Core/Scripts: Unify Chrono Literals (#22420)

* Unify Chrono Literals * Retire IN_MILLISECONDS * Build fix * Build fix (sequel) * Retire urand() * Edge cases * Build * Whitespaces * More edge cases * Additional cases
author: DanVS <33371360+DanVS@users.noreply.github.com> 2018-09-17 16:38:22 +0000
committer: jackpoz <giacomopoz@gmail.com> 2018-09-17 18:38:22 +0200
commit: 5b0f4009df4cde413c92c73467ca9a63e79a772b (patch)
tree: 26e14700c4afaac9c5e0c09a1c9ec7a143291195
parent: 28591fd1658e3e4842d64f330f27c233dc69aad2 (diff)
293 files changed, 2741 insertions, 2741 deletions
diff --git a/src/server/game/Battlegrounds/Zones/BattlegroundAV.h b/src/server/game/Battlegrounds/Zones/BattlegroundAV.h
index 361a4f70524..f31440de755 100644
--- a/src/server/game/Battlegrounds/Zones/BattlegroundAV.h
+++ b/src/server/game/Battlegrounds/Zones/BattlegroundAV.h
@@ -107,7 +107,7 @@ horde:
     AV_SOUND_HORDE_GOOD                     = 8213,
     AV_SOUND_BOTH_TOWER_DEFEND              = 8192,
 
-    AV_SOUND_ALLIANCE_CAPTAIN               = 8232, //gets called when someone attacks them and at the beginning after 3min+rand(x)*10sec (maybe buff)
+    AV_SOUND_ALLIANCE_CAPTAIN               = 8232, //gets called when someone attacks them and at the beginning after 5min+rand(x)*10sec (maybe buff)
     AV_SOUND_HORDE_CAPTAIN                  = 8333
 };
 
diff --git a/src/server/scripts/EasternKingdoms/AlteracValley/alterac_valley.cpp b/src/server/scripts/EasternKingdoms/AlteracValley/alterac_valley.cpp
index 2831164a47d..4233021f5ae 100644
--- a/src/server/scripts/EasternKingdoms/AlteracValley/alterac_valley.cpp
+++ b/src/server/scripts/EasternKingdoms/AlteracValley/alterac_valley.cpp
@@ -99,12 +99,12 @@ class npc_av_marshal_or_warmaster : public CreatureScript
                 Initialize();
 
                 events.Reset();
-                events.ScheduleEvent(EVENT_CHARGE_TARGET, urand(2 * IN_MILLISECONDS, 12 * IN_MILLISECONDS));
-                events.ScheduleEvent(EVENT_CLEAVE, urand(1 * IN_MILLISECONDS, 11 * IN_MILLISECONDS));
-                events.ScheduleEvent(EVENT_DEMORALIZING_SHOUT, 2000);
-                events.ScheduleEvent(EVENT_WHIRLWIND, urand(5 * IN_MILLISECONDS, 20 * IN_MILLISECONDS));
-                events.ScheduleEvent(EVENT_ENRAGE, urand(5 * IN_MILLISECONDS, 20 * IN_MILLISECONDS));
-                events.ScheduleEvent(EVENT_CHECK_RESET, 5000);
+                events.ScheduleEvent(EVENT_CHARGE_TARGET, 2s, 12s);
+                events.ScheduleEvent(EVENT_CLEAVE, 1s, 11s);
+                events.ScheduleEvent(EVENT_DEMORALIZING_SHOUT, 2s);
+                events.ScheduleEvent(EVENT_WHIRLWIND, 5s, 20s);
+                events.ScheduleEvent(EVENT_ENRAGE, 5s, 20s);
+                events.ScheduleEvent(EVENT_CHECK_RESET, 5s);
             }
 
             void JustAppeared() override
@@ -138,23 +138,23 @@ class npc_av_marshal_or_warmaster : public CreatureScript
                     {
                         case EVENT_CHARGE_TARGET:
                             DoCastVictim(SPELL_CHARGE);
-                            events.ScheduleEvent(EVENT_CHARGE, urand(10 * IN_MILLISECONDS, 25 * IN_MILLISECONDS));
+                            events.ScheduleEvent(EVENT_CHARGE, 10s, 25s);
                             break;
                         case EVENT_CLEAVE:
                             DoCastVictim(SPELL_CLEAVE);
-                            events.ScheduleEvent(EVENT_CLEAVE, urand(10 * IN_MILLISECONDS, 16 * IN_MILLISECONDS));
+                            events.ScheduleEvent(EVENT_CLEAVE, 10s, 16s);
                             break;
                         case EVENT_DEMORALIZING_SHOUT:
                             DoCast(me, SPELL_DEMORALIZING_SHOUT);
-                            events.ScheduleEvent(EVENT_DEMORALIZING_SHOUT, urand(10 * IN_MILLISECONDS, 15 * IN_MILLISECONDS));
+                            events.ScheduleEvent(EVENT_DEMORALIZING_SHOUT, 10s, 15s);
                             break;
                         case EVENT_WHIRLWIND:
                             DoCast(me, SPELL_WHIRLWIND);
-                            events.ScheduleEvent(EVENT_WHIRLWIND, urand(10 * IN_MILLISECONDS, 25 * IN_MILLISECONDS));
+                            events.ScheduleEvent(EVENT_WHIRLWIND, 10s, 25s);
                             break;
                         case EVENT_ENRAGE:
                             DoCast(me, SPELL_ENRAGE);
-                            events.ScheduleEvent(EVENT_ENRAGE, urand(10 * IN_MILLISECONDS, 30 * IN_MILLISECONDS));
+                            events.ScheduleEvent(EVENT_ENRAGE, 10s, 30s);
                             break;
                         case EVENT_CHECK_RESET:
                         {
@@ -164,7 +164,7 @@ class npc_av_marshal_or_warmaster : public CreatureScript
                                 EnterEvadeMode();
                                 return;
                             }
-                            events.ScheduleEvent(EVENT_CHECK_RESET, 5000);
+                            events.ScheduleEvent(EVENT_CHECK_RESET, 5s);
                             break;
                         }
                     }
diff --git a/src/server/scripts/EasternKingdoms/AlteracValley/boss_balinda.cpp b/src/server/scripts/EasternKingdoms/AlteracValley/boss_balinda.cpp
index 577c156fd83..07c9fe5d84c 100644
--- a/src/server/scripts/EasternKingdoms/AlteracValley/boss_balinda.cpp
+++ b/src/server/scripts/EasternKingdoms/AlteracValley/boss_balinda.cpp
@@ -80,12 +80,12 @@ public:
         void JustEngagedWith(Unit* /*who*/) override
         {
             Talk(SAY_AGGRO);
-            events.ScheduleEvent(EVENT_ARCANE_EXPLOSION, urand(5 * IN_MILLISECONDS, 15 * IN_MILLISECONDS));
-            events.ScheduleEvent(EVENT_CONE_OF_COLD, 8 * IN_MILLISECONDS);
-            events.ScheduleEvent(EVENT_FIREBOLT, 1 * IN_MILLISECONDS);
-            events.ScheduleEvent(EVENT_FROSTBOLT, 4 * IN_MILLISECONDS);
-            events.ScheduleEvent(EVENT_SUMMON_WATER_ELEMENTAL, 3 * IN_MILLISECONDS);
-            events.ScheduleEvent(EVENT_CHECK_RESET, 5 * IN_MILLISECONDS);
+            events.ScheduleEvent(EVENT_ARCANE_EXPLOSION, 5s, 15s);
+            events.ScheduleEvent(EVENT_CONE_OF_COLD, 8s);
+            events.ScheduleEvent(EVENT_FIREBOLT, 1s);
+            events.ScheduleEvent(EVENT_FROSTBOLT, 4s);
+            events.ScheduleEvent(EVENT_SUMMON_WATER_ELEMENTAL, 3s);
+            events.ScheduleEvent(EVENT_CHECK_RESET, 5s);
         }
 
         void JustSummoned(Creature* summoned) override
@@ -137,24 +137,24 @@ public:
                 {
                     case EVENT_ARCANE_EXPLOSION:
                         DoCastVictim(SPELL_ARCANE_EXPLOSION);
-                        events.ScheduleEvent(EVENT_ARCANE_EXPLOSION, urand(5 * IN_MILLISECONDS, 15 * IN_MILLISECONDS));
+                        events.ScheduleEvent(EVENT_ARCANE_EXPLOSION, 5s, 15s);
                         break;
                     case EVENT_CONE_OF_COLD:
                         DoCastVictim(SPELL_CONE_OF_COLD);
-                        events.ScheduleEvent(EVENT_CONE_OF_COLD, urand(10 * IN_MILLISECONDS, 20 * IN_MILLISECONDS));
+                        events.ScheduleEvent(EVENT_CONE_OF_COLD, 10s, 20s);
                         break;
                     case EVENT_FIREBOLT:
                         DoCastVictim(SPELL_FIREBALL);
-                        events.ScheduleEvent(EVENT_FIREBOLT, urand(5 * IN_MILLISECONDS, 9 * IN_MILLISECONDS));
+                        events.ScheduleEvent(EVENT_FIREBOLT, 5s, 9s);
                         break;
                     case EVENT_FROSTBOLT:
                         DoCastVictim(SPELL_FROSTBOLT);
-                        events.ScheduleEvent(EVENT_FROSTBOLT, urand(4 * IN_MILLISECONDS, 12 * IN_MILLISECONDS));
+                        events.ScheduleEvent(EVENT_FROSTBOLT, 4s, 12s);
                         break;
                     case EVENT_SUMMON_WATER_ELEMENTAL:
                         if (summons.empty())
                             DoCast(SPELL_SUMMON_WATER_ELEMENTAL);
-                        events.ScheduleEvent(EVENT_SUMMON_WATER_ELEMENTAL, 50 * IN_MILLISECONDS);
+                        events.ScheduleEvent(EVENT_SUMMON_WATER_ELEMENTAL, 50s);
                         break;
                     case EVENT_CHECK_RESET:
                         if (me->GetDistance2d(me->GetHomePosition().GetPositionX(), me->GetHomePosition().GetPositionY()) > 50)
@@ -165,7 +165,7 @@ public:
                         if (Creature* elemental = ObjectAccessor::GetCreature(*me, WaterElementalGUID))
                             if (elemental->GetDistance2d(me->GetHomePosition().GetPositionX(), me->GetHomePosition().GetPositionY()) > 50)
                                 elemental->AI()->EnterEvadeMode();
-                        events.ScheduleEvent(EVENT_CHECK_RESET, 5 * IN_MILLISECONDS);
+                        events.ScheduleEvent(EVENT_CHECK_RESET, 5s);
                         break;
                     default:
                         break;
diff --git a/src/server/scripts/EasternKingdoms/AlteracValley/boss_drekthar.cpp b/src/server/scripts/EasternKingdoms/AlteracValley/boss_drekthar.cpp
index 3371da03d6e..c3b90855101 100644
--- a/src/server/scripts/EasternKingdoms/AlteracValley/boss_drekthar.cpp
+++ b/src/server/scripts/EasternKingdoms/AlteracValley/boss_drekthar.cpp
@@ -64,11 +64,11 @@ public:
         void JustEngagedWith(Unit* /*who*/) override
         {
             Talk(SAY_AGGRO);
-            events.ScheduleEvent(EVENT_WHIRLWIND, urand(1 * IN_MILLISECONDS, 20 * IN_MILLISECONDS));
+            events.ScheduleEvent(EVENT_WHIRLWIND, 1s, 20s);
             events.ScheduleEvent(EVENT_WHIRLWIND2, urand(1 * IN_MILLISECONDS, 20 * IN_MILLISECONDS));
-            events.ScheduleEvent(EVENT_KNOCKDOWN, 12 * IN_MILLISECONDS);
-            events.ScheduleEvent(EVENT_FRENZY, 6 * IN_MILLISECONDS);
-            events.ScheduleEvent(EVENT_RANDOM_YELL, urand(20 * IN_MILLISECONDS, 30 * IN_MILLISECONDS)); //20 to 30 seconds
+            events.ScheduleEvent(EVENT_KNOCKDOWN, 12s);
+            events.ScheduleEvent(EVENT_FRENZY, 6s);
+            events.ScheduleEvent(EVENT_RANDOM_YELL, 20s, 30s); //20 to 30 seconds
         }
 
         void JustAppeared() override
@@ -105,7 +105,7 @@ public:
                 {
                     case EVENT_WHIRLWIND:
                         DoCastVictim(SPELL_WHIRLWIND);
-                        events.ScheduleEvent(EVENT_WHIRLWIND, urand(8 * IN_MILLISECONDS, 18 * IN_MILLISECONDS));
+                        events.ScheduleEvent(EVENT_WHIRLWIND, 8s, 18s);
                         break;
                     case EVENT_WHIRLWIND2:
                         DoCastVictim(SPELL_WHIRLWIND2);
@@ -113,15 +113,15 @@ public:
                         break;
                     case EVENT_KNOCKDOWN:
                         DoCastVictim(SPELL_KNOCKDOWN);
-                        events.ScheduleEvent(EVENT_KNOCKDOWN, urand(10 * IN_MILLISECONDS, 15 * IN_MILLISECONDS));
+                        events.ScheduleEvent(EVENT_KNOCKDOWN, 10s, 15s);
                         break;
                     case EVENT_FRENZY:
                         DoCastVictim(SPELL_FRENZY);
-                        events.ScheduleEvent(EVENT_FRENZY, urand(20 * IN_MILLISECONDS, 30 * IN_MILLISECONDS));
+                        events.ScheduleEvent(EVENT_FRENZY, 20s, 30s);
                         break;
                     case EVENT_RANDOM_YELL:
                         Talk(SAY_RANDOM);
-                        events.ScheduleEvent(EVENT_RANDOM_YELL, urand(20 * IN_MILLISECONDS, 30 * IN_MILLISECONDS));
+                        events.ScheduleEvent(EVENT_RANDOM_YELL, 20s, 30s);
                         break;
                     default:
                         break;
diff --git a/src/server/scripts/EasternKingdoms/AlteracValley/boss_galvangar.cpp b/src/server/scripts/EasternKingdoms/AlteracValley/boss_galvangar.cpp
index 3f12ff07c5c..cea74938db7 100644
--- a/src/server/scripts/EasternKingdoms/AlteracValley/boss_galvangar.cpp
+++ b/src/server/scripts/EasternKingdoms/AlteracValley/boss_galvangar.cpp
@@ -65,11 +65,11 @@ public:
         void JustEngagedWith(Unit* /*who*/) override
         {
             Talk(SAY_AGGRO);
-            events.ScheduleEvent(EVENT_CLEAVE, urand(1 * IN_MILLISECONDS, 9 * IN_MILLISECONDS));
-            events.ScheduleEvent(EVENT_FRIGHTENING_SHOUT, urand(2 * IN_MILLISECONDS, 19 * IN_MILLISECONDS));
+            events.ScheduleEvent(EVENT_CLEAVE, 1s, 9s);
+            events.ScheduleEvent(EVENT_FRIGHTENING_SHOUT, 2s, 19s);
             events.ScheduleEvent(EVENT_WHIRLWIND1, urand(1 * IN_MILLISECONDS, 13 * IN_MILLISECONDS));
             events.ScheduleEvent(EVENT_WHIRLWIND2, urand(5 * IN_MILLISECONDS, 20 * IN_MILLISECONDS));
-            events.ScheduleEvent(EVENT_MORTAL_STRIKE, urand(5 * IN_MILLISECONDS, 20 * IN_MILLISECONDS));
+            events.ScheduleEvent(EVENT_MORTAL_STRIKE, 5s, 20s);
         }
 
         void DoAction(int32 actionId) override
@@ -106,11 +106,11 @@ public:
                 {
                     case EVENT_CLEAVE:
                         DoCastVictim(SPELL_CLEAVE);
-                        events.ScheduleEvent(EVENT_CLEAVE, urand(10 * IN_MILLISECONDS, 16 * IN_MILLISECONDS));
+                        events.ScheduleEvent(EVENT_CLEAVE, 10s, 16s);
                         break;
                     case EVENT_FRIGHTENING_SHOUT:
                         DoCastVictim(SPELL_FRIGHTENING_SHOUT);
-                        events.ScheduleEvent(EVENT_FRIGHTENING_SHOUT, urand(10 * IN_MILLISECONDS, 15 * IN_MILLISECONDS));
+                        events.ScheduleEvent(EVENT_FRIGHTENING_SHOUT, 10s, 15s);
                         break;
                     case EVENT_WHIRLWIND1:
                         DoCastVictim(SPELL_WHIRLWIND1);
@@ -122,7 +122,7 @@ public:
                         break;
                     case EVENT_MORTAL_STRIKE:
                         DoCastVictim(SPELL_MORTAL_STRIKE);
-                        events.ScheduleEvent(EVENT_MORTAL_STRIKE, urand(10 * IN_MILLISECONDS, 30 * IN_MILLISECONDS));
+                        events.ScheduleEvent(EVENT_MORTAL_STRIKE, 10s, 30s);
                         break;
                     default:
                         break;
diff --git a/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockDepths/boss_ambassador_flamelash.cpp b/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockDepths/boss_ambassador_flamelash.cpp
index ed0eec6f793..0668419e27c 100644
--- a/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockDepths/boss_ambassador_flamelash.cpp
+++ b/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockDepths/boss_ambassador_flamelash.cpp
@@ -46,8 +46,8 @@ class boss_ambassador_flamelash : public CreatureScript
 
             void JustEngagedWith(Unit* /*who*/) override
             {
-                _events.ScheduleEvent(EVENT_FIREBLAST, 2000);
-                _events.ScheduleEvent(EVENT_SUMMON_SPIRITS, 24000);
+                _events.ScheduleEvent(EVENT_FIREBLAST, 2s);
+                _events.ScheduleEvent(EVENT_SUMMON_SPIRITS, 24s);
             }
 
             void SummonSpirit(Unit* victim)
@@ -69,12 +69,12 @@ class boss_ambassador_flamelash : public CreatureScript
                     {
                         case EVENT_FIREBLAST:
                             DoCastVictim(SPELL_FIREBLAST);
-                            _events.ScheduleEvent(EVENT_FIREBLAST, 7000);
+                            _events.ScheduleEvent(EVENT_FIREBLAST, 7s);
                             break;
                         case EVENT_SUMMON_SPIRITS:
                             for (uint32 i = 0; i < 4; ++i)
                                 SummonSpirit(me->GetVictim());
-                            _events.ScheduleEvent(EVENT_SUMMON_SPIRITS, 30000);
+                            _events.ScheduleEvent(EVENT_SUMMON_SPIRITS, 30s);
                             break;
                         default:
                             break;
diff --git a/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockDepths/boss_coren_direbrew.cpp b/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockDepths/boss_coren_direbrew.cpp
index 98eecd0da8d..89605a91381 100644
--- a/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockDepths/boss_coren_direbrew.cpp
+++ b/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockDepths/boss_coren_direbrew.cpp
@@ -174,8 +174,8 @@ struct boss_coren_direbrew : public BossAI
             EntryCheckPredicate pred(NPC_ANTAGONIST);
             summons.DoAction(ACTION_ANTAGONIST_HOSTILE, pred);
 
-            events.ScheduleEvent(EVENT_SUMMON_MOLE_MACHINE, Seconds(15));
-            events.ScheduleEvent(EVENT_DIREBREW_DISARM, Seconds(20));
+            events.ScheduleEvent(EVENT_SUMMON_MOLE_MACHINE, 15s);
+            events.ScheduleEvent(EVENT_DIREBREW_DISARM, 20s);
         }
     }
 
@@ -196,9 +196,9 @@ struct boss_coren_direbrew : public BossAI
     void SummonedCreatureDies(Creature* summon, Unit* /*killer*/) override
     {
         if (summon->GetEntry() == NPC_ILSA_DIREBREW)
-            events.ScheduleEvent(EVENT_RESPAWN_ILSA, Seconds(1));
+            events.ScheduleEvent(EVENT_RESPAWN_ILSA, 1s);
         else if (summon->GetEntry() == NPC_URSULA_DIREBREW)
-            events.ScheduleEvent(EVENT_RESPAWN_URSULA, Seconds(1));
+            events.ScheduleEvent(EVENT_RESPAWN_URSULA, 1s);
     }
 
     void JustDied(Unit* /*killer*/) override
diff --git a/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockDepths/boss_emperor_dagran_thaurissan.cpp b/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockDepths/boss_emperor_dagran_thaurissan.cpp
index 428ef19750e..a8b57b97429 100644
--- a/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockDepths/boss_emperor_dagran_thaurissan.cpp
+++ b/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockDepths/boss_emperor_dagran_thaurissan.cpp
@@ -65,8 +65,8 @@ class boss_emperor_dagran_thaurissan : public CreatureScript
             {
                 Talk(SAY_AGGRO);
                 me->CallForHelp(VISIBLE_RANGE);
-                _events.ScheduleEvent(EVENT_HANDOFTHAURISSAN, 4000);
-                _events.ScheduleEvent(EVENT_AVATAROFFLAME, 25000);
+                _events.ScheduleEvent(EVENT_HANDOFTHAURISSAN, 4s);
+                _events.ScheduleEvent(EVENT_AVATAROFFLAME, 25s);
             }
 
             void KilledUnit(Unit* who) override
@@ -99,11 +99,11 @@ class boss_emperor_dagran_thaurissan : public CreatureScript
                         case EVENT_HANDOFTHAURISSAN:
                             if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0))
                                 DoCast(target, SPELL_HANDOFTHAURISSAN);
-                            _events.ScheduleEvent(EVENT_HANDOFTHAURISSAN, 5000);
+                            _events.ScheduleEvent(EVENT_HANDOFTHAURISSAN, 5s);
                             break;
                         case EVENT_AVATAROFFLAME:
                             DoCastVictim(SPELL_AVATAROFFLAME);
-                            _events.ScheduleEvent(EVENT_AVATAROFFLAME, 18000);
+                            _events.ScheduleEvent(EVENT_AVATAROFFLAME, 18s);
                             break;
                         default:
                             break;
diff --git a/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockDepths/boss_general_angerforge.cpp b/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockDepths/boss_general_angerforge.cpp
index 5afe533be9b..1005c807300 100644
--- a/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockDepths/boss_general_angerforge.cpp
+++ b/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockDepths/boss_general_angerforge.cpp
@@ -58,9 +58,9 @@ class boss_general_angerforge : public CreatureScript
             void JustEngagedWith(Unit* /*who*/) override
             {
                 _events.SetPhase(PHASE_ONE);
-                _events.ScheduleEvent(EVENT_MIGHTYBLOW, 8000);
-                _events.ScheduleEvent(EVENT_HAMSTRING, 12000);
-                _events.ScheduleEvent(EVENT_CLEAVE, 16000);
+                _events.ScheduleEvent(EVENT_MIGHTYBLOW, 8s);
+                _events.ScheduleEvent(EVENT_HAMSTRING, 12s);
+                _events.ScheduleEvent(EVENT_CLEAVE, 16s);
             }
 
             void DamageTaken(Unit* /*attacker*/, uint32& damage) override
@@ -98,15 +98,15 @@ class boss_general_angerforge : public CreatureScript
                     {
                         case EVENT_MIGHTYBLOW:
                             DoCastVictim(SPELL_MIGHTYBLOW);
-                            _events.ScheduleEvent(EVENT_MIGHTYBLOW, 18000);
+                            _events.ScheduleEvent(EVENT_MIGHTYBLOW, 18s);
                             break;
                         case EVENT_HAMSTRING:
                             DoCastVictim(SPELL_HAMSTRING);
-                            _events.ScheduleEvent(EVENT_HAMSTRING, 15000);
+                            _events.ScheduleEvent(EVENT_HAMSTRING, 15s);
                             break;
                         case EVENT_CLEAVE:
                             DoCastVictim(SPELL_CLEAVE);
-                            _events.ScheduleEvent(EVENT_CLEAVE, 9000);
+                            _events.ScheduleEvent(EVENT_CLEAVE, 9s);
                             break;
                         case EVENT_MEDIC:
                             for (uint8 i = 0; i < 2; ++i)
@@ -115,7 +115,7 @@ class boss_general_angerforge : public CreatureScript
                         case EVENT_ADDS:
                             for (uint8 i = 0; i < 3; ++i)
                                 SummonAdd(me->GetVictim());
-                            _events.ScheduleEvent(EVENT_ADDS, 25000, 0, PHASE_TWO);
+                            _events.ScheduleEvent(EVENT_ADDS, 25s, 0, PHASE_TWO);
                             break;
                         default:
                             break;
diff --git a/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockDepths/boss_high_interrogator_gerstahn.cpp b/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockDepths/boss_high_interrogator_gerstahn.cpp
index b086670eecf..a4efc1abcb1 100644
--- a/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockDepths/boss_high_interrogator_gerstahn.cpp
+++ b/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockDepths/boss_high_interrogator_gerstahn.cpp
@@ -51,10 +51,10 @@ class boss_high_interrogator_gerstahn : public CreatureScript
 
             void JustEngagedWith(Unit* /*who*/) override
             {
-                _events.ScheduleEvent(EVENT_SHADOW_WORD_PAIN, 4000);
-                _events.ScheduleEvent(EVENT_MANABURN, 14000);
-                _events.ScheduleEvent(EVENT_PSYCHIC_SCREAM, 32000);
-                _events.ScheduleEvent(EVENT_SHADOWSHIELD, 8000);
+                _events.ScheduleEvent(EVENT_SHADOW_WORD_PAIN, 4s);
+                _events.ScheduleEvent(EVENT_MANABURN, 14s);
+                _events.ScheduleEvent(EVENT_PSYCHIC_SCREAM, 32s);
+                _events.ScheduleEvent(EVENT_SHADOWSHIELD, 8s);
             }
 
             void UpdateAI(uint32 diff) override
@@ -71,20 +71,20 @@ class boss_high_interrogator_gerstahn : public CreatureScript
                         case EVENT_SHADOW_WORD_PAIN:
                             if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0, 100.0f, true))
                                 DoCast(target, SPELL_SHADOWWORDPAIN);
-                            _events.ScheduleEvent(EVENT_SHADOW_WORD_PAIN, 7000);
+                            _events.ScheduleEvent(EVENT_SHADOW_WORD_PAIN, 7s);
                             break;
                         case EVENT_PSYCHIC_SCREAM:
                             DoCastVictim(SPELL_PSYCHICSCREAM);
-                            _events.ScheduleEvent(EVENT_PSYCHIC_SCREAM, 30000);
+                            _events.ScheduleEvent(EVENT_PSYCHIC_SCREAM, 30s);
                             break;
                         case EVENT_MANABURN:
                             if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0, 100.0f, true))
                                 DoCast(target, SPELL_MANABURN);
-                            _events.ScheduleEvent(EVENT_MANABURN, 10000);
+                            _events.ScheduleEvent(EVENT_MANABURN, 10s);
                             break;
                         case EVENT_SHADOWSHIELD:
                             DoCast(me, SPELL_SHADOWSHIELD);
-                            _events.ScheduleEvent(EVENT_SHADOWSHIELD, 25000);
+                            _events.ScheduleEvent(EVENT_SHADOWSHIELD, 25s);
                             break;
                         default:
                             break;
diff --git a/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockDepths/boss_magmus.cpp b/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockDepths/boss_magmus.cpp
index 5ecff6cb0d1..2374291ae51 100644
--- a/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockDepths/boss_magmus.cpp
+++ b/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockDepths/boss_magmus.cpp
@@ -55,7 +55,7 @@ class boss_magmus : public CreatureScript
             void JustEngagedWith(Unit* /*who*/) override
             {
                 _events.SetPhase(PHASE_ONE);
-                _events.ScheduleEvent(EVENT_FIERY_BURST, 5000);
+                _events.ScheduleEvent(EVENT_FIERY_BURST, 5s);
             }
 
             void DamageTaken(Unit* /*attacker*/, uint32& damage) override
@@ -80,11 +80,11 @@ class boss_magmus : public CreatureScript
                     {
                         case EVENT_FIERY_BURST:
                             DoCastVictim(SPELL_FIERYBURST);
-                            _events.ScheduleEvent(EVENT_FIERY_BURST, 6000);
+                            _events.ScheduleEvent(EVENT_FIERY_BURST, 6s);
                             break;
                         case EVENT_WARSTOMP:
                             DoCastVictim(SPELL_WARSTOMP);
-                            _events.ScheduleEvent(EVENT_WARSTOMP, 8000, 0, PHASE_TWO);
+                            _events.ScheduleEvent(EVENT_WARSTOMP, 8s, 0, PHASE_TWO);
                             break;
                         default:
                             break;
diff --git a/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockDepths/boss_moira_bronzebeard.cpp b/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockDepths/boss_moira_bronzebeard.cpp
index 0d8d3ef37bd..18b4c6af0c6 100644
--- a/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockDepths/boss_moira_bronzebeard.cpp
+++ b/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockDepths/boss_moira_bronzebeard.cpp
@@ -53,10 +53,10 @@ class boss_moira_bronzebeard : public CreatureScript
 
             void JustEngagedWith(Unit* /*who*/) override
             {
-                //_events.ScheduleEvent(EVENT_HEAL, 12000); // not used atm // These times are probably wrong
-                _events.ScheduleEvent(EVENT_MINDBLAST, 16000);
-                _events.ScheduleEvent(EVENT_SHADOW_WORD_PAIN, 2000);
-                _events.ScheduleEvent(EVENT_SMITE, 8000);
+                //_events.ScheduleEvent(EVENT_HEAL, 12s); // not used atm // These times are probably wrong
+                _events.ScheduleEvent(EVENT_MINDBLAST, 16s);
+                _events.ScheduleEvent(EVENT_SHADOW_WORD_PAIN, 2s);
+                _events.ScheduleEvent(EVENT_SMITE, 8s);
             }
 
             void UpdateAI(uint32 diff) override
@@ -72,15 +72,15 @@ class boss_moira_bronzebeard : public CreatureScript
                     {
                         case EVENT_MINDBLAST:
                             DoCastVictim(SPELL_MINDBLAST);
-                            _events.ScheduleEvent(EVENT_MINDBLAST, 14000);
+                            _events.ScheduleEvent(EVENT_MINDBLAST, 14s);
                             break;
                         case EVENT_SHADOW_WORD_PAIN:
                             DoCastVictim(SPELL_SHADOWWORDPAIN);
-                            _events.ScheduleEvent(EVENT_SHADOW_WORD_PAIN, 18000);
+                            _events.ScheduleEvent(EVENT_SHADOW_WORD_PAIN, 18s);
                             break;
                         case EVENT_SMITE:
                             DoCastVictim(SPELL_SMITE);
-                            _events.ScheduleEvent(EVENT_SMITE, 10000);
+                            _events.ScheduleEvent(EVENT_SMITE, 10s);
                             break;
                         default:
                             break;
diff --git a/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockDepths/boss_tomb_of_seven.cpp b/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockDepths/boss_tomb_of_seven.cpp
index 1284166be31..20605c012d0 100644
--- a/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockDepths/boss_tomb_of_seven.cpp
+++ b/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockDepths/boss_tomb_of_seven.cpp
@@ -163,10 +163,10 @@ class boss_doomrel : public CreatureScript
 
             void JustEngagedWith(Unit* /*who*/) override
             {
-                _events.ScheduleEvent(EVENT_SHADOW_BOLT_VOLLEY, 10000);
-                _events.ScheduleEvent(EVENT_IMMOLATE, 18000);
-                _events.ScheduleEvent(EVENT_CURSE_OF_WEAKNESS, 5000);
-                _events.ScheduleEvent(EVENT_DEMONARMOR, 16000);
+                _events.ScheduleEvent(EVENT_SHADOW_BOLT_VOLLEY, 10s);
+                _events.ScheduleEvent(EVENT_IMMOLATE, 18s);
+                _events.ScheduleEvent(EVENT_CURSE_OF_WEAKNESS, 5s);
+                _events.ScheduleEvent(EVENT_DEMONARMOR, 16s);
             }
 
             void DamageTaken(Unit* /*attacker*/, uint32& /*damage*/) override
@@ -203,20 +203,20 @@ class boss_doomrel : public CreatureScript
                     {
                         case EVENT_SHADOW_BOLT_VOLLEY:
                             DoCastVictim(SPELL_SHADOWBOLTVOLLEY);
-                            _events.ScheduleEvent(EVENT_SHADOW_BOLT_VOLLEY, 12000);
+                            _events.ScheduleEvent(EVENT_SHADOW_BOLT_VOLLEY, 12s);
                             break;
                         case EVENT_IMMOLATE:
                             if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0, 100.0f, true))
                                 DoCast(target, SPELL_IMMOLATE);
-                            _events.ScheduleEvent(EVENT_IMMOLATE, 25000);
+                            _events.ScheduleEvent(EVENT_IMMOLATE, 25s);
                             break;
                         case EVENT_CURSE_OF_WEAKNESS:
                             DoCastVictim(SPELL_CURSEOFWEAKNESS);
-                            _events.ScheduleEvent(EVENT_CURSE_OF_WEAKNESS, 45000);
+                            _events.ScheduleEvent(EVENT_CURSE_OF_WEAKNESS, 45s);
                             break;
                         case EVENT_DEMONARMOR:
                             DoCast(me, SPELL_DEMONARMOR);
-                            _events.ScheduleEvent(EVENT_DEMONARMOR, 300000);
+                            _events.ScheduleEvent(EVENT_DEMONARMOR, 5min);
                             break;
                         default:
                             break;
diff --git a/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockSpire/boss_drakkisath.cpp b/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockSpire/boss_drakkisath.cpp
index a9d8bb25338..9d0cdac4297 100644
--- a/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockSpire/boss_drakkisath.cpp
+++ b/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockSpire/boss_drakkisath.cpp
@@ -53,9 +53,9 @@ public:
         void JustEngagedWith(Unit* /*who*/) override
         {
             _JustEngagedWith();
-            events.ScheduleEvent(EVENT_FIRE_NOVA, 6000);
+            events.ScheduleEvent(EVENT_FIRE_NOVA, 6s);
             events.ScheduleEvent(EVENT_CLEAVE,    8000);
-            events.ScheduleEvent(EVENT_CONFLIGURATION, 15000);
+            events.ScheduleEvent(EVENT_CONFLIGURATION, 15s);
             events.ScheduleEvent(EVENT_THUNDERCLAP,    17000);
         }
 
@@ -80,19 +80,19 @@ public:
                 {
                     case EVENT_FIRE_NOVA:
                         DoCastVictim(SPELL_FIRENOVA);
-                        events.ScheduleEvent(EVENT_FIRE_NOVA, 10000);
+                        events.ScheduleEvent(EVENT_FIRE_NOVA, 10s);
                         break;
                     case EVENT_CLEAVE:
                         DoCastVictim(SPELL_CLEAVE);
-                        events.ScheduleEvent(EVENT_CLEAVE, 8000);
+                        events.ScheduleEvent(EVENT_CLEAVE, 8s);
                         break;
                     case EVENT_CONFLIGURATION:
                         DoCastVictim(SPELL_CONFLIGURATION);
-                        events.ScheduleEvent(EVENT_CONFLIGURATION, 18000);
+                        events.ScheduleEvent(EVENT_CONFLIGURATION, 18s);
                         break;
                     case EVENT_THUNDERCLAP:
                         DoCastVictim(SPELL_THUNDERCLAP);
-                        events.ScheduleEvent(EVENT_THUNDERCLAP, 20000);
+                        events.ScheduleEvent(EVENT_THUNDERCLAP, 20s);
                         break;
                 }
 
diff --git a/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockSpire/boss_gizrul_the_slavener.cpp b/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockSpire/boss_gizrul_the_slavener.cpp
index d4be9a658a5..6dc1ebf3ad8 100644
--- a/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockSpire/boss_gizrul_the_slavener.cpp
+++ b/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockSpire/boss_gizrul_the_slavener.cpp
@@ -62,8 +62,8 @@ public:
         void JustEngagedWith(Unit* /*who*/) override
         {
             _JustEngagedWith();
-            events.ScheduleEvent(EVENT_FATAL_BITE, urand(17000,20000));
-            events.ScheduleEvent(EVENT_INFECTED_BITE, urand(10000,12000));
+            events.ScheduleEvent(EVENT_FATAL_BITE, 17s, 20s);
+            events.ScheduleEvent(EVENT_INFECTED_BITE, 10s, 12s);
         }
 
         void JustDied(Unit* /*killer*/) override
@@ -87,11 +87,11 @@ public:
                 {
                     case EVENT_FATAL_BITE:
                         DoCastVictim(SPELL_FATAL_BITE);
-                        events.ScheduleEvent(EVENT_FATAL_BITE, urand(8000,10000));
+                        events.ScheduleEvent(EVENT_FATAL_BITE, 8s, 10s);
                         break;
                     case EVENT_INFECTED_BITE:
                         DoCast(me, SPELL_INFECTED_BITE);
-                        events.ScheduleEvent(EVENT_FATAL_BITE, urand(8000,10000));
+                        events.ScheduleEvent(EVENT_FATAL_BITE, 8s, 10s);
                         break;
                     default:
                         break;
diff --git a/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockSpire/boss_gyth.cpp b/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockSpire/boss_gyth.cpp
index 5364891bb13..170e273ee81 100644
--- a/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockSpire/boss_gyth.cpp
+++ b/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockSpire/boss_gyth.cpp
@@ -82,10 +82,10 @@ public:
         {
             _JustEngagedWith();
 
-            events.ScheduleEvent(EVENT_CORROSIVE_ACID, urand(8000, 16000));
-            events.ScheduleEvent(EVENT_FREEZE, urand(8000, 16000));
-            events.ScheduleEvent(EVENT_FLAME_BREATH, urand(8000, 16000));
-            events.ScheduleEvent(EVENT_KNOCK_AWAY, urand(12000, 18000));
+            events.ScheduleEvent(EVENT_CORROSIVE_ACID, 8s, 16s);
+            events.ScheduleEvent(EVENT_FREEZE, 8s, 16s);
+            events.ScheduleEvent(EVENT_FLAME_BREATH, 8s, 16s);
+            events.ScheduleEvent(EVENT_KNOCK_AWAY, 12s, 18s);
         }
 
         void JustDied(Unit* /*killer*/) override
@@ -98,7 +98,7 @@ public:
             switch (data)
             {
                 case 1:
-                    events.ScheduleEvent(EVENT_SUMMONED_1, 1000);
+                    events.ScheduleEvent(EVENT_SUMMONED_1, 1s);
                     break;
                 default:
                     break;
@@ -129,7 +129,7 @@ public:
                                 portcullis->UseDoorOrButton();
                             if (Creature* victor = me->FindNearestCreature(NPC_LORD_VICTOR_NEFARIUS, 75.0f, true))
                                 victor->AI()->SetData(1, 1);
-                            events.ScheduleEvent(EVENT_SUMMONED_2, 2000);
+                            events.ScheduleEvent(EVENT_SUMMONED_2, 2s);
                             break;
                         case EVENT_SUMMONED_2:
                             me->GetMotionMaster()->MovePath(GYTH_PATH_1, false);
@@ -152,19 +152,19 @@ public:
                 {
                     case EVENT_CORROSIVE_ACID:
                         DoCast(me, SPELL_CORROSIVE_ACID);
-                        events.ScheduleEvent(EVENT_CORROSIVE_ACID, urand(10000, 16000));
+                        events.ScheduleEvent(EVENT_CORROSIVE_ACID, 10s, 16s);
                         break;
                     case EVENT_FREEZE:
                         DoCast(me, SPELL_FREEZE);
-                        events.ScheduleEvent(EVENT_FREEZE, urand(10000, 16000));
+                        events.ScheduleEvent(EVENT_FREEZE, 10s, 16s);
                         break;
                     case EVENT_FLAME_BREATH:
                         DoCast(me, SPELL_FLAMEBREATH);
-                        events.ScheduleEvent(EVENT_FLAME_BREATH, urand(10000, 16000));
+                        events.ScheduleEvent(EVENT_FLAME_BREATH, 10s, 16s);
                         break;
                     case EVENT_KNOCK_AWAY:
                         DoCastVictim(SPELL_KNOCK_AWAY);
-                        events.ScheduleEvent(EVENT_KNOCK_AWAY, urand(14000, 20000));
+                        events.ScheduleEvent(EVENT_KNOCK_AWAY, 14s, 20s);
                         break;
                     default:
                         break;
diff --git a/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockSpire/boss_halycon.cpp b/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockSpire/boss_halycon.cpp
index e6d11afcf9f..95ca7337886 100644
--- a/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockSpire/boss_halycon.cpp
+++ b/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockSpire/boss_halycon.cpp
@@ -64,8 +64,8 @@ public:
         void JustEngagedWith(Unit* /*who*/) override
         {
             _JustEngagedWith();
-            events.ScheduleEvent(EVENT_REND, urand(17000,20000));
-            events.ScheduleEvent(EVENT_THRASH, urand(10000,12000));
+            events.ScheduleEvent(EVENT_REND, 17s, 20s);
+            events.ScheduleEvent(EVENT_THRASH, 10s, 12s);
         }
 
         void JustDied(Unit* /*killer*/) override
@@ -92,7 +92,7 @@ public:
                 {
                     case EVENT_REND:
                         DoCastVictim(SPELL_REND);
-                        events.ScheduleEvent(EVENT_REND, urand(8000,10000));
+                        events.ScheduleEvent(EVENT_REND, 8s, 10s);
                         break;
                     case EVENT_THRASH:
                         DoCast(me, SPELL_THRASH);
diff --git a/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockSpire/boss_highlord_omokk.cpp b/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockSpire/boss_highlord_omokk.cpp
index c9c96e82a33..23878690a29 100644
--- a/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockSpire/boss_highlord_omokk.cpp
+++ b/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockSpire/boss_highlord_omokk.cpp
@@ -79,11 +79,11 @@ public:
                 {
                     case EVENT_FRENZY:
                         DoCastVictim(SPELL_FRENZY);
-                        events.ScheduleEvent(EVENT_FRENZY, 60000);
+                        events.ScheduleEvent(EVENT_FRENZY, 1min);
                         break;
                     case EVENT_KNOCK_AWAY:
                         DoCastVictim(SPELL_KNOCK_AWAY);
-                        events.ScheduleEvent(EVENT_KNOCK_AWAY, 12000);
+                        events.ScheduleEvent(EVENT_KNOCK_AWAY, 12s);
                         break;
                     default:
                         break;
diff --git a/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockSpire/boss_lord_valthalak.cpp b/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockSpire/boss_lord_valthalak.cpp
index cf63ed6ef69..a4445117151 100644
--- a/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockSpire/boss_lord_valthalak.cpp
+++ b/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockSpire/boss_lord_valthalak.cpp
@@ -67,8 +67,8 @@ public:
         void JustEngagedWith(Unit* /*who*/) override
         {
             _JustEngagedWith();
-            events.ScheduleEvent(EVENT_SUMMON_SPECTRAL_ASSASSIN, urand(6000,8000));
-            events.ScheduleEvent(EVENT_SHADOW_WRATH, urand(9000,18000));
+            events.ScheduleEvent(EVENT_SUMMON_SPECTRAL_ASSASSIN, 6s, 8s);
+            events.ScheduleEvent(EVENT_SHADOW_WRATH, 9s, 18s);
         }
 
         void JustDied(Unit* /*killer*/) override
@@ -92,15 +92,15 @@ public:
                 {
                     case EVENT_SUMMON_SPECTRAL_ASSASSIN:
                         DoCast(me, SPELL_SUMMON_SPECTRAL_ASSASSIN);
-                        events.ScheduleEvent(EVENT_SUMMON_SPECTRAL_ASSASSIN, urand(30000,35000));
+                        events.ScheduleEvent(EVENT_SUMMON_SPECTRAL_ASSASSIN, 30s, 35s);
                         break;
                     case EVENT_SHADOW_BOLT_VOLLEY:
                         DoCastVictim(SPELL_SHADOW_BOLT_VOLLEY);
-                        events.ScheduleEvent(EVENT_SHADOW_BOLT_VOLLEY, urand(4000,6000));
+                        events.ScheduleEvent(EVENT_SHADOW_BOLT_VOLLEY, 4s, 6s);
                         break;
                     case EVENT_SHADOW_WRATH:
                         DoCastVictim(SPELL_SHADOW_WRATH);
-                        events.ScheduleEvent(EVENT_SHADOW_WRATH, urand(19000,24000));
+                        events.ScheduleEvent(EVENT_SHADOW_WRATH, 19s, 24s);
                         break;
                     default:
                         break;
@@ -125,7 +125,7 @@ public:
                 if (HealthBelowPct(15))
                 {
                     DoCast(me, SPELL_FRENZY);
-                    events.ScheduleEvent(EVENT_SHADOW_BOLT_VOLLEY, urand(7000,14000));
+                    events.ScheduleEvent(EVENT_SHADOW_BOLT_VOLLEY, 7s, 14s);
                     frenzy15 = true;
                 }
             }
diff --git a/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockSpire/boss_mother_smolderweb.cpp b/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockSpire/boss_mother_smolderweb.cpp
index 37bc783acf2..6a008081e11 100644
--- a/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockSpire/boss_mother_smolderweb.cpp
+++ b/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockSpire/boss_mother_smolderweb.cpp
@@ -56,7 +56,7 @@ public:
         {
             _JustEngagedWith();
             events.ScheduleEvent(EVENT_CRYSTALIZE,   20 * IN_MILLISECONDS);
-            events.ScheduleEvent(EVENT_MOTHERS_MILK, 10 * IN_MILLISECONDS);
+            events.ScheduleEvent(EVENT_MOTHERS_MILK, 10s);
         }
 
         void JustDied(Unit* /*killer*/) override
@@ -86,7 +86,7 @@ public:
                 {
                     case EVENT_CRYSTALIZE:
                         DoCast(me, SPELL_CRYSTALIZE);
-                        events.ScheduleEvent(EVENT_CRYSTALIZE, 15 * IN_MILLISECONDS);
+                        events.ScheduleEvent(EVENT_CRYSTALIZE, 15s);
                         break;
                     case EVENT_MOTHERS_MILK:
                         DoCast(me, SPELL_MOTHERSMILK);
diff --git a/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockSpire/boss_overlord_wyrmthalak.cpp b/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockSpire/boss_overlord_wyrmthalak.cpp
index 81b83ba3a1c..4f211367df5 100644
--- a/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockSpire/boss_overlord_wyrmthalak.cpp
+++ b/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockSpire/boss_overlord_wyrmthalak.cpp
@@ -79,10 +79,10 @@ public:
         void JustEngagedWith(Unit* /*who*/) override
         {
             _JustEngagedWith();
-            events.ScheduleEvent(EVENT_BLAST_WAVE, 20 * IN_MILLISECONDS);
-            events.ScheduleEvent(EVENT_SHOUT,       2 * IN_MILLISECONDS);
-            events.ScheduleEvent(EVENT_CLEAVE,      6 * IN_MILLISECONDS);
-            events.ScheduleEvent(EVENT_KNOCK_AWAY, 12 * IN_MILLISECONDS);
+            events.ScheduleEvent(EVENT_BLAST_WAVE, 20s);
+            events.ScheduleEvent(EVENT_SHOUT, 2s);
+            events.ScheduleEvent(EVENT_CLEAVE, 6s);
+            events.ScheduleEvent(EVENT_KNOCK_AWAY, 12s);
         }
 
         void JustDied(Unit* /*killer*/) override
@@ -118,19 +118,19 @@ public:
                 {
                     case EVENT_BLAST_WAVE:
                         DoCastVictim(SPELL_BLASTWAVE);
-                        events.ScheduleEvent(EVENT_BLAST_WAVE, 20 * IN_MILLISECONDS);
+                        events.ScheduleEvent(EVENT_BLAST_WAVE, 20s);
                         break;
                     case EVENT_SHOUT:
                         DoCastVictim(SPELL_SHOUT);
-                        events.ScheduleEvent(EVENT_SHOUT, 10 * IN_MILLISECONDS);
+                        events.ScheduleEvent(EVENT_SHOUT, 10s);
                         break;
                     case EVENT_CLEAVE:
                         DoCastVictim(SPELL_CLEAVE);
-                        events.ScheduleEvent(EVENT_CLEAVE, 7 * IN_MILLISECONDS);
+                        events.ScheduleEvent(EVENT_CLEAVE, 7s);
                         break;
                     case EVENT_KNOCK_AWAY:
                         DoCastVictim(SPELL_KNOCKAWAY);
-                        events.ScheduleEvent(EVENT_KNOCK_AWAY, 14 * IN_MILLISECONDS);
+                        events.ScheduleEvent(EVENT_KNOCK_AWAY, 14s);
                         break;
                 }
 
diff --git a/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockSpire/boss_pyroguard_emberseer.cpp b/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockSpire/boss_pyroguard_emberseer.cpp
index cafbc0cebf9..8fcd81fc0c5 100644
--- a/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockSpire/boss_pyroguard_emberseer.cpp
+++ b/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockSpire/boss_pyroguard_emberseer.cpp
@@ -90,9 +90,9 @@ public:
             me->RemoveAura(SPELL_EMBERSEER_FULL_STRENGTH);
             me->RemoveAura(SPELL_EMBERSEER_GROWING);
             me->RemoveAura(SPELL_EMBERSEER_GROWING_TRIGGER);
-            events.ScheduleEvent(EVENT_RESPAWN, 5000);
+            events.ScheduleEvent(EVENT_RESPAWN, 5s);
             // Hack for missing trigger spell
-            events.ScheduleEvent(EVENT_FIRE_SHIELD, 3000);
+            events.ScheduleEvent(EVENT_FIRE_SHIELD, 3s);
 
             // Open doors on reset
             if (instance->GetBossState(DATA_PYROGAURD_EMBERSEER) == IN_PROGRESS)
@@ -104,7 +104,7 @@ public:
             switch (data)
             {
                 case 1:
-                    events.ScheduleEvent(EVENT_PLAYER_CHECK, 5000);
+                    events.ScheduleEvent(EVENT_PLAYER_CHECK, 5s);
                     break;
                 case 2:
                    // Close these two doors on Blackhand Incarcerators aggro
@@ -127,7 +127,7 @@ public:
         {
             // ### TODO Check combat timing ###
             events.ScheduleEvent(EVENT_FIRENOVA,    6000);
-            events.ScheduleEvent(EVENT_FLAMEBUFFET, 3000);
+            events.ScheduleEvent(EVENT_FLAMEBUFFET, 3s);
             events.ScheduleEvent(EVENT_PYROBLAST,  14000);
         }
 
@@ -163,7 +163,7 @@ public:
                     Talk(YELL_FREE_OF_BONDS);
                     me->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NOT_SELECTABLE);
                     me->SetImmuneToPC(false);
-                    events.ScheduleEvent(EVENT_ENTER_COMBAT, 2000);
+                    events.ScheduleEvent(EVENT_ENTER_COMBAT, 2s);
                 }
             }
         }
@@ -249,7 +249,7 @@ public:
                         case EVENT_FIRE_SHIELD:
                             // #### Spell isn't doing any damage ??? ####
                             DoCast(me, SPELL_FIRE_SHIELD);
-                            events.ScheduleEvent(EVENT_FIRE_SHIELD, 3000);
+                            events.ScheduleEvent(EVENT_FIRE_SHIELD, 3s);
                             break;
                         case EVENT_PLAYER_CHECK:
                         {
@@ -289,20 +289,20 @@ public:
                 {
                     case EVENT_FIRE_SHIELD:
                         DoCast(me, SPELL_FIRE_SHIELD);
-                        events.ScheduleEvent(EVENT_FIRE_SHIELD, 3000);
+                        events.ScheduleEvent(EVENT_FIRE_SHIELD, 3s);
                         break;
                     case EVENT_FIRENOVA:
                         DoCast(me, SPELL_FIRENOVA);
-                        events.ScheduleEvent(EVENT_FIRENOVA, 6000);
+                        events.ScheduleEvent(EVENT_FIRENOVA, 6s);
                         break;
                     case EVENT_FLAMEBUFFET:
                         DoCast(me, SPELL_FLAMEBUFFET);
-                        events.ScheduleEvent(EVENT_FLAMEBUFFET, 14000);
+                        events.ScheduleEvent(EVENT_FLAMEBUFFET, 14s);
                         break;
                     case EVENT_PYROBLAST:
                         if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0, 100, true))
                             DoCast(target, SPELL_PYROBLAST);
-                        events.ScheduleEvent(EVENT_PYROBLAST, 15000);
+                        events.ScheduleEvent(EVENT_PYROBLAST, 15s);
                         break;
                     default:
                         break;
@@ -365,7 +365,7 @@ public:
             }
 
             if (data == 1 && value == 2)
-                _events.ScheduleEvent(EVENT_ENCAGED_EMBERSEER, 1000);
+                _events.ScheduleEvent(EVENT_ENCAGED_EMBERSEER, 1s);
         }
 
         void JustEngagedWith(Unit* /*who*/) override
@@ -383,8 +383,8 @@ public:
                     DoZoneInCombat(creature);    // AI()->AttackStart(me->GetVictim());
             }
 
-            _events.ScheduleEvent(EVENT_STRIKE, urand(8000, 16000));
-            _events.ScheduleEvent(EVENT_ENCAGE, urand(10000, 20000));
+            _events.ScheduleEvent(EVENT_STRIKE, 8s, 16s);
+            _events.ScheduleEvent(EVENT_ENCAGE, 10s, 20s);
         }
 
         void UpdateAI(uint32 diff) override
@@ -421,11 +421,11 @@ public:
                 {
                     case EVENT_STRIKE:
                         DoCastVictim(SPELL_STRIKE, true);
-                        _events.ScheduleEvent(EVENT_STRIKE, urand(14000, 23000));
+                        _events.ScheduleEvent(EVENT_STRIKE, 14s, 23s);
                         break;
                     case EVENT_ENCAGE:
                         DoCast(SelectTarget(SELECT_TARGET_RANDOM, 0, 100, true), EVENT_ENCAGE, true);
-                        _events.ScheduleEvent(EVENT_ENCAGE, urand(6000, 12000));
+                        _events.ScheduleEvent(EVENT_ENCAGE, 6s, 12s);
                         break;
                     default:
                         break;
diff --git a/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockSpire/boss_quartermaster_zigris.cpp b/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockSpire/boss_quartermaster_zigris.cpp
index 23d17913c89..ddb84d0528b 100644
--- a/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockSpire/boss_quartermaster_zigris.cpp
+++ b/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockSpire/boss_quartermaster_zigris.cpp
@@ -50,8 +50,8 @@ public:
         void JustEngagedWith(Unit* /*who*/) override
         {
             _JustEngagedWith();
-            events.ScheduleEvent(EVENT_SHOOT,      1000);
-            events.ScheduleEvent(EVENT_STUN_BOMB, 16000);
+            events.ScheduleEvent(EVENT_SHOOT, 1s);
+            events.ScheduleEvent(EVENT_STUN_BOMB, 16s);
         }
 
         void JustDied(Unit* /*killer*/) override
@@ -75,11 +75,11 @@ public:
                 {
                     case EVENT_SHOOT:
                         DoCastVictim(SPELL_SHOOT);
-                        events.ScheduleEvent(EVENT_SHOOT, 500);
+                        events.ScheduleEvent(EVENT_SHOOT, 500ms);
                         break;
                     case EVENT_STUN_BOMB:
                         DoCastVictim(SPELL_STUNBOMB);
-                        events.ScheduleEvent(EVENT_STUN_BOMB, 14000);
+                        events.ScheduleEvent(EVENT_STUN_BOMB, 14s);
                         break;
                 }
 
diff --git a/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockSpire/boss_rend_blackhand.cpp b/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockSpire/boss_rend_blackhand.cpp
index 3e11df677f4..899b4379fc2 100644
--- a/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockSpire/boss_rend_blackhand.cpp
+++ b/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockSpire/boss_rend_blackhand.cpp
@@ -185,9 +185,9 @@ public:
         void JustEngagedWith(Unit* /*who*/) override
         {
             _JustEngagedWith();
-            events.ScheduleEvent(EVENT_WHIRLWIND,     urand(13000, 15000));
-            events.ScheduleEvent(EVENT_CLEAVE,        urand(15000, 17000));
-            events.ScheduleEvent(EVENT_MORTAL_STRIKE, urand(17000, 19000));
+            events.ScheduleEvent(EVENT_WHIRLWIND, 13s, 15s);
+            events.ScheduleEvent(EVENT_CLEAVE, 15s, 17s);
+            events.ScheduleEvent(EVENT_MORTAL_STRIKE, 17s, 19s);
         }
 
         void IsSummonedBy(Unit* /*summoner*/) override
@@ -266,7 +266,7 @@ public:
                             if (Creature* victor = ObjectAccessor::GetCreature(*me, victorGUID))
                                 victor->AI()->Talk(SAY_NEFARIUS_1);
                             events.ScheduleEvent(EVENT_WAVE_1, 2000);
-                            events.ScheduleEvent(EVENT_TURN_TO_REND, 4000);
+                            events.ScheduleEvent(EVENT_TURN_TO_REND, 4s);
                             events.ScheduleEvent(EVENT_WAVES_TEXT_1, 20000);
                             break;
                         case EVENT_TURN_TO_REND:
@@ -350,14 +350,14 @@ public:
                             if (Creature* victor = ObjectAccessor::GetCreature(*me, victorGUID))
                                 victor->AI()->Talk(SAY_NEFARIUS_7);
                             Talk(SAY_BLACKHAND_2);
-                            events.ScheduleEvent(EVENT_PATH_REND, 1000);
+                            events.ScheduleEvent(EVENT_PATH_REND, 1s);
                             events.ScheduleEvent(EVENT_WAVES_COMPLETE_TEXT_3, 4000);
                             break;
                         case EVENT_WAVES_COMPLETE_TEXT_3:
                             if (Creature* victor = ObjectAccessor::GetCreature(*me, victorGUID))
                                 victor->AI()->Talk(SAY_NEFARIUS_8);
-                            events.ScheduleEvent(EVENT_PATH_NEFARIUS, 1000);
-                            events.ScheduleEvent(EVENT_PATH_REND, 1000);
+                            events.ScheduleEvent(EVENT_PATH_NEFARIUS, 1s);
+                            events.ScheduleEvent(EVENT_PATH_REND, 1s);
                             break;
                         case EVENT_PATH_NEFARIUS:
                             if (Creature* victor = ObjectAccessor::GetCreature(*me, victorGUID))
@@ -429,15 +429,15 @@ public:
                 {
                     case EVENT_WHIRLWIND:
                         DoCast(SPELL_WHIRLWIND);
-                        events.ScheduleEvent(EVENT_WHIRLWIND, urand(13000, 18000));
+                        events.ScheduleEvent(EVENT_WHIRLWIND, 13s, 18s);
                         break;
                     case EVENT_CLEAVE:
                         DoCastVictim(SPELL_CLEAVE);
-                        events.ScheduleEvent(EVENT_CLEAVE, urand(10000, 14000));
+                        events.ScheduleEvent(EVENT_CLEAVE, 10s, 14s);
                         break;
                     case EVENT_MORTAL_STRIKE:
                         DoCastVictim(SPELL_MORTAL_STRIKE);
-                        events.ScheduleEvent(EVENT_MORTAL_STRIKE, urand(14000, 16000));
+                        events.ScheduleEvent(EVENT_MORTAL_STRIKE, 14s, 16s);
                         break;
                 }
 
diff --git a/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockSpire/boss_shadow_hunter_voshgajin.cpp b/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockSpire/boss_shadow_hunter_voshgajin.cpp
index 7b0b5e4a1d9..db1976a523b 100644
--- a/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockSpire/boss_shadow_hunter_voshgajin.cpp
+++ b/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockSpire/boss_shadow_hunter_voshgajin.cpp
@@ -57,9 +57,9 @@ public:
         void JustEngagedWith(Unit* /*who*/) override
         {
             _JustEngagedWith();
-            events.ScheduleEvent(EVENT_CURSE_OF_BLOOD, 2 * IN_MILLISECONDS);
+            events.ScheduleEvent(EVENT_CURSE_OF_BLOOD, 2s);
             events.ScheduleEvent(EVENT_HEX,     8 * IN_MILLISECONDS);
-            events.ScheduleEvent(EVENT_CLEAVE, 14 * IN_MILLISECONDS);
+            events.ScheduleEvent(EVENT_CLEAVE, 14s);
         }
 
         void JustDied(Unit* /*killer*/) override
@@ -83,16 +83,16 @@ public:
                 {
                     case EVENT_CURSE_OF_BLOOD:
                         DoCastVictim(SPELL_CURSEOFBLOOD);
-                        events.ScheduleEvent(EVENT_CURSE_OF_BLOOD, 45 * IN_MILLISECONDS);
+                        events.ScheduleEvent(EVENT_CURSE_OF_BLOOD, 45s);
                         break;
                     case EVENT_HEX:
                         if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0, 100, true))
                             DoCast(target, SPELL_HEX);
-                        events.ScheduleEvent(EVENT_HEX, 15 * IN_MILLISECONDS);
+                        events.ScheduleEvent(EVENT_HEX, 15s);
                         break;
                     case EVENT_CLEAVE:
                         DoCastVictim(SPELL_CLEAVE);
-                        events.ScheduleEvent(EVENT_CLEAVE, 7 * IN_MILLISECONDS);
+                        events.ScheduleEvent(EVENT_CLEAVE, 7s);
                         break;
                 }
 
diff --git a/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockSpire/boss_the_beast.cpp b/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockSpire/boss_the_beast.cpp
index c9f0921f516..5c7136ea8e4 100644
--- a/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockSpire/boss_the_beast.cpp
+++ b/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockSpire/boss_the_beast.cpp
@@ -149,12 +149,12 @@ struct boss_the_beast : public BossAI
     void JustEngagedWith(Unit* /*who*/) override
     {
         _JustEngagedWith();
-        events.ScheduleEvent(EVENT_FLAME_BREAK, Seconds(12));
-        events.ScheduleEvent(EVENT_IMMOLATE, Seconds(3));
-        events.ScheduleEvent(EVENT_TERRIFYING_ROAR, Seconds(23));
-        events.ScheduleEvent(EVENT_BERSERKER_CHARGE, Seconds(2));
-        events.ScheduleEvent(EVENT_FIREBALL, Seconds(8), Seconds(21));
-        events.ScheduleEvent(EVENT_FIREBLAST, Seconds(5), Seconds(8));
+        events.ScheduleEvent(EVENT_FLAME_BREAK, 12s);
+        events.ScheduleEvent(EVENT_IMMOLATE, 3s);
+        events.ScheduleEvent(EVENT_TERRIFYING_ROAR, 23s);
+        events.ScheduleEvent(EVENT_BERSERKER_CHARGE, 2s);
+        events.ScheduleEvent(EVENT_FIREBALL, 8s, 21s);
+        events.ScheduleEvent(EVENT_FIREBLAST, 5s, 8s);
     }
 
     void UpdateAI(uint32 diff) override
diff --git a/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockSpire/boss_urok_doomhowl.cpp b/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockSpire/boss_urok_doomhowl.cpp
index 799518a3955..3447c9386e3 100644
--- a/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockSpire/boss_urok_doomhowl.cpp
+++ b/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockSpire/boss_urok_doomhowl.cpp
@@ -56,8 +56,8 @@ public:
         void JustEngagedWith(Unit* /*who*/) override
         {
             _JustEngagedWith();
-            events.ScheduleEvent(SPELL_REND, urand(17000,20000));
-            events.ScheduleEvent(SPELL_STRIKE, urand(10000,12000));
+            events.ScheduleEvent(SPELL_REND, 17s, 20s);
+            events.ScheduleEvent(SPELL_STRIKE, 10s, 12s);
             Talk(SAY_AGGRO);
         }
 
@@ -82,11 +82,11 @@ public:
                 {
                     case SPELL_REND:
                         DoCastVictim(SPELL_REND);
-                        events.ScheduleEvent(SPELL_REND, urand(8000,10000));
+                        events.ScheduleEvent(SPELL_REND, 8s, 10s);
                         break;
                     case SPELL_STRIKE:
                         DoCastVictim(SPELL_STRIKE);
-                        events.ScheduleEvent(SPELL_STRIKE, urand(8000,10000));
+                        events.ScheduleEvent(SPELL_STRIKE, 8s, 10s);
                         break;
                     default:
                         break;
diff --git a/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockSpire/boss_warmaster_voone.cpp b/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockSpire/boss_warmaster_voone.cpp
index de759584eb5..bda6c5496dd 100644
--- a/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockSpire/boss_warmaster_voone.cpp
+++ b/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockSpire/boss_warmaster_voone.cpp
@@ -57,12 +57,12 @@ public:
         void JustEngagedWith(Unit* /*who*/) override
         {
             _JustEngagedWith();
-            events.ScheduleEvent(EVENT_SNAP_KICK, 8 * IN_MILLISECONDS);
+            events.ScheduleEvent(EVENT_SNAP_KICK, 8s);
             events.ScheduleEvent(EVENT_CLEAVE,   14 * IN_MILLISECONDS);
-            events.ScheduleEvent(EVENT_UPPERCUT, 20 * IN_MILLISECONDS);
-            events.ScheduleEvent(EVENT_MORTAL_STRIKE, 12 * IN_MILLISECONDS);
+            events.ScheduleEvent(EVENT_UPPERCUT, 20s);
+            events.ScheduleEvent(EVENT_MORTAL_STRIKE, 12s);
             events.ScheduleEvent(EVENT_PUMMEL,   32 * IN_MILLISECONDS);
-            events.ScheduleEvent(EVENT_THROW_AXE, 1 * IN_MILLISECONDS);
+            events.ScheduleEvent(EVENT_THROW_AXE, 1s);
         }
 
         void JustDied(Unit* /*killer*/) override
@@ -86,27 +86,27 @@ public:
                 {
                     case EVENT_SNAP_KICK:
                         DoCastVictim(SPELL_SNAPKICK);
-                        events.ScheduleEvent(EVENT_SNAP_KICK, 6 * IN_MILLISECONDS);
+                        events.ScheduleEvent(EVENT_SNAP_KICK, 6s);
                         break;
                     case EVENT_CLEAVE:
                         DoCastVictim(SPELL_CLEAVE);
-                        events.ScheduleEvent(EVENT_CLEAVE, 12 * IN_MILLISECONDS);
+                        events.ScheduleEvent(EVENT_CLEAVE, 12s);
                         break;
                     case EVENT_UPPERCUT:
                         DoCastVictim(SPELL_UPPERCUT);
-                        events.ScheduleEvent(EVENT_UPPERCUT, 14 * IN_MILLISECONDS);
+                        events.ScheduleEvent(EVENT_UPPERCUT, 14s);
                         break;
                     case EVENT_MORTAL_STRIKE:
                         DoCastVictim(SPELL_MORTALSTRIKE);
-                        events.ScheduleEvent(EVENT_MORTAL_STRIKE, 10 * IN_MILLISECONDS);
+                        events.ScheduleEvent(EVENT_MORTAL_STRIKE, 10s);
                         break;
                     case EVENT_PUMMEL:
                         DoCastVictim(SPELL_PUMMEL);
-                        events.ScheduleEvent(EVENT_MORTAL_STRIKE, 16 * IN_MILLISECONDS);
+                        events.ScheduleEvent(EVENT_MORTAL_STRIKE, 16s);
                         break;
                     case EVENT_THROW_AXE:
                         DoCastVictim(SPELL_THROWAXE);
-                        events.ScheduleEvent(EVENT_THROW_AXE, 8 * IN_MILLISECONDS);
+                        events.ScheduleEvent(EVENT_THROW_AXE, 8s);
                         break;
                 }
 
diff --git a/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockSpire/instance_blackrock_spire.cpp b/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockSpire/instance_blackrock_spire.cpp
index 5561643f525..1c1ef82814e 100644
--- a/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockSpire/instance_blackrock_spire.cpp
+++ b/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockSpire/instance_blackrock_spire.cpp
@@ -284,7 +284,7 @@ public:
                     if (data == AREATRIGGER_DRAGONSPIRE_HALL)
                     {
                         if (GetBossState(DATA_DRAGONSPIRE_ROOM) != DONE)
-                            Events.ScheduleEvent(EVENT_DARGONSPIRE_ROOM_STORE, 1000);
+                            Events.ScheduleEvent(EVENT_DARGONSPIRE_ROOM_STORE, 1s);
                     }
                     break;
                 default:
@@ -380,12 +380,12 @@ public:
                 {
                     case EVENT_DARGONSPIRE_ROOM_STORE:
                         Dragonspireroomstore();
-                        Events.ScheduleEvent(EVENT_DARGONSPIRE_ROOM_CHECK, 3000);
+                        Events.ScheduleEvent(EVENT_DARGONSPIRE_ROOM_CHECK, 3s);
                         break;
                     case EVENT_DARGONSPIRE_ROOM_CHECK:
                         Dragonspireroomcheck();
                         if ((GetBossState(DATA_DRAGONSPIRE_ROOM) != DONE))
-                            Events.ScheduleEvent(EVENT_DARGONSPIRE_ROOM_CHECK, 3000);
+                            Events.ScheduleEvent(EVENT_DARGONSPIRE_ROOM_CHECK, 3s);
                         break;
                     default:
                          break;
diff --git a/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackwingLair/boss_broodlord_lashlayer.cpp b/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackwingLair/boss_broodlord_lashlayer.cpp
index b6512a7a3b6..0553e748017 100644
--- a/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackwingLair/boss_broodlord_lashlayer.cpp
+++ b/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackwingLair/boss_broodlord_lashlayer.cpp
@@ -57,11 +57,11 @@ public:
             _JustEngagedWith();
             Talk(SAY_AGGRO);
 
-            events.ScheduleEvent(EVENT_CLEAVE, 8000);
-            events.ScheduleEvent(EVENT_BLASTWAVE, 12000);
-            events.ScheduleEvent(EVENT_MORTALSTRIKE, 20000);
-            events.ScheduleEvent(EVENT_KNOCKBACK, 30000);
-            events.ScheduleEvent(EVENT_CHECK, 1000);
+            events.ScheduleEvent(EVENT_CLEAVE, 8s);
+            events.ScheduleEvent(EVENT_BLASTWAVE, 12s);
+            events.ScheduleEvent(EVENT_MORTALSTRIKE, 20s);
+            events.ScheduleEvent(EVENT_KNOCKBACK, 30s);
+            events.ScheduleEvent(EVENT_CHECK, 1s);
         }
 
         void UpdateAI(uint32 diff) override
@@ -77,21 +77,21 @@ public:
                 {
                     case EVENT_CLEAVE:
                         DoCastVictim(SPELL_CLEAVE);
-                        events.ScheduleEvent(EVENT_CLEAVE, 7000);
+                        events.ScheduleEvent(EVENT_CLEAVE, 7s);
                         break;
                     case EVENT_BLASTWAVE:
                         DoCastVictim(SPELL_BLASTWAVE);
-                        events.ScheduleEvent(EVENT_BLASTWAVE, urand(8000, 16000));
+                        events.ScheduleEvent(EVENT_BLASTWAVE, 8s, 16s);
                         break;
                     case EVENT_MORTALSTRIKE:
                         DoCastVictim(SPELL_MORTALSTRIKE);
-                        events.ScheduleEvent(EVENT_MORTALSTRIKE, urand(25000, 35000));
+                        events.ScheduleEvent(EVENT_MORTALSTRIKE, 25s, 35s);
                         break;
                     case EVENT_KNOCKBACK:
                         DoCastVictim(SPELL_KNOCKBACK);
                         if (GetThreat(me->GetVictim()))
                             ModifyThreatByPercent(me->GetVictim(), -50);
-                        events.ScheduleEvent(EVENT_KNOCKBACK, urand(15000, 30000));
+                        events.ScheduleEvent(EVENT_KNOCKBACK, 15s, 30s);
                         break;
                     case EVENT_CHECK:
                         if (me->GetDistance(me->GetHomePosition()) > 150.0f)
@@ -99,7 +99,7 @@ public:
                             Talk(SAY_LEASH);
                             EnterEvadeMode(EVADE_REASON_BOUNDARY);
                         }
-                        events.ScheduleEvent(EVENT_CHECK, 1000);
+                        events.ScheduleEvent(EVENT_CHECK, 1s);
                         break;
                 }
             }
diff --git a/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackwingLair/boss_chromaggus.cpp b/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackwingLair/boss_chromaggus.cpp
index 758f90e20ca..2d5ff24296f 100644
--- a/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackwingLair/boss_chromaggus.cpp
+++ b/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackwingLair/boss_chromaggus.cpp
@@ -199,8 +199,8 @@ public:
             events.ScheduleEvent(EVENT_SHIMMER, 0);
             events.ScheduleEvent(EVENT_BREATH_1, 30000);
             events.ScheduleEvent(EVENT_BREATH_2, 60000);
-            events.ScheduleEvent(EVENT_AFFLICTION, 10000);
-            events.ScheduleEvent(EVENT_FRENZY, 15000);
+            events.ScheduleEvent(EVENT_AFFLICTION, 10s);
+            events.ScheduleEvent(EVENT_FRENZY, 15s);
         }
 
         void UpdateAI(uint32 diff) override
@@ -228,7 +228,7 @@ public:
                             DoCast(me, spell);
                             CurrentVurln_Spell = spell;
                             Talk(EMOTE_SHIMMER);
-                            events.ScheduleEvent(EVENT_SHIMMER, 45000);
+                            events.ScheduleEvent(EVENT_SHIMMER, 45s);
                             break;
                         }
                     case EVENT_BREATH_1:
@@ -260,11 +260,11 @@ public:
                                 }
                             }
                         }
-                        events.ScheduleEvent(EVENT_AFFLICTION, 10000);
+                        events.ScheduleEvent(EVENT_AFFLICTION, 10s);
                         break;
                     case EVENT_FRENZY:
                         DoCast(me, SPELL_FRENZY);
-                        events.ScheduleEvent(EVENT_FRENZY, urand(10000, 15000));
+                        events.ScheduleEvent(EVENT_FRENZY, 10s, 15s);
                         break;
                 }
 
diff --git a/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackwingLair/boss_ebonroc.cpp b/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackwingLair/boss_ebonroc.cpp
index cd1024c3fdf..987c10a1a7a 100644
--- a/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackwingLair/boss_ebonroc.cpp
+++ b/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackwingLair/boss_ebonroc.cpp
@@ -47,9 +47,9 @@ public:
         {
             _JustEngagedWith();
 
-            events.ScheduleEvent(EVENT_SHADOWFLAME, urand(10000, 20000));
-            events.ScheduleEvent(EVENT_WINGBUFFET, 30000);
-            events.ScheduleEvent(EVENT_SHADOWOFEBONROC, urand(8000, 10000));
+            events.ScheduleEvent(EVENT_SHADOWFLAME, 10s, 20s);
+            events.ScheduleEvent(EVENT_WINGBUFFET, 30s);
+            events.ScheduleEvent(EVENT_SHADOWOFEBONROC, 8s, 10s);
         }
 
         void UpdateAI(uint32 diff) override
@@ -68,15 +68,15 @@ public:
                 {
                     case EVENT_SHADOWFLAME:
                         DoCastVictim(SPELL_SHADOWFLAME);
-                        events.ScheduleEvent(EVENT_SHADOWFLAME, urand(10000, 20000));
+                        events.ScheduleEvent(EVENT_SHADOWFLAME, 10s, 20s);
                         break;
                     case EVENT_WINGBUFFET:
                         DoCastVictim(SPELL_WINGBUFFET);
-                        events.ScheduleEvent(EVENT_WINGBUFFET, 30000);
+                        events.ScheduleEvent(EVENT_WINGBUFFET, 30s);
                         break;
                     case EVENT_SHADOWOFEBONROC:
                         DoCastVictim(SPELL_SHADOWOFEBONROC);
-                        events.ScheduleEvent(EVENT_SHADOWOFEBONROC, urand(8000, 10000));
+                        events.ScheduleEvent(EVENT_SHADOWOFEBONROC, 8s, 10s);
                         break;
                 }
 
diff --git a/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackwingLair/boss_firemaw.cpp b/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackwingLair/boss_firemaw.cpp
index b721c9434f8..ea80e19a7c8 100644
--- a/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackwingLair/boss_firemaw.cpp
+++ b/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackwingLair/boss_firemaw.cpp
@@ -47,9 +47,9 @@ public:
         {
             _JustEngagedWith();
 
-            events.ScheduleEvent(EVENT_SHADOWFLAME, urand(10000, 20000));
-            events.ScheduleEvent(EVENT_WINGBUFFET, 30000);
-            events.ScheduleEvent(EVENT_FLAMEBUFFET, 5000);
+            events.ScheduleEvent(EVENT_SHADOWFLAME, 10s, 20s);
+            events.ScheduleEvent(EVENT_WINGBUFFET, 30s);
+            events.ScheduleEvent(EVENT_FLAMEBUFFET, 5s);
         }
 
         void UpdateAI(uint32 diff) override
@@ -68,17 +68,17 @@ public:
                 {
                     case EVENT_SHADOWFLAME:
                         DoCastVictim(SPELL_SHADOWFLAME);
-                        events.ScheduleEvent(EVENT_SHADOWFLAME, urand(10000, 20000));
+                        events.ScheduleEvent(EVENT_SHADOWFLAME, 10s, 20s);
                         break;
                     case EVENT_WINGBUFFET:
                         DoCastVictim(SPELL_WINGBUFFET);
                         if (GetThreat(me->GetVictim()))
                             ModifyThreatByPercent(me->GetVictim(), -75);
-                        events.ScheduleEvent(EVENT_WINGBUFFET, 30000);
+                        events.ScheduleEvent(EVENT_WINGBUFFET, 30s);
                         break;
                     case EVENT_FLAMEBUFFET:
                         DoCastVictim(SPELL_FLAMEBUFFET);
-                        events.ScheduleEvent(EVENT_FLAMEBUFFET, 5000);
+                        events.ScheduleEvent(EVENT_FLAMEBUFFET, 5s);
                         break;
                 }
 
diff --git a/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackwingLair/boss_flamegor.cpp b/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackwingLair/boss_flamegor.cpp
index e0b1c63f089..57daabc25ab 100644
--- a/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackwingLair/boss_flamegor.cpp
+++ b/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackwingLair/boss_flamegor.cpp
@@ -52,9 +52,9 @@ public:
         {
             _JustEngagedWith();
 
-            events.ScheduleEvent(EVENT_SHADOWFLAME, urand(10000, 20000));
-            events.ScheduleEvent(EVENT_WINGBUFFET, 30000);
-            events.ScheduleEvent(EVENT_FRENZY, 10000);
+            events.ScheduleEvent(EVENT_SHADOWFLAME, 10s, 20s);
+            events.ScheduleEvent(EVENT_WINGBUFFET, 30s);
+            events.ScheduleEvent(EVENT_FRENZY, 10s);
         }
 
         void UpdateAI(uint32 diff) override
@@ -73,18 +73,18 @@ public:
                 {
                     case EVENT_SHADOWFLAME:
                         DoCastVictim(SPELL_SHADOWFLAME);
-                        events.ScheduleEvent(EVENT_SHADOWFLAME, urand(10000, 20000));
+                        events.ScheduleEvent(EVENT_SHADOWFLAME, 10s, 20s);
                         break;
                     case EVENT_WINGBUFFET:
                         DoCastVictim(SPELL_WINGBUFFET);
                         if (GetThreat(me->GetVictim()))
                             ModifyThreatByPercent(me->GetVictim(), -75);
-                        events.ScheduleEvent(EVENT_WINGBUFFET, 30000);
+                        events.ScheduleEvent(EVENT_WINGBUFFET, 30s);
                         break;
                     case EVENT_FRENZY:
                         Talk(EMOTE_FRENZY);
                         DoCast(me, SPELL_FRENZY);
-                        events.ScheduleEvent(EVENT_FRENZY, urand(8000, 10000));
+                        events.ScheduleEvent(EVENT_FRENZY, 8s, 10s);
                         break;
                 }
 
diff --git a/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackwingLair/boss_nefarian.cpp b/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackwingLair/boss_nefarian.cpp
index c5629194054..654a14afc4b 100644
--- a/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackwingLair/boss_nefarian.cpp
+++ b/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackwingLair/boss_nefarian.cpp
@@ -215,10 +215,10 @@ public:
             me->SetStandState(UNIT_STAND_STATE_STAND);
             me->SetImmuneToPC(false);
             AttackStart(target);
-            events.ScheduleEvent(EVENT_SHADOW_BOLT, urand(3000, 10000));
-            events.ScheduleEvent(EVENT_FEAR, urand(10000, 20000));
-            //events.ScheduleEvent(EVENT_MIND_CONTROL, urand(30000, 35000));
-            events.ScheduleEvent(EVENT_SPAWN_ADD, 10000);
+            events.ScheduleEvent(EVENT_SHADOW_BOLT, 3s, 10s);
+            events.ScheduleEvent(EVENT_FEAR, 10s, 20s);
+            //events.ScheduleEvent(EVENT_MIND_CONTROL, 30s, 35s);
+            events.ScheduleEvent(EVENT_SPAWN_ADD, 10s);
         }
 
         void SummonedCreatureDies(Creature* summon, Unit* /*killer*/) override
@@ -322,17 +322,17 @@ public:
                                     break;
                             }
                             ResetThreatList();
-                            events.ScheduleEvent(EVENT_SHADOW_BOLT, urand(3000, 10000));
+                            events.ScheduleEvent(EVENT_SHADOW_BOLT, 3s, 10s);
                             break;
                         case EVENT_FEAR:
                             if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0, 40, true))
                                 DoCast(target, SPELL_FEAR);
-                            events.ScheduleEvent(EVENT_FEAR, urand(10000, 20000));
+                            events.ScheduleEvent(EVENT_FEAR, 10s, 20s);
                             break;
                         case EVENT_MIND_CONTROL:
                             if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0, 40, true))
                                 DoCast(target, SPELL_SHADOW_COMMAND);
-                            events.ScheduleEvent(EVENT_MIND_CONTROL, urand(30000, 35000));
+                            events.ScheduleEvent(EVENT_MIND_CONTROL, 30s, 35s);
                             break;
                         case EVENT_SPAWN_ADD:
                             for (uint8 i=0; i<2; ++i)
@@ -366,7 +366,7 @@ public:
                                     return;
                                 }
                             }
-                            events.ScheduleEvent(EVENT_SPAWN_ADD, 4000);
+                            events.ScheduleEvent(EVENT_SPAWN_ADD, 4s);
                             break;
                     }
 
@@ -428,12 +428,12 @@ public:
 
         void JustEngagedWith(Unit* /*who*/) override
         {
-            events.ScheduleEvent(EVENT_SHADOWFLAME, 12000);
-            events.ScheduleEvent(EVENT_FEAR, urand(25000, 35000));
-            events.ScheduleEvent(EVENT_VEILOFSHADOW, urand(25000, 35000));
-            events.ScheduleEvent(EVENT_CLEAVE, 7000);
-            //events.ScheduleEvent(EVENT_TAILLASH, 10000);
-            events.ScheduleEvent(EVENT_CLASSCALL, urand(30000, 35000));
+            events.ScheduleEvent(EVENT_SHADOWFLAME, 12s);
+            events.ScheduleEvent(EVENT_FEAR, 25s, 35s);
+            events.ScheduleEvent(EVENT_VEILOFSHADOW, 25s, 35s);
+            events.ScheduleEvent(EVENT_CLEAVE, 7s);
+            //events.ScheduleEvent(EVENT_TAILLASH, 10s);
+            events.ScheduleEvent(EVENT_CLASSCALL, 30s, 35s);
             Talk(SAY_RANDOM);
         }
 
@@ -494,24 +494,24 @@ public:
                 {
                     case EVENT_SHADOWFLAME:
                         DoCastVictim(SPELL_SHADOWFLAME);
-                        events.ScheduleEvent(EVENT_SHADOWFLAME, 12000);
+                        events.ScheduleEvent(EVENT_SHADOWFLAME, 12s);
                         break;
                     case EVENT_FEAR:
                         DoCastVictim(SPELL_BELLOWINGROAR);
-                        events.ScheduleEvent(EVENT_FEAR, urand(25000, 35000));
+                        events.ScheduleEvent(EVENT_FEAR, 25s, 35s);
                         break;
                     case EVENT_VEILOFSHADOW:
                         DoCastVictim(SPELL_VEILOFSHADOW);
-                        events.ScheduleEvent(EVENT_VEILOFSHADOW, urand(25000, 35000));
+                        events.ScheduleEvent(EVENT_VEILOFSHADOW, 25s, 35s);
                         break;
                     case EVENT_CLEAVE:
                         DoCastVictim(SPELL_CLEAVE);
-                        events.ScheduleEvent(EVENT_CLEAVE, 7000);
+                        events.ScheduleEvent(EVENT_CLEAVE, 7s);
                         break;
                     case EVENT_TAILLASH:
                         // Cast NYI since we need a better check for behind target
                         DoCastVictim(SPELL_TAILLASH);
-                        events.ScheduleEvent(EVENT_TAILLASH, 10000);
+                        events.ScheduleEvent(EVENT_TAILLASH, 10s);
                         break;
                     case EVENT_CLASSCALL:
                         if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0, 100.0f, true))
@@ -560,7 +560,7 @@ public:
                             default:
                                 break;
                         }
-                        events.ScheduleEvent(EVENT_CLASSCALL, urand(30000, 35000));
+                        events.ScheduleEvent(EVENT_CLASSCALL, 30s, 35s);
                         break;
                 }
 
diff --git a/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackwingLair/boss_razorgore.cpp b/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackwingLair/boss_razorgore.cpp
index c4cdce697ae..dee8bb5c645 100644
--- a/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackwingLair/boss_razorgore.cpp
+++ b/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackwingLair/boss_razorgore.cpp
@@ -100,10 +100,10 @@ public:
 
         void DoChangePhase()
         {
-            events.ScheduleEvent(EVENT_CLEAVE, 15000);
-            events.ScheduleEvent(EVENT_STOMP, 35000);
-            events.ScheduleEvent(EVENT_FIREBALL, 7000);
-            events.ScheduleEvent(EVENT_CONFLAGRATION, 12000);
+            events.ScheduleEvent(EVENT_CLEAVE, 15s);
+            events.ScheduleEvent(EVENT_STOMP, 35s);
+            events.ScheduleEvent(EVENT_FIREBALL, 7s);
+            events.ScheduleEvent(EVENT_CONFLAGRATION, 12s);
 
             secondPhase = true;
             me->RemoveAllAuras();
@@ -139,19 +139,19 @@ public:
                 {
                     case EVENT_CLEAVE:
                         DoCastVictim(SPELL_CLEAVE);
-                        events.ScheduleEvent(EVENT_CLEAVE, urand(7000, 10000));
+                        events.ScheduleEvent(EVENT_CLEAVE, 7s, 10s);
                         break;
                     case EVENT_STOMP:
                         DoCastVictim(SPELL_WARSTOMP);
-                        events.ScheduleEvent(EVENT_STOMP, urand(15000, 25000));
+                        events.ScheduleEvent(EVENT_STOMP, 15s, 25s);
                         break;
                     case EVENT_FIREBALL:
                         DoCastVictim(SPELL_FIREBALLVOLLEY);
-                        events.ScheduleEvent(EVENT_FIREBALL, urand(12000, 15000));
+                        events.ScheduleEvent(EVENT_FIREBALL, 12s, 15s);
                         break;
                     case EVENT_CONFLAGRATION:
                         DoCastVictim(SPELL_CONFLAGRATION);
-                        events.ScheduleEvent(EVENT_CONFLAGRATION, 30000);
+                        events.ScheduleEvent(EVENT_CONFLAGRATION, 30s);
                         break;
                 }
 
diff --git a/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackwingLair/boss_vaelastrasz.cpp b/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackwingLair/boss_vaelastrasz.cpp
index 61730d9815c..680f6927ba2 100644
--- a/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackwingLair/boss_vaelastrasz.cpp
+++ b/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackwingLair/boss_vaelastrasz.cpp
@@ -103,12 +103,12 @@ public:
             // now drop damage requirement to be able to take loot
             me->ResetPlayerDamageReq();
 
-            events.ScheduleEvent(EVENT_CLEAVE, 10000);
-            events.ScheduleEvent(EVENT_FLAMEBREATH, 15000);
-            events.ScheduleEvent(EVENT_FIRENOVA, 20000);
-            events.ScheduleEvent(EVENT_TAILSWIPE, 11000);
-            events.ScheduleEvent(EVENT_BURNINGADRENALINE_CASTER, 15000);
-            events.ScheduleEvent(EVENT_BURNINGADRENALINE_TANK, 45000);
+            events.ScheduleEvent(EVENT_CLEAVE, 10s);
+            events.ScheduleEvent(EVENT_FLAMEBREATH, 15s);
+            events.ScheduleEvent(EVENT_FIRENOVA, 20s);
+            events.ScheduleEvent(EVENT_TAILSWIPE, 11s);
+            events.ScheduleEvent(EVENT_BURNINGADRENALINE_CASTER, 15s);
+            events.ScheduleEvent(EVENT_BURNINGADRENALINE_TANK, 45s);
         }
 
         void BeginSpeech(Unit* target)
@@ -171,16 +171,16 @@ public:
                 switch (eventId)
                 {
                     case EVENT_CLEAVE:
-                        events.ScheduleEvent(EVENT_CLEAVE, 15000);
+                        events.ScheduleEvent(EVENT_CLEAVE, 15s);
                         DoCastVictim(SPELL_CLEAVE);
                         break;
                     case EVENT_FLAMEBREATH:
                         DoCastVictim(SPELL_FLAMEBREATH);
-                        events.ScheduleEvent(EVENT_FLAMEBREATH, urand(8000, 14000));
+                        events.ScheduleEvent(EVENT_FLAMEBREATH, 8s, 14s);
                         break;
                     case EVENT_FIRENOVA:
                         DoCastVictim(SPELL_FIRENOVA);
-                        events.ScheduleEvent(EVENT_FIRENOVA, 15000);
+                        events.ScheduleEvent(EVENT_FIRENOVA, 15s);
                         break;
                     case EVENT_TAILSWIPE:
                         //Only cast if we are behind
@@ -188,7 +188,7 @@ public:
                         {
                         DoCast(me->GetVictim(), SPELL_TAILSWIPE);
                         }*/
-                        events.ScheduleEvent(EVENT_TAILSWIPE, 15000);
+                        events.ScheduleEvent(EVENT_TAILSWIPE, 15s);
                         break;
                     case EVENT_BURNINGADRENALINE_CASTER:
                         {
@@ -200,12 +200,12 @@ public:
                             }
                         }
                         //reschedule the event
-                        events.ScheduleEvent(EVENT_BURNINGADRENALINE_CASTER, 15000);
+                        events.ScheduleEvent(EVENT_BURNINGADRENALINE_CASTER, 15s);
                         break;
                     case EVENT_BURNINGADRENALINE_TANK:
                         //Vael has to cast it himself; contrary to the previous commit's comment. Nothing happens otherwise.
                         me->CastSpell(me->GetVictim(), SPELL_BURNINGADRENALINE, true);
-                        events.ScheduleEvent(EVENT_BURNINGADRENALINE_TANK, 45000);
+                        events.ScheduleEvent(EVENT_BURNINGADRENALINE_TANK, 45s);
                         break;
                 }
 
diff --git a/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackwingLair/instance_blackwing_lair.cpp b/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackwingLair/instance_blackwing_lair.cpp
index 76b25640969..68cfe34cda3 100644
--- a/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackwingLair/instance_blackwing_lair.cpp
+++ b/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackwingLair/instance_blackwing_lair.cpp
@@ -195,7 +195,7 @@ public:
                 switch (data)
                 {
                     case IN_PROGRESS:
-                        _events.ScheduleEvent(EVENT_RAZOR_SPAWN, 45 * IN_MILLISECONDS);
+                        _events.ScheduleEvent(EVENT_RAZOR_SPAWN, 45s);
                         EggEvent = data;
                         EggCount = 0;
                         break;
@@ -213,7 +213,7 @@ public:
                                 razor->RemoveAurasDueToSpell(42013); // MindControl
                                 DoRemoveAurasDueToSpellOnPlayers(42013);
                             }
-                            _events.ScheduleEvent(EVENT_RAZOR_PHASE_TWO, 1 * IN_MILLISECONDS);
+                            _events.ScheduleEvent(EVENT_RAZOR_PHASE_TWO, 1s);
                             _events.CancelEvent(EVENT_RAZOR_SPAWN);
                         }
                         if (EggEvent == NOT_STARTED)
@@ -245,7 +245,7 @@ public:
                         for (uint8 i = urand(2, 5); i > 0; --i)
                             if (Creature* summon = instance->SummonCreature(Entry[urand(0, 4)], SummonPosition[urand(0, 7)]))
                                 summon->AI()->DoZoneInCombat();
-                        _events.ScheduleEvent(EVENT_RAZOR_SPAWN, urand(12, 17) * IN_MILLISECONDS);
+                        _events.ScheduleEvent(EVENT_RAZOR_SPAWN, 12s, 17s);
                         break;
                     case EVENT_RAZOR_PHASE_TWO:
                         _events.CancelEvent(EVENT_RAZOR_SPAWN);
diff --git a/src/server/scripts/EasternKingdoms/BlackrockMountain/MoltenCore/boss_baron_geddon.cpp b/src/server/scripts/EasternKingdoms/BlackrockMountain/MoltenCore/boss_baron_geddon.cpp
index 0461c7a188c..9ddafbf0088 100644
--- a/src/server/scripts/EasternKingdoms/BlackrockMountain/MoltenCore/boss_baron_geddon.cpp
+++ b/src/server/scripts/EasternKingdoms/BlackrockMountain/MoltenCore/boss_baron_geddon.cpp
@@ -65,9 +65,9 @@ class boss_baron_geddon : public CreatureScript
             void JustEngagedWith(Unit* victim) override
             {
                 BossAI::JustEngagedWith(victim);
-                events.ScheduleEvent(EVENT_INFERNO, 45000);
-                events.ScheduleEvent(EVENT_IGNITE_MANA, 30000);
-                events.ScheduleEvent(EVENT_LIVING_BOMB, 35000);
+                events.ScheduleEvent(EVENT_INFERNO, 45s);
+                events.ScheduleEvent(EVENT_IGNITE_MANA, 30s);
+                events.ScheduleEvent(EVENT_LIVING_BOMB, 35s);
             }
 
             void UpdateAI(uint32 diff) override
@@ -95,17 +95,17 @@ class boss_baron_geddon : public CreatureScript
                     {
                         case EVENT_INFERNO:
                             DoCast(me, SPELL_INFERNO);
-                            events.ScheduleEvent(EVENT_INFERNO, 45000);
+                            events.ScheduleEvent(EVENT_INFERNO, 45s);
                             break;
                         case EVENT_IGNITE_MANA:
                             if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0, 0.0f, true, true, -SPELL_IGNITE_MANA))
                                 DoCast(target, SPELL_IGNITE_MANA);
-                            events.ScheduleEvent(EVENT_IGNITE_MANA, 30000);
+                            events.ScheduleEvent(EVENT_IGNITE_MANA, 30s);
                             break;
                         case EVENT_LIVING_BOMB:
                             if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0, 0.0f, true))
                                 DoCast(target, SPELL_LIVING_BOMB);
-                            events.ScheduleEvent(EVENT_LIVING_BOMB, 35000);
+                            events.ScheduleEvent(EVENT_LIVING_BOMB, 35s);
                             break;
                         default:
                             break;
diff --git a/src/server/scripts/EasternKingdoms/BlackrockMountain/MoltenCore/boss_garr.cpp b/src/server/scripts/EasternKingdoms/BlackrockMountain/MoltenCore/boss_garr.cpp
index 59e9710f99b..8e1d37e0af2 100644
--- a/src/server/scripts/EasternKingdoms/BlackrockMountain/MoltenCore/boss_garr.cpp
+++ b/src/server/scripts/EasternKingdoms/BlackrockMountain/MoltenCore/boss_garr.cpp
@@ -60,8 +60,8 @@ class boss_garr : public CreatureScript
             void JustEngagedWith(Unit* victim) override
             {
                 BossAI::JustEngagedWith(victim);
-                events.ScheduleEvent(EVENT_ANTIMAGIC_PULSE, 25000);
-                events.ScheduleEvent(EVENT_MAGMA_SHACKLES, 15000);
+                events.ScheduleEvent(EVENT_ANTIMAGIC_PULSE, 25s);
+                events.ScheduleEvent(EVENT_MAGMA_SHACKLES, 15s);
             }
 
             void UpdateAI(uint32 diff) override
@@ -80,11 +80,11 @@ class boss_garr : public CreatureScript
                     {
                         case EVENT_ANTIMAGIC_PULSE:
                             DoCast(me, SPELL_ANTIMAGIC_PULSE);
-                            events.ScheduleEvent(EVENT_ANTIMAGIC_PULSE, urand(10000, 15000));
+                            events.ScheduleEvent(EVENT_ANTIMAGIC_PULSE, 10s, 15s);
                             break;
                         case EVENT_MAGMA_SHACKLES:
                             DoCast(me, SPELL_MAGMA_SHACKLES);
-                            events.ScheduleEvent(EVENT_MAGMA_SHACKLES, urand(8000, 12000));
+                            events.ScheduleEvent(EVENT_MAGMA_SHACKLES, 8s, 12s);
                             break;
                         default:
                             break;
diff --git a/src/server/scripts/EasternKingdoms/BlackrockMountain/MoltenCore/boss_gehennas.cpp b/src/server/scripts/EasternKingdoms/BlackrockMountain/MoltenCore/boss_gehennas.cpp
index 61857d518d7..7da36b01e95 100644
--- a/src/server/scripts/EasternKingdoms/BlackrockMountain/MoltenCore/boss_gehennas.cpp
+++ b/src/server/scripts/EasternKingdoms/BlackrockMountain/MoltenCore/boss_gehennas.cpp
@@ -56,9 +56,9 @@ class boss_gehennas : public CreatureScript
             void JustEngagedWith(Unit* victim) override
             {
                 BossAI::JustEngagedWith(victim);
-                events.ScheduleEvent(EVENT_GEHENNAS_CURSE, 12000);
-                events.ScheduleEvent(EVENT_RAIN_OF_FIRE, 10000);
-                events.ScheduleEvent(EVENT_SHADOW_BOLT, 6000);
+                events.ScheduleEvent(EVENT_GEHENNAS_CURSE, 12s);
+                events.ScheduleEvent(EVENT_RAIN_OF_FIRE, 10s);
+                events.ScheduleEvent(EVENT_SHADOW_BOLT, 6s);
             }
 
             void UpdateAI(uint32 diff) override
@@ -77,17 +77,17 @@ class boss_gehennas : public CreatureScript
                     {
                         case EVENT_GEHENNAS_CURSE:
                             DoCastVictim(SPELL_GEHENNAS_CURSE);
-                            events.ScheduleEvent(EVENT_GEHENNAS_CURSE, urand(22000, 30000));
+                            events.ScheduleEvent(EVENT_GEHENNAS_CURSE, 22s, 30s);
                             break;
                         case EVENT_RAIN_OF_FIRE:
                             if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0))
                                 DoCast(target, SPELL_RAIN_OF_FIRE);
-                            events.ScheduleEvent(EVENT_RAIN_OF_FIRE, urand(4000, 12000));
+                            events.ScheduleEvent(EVENT_RAIN_OF_FIRE, 4s, 12s);
                             break;
                         case EVENT_SHADOW_BOLT:
                             if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 1))
                                 DoCast(target, SPELL_SHADOW_BOLT);
-                            events.ScheduleEvent(EVENT_SHADOW_BOLT, 7000);
+                            events.ScheduleEvent(EVENT_SHADOW_BOLT, 7s);
                             break;
                         default:
                             break;
diff --git a/src/server/scripts/EasternKingdoms/BlackrockMountain/MoltenCore/boss_golemagg.cpp b/src/server/scripts/EasternKingdoms/BlackrockMountain/MoltenCore/boss_golemagg.cpp
index 4c12217a1de..36481d10a8d 100644
--- a/src/server/scripts/EasternKingdoms/BlackrockMountain/MoltenCore/boss_golemagg.cpp
+++ b/src/server/scripts/EasternKingdoms/BlackrockMountain/MoltenCore/boss_golemagg.cpp
@@ -74,7 +74,7 @@ class boss_golemagg : public CreatureScript
             void JustEngagedWith(Unit* victim) override
             {
                 BossAI::JustEngagedWith(victim);
-                events.ScheduleEvent(EVENT_PYROBLAST, 7000);
+                events.ScheduleEvent(EVENT_PYROBLAST, 7s);
             }
 
             void DamageTaken(Unit* /*attacker*/, uint32& /*damage*/) override
@@ -83,7 +83,7 @@ class boss_golemagg : public CreatureScript
                     return;
 
                 DoCast(me, SPELL_ENRAGE, true);
-                events.ScheduleEvent(EVENT_EARTHQUAKE, 3000);
+                events.ScheduleEvent(EVENT_EARTHQUAKE, 3s);
             }
 
             void UpdateAI(uint32 diff) override
@@ -103,11 +103,11 @@ class boss_golemagg : public CreatureScript
                         case EVENT_PYROBLAST:
                             if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0))
                                 DoCast(target, SPELL_PYROBLAST);
-                            events.ScheduleEvent(EVENT_PYROBLAST, 7000);
+                            events.ScheduleEvent(EVENT_PYROBLAST, 7s);
                             break;
                         case EVENT_EARTHQUAKE:
                             DoCastVictim(SPELL_EARTHQUAKE);
-                            events.ScheduleEvent(EVENT_EARTHQUAKE, 3000);
+                            events.ScheduleEvent(EVENT_EARTHQUAKE, 3s);
                             break;
                         default:
                             break;
diff --git a/src/server/scripts/EasternKingdoms/BlackrockMountain/MoltenCore/boss_lucifron.cpp b/src/server/scripts/EasternKingdoms/BlackrockMountain/MoltenCore/boss_lucifron.cpp
index ce4bed33f4c..1c891edbdc5 100644
--- a/src/server/scripts/EasternKingdoms/BlackrockMountain/MoltenCore/boss_lucifron.cpp
+++ b/src/server/scripts/EasternKingdoms/BlackrockMountain/MoltenCore/boss_lucifron.cpp
@@ -56,9 +56,9 @@ class boss_lucifron : public CreatureScript
             void JustEngagedWith(Unit* victim) override
             {
                 BossAI::JustEngagedWith(victim);
-                events.ScheduleEvent(EVENT_IMPENDING_DOOM, 10000);
-                events.ScheduleEvent(EVENT_LUCIFRON_CURSE, 20000);
-                events.ScheduleEvent(EVENT_SHADOW_SHOCK, 6000);
+                events.ScheduleEvent(EVENT_IMPENDING_DOOM, 10s);
+                events.ScheduleEvent(EVENT_LUCIFRON_CURSE, 20s);
+                events.ScheduleEvent(EVENT_SHADOW_SHOCK, 6s);
             }
 
             void UpdateAI(uint32 diff) override
@@ -77,15 +77,15 @@ class boss_lucifron : public CreatureScript
                     {
                         case EVENT_IMPENDING_DOOM:
                             DoCastVictim(SPELL_IMPENDING_DOOM);
-                            events.ScheduleEvent(EVENT_IMPENDING_DOOM, 20000);
+                            events.ScheduleEvent(EVENT_IMPENDING_DOOM, 20s);
                             break;
                         case EVENT_LUCIFRON_CURSE:
                             DoCastVictim(SPELL_LUCIFRON_CURSE);
-                            events.ScheduleEvent(EVENT_LUCIFRON_CURSE, 15000);
+                            events.ScheduleEvent(EVENT_LUCIFRON_CURSE, 15s);
                             break;
                         case EVENT_SHADOW_SHOCK:
                             DoCastVictim(SPELL_SHADOW_SHOCK);
-                            events.ScheduleEvent(EVENT_SHADOW_SHOCK, 6000);
+                            events.ScheduleEvent(EVENT_SHADOW_SHOCK, 6s);
                             break;
                         default:
                             break;
diff --git a/src/server/scripts/EasternKingdoms/BlackrockMountain/MoltenCore/boss_magmadar.cpp b/src/server/scripts/EasternKingdoms/BlackrockMountain/MoltenCore/boss_magmadar.cpp
index 27271d9dca6..522bae90f73 100644
--- a/src/server/scripts/EasternKingdoms/BlackrockMountain/MoltenCore/boss_magmadar.cpp
+++ b/src/server/scripts/EasternKingdoms/BlackrockMountain/MoltenCore/boss_magmadar.cpp
@@ -68,9 +68,9 @@ class boss_magmadar : public CreatureScript
             void JustEngagedWith(Unit* victim) override
             {
                 BossAI::JustEngagedWith(victim);
-                events.ScheduleEvent(EVENT_FRENZY, 30000);
-                events.ScheduleEvent(EVENT_PANIC, 20000);
-                events.ScheduleEvent(EVENT_LAVA_BOMB, 12000);
+                events.ScheduleEvent(EVENT_FRENZY, 30s);
+                events.ScheduleEvent(EVENT_PANIC, 20s);
+                events.ScheduleEvent(EVENT_LAVA_BOMB, 12s);
             }
 
             void UpdateAI(uint32 diff) override
@@ -90,16 +90,16 @@ class boss_magmadar : public CreatureScript
                         case EVENT_FRENZY:
                             Talk(EMOTE_FRENZY);
                             DoCast(me, SPELL_FRENZY);
-                            events.ScheduleEvent(EVENT_FRENZY, 15000);
+                            events.ScheduleEvent(EVENT_FRENZY, 15s);
                             break;
                         case EVENT_PANIC:
                             DoCastVictim(SPELL_PANIC);
-                            events.ScheduleEvent(EVENT_PANIC, 35000);
+                            events.ScheduleEvent(EVENT_PANIC, 35s);
                             break;
                         case EVENT_LAVA_BOMB:
                             if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0, 0.0f, true, true, -SPELL_LAVA_BOMB))
                                 DoCast(target, SPELL_LAVA_BOMB);
-                            events.ScheduleEvent(EVENT_LAVA_BOMB, 12000);
+                            events.ScheduleEvent(EVENT_LAVA_BOMB, 12s);
                             break;
                         default:
                             break;
diff --git a/src/server/scripts/EasternKingdoms/BlackrockMountain/MoltenCore/boss_majordomo_executus.cpp b/src/server/scripts/EasternKingdoms/BlackrockMountain/MoltenCore/boss_majordomo_executus.cpp
index ac481ecd11c..ee60435feef 100644
--- a/src/server/scripts/EasternKingdoms/BlackrockMountain/MoltenCore/boss_majordomo_executus.cpp
+++ b/src/server/scripts/EasternKingdoms/BlackrockMountain/MoltenCore/boss_majordomo_executus.cpp
@@ -93,10 +93,10 @@ class boss_majordomo : public CreatureScript
             {
                 BossAI::JustEngagedWith(who);
                 Talk(SAY_AGGRO);
-                events.ScheduleEvent(EVENT_MAGIC_REFLECTION, 30000);
-                events.ScheduleEvent(EVENT_DAMAGE_REFLECTION, 15000);
-                events.ScheduleEvent(EVENT_BLAST_WAVE, 10000);
-                events.ScheduleEvent(EVENT_TELEPORT, 20000);
+                events.ScheduleEvent(EVENT_MAGIC_REFLECTION, 30s);
+                events.ScheduleEvent(EVENT_DAMAGE_REFLECTION, 15s);
+                events.ScheduleEvent(EVENT_BLAST_WAVE, 10s);
+                events.ScheduleEvent(EVENT_TELEPORT, 20s);
             }
 
             void UpdateAI(uint32 diff) override
@@ -131,20 +131,20 @@ class boss_majordomo : public CreatureScript
                         {
                             case EVENT_MAGIC_REFLECTION:
                                 DoCast(me, SPELL_MAGIC_REFLECTION);
-                                events.ScheduleEvent(EVENT_MAGIC_REFLECTION, 30000);
+                                events.ScheduleEvent(EVENT_MAGIC_REFLECTION, 30s);
                                 break;
                             case EVENT_DAMAGE_REFLECTION:
                                 DoCast(me, SPELL_DAMAGE_REFLECTION);
-                                events.ScheduleEvent(EVENT_DAMAGE_REFLECTION, 30000);
+                                events.ScheduleEvent(EVENT_DAMAGE_REFLECTION, 30s);
                                 break;
                             case EVENT_BLAST_WAVE:
                                 DoCastVictim(SPELL_BLAST_WAVE);
-                                events.ScheduleEvent(EVENT_BLAST_WAVE, 10000);
+                                events.ScheduleEvent(EVENT_BLAST_WAVE, 10s);
                                 break;
                             case EVENT_TELEPORT:
                                 if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 1))
                                     DoCast(target, SPELL_TELEPORT);
-                                events.ScheduleEvent(EVENT_TELEPORT, 20000);
+                                events.ScheduleEvent(EVENT_TELEPORT, 20s);
                                 break;
                             default:
                                 break;
diff --git a/src/server/scripts/EasternKingdoms/BlackrockMountain/MoltenCore/boss_ragnaros.cpp b/src/server/scripts/EasternKingdoms/BlackrockMountain/MoltenCore/boss_ragnaros.cpp
index c779ae9db33..157501bc7d6 100644
--- a/src/server/scripts/EasternKingdoms/BlackrockMountain/MoltenCore/boss_ragnaros.cpp
+++ b/src/server/scripts/EasternKingdoms/BlackrockMountain/MoltenCore/boss_ragnaros.cpp
@@ -110,13 +110,13 @@ class boss_ragnaros : public CreatureScript
             void JustEngagedWith(Unit* victim) override
             {
                 BossAI::JustEngagedWith(victim);
-                events.ScheduleEvent(EVENT_ERUPTION, 15000);
-                events.ScheduleEvent(EVENT_WRATH_OF_RAGNAROS, 30000);
-                events.ScheduleEvent(EVENT_HAND_OF_RAGNAROS, 25000);
-                events.ScheduleEvent(EVENT_LAVA_BURST, 10000);
-                events.ScheduleEvent(EVENT_ELEMENTAL_FIRE, 3000);
-                events.ScheduleEvent(EVENT_MAGMA_BLAST, 2000);
-                events.ScheduleEvent(EVENT_SUBMERGE, 180000);
+                events.ScheduleEvent(EVENT_ERUPTION, 15s);
+                events.ScheduleEvent(EVENT_WRATH_OF_RAGNAROS, 30s);
+                events.ScheduleEvent(EVENT_HAND_OF_RAGNAROS, 25s);
+                events.ScheduleEvent(EVENT_LAVA_BURST, 10s);
+                events.ScheduleEvent(EVENT_ELEMENTAL_FIRE, 3s);
+                events.ScheduleEvent(EVENT_MAGMA_BLAST, 2s);
+                events.ScheduleEvent(EVENT_SUBMERGE, 3min);
             }
 
             void KilledUnit(Unit* /*victim*/) override
@@ -207,27 +207,27 @@ class boss_ragnaros : public CreatureScript
                         {
                             case EVENT_ERUPTION:
                                 DoCastVictim(SPELL_ERRUPTION);
-                                events.ScheduleEvent(EVENT_ERUPTION, urand(20000, 45000));
+                                events.ScheduleEvent(EVENT_ERUPTION, 20s, 45s);
                                 break;
                             case EVENT_WRATH_OF_RAGNAROS:
                                 DoCastVictim(SPELL_WRATH_OF_RAGNAROS);
                                 if (urand(0, 1))
                                     Talk(SAY_WRATH);
-                                events.ScheduleEvent(EVENT_WRATH_OF_RAGNAROS, 25000);
+                                events.ScheduleEvent(EVENT_WRATH_OF_RAGNAROS, 25s);
                                 break;
                             case EVENT_HAND_OF_RAGNAROS:
                                 DoCast(me, SPELL_HAND_OF_RAGNAROS);
                                 if (urand(0, 1))
                                     Talk(SAY_HAND);
-                                events.ScheduleEvent(EVENT_HAND_OF_RAGNAROS, 20000);
+                                events.ScheduleEvent(EVENT_HAND_OF_RAGNAROS, 20s);
                                 break;
                             case EVENT_LAVA_BURST:
                                 DoCastVictim(SPELL_LAVA_BURST);
-                                events.ScheduleEvent(EVENT_LAVA_BURST, 10000);
+                                events.ScheduleEvent(EVENT_LAVA_BURST, 10s);
                                 break;
                             case EVENT_ELEMENTAL_FIRE:
                                 DoCastVictim(SPELL_ELEMENTAL_FIRE);
-                                events.ScheduleEvent(EVENT_ELEMENTAL_FIRE, urand(10000, 14000));
+                                events.ScheduleEvent(EVENT_ELEMENTAL_FIRE, 10s, 14s);
                                 break;
                             case EVENT_MAGMA_BLAST:
                                 if (!me->IsWithinMeleeRange(me->GetVictim()))
@@ -240,7 +240,7 @@ class boss_ragnaros : public CreatureScript
                                         _hasYelledMagmaBurst = true;
                                     }
                                 }
-                                events.ScheduleEvent(EVENT_MAGMA_BLAST, 2500);
+                                events.ScheduleEvent(EVENT_MAGMA_BLAST, 2500ms);
                                 break;
                             case EVENT_SUBMERGE:
                             {
@@ -291,7 +291,7 @@ class boss_ragnaros : public CreatureScript
                                         _emergeTimer = 90000;
                                     }
                                 }
-                                events.ScheduleEvent(EVENT_SUBMERGE, 180000);
+                                events.ScheduleEvent(EVENT_SUBMERGE, 3min);
                                 break;
                             }
                             default:
diff --git a/src/server/scripts/EasternKingdoms/BlackrockMountain/MoltenCore/boss_shazzrah.cpp b/src/server/scripts/EasternKingdoms/BlackrockMountain/MoltenCore/boss_shazzrah.cpp
index 601b0e35b17..ca9d1740047 100644
--- a/src/server/scripts/EasternKingdoms/BlackrockMountain/MoltenCore/boss_shazzrah.cpp
+++ b/src/server/scripts/EasternKingdoms/BlackrockMountain/MoltenCore/boss_shazzrah.cpp
@@ -52,11 +52,11 @@ class boss_shazzrah : public CreatureScript
             void JustEngagedWith(Unit* target) override
             {
                 BossAI::JustEngagedWith(target);
-                events.ScheduleEvent(EVENT_ARCANE_EXPLOSION, 6000);
-                events.ScheduleEvent(EVENT_SHAZZRAH_CURSE, 10000);
-                events.ScheduleEvent(EVENT_MAGIC_GROUNDING, 24000);
-                events.ScheduleEvent(EVENT_COUNTERSPELL, 15000);
-                events.ScheduleEvent(EVENT_SHAZZRAH_GATE, 45000);
+                events.ScheduleEvent(EVENT_ARCANE_EXPLOSION, 6s);
+                events.ScheduleEvent(EVENT_SHAZZRAH_CURSE, 10s);
+                events.ScheduleEvent(EVENT_MAGIC_GROUNDING, 24s);
+                events.ScheduleEvent(EVENT_COUNTERSPELL, 15s);
+                events.ScheduleEvent(EVENT_SHAZZRAH_GATE, 45s);
             }
 
             void UpdateAI(uint32 diff) override
@@ -75,7 +75,7 @@ class boss_shazzrah : public CreatureScript
                     {
                         case EVENT_ARCANE_EXPLOSION:
                             DoCastVictim(SPELL_ARCANE_EXPLOSION);
-                            events.ScheduleEvent(EVENT_ARCANE_EXPLOSION, urand(4000, 7000));
+                            events.ScheduleEvent(EVENT_ARCANE_EXPLOSION, 4s, 7s);
                             break;
                         // Triggered subsequent to using "Gate of Shazzrah".
                         case EVENT_ARCANE_EXPLOSION_TRIGGERED:
@@ -84,22 +84,22 @@ class boss_shazzrah : public CreatureScript
                         case EVENT_SHAZZRAH_CURSE:
                             if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0, 0.0f, true, true, -SPELL_SHAZZRAH_CURSE))
                                 DoCast(target, SPELL_SHAZZRAH_CURSE);
-                            events.ScheduleEvent(EVENT_SHAZZRAH_CURSE, urand(25000, 30000));
+                            events.ScheduleEvent(EVENT_SHAZZRAH_CURSE, 25s, 30s);
                             break;
                         case EVENT_MAGIC_GROUNDING:
                             DoCast(me, SPELL_MAGIC_GROUNDING);
-                            events.ScheduleEvent(EVENT_MAGIC_GROUNDING, 35000);
+                            events.ScheduleEvent(EVENT_MAGIC_GROUNDING, 35s);
                             break;
                         case EVENT_COUNTERSPELL:
                             DoCastVictim(SPELL_COUNTERSPELL);
-                            events.ScheduleEvent(EVENT_COUNTERSPELL, urand(16000, 20000));
+                            events.ScheduleEvent(EVENT_COUNTERSPELL, 16s, 20s);
                             break;
                         case EVENT_SHAZZRAH_GATE:
                             ResetThreatList();
                             DoCastAOE(SPELL_SHAZZRAH_GATE_DUMMY);
-                            events.ScheduleEvent(EVENT_ARCANE_EXPLOSION_TRIGGERED, 2000);
-                            events.RescheduleEvent(EVENT_ARCANE_EXPLOSION, urand(3000, 6000));
-                            events.ScheduleEvent(EVENT_SHAZZRAH_GATE, 45000);
+                            events.ScheduleEvent(EVENT_ARCANE_EXPLOSION_TRIGGERED, 2s);
+                            events.RescheduleEvent(EVENT_ARCANE_EXPLOSION, 3s, 6s);
+                            events.ScheduleEvent(EVENT_SHAZZRAH_GATE, 45s);
                             break;
                         default:
                             break;
diff --git a/src/server/scripts/EasternKingdoms/BlackrockMountain/MoltenCore/boss_sulfuron_harbinger.cpp b/src/server/scripts/EasternKingdoms/BlackrockMountain/MoltenCore/boss_sulfuron_harbinger.cpp
index d358c0bd678..5c589935953 100644
--- a/src/server/scripts/EasternKingdoms/BlackrockMountain/MoltenCore/boss_sulfuron_harbinger.cpp
+++ b/src/server/scripts/EasternKingdoms/BlackrockMountain/MoltenCore/boss_sulfuron_harbinger.cpp
@@ -70,11 +70,11 @@ class boss_sulfuron : public CreatureScript
             void JustEngagedWith(Unit* victim) override
             {
                 BossAI::JustEngagedWith(victim);
-                events.ScheduleEvent(EVENT_DARK_STRIKE, 10000);
-                events.ScheduleEvent(EVENT_DEMORALIZING_SHOUT, 15000);
-                events.ScheduleEvent(EVENT_INSPIRE, 13000);
-                events.ScheduleEvent(EVENT_KNOCKDOWN, 6000);
-                events.ScheduleEvent(EVENT_FLAMESPEAR, 2000);
+                events.ScheduleEvent(EVENT_DARK_STRIKE, 10s);
+                events.ScheduleEvent(EVENT_DEMORALIZING_SHOUT, 15s);
+                events.ScheduleEvent(EVENT_INSPIRE, 13s);
+                events.ScheduleEvent(EVENT_KNOCKDOWN, 6s);
+                events.ScheduleEvent(EVENT_FLAMESPEAR, 2s);
             }
 
             void UpdateAI(uint32 diff) override
@@ -93,11 +93,11 @@ class boss_sulfuron : public CreatureScript
                     {
                         case EVENT_DARK_STRIKE:
                             DoCast(me, SPELL_DARK_STRIKE);
-                            events.ScheduleEvent(EVENT_DARK_STRIKE, urand(15000, 18000));
+                            events.ScheduleEvent(EVENT_DARK_STRIKE, 15s, 18s);
                             break;
                         case EVENT_DEMORALIZING_SHOUT:
                             DoCastVictim(SPELL_DEMORALIZING_SHOUT);
-                            events.ScheduleEvent(EVENT_DEMORALIZING_SHOUT, urand(15000, 20000));
+                            events.ScheduleEvent(EVENT_DEMORALIZING_SHOUT, 15s, 20s);
                             break;
                         case EVENT_INSPIRE:
                         {
@@ -106,17 +106,17 @@ class boss_sulfuron : public CreatureScript
                                 DoCast(Trinity::Containers::SelectRandomContainerElement(healers), SPELL_INSPIRE);
 
                             DoCast(me, SPELL_INSPIRE);
-                            events.ScheduleEvent(EVENT_INSPIRE, urand(20000, 26000));
+                            events.ScheduleEvent(EVENT_INSPIRE, 20s, 26s);
                             break;
                         }
                         case EVENT_KNOCKDOWN:
                             DoCastVictim(SPELL_KNOCKDOWN);
-                            events.ScheduleEvent(EVENT_KNOCKDOWN, urand(12000, 15000));
+                            events.ScheduleEvent(EVENT_KNOCKDOWN, 12s, 15s);
                             break;
                         case EVENT_FLAMESPEAR:
                             if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0, 0.0f, true))
                                 DoCast(target, SPELL_FLAMESPEAR);
-                            events.ScheduleEvent(EVENT_FLAMESPEAR, urand(12000, 16000));
+                            events.ScheduleEvent(EVENT_FLAMESPEAR, 12s, 16s);
                             break;
                         default:
                             break;
@@ -160,9 +160,9 @@ class npc_flamewaker_priest : public CreatureScript
             void JustEngagedWith(Unit* victim) override
             {
                 ScriptedAI::JustEngagedWith(victim);
-                events.ScheduleEvent(EVENT_HEAL, urand(15000, 30000));
-                events.ScheduleEvent(EVENT_SHADOW_WORD_PAIN, 2000);
-                events.ScheduleEvent(EVENT_IMMOLATE, 8000);
+                events.ScheduleEvent(EVENT_HEAL, 15s, 30s);
+                events.ScheduleEvent(EVENT_SHADOW_WORD_PAIN, 2s);
+                events.ScheduleEvent(EVENT_IMMOLATE, 8s);
             }
 
             void UpdateAI(uint32 diff) override
@@ -182,17 +182,17 @@ class npc_flamewaker_priest : public CreatureScript
                         case EVENT_HEAL:
                             if (Unit* target = DoSelectLowestHpFriendly(60.0f, 1))
                                 DoCast(target, SPELL_HEAL);
-                            events.ScheduleEvent(EVENT_HEAL, urand(15000, 20000));
+                            events.ScheduleEvent(EVENT_HEAL, 15s, 20s);
                             break;
                         case EVENT_SHADOW_WORD_PAIN:
                             if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0, 0.0f, true, true, -SPELL_SHADOWWORDPAIN))
                                 DoCast(target, SPELL_SHADOWWORDPAIN);
-                            events.ScheduleEvent(EVENT_SHADOW_WORD_PAIN, urand(18000, 26000));
+                            events.ScheduleEvent(EVENT_SHADOW_WORD_PAIN, 18s, 26s);
                             break;
                         case EVENT_IMMOLATE:
                             if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0, 0.0f, true, true, -SPELL_IMMOLATE))
                                 DoCast(target, SPELL_IMMOLATE);
-                            events.ScheduleEvent(EVENT_IMMOLATE, urand(15000, 25000));
+                            events.ScheduleEvent(EVENT_IMMOLATE, 15s, 25s);
                             break;
                         default:
                             break;
diff --git a/src/server/scripts/EasternKingdoms/Karazhan/boss_curator.cpp b/src/server/scripts/EasternKingdoms/Karazhan/boss_curator.cpp
index cfcc553fa7c..066385c81ef 100644
--- a/src/server/scripts/EasternKingdoms/Karazhan/boss_curator.cpp
+++ b/src/server/scripts/EasternKingdoms/Karazhan/boss_curator.cpp
@@ -82,9 +82,9 @@ public:
             _JustEngagedWith();
             Talk(SAY_AGGRO);
 
-            events.ScheduleEvent(EVENT_HATEFUL_BOLT, Seconds(12));
-            events.ScheduleEvent(EVENT_SUMMON_ASTRAL_FLARE, Seconds(10));
-            events.ScheduleEvent(EVENT_BERSERK, Minutes(12));
+            events.ScheduleEvent(EVENT_HATEFUL_BOLT, 12s);
+            events.ScheduleEvent(EVENT_SUMMON_ASTRAL_FLARE, 10s);
+            events.ScheduleEvent(EVENT_BERSERK, 12min);
         }
 
         void DamageTaken(Unit* /*attacker*/, uint32& /*damage*/) override
diff --git a/src/server/scripts/EasternKingdoms/Karazhan/boss_maiden_of_virtue.cpp b/src/server/scripts/EasternKingdoms/Karazhan/boss_maiden_of_virtue.cpp
index 42cf8079c41..b1d773df250 100644
--- a/src/server/scripts/EasternKingdoms/Karazhan/boss_maiden_of_virtue.cpp
+++ b/src/server/scripts/EasternKingdoms/Karazhan/boss_maiden_of_virtue.cpp
@@ -71,10 +71,10 @@ public:
             Talk(SAY_AGGRO);
 
             DoCastSelf(SPELL_HOLYGROUND, true);
-            events.ScheduleEvent(EVENT_REPENTANCE, Seconds(33), Seconds(45));
-            events.ScheduleEvent(EVENT_HOLYFIRE, Seconds(8));
-            events.ScheduleEvent(EVENT_HOLYWRATH, Seconds(15), Seconds(25));
-            events.ScheduleEvent(EVENT_ENRAGE, Minutes(10));
+            events.ScheduleEvent(EVENT_REPENTANCE, 33s, 45s);
+            events.ScheduleEvent(EVENT_HOLYFIRE, 8s);
+            events.ScheduleEvent(EVENT_HOLYWRATH, 15s, 25s);
+            events.ScheduleEvent(EVENT_ENRAGE, 10min);
         }
 
         void UpdateAI(uint32 diff) override
diff --git a/src/server/scripts/EasternKingdoms/Karazhan/boss_nightbane.cpp b/src/server/scripts/EasternKingdoms/Karazhan/boss_nightbane.cpp
index 23fba8cc3f5..61f25fbf907 100644
--- a/src/server/scripts/EasternKingdoms/Karazhan/boss_nightbane.cpp
+++ b/src/server/scripts/EasternKingdoms/Karazhan/boss_nightbane.cpp
@@ -215,18 +215,18 @@ public:
                         events.ScheduleEvent(EVENT_START_INTRO_PATH, Milliseconds(1));
                         break;
                     case POINT_INTRO_END:
-                        events.ScheduleEvent(EVENT_END_INTRO, Seconds(2));
+                        events.ScheduleEvent(EVENT_END_INTRO, 2s);
                         break;
                     case POINT_INTRO_LANDING:
                         me->SetDisableGravity(false);
                         me->HandleEmoteCommand(EMOTE_ONESHOT_LAND);
-                        events.ScheduleEvent(EVENT_INTRO_LANDING, Seconds(3));
+                        events.ScheduleEvent(EVENT_INTRO_LANDING, 3s);
                         break;
                     case POINT_PHASE_TWO_LANDING:
                         events.SetPhase(PHASE_GROUND);
                         me->SetDisableGravity(false);
                         me->HandleEmoteCommand(EMOTE_ONESHOT_LAND);
-                        events.ScheduleEvent(EVENT_LANDED, Seconds(3));
+                        events.ScheduleEvent(EVENT_LANDED, 3s);
                         break;
                     case POINT_PHASE_TWO_END:
                         events.ScheduleEvent(EVENT_END_PHASE_TWO, Milliseconds(1));
diff --git a/src/server/scripts/EasternKingdoms/Karazhan/boss_terestian_illhoof.cpp b/src/server/scripts/EasternKingdoms/Karazhan/boss_terestian_illhoof.cpp
index 586beb3e52b..c1a3cbbe1bf 100644
--- a/src/server/scripts/EasternKingdoms/Karazhan/boss_terestian_illhoof.cpp
+++ b/src/server/scripts/EasternKingdoms/Karazhan/boss_terestian_illhoof.cpp
@@ -78,12 +78,12 @@ public:
             summons.DoAction(ACTION_DESPAWN_IMPS, pred);
             _Reset();
 
-            events.ScheduleEvent(EVENT_SHADOWBOLT, Seconds(1));
-            events.ScheduleEvent(EVENT_SUMMON_KILREK, Seconds(3));
-            events.ScheduleEvent(EVENT_SACRIFICE, Seconds(30));
+            events.ScheduleEvent(EVENT_SHADOWBOLT, 1s);
+            events.ScheduleEvent(EVENT_SUMMON_KILREK, 3s);
+            events.ScheduleEvent(EVENT_SACRIFICE, 30s);
             events.ScheduleEvent(EVENT_SUMMON_PORTAL_1, Seconds(10));
             events.ScheduleEvent(EVENT_SUMMON_PORTAL_2, Seconds(11));
-            events.ScheduleEvent(EVENT_ENRAGE, Minutes(10));
+            events.ScheduleEvent(EVENT_ENRAGE, 10min);
         }
 
         void JustEngagedWith(Unit* /*who*/) override
@@ -95,7 +95,7 @@ public:
         void SpellHit(Unit* /*caster*/, SpellInfo const* spell) override
         {
             if (spell->Id == SPELL_BROKEN_PACT)
-                events.ScheduleEvent(EVENT_SUMMON_KILREK, Seconds(32));
+                events.ScheduleEvent(EVENT_SUMMON_KILREK, 32s);
         }
 
         void KilledUnit(Unit* victim) override
diff --git a/src/server/scripts/EasternKingdoms/MagistersTerrace/boss_selin_fireheart.cpp b/src/server/scripts/EasternKingdoms/MagistersTerrace/boss_selin_fireheart.cpp
index a8f9c0e94c4..64493786c11 100644
--- a/src/server/scripts/EasternKingdoms/MagistersTerrace/boss_selin_fireheart.cpp
+++ b/src/server/scripts/EasternKingdoms/MagistersTerrace/boss_selin_fireheart.cpp
@@ -94,7 +94,7 @@ class boss_selin_fireheart : public CreatureScript
                 {
                     case ACTION_SWITCH_PHASE:
                         events.SetPhase(PHASE_NORMAL);
-                        events.ScheduleEvent(EVENT_FEL_EXPLOSION, 2000, 0, PHASE_NORMAL);
+                        events.ScheduleEvent(EVENT_FEL_EXPLOSION, 2s, 0, PHASE_NORMAL);
                         AttackStart(me->GetVictim());
                         me->GetMotionMaster()->MoveChase(me->GetVictim());
                         break;
@@ -137,7 +137,7 @@ class boss_selin_fireheart : public CreatureScript
                 _JustEngagedWith();
 
                 events.SetPhase(PHASE_NORMAL);
-                events.ScheduleEvent(EVENT_FEL_EXPLOSION, 2100, 0, PHASE_NORMAL);
+                events.ScheduleEvent(EVENT_FEL_EXPLOSION, 2100ms, 0, PHASE_NORMAL);
              }
 
             void KilledUnit(Unit* victim) override
@@ -155,7 +155,7 @@ class boss_selin_fireheart : public CreatureScript
                     {
                         CrystalChosen->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NOT_SELECTABLE);
                         CrystalChosen->CastSpell(me, SPELL_MANA_RAGE, true);
-                        events.ScheduleEvent(EVENT_EMPOWER, 10000, PHASE_DRAIN);
+                        events.ScheduleEvent(EVENT_EMPOWER, 10s, PHASE_DRAIN);
                     }
                 }
             }
@@ -184,7 +184,7 @@ class boss_selin_fireheart : public CreatureScript
                     {
                         case EVENT_FEL_EXPLOSION:
                             DoCastAOE(SPELL_FEL_EXPLOSION);
-                            events.ScheduleEvent(EVENT_FEL_EXPLOSION, 2000, 0, PHASE_NORMAL);
+                            events.ScheduleEvent(EVENT_FEL_EXPLOSION, 2s, 0, PHASE_NORMAL);
                             break;
                         case EVENT_DRAIN_CRYSTAL:
                             SelectNearestCrystal();
@@ -193,12 +193,12 @@ class boss_selin_fireheart : public CreatureScript
                         case EVENT_DRAIN_MANA:
                             if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0, 45.0f, true))
                                 DoCast(target, SPELL_DRAIN_MANA);
-                            events.ScheduleEvent(EVENT_DRAIN_MANA, 10000, 0, PHASE_NORMAL);
+                            events.ScheduleEvent(EVENT_DRAIN_MANA, 10s, 0, PHASE_NORMAL);
                             break;
                         case EVENT_DRAIN_LIFE:
                             if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0, 20.0f, true))
                                 DoCast(target, SPELL_DRAIN_LIFE);
-                            events.ScheduleEvent(EVENT_DRAIN_LIFE, 10000, 0, PHASE_NORMAL);
+                            events.ScheduleEvent(EVENT_DRAIN_LIFE, 10s, 0, PHASE_NORMAL);
                             break;
                         case EVENT_EMPOWER:
                         {
diff --git a/src/server/scripts/EasternKingdoms/MagistersTerrace/boss_vexallus.cpp b/src/server/scripts/EasternKingdoms/MagistersTerrace/boss_vexallus.cpp
index 95c29ed6bf3..df2dbe776dd 100644
--- a/src/server/scripts/EasternKingdoms/MagistersTerrace/boss_vexallus.cpp
+++ b/src/server/scripts/EasternKingdoms/MagistersTerrace/boss_vexallus.cpp
@@ -88,8 +88,8 @@ class boss_vexallus : public CreatureScript
                 Talk(SAY_AGGRO);
                 _JustEngagedWith();
 
-                events.ScheduleEvent(EVENT_CHAIN_LIGHTNING, 8000);
-                events.ScheduleEvent(EVENT_ARCANE_SHOCK, 5000);
+                events.ScheduleEvent(EVENT_CHAIN_LIGHTNING, 8s);
+                events.ScheduleEvent(EVENT_ARCANE_SHOCK, 5s);
             }
 
             void JustSummoned(Creature* summoned) override
@@ -113,7 +113,7 @@ class boss_vexallus : public CreatureScript
                     {
                         _enraged = true;
                         events.Reset();
-                        events.ScheduleEvent(EVENT_OVERLOAD, 1200);
+                        events.ScheduleEvent(EVENT_OVERLOAD, 1200ms);
                         return;
                     }
                     else
@@ -149,16 +149,16 @@ class boss_vexallus : public CreatureScript
                         case EVENT_CHAIN_LIGHTNING:
                             if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0, 0.0f, true))
                                 DoCast(target, SPELL_CHAIN_LIGHTNING);
-                            events.ScheduleEvent(EVENT_CHAIN_LIGHTNING, 8000);
+                            events.ScheduleEvent(EVENT_CHAIN_LIGHTNING, 8s);
                             break;
                         case EVENT_ARCANE_SHOCK:
                             if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0, 20.0f, true))
                                 DoCast(target, SPELL_ARCANE_SHOCK);
-                            events.ScheduleEvent(EVENT_ARCANE_SHOCK, 8000);
+                            events.ScheduleEvent(EVENT_ARCANE_SHOCK, 8s);
                             break;
                         case EVENT_OVERLOAD:
                             DoCastVictim(SPELL_OVERLOAD);
-                            events.ScheduleEvent(EVENT_OVERLOAD, 2000);
+                            events.ScheduleEvent(EVENT_OVERLOAD, 2s);
                             break;
                         default:
                             break;
diff --git a/src/server/scripts/EasternKingdoms/MagistersTerrace/instance_magisters_terrace.cpp b/src/server/scripts/EasternKingdoms/MagistersTerrace/instance_magisters_terrace.cpp
index bd8635cd3f2..037ac5e4354 100644
--- a/src/server/scripts/EasternKingdoms/MagistersTerrace/instance_magisters_terrace.cpp
+++ b/src/server/scripts/EasternKingdoms/MagistersTerrace/instance_magisters_terrace.cpp
@@ -155,7 +155,7 @@ class instance_magisters_terrace : public InstanceMapScript
             {
                 if (eventId == EVENT_SPAWN_KALECGOS)
                     if (!instance->GetCreature(KalecgosGUID) && Events.Empty())
-                       Events.ScheduleEvent(EVENT_SPAWN_KALECGOS, Minutes(1));
+                       Events.ScheduleEvent(EVENT_SPAWN_KALECGOS, 1min);
             }
 
             void Update(uint32 diff) override
diff --git a/src/server/scripts/EasternKingdoms/MagistersTerrace/magisters_terrace.cpp b/src/server/scripts/EasternKingdoms/MagistersTerrace/magisters_terrace.cpp
index 9406b6ed41f..48181fbeea1 100644
--- a/src/server/scripts/EasternKingdoms/MagistersTerrace/magisters_terrace.cpp
+++ b/src/server/scripts/EasternKingdoms/MagistersTerrace/magisters_terrace.cpp
@@ -82,7 +82,7 @@ public:
                 me->HandleEmoteCommand(EMOTE_ONESHOT_LAND);
                 me->SetDisableGravity(false);
                 me->SetHover(false);
-                events.ScheduleEvent(EVENT_KALECGOS_LANDING, Seconds(2));
+                events.ScheduleEvent(EVENT_KALECGOS_LANDING, 2s);
             }
         }
 
@@ -95,7 +95,7 @@ public:
                 case EVENT_KALECGOS_LANDING:
                     DoCastAOE(SPELL_CAMERA_SHAKE);
                     me->SetObjectScale(0.6f);
-                    events.ScheduleEvent(EVENT_KALECGOS_TRANSFORM, Seconds(1));
+                    events.ScheduleEvent(EVENT_KALECGOS_TRANSFORM, 1s);
                     break;
                 case EVENT_KALECGOS_TRANSFORM:
                     DoCast(me, SPELL_ORB_KILL_CREDIT, true);
diff --git a/src/server/scripts/EasternKingdoms/ScarletEnclave/chapter1.cpp b/src/server/scripts/EasternKingdoms/ScarletEnclave/chapter1.cpp
index 33b490065fb..18f8b4a616a 100644
--- a/src/server/scripts/EasternKingdoms/ScarletEnclave/chapter1.cpp
+++ b/src/server/scripts/EasternKingdoms/ScarletEnclave/chapter1.cpp
@@ -137,10 +137,10 @@ public:
 
         void JustEngagedWith(Unit* /*who*/) override
         {
-            events.ScheduleEvent(EVENT_ICY_TOUCH, 1000, GCD_CAST);
-            events.ScheduleEvent(EVENT_PLAGUE_STRIKE, 3000, GCD_CAST);
-            events.ScheduleEvent(EVENT_BLOOD_STRIKE, 2000, GCD_CAST);
-            events.ScheduleEvent(EVENT_DEATH_COIL, 5000, GCD_CAST);
+            events.ScheduleEvent(EVENT_ICY_TOUCH, 1s, GCD_CAST);
+            events.ScheduleEvent(EVENT_PLAGUE_STRIKE, 3s, GCD_CAST);
+            events.ScheduleEvent(EVENT_BLOOD_STRIKE, 2s, GCD_CAST);
+            events.ScheduleEvent(EVENT_DEATH_COIL, 5s, GCD_CAST);
         }
 
         void MovementInform(uint32 type, uint32 id) override
@@ -258,22 +258,22 @@ public:
                     case EVENT_ICY_TOUCH:
                         DoCastVictim(SPELL_ICY_TOUCH);
                         events.DelayEvents(1000, GCD_CAST);
-                        events.ScheduleEvent(EVENT_ICY_TOUCH, 5000, GCD_CAST);
+                        events.ScheduleEvent(EVENT_ICY_TOUCH, 5s, GCD_CAST);
                         break;
                     case EVENT_PLAGUE_STRIKE:
                         DoCastVictim(SPELL_PLAGUE_STRIKE);
                         events.DelayEvents(1000, GCD_CAST);
-                        events.ScheduleEvent(EVENT_PLAGUE_STRIKE, 5000, GCD_CAST);
+                        events.ScheduleEvent(EVENT_PLAGUE_STRIKE, 5s, GCD_CAST);
                         break;
                     case EVENT_BLOOD_STRIKE:
                         DoCastVictim(SPELL_BLOOD_STRIKE);
                         events.DelayEvents(1000, GCD_CAST);
-                        events.ScheduleEvent(EVENT_BLOOD_STRIKE, 5000, GCD_CAST);
+                        events.ScheduleEvent(EVENT_BLOOD_STRIKE, 5s, GCD_CAST);
                         break;
                     case EVENT_DEATH_COIL:
                         DoCastVictim(SPELL_DEATH_COIL);
                         events.DelayEvents(1000, GCD_CAST);
-                        events.ScheduleEvent(EVENT_DEATH_COIL, 5000, GCD_CAST);
+                        events.ScheduleEvent(EVENT_DEATH_COIL, 5s, GCD_CAST);
                         break;
                     }
                 }
diff --git a/src/server/scripts/EasternKingdoms/ScarletMonastery/boss_arcanist_doan.cpp b/src/server/scripts/EasternKingdoms/ScarletMonastery/boss_arcanist_doan.cpp
index 62671996334..b9b3af69282 100644
--- a/src/server/scripts/EasternKingdoms/ScarletMonastery/boss_arcanist_doan.cpp
+++ b/src/server/scripts/EasternKingdoms/ScarletMonastery/boss_arcanist_doan.cpp
@@ -66,7 +66,7 @@ class boss_arcanist_doan : public CreatureScript
                 Talk(SAY_AGGRO);
 
                 events.ScheduleEvent(EVENT_SILENCE,         15 * IN_MILLISECONDS);
-                events.ScheduleEvent(EVENT_ARCANE_EXPLOSION, 3 * IN_MILLISECONDS);
+                events.ScheduleEvent(EVENT_ARCANE_EXPLOSION, 3s);
                 events.ScheduleEvent(EVENT_POLYMORPH,       30 * IN_MILLISECONDS);
             }
 
@@ -91,16 +91,16 @@ class boss_arcanist_doan : public CreatureScript
                     {
                         case EVENT_SILENCE:
                             DoCastVictim(SPELL_SILENCE);
-                            events.ScheduleEvent(EVENT_SILENCE, urand(15, 20) * IN_MILLISECONDS);
+                            events.ScheduleEvent(EVENT_SILENCE, 15s, 20s);
                             break;
                         case EVENT_ARCANE_EXPLOSION:
                             DoCastVictim(SPELL_ARCANE_EXPLOSION);
-                            events.ScheduleEvent(EVENT_SILENCE, 8 * IN_MILLISECONDS);
+                            events.ScheduleEvent(EVENT_SILENCE, 8s);
                             break;
                         case EVENT_POLYMORPH:
                             if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 1, 30.0f, true))
                                 DoCast(target, SPELL_POLYMORPH);
-                            events.ScheduleEvent(EVENT_POLYMORPH, 20 * IN_MILLISECONDS);
+                            events.ScheduleEvent(EVENT_POLYMORPH, 20s);
                             break;
                         default:
                             break;
diff --git a/src/server/scripts/EasternKingdoms/ScarletMonastery/boss_azshir_the_sleepless.cpp b/src/server/scripts/EasternKingdoms/ScarletMonastery/boss_azshir_the_sleepless.cpp
index 6d07ed32e9d..2768d6a840b 100644
--- a/src/server/scripts/EasternKingdoms/ScarletMonastery/boss_azshir_the_sleepless.cpp
+++ b/src/server/scripts/EasternKingdoms/ScarletMonastery/boss_azshir_the_sleepless.cpp
@@ -54,8 +54,8 @@ class boss_azshir_the_sleepless : public CreatureScript
             void JustEngagedWith(Unit* /*who*/) override
             {
                 _JustEngagedWith();
-                events.ScheduleEvent(EVENT_CALL_OF_GRAVE, 30000);
-                events.ScheduleEvent(EVENT_TERRIFY, 20000);
+                events.ScheduleEvent(EVENT_CALL_OF_GRAVE, 30s);
+                events.ScheduleEvent(EVENT_TERRIFY, 20s);
             }
 
             void JustDied(Unit* /*killer*/) override
@@ -68,7 +68,7 @@ class boss_azshir_the_sleepless : public CreatureScript
                 if (!_siphon && me->HealthBelowPctDamaged(50, damage))
                 {
                     DoCastVictim(SPELL_SOUL_SIPHON);
-                    events.ScheduleEvent(EVENT_SOUL_SIPHON, 20000);
+                    events.ScheduleEvent(EVENT_SOUL_SIPHON, 20s);
                     _siphon = true;
                 }
             }
@@ -89,15 +89,15 @@ class boss_azshir_the_sleepless : public CreatureScript
                     {
                         case EVENT_CALL_OF_GRAVE:
                             DoCastVictim(SPELL_CALL_OF_THE_GRAVE);
-                            events.ScheduleEvent(EVENT_CALL_OF_GRAVE, 30000);
+                            events.ScheduleEvent(EVENT_CALL_OF_GRAVE, 30s);
                             break;
                         case EVENT_TERRIFY:
                             DoCastVictim(SPELL_TERRIFY);
-                            events.ScheduleEvent(EVENT_TERRIFY, 20000);
+                            events.ScheduleEvent(EVENT_TERRIFY, 20s);
                             break;
                         case EVENT_SOUL_SIPHON:
                             DoCastVictim(SPELL_SOUL_SIPHON);
-                            events.ScheduleEvent(EVENT_SOUL_SIPHON, 20000);
+                            events.ScheduleEvent(EVENT_SOUL_SIPHON, 20s);
                             break;
                         default:
                             break;
diff --git a/src/server/scripts/EasternKingdoms/ScarletMonastery/boss_bloodmage_thalnos.cpp b/src/server/scripts/EasternKingdoms/ScarletMonastery/boss_bloodmage_thalnos.cpp
index 7afbcb78ec1..7dd6a179526 100644
--- a/src/server/scripts/EasternKingdoms/ScarletMonastery/boss_bloodmage_thalnos.cpp
+++ b/src/server/scripts/EasternKingdoms/ScarletMonastery/boss_bloodmage_thalnos.cpp
@@ -64,10 +64,10 @@ class boss_bloodmage_thalnos : public CreatureScript
             {
                 Talk(SAY_AGGRO);
                 _JustEngagedWith();
-                events.ScheduleEvent(EVENT_FLAME_SHOCK, 10000);
-                events.ScheduleEvent(EVENT_SHADOW_BOLT, 2000);
-                events.ScheduleEvent(EVENT_FLAME_SPIKE, 8000);
-                events.ScheduleEvent(EVENT_FIRE_NOVA, 40000);
+                events.ScheduleEvent(EVENT_FLAME_SHOCK, 10s);
+                events.ScheduleEvent(EVENT_SHADOW_BOLT, 2s);
+                events.ScheduleEvent(EVENT_FLAME_SPIKE, 8s);
+                events.ScheduleEvent(EVENT_FIRE_NOVA, 40s);
             }
 
             void JustDied(Unit* /*killer*/) override
@@ -95,19 +95,19 @@ class boss_bloodmage_thalnos : public CreatureScript
                 {
                     case EVENT_FLAME_SHOCK:
                         DoCastVictim(SPELL_FLAMESHOCK);
-                        events.ScheduleEvent(EVENT_FLAME_SHOCK, urand(10000, 15000));
+                        events.ScheduleEvent(EVENT_FLAME_SHOCK, 10s, 15s);
                         break;
                     case EVENT_SHADOW_BOLT:
                         DoCastVictim(SPELL_SHADOWBOLT);
-                        events.ScheduleEvent(EVENT_SHADOW_BOLT, 2000);
+                        events.ScheduleEvent(EVENT_SHADOW_BOLT, 2s);
                         break;
                     case EVENT_FLAME_SPIKE:
                         DoCastVictim(SPELL_FLAMESPIKE);
-                        events.ScheduleEvent(EVENT_FLAME_SPIKE, 30000);
+                        events.ScheduleEvent(EVENT_FLAME_SPIKE, 30s);
                         break;
                     case EVENT_FIRE_NOVA:
                         DoCastVictim(SPELL_FIRENOVA);
-                        events.ScheduleEvent(EVENT_FIRE_NOVA, 40000);
+                        events.ScheduleEvent(EVENT_FIRE_NOVA, 40s);
                         break;
                     default:
                         break;
diff --git a/src/server/scripts/EasternKingdoms/ScarletMonastery/boss_herod.cpp b/src/server/scripts/EasternKingdoms/ScarletMonastery/boss_herod.cpp
index 2b6ba94f664..5f535a1244e 100644
--- a/src/server/scripts/EasternKingdoms/ScarletMonastery/boss_herod.cpp
+++ b/src/server/scripts/EasternKingdoms/ScarletMonastery/boss_herod.cpp
@@ -83,8 +83,8 @@ class boss_herod : public CreatureScript
                 DoCast(me, SPELL_RUSHINGCHARGE);
                 _JustEngagedWith();
 
-                events.ScheduleEvent(EVENT_CLEAVE, 12000);
-                events.ScheduleEvent(EVENT_WHIRLWIND, 60000);
+                events.ScheduleEvent(EVENT_CLEAVE, 12s);
+                events.ScheduleEvent(EVENT_WHIRLWIND, 1min);
             }
 
             void KilledUnit(Unit* /*victim*/) override
@@ -117,12 +117,12 @@ class boss_herod : public CreatureScript
                 {
                     case EVENT_CLEAVE:
                         DoCastVictim(SPELL_CLEAVE);
-                        events.ScheduleEvent(EVENT_CLEAVE, 12000);
+                        events.ScheduleEvent(EVENT_CLEAVE, 12s);
                         break;
                     case EVENT_WHIRLWIND:
                         Talk(SAY_WHIRLWIND);
                         DoCastVictim(SPELL_WHIRLWIND);
-                        events.ScheduleEvent(EVENT_WHIRLWIND, 30000);
+                        events.ScheduleEvent(EVENT_WHIRLWIND, 30s);
                         break;
                     default:
                         break;
diff --git a/src/server/scripts/EasternKingdoms/ScarletMonastery/boss_houndmaster_loksey.cpp b/src/server/scripts/EasternKingdoms/ScarletMonastery/boss_houndmaster_loksey.cpp
index 4e7969f1ebb..0f5a24e2621 100644
--- a/src/server/scripts/EasternKingdoms/ScarletMonastery/boss_houndmaster_loksey.cpp
+++ b/src/server/scripts/EasternKingdoms/ScarletMonastery/boss_houndmaster_loksey.cpp
@@ -53,7 +53,7 @@ class boss_houndmaster_loksey : public CreatureScript
             {
                 Talk(SAY_AGGRO);
                 _JustEngagedWith();
-                events.ScheduleEvent(EVENT_BLOODLUST, 20000);
+                events.ScheduleEvent(EVENT_BLOODLUST, 20s);
             }
 
             void JustDied(Unit* /*killer*/) override
@@ -67,7 +67,7 @@ class boss_houndmaster_loksey : public CreatureScript
                 {
                     case EVENT_BLOODLUST:
                         DoCast(me, SPELL_BLOODLUST);
-                        events.ScheduleEvent(EVENT_BLOODLUST, 20000);
+                        events.ScheduleEvent(EVENT_BLOODLUST, 20s);
                         break;
                     default:
                         break;
diff --git a/src/server/scripts/EasternKingdoms/ScarletMonastery/boss_interrogator_vishas.cpp b/src/server/scripts/EasternKingdoms/ScarletMonastery/boss_interrogator_vishas.cpp
index f2e0bd38d2c..66aa049aa47 100644
--- a/src/server/scripts/EasternKingdoms/ScarletMonastery/boss_interrogator_vishas.cpp
+++ b/src/server/scripts/EasternKingdoms/ScarletMonastery/boss_interrogator_vishas.cpp
@@ -67,7 +67,7 @@ class boss_interrogator_vishas : public CreatureScript
             {
                 Talk(SAY_AGGRO);
                 _JustEngagedWith();
-                events.ScheduleEvent(EVENT_SHADOW_WORD_PAIN, 5000);
+                events.ScheduleEvent(EVENT_SHADOW_WORD_PAIN, 5s);
             }
 
             void KilledUnit(Unit* victim) override
@@ -104,7 +104,7 @@ class boss_interrogator_vishas : public CreatureScript
                 {
                     case EVENT_SHADOW_WORD_PAIN:
                         DoCastVictim(SPELL_SHADOW_WORD_PAIN);
-                        events.ScheduleEvent(EVENT_SHADOW_WORD_PAIN, urand(5000, 15000));
+                        events.ScheduleEvent(EVENT_SHADOW_WORD_PAIN, 5s, 15s);
                         break;
                     default:
                         break;
diff --git a/src/server/scripts/EasternKingdoms/ScarletMonastery/boss_scorn.cpp b/src/server/scripts/EasternKingdoms/ScarletMonastery/boss_scorn.cpp
index ef292a811c3..d3d7dda08f6 100644
--- a/src/server/scripts/EasternKingdoms/ScarletMonastery/boss_scorn.cpp
+++ b/src/server/scripts/EasternKingdoms/ScarletMonastery/boss_scorn.cpp
@@ -52,10 +52,10 @@ class boss_scorn : public CreatureScript
             void JustEngagedWith(Unit* /*who*/) override
             {
                 _JustEngagedWith();
-                events.ScheduleEvent(EVENT_LICH_SLAP, 45000);
-                events.ScheduleEvent(EVENT_FROSTBOLT_VOLLEY, 30000);
-                events.ScheduleEvent(EVENT_MIND_FLAY, 30000);
-                events.ScheduleEvent(EVENT_FROST_NOVA, 30000);
+                events.ScheduleEvent(EVENT_LICH_SLAP, 45s);
+                events.ScheduleEvent(EVENT_FROSTBOLT_VOLLEY, 30s);
+                events.ScheduleEvent(EVENT_MIND_FLAY, 30s);
+                events.ScheduleEvent(EVENT_FROST_NOVA, 30s);
             }
 
             void JustDied(Unit* /*killer*/) override
@@ -69,19 +69,19 @@ class boss_scorn : public CreatureScript
                 {
                     case EVENT_LICH_SLAP:
                         DoCastVictim(SPELL_LICHSLAP);
-                        events.ScheduleEvent(EVENT_LICH_SLAP, 45000);
+                        events.ScheduleEvent(EVENT_LICH_SLAP, 45s);
                         break;
                     case EVENT_FROSTBOLT_VOLLEY:
                         DoCastVictim(SPELL_FROSTBOLT_VOLLEY);
-                        events.ScheduleEvent(EVENT_FROSTBOLT_VOLLEY, 20000);
+                        events.ScheduleEvent(EVENT_FROSTBOLT_VOLLEY, 20s);
                         break;
                     case EVENT_MIND_FLAY:
                         DoCastVictim(SPELL_MINDFLAY);
-                        events.ScheduleEvent(EVENT_MIND_FLAY, 20000);
+                        events.ScheduleEvent(EVENT_MIND_FLAY, 20s);
                         break;
                     case EVENT_FROST_NOVA:
                         DoCastVictim(SPELL_FROSTNOVA);
-                        events.ScheduleEvent(EVENT_FROST_NOVA, 15000);
+                        events.ScheduleEvent(EVENT_FROST_NOVA, 15s);
                         break;
                     default:
                         break;
diff --git a/src/server/scripts/EasternKingdoms/Scholomance/boss_darkmaster_gandling.cpp b/src/server/scripts/EasternKingdoms/Scholomance/boss_darkmaster_gandling.cpp
index 805f113a9b0..da7ce55f362 100644
--- a/src/server/scripts/EasternKingdoms/Scholomance/boss_darkmaster_gandling.cpp
+++ b/src/server/scripts/EasternKingdoms/Scholomance/boss_darkmaster_gandling.cpp
@@ -79,10 +79,10 @@ class boss_darkmaster_gandling : public CreatureScript
             void JustEngagedWith(Unit* /*who*/) override
             {
                 _JustEngagedWith();
-                events.ScheduleEvent(EVENT_ARCANEMISSILES, 4500);
-                events.ScheduleEvent(EVENT_SHADOWSHIELD, 12000);
-                events.ScheduleEvent(EVENT_CURSE, 2000);
-                events.ScheduleEvent(EVENT_SHADOW_PORTAL, 16000);
+                events.ScheduleEvent(EVENT_ARCANEMISSILES, 4500ms);
+                events.ScheduleEvent(EVENT_SHADOWSHIELD, 12s);
+                events.ScheduleEvent(EVENT_CURSE, 2s);
+                events.ScheduleEvent(EVENT_SHADOW_PORTAL, 15s);
 
                 if (GameObject* gate = ObjectAccessor::GetGameObject(*me, instance->GetGuidData(GO_GATE_GANDLING)))
                     gate->SetGoState(GO_STATE_READY);
@@ -110,21 +110,21 @@ class boss_darkmaster_gandling : public CreatureScript
                     {
                         case EVENT_ARCANEMISSILES:
                             DoCastVictim(SPELL_ARCANEMISSILES, true);
-                            events.ScheduleEvent(EVENT_ARCANEMISSILES, 8000);
+                            events.ScheduleEvent(EVENT_ARCANEMISSILES, 8s);
                             break;
                         case EVENT_SHADOWSHIELD:
                             DoCast(me, SPELL_SHADOWSHIELD);
-                            events.ScheduleEvent(EVENT_SHADOWSHIELD, urand(14000, 28000));
+                            events.ScheduleEvent(EVENT_SHADOWSHIELD, 14s, 28s);
                             break;
                         case EVENT_CURSE:
                             DoCastVictim(SPELL_CURSE, true);
-                            events.ScheduleEvent(EVENT_CURSE, urand(15000, 27000));
+                            events.ScheduleEvent(EVENT_CURSE, 15s, 27s);
                             break;
                         case EVENT_SHADOW_PORTAL:
                             if (HealthAbovePct(3))
                             {
                                 DoCast(SelectTarget(SELECT_TARGET_RANDOM, 0, 100, true), SPELL_SHADOW_PORTAL, true);
-                                events.ScheduleEvent(EVENT_SHADOW_PORTAL, urand(17000, 27000));
+                                events.ScheduleEvent(EVENT_SHADOW_PORTAL, 17s, 27s);
                             }
                     }
 
diff --git a/src/server/scripts/EasternKingdoms/Scholomance/boss_doctor_theolen_krastinov.cpp b/src/server/scripts/EasternKingdoms/Scholomance/boss_doctor_theolen_krastinov.cpp
index 42d2af0ffa9..388ccb1de8d 100644
--- a/src/server/scripts/EasternKingdoms/Scholomance/boss_doctor_theolen_krastinov.cpp
+++ b/src/server/scripts/EasternKingdoms/Scholomance/boss_doctor_theolen_krastinov.cpp
@@ -56,9 +56,9 @@ class boss_doctor_theolen_krastinov : public CreatureScript
             void JustEngagedWith(Unit* /*who*/) override
             {
                 _JustEngagedWith();
-                events.ScheduleEvent(EVENT_REND, 8000);
-                events.ScheduleEvent(EVENT_BACKHAND, 9000);
-                events.ScheduleEvent(EVENT_FRENZY, 1000);
+                events.ScheduleEvent(EVENT_REND, 8s);
+                events.ScheduleEvent(EVENT_BACKHAND, 9s);
+                events.ScheduleEvent(EVENT_FRENZY, 1s);
             }
 
             void UpdateAI(uint32 diff) override
@@ -77,11 +77,11 @@ class boss_doctor_theolen_krastinov : public CreatureScript
                     {
                         case EVENT_REND:
                             DoCastVictim(SPELL_REND, true);
-                            events.ScheduleEvent(EVENT_REND, 10000);
+                            events.ScheduleEvent(EVENT_REND, 10s);
                             break;
                         case EVENT_BACKHAND:
                             DoCastVictim(SPELL_BACKHAND, true);
-                            events.ScheduleEvent(EVENT_BACKHAND, 10000);
+                            events.ScheduleEvent(EVENT_BACKHAND, 10s);
                             break;
                         case EVENT_FRENZY:
                             DoCast(me, SPELL_FRENZY, true);
diff --git a/src/server/scripts/EasternKingdoms/Scholomance/boss_illucia_barov.cpp b/src/server/scripts/EasternKingdoms/Scholomance/boss_illucia_barov.cpp
index 74cdc44bf0d..5962355ff41 100644
--- a/src/server/scripts/EasternKingdoms/Scholomance/boss_illucia_barov.cpp
+++ b/src/server/scripts/EasternKingdoms/Scholomance/boss_illucia_barov.cpp
@@ -54,10 +54,10 @@ class boss_illucia_barov : public CreatureScript
             void JustEngagedWith(Unit* /*who*/) override
             {
                 _JustEngagedWith();
-                events.ScheduleEvent(EVENT_CURSEOFAGONY, 18000);
-                events.ScheduleEvent(EVENT_SHADOWSHOCK, 9000);
-                events.ScheduleEvent(EVENT_SILENCE, 5000);
-                events.ScheduleEvent(EVENT_FEAR, 30000);
+                events.ScheduleEvent(EVENT_CURSEOFAGONY, 18s);
+                events.ScheduleEvent(EVENT_SHADOWSHOCK, 9s);
+                events.ScheduleEvent(EVENT_SILENCE, 5s);
+                events.ScheduleEvent(EVENT_FEAR, 30s);
             }
 
             void UpdateAI(uint32 diff) override
@@ -76,19 +76,19 @@ class boss_illucia_barov : public CreatureScript
                     {
                         case EVENT_CURSEOFAGONY:
                             DoCastVictim(SPELL_CURSEOFAGONY, true);
-                            events.ScheduleEvent(EVENT_CURSEOFAGONY, 30000);
+                            events.ScheduleEvent(EVENT_CURSEOFAGONY, 30s);
                             break;
                         case EVENT_SHADOWSHOCK:
                             DoCast(SelectTarget(SELECT_TARGET_RANDOM, 0, 100, true), SPELL_SHADOWSHOCK, true);
-                            events.ScheduleEvent(EVENT_SHADOWSHOCK, 12000);
+                            events.ScheduleEvent(EVENT_SHADOWSHOCK, 12s);
                             break;
                         case EVENT_SILENCE:
                             DoCastVictim(SPELL_SILENCE, true);
-                            events.ScheduleEvent(EVENT_SILENCE, 14000);
+                            events.ScheduleEvent(EVENT_SILENCE, 14s);
                             break;
                         case EVENT_FEAR:
                             DoCastVictim(SPELL_FEAR, true);
-                            events.ScheduleEvent(EVENT_FEAR, 30000);
+                            events.ScheduleEvent(EVENT_FEAR, 30s);
                             break;
                         default:
                             break;
diff --git a/src/server/scripts/EasternKingdoms/Scholomance/boss_instructor_malicia.cpp b/src/server/scripts/EasternKingdoms/Scholomance/boss_instructor_malicia.cpp
index 04a0ec1748e..b2f2373103d 100644
--- a/src/server/scripts/EasternKingdoms/Scholomance/boss_instructor_malicia.cpp
+++ b/src/server/scripts/EasternKingdoms/Scholomance/boss_instructor_malicia.cpp
@@ -73,11 +73,11 @@ class boss_instructor_malicia : public CreatureScript
             void JustEngagedWith(Unit* /*who*/) override
             {
                 _JustEngagedWith();
-                events.ScheduleEvent(EVENT_CALLOFGRAVES, 4000);
-                events.ScheduleEvent(EVENT_CORRUPTION, 8000);
-                events.ScheduleEvent(EVENT_RENEW, 32000);
-                events.ScheduleEvent(EVENT_FLASHHEAL, 38000);
-                events.ScheduleEvent(EVENT_HEALINGTOUCH, 45000);
+                events.ScheduleEvent(EVENT_CALLOFGRAVES, 4s);
+                events.ScheduleEvent(EVENT_CORRUPTION, 8s);
+                events.ScheduleEvent(EVENT_RENEW, 32s);
+                events.ScheduleEvent(EVENT_FLASHHEAL, 38s);
+                events.ScheduleEvent(EVENT_HEALINGTOUCH, 45s);
             }
 
             void UpdateAI(uint32 diff) override
@@ -96,28 +96,28 @@ class boss_instructor_malicia : public CreatureScript
                     {
                         case EVENT_CALLOFGRAVES:
                             DoCastVictim(SPELL_CALLOFGRAVES, true);
-                            events.ScheduleEvent(EVENT_CALLOFGRAVES, 65000);
+                            events.ScheduleEvent(EVENT_CALLOFGRAVES, 65s);
                             break;
                         case EVENT_CORRUPTION:
                             DoCast(SelectTarget(SELECT_TARGET_RANDOM, 0, 100, true), SPELL_CORRUPTION, true);
-                            events.ScheduleEvent(EVENT_CORRUPTION, 24000);
+                            events.ScheduleEvent(EVENT_CORRUPTION, 24s);
                             break;
                         case EVENT_RENEW:
                             DoCast(me, SPELL_RENEW);
-                            events.ScheduleEvent(EVENT_RENEW, 10000);
+                            events.ScheduleEvent(EVENT_RENEW, 10s);
                             break;
                         case EVENT_FLASHHEAL:
                             //5 Flashheals will be cast
                             DoCast(me, SPELL_FLASHHEAL);
                             if (FlashCounter < 2)
                             {
-                                events.ScheduleEvent(EVENT_FLASHHEAL, 5000);
+                                events.ScheduleEvent(EVENT_FLASHHEAL, 5s);
                                 ++FlashCounter;
                             }
                             else
                             {
                                 FlashCounter=0;
-                                events.ScheduleEvent(EVENT_FLASHHEAL, 30000);
+                                events.ScheduleEvent(EVENT_FLASHHEAL, 30s);
                             }
                             break;
                         case EVENT_HEALINGTOUCH:
@@ -125,13 +125,13 @@ class boss_instructor_malicia : public CreatureScript
                             DoCast(me, SPELL_HEALINGTOUCH);
                             if (TouchCounter < 2)
                             {
-                                events.ScheduleEvent(EVENT_HEALINGTOUCH, 5500);
+                                events.ScheduleEvent(EVENT_HEALINGTOUCH, 5500ms);
                                 ++TouchCounter;
                             }
                             else
                             {
                                 TouchCounter=0;
-                                events.ScheduleEvent(EVENT_HEALINGTOUCH, 30000);
+                                events.ScheduleEvent(EVENT_HEALINGTOUCH, 30s);
                             }
                             break;
                         default:
diff --git a/src/server/scripts/EasternKingdoms/Scholomance/boss_jandice_barov.cpp b/src/server/scripts/EasternKingdoms/Scholomance/boss_jandice_barov.cpp
index b869764b602..89a4213fc20 100644
--- a/src/server/scripts/EasternKingdoms/Scholomance/boss_jandice_barov.cpp
+++ b/src/server/scripts/EasternKingdoms/Scholomance/boss_jandice_barov.cpp
@@ -60,8 +60,8 @@ public:
 
         void JustEngagedWith(Unit* /*who*/) override
         {
-            events.ScheduleEvent(EVENT_CURSE_OF_BLOOD, 15000);
-            events.ScheduleEvent(EVENT_ILLUSION, 30000);
+            events.ScheduleEvent(EVENT_CURSE_OF_BLOOD, 15s);
+            events.ScheduleEvent(EVENT_ILLUSION, 30s);
         }
 
         void JustDied(Unit* /*killer*/) override
@@ -85,15 +85,15 @@ public:
                 {
                     case EVENT_CURSE_OF_BLOOD:
                         DoCastVictim(SPELL_CURSE_OF_BLOOD);
-                        events.ScheduleEvent(EVENT_CURSE_OF_BLOOD, 30000);
+                        events.ScheduleEvent(EVENT_CURSE_OF_BLOOD, 30s);
                         break;
                     case EVENT_ILLUSION:
                         DoCast(SPELL_ILLUSION);
                         me->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NOT_SELECTABLE);
                         me->SetDisplayId(11686);  // Invisible Model
                         ModifyThreatByPercent(me->GetVictim(), -99);
-                        events.ScheduleEvent(EVENT_SET_VISIBILITY, 3000);
-                        events.ScheduleEvent(EVENT_ILLUSION, 25000);
+                        events.ScheduleEvent(EVENT_SET_VISIBILITY, 3s);
+                        events.ScheduleEvent(EVENT_ILLUSION, 25s);
                         break;
                     case EVENT_SET_VISIBILITY:
                         me->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NOT_SELECTABLE);
diff --git a/src/server/scripts/EasternKingdoms/Scholomance/boss_kirtonos_the_herald.cpp b/src/server/scripts/EasternKingdoms/Scholomance/boss_kirtonos_the_herald.cpp
index 42c19ca65f3..c4cb3ab29d3 100644
--- a/src/server/scripts/EasternKingdoms/Scholomance/boss_kirtonos_the_herald.cpp
+++ b/src/server/scripts/EasternKingdoms/Scholomance/boss_kirtonos_the_herald.cpp
@@ -89,14 +89,14 @@ class boss_kirtonos_the_herald : public CreatureScript
 
             void JustEngagedWith(Unit* /*who*/) override
             {
-                events.ScheduleEvent(EVENT_SWOOP, urand(8000, 8000));
-                events.ScheduleEvent(EVENT_WING_FLAP, urand(15000, 15000));
-                events.ScheduleEvent(EVENT_PIERCE_ARMOR, urand(18000, 18000));
-                events.ScheduleEvent(EVENT_DISARM, urand(22000, 22000));
-                events.ScheduleEvent(EVENT_SHADOW_BOLT, urand(42000, 42000));
-                events.ScheduleEvent(EVENT_CURSE_OF_TONGUES, urand(53000, 53000));
-                events.ScheduleEvent(EVENT_DOMINATE_MIND, urand(34000, 48000));
-                events.ScheduleEvent(EVENT_KIRTONOS_TRANSFORM, urand(20000, 20000));
+                events.ScheduleEvent(EVENT_SWOOP, 8s, 8s);
+                events.ScheduleEvent(EVENT_WING_FLAP, 15s, 15s);
+                events.ScheduleEvent(EVENT_PIERCE_ARMOR, 18s, 18s);
+                events.ScheduleEvent(EVENT_DISARM, 22s, 22s);
+                events.ScheduleEvent(EVENT_SHADOW_BOLT, 42s, 42s);
+                events.ScheduleEvent(EVENT_CURSE_OF_TONGUES, 53s, 53s);
+                events.ScheduleEvent(EVENT_DOMINATE_MIND, 34s, 48s);
+                events.ScheduleEvent(EVENT_KIRTONOS_TRANSFORM, 20s, 20s);
                 _JustEngagedWith();
             }
 
@@ -203,31 +203,31 @@ class boss_kirtonos_the_herald : public CreatureScript
                     {
                         case EVENT_SWOOP:
                             DoCast(me, SPELL_SWOOP);
-                            events.ScheduleEvent(EVENT_SWOOP, 15000);
+                            events.ScheduleEvent(EVENT_SWOOP, 15s);
                             break;
                         case EVENT_WING_FLAP:
                             DoCast(me, SPELL_WING_FLAP);
-                            events.ScheduleEvent(EVENT_WING_FLAP, 13000);
+                            events.ScheduleEvent(EVENT_WING_FLAP, 13s);
                             break;
                         case EVENT_PIERCE_ARMOR:
                             DoCastVictim(SPELL_PIERCE_ARMOR, true);
-                            events.ScheduleEvent(EVENT_PIERCE_ARMOR, 12000);
+                            events.ScheduleEvent(EVENT_PIERCE_ARMOR, 12s);
                             break;
                         case EVENT_DISARM:
                             DoCastVictim(SPELL_DISARM, true);
-                            events.ScheduleEvent(EVENT_DISARM, 11000);
+                            events.ScheduleEvent(EVENT_DISARM, 11s);
                             break;
                         case EVENT_SHADOW_BOLT:
                             DoCastVictim(SPELL_SHADOW_BOLT, true);
-                            events.ScheduleEvent(EVENT_SHADOW_BOLT, 42000);
+                            events.ScheduleEvent(EVENT_SHADOW_BOLT, 42s);
                             break;
                         case EVENT_CURSE_OF_TONGUES:
                             DoCastVictim(SPELL_CURSE_OF_TONGUES, true);
-                            events.ScheduleEvent(EVENT_CURSE_OF_TONGUES, 35000);
+                            events.ScheduleEvent(EVENT_CURSE_OF_TONGUES, 35s);
                             break;
                         case EVENT_DOMINATE_MIND:
                             DoCastVictim(SPELL_DOMINATE_MIND, true);
-                            events.ScheduleEvent(EVENT_DOMINATE_MIND, urand(44000, 48000));
+                            events.ScheduleEvent(EVENT_DOMINATE_MIND, 44s, 48s);
                             break;
                         case EVENT_KIRTONOS_TRANSFORM:
                             if (me->HasAura(SPELL_KIRTONOS_TRANSFORM))
@@ -242,7 +242,7 @@ class boss_kirtonos_the_herald : public CreatureScript
                                 me->SetUInt32Value(UNIT_VIRTUAL_ITEM_SLOT_ID + 0, uint32(WEAPON_KIRTONOS_STAFF));
                                 me->SetCanFly(true);
                             }
-                            events.ScheduleEvent(EVENT_KIRTONOS_TRANSFORM, urand(16000, 18000));
+                            events.ScheduleEvent(EVENT_KIRTONOS_TRANSFORM, 16s, 18s);
                             break;
                         default:
                             break;
diff --git a/src/server/scripts/EasternKingdoms/Scholomance/boss_kormok.cpp b/src/server/scripts/EasternKingdoms/Scholomance/boss_kormok.cpp
index 7e915e7545b..3d008083fa3 100644
--- a/src/server/scripts/EasternKingdoms/Scholomance/boss_kormok.cpp
+++ b/src/server/scripts/EasternKingdoms/Scholomance/boss_kormok.cpp
@@ -67,8 +67,8 @@ public:
 
         void JustEngagedWith(Unit* /*who*/) override
         {
-            events.ScheduleEvent(EVENT_SHADOWBOLT_VOLLEY, 10000);
-            events.ScheduleEvent(EVENT_BONE_SHIELD, 2000);
+            events.ScheduleEvent(EVENT_SHADOWBOLT_VOLLEY, 10s);
+            events.ScheduleEvent(EVENT_BONE_SHIELD, 2s);
             events.ScheduleEvent(EVENT_SUMMON_MINIONS, 15000);
         }
 
@@ -110,7 +110,7 @@ public:
                         break;
                     case EVENT_SUMMON_MINIONS:
                         DoCast(SPELL_SUMMON_BONE_MINIONS);
-                        events.ScheduleEvent(EVENT_SUMMON_MINIONS, 12000);
+                        events.ScheduleEvent(EVENT_SUMMON_MINIONS, 12s);
                         break;
                     default:
                         break;
diff --git a/src/server/scripts/EasternKingdoms/Scholomance/boss_lord_alexei_barov.cpp b/src/server/scripts/EasternKingdoms/Scholomance/boss_lord_alexei_barov.cpp
index cf13c5ab77d..f180d09db89 100644
--- a/src/server/scripts/EasternKingdoms/Scholomance/boss_lord_alexei_barov.cpp
+++ b/src/server/scripts/EasternKingdoms/Scholomance/boss_lord_alexei_barov.cpp
@@ -58,8 +58,8 @@ class boss_lord_alexei_barov : public CreatureScript
             void JustEngagedWith(Unit* /*who*/) override
             {
                 _JustEngagedWith();
-                events.ScheduleEvent(EVENT_IMMOLATE, 7000);
-                events.ScheduleEvent(EVENT_VEILOFSHADOW, 15000);
+                events.ScheduleEvent(EVENT_IMMOLATE, 7s);
+                events.ScheduleEvent(EVENT_VEILOFSHADOW, 15s);
             }
 
             void UpdateAI(uint32 diff) override
@@ -78,11 +78,11 @@ class boss_lord_alexei_barov : public CreatureScript
                     {
                         case EVENT_IMMOLATE:
                             DoCast(SelectTarget(SELECT_TARGET_RANDOM, 0, 100, true), SPELL_IMMOLATE, true);
-                            events.ScheduleEvent(EVENT_IMMOLATE, 12000);
+                            events.ScheduleEvent(EVENT_IMMOLATE, 12s);
                             break;
                         case EVENT_VEILOFSHADOW:
                             DoCastVictim(SPELL_VEILOFSHADOW, true);
-                            events.ScheduleEvent(EVENT_VEILOFSHADOW, 20000);
+                            events.ScheduleEvent(EVENT_VEILOFSHADOW, 20s);
                             break;
                         default:
                             break;
diff --git a/src/server/scripts/EasternKingdoms/Scholomance/boss_lorekeeper_polkelt.cpp b/src/server/scripts/EasternKingdoms/Scholomance/boss_lorekeeper_polkelt.cpp
index a234db44497..860137bd836 100644
--- a/src/server/scripts/EasternKingdoms/Scholomance/boss_lorekeeper_polkelt.cpp
+++ b/src/server/scripts/EasternKingdoms/Scholomance/boss_lorekeeper_polkelt.cpp
@@ -53,10 +53,10 @@ class boss_lorekeeper_polkelt : public CreatureScript
             void JustEngagedWith(Unit* /*who*/) override
             {
                 _JustEngagedWith();
-                events.ScheduleEvent(EVENT_VOLATILEINFECTION, 38000);
-                events.ScheduleEvent(EVENT_DARKPLAGUE, 8000);
-                events.ScheduleEvent(EVENT_CORROSIVEACID, 45000);
-                events.ScheduleEvent(EVENT_NOXIOUSCATALYST, 35000);
+                events.ScheduleEvent(EVENT_VOLATILEINFECTION, 38s);
+                events.ScheduleEvent(EVENT_DARKPLAGUE, 8s);
+                events.ScheduleEvent(EVENT_CORROSIVEACID, 45s);
+                events.ScheduleEvent(EVENT_NOXIOUSCATALYST, 35s);
             }
 
             void UpdateAI(uint32 diff) override
@@ -75,19 +75,19 @@ class boss_lorekeeper_polkelt : public CreatureScript
                     {
                         case EVENT_VOLATILEINFECTION:
                             DoCastVictim(SPELL_VOLATILEINFECTION, true);
-                            events.ScheduleEvent(EVENT_VOLATILEINFECTION, 32000);
+                            events.ScheduleEvent(EVENT_VOLATILEINFECTION, 32s);
                             break;
                         case EVENT_DARKPLAGUE:
                             DoCastVictim(SPELL_DARKPLAGUE, true);
-                            events.ScheduleEvent(EVENT_DARKPLAGUE, 8000);
+                            events.ScheduleEvent(EVENT_DARKPLAGUE, 8s);
                             break;
                         case EVENT_CORROSIVEACID:
                             DoCastVictim(SPELL_CORROSIVEACID, true);
-                            events.ScheduleEvent(EVENT_CORROSIVEACID, 25000);
+                            events.ScheduleEvent(EVENT_CORROSIVEACID, 25s);
                             break;
                         case EVENT_NOXIOUSCATALYST:
                             DoCastVictim(SPELL_NOXIOUSCATALYST, true);
-                            events.ScheduleEvent(EVENT_NOXIOUSCATALYST, 38000);
+                            events.ScheduleEvent(EVENT_NOXIOUSCATALYST, 38s);
                             break;
                         default:
                             break;
diff --git a/src/server/scripts/EasternKingdoms/Scholomance/boss_ras_frostwhisper.cpp b/src/server/scripts/EasternKingdoms/Scholomance/boss_ras_frostwhisper.cpp
index 486e6a489c3..e6ee8513e5f 100644
--- a/src/server/scripts/EasternKingdoms/Scholomance/boss_ras_frostwhisper.cpp
+++ b/src/server/scripts/EasternKingdoms/Scholomance/boss_ras_frostwhisper.cpp
@@ -56,10 +56,10 @@ public:
 
         void JustEngagedWith(Unit* /*who*/) override
         {
-            events.ScheduleEvent(EVENT_ICE_ARMOR, 2000);
-            events.ScheduleEvent(EVENT_FROSTBOLT, 8000);
-            events.ScheduleEvent(EVENT_CHILL_NOVA, 12000);
-            events.ScheduleEvent(EVENT_FREEZE, 18000);
+            events.ScheduleEvent(EVENT_ICE_ARMOR, 2s);
+            events.ScheduleEvent(EVENT_FROSTBOLT, 8s);
+            events.ScheduleEvent(EVENT_CHILL_NOVA, 12s);
+            events.ScheduleEvent(EVENT_FREEZE, 18s);
             events.ScheduleEvent(EVENT_FEAR, 45000);
         }
 
@@ -79,24 +79,24 @@ public:
                 {
                     case EVENT_ICE_ARMOR:
                         DoCast(me, SPELL_ICE_ARMOR);
-                        events.ScheduleEvent(EVENT_ICE_ARMOR, 180000);
+                        events.ScheduleEvent(EVENT_ICE_ARMOR, 3min);
                         break;
                     case EVENT_FROSTBOLT:
                         if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0, 40.0f, true))
                             DoCast(target, SPELL_FROSTBOLT);
-                        events.ScheduleEvent(EVENT_FROSTBOLT, 8000);
+                        events.ScheduleEvent(EVENT_FROSTBOLT, 8s);
                         break;
                     case EVENT_FREEZE:
                         DoCastVictim(SPELL_FREEZE);
-                        events.ScheduleEvent(EVENT_FREEZE, 24000);
+                        events.ScheduleEvent(EVENT_FREEZE, 24s);
                         break;
                     case EVENT_FEAR:
                         DoCastVictim(SPELL_FEAR);
-                        events.ScheduleEvent(EVENT_FEAR, 30000);
+                        events.ScheduleEvent(EVENT_FEAR, 30s);
                         break;
                     case EVENT_CHILL_NOVA:
                         DoCastVictim(SPELL_CHILL_NOVA);
-                        events.ScheduleEvent(EVENT_CHILL_NOVA, 14000);
+                        events.ScheduleEvent(EVENT_CHILL_NOVA, 14s);
                         break;
                     case EVENT_FROSTVOLLEY:
                         DoCastVictim(SPELL_FROSTVOLLEY);
diff --git a/src/server/scripts/EasternKingdoms/Scholomance/boss_the_ravenian.cpp b/src/server/scripts/EasternKingdoms/Scholomance/boss_the_ravenian.cpp
index f2cc647ac41..acb5eddff87 100644
--- a/src/server/scripts/EasternKingdoms/Scholomance/boss_the_ravenian.cpp
+++ b/src/server/scripts/EasternKingdoms/Scholomance/boss_the_ravenian.cpp
@@ -53,10 +53,10 @@ class boss_the_ravenian : public CreatureScript
             void JustEngagedWith(Unit* /*who*/) override
             {
                 _JustEngagedWith();
-                events.ScheduleEvent(EVENT_TRAMPLE, 24000);
-                events.ScheduleEvent(EVENT_CLEAVE, 15000);
-                events.ScheduleEvent(EVENT_SUNDERINCLEAVE, 40000);
-                events.ScheduleEvent(EVENT_KNOCKAWAY, 32000);
+                events.ScheduleEvent(EVENT_TRAMPLE, 24s);
+                events.ScheduleEvent(EVENT_CLEAVE, 15s);
+                events.ScheduleEvent(EVENT_SUNDERINCLEAVE, 40s);
+                events.ScheduleEvent(EVENT_KNOCKAWAY, 32s);
             }
 
             void UpdateAI(uint32 diff) override
@@ -75,19 +75,19 @@ class boss_the_ravenian : public CreatureScript
                     {
                         case EVENT_TRAMPLE:
                             DoCastVictim(SPELL_TRAMPLE, true);
-                            events.ScheduleEvent(EVENT_TRAMPLE, 10000);
+                            events.ScheduleEvent(EVENT_TRAMPLE, 10s);
                             break;
                         case EVENT_CLEAVE:
                             DoCastVictim(SPELL_CLEAVE, true);
-                            events.ScheduleEvent(EVENT_CLEAVE, 7000);
+                            events.ScheduleEvent(EVENT_CLEAVE, 7s);
                             break;
                         case EVENT_SUNDERINCLEAVE:
                             DoCastVictim(SPELL_SUNDERINCLEAVE, true);
-                            events.ScheduleEvent(EVENT_SUNDERINCLEAVE, 20000);
+                            events.ScheduleEvent(EVENT_SUNDERINCLEAVE, 20s);
                             break;
                         case EVENT_KNOCKAWAY:
                             DoCastVictim(SPELL_KNOCKAWAY, true);
-                            events.ScheduleEvent(EVENT_KNOCKAWAY, 12000);
+                            events.ScheduleEvent(EVENT_KNOCKAWAY, 12s);
                             break;
                         default:
                             break;
diff --git a/src/server/scripts/EasternKingdoms/Scholomance/boss_vectus.cpp b/src/server/scripts/EasternKingdoms/Scholomance/boss_vectus.cpp
index 573f0462734..b7ff7e327e5 100644
--- a/src/server/scripts/EasternKingdoms/Scholomance/boss_vectus.cpp
+++ b/src/server/scripts/EasternKingdoms/Scholomance/boss_vectus.cpp
@@ -55,8 +55,8 @@ public:
 
         void JustEngagedWith(Unit* /*who*/) override
         {
-            events.ScheduleEvent(EVENT_FIRE_SHIELD, 2000);
-            events.ScheduleEvent(EVENT_BLAST_WAVE, 14000);
+            events.ScheduleEvent(EVENT_FIRE_SHIELD, 2s);
+            events.ScheduleEvent(EVENT_BLAST_WAVE, 14s);
         }
 
         void DamageTaken(Unit* /*attacker*/, uint32& damage) override
@@ -65,7 +65,7 @@ public:
             {
                 DoCast(me, SPELL_FRENZY);
                 Talk(EMOTE_FRENZY);
-                events.ScheduleEvent(EVENT_FRENZY, 24000);
+                events.ScheduleEvent(EVENT_FRENZY, 24s);
             }
         }
 
@@ -85,16 +85,16 @@ public:
                 {
                     case EVENT_FIRE_SHIELD:
                         DoCast(me, SPELL_FIRE_SHIELD);
-                        events.ScheduleEvent(EVENT_FIRE_SHIELD, 90000);
+                        events.ScheduleEvent(EVENT_FIRE_SHIELD, 90s);
                         break;
                     case EVENT_BLAST_WAVE:
                         DoCast(me, SPELL_BLAST_WAVE);
-                        events.ScheduleEvent(EVENT_BLAST_WAVE, 12000);
+                        events.ScheduleEvent(EVENT_BLAST_WAVE, 12s);
                         break;
                     case EVENT_FRENZY:
                         DoCast(me, SPELL_FRENZY);
                         Talk(EMOTE_FRENZY);
-                        events.ScheduleEvent(EVENT_FRENZY, 24000);
+                        events.ScheduleEvent(EVENT_FRENZY, 24s);
                         break;
                     default:
                         break;
diff --git a/src/server/scripts/EasternKingdoms/ShadowfangKeep/boss_apothecary_hummel.cpp b/src/server/scripts/EasternKingdoms/ShadowfangKeep/boss_apothecary_hummel.cpp
index 9778c0ad40d..b92177a2bc2 100644
--- a/src/server/scripts/EasternKingdoms/ShadowfangKeep/boss_apothecary_hummel.cpp
+++ b/src/server/scripts/EasternKingdoms/ShadowfangKeep/boss_apothecary_hummel.cpp
@@ -210,16 +210,16 @@ class boss_apothecary_hummel : public CreatureScript
                             break;
                         case EVENT_HUMMEL_SAY_2:
                             Talk(SAY_INTRO_2);
-                            events.ScheduleEvent(EVENT_START_FIGHT, Seconds(4));
+                            events.ScheduleEvent(EVENT_START_FIGHT, 4s);
                             break;
                         case EVENT_START_FIGHT:
                         {
                             me->SetImmuneToAll(false);
                             DoZoneInCombat();
-                            events.ScheduleEvent(EVENT_CALL_BAXTER, Seconds(6));
-                            events.ScheduleEvent(EVENT_CALL_FRYE, Seconds(14));
+                            events.ScheduleEvent(EVENT_CALL_BAXTER, 6s);
+                            events.ScheduleEvent(EVENT_CALL_FRYE, 14s);
                             events.ScheduleEvent(EVENT_PERFUME_SPRAY, Milliseconds(3640));
-                            events.ScheduleEvent(EVENT_CHAIN_REACTION, Seconds(15));
+                            events.ScheduleEvent(EVENT_CHAIN_REACTION, 15s);
 
                             Talk(SAY_SUMMON_ADDS);
                             std::vector<Creature*> trashs;
@@ -343,8 +343,8 @@ class npc_apothecary_baxter : public CreatureScript
             void Reset() override
             {
                 _events.Reset();
-                _events.ScheduleEvent(EVENT_COLOGNE_SPRAY, Seconds(7));
-                _events.ScheduleEvent(EVENT_CHAIN_REACTION, Seconds(12));
+                _events.ScheduleEvent(EVENT_COLOGNE_SPRAY, 7s);
+                _events.ScheduleEvent(EVENT_CHAIN_REACTION, 12s);
             }
 
             void JustDied(Unit* /*killer*/) override
diff --git a/src/server/scripts/EasternKingdoms/ShadowfangKeep/shadowfang_keep.cpp b/src/server/scripts/EasternKingdoms/ShadowfangKeep/shadowfang_keep.cpp
index e4ef77f2838..95c974f9029 100644
--- a/src/server/scripts/EasternKingdoms/ShadowfangKeep/shadowfang_keep.cpp
+++ b/src/server/scripts/EasternKingdoms/ShadowfangKeep/shadowfang_keep.cpp
@@ -257,10 +257,10 @@ class boss_archmage_arugal : public CreatureScript
             {
                 _JustEngagedWith();
                 Talk(SAY_AGGRO);
-                events.ScheduleEvent(EVENT_CURSE, Seconds(7));
-                events.ScheduleEvent(EVENT_TELEPORT, Seconds(15));
-                events.ScheduleEvent(EVENT_VOID_BOLT, Seconds(1));
-                events.ScheduleEvent(EVENT_THUNDERSHOCK, Seconds(10));
+                events.ScheduleEvent(EVENT_CURSE, 7s);
+                events.ScheduleEvent(EVENT_TELEPORT, 15s);
+                events.ScheduleEvent(EVENT_VOID_BOLT, 1s);
+                events.ScheduleEvent(EVENT_THUNDERSHOCK, 10s);
             }
 
             void AttackStart(Unit* who) override
diff --git a/src/server/scripts/EasternKingdoms/Stratholme/boss_maleki_the_pallid.cpp b/src/server/scripts/EasternKingdoms/Stratholme/boss_maleki_the_pallid.cpp
index d59bf249f54..b8a6cacaf0c 100644
--- a/src/server/scripts/EasternKingdoms/Stratholme/boss_maleki_the_pallid.cpp
+++ b/src/server/scripts/EasternKingdoms/Stratholme/boss_maleki_the_pallid.cpp
@@ -65,7 +65,7 @@ public:
         {
             _events.ScheduleEvent(EVENT_FROSTBOLT,  1 * IN_MILLISECONDS);
             _events.ScheduleEvent(EVENT_ICETOMB,   16 * IN_MILLISECONDS);
-            _events.ScheduleEvent(EVENT_DRAINLIFE, 31 * IN_MILLISECONDS);
+            _events.ScheduleEvent(EVENT_DRAINLIFE, 31s);
         }
 
         void JustDied(Unit* /*killer*/) override
@@ -96,12 +96,12 @@ public:
                     case EVENT_ICETOMB:
                         if (rand32() % 65)
                             DoCastVictim(SPELL_ICETOMB);
-                        _events.ScheduleEvent(EVENT_ICETOMB, 28 * IN_MILLISECONDS);
+                        _events.ScheduleEvent(EVENT_ICETOMB, 28s);
                         break;
                     case EVENT_DRAINLIFE:
                         if (rand32() % 55)
                             DoCastVictim(SPELL_DRAINLIFE);
-                        _events.ScheduleEvent(EVENT_DRAINLIFE, 31 * IN_MILLISECONDS);
+                        _events.ScheduleEvent(EVENT_DRAINLIFE, 31s);
                         break;
                     default:
                         break;
diff --git a/src/server/scripts/EasternKingdoms/Stratholme/boss_postmaster_malown.cpp b/src/server/scripts/EasternKingdoms/Stratholme/boss_postmaster_malown.cpp
index d5472d3749c..7cd2e85b13b 100644
--- a/src/server/scripts/EasternKingdoms/Stratholme/boss_postmaster_malown.cpp
+++ b/src/server/scripts/EasternKingdoms/Stratholme/boss_postmaster_malown.cpp
@@ -66,10 +66,10 @@ class boss_postmaster_malown : public CreatureScript
 
             void JustEngagedWith(Unit* /*who*/) override
             {
-                events.ScheduleEvent(EVENT_WAILINGDEAD, 19000);     // lasts 6 sec
-                events.ScheduleEvent(EVENT_BACKHAND, 8000);         // 2 sec stun
-                events.ScheduleEvent(EVENT_CURSEOFWEAKNESS, 20000); // lasts 2 mins
-                events.ScheduleEvent(EVENT_CURSEOFTONGUES, 22000);
+                events.ScheduleEvent(EVENT_WAILINGDEAD, 19s);     // lasts 6 sec
+                events.ScheduleEvent(EVENT_BACKHAND, 8s);         // 2 sec stun
+                events.ScheduleEvent(EVENT_CURSEOFWEAKNESS, 20s); // lasts 2 mins
+                events.ScheduleEvent(EVENT_CURSEOFTONGUES, 22s);
                 events.ScheduleEvent(EVENT_CALLOFTHEGRAVE, 25000);
             }
 
@@ -95,22 +95,22 @@ class boss_postmaster_malown : public CreatureScript
                         case EVENT_WAILINGDEAD:
                             if (rand32() % 100 < 65) //65% chance to cast
                                 DoCastVictim(SPELL_WAILINGDEAD, true);
-                            events.ScheduleEvent(EVENT_WAILINGDEAD, 19000);
+                            events.ScheduleEvent(EVENT_WAILINGDEAD, 19s);
                             break;
                         case EVENT_BACKHAND:
                             if (rand32() % 100 < 45) //45% chance to cast
                                 DoCastVictim(SPELL_BACKHAND, true);
-                            events.ScheduleEvent(EVENT_WAILINGDEAD, 8000);
+                            events.ScheduleEvent(EVENT_WAILINGDEAD, 8s);
                             break;
                         case EVENT_CURSEOFWEAKNESS:
                             if (rand32() % 100 < 3) //3% chance to cast
                                 DoCastVictim(SPELL_CURSEOFWEAKNESS, true);
-                            events.ScheduleEvent(EVENT_WAILINGDEAD, 20000);
+                            events.ScheduleEvent(EVENT_WAILINGDEAD, 20s);
                             break;
                         case EVENT_CURSEOFTONGUES:
                             if (rand32() % 100 < 3) //3% chance to cast
                                 DoCastVictim(SPELL_CURSEOFTONGUES, true);
-                            events.ScheduleEvent(EVENT_WAILINGDEAD, 22000);
+                            events.ScheduleEvent(EVENT_WAILINGDEAD, 22s);
                             break;
                         case EVENT_CALLOFTHEGRAVE:
                             if (rand32() % 100 < 5) //5% chance to cast
diff --git a/src/server/scripts/EasternKingdoms/Stratholme/instance_stratholme.cpp b/src/server/scripts/EasternKingdoms/Stratholme/instance_stratholme.cpp
index 67d3de21fd5..7eaa863adf4 100644
--- a/src/server/scripts/EasternKingdoms/Stratholme/instance_stratholme.cpp
+++ b/src/server/scripts/EasternKingdoms/Stratholme/instance_stratholme.cpp
@@ -359,7 +359,7 @@ class instance_stratholme : public InstanceMapScript
 
                         if (data == DONE)
                         {
-                            events.ScheduleEvent(EVENT_SLAUGHTER_SQUARE, 60000);
+                            events.ScheduleEvent(EVENT_SLAUGHTER_SQUARE, 1min);
                             TC_LOG_DEBUG("scripts", "Instance Stratholme: Slaugther event will continue in 1 minute.");
                         }
                         EncounterState[4] = data;
diff --git a/src/server/scripts/EasternKingdoms/SunwellPlateau/boss_felmyst.cpp b/src/server/scripts/EasternKingdoms/SunwellPlateau/boss_felmyst.cpp
index 135bb109f51..60cfc8c0fde 100644
--- a/src/server/scripts/EasternKingdoms/SunwellPlateau/boss_felmyst.cpp
+++ b/src/server/scripts/EasternKingdoms/SunwellPlateau/boss_felmyst.cpp
@@ -158,7 +158,7 @@ public:
 
         void JustEngagedWith(Unit* /*who*/) override
         {
-            events.ScheduleEvent(EVENT_BERSERK, 600000);
+            events.ScheduleEvent(EVENT_BERSERK, 10min);
 
             me->setActive(true);
             DoZoneInCombat();
@@ -253,15 +253,15 @@ public:
                     me->StopMoving();
                     me->SetSpeedRate(MOVE_RUN, 2.0f);
 
-                    events.ScheduleEvent(EVENT_CLEAVE, urand(5000, 10000));
-                    events.ScheduleEvent(EVENT_CORROSION, urand(10000, 20000));
-                    events.ScheduleEvent(EVENT_GAS_NOVA, urand(15000, 20000));
-                    events.ScheduleEvent(EVENT_ENCAPSULATE, urand(20000, 25000));
-                    events.ScheduleEvent(EVENT_FLIGHT, 60000);
+                    events.ScheduleEvent(EVENT_CLEAVE, 5s, 10s);
+                    events.ScheduleEvent(EVENT_CORROSION, 10s, 20s);
+                    events.ScheduleEvent(EVENT_GAS_NOVA, 15s, 20s);
+                    events.ScheduleEvent(EVENT_ENCAPSULATE, 20s, 25s);
+                    events.ScheduleEvent(EVENT_FLIGHT, 1min);
                     break;
                 case PHASE_FLIGHT:
                     me->SetDisableGravity(true);
-                    events.ScheduleEvent(EVENT_FLIGHT_SEQUENCE, 1000);
+                    events.ScheduleEvent(EVENT_FLIGHT_SEQUENCE, 1s);
                     uiFlightCount = 0;
                     uiBreathCount = 0;
                     break;
@@ -281,7 +281,7 @@ public:
                     me->HandleEmoteCommand(EMOTE_ONESHOT_LIFTOFF);
                     me->StopMoving();
                     Talk(YELL_TAKEOFF);
-                    events.ScheduleEvent(EVENT_FLIGHT_SEQUENCE, 2000);
+                    events.ScheduleEvent(EVENT_FLIGHT_SEQUENCE, 2s);
                     break;
                 case 1:
                     me->GetMotionMaster()->MovePoint(0, me->GetPositionX()+1, me->GetPositionY(), me->GetPositionZ()+10);
@@ -306,7 +306,7 @@ public:
                         Vapor->CastSpell(Vapor, SPELL_VAPOR_TRIGGER, true);
                     }
 
-                    events.ScheduleEvent(EVENT_FLIGHT_SEQUENCE, 10000);
+                    events.ScheduleEvent(EVENT_FLIGHT_SEQUENCE, 10s);
                     break;
                 }
                 case 3:
@@ -334,7 +334,7 @@ public:
                         pVapor->CastSpell(pVapor, SPELL_VAPOR_TRIGGER, true);
                     }
 
-                    events.ScheduleEvent(EVENT_FLIGHT_SEQUENCE, 10000);
+                    events.ScheduleEvent(EVENT_FLIGHT_SEQUENCE, 10s);
                     break;
                 }
                 case 4:
@@ -363,7 +363,7 @@ public:
                 case 6:
                     me->SetFacingTo(me->GetAbsoluteAngle(breathX, breathY));
                     //DoTextEmote("takes a deep breath.", nullptr);
-                    events.ScheduleEvent(EVENT_FLIGHT_SEQUENCE, 10000);
+                    events.ScheduleEvent(EVENT_FLIGHT_SEQUENCE, 10s);
                     break;
                 case 7:
                 {
@@ -424,24 +424,24 @@ public:
                     case EVENT_BERSERK:
                         Talk(YELL_BERSERK);
                         DoCast(me, SPELL_BERSERK, true);
-                        events.ScheduleEvent(EVENT_BERSERK, 10000);
+                        events.ScheduleEvent(EVENT_BERSERK, 10s);
                         break;
                     case EVENT_CLEAVE:
                         DoCastVictim(SPELL_CLEAVE, false);
-                        events.ScheduleEvent(EVENT_CLEAVE, urand(5000, 10000));
+                        events.ScheduleEvent(EVENT_CLEAVE, 5s, 10s);
                         break;
                     case EVENT_CORROSION:
                         DoCastVictim(SPELL_CORROSION, false);
-                        events.ScheduleEvent(EVENT_CORROSION, urand(20000, 30000));
+                        events.ScheduleEvent(EVENT_CORROSION, 20s, 30s);
                         break;
                     case EVENT_GAS_NOVA:
                         DoCast(me, SPELL_GAS_NOVA, false);
-                        events.ScheduleEvent(EVENT_GAS_NOVA, urand(20000, 25000));
+                        events.ScheduleEvent(EVENT_GAS_NOVA, 20s, 25s);
                         break;
                     case EVENT_ENCAPSULATE:
                         if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0, 150, true))
                             DoCast(target, SPELL_ENCAPSULATE_CHANNEL, false);
-                        events.ScheduleEvent(EVENT_ENCAPSULATE, urand(25000, 30000));
+                        events.ScheduleEvent(EVENT_ENCAPSULATE, 25s, 30s);
                         break;
                     case EVENT_FLIGHT:
                         EnterPhase(PHASE_FLIGHT);
@@ -475,7 +475,7 @@ public:
                                 me->CastSpell(Fog, SPELL_FOG_FORCE, true);
                             }
                         }
-                        events.ScheduleEvent(EVENT_SUMMON_FOG, 1000);
+                        events.ScheduleEvent(EVENT_SUMMON_FOG, 1s);
                         break;
                 }
             }
diff --git a/src/server/scripts/EasternKingdoms/SunwellPlateau/boss_kalecgos.cpp b/src/server/scripts/EasternKingdoms/SunwellPlateau/boss_kalecgos.cpp
index 025bc44ed6a..e8bd49093cf 100644
--- a/src/server/scripts/EasternKingdoms/SunwellPlateau/boss_kalecgos.cpp
+++ b/src/server/scripts/EasternKingdoms/SunwellPlateau/boss_kalecgos.cpp
@@ -152,12 +152,12 @@ struct boss_kalecgos : public BossAI
         _isEnraged = false;
         _isBanished = false;
         _Reset();
-        events.ScheduleEvent(EVENT_ARCANE_BUFFET, Seconds(8));
-        events.ScheduleEvent(EVENT_FROST_BREATH, Seconds(15));
-        events.ScheduleEvent(EVENT_WILD_MAGIC, Seconds(10));
-        events.ScheduleEvent(EVENT_TAIL_LASH, Seconds(25));
-        events.ScheduleEvent(EVENT_SPECTRAL_BLAST, Seconds(20), Seconds(25));
-        events.ScheduleEvent(EVENT_CHECK_TIMER, Seconds(1));
+        events.ScheduleEvent(EVENT_ARCANE_BUFFET, 8s);
+        events.ScheduleEvent(EVENT_FROST_BREATH, 15s);
+        events.ScheduleEvent(EVENT_WILD_MAGIC, 10s);
+        events.ScheduleEvent(EVENT_TAIL_LASH, 25s);
+        events.ScheduleEvent(EVENT_SPECTRAL_BLAST, 20s, 25s);
+        events.ScheduleEvent(EVENT_CHECK_TIMER, 1s);
     }
 
     void EnterEvadeMode(EvadeReason /*why*/) override
@@ -190,7 +190,7 @@ struct boss_kalecgos : public BossAI
         switch (action)
         {
             case ACTION_START_OUTRO:
-                events.ScheduleEvent(EVENT_OUTRO_START, Seconds(1));
+                events.ScheduleEvent(EVENT_OUTRO_START, 1s);
                 break;
             case ACTION_ENRAGE:
                 _isEnraged = true;
@@ -361,8 +361,8 @@ struct boss_kalecgos_human : public ScriptedAI
         if (Creature* sath = _instance->GetCreature(DATA_SATHROVARR))
             _sathGUID = sath->GetGUID();
 
-        _events.ScheduleEvent(EVENT_REVITALIZE, Seconds(5));
-        _events.ScheduleEvent(EVENT_HEROIC_STRIKE, Seconds(3));
+        _events.ScheduleEvent(EVENT_REVITALIZE, 5s);
+        _events.ScheduleEvent(EVENT_HEROIC_STRIKE, 3s);
     }
 
     void JustDied(Unit* /*killer*/) override
@@ -456,10 +456,10 @@ struct boss_sathrovarr : public BossAI
         _isEnraged = false;
         _isBanished = false;
         _Reset();
-        events.ScheduleEvent(EVENT_SHADOWBOLT, Seconds(7), Seconds(10));
-        events.ScheduleEvent(EVENT_AGONY_CURSE, Seconds(20));
-        events.ScheduleEvent(EVENT_CORRUPTION_STRIKE, Seconds(13));
-        events.ScheduleEvent(EVENT_CHECK_TIMER, Seconds(1));
+        events.ScheduleEvent(EVENT_SHADOWBOLT, 7s, 10s);
+        events.ScheduleEvent(EVENT_AGONY_CURSE, 20s);
+        events.ScheduleEvent(EVENT_CORRUPTION_STRIKE, 13s);
+        events.ScheduleEvent(EVENT_CHECK_TIMER, 1s);
     }
 
     void JustEngagedWith(Unit* /*who*/) override
diff --git a/src/server/scripts/EasternKingdoms/ZulAman/boss_akilzon.cpp b/src/server/scripts/EasternKingdoms/ZulAman/boss_akilzon.cpp
index 1dfbce63c42..ee33327a754 100644
--- a/src/server/scripts/EasternKingdoms/ZulAman/boss_akilzon.cpp
+++ b/src/server/scripts/EasternKingdoms/ZulAman/boss_akilzon.cpp
@@ -117,11 +117,11 @@ class boss_akilzon : public CreatureScript
             {
                 _JustEngagedWith();
 
-                events.ScheduleEvent(EVENT_STATIC_DISRUPTION, urand(10000, 20000)); // 10 to 20 seconds (bosskillers)
-                events.ScheduleEvent(EVENT_GUST_OF_WIND, urand(20000, 30000));      // 20 to 30 seconds(bosskillers)
-                events.ScheduleEvent(EVENT_CALL_LIGHTNING, urand(10000, 20000));    // totaly random timer. can't find any info on this
-                events.ScheduleEvent(EVENT_ELECTRICAL_STORM, 60000);                // 60 seconds(bosskillers)
-                events.ScheduleEvent(EVENT_RAIN, urand(47000, 52000));
+                events.ScheduleEvent(EVENT_STATIC_DISRUPTION, 10s, 20s); // 10 to 20 seconds (bosskillers)
+                events.ScheduleEvent(EVENT_GUST_OF_WIND, 20s, 30s);      // 20 to 30 seconds(bosskillers)
+                events.ScheduleEvent(EVENT_CALL_LIGHTNING, 10s, 20s);    // totaly random timer. can't find any info on this
+                events.ScheduleEvent(EVENT_ELECTRICAL_STORM, 1min);                // 60 seconds(bosskillers)
+                events.ScheduleEvent(EVENT_RAIN, 47s, 52s);
                 events.ScheduleEvent(EVENT_ENRAGE, 10*MINUTE*IN_MILLISECONDS);      // 10 minutes till enrage(bosskillers)
 
                 Talk(SAY_AGGRO);
@@ -212,7 +212,7 @@ class boss_akilzon : public CreatureScript
                 if (StormCount > 10)
                 {
                     StormCount = 0; // finish
-                    events.ScheduleEvent(EVENT_SUMMON_EAGLES, 5000);
+                    events.ScheduleEvent(EVENT_SUMMON_EAGLES, 5s);
                     me->InterruptNonMeleeSpells(false);
                     CloudGUID.Clear();
                     if (Cloud)
@@ -220,7 +220,7 @@ class boss_akilzon : public CreatureScript
                     SetWeather(WEATHER_STATE_FINE, 0.0f);
                     isRaining = false;
                 }
-                events.ScheduleEvent(EVENT_STORM_SEQUENCE, 1000);
+                events.ScheduleEvent(EVENT_STORM_SEQUENCE, 1s);
             }
 
             void UpdateAI(uint32 diff) override
@@ -246,7 +246,7 @@ class boss_akilzon : public CreatureScript
                             }
                             /*if (float dist = me->IsWithinDist3d(target->GetPositionX(), target->GetPositionY(), target->GetPositionZ(), 5.0f) dist = 5.0f;
                             SDisruptAOEVisual_Timer = 1000 + floor(dist / 30 * 1000.0f);*/
-                            events.ScheduleEvent(EVENT_STATIC_DISRUPTION, urand(10000, 18000));
+                            events.ScheduleEvent(EVENT_STATIC_DISRUPTION, 10s, 18s);
                             break;
                             }
                         case EVENT_GUST_OF_WIND:
@@ -256,12 +256,12 @@ class boss_akilzon : public CreatureScript
                                     target = me->GetVictim();
                                 if (target)
                                     DoCast(target, SPELL_GUST_OF_WIND);
-                                events.ScheduleEvent(EVENT_GUST_OF_WIND, urand(20000, 30000));
+                                events.ScheduleEvent(EVENT_GUST_OF_WIND, 20s, 30s);
                                 break;
                             }
                         case EVENT_CALL_LIGHTNING:
                             DoCastVictim(SPELL_CALL_LIGHTNING);
-                            events.ScheduleEvent(EVENT_CALL_LIGHTNING, urand(12000, 17000)); // totaly random timer. can't find any info on this
+                            events.ScheduleEvent(EVENT_CALL_LIGHTNING, 12s, 17s); // totaly random timer. can't find any info on this
                             break;
                         case EVENT_ELECTRICAL_STORM:
                             {
@@ -297,8 +297,8 @@ class boss_akilzon : public CreatureScript
                                         Cloud->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NOT_SELECTABLE);
                                     }
                                 StormCount = 1;
-                                events.ScheduleEvent(EVENT_ELECTRICAL_STORM, 60000); // 60 seconds(bosskillers)
-                                events.ScheduleEvent(EVENT_RAIN, urand(47000, 52000));
+                                events.ScheduleEvent(EVENT_ELECTRICAL_STORM, 1min); // 60 seconds(bosskillers)
+                                events.ScheduleEvent(EVENT_RAIN, 47s, 52s);
                                 break;
                             }
                         case EVENT_RAIN:
@@ -308,7 +308,7 @@ class boss_akilzon : public CreatureScript
                                 isRaining = true;
                             }
                             else
-                                events.ScheduleEvent(EVENT_RAIN, 1000);
+                                events.ScheduleEvent(EVENT_RAIN, 1s);
                             break;
                         case EVENT_STORM_SEQUENCE:
                             {
@@ -355,7 +355,7 @@ class boss_akilzon : public CreatureScript
                         case EVENT_ENRAGE:
                              Talk(SAY_ENRAGE);
                              DoCast(me, SPELL_BERSERK, true);
-                            events.ScheduleEvent(EVENT_ENRAGE, 600000);
+                            events.ScheduleEvent(EVENT_ENRAGE, 10min);
                             break;
                         default:
                             break;
diff --git a/src/server/scripts/EasternKingdoms/ZulGurub/boss_arlokk.cpp b/src/server/scripts/EasternKingdoms/ZulGurub/boss_arlokk.cpp
index 54cac735a1e..c7883e1f03f 100644
--- a/src/server/scripts/EasternKingdoms/ZulGurub/boss_arlokk.cpp
+++ b/src/server/scripts/EasternKingdoms/ZulGurub/boss_arlokk.cpp
@@ -138,7 +138,7 @@ class boss_arlokk : public CreatureScript
                 _JustEngagedWith();
                 events.ScheduleEvent(EVENT_SHADOW_WORD_PAIN, urand(7000, 9000), 0, PHASE_ONE);
                 events.ScheduleEvent(EVENT_GOUGE, urand(12000, 15000), 0, PHASE_ONE);
-                events.ScheduleEvent(EVENT_SUMMON_PROWLERS, 6000, 0, PHASE_ALL);
+                events.ScheduleEvent(EVENT_SUMMON_PROWLERS, 6s, 0, PHASE_ALL);
                 events.ScheduleEvent(EVENT_MARK_OF_ARLOKK, urand(9000, 11000), 0, PHASE_ALL);
                 events.ScheduleEvent(EVENT_TRANSFORM, urand(15000, 20000), 0, PHASE_ONE);
                 Talk(SAY_AGGRO);
@@ -223,7 +223,7 @@ class boss_arlokk : public CreatureScript
                                     ++_summonCountB;
                                 }
                             }
-                            events.ScheduleEvent(EVENT_SUMMON_PROWLERS, 6000, 0, PHASE_ALL);
+                            events.ScheduleEvent(EVENT_SUMMON_PROWLERS, 6s, 0, PHASE_ALL);
                             break;
                         case EVENT_MARK_OF_ARLOKK:
                         {
@@ -255,7 +255,7 @@ class boss_arlokk : public CreatureScript
                             me->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NON_ATTACKABLE|UNIT_FLAG_NOT_SELECTABLE);
                             DoCast(me, SPELL_VANISH_VISUAL);
                             DoCast(me, SPELL_VANISH);
-                            events.ScheduleEvent(EVENT_VANISH, 1000, 0, PHASE_ONE);
+                            events.ScheduleEvent(EVENT_VANISH, 1s, 0, PHASE_ONE);
                             break;
                         }
                         case EVENT_VANISH:
@@ -372,7 +372,7 @@ class npc_zulian_prowler : public CreatureScript
 
                 if (Unit* arlokk = ObjectAccessor::GetUnit(*me, _instance->GetGuidData(NPC_ARLOKK)))
                     me->GetMotionMaster()->MovePoint(0, arlokk->GetPositionX(), arlokk->GetPositionY(), arlokk->GetPositionZ());
-                _events.ScheduleEvent(EVENT_ATTACK, 6000);
+                _events.ScheduleEvent(EVENT_ATTACK, 6s);
             }
 
             void JustEngagedWith(Unit* /*who*/) override
diff --git a/src/server/scripts/EasternKingdoms/ZulGurub/boss_gahzranka.cpp b/src/server/scripts/EasternKingdoms/ZulGurub/boss_gahzranka.cpp
index e3d354cbfef..df6870b33d5 100644
--- a/src/server/scripts/EasternKingdoms/ZulGurub/boss_gahzranka.cpp
+++ b/src/server/scripts/EasternKingdoms/ZulGurub/boss_gahzranka.cpp
@@ -63,9 +63,9 @@ class boss_gahzranka : public CreatureScript // gahzranka
             void JustEngagedWith(Unit* /*who*/) override
             {
                 _JustEngagedWith();
-                events.ScheduleEvent(EVENT_FROSTBREATH, 8000);
-                events.ScheduleEvent(EVENT_MASSIVEGEYSER, 25000);
-                events.ScheduleEvent(EVENT_SLAM, 17000);
+                events.ScheduleEvent(EVENT_FROSTBREATH, 8s);
+                events.ScheduleEvent(EVENT_MASSIVEGEYSER, 25s);
+                events.ScheduleEvent(EVENT_SLAM, 15s);
             }
 
             void UpdateAI(uint32 diff) override
@@ -84,15 +84,15 @@ class boss_gahzranka : public CreatureScript // gahzranka
                     {
                         case EVENT_FROSTBREATH:
                             DoCastVictim(SPELL_FROSTBREATH, true);
-                            events.ScheduleEvent(EVENT_FROSTBREATH, urand(7000, 11000));
+                            events.ScheduleEvent(EVENT_FROSTBREATH, 7s, 11s);
                             break;
                         case EVENT_MASSIVEGEYSER:
                             DoCastVictim(SPELL_MASSIVEGEYSER, true);
-                            events.ScheduleEvent(EVENT_MASSIVEGEYSER, urand(22000, 32000));
+                            events.ScheduleEvent(EVENT_MASSIVEGEYSER, 22s, 32s);
                             break;
                         case EVENT_SLAM:
                             DoCastVictim(SPELL_SLAM, true);
-                            events.ScheduleEvent(EVENT_SLAM, urand(12000, 20000));
+                            events.ScheduleEvent(EVENT_SLAM, 12s, 20s);
                             break;
                         default:
                             break;
diff --git a/src/server/scripts/EasternKingdoms/ZulGurub/boss_grilek.cpp b/src/server/scripts/EasternKingdoms/ZulGurub/boss_grilek.cpp
index dc125e5aead..25874441307 100644
--- a/src/server/scripts/EasternKingdoms/ZulGurub/boss_grilek.cpp
+++ b/src/server/scripts/EasternKingdoms/ZulGurub/boss_grilek.cpp
@@ -61,8 +61,8 @@ class boss_grilek : public CreatureScript // grilek
             void JustEngagedWith(Unit* /*who*/) override
             {
                 _JustEngagedWith();
-                events.ScheduleEvent(EVENT_AVATAR, urand(15000, 25000));
-                events.ScheduleEvent(EVENT_GROUND_TREMOR, urand(15000, 25000));
+                events.ScheduleEvent(EVENT_AVATAR, 15s, 25s);
+                events.ScheduleEvent(EVENT_GROUND_TREMOR, 15s, 25s);
             }
 
             void UpdateAI(uint32 diff) override
@@ -89,11 +89,11 @@ class boss_grilek : public CreatureScript // grilek
 
                             if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 1))
                                 AttackStart(target);
-                            events.ScheduleEvent(EVENT_AVATAR, urand(25000, 35000));
+                            events.ScheduleEvent(EVENT_AVATAR, 25s, 35s);
                             break;
                         case EVENT_GROUND_TREMOR:
                             DoCastVictim(SPELL_GROUND_TREMOR, true);
-                            events.ScheduleEvent(EVENT_GROUND_TREMOR, urand(12000, 16000));
+                            events.ScheduleEvent(EVENT_GROUND_TREMOR, 12s, 16s);
                             break;
                         default:
                             break;
diff --git a/src/server/scripts/EasternKingdoms/ZulGurub/boss_hakkar.cpp b/src/server/scripts/EasternKingdoms/ZulGurub/boss_hakkar.cpp
index 707e998d15c..8a1691491d0 100644
--- a/src/server/scripts/EasternKingdoms/ZulGurub/boss_hakkar.cpp
+++ b/src/server/scripts/EasternKingdoms/ZulGurub/boss_hakkar.cpp
@@ -87,21 +87,21 @@ class boss_hakkar : public CreatureScript
             void JustEngagedWith(Unit* /*who*/) override
             {
                 _JustEngagedWith();
-                events.ScheduleEvent(EVENT_BLOOD_SIPHON, 90000);
-                events.ScheduleEvent(EVENT_CORRUPTED_BLOOD, 25000);
-                events.ScheduleEvent(EVENT_CAUSE_INSANITY, 17000);
-                events.ScheduleEvent(EVENT_WILL_OF_HAKKAR, 17000);
-                events.ScheduleEvent(EVENT_ENRAGE, 600000);
+                events.ScheduleEvent(EVENT_BLOOD_SIPHON, 90s);
+                events.ScheduleEvent(EVENT_CORRUPTED_BLOOD, 25s);
+                events.ScheduleEvent(EVENT_CAUSE_INSANITY, 15s);
+                events.ScheduleEvent(EVENT_WILL_OF_HAKKAR, 15s);
+                events.ScheduleEvent(EVENT_ENRAGE, 10min);
                 if (instance->GetBossState(DATA_JEKLIK) != DONE)
-                    events.ScheduleEvent(EVENT_ASPECT_OF_JEKLIK, 4000);
+                    events.ScheduleEvent(EVENT_ASPECT_OF_JEKLIK, 4s);
                 if (instance->GetBossState(DATA_VENOXIS) != DONE)
-                    events.ScheduleEvent(EVENT_ASPECT_OF_VENOXIS, 7000);
+                    events.ScheduleEvent(EVENT_ASPECT_OF_VENOXIS, 7s);
                 if (instance->GetBossState(DATA_MARLI) != DONE)
-                    events.ScheduleEvent(EVENT_ASPECT_OF_MARLI, 12000);
+                    events.ScheduleEvent(EVENT_ASPECT_OF_MARLI, 12s);
                 if (instance->GetBossState(DATA_THEKAL) != DONE)
-                    events.ScheduleEvent(EVENT_ASPECT_OF_THEKAL, 8000);
+                    events.ScheduleEvent(EVENT_ASPECT_OF_THEKAL, 8s);
                 if (instance->GetBossState(DATA_ARLOKK) != DONE)
-                    events.ScheduleEvent(EVENT_ASPECT_OF_ARLOKK, 18000);
+                    events.ScheduleEvent(EVENT_ASPECT_OF_ARLOKK, 18s);
                 Talk(SAY_AGGRO);
             }
 
@@ -121,44 +121,44 @@ class boss_hakkar : public CreatureScript
                     {
                         case EVENT_BLOOD_SIPHON:
                             DoCastVictim(SPELL_BLOOD_SIPHON, true);
-                            events.ScheduleEvent(EVENT_BLOOD_SIPHON, 90000);
+                            events.ScheduleEvent(EVENT_BLOOD_SIPHON, 90s);
                             break;
                         case EVENT_CORRUPTED_BLOOD:
                             DoCastVictim(SPELL_CORRUPTED_BLOOD, true);
-                            events.ScheduleEvent(EVENT_CORRUPTED_BLOOD, urand(30000, 45000));
+                            events.ScheduleEvent(EVENT_CORRUPTED_BLOOD, 30s, 45s);
                             break;
                         case EVENT_CAUSE_INSANITY:
                             // DoCast(SelectTarget(SELECT_TARGET_RANDOM, 0, 100, true), SPELL_CAUSE_INSANITY);
-                            // events.ScheduleEvent(EVENT_CAUSE_INSANITY, urand(35000, 45000));
+                            // events.ScheduleEvent(EVENT_CAUSE_INSANITY, 35s, 45s);
                             break;
                         case EVENT_WILL_OF_HAKKAR:
                             DoCast(SelectTarget(SELECT_TARGET_RANDOM, 0, 100, true), SPELL_WILL_OF_HAKKAR);
-                            events.ScheduleEvent(EVENT_WILL_OF_HAKKAR, urand(25000, 35000));
+                            events.ScheduleEvent(EVENT_WILL_OF_HAKKAR, 25s, 35s);
                             break;
                         case EVENT_ENRAGE:
                             if (!me->HasAura(SPELL_ENRAGE))
                                 DoCast(me, SPELL_ENRAGE);
-                            events.ScheduleEvent(EVENT_ENRAGE, 90000);
+                            events.ScheduleEvent(EVENT_ENRAGE, 90s);
                             break;
                         case EVENT_ASPECT_OF_JEKLIK:
                             DoCastVictim(SPELL_ASPECT_OF_JEKLIK, true);
-                            events.ScheduleEvent(EVENT_ASPECT_OF_JEKLIK, urand(10000, 14000));
+                            events.ScheduleEvent(EVENT_ASPECT_OF_JEKLIK, 10s, 14s);
                             break;
                         case EVENT_ASPECT_OF_VENOXIS:
                             DoCastVictim(SPELL_ASPECT_OF_VENOXIS, true);
-                            events.ScheduleEvent(EVENT_ASPECT_OF_VENOXIS, 8000);
+                            events.ScheduleEvent(EVENT_ASPECT_OF_VENOXIS, 8s);
                             break;
                         case EVENT_ASPECT_OF_MARLI:
                             DoCastVictim(SPELL_ASPECT_OF_MARLI, true);
-                            events.ScheduleEvent(EVENT_ASPECT_OF_MARLI, 10000);
+                            events.ScheduleEvent(EVENT_ASPECT_OF_MARLI, 10s);
                             break;
                         case EVENT_ASPECT_OF_THEKAL:
                             DoCastVictim(SPELL_ASPECT_OF_THEKAL, true);
-                            events.ScheduleEvent(EVENT_ASPECT_OF_THEKAL, 15000);
+                            events.ScheduleEvent(EVENT_ASPECT_OF_THEKAL, 15s);
                             break;
                         case EVENT_ASPECT_OF_ARLOKK:
                             DoCastVictim(SPELL_ASPECT_OF_ARLOKK, true);
-                            events.ScheduleEvent(EVENT_ASPECT_OF_ARLOKK, urand(10000, 15000));
+                            events.ScheduleEvent(EVENT_ASPECT_OF_ARLOKK, 10s, 15s);
                             break;
                         default:
                             break;
diff --git a/src/server/scripts/EasternKingdoms/ZulGurub/boss_hazzarah.cpp b/src/server/scripts/EasternKingdoms/ZulGurub/boss_hazzarah.cpp
index f673247b779..d9dddb81ad4 100644
--- a/src/server/scripts/EasternKingdoms/ZulGurub/boss_hazzarah.cpp
+++ b/src/server/scripts/EasternKingdoms/ZulGurub/boss_hazzarah.cpp
@@ -63,9 +63,9 @@ class boss_hazzarah : public CreatureScript
             void JustEngagedWith(Unit* /*who*/) override
             {
                 _JustEngagedWith();
-                events.ScheduleEvent(EVENT_MANABURN, urand(4000, 10000));
-                events.ScheduleEvent(EVENT_SLEEP, urand(10000, 18000));
-                events.ScheduleEvent(EVENT_ILLUSIONS, urand(10000, 18000));
+                events.ScheduleEvent(EVENT_MANABURN, 4s, 10s);
+                events.ScheduleEvent(EVENT_SLEEP, 10s, 18s);
+                events.ScheduleEvent(EVENT_ILLUSIONS, 10s, 18s);
             }
 
             void UpdateAI(uint32 diff) override
@@ -84,11 +84,11 @@ class boss_hazzarah : public CreatureScript
                     {
                         case EVENT_MANABURN:
                             DoCastVictim(SPELL_MANABURN, true);
-                            events.ScheduleEvent(EVENT_MANABURN, urand(8000, 16000));
+                            events.ScheduleEvent(EVENT_MANABURN, 8s, 16s);
                             break;
                         case EVENT_SLEEP:
                             DoCastVictim(SPELL_SLEEP, true);
-                            events.ScheduleEvent(EVENT_SLEEP, urand(12000, 20000));
+                            events.ScheduleEvent(EVENT_SLEEP, 12s, 20s);
                             break;
                         case EVENT_ILLUSIONS:
                             // We will summon 3 illusions that will spawn on a random gamer and attack this gamer
@@ -99,7 +99,7 @@ class boss_hazzarah : public CreatureScript
                                     if (Creature* Illusion = me->SummonCreature(NPC_NIGHTMARE_ILLUSION, target->GetPositionX(), target->GetPositionY(), target->GetPositionZ(), 0, TEMPSUMMON_TIMED_OR_CORPSE_DESPAWN, 30000))
                                         Illusion->AI()->AttackStart(target);
                             }
-                            events.ScheduleEvent(EVENT_ILLUSIONS, urand(15000, 25000));
+                            events.ScheduleEvent(EVENT_ILLUSIONS, 15s, 25s);
                             break;
                         default:
                             break;
diff --git a/src/server/scripts/EasternKingdoms/ZulGurub/boss_jeklik.cpp b/src/server/scripts/EasternKingdoms/ZulGurub/boss_jeklik.cpp
index 8773f347188..fa901495833 100644
--- a/src/server/scripts/EasternKingdoms/ZulGurub/boss_jeklik.cpp
+++ b/src/server/scripts/EasternKingdoms/ZulGurub/boss_jeklik.cpp
@@ -102,10 +102,10 @@ class boss_jeklik : public CreatureScript
                 Talk(SAY_AGGRO);
                 events.SetPhase(PHASE_ONE);
 
-                events.ScheduleEvent(EVENT_CHARGE_JEKLIK, 20000, 0, PHASE_ONE);
-                events.ScheduleEvent(EVENT_SONIC_BURST, 8000, 0, PHASE_ONE);
-                events.ScheduleEvent(EVENT_SCREECH, 13000, 0, PHASE_ONE);
-                events.ScheduleEvent(EVENT_SPAWN_BATS, 60000, 0, PHASE_ONE);
+                events.ScheduleEvent(EVENT_CHARGE_JEKLIK, 20s, 0, PHASE_ONE);
+                events.ScheduleEvent(EVENT_SONIC_BURST, 8s, 0, PHASE_ONE);
+                events.ScheduleEvent(EVENT_SCREECH, 13s, 0, PHASE_ONE);
+                events.ScheduleEvent(EVENT_SPAWN_BATS, 60s, 0, PHASE_ONE);
 
                 me->SetCanFly(true);
                 DoCast(me, SPELL_BAT_FORM);
@@ -119,11 +119,11 @@ class boss_jeklik : public CreatureScript
                     me->SetCanFly(false);
                     ResetThreatList();
                     events.SetPhase(PHASE_TWO);
-                    events.ScheduleEvent(EVENT_SHADOW_WORD_PAIN, 6000, 0, PHASE_TWO);
-                    events.ScheduleEvent(EVENT_MIND_FLAY, 11000, 0, PHASE_TWO);
-                    events.ScheduleEvent(EVENT_CHAIN_MIND_FLAY, 26000, 0, PHASE_TWO);
-                    events.ScheduleEvent(EVENT_GREATER_HEAL, 50000, 0, PHASE_TWO);
-                    events.ScheduleEvent(EVENT_SPAWN_FLYING_BATS, 10000, 0, PHASE_TWO);
+                    events.ScheduleEvent(EVENT_SHADOW_WORD_PAIN, 6s, 0, PHASE_TWO);
+                    events.ScheduleEvent(EVENT_MIND_FLAY, 11s, 0, PHASE_TWO);
+                    events.ScheduleEvent(EVENT_CHAIN_MIND_FLAY, 26s, 0, PHASE_TWO);
+                    events.ScheduleEvent(EVENT_GREATER_HEAL, 50s, 0, PHASE_TWO);
+                    events.ScheduleEvent(EVENT_SPAWN_FLYING_BATS, 10s, 0, PHASE_TWO);
                     return;
                 }
             }
@@ -163,7 +163,7 @@ class boss_jeklik : public CreatureScript
                                 for (uint8 i = 0; i < 6; ++i)
                                     if (Creature* bat = me->SummonCreature(NPC_BLOODSEEKER_BAT, SpawnBat[i], TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 15000))
                                         bat->AI()->AttackStart(target);
-                            events.ScheduleEvent(EVENT_SPAWN_BATS, 60000, 0, PHASE_ONE);
+                            events.ScheduleEvent(EVENT_SPAWN_BATS, 1min, 0, PHASE_ONE);
                             break;
                         case EVENT_SHADOW_WORD_PAIN:
                             if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0))
@@ -172,7 +172,7 @@ class boss_jeklik : public CreatureScript
                             break;
                         case EVENT_MIND_FLAY:
                             DoCastVictim(SPELL_MIND_FLAY);
-                            events.ScheduleEvent(EVENT_MIND_FLAY, 16000, 0, PHASE_TWO);
+                            events.ScheduleEvent(EVENT_MIND_FLAY, 16s, 0, PHASE_TWO);
                             break;
                         case EVENT_CHAIN_MIND_FLAY:
                             me->InterruptNonMeleeSpells(false);
diff --git a/src/server/scripts/EasternKingdoms/ZulGurub/boss_jindo.cpp b/src/server/scripts/EasternKingdoms/ZulGurub/boss_jindo.cpp
index 510ce1938cd..e724c333d8e 100644
--- a/src/server/scripts/EasternKingdoms/ZulGurub/boss_jindo.cpp
+++ b/src/server/scripts/EasternKingdoms/ZulGurub/boss_jindo.cpp
@@ -90,11 +90,11 @@ class boss_jindo : public CreatureScript
             void JustEngagedWith(Unit* /*who*/) override
             {
                 _JustEngagedWith();
-                events.ScheduleEvent(EVENT_BRAIN_WASH_TOTEM, 20000);
-                events.ScheduleEvent(EVENT_POWERFULL_HEALING_WARD, 16000);
-                events.ScheduleEvent(EVENT_HEX, 8000);
-                events.ScheduleEvent(EVENT_DELUSIONS_OF_JINDO, 10000);
-                events.ScheduleEvent(EVENT_TELEPORT, 5000);
+                events.ScheduleEvent(EVENT_BRAIN_WASH_TOTEM, 20s);
+                events.ScheduleEvent(EVENT_POWERFULL_HEALING_WARD, 15s);
+                events.ScheduleEvent(EVENT_HEX, 8s);
+                events.ScheduleEvent(EVENT_DELUSIONS_OF_JINDO, 10s);
+                events.ScheduleEvent(EVENT_TELEPORT, 5s);
                 Talk(SAY_AGGRO);
             }
 
@@ -114,11 +114,11 @@ class boss_jindo : public CreatureScript
                     {
                         case EVENT_BRAIN_WASH_TOTEM:
                             DoCast(me, SPELL_BRAIN_WASH_TOTEM);
-                            events.ScheduleEvent(EVENT_BRAIN_WASH_TOTEM, urand(18000, 26000));
+                            events.ScheduleEvent(EVENT_BRAIN_WASH_TOTEM, 18s, 26s);
                             break;
                         case EVENT_POWERFULL_HEALING_WARD:
                             DoCast(me, SPELL_POWERFULL_HEALING_WARD);
-                            events.ScheduleEvent(EVENT_POWERFULL_HEALING_WARD, urand(14000, 20000));
+                            events.ScheduleEvent(EVENT_POWERFULL_HEALING_WARD, 14s, 20s);
                             break;
                         case EVENT_HEX:
                             if (Unit* target = me->GetVictim())
@@ -127,7 +127,7 @@ class boss_jindo : public CreatureScript
                                 if (GetThreat(target))
                                     ModifyThreatByPercent(target, -80);
                             }
-                            events.ScheduleEvent(EVENT_HEX, urand(12000, 20000));
+                            events.ScheduleEvent(EVENT_HEX, 12s, 20s);
                             break;
                         case EVENT_DELUSIONS_OF_JINDO:
                             // Casting the delusion curse with a shade so shade will attack the same target with the curse.
@@ -136,7 +136,7 @@ class boss_jindo : public CreatureScript
                                 DoCast(target, SPELL_SHADE_OF_JINDO, true);
                                 DoCast(target, SPELL_DELUSIONS_OF_JINDO);
                             }
-                            events.ScheduleEvent(EVENT_DELUSIONS_OF_JINDO, urand(4000, 12000));
+                            events.ScheduleEvent(EVENT_DELUSIONS_OF_JINDO, 4s, 12s);
                             break;
                         case EVENT_TELEPORT:
                             // Teleports a random player and spawns 9 Sacrificed Trolls to attack player
@@ -151,7 +151,7 @@ class boss_jindo : public CreatureScript
                                     if (Creature* SacrificedTroll = me->SummonCreature(NPC_SACRIFICED_TROLL, Formation[i].GetPositionX(), Formation[i].GetPositionY(), Formation[i].GetPositionZ(), Formation[i].GetOrientation(), TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 15000))
                                         SacrificedTroll->AI()->AttackStart(target);
                             }
-                            events.ScheduleEvent(EVENT_TELEPORT, urand(15000, 23000));
+                            events.ScheduleEvent(EVENT_TELEPORT, 15s, 23s);
                             break;
                         default:
                             break;
diff --git a/src/server/scripts/EasternKingdoms/ZulGurub/boss_mandokir.cpp b/src/server/scripts/EasternKingdoms/ZulGurub/boss_mandokir.cpp
index 1768773dcf9..3f48aea76cf 100644
--- a/src/server/scripts/EasternKingdoms/ZulGurub/boss_mandokir.cpp
+++ b/src/server/scripts/EasternKingdoms/ZulGurub/boss_mandokir.cpp
@@ -131,7 +131,7 @@ class boss_mandokir : public CreatureScript
                     _Reset();
                     Initialize();
                     me->SetImmuneToAll(true);
-                    events.ScheduleEvent(EVENT_CHECK_START, 1000);
+                    events.ScheduleEvent(EVENT_CHECK_START, 1s);
                     if (Creature* speaker = ObjectAccessor::GetCreature(*me, instance->GetGuidData(NPC_VILEBRANCH_SPEAKER)))
                         if (!speaker->IsAlive())
                             speaker->Respawn(true);
@@ -158,11 +158,11 @@ class boss_mandokir : public CreatureScript
             void JustEngagedWith(Unit* /*who*/) override
             {
                 _JustEngagedWith();
-                events.ScheduleEvent(EVENT_OVERPOWER, urand(7000, 9000));
-                events.ScheduleEvent(EVENT_MORTAL_STRIKE, urand(12000, 18000));
-                events.ScheduleEvent(EVENT_WHIRLWIND, urand(24000, 30000));
-                events.ScheduleEvent(EVENT_WATCH_PLAYER, urand(13000, 15000));
-                events.ScheduleEvent(EVENT_CHARGE_PLAYER, urand(33000, 38000));
+                events.ScheduleEvent(EVENT_OVERPOWER, 7s, 9s);
+                events.ScheduleEvent(EVENT_MORTAL_STRIKE, 12s, 18s);
+                events.ScheduleEvent(EVENT_WHIRLWIND, 24s, 30s);
+                events.ScheduleEvent(EVENT_WATCH_PLAYER, 13s, 15s);
+                events.ScheduleEvent(EVENT_CHARGE_PLAYER, 33s, 38s);
                 me->SetHomePosition(me->GetPositionX(), me->GetPositionY(), me->GetPositionZ(), me->GetOrientation());
                 Talk(SAY_AGGRO);
                 me->Dismount();
@@ -232,10 +232,10 @@ class boss_mandokir : public CreatureScript
                                     if (instance->GetBossState(DATA_MANDOKIR) == SPECIAL)
                                     {
                                         me->GetMotionMaster()->MovePoint(0, PosMandokir[1].m_positionX, PosMandokir[1].m_positionY, PosMandokir[1].m_positionZ);
-                                        events.ScheduleEvent(EVENT_STARTED, 6000);
+                                        events.ScheduleEvent(EVENT_STARTED, 6s);
                                     }
                                     else
-                                        events.ScheduleEvent(EVENT_CHECK_START, 1000);
+                                        events.ScheduleEvent(EVENT_CHECK_START, 1s);
                                     break;
                                 case EVENT_STARTED:
                                     me->SetImmuneToAll(false);
@@ -258,16 +258,16 @@ class boss_mandokir : public CreatureScript
                     {
                         case EVENT_OVERPOWER:
                             DoCastVictim(SPELL_OVERPOWER, true);
-                            events.ScheduleEvent(EVENT_OVERPOWER, urand(6000, 12000));
+                            events.ScheduleEvent(EVENT_OVERPOWER, 6s, 12s);
                             break;
                         case EVENT_MORTAL_STRIKE:
                             if (me->GetVictim() && me->EnsureVictim()->HealthBelowPct(50))
                                 DoCastVictim(SPELL_MORTAL_STRIKE, true);
-                            events.ScheduleEvent(EVENT_MORTAL_STRIKE, urand(12000, 18000));
+                            events.ScheduleEvent(EVENT_MORTAL_STRIKE, 12s, 18s);
                             break;
                         case EVENT_WHIRLWIND:
                             DoCast(me, SPELL_WHIRLWIND);
-                            events.ScheduleEvent(EVENT_WHIRLWIND, urand(22000, 26000));
+                            events.ScheduleEvent(EVENT_WHIRLWIND, 22s, 26s);
                             break;
                         case EVENT_WATCH_PLAYER:
                             if (Unit* player = SelectTarget(SELECT_TARGET_RANDOM, 0, 100, true))
@@ -275,11 +275,11 @@ class boss_mandokir : public CreatureScript
                                 DoCast(player, SPELL_WATCH);
                                 Talk(SAY_WATCH, player);
                             }
-                            events.ScheduleEvent(EVENT_WATCH_PLAYER, urand(12000, 15000));
+                            events.ScheduleEvent(EVENT_WATCH_PLAYER, 12s, 15s);
                             break;
                         case EVENT_CHARGE_PLAYER:
                             DoCast(SelectTarget(SELECT_TARGET_RANDOM, 0, 40, true), SPELL_CHARGE);
-                            events.ScheduleEvent(EVENT_CHARGE_PLAYER, urand(22000, 30000));
+                            events.ScheduleEvent(EVENT_CHARGE_PLAYER, 22s, 30s);
                             break;
                         default:
                             break;
diff --git a/src/server/scripts/EasternKingdoms/ZulGurub/boss_marli.cpp b/src/server/scripts/EasternKingdoms/ZulGurub/boss_marli.cpp
index 5cd5d52aada..29a0da8a379 100644
--- a/src/server/scripts/EasternKingdoms/ZulGurub/boss_marli.cpp
+++ b/src/server/scripts/EasternKingdoms/ZulGurub/boss_marli.cpp
@@ -101,7 +101,7 @@ class boss_marli : public CreatureScript
             void JustEngagedWith(Unit* /*who*/) override
             {
                 _JustEngagedWith();
-                events.ScheduleEvent(EVENT_SPAWN_START_SPIDERS, 1000, 0, PHASE_ONE);
+                events.ScheduleEvent(EVENT_SPAWN_START_SPIDERS, 1s, 0, PHASE_ONE);
                 Talk(SAY_AGGRO);
             }
 
@@ -127,16 +127,16 @@ class boss_marli : public CreatureScript
                                     if (Creature* spider = me->SummonCreature(NPC_SPIDER, target->GetPositionX(), target->GetPositionY(), target->GetPositionZ(), 0, TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 15000))
                                         spider->AI()->AttackStart(target);
                             }
-                            events.ScheduleEvent(EVENT_ASPECT_OF_MARLI, 12000, 0, PHASE_TWO);
-                            events.ScheduleEvent(EVENT_TRANSFORM, 45000, 0, PHASE_TWO);
-                            events.ScheduleEvent(EVENT_POISON_VOLLEY, 15000);
-                            events.ScheduleEvent(EVENT_SPAWN_SPIDER, 30000);
-                            events.ScheduleEvent(EVENT_TRANSFORM, 45000, 0, PHASE_TWO);
+                            events.ScheduleEvent(EVENT_ASPECT_OF_MARLI, 12s, 0, PHASE_TWO);
+                            events.ScheduleEvent(EVENT_TRANSFORM, 45s, 0, PHASE_TWO);
+                            events.ScheduleEvent(EVENT_POISON_VOLLEY, 15s);
+                            events.ScheduleEvent(EVENT_SPAWN_SPIDER, 30s);
+                            events.ScheduleEvent(EVENT_TRANSFORM, 45s, 0, PHASE_TWO);
                             events.SetPhase(PHASE_TWO);
                             break;
                         case EVENT_POISON_VOLLEY:
                             DoCastVictim(SPELL_POISON_VOLLEY, true);
-                            events.ScheduleEvent(EVENT_POISON_VOLLEY, urand(10000, 20000));
+                            events.ScheduleEvent(EVENT_POISON_VOLLEY, 10s, 20s);
                             break;
                         case EVENT_ASPECT_OF_MARLI:
                             DoCastVictim(SPELL_ASPECT_OF_MARLI, true);
@@ -146,7 +146,7 @@ class boss_marli : public CreatureScript
                             if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0))
                                 if (Creature* spider = me->SummonCreature(NPC_SPIDER, target->GetPositionX(), target->GetPositionY(), target->GetPositionZ(), 0, TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 15000))
                                     spider->AI()->AttackStart(target);
-                            events.ScheduleEvent(EVENT_SPAWN_SPIDER, urand(12000, 17000));
+                            events.ScheduleEvent(EVENT_SPAWN_SPIDER, 12s, 17s);
                             break;
                         case EVENT_TRANSFORM:
                         {
@@ -162,8 +162,8 @@ class boss_marli : public CreatureScript
                             DoCastVictim(SPELL_ENVOLWINGWEB);
                             if (GetThreat(me->GetVictim()))
                                 ModifyThreatByPercent(me->GetVictim(), -100);
-                            events.ScheduleEvent(EVENT_CHARGE_PLAYER, 1500, 0, PHASE_THREE);
-                            events.ScheduleEvent(EVENT_TRANSFORM_BACK, 25000, 0, PHASE_THREE);
+                            events.ScheduleEvent(EVENT_CHARGE_PLAYER, 1500ms, 0, PHASE_THREE);
+                            events.ScheduleEvent(EVENT_TRANSFORM_BACK, 25s, 0, PHASE_THREE);
                             events.SetPhase(PHASE_THREE);
                             break;
                         }
@@ -182,7 +182,7 @@ class boss_marli : public CreatureScript
                                 DoCast(target, SPELL_CHARGE);
                                 AttackStart(target);
                             }
-                            events.ScheduleEvent(EVENT_CHARGE_PLAYER, 8000, 0, PHASE_THREE);
+                            events.ScheduleEvent(EVENT_CHARGE_PLAYER, 8s, 0, PHASE_THREE);
                             break;
                         }
                         case EVENT_TRANSFORM_BACK:
@@ -195,10 +195,10 @@ class boss_marli : public CreatureScript
                             me->UpdateDamagePhysical(BASE_ATTACK);
                             */
                             me->ApplyStatPctModifier(UNIT_MOD_DAMAGE_MAINHAND, TOTAL_PCT, DamageDecrease); // hack
-                            events.ScheduleEvent(EVENT_ASPECT_OF_MARLI, 12000, 0, PHASE_TWO);
-                            events.ScheduleEvent(EVENT_TRANSFORM, 45000, 0, PHASE_TWO);
-                            events.ScheduleEvent(EVENT_POISON_VOLLEY, 15000);
-                            events.ScheduleEvent(EVENT_SPAWN_SPIDER, 30000);
+                            events.ScheduleEvent(EVENT_ASPECT_OF_MARLI, 12s, 0, PHASE_TWO);
+                            events.ScheduleEvent(EVENT_TRANSFORM, 45s, 0, PHASE_TWO);
+                            events.ScheduleEvent(EVENT_POISON_VOLLEY, 15s);
+                            events.ScheduleEvent(EVENT_SPAWN_SPIDER, 30s);
                             events.ScheduleEvent(EVENT_TRANSFORM, urand(35000, 60000), 0, PHASE_TWO);
                             events.SetPhase(PHASE_TWO);
                             break;
diff --git a/src/server/scripts/EasternKingdoms/ZulGurub/boss_thekal.cpp b/src/server/scripts/EasternKingdoms/ZulGurub/boss_thekal.cpp
index f45d31f02af..9e1a6883bef 100644
--- a/src/server/scripts/EasternKingdoms/ZulGurub/boss_thekal.cpp
+++ b/src/server/scripts/EasternKingdoms/ZulGurub/boss_thekal.cpp
@@ -123,10 +123,10 @@ class boss_thekal : public CreatureScript
             void JustEngagedWith(Unit* /*who*/) override
             {
                 _JustEngagedWith();
-                events.ScheduleEvent(EVENT_MORTALCLEAVE, 4000, 0, PHASE_ONE);     // Phase 1
-                events.ScheduleEvent(EVENT_SILENCE, 9000, 0, PHASE_ONE);          // Phase 1
-                events.ScheduleEvent(EVENT_CHECK_TIMER, 10000, 0, PHASE_ONE);     // Phase 1
-                events.ScheduleEvent(EVENT_RESURRECT_TIMER, 10000, 0, PHASE_ONE); // Phase 1
+                events.ScheduleEvent(EVENT_MORTALCLEAVE, 4s, 0, PHASE_ONE);     // Phase 1
+                events.ScheduleEvent(EVENT_SILENCE, 9s, 0, PHASE_ONE);          // Phase 1
+                events.ScheduleEvent(EVENT_CHECK_TIMER, 10s, 0, PHASE_ONE);     // Phase 1
+                events.ScheduleEvent(EVENT_RESURRECT_TIMER, 10s, 0, PHASE_ONE); // Phase 1
                 Talk(SAY_AGGRO);
             }
 
@@ -173,14 +173,14 @@ class boss_thekal : public CreatureScript
                                 */
                                 me->ApplyStatPctModifier(UNIT_MOD_DAMAGE_MAINHAND, TOTAL_PCT, DamageIncrease); // hack
                                 ResetThreatList();
-                                events.ScheduleEvent(EVENT_FRENZY, 30000, 0, PHASE_TWO);          // Phase 2
-                                events.ScheduleEvent(EVENT_FORCEPUNCH, 4000, 0, PHASE_TWO);       // Phase 2
-                                events.ScheduleEvent(EVENT_SPELL_CHARGE, 12000, 0, PHASE_TWO);    // Phase 2
-                                events.ScheduleEvent(EVENT_ENRAGE, 32000, 0, PHASE_TWO);          // Phase 2
-                                events.ScheduleEvent(EVENT_SUMMONTIGERS, 25000, 0, PHASE_TWO);    // Phase 2
+                                events.ScheduleEvent(EVENT_FRENZY, 30s, 0, PHASE_TWO);          // Phase 2
+                                events.ScheduleEvent(EVENT_FORCEPUNCH, 4s, 0, PHASE_TWO);       // Phase 2
+                                events.ScheduleEvent(EVENT_SPELL_CHARGE, 12s, 0, PHASE_TWO);    // Phase 2
+                                events.ScheduleEvent(EVENT_ENRAGE, 32s, 0, PHASE_TWO);          // Phase 2
+                                events.ScheduleEvent(EVENT_SUMMONTIGERS, 25s, 0, PHASE_TWO);    // Phase 2
                                 events.SetPhase(PHASE_TWO);
                             }
-                            events.ScheduleEvent(EVENT_RESURRECT_TIMER, 10000, 0, PHASE_ONE);
+                            events.ScheduleEvent(EVENT_RESURRECT_TIMER, 10s, 0, PHASE_ONE);
                             break;
                         case EVENT_CHECK_TIMER:
                             //Check_Timer for the death of LorKhan and Zath.
@@ -212,11 +212,11 @@ class boss_thekal : public CreatureScript
                                     }
                                 }
                             }
-                            events.ScheduleEvent(EVENT_CHECK_TIMER, 5000, 0, PHASE_ONE);
+                            events.ScheduleEvent(EVENT_CHECK_TIMER, 5s, 0, PHASE_ONE);
                             break;
                         case EVENT_FRENZY:
                             DoCast(me, SPELL_FRENZY);
-                            events.ScheduleEvent(EVENT_FRENZY, 30000, 0, PHASE_TWO);
+                            events.ScheduleEvent(EVENT_FRENZY, 30s, 0, PHASE_TWO);
                             break;
                         case EVENT_FORCEPUNCH:
                             DoCastVictim(SPELL_FORCEPUNCH, true);
@@ -237,7 +237,7 @@ class boss_thekal : public CreatureScript
                                 DoCast(me, SPELL_ENRAGE);
                                 Enraged = true;
                             }
-                            events.ScheduleEvent(EVENT_ENRAGE, 30000);
+                            events.ScheduleEvent(EVENT_ENRAGE, 30s);
                             break;
                         case EVENT_SUMMONTIGERS:
                             DoCastVictim(SPELL_SUMMONTIGERS, true);
diff --git a/src/server/scripts/EasternKingdoms/ZulGurub/boss_venoxis.cpp b/src/server/scripts/EasternKingdoms/ZulGurub/boss_venoxis.cpp
index 069c3669b0c..7375c69884f 100644
--- a/src/server/scripts/EasternKingdoms/ZulGurub/boss_venoxis.cpp
+++ b/src/server/scripts/EasternKingdoms/ZulGurub/boss_venoxis.cpp
@@ -125,13 +125,13 @@ class boss_venoxis : public CreatureScript
                 _JustEngagedWith();
                 me->SetReactState(REACT_AGGRESSIVE);
                 // Always running events
-                events.ScheduleEvent(EVENT_THRASH, 5000);
+                events.ScheduleEvent(EVENT_THRASH, 5s);
                 // Phase one events (regular form)
-                events.ScheduleEvent(EVENT_HOLY_NOVA, 5000, 0, PHASE_ONE);
-                events.ScheduleEvent(EVENT_DISPEL_MAGIC, 35000, 0, PHASE_ONE);
-                events.ScheduleEvent(EVENT_HOLY_FIRE, 10000, 0, PHASE_ONE);
-                events.ScheduleEvent(EVENT_RENEW, 30000, 0, PHASE_ONE);
-                events.ScheduleEvent(EVENT_HOLY_WRATH, 60000, 0, PHASE_ONE);
+                events.ScheduleEvent(EVENT_HOLY_NOVA, 5s, 0, PHASE_ONE);
+                events.ScheduleEvent(EVENT_DISPEL_MAGIC, 35s, 0, PHASE_ONE);
+                events.ScheduleEvent(EVENT_HOLY_FIRE, 10s, 0, PHASE_ONE);
+                events.ScheduleEvent(EVENT_RENEW, 30s, 0, PHASE_ONE);
+                events.ScheduleEvent(EVENT_HOLY_WRATH, 1min, 0, PHASE_ONE);
 
                 events.SetPhase(PHASE_ONE);
 
@@ -146,13 +146,13 @@ class boss_venoxis : public CreatureScript
                 {
                     _transformed = true;
                     // schedule the event that changes our phase
-                    events.ScheduleEvent(EVENT_TRANSFORM, 100);
+                    events.ScheduleEvent(EVENT_TRANSFORM, 100ms);
                 }
                 // we're losing health, bad, go frenzy
                 else if (!_frenzied && !HealthAbovePct(20))
                 {
                     _frenzied = true;
-                    events.ScheduleEvent(EVENT_FRENZY, 100);
+                    events.ScheduleEvent(EVENT_FRENZY, 100ms);
                 }
             }
 
@@ -174,7 +174,7 @@ class boss_venoxis : public CreatureScript
                         // thrash is available in all phases
                         case EVENT_THRASH:
                             DoCast(me, SPELL_THRASH, true);
-                            events.ScheduleEvent(EVENT_THRASH, urand(10000, 20000));
+                            events.ScheduleEvent(EVENT_THRASH, 10s, 20s);
                             break;
                         // troll form spells and Actions (first part)
                         case EVENT_DISPEL_MAGIC:
@@ -230,7 +230,7 @@ class boss_venoxis : public CreatureScript
                         case EVENT_PARASITIC_SERPENT:
                             if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM))
                                 DoCast(target, SPELL_SUMMON_PARASITIC_SERPENT);
-                            events.ScheduleEvent(EVENT_PARASITIC_SERPENT, 15000, 0, PHASE_TWO);
+                            events.ScheduleEvent(EVENT_PARASITIC_SERPENT, 15s, 0, PHASE_TWO);
                             break;
                         case EVENT_FRENZY:
                             // frenzy at 20% health
@@ -248,9 +248,9 @@ class boss_venoxis : public CreatureScript
                             ResetThreatList();
 
                             // phase two events (snakeform)
-                            events.ScheduleEvent(EVENT_VENOM_SPIT, 5000, 0, PHASE_TWO);
-                            events.ScheduleEvent(EVENT_POISON_CLOUD, 10000, 0, PHASE_TWO);
-                            events.ScheduleEvent(EVENT_PARASITIC_SERPENT, 30000, 0, PHASE_TWO);
+                            events.ScheduleEvent(EVENT_VENOM_SPIT, 5s, 0, PHASE_TWO);
+                            events.ScheduleEvent(EVENT_POISON_CLOUD, 10s, 0, PHASE_TWO);
+                            events.ScheduleEvent(EVENT_PARASITIC_SERPENT, 30s, 0, PHASE_TWO);
 
                             // transformed, start phase two
                             events.SetPhase(PHASE_TWO);
diff --git a/src/server/scripts/EasternKingdoms/ZulGurub/boss_wushoolay.cpp b/src/server/scripts/EasternKingdoms/ZulGurub/boss_wushoolay.cpp
index fdfcaf48190..51be8ea5f3e 100644
--- a/src/server/scripts/EasternKingdoms/ZulGurub/boss_wushoolay.cpp
+++ b/src/server/scripts/EasternKingdoms/ZulGurub/boss_wushoolay.cpp
@@ -61,8 +61,8 @@ class boss_wushoolay : public CreatureScript
             void JustEngagedWith(Unit* /*who*/) override
             {
                 _JustEngagedWith();
-                events.ScheduleEvent(EVENT_LIGHTNINGCLOUD, urand(5000, 10000));
-                events.ScheduleEvent(EVENT_LIGHTNINGWAVE, urand(8000, 16000));
+                events.ScheduleEvent(EVENT_LIGHTNINGCLOUD, 5s, 10s);
+                events.ScheduleEvent(EVENT_LIGHTNINGWAVE, 8s, 16s);
             }
 
             void UpdateAI(uint32 diff) override
@@ -81,11 +81,11 @@ class boss_wushoolay : public CreatureScript
                     {
                         case EVENT_LIGHTNINGCLOUD:
                             DoCastVictim(SPELL_LIGHTNINGCLOUD, true);
-                            events.ScheduleEvent(EVENT_LIGHTNINGCLOUD, urand(15000, 20000));
+                            events.ScheduleEvent(EVENT_LIGHTNINGCLOUD, 15s, 20s);
                             break;
                         case EVENT_LIGHTNINGWAVE:
                             DoCast(SelectTarget(SELECT_TARGET_RANDOM, 0, 100, true), SPELL_LIGHTNINGWAVE);
-                            events.ScheduleEvent(EVENT_LIGHTNINGWAVE, urand(12000, 16000));
+                            events.ScheduleEvent(EVENT_LIGHTNINGWAVE, 12s, 16s);
                             break;
                         default:
                             break;
diff --git a/src/server/scripts/EasternKingdoms/zone_duskwood.cpp b/src/server/scripts/EasternKingdoms/zone_duskwood.cpp
index f3a8e575196..5fffe164336 100644
--- a/src/server/scripts/EasternKingdoms/zone_duskwood.cpp
+++ b/src/server/scripts/EasternKingdoms/zone_duskwood.cpp
@@ -76,7 +76,7 @@ public:
         {
             Talk(YELL_TWILIGHT_CORRUPTOR_AGGRO);
             _events.ScheduleEvent(EVENT_SOUL_CORRUPTION, 15000);
-            _events.ScheduleEvent(EVENT_CREATURE_OF_NIGHTMARE, 30000);
+            _events.ScheduleEvent(EVENT_CREATURE_OF_NIGHTMARE, 30s);
         }
 
         void KilledUnit(Unit* victim) override
@@ -110,7 +110,7 @@ public:
                 {
                     case EVENT_SOUL_CORRUPTION:
                         DoCastAOE(SPELL_SOUL_CORRUPTION);
-                        _events.ScheduleEvent(EVENT_SOUL_CORRUPTION, urand(15000, 19000));
+                        _events.ScheduleEvent(EVENT_SOUL_CORRUPTION, 15s, 19s);
                         break;
                     case EVENT_CREATURE_OF_NIGHTMARE:
                         if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0, 0.0f, true))
diff --git a/src/server/scripts/EasternKingdoms/zone_tirisfal_glades.cpp b/src/server/scripts/EasternKingdoms/zone_tirisfal_glades.cpp
index 579aa03182a..474c94ccb98 100644
--- a/src/server/scripts/EasternKingdoms/zone_tirisfal_glades.cpp
+++ b/src/server/scripts/EasternKingdoms/zone_tirisfal_glades.cpp
@@ -78,7 +78,7 @@ public:
                 damage = 0;
                 me->CombatStop(true);
                 EnterEvadeMode();
-                _events.ScheduleEvent(EVENT_EMOTE_RUDE, Seconds(3));
+                _events.ScheduleEvent(EVENT_EMOTE_RUDE, 3s);
             }
         }
 
@@ -92,22 +92,22 @@ public:
                 {
                     case EVENT_EMOTE_RUDE:
                         me->HandleEmoteCommand(EMOTE_ONESHOT_RUDE);
-                        _events.ScheduleEvent(EVENT_TALK, Seconds(2));
+                        _events.ScheduleEvent(EVENT_TALK, 2s);
                         break;
                     case EVENT_TALK:
                         Talk(SAY_COMPLETE);
-                        _events.ScheduleEvent(EVENT_DRINK, Seconds(5));
+                        _events.ScheduleEvent(EVENT_DRINK, 5s);
                         break;
                     case EVENT_DRINK:
                         if (Player* player = ObjectAccessor::GetPlayer(*me, _playerGUID))
                             player->AreaExploredOrEventHappens(QUEST_590);
                         _playerGUID.Clear();
                         DoCastSelf(SPELL_DRINK);
-                        _events.ScheduleEvent(EVENT_SET_QUESTGIVER_FLAG, Seconds(12));
+                        _events.ScheduleEvent(EVENT_SET_QUESTGIVER_FLAG, 12s);
                         break;
                     case EVENT_SET_QUESTGIVER_FLAG:
                         me->SetFlag(UNIT_NPC_FLAGS, UNIT_NPC_FLAG_QUESTGIVER);
-                        _events.ScheduleEvent(EVENT_STAND, Seconds(3));
+                        _events.ScheduleEvent(EVENT_STAND, 3s);
                         break;
                     case EVENT_STAND:
                         me->SetStandState(UNIT_STAND_STATE_STAND);
diff --git a/src/server/scripts/EasternKingdoms/zone_undercity.cpp b/src/server/scripts/EasternKingdoms/zone_undercity.cpp
index c03ec16bfb0..03031998dbb 100644
--- a/src/server/scripts/EasternKingdoms/zone_undercity.cpp
+++ b/src/server/scripts/EasternKingdoms/zone_undercity.cpp
@@ -126,11 +126,11 @@ public:
         void JustEngagedWith(Unit* /*who*/) override
         {
             DoPlaySoundToSet(me, SOUND_AGGRO);
-            _events.ScheduleEvent(EVENT_FADE, 30000);
-            _events.ScheduleEvent(EVENT_SUMMON_SKELETON, 20000);
+            _events.ScheduleEvent(EVENT_FADE, 30s);
+            _events.ScheduleEvent(EVENT_SUMMON_SKELETON, 20s);
             _events.ScheduleEvent(EVENT_BLACK_ARROW, 15000);
-            _events.ScheduleEvent(EVENT_SHOOT, 8000);
-            _events.ScheduleEvent(EVENT_MULTI_SHOT, 10000);
+            _events.ScheduleEvent(EVENT_SHOOT, 8s);
+            _events.ScheduleEvent(EVENT_MULTI_SHOT, 10s);
         }
 
         void SetGUID(ObjectGuid const& guid, int32 id) override
@@ -146,8 +146,8 @@ public:
                 for (uint8 i = 0; i < 4; ++i)
                     me->SummonCreature(NPC_HIGHBORNE_LAMENTER, HighborneLoc[i][0], HighborneLoc[i][1], HIGHBORNE_LOC_Y, HighborneLoc[i][2], TEMPSUMMON_TIMED_DESPAWN, 160000);
 
-                _events.ScheduleEvent(EVENT_LAMENT_OF_THE_HIGHBORN, 2000);
-                _events.ScheduleEvent(EVENT_SUNSORROW_WHISPER, 10000);
+                _events.ScheduleEvent(EVENT_LAMENT_OF_THE_HIGHBORN, 2s);
+                _events.ScheduleEvent(EVENT_SUNSORROW_WHISPER, 10s);
             }
         }
 
@@ -189,26 +189,26 @@ public:
                         if (Unit* victim = me->GetVictim())
                             if (me->GetDistance(victim) > 10.0f)
                                 DoCast(victim, SPELL_MULTI_SHOT);
-                        _events.ScheduleEvent(EVENT_FADE, urand(30000, 35000));
+                        _events.ScheduleEvent(EVENT_FADE, 30s, 35s);
                         break;
                     case EVENT_SUMMON_SKELETON:
                         DoCast(me, SPELL_SUMMON_SKELETON);
-                        _events.ScheduleEvent(EVENT_SUMMON_SKELETON, urand(20000, 30000));
+                        _events.ScheduleEvent(EVENT_SUMMON_SKELETON, 20s, 30s);
                         break;
                     case EVENT_BLACK_ARROW:
                         if (Unit* victim = me->GetVictim())
                             DoCast(victim, SPELL_BLACK_ARROW);
-                        _events.ScheduleEvent(EVENT_BLACK_ARROW, urand(15000, 20000));
+                        _events.ScheduleEvent(EVENT_BLACK_ARROW, 15s, 20s);
                         break;
                     case EVENT_SHOOT:
                         if (Unit* victim = me->GetVictim())
                             DoCast(victim, SPELL_SHOT);
-                        _events.ScheduleEvent(EVENT_SHOOT, urand(8000, 10000));
+                        _events.ScheduleEvent(EVENT_SHOOT, 8s, 10s);
                         break;
                     case EVENT_MULTI_SHOT:
                         if (Unit* victim = me->GetVictim())
                             DoCast(victim, SPELL_MULTI_SHOT);
-                        _events.ScheduleEvent(EVENT_MULTI_SHOT, urand(10000, 13000));
+                        _events.ScheduleEvent(EVENT_MULTI_SHOT, 10s, 13s);
                         break;
                     case EVENT_LAMENT_OF_THE_HIGHBORN:
                         if (!me->HasAura(SPELL_SYLVANAS_CAST))
@@ -222,7 +222,7 @@ public:
                         else
                         {
                             DoSummon(NPC_HIGHBORNE_BUNNY, me, 10.0f, 3000, TEMPSUMMON_TIMED_DESPAWN);
-                            _events.ScheduleEvent(EVENT_LAMENT_OF_THE_HIGHBORN, 2000);
+                            _events.ScheduleEvent(EVENT_LAMENT_OF_THE_HIGHBORN, 2s);
                         }
                         break;
                     case EVENT_SUNSORROW_WHISPER:
diff --git a/src/server/scripts/Events/fireworks_show.cpp b/src/server/scripts/Events/fireworks_show.cpp
index 72fac1e76a7..09671f11140 100644
--- a/src/server/scripts/Events/fireworks_show.cpp
+++ b/src/server/scripts/Events/fireworks_show.cpp
@@ -804,15 +804,15 @@ public:
             // Start
             if ((localTm.tm_min == 0 && localTm.tm_sec == 0) && !_started && (IsHolidayActive(HOLIDAY_FIREWORKS_SPECTACULAR) || IsEventActive(GAME_EVENT_NEW_YEAR)))
             {
-                _events.ScheduleEvent(EVENT_CHEER, Seconds(1));
-                _events.ScheduleEvent(EVENT_FIRE, Seconds(1));
+                _events.ScheduleEvent(EVENT_CHEER, 1s);
+                _events.ScheduleEvent(EVENT_FIRE, 1s);
                 _started = true;
             }
 
             // Event is active
             if ((localTm.tm_min >= 0 && localTm.tm_sec >= 1 && localTm.tm_min <= 9 && localTm.tm_sec <= 59 && !_started) && (IsHolidayActive(HOLIDAY_FIREWORKS_SPECTACULAR) || IsEventActive(GAME_EVENT_NEW_YEAR)))
             {
-                _events.ScheduleEvent(EVENT_FIRE, Seconds(1));
+                _events.ScheduleEvent(EVENT_FIRE, 1s);
                 _started = true;
             }
 
@@ -820,7 +820,7 @@ public:
             if ((localTm.tm_min == 10 && localTm.tm_sec == 0) && _started == true)
             {
                 _started = false;
-                _events.ScheduleEvent(EVENT_CHEER, Seconds(1));
+                _events.ScheduleEvent(EVENT_CHEER, 1s);
                 _events.CancelEvent(EVENT_FIRE);
             }
 
@@ -828,17 +828,17 @@ public:
             if ((localTm.tm_min == 10 && localTm.tm_sec == 30 && localTm.tm_hour == 0) && IsEventActive(GAME_EVENT_NEW_YEAR) && _big == true)
             {
                 _big = false;
-                _events.ScheduleEvent(EVENT_CHEER, Seconds(1));
-                _events.ScheduleEvent(EVENT_FIRE, Seconds(1));
-                _events.ScheduleEvent(EVENT_FIRE, Seconds(1));
-                _events.ScheduleEvent(EVENT_FIRE, Seconds(1));
-                _events.ScheduleEvent(EVENT_FIRE, Seconds(1));
-                _events.ScheduleEvent(EVENT_FIRE, Seconds(1));
-                _events.ScheduleEvent(EVENT_FIRE, Seconds(1));
-                _events.ScheduleEvent(EVENT_FIRE, Seconds(1));
-                _events.ScheduleEvent(EVENT_FIRE, Seconds(1));
-                _events.ScheduleEvent(EVENT_FIRE, Seconds(1));
-                _events.ScheduleEvent(EVENT_FIRE, Seconds(1));
+                _events.ScheduleEvent(EVENT_CHEER, 1s);
+                _events.ScheduleEvent(EVENT_FIRE, 1s);
+                _events.ScheduleEvent(EVENT_FIRE, 1s);
+                _events.ScheduleEvent(EVENT_FIRE, 1s);
+                _events.ScheduleEvent(EVENT_FIRE, 1s);
+                _events.ScheduleEvent(EVENT_FIRE, 1s);
+                _events.ScheduleEvent(EVENT_FIRE, 1s);
+                _events.ScheduleEvent(EVENT_FIRE, 1s);
+                _events.ScheduleEvent(EVENT_FIRE, 1s);
+                _events.ScheduleEvent(EVENT_FIRE, 1s);
+                _events.ScheduleEvent(EVENT_FIRE, 1s);
             }
 
             while (uint32 eventId = _events.ExecuteEvent())
@@ -877,7 +877,7 @@ public:
                         }
 
                         if (_started == true)
-                            _events.ScheduleEvent(EVENT_FIRE, Seconds(1), Seconds(2));
+                            _events.ScheduleEvent(EVENT_FIRE, 1s, 2s);
 
                         break;
                     }
diff --git a/src/server/scripts/Kalimdor/BlackfathomDeeps/boss_aku_mai.cpp b/src/server/scripts/Kalimdor/BlackfathomDeeps/boss_aku_mai.cpp
index 51d38df8122..171ad327ba2 100644
--- a/src/server/scripts/Kalimdor/BlackfathomDeeps/boss_aku_mai.cpp
+++ b/src/server/scripts/Kalimdor/BlackfathomDeeps/boss_aku_mai.cpp
@@ -57,7 +57,7 @@ public:
         void JustEngagedWith(Unit* /*who*/) override
         {
             _JustEngagedWith();
-            events.ScheduleEvent(EVENT_POISON_CLOUD, urand(5000, 9000));
+            events.ScheduleEvent(EVENT_POISON_CLOUD, 5s, 9s);
         }
 
         void DamageTaken(Unit* /*atacker*/, uint32 &damage) override
@@ -75,7 +75,7 @@ public:
             {
                 case EVENT_POISON_CLOUD:
                     DoCastVictim(SPELL_POISON_CLOUD);
-                    events.ScheduleEvent(EVENT_POISON_CLOUD, urand(25000, 50000));
+                    events.ScheduleEvent(EVENT_POISON_CLOUD, 25s, 50s);
                     break;
                 default:
                     break;
diff --git a/src/server/scripts/Kalimdor/BlackfathomDeeps/boss_gelihast.cpp b/src/server/scripts/Kalimdor/BlackfathomDeeps/boss_gelihast.cpp
index 69d7409c1c1..4b68bb69deb 100644
--- a/src/server/scripts/Kalimdor/BlackfathomDeeps/boss_gelihast.cpp
+++ b/src/server/scripts/Kalimdor/BlackfathomDeeps/boss_gelihast.cpp
@@ -41,7 +41,7 @@ public:
         void JustEngagedWith(Unit* /*who*/) override
         {
             _JustEngagedWith();
-            events.ScheduleEvent(EVENT_THROW_NET, urand(2000, 4000));
+            events.ScheduleEvent(EVENT_THROW_NET, 2s, 4s);
         }
 
         void UpdateAI(uint32 diff) override
@@ -56,7 +56,7 @@ public:
                 if (eventId == EVENT_THROW_NET)
                 {
                     DoCastVictim(SPELL_NET);
-                    events.ScheduleEvent(EVENT_THROW_NET, urand(4000, 7000));
+                    events.ScheduleEvent(EVENT_THROW_NET, 4s, 7s);
                 }
             }
 
diff --git a/src/server/scripts/Kalimdor/BlackfathomDeeps/boss_kelris.cpp b/src/server/scripts/Kalimdor/BlackfathomDeeps/boss_kelris.cpp
index f78c0bf6dbb..fa71fd98c51 100644
--- a/src/server/scripts/Kalimdor/BlackfathomDeeps/boss_kelris.cpp
+++ b/src/server/scripts/Kalimdor/BlackfathomDeeps/boss_kelris.cpp
@@ -51,8 +51,8 @@ public:
         {
             _JustEngagedWith();
             Talk(SAY_AGGRO);
-            events.ScheduleEvent(EVENT_MIND_BLAST, urand(2000, 5000));
-            events.ScheduleEvent(EVENT_SLEEP, urand(9000, 12000));
+            events.ScheduleEvent(EVENT_MIND_BLAST, 2s, 5s);
+            events.ScheduleEvent(EVENT_SLEEP, 9s, 12s);
         }
 
         void JustDied(Unit* /*killer*/) override
@@ -77,7 +77,7 @@ public:
                 {
                     case EVENT_MIND_BLAST:
                         DoCastVictim(SPELL_MIND_BLAST);
-                        events.ScheduleEvent(EVENT_MIND_BLAST, urand(7000, 9000));
+                        events.ScheduleEvent(EVENT_MIND_BLAST, 7s, 9s);
                         break;
                     case EVENT_SLEEP:
                         if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0, 100, true))
@@ -85,7 +85,7 @@ public:
                             Talk(SAY_SLEEP);
                             DoCast(target, SPELL_SLEEP);
                         }
-                        events.ScheduleEvent(EVENT_SLEEP, urand(15000, 20000));
+                        events.ScheduleEvent(EVENT_SLEEP, 15s, 20s);
                         break;
                     default:
                         break;
diff --git a/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/boss_archimonde.cpp b/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/boss_archimonde.cpp
index 6efe482eac9..2510d33bae4 100644
--- a/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/boss_archimonde.cpp
+++ b/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/boss_archimonde.cpp
@@ -304,14 +304,14 @@ public:
         {
             Talk(SAY_AGGRO);
             _JustEngagedWith();
-            events.ScheduleEvent(EVENT_FEAR, 42000);
-            events.ScheduleEvent(EVENT_AIR_BURST, 30000);
-            events.ScheduleEvent(EVENT_GRIP_OF_THE_LEGION, urand(5000, 25000));
-            events.ScheduleEvent(EVENT_DOOMFIRE, 20000);
-            events.ScheduleEvent(EVENT_UNLEASH_SOUL_CHARGE, urand(2000, 30000));
-            events.ScheduleEvent(EVENT_FINGER_OF_DEATH, 15000);
-            events.ScheduleEvent(EVENT_HAND_OF_DEATH, 600000);
-            events.ScheduleEvent(EVENT_DISTANCE_CHECK, 30000);
+            events.ScheduleEvent(EVENT_FEAR, 42s);
+            events.ScheduleEvent(EVENT_AIR_BURST, 30s);
+            events.ScheduleEvent(EVENT_GRIP_OF_THE_LEGION, 5s, 25s);
+            events.ScheduleEvent(EVENT_DOOMFIRE, 20s);
+            events.ScheduleEvent(EVENT_UNLEASH_SOUL_CHARGE, 2s, 30s);
+            events.ScheduleEvent(EVENT_FINGER_OF_DEATH, 15s);
+            events.ScheduleEvent(EVENT_HAND_OF_DEATH, 10min);
+            events.ScheduleEvent(EVENT_DISTANCE_CHECK, 30s);
         }
 
         void ExecuteEvent(uint32 eventId) override
@@ -320,7 +320,7 @@ public:
             {
                 case EVENT_HAND_OF_DEATH:
                     DoCastAOE(SPELL_HAND_OF_DEATH);
-                    events.ScheduleEvent(EVENT_HAND_OF_DEATH, 2000);
+                    events.ScheduleEvent(EVENT_HAND_OF_DEATH, 2s);
                     break;
                 case EVENT_UNLEASH_SOUL_CHARGE:
                     _chargeSpell = 0;
@@ -347,32 +347,32 @@ public:
                         me->RemoveAuraFromStack(_chargeSpell);
                         DoCastVictim(_unleashSpell);
                         SoulChargeCount--;
-                        events.ScheduleEvent(EVENT_UNLEASH_SOUL_CHARGE, urand(2000, 30000));
+                        events.ScheduleEvent(EVENT_UNLEASH_SOUL_CHARGE, 2s, 30s);
                     }
                     break;
                 case EVENT_FINGER_OF_DEATH:
                     if (!SelectTarget(SELECT_TARGET_RANDOM, 0, 5.0f)) // Checks if there are no targets in melee range
                     {
                         DoCast(SelectTarget(SELECT_TARGET_RANDOM, 0), SPELL_FINGER_OF_DEATH);
-                        events.ScheduleEvent(EVENT_FINGER_OF_DEATH, 1000);
+                        events.ScheduleEvent(EVENT_FINGER_OF_DEATH, 1s);
                     }
                     else
-                        events.ScheduleEvent(EVENT_FINGER_OF_DEATH, 5000);
+                        events.ScheduleEvent(EVENT_FINGER_OF_DEATH, 5s);
                     break;
                 case EVENT_GRIP_OF_THE_LEGION:
                     if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0))
                         DoCast(target, SPELL_GRIP_OF_THE_LEGION);
-                    events.ScheduleEvent(EVENT_GRIP_OF_THE_LEGION, urand(5000, 25000));
+                    events.ScheduleEvent(EVENT_GRIP_OF_THE_LEGION, 5s, 25s);
                     break;
                 case EVENT_AIR_BURST:
                     Talk(SAY_AIR_BURST);
                     if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 1))
                         DoCast(target, SPELL_AIR_BURST); //not on tank
-                    events.ScheduleEvent(EVENT_AIR_BURST, urand(25000, 40000));
+                    events.ScheduleEvent(EVENT_AIR_BURST, 25s, 40s);
                     break;
                 case EVENT_FEAR:
                     DoCastAOE(SPELL_FEAR);
-                    events.ScheduleEvent(EVENT_FEAR, 42000);
+                    events.ScheduleEvent(EVENT_FEAR, 42s);
                     break;
                 case EVENT_DOOMFIRE:
                     Talk(SAY_DOOMFIRE);
@@ -380,20 +380,20 @@ public:
                         SummonDoomfire(temp);
                     else
                         SummonDoomfire(me->GetVictim());
-                    events.ScheduleEvent(EVENT_DOOMFIRE, 20000);
+                    events.ScheduleEvent(EVENT_DOOMFIRE, 20s);
                     break;
                 case EVENT_DISTANCE_CHECK:
                     if (Creature* channelTrigger = instance->GetCreature(DATA_CHANNEL_TARGET))
                         if (me->IsWithinDistInMap(channelTrigger, 75.0f))
                             DoAction(ACTION_ENRAGE);
-                    events.ScheduleEvent(EVENT_DISTANCE_CHECK, 5000);
+                    events.ScheduleEvent(EVENT_DISTANCE_CHECK, 5s);
                     break;
                 case EVENT_SUMMON_WHISP:
                     DoSpawnCreature(NPC_ANCIENT_WISP, float(rand32() % 40), float(rand32() % 40), 0, 0, TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 15000);
                     ++WispCount;
                     if (WispCount >= 30)
                         me->KillSelf();
-                    events.ScheduleEvent(EVENT_SUMMON_WHISP, 1500);
+                    events.ScheduleEvent(EVENT_SUMMON_WHISP, 1500ms);
                     break;
                 default:
                     break;
@@ -415,7 +415,7 @@ public:
                     // All members of raid must get this buff
                     DoCastAOE(SPELL_PROTECTION_OF_ELUNE, true);
                     HasProtected = true;
-                    events.ScheduleEvent(EVENT_SUMMON_WHISP, 1500);
+                    events.ScheduleEvent(EVENT_SUMMON_WHISP, 1500ms);
                 }
             }
         }
@@ -445,7 +445,7 @@ public:
                         break;
                 }
 
-                events.ScheduleEvent(EVENT_UNLEASH_SOUL_CHARGE, urand(2000, 30000));
+                events.ScheduleEvent(EVENT_UNLEASH_SOUL_CHARGE, 2s, 30s);
                 ++SoulChargeCount;
             }
         }
diff --git a/src/server/scripts/Kalimdor/CavernsOfTime/CullingOfStratholme/boss_chrono_lord_epoch.cpp b/src/server/scripts/Kalimdor/CavernsOfTime/CullingOfStratholme/boss_chrono_lord_epoch.cpp
index 7c287a9a683..6d2189b4317 100644
--- a/src/server/scripts/Kalimdor/CavernsOfTime/CullingOfStratholme/boss_chrono_lord_epoch.cpp
+++ b/src/server/scripts/Kalimdor/CavernsOfTime/CullingOfStratholme/boss_chrono_lord_epoch.cpp
@@ -66,10 +66,10 @@ class boss_epoch : public CreatureScript
                 Talk(SAY_AGGRO);
                 _JustEngagedWith();
 
-                events.ScheduleEvent(EVENT_CURSE_OF_EXERTION, 9300);
+                events.ScheduleEvent(EVENT_CURSE_OF_EXERTION, 9300ms);
                 events.ScheduleEvent(EVENT_TIME_WARP, 25300);
                 events.ScheduleEvent(EVENT_TIME_STOP, 21300);
-                events.ScheduleEvent(EVENT_WOUNDING_STRIKE, 5300);
+                events.ScheduleEvent(EVENT_WOUNDING_STRIKE, 5300ms);
             }
 
             void ExecuteEvent(uint32 eventId) override
@@ -79,7 +79,7 @@ class boss_epoch : public CreatureScript
                     case EVENT_CURSE_OF_EXERTION:
                         if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0, 100.0f, true))
                             DoCast(target, SPELL_CURSE_OF_EXERTION);
-                        events.ScheduleEvent(EVENT_CURSE_OF_EXERTION, 9300);
+                        events.ScheduleEvent(EVENT_CURSE_OF_EXERTION, 9300ms);
                         break;
                     case EVENT_TIME_WARP:
                         Talk(SAY_TIME_WARP);
@@ -92,7 +92,7 @@ class boss_epoch : public CreatureScript
                         break;
                     case EVENT_WOUNDING_STRIKE:
                         DoCastVictim(SPELL_WOUNDING_STRIKE);
-                        events.ScheduleEvent(EVENT_WOUNDING_STRIKE, 5300);
+                        events.ScheduleEvent(EVENT_WOUNDING_STRIKE, 5300ms);
                         break;
                     default:
                         break;
diff --git a/src/server/scripts/Kalimdor/CavernsOfTime/CullingOfStratholme/boss_infinite_corruptor.cpp b/src/server/scripts/Kalimdor/CavernsOfTime/CullingOfStratholme/boss_infinite_corruptor.cpp
index 789c650b61e..3b4a11fd1eb 100644
--- a/src/server/scripts/Kalimdor/CavernsOfTime/CullingOfStratholme/boss_infinite_corruptor.cpp
+++ b/src/server/scripts/Kalimdor/CavernsOfTime/CullingOfStratholme/boss_infinite_corruptor.cpp
@@ -64,8 +64,8 @@ class boss_infinite_corruptor : public CreatureScript
             {
                 Talk(SAY_AGGRO);
                 _JustEngagedWith();
-                events.ScheduleEvent(EVENT_CORRUPTING_BLIGHT, 7000);
-                events.ScheduleEvent(EVENT_VOID_STRIKE, 5000);
+                events.ScheduleEvent(EVENT_CORRUPTING_BLIGHT, 7s);
+                events.ScheduleEvent(EVENT_VOID_STRIKE, 5s);
             }
 
             void JustDied(Unit* /*killer*/) override
@@ -90,11 +90,11 @@ class boss_infinite_corruptor : public CreatureScript
                     case EVENT_CORRUPTING_BLIGHT:
                         if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0, 60.0f, true))
                             DoCast(target, SPELL_CORRUPTING_BLIGHT);
-                        events.ScheduleEvent(EVENT_CORRUPTING_BLIGHT, 17000);
+                        events.ScheduleEvent(EVENT_CORRUPTING_BLIGHT, 15s);
                         break;
                     case EVENT_VOID_STRIKE:
                         DoCastVictim(SPELL_VOID_STRIKE);
-                        events.ScheduleEvent(EVENT_VOID_STRIKE, 5000);
+                        events.ScheduleEvent(EVENT_VOID_STRIKE, 5s);
                         break;
                     default:
                         break;
diff --git a/src/server/scripts/Kalimdor/CavernsOfTime/CullingOfStratholme/boss_meathook.cpp b/src/server/scripts/Kalimdor/CavernsOfTime/CullingOfStratholme/boss_meathook.cpp
index 26e25312815..e0070f87aef 100644
--- a/src/server/scripts/Kalimdor/CavernsOfTime/CullingOfStratholme/boss_meathook.cpp
+++ b/src/server/scripts/Kalimdor/CavernsOfTime/CullingOfStratholme/boss_meathook.cpp
@@ -57,9 +57,9 @@ class boss_meathook : public CreatureScript
             {
                 Talk(SAY_AGGRO);
                 _JustEngagedWith();
-                events.ScheduleEvent(EVENT_CHAIN, urand(12000, 17000));
-                events.ScheduleEvent(EVENT_DISEASE, urand(2000, 4000));
-                events.ScheduleEvent(EVENT_FRENZY, urand(21000, 26000));
+                events.ScheduleEvent(EVENT_CHAIN, 12s, 17s);
+                events.ScheduleEvent(EVENT_DISEASE, 2s, 4s);
+                events.ScheduleEvent(EVENT_FRENZY, 21s, 26s);
             }
 
             void ExecuteEvent(uint32 eventId) override
@@ -69,15 +69,15 @@ class boss_meathook : public CreatureScript
                     case EVENT_CHAIN:
                         if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0, 100.0f, true))
                             DoCast(target, SPELL_CONSTRICTING_CHAINS);
-                        events.ScheduleEvent(EVENT_CHAIN, urand(2000, 4000));
+                        events.ScheduleEvent(EVENT_CHAIN, 2s, 4s);
                         break;
                     case EVENT_DISEASE:
                         DoCastAOE(SPELL_DISEASE_EXPULSION);
-                        events.ScheduleEvent(EVENT_DISEASE, urand(1500, 4000));
+                        events.ScheduleEvent(EVENT_DISEASE, 1500ms, 4s);
                         break;
                     case EVENT_FRENZY:
                         DoCast(me, SPELL_FRENZY);
-                        events.ScheduleEvent(EVENT_FRENZY, urand(21000, 26000));
+                        events.ScheduleEvent(EVENT_FRENZY, 21s, 26s);
                         break;
                     default:
                         break;
diff --git a/src/server/scripts/Kalimdor/CavernsOfTime/CullingOfStratholme/boss_salramm_the_fleshcrafter.cpp b/src/server/scripts/Kalimdor/CavernsOfTime/CullingOfStratholme/boss_salramm_the_fleshcrafter.cpp
index cd3eababe4e..a32084847f3 100644
--- a/src/server/scripts/Kalimdor/CavernsOfTime/CullingOfStratholme/boss_salramm_the_fleshcrafter.cpp
+++ b/src/server/scripts/Kalimdor/CavernsOfTime/CullingOfStratholme/boss_salramm_the_fleshcrafter.cpp
@@ -65,9 +65,9 @@ class boss_salramm : public CreatureScript
                 Talk(SAY_AGGRO);
                 _JustEngagedWith();
 
-                events.ScheduleEvent(EVENT_CURSE_FLESH, 30000);
-                events.ScheduleEvent(EVENT_SUMMON_GHOULS, urand(19000, 24000));
-                events.ScheduleEvent(EVENT_SHADOW_BOLT, urand(8000, 12000));
+                events.ScheduleEvent(EVENT_CURSE_FLESH, 30s);
+                events.ScheduleEvent(EVENT_SUMMON_GHOULS, 19s, 24s);
+                events.ScheduleEvent(EVENT_SHADOW_BOLT, 8s, 12s);
                 events.ScheduleEvent(EVENT_STEAL_FLESH, 12345); /// @todo: adjust timer
             }
 
@@ -77,18 +77,18 @@ class boss_salramm : public CreatureScript
                 {
                     case EVENT_CURSE_FLESH:
                         DoCastVictim(SPELL_CURSE_OF_TWISTED_FLESH);
-                        events.ScheduleEvent(EVENT_CURSE_FLESH, 37000);
+                        events.ScheduleEvent(EVENT_CURSE_FLESH, 35s);
                         break;
                     case EVENT_SUMMON_GHOULS:
                         Talk(SAY_SUMMON_GHOULS);
                         DoCast(me, SPELL_SUMMON_GHOULS);
-                        events.ScheduleEvent(EVENT_SUMMON_GHOULS, 10000);
-                        events.ScheduleEvent(EVENT_EXPLODE_GHOUL, 6000);
+                        events.ScheduleEvent(EVENT_SUMMON_GHOULS, 10s);
+                        events.ScheduleEvent(EVENT_EXPLODE_GHOUL, 6s);
                         break;
                     case EVENT_SHADOW_BOLT:
                         if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0, 40.0f, true))
                             DoCast(target, SPELL_SHADOW_BOLT);
-                        events.ScheduleEvent(EVENT_SHADOW_BOLT, urand(8000, 12000));
+                        events.ScheduleEvent(EVENT_SHADOW_BOLT, 8s, 12s);
                         break;
                     case EVENT_STEAL_FLESH:
                         Talk(SAY_STEAL_FLESH);
diff --git a/src/server/scripts/Kalimdor/CavernsOfTime/CullingOfStratholme/instance_culling_of_stratholme.cpp b/src/server/scripts/Kalimdor/CavernsOfTime/CullingOfStratholme/instance_culling_of_stratholme.cpp
index 323d027b2d0..9607e130ddc 100644
--- a/src/server/scripts/Kalimdor/CavernsOfTime/CullingOfStratholme/instance_culling_of_stratholme.cpp
+++ b/src/server/scripts/Kalimdor/CavernsOfTime/CullingOfStratholme/instance_culling_of_stratholme.cpp
@@ -313,7 +313,7 @@ class instance_culling_of_stratholme : public InstanceMapScript
                                 default:
                                     break;
                             }
-                            events.ScheduleEvent(EVENT_INFINITE_TIMER, 60000);
+                            events.ScheduleEvent(EVENT_INFINITE_TIMER, 1min);
                             --_eventTimer;
                             break;
                         default:
diff --git a/src/server/scripts/Kalimdor/CavernsOfTime/TheBlackMorass/boss_aeonus.cpp b/src/server/scripts/Kalimdor/CavernsOfTime/TheBlackMorass/boss_aeonus.cpp
index 25b30c130cf..bbae751f330 100644
--- a/src/server/scripts/Kalimdor/CavernsOfTime/TheBlackMorass/boss_aeonus.cpp
+++ b/src/server/scripts/Kalimdor/CavernsOfTime/TheBlackMorass/boss_aeonus.cpp
@@ -64,9 +64,9 @@ public:
 
         void JustEngagedWith(Unit* /*who*/) override
         {
-            events.ScheduleEvent(EVENT_SANDBREATH, urand(15000, 30000));
-            events.ScheduleEvent(EVENT_TIMESTOP, urand(10000, 15000));
-            events.ScheduleEvent(EVENT_FRENZY, urand(30000, 45000));
+            events.ScheduleEvent(EVENT_SANDBREATH, 15s, 30s);
+            events.ScheduleEvent(EVENT_TIMESTOP, 10s, 15s);
+            events.ScheduleEvent(EVENT_FRENZY, 30s, 45s);
 
             Talk(SAY_AGGRO);
         }
@@ -118,16 +118,16 @@ public:
                 {
                     case EVENT_SANDBREATH:
                         DoCastVictim(SPELL_SAND_BREATH);
-                        events.ScheduleEvent(EVENT_SANDBREATH, urand(15000, 25000));
+                        events.ScheduleEvent(EVENT_SANDBREATH, 15s, 25s);
                         break;
                     case EVENT_TIMESTOP:
                         DoCastVictim(SPELL_TIME_STOP);
-                        events.ScheduleEvent(EVENT_TIMESTOP, urand(20000, 35000));
+                        events.ScheduleEvent(EVENT_TIMESTOP, 20s, 35s);
                         break;
                     case EVENT_FRENZY:
                          Talk(EMOTE_FRENZY);
                          DoCast(me, SPELL_ENRAGE);
-                        events.ScheduleEvent(EVENT_FRENZY, urand(20000, 35000));
+                        events.ScheduleEvent(EVENT_FRENZY, 20s, 35s);
                         break;
                     default:
                         break;
diff --git a/src/server/scripts/Kalimdor/CavernsOfTime/TheBlackMorass/boss_chrono_lord_deja.cpp b/src/server/scripts/Kalimdor/CavernsOfTime/TheBlackMorass/boss_chrono_lord_deja.cpp
index 8b56ea6c275..f047b0a9677 100644
--- a/src/server/scripts/Kalimdor/CavernsOfTime/TheBlackMorass/boss_chrono_lord_deja.cpp
+++ b/src/server/scripts/Kalimdor/CavernsOfTime/TheBlackMorass/boss_chrono_lord_deja.cpp
@@ -65,11 +65,11 @@ public:
 
         void JustEngagedWith(Unit* /*who*/) override
         {
-            events.ScheduleEvent(EVENT_ARCANE_BLAST, urand(18000, 23000));
-            events.ScheduleEvent(EVENT_TIME_LAPSE, urand(10000, 15000));
-            events.ScheduleEvent(EVENT_ARCANE_DISCHARGE, urand(20000, 30000));
+            events.ScheduleEvent(EVENT_ARCANE_BLAST, 18s, 23s);
+            events.ScheduleEvent(EVENT_TIME_LAPSE, 10s, 15s);
+            events.ScheduleEvent(EVENT_ARCANE_DISCHARGE, 20s, 30s);
             if (IsHeroic())
-                events.ScheduleEvent(EVENT_ATTRACTION, urand(25000, 35000));
+                events.ScheduleEvent(EVENT_ATTRACTION, 25s, 35s);
 
             Talk(SAY_AGGRO);
         }
@@ -118,21 +118,21 @@ public:
                 {
                     case EVENT_ARCANE_BLAST:
                         DoCastVictim(SPELL_ARCANE_BLAST);
-                        events.ScheduleEvent(EVENT_ARCANE_BLAST, urand(15000, 25000));
+                        events.ScheduleEvent(EVENT_ARCANE_BLAST, 15s, 25s);
                         break;
                     case EVENT_TIME_LAPSE:
                         Talk(SAY_BANISH);
                         DoCast(me, SPELL_TIME_LAPSE);
-                        events.ScheduleEvent(EVENT_TIME_LAPSE, urand(15000, 25000));
+                        events.ScheduleEvent(EVENT_TIME_LAPSE, 15s, 25s);
                         break;
                     case EVENT_ARCANE_DISCHARGE:
                         if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0))
                             DoCast(target, SPELL_ARCANE_DISCHARGE);
-                        events.ScheduleEvent(EVENT_ARCANE_DISCHARGE, urand(20000, 30000));
+                        events.ScheduleEvent(EVENT_ARCANE_DISCHARGE, 20s, 30s);
                         break;
                     case EVENT_ATTRACTION: // Only in Heroic
                         DoCast(me, SPELL_ATTRACTION);
-                        events.ScheduleEvent(EVENT_ATTRACTION, urand(25000, 35000));
+                        events.ScheduleEvent(EVENT_ATTRACTION, 25s, 35s);
                         break;
                     default:
                         break;
diff --git a/src/server/scripts/Kalimdor/CavernsOfTime/TheBlackMorass/boss_temporus.cpp b/src/server/scripts/Kalimdor/CavernsOfTime/TheBlackMorass/boss_temporus.cpp
index c0d97f39c41..25a2b15fa11 100644
--- a/src/server/scripts/Kalimdor/CavernsOfTime/TheBlackMorass/boss_temporus.cpp
+++ b/src/server/scripts/Kalimdor/CavernsOfTime/TheBlackMorass/boss_temporus.cpp
@@ -64,11 +64,11 @@ public:
 
         void JustEngagedWith(Unit* /*who*/) override
         {
-            events.ScheduleEvent(EVENT_HASTE, urand(15000, 23000));
-            events.ScheduleEvent(EVENT_MORTAL_WOUND, 8000);
-            events.ScheduleEvent(EVENT_WING_BUFFET, urand(25000, 35000));
+            events.ScheduleEvent(EVENT_HASTE, 15s, 23s);
+            events.ScheduleEvent(EVENT_MORTAL_WOUND, 8s);
+            events.ScheduleEvent(EVENT_WING_BUFFET, 25s, 35s);
             if (IsHeroic())
-                events.ScheduleEvent(EVENT_SPELL_REFLECTION, 30000);
+                events.ScheduleEvent(EVENT_SPELL_REFLECTION, 30s);
 
             Talk(SAY_AGGRO);
         }
@@ -118,19 +118,19 @@ public:
                 {
                     case EVENT_HASTE:
                         DoCast(me, SPELL_HASTE);
-                        events.ScheduleEvent(EVENT_HASTE, urand(20000, 25000));
+                        events.ScheduleEvent(EVENT_HASTE, 20s, 25s);
                         break;
                     case EVENT_MORTAL_WOUND:
                         DoCast(me, SPELL_MORTAL_WOUND);
-                        events.ScheduleEvent(EVENT_MORTAL_WOUND, urand(10000, 20000));
+                        events.ScheduleEvent(EVENT_MORTAL_WOUND, 10s, 20s);
                         break;
                     case EVENT_WING_BUFFET:
                          DoCast(me, SPELL_WING_BUFFET);
-                        events.ScheduleEvent(EVENT_WING_BUFFET, urand(20000, 30000));
+                        events.ScheduleEvent(EVENT_WING_BUFFET, 20s, 30s);
                         break;
                     case EVENT_SPELL_REFLECTION: // Only in Heroic
                         DoCast(me, SPELL_REFLECT);
-                        events.ScheduleEvent(EVENT_SPELL_REFLECTION, urand(25000, 35000));
+                        events.ScheduleEvent(EVENT_SPELL_REFLECTION, 25s, 35s);
                         break;
                     default:
                         break;
diff --git a/src/server/scripts/Kalimdor/OnyxiasLair/boss_onyxia.cpp b/src/server/scripts/Kalimdor/OnyxiasLair/boss_onyxia.cpp
index e63f8e03453..44936216ad9 100644
--- a/src/server/scripts/Kalimdor/OnyxiasLair/boss_onyxia.cpp
+++ b/src/server/scripts/Kalimdor/OnyxiasLair/boss_onyxia.cpp
@@ -164,10 +164,10 @@ public:
         {
             _JustEngagedWith();
             Talk(SAY_AGGRO);
-            events.ScheduleEvent(EVENT_FLAME_BREATH, urand(10000, 20000));
-            events.ScheduleEvent(EVENT_TAIL_SWEEP, urand(15000, 20000));
-            events.ScheduleEvent(EVENT_CLEAVE, urand(2000, 5000));
-            events.ScheduleEvent(EVENT_WING_BUFFET, urand(10000, 20000));
+            events.ScheduleEvent(EVENT_FLAME_BREATH, 10s, 20s);
+            events.ScheduleEvent(EVENT_TAIL_SWEEP, 15s, 20s);
+            events.ScheduleEvent(EVENT_CLEAVE, 2s, 5s);
+            events.ScheduleEvent(EVENT_WING_BUFFET, 10s, 20s);
             instance->DoStartTimedAchievement(ACHIEVEMENT_TIMED_TYPE_EVENT, ACHIEV_TIMED_START_EVENT);
         }
 
@@ -239,11 +239,11 @@ public:
                             me->GetMotionMaster()->MoveChase(tank);
                         else if (Unit* newtarget = SelectTarget(SELECT_TARGET_MINDISTANCE, 0))
                             me->GetMotionMaster()->MoveChase(newtarget);
-                        events.ScheduleEvent(EVENT_BELLOWING_ROAR, 5000);
-                        events.ScheduleEvent(EVENT_FLAME_BREATH, urand(10000, 20000));
-                        events.ScheduleEvent(EVENT_TAIL_SWEEP, urand(15000, 20000));
-                        events.ScheduleEvent(EVENT_CLEAVE, urand(2000, 5000));
-                        events.ScheduleEvent(EVENT_WING_BUFFET, urand(15000, 30000));
+                        events.ScheduleEvent(EVENT_BELLOWING_ROAR, 5s);
+                        events.ScheduleEvent(EVENT_FLAME_BREATH, 10s, 20s);
+                        events.ScheduleEvent(EVENT_TAIL_SWEEP, 15s, 20s);
+                        events.ScheduleEvent(EVENT_CLEAVE, 2s, 5s);
+                        events.ScheduleEvent(EVENT_WING_BUFFET, 15s, 30s);
                         break;
                     case 10:
                         me->SetCanFly(true);
@@ -256,11 +256,11 @@ public:
                         me->SetSpeedRate(MOVE_FLIGHT, 1.0f);
                         Talk(SAY_PHASE_2_TRANS);
                         instance->SetData(DATA_ONYXIA_PHASE, Phase);
-                        events.ScheduleEvent(EVENT_WHELP_SPAWN, 5000);
+                        events.ScheduleEvent(EVENT_WHELP_SPAWN, 5s);
                         events.ScheduleEvent(EVENT_LAIR_GUARD, 15000);
                         events.ScheduleEvent(EVENT_DEEP_BREATH, 75000);
-                        events.ScheduleEvent(EVENT_MOVEMENT, 10000);
-                        events.ScheduleEvent(EVENT_FIREBALL, 18000);
+                        events.ScheduleEvent(EVENT_MOVEMENT, 10s);
+                        events.ScheduleEvent(EVENT_FIREBALL, 18s);
                         break;
                     case 11:
                         if (PointData)
@@ -362,24 +362,24 @@ public:
                             Cell::VisitGridObjects(me, searcher, 30.0f);
                             if (Floor)
                                 instance->SetGuidData(DATA_FLOOR_ERUPTION_GUID, Floor->GetGUID());
-                            events.ScheduleEvent(EVENT_BELLOWING_ROAR, 30000);
+                            events.ScheduleEvent(EVENT_BELLOWING_ROAR, 30s);
                             break;
                         }
                         case EVENT_FLAME_BREATH:   // Phase PHASE_START and PHASE_END
                             DoCastVictim(SPELL_FLAME_BREATH);
-                            events.ScheduleEvent(EVENT_FLAME_BREATH, urand(10000, 20000));
+                            events.ScheduleEvent(EVENT_FLAME_BREATH, 10s, 20s);
                             break;
                         case EVENT_TAIL_SWEEP:     // Phase PHASE_START and PHASE_END
                             DoCastAOE(SPELL_TAIL_SWEEP);
-                            events.ScheduleEvent(EVENT_TAIL_SWEEP, urand(15000, 20000));
+                            events.ScheduleEvent(EVENT_TAIL_SWEEP, 15s, 20s);
                             break;
                         case EVENT_CLEAVE:         // Phase PHASE_START and PHASE_END
                             DoCastVictim(SPELL_CLEAVE);
-                            events.ScheduleEvent(EVENT_CLEAVE, urand(2000, 5000));
+                            events.ScheduleEvent(EVENT_CLEAVE, 2s, 5s);
                             break;
                         case EVENT_WING_BUFFET:    // Phase PHASE_START and PHASE_END
                             DoCastVictim(SPELL_WING_BUFFET);
-                            events.ScheduleEvent(EVENT_WING_BUFFET, urand(15000, 30000));
+                            events.ScheduleEvent(EVENT_WING_BUFFET, 15s, 30s);
                             break;
                         default:
                             break;
@@ -401,7 +401,7 @@ public:
                     IsMoving = false;
                     Position const pos = me->GetHomePosition();
                     me->GetMotionMaster()->MovePoint(9, pos.GetPositionX(), pos.GetPositionY(), pos.GetPositionZ() + 12.0f);
-                    events.ScheduleEvent(EVENT_BELLOWING_ROAR, 30000);
+                    events.ScheduleEvent(EVENT_BELLOWING_ROAR, 30s);
                     return;
                 }
 
@@ -430,7 +430,7 @@ public:
                                 events.ScheduleEvent(EVENT_DEEP_BREATH, 75000);
                             }
                             else
-                                events.ScheduleEvent(EVENT_DEEP_BREATH, 1000);
+                                events.ScheduleEvent(EVENT_DEEP_BREATH, 1s);
                             break;
                         case EVENT_MOVEMENT:         // Phase PHASE_BREATH
                             if (!IsMoving && !(me->HasUnitState(UNIT_STATE_CASTING)))
@@ -446,21 +446,21 @@ public:
                                 events.ScheduleEvent(EVENT_MOVEMENT, 25000);
                             }
                             else
-                                events.ScheduleEvent(EVENT_MOVEMENT, 500);
+                                events.ScheduleEvent(EVENT_MOVEMENT, 500ms);
                             break;
                         case EVENT_FIREBALL:         // Phase PHASE_BREATH
                             if (!IsMoving)
                             {
                                 if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0))
                                     DoCast(target, SPELL_FIREBALL);
-                                events.ScheduleEvent(EVENT_FIREBALL, 8000);
+                                events.ScheduleEvent(EVENT_FIREBALL, 8s);
                             }
                             else
-                                events.ScheduleEvent(EVENT_FIREBALL, 1000);
+                                events.ScheduleEvent(EVENT_FIREBALL, 1s);
                             break;
                         case EVENT_LAIR_GUARD:       // Phase PHASE_BREATH
                             me->SummonCreature(NPC_LAIRGUARD, SpawnLocations[2], TEMPSUMMON_CORPSE_DESPAWN);
-                            events.ScheduleEvent(EVENT_LAIR_GUARD, 30000);
+                            events.ScheduleEvent(EVENT_LAIR_GUARD, 30s);
                             break;
                         case EVENT_WHELP_SPAWN:      // Phase PHASE_BREATH
                             me->SummonCreature(NPC_WHELP, SpawnLocations[0], TEMPSUMMON_CORPSE_DESPAWN);
@@ -468,10 +468,10 @@ public:
                             if (SummonWhelpCount >= RAID_MODE(20, 40))
                             {
                                 SummonWhelpCount = 0;
-                                events.ScheduleEvent(EVENT_WHELP_SPAWN, 90000);
+                                events.ScheduleEvent(EVENT_WHELP_SPAWN, 90s);
                             }
                             else
-                                events.ScheduleEvent(EVENT_WHELP_SPAWN, 500);
+                                events.ScheduleEvent(EVENT_WHELP_SPAWN, 500ms);
                             break;
                         default:
                             break;
diff --git a/src/server/scripts/Kalimdor/RazorfenDowns/boss_amnennar_the_coldbringer.cpp b/src/server/scripts/Kalimdor/RazorfenDowns/boss_amnennar_the_coldbringer.cpp
index 1e7c3e2343e..f744e36da36 100644
--- a/src/server/scripts/Kalimdor/RazorfenDowns/boss_amnennar_the_coldbringer.cpp
+++ b/src/server/scripts/Kalimdor/RazorfenDowns/boss_amnennar_the_coldbringer.cpp
@@ -71,9 +71,9 @@ public:
         void JustEngagedWith(Unit* /*who*/) override
         {
             _JustEngagedWith();
-            events.ScheduleEvent(EVENT_AMNENNARSWRATH, 8000);
-            events.ScheduleEvent(EVENT_FROSTBOLT, 1000);
-            events.ScheduleEvent(EVENT_FROST_NOVA, urand(10000, 15000));
+            events.ScheduleEvent(EVENT_AMNENNARSWRATH, 8s);
+            events.ScheduleEvent(EVENT_FROSTBOLT, 1s);
+            events.ScheduleEvent(EVENT_FROST_NOVA, 10s, 15s);
             Talk(SAY_AGGRO);
         }
 
@@ -104,15 +104,15 @@ public:
                 {
                     case EVENT_AMNENNARSWRATH:
                         DoCastVictim(SPELL_AMNENNARSWRATH);
-                        events.ScheduleEvent(EVENT_AMNENNARSWRATH, 12000);
+                        events.ScheduleEvent(EVENT_AMNENNARSWRATH, 12s);
                         break;
                     case EVENT_FROSTBOLT:
                         DoCastVictim(SPELL_FROSTBOLT);
-                        events.ScheduleEvent(EVENT_FROSTBOLT, 8000);
+                        events.ScheduleEvent(EVENT_FROSTBOLT, 8s);
                         break;
                     case EVENT_FROST_NOVA:
                         DoCast(me, SPELL_FROST_NOVA);
-                        events.ScheduleEvent(EVENT_FROST_NOVA, 15000);
+                        events.ScheduleEvent(EVENT_FROST_NOVA, 15s);
                         break;
                 }
 
diff --git a/src/server/scripts/Kalimdor/RazorfenDowns/boss_mordresh_fire_eye.cpp b/src/server/scripts/Kalimdor/RazorfenDowns/boss_mordresh_fire_eye.cpp
index 1ae4a0d8ba3..437bcfb0abd 100644
--- a/src/server/scripts/Kalimdor/RazorfenDowns/boss_mordresh_fire_eye.cpp
+++ b/src/server/scripts/Kalimdor/RazorfenDowns/boss_mordresh_fire_eye.cpp
@@ -63,8 +63,8 @@ public:
             _JustEngagedWith();
             events.Reset();
             Talk(SAY_AGGRO);
-            events.ScheduleEvent(EVENT_FIREBALL, 100);
-            events.ScheduleEvent(EVENT_FIRE_NOVA, urand(8000, 12000));
+            events.ScheduleEvent(EVENT_FIREBALL, 100ms);
+            events.ScheduleEvent(EVENT_FIRE_NOVA, 8s, 12s);
         }
 
         void JustDied(Unit* /*killer*/) override
@@ -112,11 +112,11 @@ public:
                 {
                     case EVENT_FIREBALL:
                         DoCastVictim(SPELL_FIREBALL);
-                        events.ScheduleEvent(EVENT_FIREBALL, urand(2400, 3800));
+                        events.ScheduleEvent(EVENT_FIREBALL, 2400ms, 3800ms);
                         break;
                     case EVENT_FIRE_NOVA:
                         DoCast(me, SPELL_FIRE_NOVA);
-                        events.ScheduleEvent(EVENT_FIRE_NOVA, urand(11000, 16000));
+                        events.ScheduleEvent(EVENT_FIRE_NOVA, 11s, 16s);
                         break;
                 }
 
diff --git a/src/server/scripts/Kalimdor/RazorfenDowns/boss_tuten_kash.cpp b/src/server/scripts/Kalimdor/RazorfenDowns/boss_tuten_kash.cpp
index 2f7a6353675..9d801bdface 100644
--- a/src/server/scripts/Kalimdor/RazorfenDowns/boss_tuten_kash.cpp
+++ b/src/server/scripts/Kalimdor/RazorfenDowns/boss_tuten_kash.cpp
@@ -54,8 +54,8 @@ public:
         void JustEngagedWith(Unit* /*who*/) override
         {
             _JustEngagedWith();
-            events.ScheduleEvent(EVENT_WEB_SPRAY, urand(3000, 5000));
-            events.ScheduleEvent(EVENT_CURSE_OF_TUTENKASH, urand(9000, 14000));
+            events.ScheduleEvent(EVENT_WEB_SPRAY, 3s, 5s);
+            events.ScheduleEvent(EVENT_CURSE_OF_TUTENKASH, 9s, 14s);
         }
 
         void JustDied(Unit* /*killer*/) override
@@ -83,11 +83,11 @@ public:
                             if (!target->HasAura(SPELL_WEB_SPRAY))
                                 DoCast(target, SPELL_WEB_SPRAY);
                         }
-                        events.ScheduleEvent(EVENT_WEB_SPRAY, urand(6000, 8000));
+                        events.ScheduleEvent(EVENT_WEB_SPRAY, 6s, 8s);
                         break;
                     case EVENT_CURSE_OF_TUTENKASH:
                         DoCast(me, SPELL_CURSE_OF_TUTENKASH);
-                        events.ScheduleEvent(EVENT_CURSE_OF_TUTENKASH, urand(15000, 25000));
+                        events.ScheduleEvent(EVENT_CURSE_OF_TUTENKASH, 15s, 25s);
                         break;
                 }
 
diff --git a/src/server/scripts/Kalimdor/RazorfenDowns/razorfen_downs.cpp b/src/server/scripts/Kalimdor/RazorfenDowns/razorfen_downs.cpp
index 8f281d85bb6..08ca7b91e8d 100644
--- a/src/server/scripts/Kalimdor/RazorfenDowns/razorfen_downs.cpp
+++ b/src/server/scripts/Kalimdor/RazorfenDowns/razorfen_downs.cpp
@@ -116,8 +116,8 @@ public:
                 Talk(SAY_WATCH_OUT, who);
             else
             {
-                events.ScheduleEvent(EVENT_FIREBALL, 1000);
-                events.ScheduleEvent(EVENT_FROST_NOVA, urand(8000, 12000));
+                events.ScheduleEvent(EVENT_FIREBALL, 1s);
+                events.ScheduleEvent(EVENT_FROST_NOVA, 8s, 12s);
                 if (urand(0, 100) > 40)
                     Talk(SAY_AGGRO, who);
             }
@@ -146,7 +146,7 @@ public:
             if (type == WAYPOINT_MOTION_TYPE && id == POINT_REACH_IDOL)
             {
                 channeling = true;
-                events.ScheduleEvent(EVENT_CHANNEL, 2000);
+                events.ScheduleEvent(EVENT_CHANNEL, 2s);
             }
         }
 
@@ -164,14 +164,14 @@ public:
                     case EVENT_CHANNEL:
                         Talk(SAY_EVENT_START);
                         DoCast(me, SPELL_IDOL_SHUTDOWN_VISUAL);
-                        events.ScheduleEvent(EVENT_IDOL_ROOM_SPAWNER, 100);
+                        events.ScheduleEvent(EVENT_IDOL_ROOM_SPAWNER, 100ms);
                         events.ScheduleEvent(EVENT_PROGRESS, 120000);
                         break;
                     case EVENT_IDOL_ROOM_SPAWNER:
                         if (Creature* creature = me->SummonCreature(NPC_IDOL_ROOM_SPAWNER, PosSummonSpawner[urand(0,2)], TEMPSUMMON_TIMED_DESPAWN, 4000))
                             creature->AI()->SetData(0,spawnerCount);
                         if (++spawnerCount < 8)
-                            events.ScheduleEvent(EVENT_IDOL_ROOM_SPAWNER, 35000);
+                            events.ScheduleEvent(EVENT_IDOL_ROOM_SPAWNER, 35s);
                         break;
                     case EVENT_PROGRESS:
                     {
@@ -180,23 +180,23 @@ public:
                             case 0:
                                 Talk(SAY_EVENT_THREE_MIN_LEFT);
                                 ++eventProgress;
-                                 events.ScheduleEvent(EVENT_PROGRESS, 60000);
+                                 events.ScheduleEvent(EVENT_PROGRESS, 1min);
                                  break;
                             case 1:
                                 Talk(SAY_EVENT_TWO_MIN_LEFT);
                                 ++eventProgress;
-                                events.ScheduleEvent(EVENT_PROGRESS, 60000);
+                                events.ScheduleEvent(EVENT_PROGRESS, 1min);
                                 break;
                             case 2:
                                 Talk(SAY_EVENT_ONE_MIN_LEFT);
                                 ++eventProgress;
-                                events.ScheduleEvent(EVENT_PROGRESS, 60000);
+                                events.ScheduleEvent(EVENT_PROGRESS, 1min);
                                 break;
                             case 3:
                                 events.CancelEvent(EVENT_IDOL_ROOM_SPAWNER);
                                 me->InterruptSpell(CURRENT_CHANNELED_SPELL);
                                 Talk(SAY_EVENT_END);
-                                events.ScheduleEvent(EVENT_COMPLETE, 3000);
+                                events.ScheduleEvent(EVENT_COMPLETE, 3s);
                                 break;
                         }
                           break;
@@ -230,13 +230,13 @@ public:
                         if (me->HasUnitState(UNIT_STATE_CASTING) || !UpdateVictim())
                             return;
                         DoCastVictim(SPELL_FIREBALL);
-                        events.ScheduleEvent(EVENT_FIREBALL, 8000);
+                        events.ScheduleEvent(EVENT_FIREBALL, 8s);
                         break;
                     case EVENT_FROST_NOVA:
                         if (me->HasUnitState(UNIT_STATE_CASTING) || !UpdateVictim())
                             return;
                         DoCast(me, SPELL_FROST_NOVA);
-                        events.ScheduleEvent(EVENT_FROST_NOVA, 15000);
+                        events.ScheduleEvent(EVENT_FROST_NOVA, 15s);
                         break;
                 }
             }
@@ -333,7 +333,7 @@ public:
 
         void JustEngagedWith(Unit* /*who*/) override
         {
-            events.ScheduleEvent(EVENT_WEB, urand(5000, 8000));
+            events.ScheduleEvent(EVENT_WEB, 5s, 8s);
         }
 
         void UpdateAI(uint32 diff) override
@@ -349,7 +349,7 @@ public:
                 {
                     case EVENT_WEB:
                         DoCastVictim(SPELL_WEB);
-                        events.ScheduleEvent(EVENT_WEB, urand(7000, 16000));
+                        events.ScheduleEvent(EVENT_WEB, 7s, 16s);
                         break;
                 }
             }
diff --git a/src/server/scripts/Kalimdor/RuinsOfAhnQiraj/boss_ayamiss.cpp b/src/server/scripts/Kalimdor/RuinsOfAhnQiraj/boss_ayamiss.cpp
index 72a4f5e873a..f4427e0f6bd 100644
--- a/src/server/scripts/Kalimdor/RuinsOfAhnQiraj/boss_ayamiss.cpp
+++ b/src/server/scripts/Kalimdor/RuinsOfAhnQiraj/boss_ayamiss.cpp
@@ -142,11 +142,11 @@ class boss_ayamiss : public CreatureScript
             {
                 BossAI::JustEngagedWith(attacker);
 
-                events.ScheduleEvent(EVENT_STINGER_SPRAY, urand(20000, 30000));
-                events.ScheduleEvent(EVENT_POISON_STINGER, 5000);
-                events.ScheduleEvent(EVENT_SUMMON_SWARMER, 5000);
-                events.ScheduleEvent(EVENT_SWARMER_ATTACK, 60000);
-                events.ScheduleEvent(EVENT_PARALYZE, 15000);
+                events.ScheduleEvent(EVENT_STINGER_SPRAY, 20s, 30s);
+                events.ScheduleEvent(EVENT_POISON_STINGER, 5s);
+                events.ScheduleEvent(EVENT_SUMMON_SWARMER, 5s);
+                events.ScheduleEvent(EVENT_SWARMER_ATTACK, 1min);
+                events.ScheduleEvent(EVENT_PARALYZE, 15s);
 
                 me->SetCanFly(true);
                 me->SetDisableGravity(true);
@@ -171,8 +171,8 @@ class boss_ayamiss : public CreatureScript
                         me->GetMotionMaster()->MovePoint(POINT_GROUND, VictimPos);
                     }
                     ResetThreatList();
-                    events.ScheduleEvent(EVENT_LASH, urand(5000, 8000));
-                    events.ScheduleEvent(EVENT_TRASH, urand(3000, 6000));
+                    events.ScheduleEvent(EVENT_LASH, 5s, 8s);
+                    events.ScheduleEvent(EVENT_TRASH, 3s, 6s);
                     events.CancelEvent(EVENT_POISON_STINGER);
                 }
                 else
@@ -193,11 +193,11 @@ class boss_ayamiss : public CreatureScript
                     {
                         case EVENT_STINGER_SPRAY:
                             DoCast(me, SPELL_STINGER_SPRAY);
-                            events.ScheduleEvent(EVENT_STINGER_SPRAY, urand(15000, 20000));
+                            events.ScheduleEvent(EVENT_STINGER_SPRAY, 15s, 20s);
                             break;
                         case EVENT_POISON_STINGER:
                             DoCastVictim(SPELL_POISON_STINGER);
-                            events.ScheduleEvent(EVENT_POISON_STINGER, urand(2000, 3000));
+                            events.ScheduleEvent(EVENT_POISON_STINGER, 2s, 3s);
                             break;
                         case EVENT_PARALYZE:
                             if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0, 0, true))
@@ -207,7 +207,7 @@ class boss_ayamiss : public CreatureScript
                                 uint8 Index = urand(0, 1);
                                 me->SummonCreature(NPC_LARVA, LarvaPos[Index], TEMPSUMMON_TIMED_OR_CORPSE_DESPAWN, 30000);
                             }
-                            events.ScheduleEvent(EVENT_PARALYZE, 15000);
+                            events.ScheduleEvent(EVENT_PARALYZE, 15s);
                             break;
                         case EVENT_SWARMER_ATTACK:
                             for (GuidList::iterator i = _swarmers.begin(); i != _swarmers.end(); ++i)
@@ -216,22 +216,22 @@ class boss_ayamiss : public CreatureScript
                                         swarmer->AI()->AttackStart(target);
 
                             _swarmers.clear();
-                            events.ScheduleEvent(EVENT_SWARMER_ATTACK, 60000);
+                            events.ScheduleEvent(EVENT_SWARMER_ATTACK, 1min);
                             break;
                         case EVENT_SUMMON_SWARMER:
                         {
                             Position Pos = me->GetRandomPoint(SwarmerPos, 80.0f);
                             me->SummonCreature(NPC_SWARMER, Pos);
-                            events.ScheduleEvent(EVENT_SUMMON_SWARMER, 5000);
+                            events.ScheduleEvent(EVENT_SUMMON_SWARMER, 5s);
                             break;
                         }
                         case EVENT_TRASH:
                             DoCastVictim(SPELL_TRASH);
-                            events.ScheduleEvent(EVENT_TRASH, urand(5000, 7000));
+                            events.ScheduleEvent(EVENT_TRASH, 5s, 7s);
                             break;
                         case EVENT_LASH:
                             DoCastVictim(SPELL_LASH);
-                            events.ScheduleEvent(EVENT_LASH, urand(8000, 15000));
+                            events.ScheduleEvent(EVENT_LASH, 8s, 15s);
                             break;
                     }
                 }
diff --git a/src/server/scripts/Kalimdor/RuinsOfAhnQiraj/boss_buru.cpp b/src/server/scripts/Kalimdor/RuinsOfAhnQiraj/boss_buru.cpp
index de35c64119b..712bc51d16f 100644
--- a/src/server/scripts/Kalimdor/RuinsOfAhnQiraj/boss_buru.cpp
+++ b/src/server/scripts/Kalimdor/RuinsOfAhnQiraj/boss_buru.cpp
@@ -91,9 +91,9 @@ class boss_buru : public CreatureScript
                 Talk(EMOTE_TARGET, who);
                 DoCast(me, SPELL_THORNS);
 
-                events.ScheduleEvent(EVENT_DISMEMBER, 5000);
-                events.ScheduleEvent(EVENT_GATHERING_SPEED, 9000);
-                events.ScheduleEvent(EVENT_FULL_SPEED, 60000);
+                events.ScheduleEvent(EVENT_DISMEMBER, 5s);
+                events.ScheduleEvent(EVENT_GATHERING_SPEED, 9s);
+                events.ScheduleEvent(EVENT_FULL_SPEED, 1min);
 
                 _phase = PHASE_EGG;
             }
@@ -118,8 +118,8 @@ class boss_buru : public CreatureScript
 
                 me->RemoveAurasDueToSpell(SPELL_FULL_SPEED);
                 me->RemoveAurasDueToSpell(SPELL_GATHERING_SPEED);
-                events.ScheduleEvent(EVENT_GATHERING_SPEED, 9000);
-                events.ScheduleEvent(EVENT_FULL_SPEED, 60000);
+                events.ScheduleEvent(EVENT_GATHERING_SPEED, 9s);
+                events.ScheduleEvent(EVENT_FULL_SPEED, 1min);
 
                 if (Unit* victim = SelectTarget(SELECT_TARGET_RANDOM, 0, 0.0f, true))
                 {
@@ -149,18 +149,18 @@ class boss_buru : public CreatureScript
                     {
                         case EVENT_DISMEMBER:
                             DoCastVictim(SPELL_DISMEMBER);
-                            events.ScheduleEvent(EVENT_DISMEMBER, 5000);
+                            events.ScheduleEvent(EVENT_DISMEMBER, 5s);
                             break;
                         case EVENT_GATHERING_SPEED:
                             DoCast(me, SPELL_GATHERING_SPEED);
-                            events.ScheduleEvent(EVENT_GATHERING_SPEED, 9000);
+                            events.ScheduleEvent(EVENT_GATHERING_SPEED, 9s);
                             break;
                         case EVENT_FULL_SPEED:
                             DoCast(me, SPELL_FULL_SPEED);
                             break;
                         case EVENT_CREEPING_PLAGUE:
                             DoCast(me, SPELL_CREEPING_PLAGUE);
-                            events.ScheduleEvent(EVENT_CREEPING_PLAGUE, 6000);
+                            events.ScheduleEvent(EVENT_CREEPING_PLAGUE, 6s);
                             break;
                         case EVENT_RESPAWN_EGG:
                             if (Creature* egg = ObjectAccessor::GetCreature(*me, Eggs.front()))
diff --git a/src/server/scripts/Kalimdor/RuinsOfAhnQiraj/boss_kurinnaxx.cpp b/src/server/scripts/Kalimdor/RuinsOfAhnQiraj/boss_kurinnaxx.cpp
index 4d04a982154..8ffeb7a6608 100644
--- a/src/server/scripts/Kalimdor/RuinsOfAhnQiraj/boss_kurinnaxx.cpp
+++ b/src/server/scripts/Kalimdor/RuinsOfAhnQiraj/boss_kurinnaxx.cpp
@@ -66,10 +66,10 @@ class boss_kurinnaxx : public CreatureScript
             {
                 _Reset();
                 Initialize();
-                events.ScheduleEvent(EVENT_MORTAL_WOUND, 8000);
-                events.ScheduleEvent(EVENT_SANDTRAP, urand(5000, 15000));
-                events.ScheduleEvent(EVENT_TRASH, 1000);
-                events.ScheduleEvent(EVENT_WIDE_SLASH, 11000);
+                events.ScheduleEvent(EVENT_MORTAL_WOUND, 8s);
+                events.ScheduleEvent(EVENT_SANDTRAP, 5s, 15s);
+                events.ScheduleEvent(EVENT_TRASH, 1s);
+                events.ScheduleEvent(EVENT_WIDE_SLASH, 11s);
             }
 
             void DamageTaken(Unit* /*attacker*/, uint32& /*damage*/) override
@@ -104,22 +104,22 @@ class boss_kurinnaxx : public CreatureScript
                     {
                         case EVENT_MORTAL_WOUND:
                             DoCastVictim(SPELL_MORTALWOUND);
-                            events.ScheduleEvent(EVENT_MORTAL_WOUND, 8000);
+                            events.ScheduleEvent(EVENT_MORTAL_WOUND, 8s);
                             break;
                         case EVENT_SANDTRAP:
                             if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0, 100, true))
                                 target->CastSpell(target, SPELL_SANDTRAP, true);
                             else if (Unit* victim = me->GetVictim())
                                 victim->CastSpell(victim, SPELL_SANDTRAP, true);
-                            events.ScheduleEvent(EVENT_SANDTRAP, urand(5000, 15000));
+                            events.ScheduleEvent(EVENT_SANDTRAP, 5s, 15s);
                             break;
                         case EVENT_WIDE_SLASH:
                             DoCast(me, SPELL_WIDE_SLASH);
-                            events.ScheduleEvent(EVENT_WIDE_SLASH, 11000);
+                            events.ScheduleEvent(EVENT_WIDE_SLASH, 11s);
                             break;
                         case EVENT_TRASH:
                             DoCast(me, SPELL_TRASH);
-                            events.ScheduleEvent(EVENT_WIDE_SLASH, 16000);
+                            events.ScheduleEvent(EVENT_WIDE_SLASH, 15s);
                             break;
                         default:
                             break;
diff --git a/src/server/scripts/Kalimdor/RuinsOfAhnQiraj/boss_moam.cpp b/src/server/scripts/Kalimdor/RuinsOfAhnQiraj/boss_moam.cpp
index c86432eecd3..449b356df0e 100644
--- a/src/server/scripts/Kalimdor/RuinsOfAhnQiraj/boss_moam.cpp
+++ b/src/server/scripts/Kalimdor/RuinsOfAhnQiraj/boss_moam.cpp
@@ -73,8 +73,8 @@ class boss_moam : public CreatureScript
                 _Reset();
                 me->SetPower(POWER_MANA, 0);
                 Initialize();
-                events.ScheduleEvent(EVENT_STONE_PHASE, 90000);
-                //events.ScheduleEvent(EVENT_WIDE_SLASH, 11000);
+                events.ScheduleEvent(EVENT_STONE_PHASE, 90s);
+                //events.ScheduleEvent(EVENT_WIDE_SLASH, 11s);
             }
 
             void DamageTaken(Unit* /*attacker*/, uint32& /*damage*/) override
@@ -93,7 +93,7 @@ class boss_moam : public CreatureScript
                     case ACTION_STONE_PHASE_END:
                     {
                         me->RemoveAurasDueToSpell(SPELL_ENERGIZE);
-                        events.ScheduleEvent(EVENT_STONE_PHASE, 90000);
+                        events.ScheduleEvent(EVENT_STONE_PHASE, 90s);
                         _isStonePhase = false;
                         break;
                     }
@@ -103,7 +103,7 @@ class boss_moam : public CreatureScript
                         DoCast(me, SPELL_SUMMON_MANA_FIEND_2);
                         DoCast(me, SPELL_SUMMON_MANA_FIEND_3);
                         DoCast(me, SPELL_ENERGIZE);
-                        events.ScheduleEvent(EVENT_STONE_PHASE_END, 90000);
+                        events.ScheduleEvent(EVENT_STONE_PHASE_END, 90s);
                         break;
                     }
                     default:
@@ -158,16 +158,16 @@ class boss_moam : public CreatureScript
                             for (std::list<Unit*>::iterator itr = targetList.begin(); itr != targetList.end(); ++itr)
                                 DoCast(*itr, SPELL_DRAIN_MANA);
 
-                            events.ScheduleEvent(EVENT_DRAIN_MANA, urand(5000, 15000));
+                            events.ScheduleEvent(EVENT_DRAIN_MANA, 5s, 15s);
                             break;
                         }/*
                         case EVENT_WIDE_SLASH:
                             DoCast(me, SPELL_WIDE_SLASH);
-                            events.ScheduleEvent(EVENT_WIDE_SLASH, 11000);
+                            events.ScheduleEvent(EVENT_WIDE_SLASH, 11s);
                             break;
                         case EVENT_TRASH:
                             DoCast(me, SPELL_TRASH);
-                            events.ScheduleEvent(EVENT_WIDE_SLASH, 16000);
+                            events.ScheduleEvent(EVENT_WIDE_SLASH, 15s);
                             break;*/
                         default:
                             break;
diff --git a/src/server/scripts/Kalimdor/RuinsOfAhnQiraj/boss_ossirian.cpp b/src/server/scripts/Kalimdor/RuinsOfAhnQiraj/boss_ossirian.cpp
index dacac70ac42..8e2cc7fd88e 100644
--- a/src/server/scripts/Kalimdor/RuinsOfAhnQiraj/boss_ossirian.cpp
+++ b/src/server/scripts/Kalimdor/RuinsOfAhnQiraj/boss_ossirian.cpp
@@ -143,9 +143,9 @@ class boss_ossirian : public CreatureScript
             {
                 _JustEngagedWith();
                 events.Reset();
-                events.ScheduleEvent(EVENT_SILENCE, 30000);
-                events.ScheduleEvent(EVENT_CYCLONE, 20000);
-                events.ScheduleEvent(EVENT_STOMP, 30000);
+                events.ScheduleEvent(EVENT_SILENCE, 30s);
+                events.ScheduleEvent(EVENT_CYCLONE, 20s);
+                events.ScheduleEvent(EVENT_STOMP, 30s);
 
                 DoCast(me, SPELL_SUPREME);
                 Talk(SAY_AGGRO);
@@ -256,15 +256,15 @@ class boss_ossirian : public CreatureScript
                     {
                         case EVENT_SILENCE:
                             DoCast(me, SPELL_SILENCE);
-                            events.ScheduleEvent(EVENT_SILENCE, urand(20000, 30000));
+                            events.ScheduleEvent(EVENT_SILENCE, 20s, 30s);
                             break;
                         case EVENT_CYCLONE:
                             DoCastVictim(SPELL_CYCLONE);
-                            events.ScheduleEvent(EVENT_CYCLONE, 20000);
+                            events.ScheduleEvent(EVENT_CYCLONE, 20s);
                             break;
                         case EVENT_STOMP:
                             DoCast(me, SPELL_STOMP);
-                            events.ScheduleEvent(EVENT_STOMP, 30000);
+                            events.ScheduleEvent(EVENT_STOMP, 30s);
                             break;
                         default:
                             break;
diff --git a/src/server/scripts/Kalimdor/RuinsOfAhnQiraj/boss_rajaxx.cpp b/src/server/scripts/Kalimdor/RuinsOfAhnQiraj/boss_rajaxx.cpp
index 7598c990833..ec48fc3fec3 100644
--- a/src/server/scripts/Kalimdor/RuinsOfAhnQiraj/boss_rajaxx.cpp
+++ b/src/server/scripts/Kalimdor/RuinsOfAhnQiraj/boss_rajaxx.cpp
@@ -77,8 +77,8 @@ class boss_rajaxx : public CreatureScript
             {
                 _Reset();
                 Initialize();
-                events.ScheduleEvent(EVENT_DISARM, 10000);
-                events.ScheduleEvent(EVENT_THUNDERCRASH, 12000);
+                events.ScheduleEvent(EVENT_DISARM, 10s);
+                events.ScheduleEvent(EVENT_THUNDERCRASH, 12s);
             }
 
             void JustDied(Unit* /*killer*/) override
@@ -108,11 +108,11 @@ class boss_rajaxx : public CreatureScript
                     {
                         case EVENT_DISARM:
                             DoCastVictim(SPELL_DISARM);
-                            events.ScheduleEvent(EVENT_DISARM, 22000);
+                            events.ScheduleEvent(EVENT_DISARM, 22s);
                             break;
                         case EVENT_THUNDERCRASH:
                             DoCast(me, SPELL_THUNDERCRASH);
-                            events.ScheduleEvent(EVENT_THUNDERCRASH, 21000);
+                            events.ScheduleEvent(EVENT_THUNDERCRASH, 21s);
                             break;
                         default:
                             break;
diff --git a/src/server/scripts/Kalimdor/TempleOfAhnQiraj/boss_skeram.cpp b/src/server/scripts/Kalimdor/TempleOfAhnQiraj/boss_skeram.cpp
index 4bc180eb775..7abc8d35d7c 100644
--- a/src/server/scripts/Kalimdor/TempleOfAhnQiraj/boss_skeram.cpp
+++ b/src/server/scripts/Kalimdor/TempleOfAhnQiraj/boss_skeram.cpp
@@ -136,10 +136,10 @@ class boss_skeram : public CreatureScript
                 _JustEngagedWith();
                 events.Reset();
 
-                events.ScheduleEvent(EVENT_ARCANE_EXPLOSION, urand(6000, 12000));
-                events.ScheduleEvent(EVENT_FULLFILMENT, 15000);
-                events.ScheduleEvent(EVENT_BLINK, urand(30000, 45000));
-                events.ScheduleEvent(EVENT_EARTH_SHOCK, 2000);
+                events.ScheduleEvent(EVENT_ARCANE_EXPLOSION, 6s, 12s);
+                events.ScheduleEvent(EVENT_FULLFILMENT, 15s);
+                events.ScheduleEvent(EVENT_BLINK, 30s, 45s);
+                events.ScheduleEvent(EVENT_EARTH_SHOCK, 2s);
 
                 Talk(SAY_AGGRO);
             }
@@ -157,22 +157,22 @@ class boss_skeram : public CreatureScript
                     {
                         case EVENT_ARCANE_EXPLOSION:
                             DoCastAOE(SPELL_ARCANE_EXPLOSION, true);
-                            events.ScheduleEvent(EVENT_ARCANE_EXPLOSION, urand(8000, 18000));
+                            events.ScheduleEvent(EVENT_ARCANE_EXPLOSION, 8s, 18s);
                             break;
                         case EVENT_FULLFILMENT:
                             if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 1, 45.0f, true))
                                 DoCast(target, SPELL_TRUE_FULFILLMENT);
-                            events.ScheduleEvent(EVENT_FULLFILMENT, urand(20000, 30000));
+                            events.ScheduleEvent(EVENT_FULLFILMENT, 20s, 30s);
                             break;
                         case EVENT_BLINK:
                             DoCast(me, BlinkSpells[urand(0, 2)]);
                             ResetThreatList();
                             me->SetVisible(true);
-                            events.ScheduleEvent(EVENT_BLINK, urand(10000, 30000));
+                            events.ScheduleEvent(EVENT_BLINK, 10s, 30s);
                             break;
                         case EVENT_EARTH_SHOCK:
                             DoCastVictim(SPELL_EARTH_SHOCK);
-                            events.ScheduleEvent(EVENT_EARTH_SHOCK, 2000);
+                            events.ScheduleEvent(EVENT_EARTH_SHOCK, 2s);
                             break;
                     }
                 }
diff --git a/src/server/scripts/Kalimdor/TempleOfAhnQiraj/boss_viscidus.cpp b/src/server/scripts/Kalimdor/TempleOfAhnQiraj/boss_viscidus.cpp
index 662d637d546..9511232b539 100644
--- a/src/server/scripts/Kalimdor/TempleOfAhnQiraj/boss_viscidus.cpp
+++ b/src/server/scripts/Kalimdor/TempleOfAhnQiraj/boss_viscidus.cpp
@@ -164,7 +164,7 @@ class boss_viscidus : public CreatureScript
                         _phase = PHASE_MELEE;
                         DoCast(me, SPELL_VISCIDUS_FREEZE);
                         me->RemoveAura(SPELL_VISCIDUS_SLOWED_MORE);
-                        events.ScheduleEvent(EVENT_RESET_PHASE, 15000);
+                        events.ScheduleEvent(EVENT_RESET_PHASE, 15s);
                     }
                     else if (_hitcounter >= HITCOUNTER_SLOW_MORE)
                     {
@@ -190,8 +190,8 @@ class boss_viscidus : public CreatureScript
             void InitSpells()
             {
                 DoCast(me, SPELL_TOXIN);
-                events.ScheduleEvent(EVENT_POISONBOLT_VOLLEY, urand(10000, 15000));
-                events.ScheduleEvent(EVENT_POISON_SHOCK, urand(7000, 12000));
+                events.ScheduleEvent(EVENT_POISONBOLT_VOLLEY, 10s, 15s);
+                events.ScheduleEvent(EVENT_POISON_SHOCK, 7s, 12s);
             }
 
             void EnterEvadeMode(EvadeReason why) override
@@ -233,11 +233,11 @@ class boss_viscidus : public CreatureScript
                     {
                         case EVENT_POISONBOLT_VOLLEY:
                             DoCast(me, SPELL_POISONBOLT_VOLLEY);
-                            events.ScheduleEvent(EVENT_POISONBOLT_VOLLEY, urand(10000, 15000));
+                            events.ScheduleEvent(EVENT_POISONBOLT_VOLLEY, 10s, 15s);
                             break;
                         case EVENT_POISON_SHOCK:
                             DoCast(me, SPELL_POISON_SHOCK);
-                            events.ScheduleEvent(EVENT_POISON_SHOCK, urand(7000, 12000));
+                            events.ScheduleEvent(EVENT_POISON_SHOCK, 7s, 12s);
                             break;
                         case EVENT_RESET_PHASE:
                             _hitcounter = 0;
diff --git a/src/server/scripts/Kalimdor/ZulFarrak/boss_zum_rah.cpp b/src/server/scripts/Kalimdor/ZulFarrak/boss_zum_rah.cpp
index 634fb802083..253275f516c 100644
--- a/src/server/scripts/Kalimdor/ZulFarrak/boss_zum_rah.cpp
+++ b/src/server/scripts/Kalimdor/ZulFarrak/boss_zum_rah.cpp
@@ -76,8 +76,8 @@ public:
         void JustEngagedWith(Unit* /*who*/) override
         {
             Talk(SAY_SANCT_INVADE);
-            events.ScheduleEvent(EVENT_SHADOW_BOLT, 1000);
-            events.ScheduleEvent(EVENT_SHADOWBOLT_VOLLEY, 10000);
+            events.ScheduleEvent(EVENT_SHADOW_BOLT, 1s);
+            events.ScheduleEvent(EVENT_SHADOWBOLT_VOLLEY, 10s);
         }
 
         void JustDied(Unit* /*killer*/) override
@@ -103,7 +103,7 @@ public:
                 {
                     case EVENT_SHADOW_BOLT:
                         DoCastVictim(SPELL_SHADOW_BOLT);
-                        events.ScheduleEvent(EVENT_SHADOW_BOLT, 4000);
+                        events.ScheduleEvent(EVENT_SHADOW_BOLT, 4s);
                         break;
                     case EVENT_WARD_OF_ZUM_RAH:
                         DoCast(me,SPELL_WARD_OF_ZUM_RAH);
@@ -114,7 +114,7 @@ public:
                     case EVENT_SHADOWBOLT_VOLLEY:
                         if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0))
                             DoCast(target, SPELL_SHADOWBOLT_VOLLEY);
-                        events.ScheduleEvent(EVENT_SHADOWBOLT_VOLLEY, 9000);
+                        events.ScheduleEvent(EVENT_SHADOWBOLT_VOLLEY, 9s);
                         break;
                     default:
                         break;
@@ -125,20 +125,20 @@ public:
             {
                 _ward80 = true;
                 Talk(SAY_WARD);
-                events.ScheduleEvent(EVENT_WARD_OF_ZUM_RAH, 1000);
+                events.ScheduleEvent(EVENT_WARD_OF_ZUM_RAH, 1s);
             }
 
             if (!_ward40 && HealthBelowPct(40))
             {
                 _ward40 = true;
                 Talk(SAY_WARD);
-                events.ScheduleEvent(EVENT_WARD_OF_ZUM_RAH, 1000);
+                events.ScheduleEvent(EVENT_WARD_OF_ZUM_RAH, 1s);
             }
 
             if (!_heal30 && HealthBelowPct(30))
             {
                 _heal30 = true;
-                events.ScheduleEvent(EVENT_HEALING_WAVE, 3000);
+                events.ScheduleEvent(EVENT_HEALING_WAVE, 3s);
             }
 
             DoMeleeAttackIfReady();
diff --git a/src/server/scripts/Kalimdor/boss_azuregos.cpp b/src/server/scripts/Kalimdor/boss_azuregos.cpp
index ef22f8451dd..cec6b99fed1 100644
--- a/src/server/scripts/Kalimdor/boss_azuregos.cpp
+++ b/src/server/scripts/Kalimdor/boss_azuregos.cpp
@@ -73,13 +73,13 @@ class boss_azuregos : public CreatureScript
                 DoCast(me, SPELL_MARK_OF_FROST_AURA, true);
                 _enraged = false;
 
-                events.ScheduleEvent(EVENT_MARK_OF_FROST, 35000);
-                events.ScheduleEvent(EVENT_MANA_STORM, urand(5000, 17000));
-                events.ScheduleEvent(EVENT_CHILL, urand(10000, 30000));
-                events.ScheduleEvent(EVENT_BREATH, urand(2000, 8000));
-                events.ScheduleEvent(EVENT_TELEPORT, 30000);
-                events.ScheduleEvent(EVENT_REFLECT, urand(15000, 30000));
-                events.ScheduleEvent(EVENT_CLEAVE, 7000);
+                events.ScheduleEvent(EVENT_MARK_OF_FROST, 35s);
+                events.ScheduleEvent(EVENT_MANA_STORM, 5s, 17s);
+                events.ScheduleEvent(EVENT_CHILL, 10s, 30s);
+                events.ScheduleEvent(EVENT_BREATH, 2s, 8s);
+                events.ScheduleEvent(EVENT_TELEPORT, 30s);
+                events.ScheduleEvent(EVENT_REFLECT, 15s, 30s);
+                events.ScheduleEvent(EVENT_CLEAVE, 7s);
             }
 
             void KilledUnit(Unit* who) override
@@ -109,11 +109,11 @@ class boss_azuregos : public CreatureScript
                             break;
                         case EVENT_CHILL:
                             DoCastVictim(SPELL_CHILL);
-                            events.ScheduleEvent(EVENT_CHILL, urand(13000, 25000));
+                            events.ScheduleEvent(EVENT_CHILL, 13s, 25s);
                             break;
                         case EVENT_BREATH:
                             DoCastVictim(SPELL_FROST_BREATH);
-                            events.ScheduleEvent(EVENT_BREATH, urand(10000, 15000));
+                            events.ScheduleEvent(EVENT_BREATH, 10s, 15s);
                             break;
                         case EVENT_TELEPORT:
                         {
@@ -123,16 +123,16 @@ class boss_azuregos : public CreatureScript
                                     DoTeleportPlayer(player, me->GetPositionX(), me->GetPositionY(), me->GetPositionZ()+3, player->GetOrientation());
 
                             ResetThreatList();
-                            events.ScheduleEvent(EVENT_TELEPORT, 30000);
+                            events.ScheduleEvent(EVENT_TELEPORT, 30s);
                             break;
                         }
                         case EVENT_REFLECT:
                             DoCast(me, SPELL_REFLECT);
-                            events.ScheduleEvent(EVENT_REFLECT, urand(20000, 35000));
+                            events.ScheduleEvent(EVENT_REFLECT, 20s, 35s);
                             break;
                         case EVENT_CLEAVE:
                             DoCastVictim(SPELL_CLEAVE);
-                            events.ScheduleEvent(EVENT_CLEAVE, 7000);
+                            events.ScheduleEvent(EVENT_CLEAVE, 7s);
                             break;
                         default:
                             break;
diff --git a/src/server/scripts/Kalimdor/zone_azuremyst_isle.cpp b/src/server/scripts/Kalimdor/zone_azuremyst_isle.cpp
index 2cfbc12cba2..965793ba7b2 100644
--- a/src/server/scripts/Kalimdor/zone_azuremyst_isle.cpp
+++ b/src/server/scripts/Kalimdor/zone_azuremyst_isle.cpp
@@ -368,7 +368,7 @@ public:
             if (quest->GetQuestId() == QUEST_A_CRY_FOR_HELP)
             {
                 _player = player->GetGUID();
-                _events.ScheduleEvent(EVENT_ACCEPT_QUEST, Seconds(2));
+                _events.ScheduleEvent(EVENT_ACCEPT_QUEST, 2s);
             }
         }
 
@@ -383,7 +383,7 @@ public:
                         break;
                     case 28:
                         player->GroupEventHappens(QUEST_A_CRY_FOR_HELP, me);
-                        _events.ScheduleEvent(EVENT_TALK_END, Seconds(2));
+                        _events.ScheduleEvent(EVENT_TALK_END, 2s);
                         SetRun(true);
                         break;
                     case 29:
@@ -407,12 +407,12 @@ public:
                         if (Player* player = ObjectAccessor::GetPlayer(*me, _player))
                             Talk(SAY_START, player);
                         me->SetFaction(FACTION_ESCORTEE_N_NEUTRAL_PASSIVE);
-                        _events.ScheduleEvent(EVENT_START_ESCORT, Seconds(1));
+                        _events.ScheduleEvent(EVENT_START_ESCORT, 1s);
                         break;
                     case EVENT_START_ESCORT:
                         if (Player* player = ObjectAccessor::GetPlayer(*me, _player))
                             EscortAI::Start(true, false, player->GetGUID());
-                        _events.ScheduleEvent(EVENT_STAND, Seconds(2));
+                        _events.ScheduleEvent(EVENT_STAND, 2s);
                         break;
                     case EVENT_STAND: // Remove kneel standstate. Using a separate delayed event because it causes unwanted delay before starting waypoint movement.
                         me->SetByteValue(UNIT_FIELD_BYTES_1, 0, 0);
@@ -420,7 +420,7 @@ public:
                     case EVENT_TALK_END:
                         if (Player* player = ObjectAccessor::GetPlayer(*me, _player))
                             Talk(SAY_END1, player);
-                        _events.ScheduleEvent(EVENT_COWLEN_TALK, Seconds(2));
+                        _events.ScheduleEvent(EVENT_COWLEN_TALK, 2s);
                         break;
                     case EVENT_COWLEN_TALK:
                         if (Creature* cowlen = me->FindNearestCreature(NPC_COWLEN, 50.0f, true))
diff --git a/src/server/scripts/Kalimdor/zone_bloodmyst_isle.cpp b/src/server/scripts/Kalimdor/zone_bloodmyst_isle.cpp
index 0adaf778e13..10370878955 100644
--- a/src/server/scripts/Kalimdor/zone_bloodmyst_isle.cpp
+++ b/src/server/scripts/Kalimdor/zone_bloodmyst_isle.cpp
@@ -258,7 +258,7 @@ public:
         {
             _events.ScheduleEvent(EVENT_UPPERCUT,      15 * IN_MILLISECONDS);
             _events.ScheduleEvent(EVENT_IMMOLATE,      10 * IN_MILLISECONDS);
-            _events.ScheduleEvent(EVENT_CURSE_OF_BLOOD, 5 * IN_MILLISECONDS);
+            _events.ScheduleEvent(EVENT_CURSE_OF_BLOOD, 5s);
         }
 
         void JustDied(Unit* killer) override
@@ -293,15 +293,15 @@ public:
                 {
                     case EVENT_UPPERCUT:
                         DoCastVictim(SPELL_UPPERCUT);
-                        _events.ScheduleEvent(EVENT_UPPERCUT, urand(10, 12) * IN_MILLISECONDS);
+                        _events.ScheduleEvent(EVENT_UPPERCUT, 10s, 12s);
                         break;
                     case EVENT_IMMOLATE:
                         DoCastVictim(SPELL_IMMOLATE);
-                        _events.ScheduleEvent(EVENT_IMMOLATE, urand(15, 20) * IN_MILLISECONDS);
+                        _events.ScheduleEvent(EVENT_IMMOLATE, 15s, 20s);
                         break;
                     case EVENT_CURSE_OF_BLOOD:
                         DoCastVictim(SPELL_CURSE_OF_BLOOD);
-                        _events.ScheduleEvent(EVENT_CURSE_OF_BLOOD, urand(20, 25) * IN_MILLISECONDS);
+                        _events.ScheduleEvent(EVENT_CURSE_OF_BLOOD, 20s, 25s);
                         break;
                     default:
                         break;
@@ -414,10 +414,10 @@ public:
             me->SetCanDualWield(true);
 
             _events.Reset();
-            _events.ScheduleEvent(EVENT_FROST_SHOCK, 1 * IN_MILLISECONDS);
-            _events.ScheduleEvent(EVENT_HEALING_SURGE, 5 * IN_MILLISECONDS);
-            _events.ScheduleEvent(EVENT_SEARING_TOTEM, 15 * IN_MILLISECONDS);
-            _events.ScheduleEvent(EVENT_STRENGTH_OF_EARTH_TOTEM, 20 * IN_MILLISECONDS);
+            _events.ScheduleEvent(EVENT_FROST_SHOCK, 1s);
+            _events.ScheduleEvent(EVENT_HEALING_SURGE, 5s);
+            _events.ScheduleEvent(EVENT_SEARING_TOTEM, 15s);
+            _events.ScheduleEvent(EVENT_STRENGTH_OF_EARTH_TOTEM, 20s);
         }
 
         void UpdateAI(uint32 diff) override
@@ -433,7 +433,7 @@ public:
                         case EVENT_FROST_SHOCK:
                             DoCastVictim(SPELL_FROST_SHOCK);
                             _events.DelayEvents(1 * IN_MILLISECONDS);
-                            _events.ScheduleEvent(EVENT_FROST_SHOCK, urand(10, 15) * IN_MILLISECONDS);
+                            _events.ScheduleEvent(EVENT_FROST_SHOCK, 10s, 15s);
                             break;
                         case EVENT_SEARING_TOTEM:
                             DoCast(me, SPELL_SEARING_TOTEM);
@@ -456,10 +456,10 @@ public:
                             if (target)
                             {
                                 DoCast(target, SPELL_HEALING_SURGE);
-                                _events.ScheduleEvent(EVENT_HEALING_SURGE, 10 * IN_MILLISECONDS);
+                                _events.ScheduleEvent(EVENT_HEALING_SURGE, 10s);
                             }
                             else
-                                _events.ScheduleEvent(EVENT_HEALING_SURGE, 2 * IN_MILLISECONDS);
+                                _events.ScheduleEvent(EVENT_HEALING_SURGE, 2s);
                             break;
                         }
                         default:
diff --git a/src/server/scripts/Kalimdor/zone_durotar.cpp b/src/server/scripts/Kalimdor/zone_durotar.cpp
index 7ed3b05e7b8..da79bc7518d 100644
--- a/src/server/scripts/Kalimdor/zone_durotar.cpp
+++ b/src/server/scripts/Kalimdor/zone_durotar.cpp
@@ -104,7 +104,7 @@ class npc_tiger_matriarch_credit : public CreatureScript
            npc_tiger_matriarch_creditAI(Creature* creature) : ScriptedAI(creature)
            {
                SetCombatMovement(false);
-               events.ScheduleEvent(EVENT_CHECK_SUMMON_AURA, 2000);
+               events.ScheduleEvent(EVENT_CHECK_SUMMON_AURA, 2s);
            }
 
             void UpdateAI(uint32 diff) override
@@ -134,7 +134,7 @@ class npc_tiger_matriarch_credit : public CreatureScript
                         }
                     }
 
-                    events.ScheduleEvent(EVENT_CHECK_SUMMON_AURA, 5000);
+                    events.ScheduleEvent(EVENT_CHECK_SUMMON_AURA, 5s);
                 }
             }
 
@@ -162,8 +162,8 @@ class npc_tiger_matriarch : public CreatureScript
             void JustEngagedWith(Unit* /*target*/) override
             {
                 _events.Reset();
-                _events.ScheduleEvent(EVENT_POUNCE, 100);
-                _events.ScheduleEvent(EVENT_NOSUMMON, 50000);
+                _events.ScheduleEvent(EVENT_POUNCE, 100ms);
+                _events.ScheduleEvent(EVENT_NOSUMMON, 50s);
             }
 
             void IsSummonedBy(Unit* summoner) override
@@ -234,7 +234,7 @@ class npc_tiger_matriarch : public CreatureScript
                     {
                         case EVENT_POUNCE:
                             DoCastVictim(SPELL_POUNCE);
-                            _events.ScheduleEvent(EVENT_POUNCE, 30000);
+                            _events.ScheduleEvent(EVENT_POUNCE, 30s);
                             break;
                         case EVENT_NOSUMMON: // Reapply SPELL_NO_SUMMON_AURA
                             if (Unit* tiger = ObjectAccessor::GetUnit(*me, _tigerGuid))
@@ -243,7 +243,7 @@ class npc_tiger_matriarch : public CreatureScript
                                     if (Unit* vehSummoner = tiger->ToTempSummon()->GetSummoner())
                                         me->AddAura(SPELL_NO_SUMMON_AURA, vehSummoner);
                             }
-                            _events.ScheduleEvent(EVENT_NOSUMMON, 50000);
+                            _events.ScheduleEvent(EVENT_NOSUMMON, 50s);
                             break;
                         default:
                             break;
diff --git a/src/server/scripts/Kalimdor/zone_moonglade.cpp b/src/server/scripts/Kalimdor/zone_moonglade.cpp
index a96048242c0..9561bf2a668 100644
--- a/src/server/scripts/Kalimdor/zone_moonglade.cpp
+++ b/src/server/scripts/Kalimdor/zone_moonglade.cpp
@@ -434,8 +434,8 @@ public:
         void JustEngagedWith(Unit* /*attacker*/) override
         {
             events.Reset();
-            events.ScheduleEvent(EVENT_CAST_CLEAVE, urand(3000, 5000));
-            events.ScheduleEvent(EVENT_CAST_STARFALL, urand(8000, 10000));
+            events.ScheduleEvent(EVENT_CAST_CLEAVE, 3s, 5s);
+            events.ScheduleEvent(EVENT_CAST_STARFALL, 8s, 10s);
         }
 
         void JustDied(Unit* /*killer*/) override
@@ -465,12 +465,12 @@ public:
             {
                 case EVENT_CAST_CLEAVE:
                     DoCastVictim(SPELL_OMEN_CLEAVE);
-                    events.ScheduleEvent(EVENT_CAST_CLEAVE, urand(8000, 10000));
+                    events.ScheduleEvent(EVENT_CAST_CLEAVE, 8s, 10s);
                     break;
                 case EVENT_CAST_STARFALL:
                     if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0))
                         DoCast(target, SPELL_OMEN_STARFALL);
-                    events.ScheduleEvent(EVENT_CAST_STARFALL, urand(14000, 16000));
+                    events.ScheduleEvent(EVENT_CAST_STARFALL, 14s, 16s);
                     break;
             }
 
diff --git a/src/server/scripts/Kalimdor/zone_orgrimmar.cpp b/src/server/scripts/Kalimdor/zone_orgrimmar.cpp
index 0abb55f0107..c039b450c93 100644
--- a/src/server/scripts/Kalimdor/zone_orgrimmar.cpp
+++ b/src/server/scripts/Kalimdor/zone_orgrimmar.cpp
@@ -781,7 +781,7 @@ public:
                         if (Creature* portal = ObjectAccessor::GetCreature(*me, stormwindPortalGUID))
                             portal->DespawnOrUnsummon();
 
-                        events.ScheduleEvent(EVENT_HERALD_RESET, 60000);
+                        events.ScheduleEvent(EVENT_HERALD_RESET, 1min);
                         break;
                     }
                     case EVENT_HERALD_RESET:
diff --git a/src/server/scripts/Kalimdor/zone_the_barrens.cpp b/src/server/scripts/Kalimdor/zone_the_barrens.cpp
index 855429b3cd8..db2be431293 100644
--- a/src/server/scripts/Kalimdor/zone_the_barrens.cpp
+++ b/src/server/scripts/Kalimdor/zone_the_barrens.cpp
@@ -627,7 +627,7 @@ public:
                     if (Player* player = GetPlayerForEscort())
                     {
                         player->GroupEventHappens(QUEST_ESCAPE, me);
-                        me->DespawnOrUnsummon(3min);
+                        me->DespawnOrUnsummon(5min);
                         me->SummonCreature(NPC_PILOT_WIZZ, 0.0f, 0.0f, 0.0f, 0.0f, TEMPSUMMON_TIMED_DESPAWN, 180000);
                     }
                     break;
diff --git a/src/server/scripts/Kalimdor/zone_winterspring.cpp b/src/server/scripts/Kalimdor/zone_winterspring.cpp
index f90f86b2494..4db3f7126ae 100644
--- a/src/server/scripts/Kalimdor/zone_winterspring.cpp
+++ b/src/server/scripts/Kalimdor/zone_winterspring.cpp
@@ -390,7 +390,7 @@ public:
                     SetEscortPaused(true);
                     DoSummonPriestess();
                     Talk(SAY_RANSHALLA_ALTAR_2);
-                    events.ScheduleEvent(EVENT_RESUME, 2000);
+                    events.ScheduleEvent(EVENT_RESUME, 2s);
                     break;
                 case 44:
                     // Stop the escort and turn towards the altar
diff --git a/src/server/scripts/Northrend/AzjolNerub/Ahnkahet/boss_amanitar.cpp b/src/server/scripts/Northrend/AzjolNerub/Ahnkahet/boss_amanitar.cpp
index 9d8c02446bb..aeae82dbe7c 100644
--- a/src/server/scripts/Northrend/AzjolNerub/Ahnkahet/boss_amanitar.cpp
+++ b/src/server/scripts/Northrend/AzjolNerub/Ahnkahet/boss_amanitar.cpp
@@ -92,12 +92,12 @@ struct boss_amanitar : public BossAI
     void JustEngagedWith(Unit* /*who*/) override
     {
         _JustEngagedWith();
-        events.ScheduleEvent(EVENT_ROOT, Seconds(5), Seconds(9));
-        events.ScheduleEvent(EVENT_BASH, Seconds(10), Seconds(14));
-        events.ScheduleEvent(EVENT_BOLT, Seconds(15), Seconds(20));
-        events.ScheduleEvent(EVENT_MINI, Seconds(12), Seconds(18));
-        events.ScheduleEvent(EVENT_SPAWN, Seconds(1));
-        events.ScheduleEvent(EVENT_RESPAWN, Seconds(40), Seconds(60));
+        events.ScheduleEvent(EVENT_ROOT, 5s, 9s);
+        events.ScheduleEvent(EVENT_BASH, 10s, 14s);
+        events.ScheduleEvent(EVENT_BOLT, 15s, 20s);
+        events.ScheduleEvent(EVENT_MINI, 12s, 18s);
+        events.ScheduleEvent(EVENT_SPAWN, 1s);
+        events.ScheduleEvent(EVENT_RESPAWN, 40s, 1min);
     }
 
     void EnterEvadeMode(EvadeReason /*why*/) override
diff --git a/src/server/scripts/Northrend/AzjolNerub/Ahnkahet/boss_elder_nadox.cpp b/src/server/scripts/Northrend/AzjolNerub/Ahnkahet/boss_elder_nadox.cpp
index 960a62aaa84..2b06a055e2e 100644
--- a/src/server/scripts/Northrend/AzjolNerub/Ahnkahet/boss_elder_nadox.cpp
+++ b/src/server/scripts/Northrend/AzjolNerub/Ahnkahet/boss_elder_nadox.cpp
@@ -83,13 +83,13 @@ class boss_elder_nadox : public CreatureScript
                 _JustEngagedWith();
                 Talk(SAY_AGGRO);
 
-                events.ScheduleEvent(EVENT_PLAGUE, 13 * IN_MILLISECONDS);
-                events.ScheduleEvent(EVENT_SUMMON_SWARMER, 10 * IN_MILLISECONDS);
+                events.ScheduleEvent(EVENT_PLAGUE, 13s);
+                events.ScheduleEvent(EVENT_SUMMON_SWARMER, 10s);
 
                 if (IsHeroic())
                 {
-                    events.ScheduleEvent(EVENT_RAGE, 12 * IN_MILLISECONDS);
-                    events.ScheduleEvent(EVENT_CHECK_ENRAGE, 5 * IN_MILLISECONDS);
+                    events.ScheduleEvent(EVENT_RAGE, 12s);
+                    events.ScheduleEvent(EVENT_CHECK_ENRAGE, 5s);
                 }
             }
 
@@ -132,25 +132,25 @@ class boss_elder_nadox : public CreatureScript
                     {
                         case EVENT_PLAGUE:
                             DoCast(SelectTarget(SELECT_TARGET_RANDOM, 0, 100, true), SPELL_BROOD_PLAGUE, true);
-                            events.ScheduleEvent(EVENT_PLAGUE, 15 * IN_MILLISECONDS);
+                            events.ScheduleEvent(EVENT_PLAGUE, 15s);
                             break;
                         case EVENT_RAGE:
                             DoCast(H_SPELL_BROOD_RAGE);
-                            events.ScheduleEvent(EVENT_RAGE, urand(10 * IN_MILLISECONDS, 50 * IN_MILLISECONDS));
+                            events.ScheduleEvent(EVENT_RAGE, 10s, 50s);
                             break;
                         case EVENT_SUMMON_SWARMER:
                             /// @todo: summoned by egg
                             DoCast(me, SPELL_SUMMON_SWARMERS);
                             if (urand(1, 3) == 3) // 33% chance of dialog
                                 Talk(SAY_EGG_SAC);
-                            events.ScheduleEvent(EVENT_SUMMON_SWARMER, 10 * IN_MILLISECONDS);
+                            events.ScheduleEvent(EVENT_SUMMON_SWARMER, 10s);
                             break;
                         case EVENT_CHECK_ENRAGE:
                             if (me->HasAura(SPELL_ENRAGE))
                                 return;
                             if (me->GetPositionZ() < 24.0f)
                                 DoCast(me, SPELL_ENRAGE, true);
-                            events.ScheduleEvent(EVENT_CHECK_ENRAGE, 5 * IN_MILLISECONDS);
+                            events.ScheduleEvent(EVENT_CHECK_ENRAGE, 5s);
                             break;
                         default:
                             break;
@@ -191,7 +191,7 @@ class npc_ahnkahar_nerubian : public CreatureScript
             void Reset() override
             {
                 _events.Reset();
-                _events.ScheduleEvent(EVENT_SPRINT, 13 * IN_MILLISECONDS);
+                _events.ScheduleEvent(EVENT_SPRINT, 13s);
             }
 
             void UpdateAI(uint32 diff) override
@@ -210,7 +210,7 @@ class npc_ahnkahar_nerubian : public CreatureScript
                     {
                         case EVENT_SPRINT:
                             DoCast(me, SPELL_SPRINT);
-                            _events.ScheduleEvent(EVENT_SPRINT, 20 * IN_MILLISECONDS);
+                            _events.ScheduleEvent(EVENT_SPRINT, 20s);
                             break;
                     }
                 }
diff --git a/src/server/scripts/Northrend/AzjolNerub/Ahnkahet/boss_jedoga_shadowseeker.cpp b/src/server/scripts/Northrend/AzjolNerub/Ahnkahet/boss_jedoga_shadowseeker.cpp
index 59cb87226ef..8c630c156e2 100644
--- a/src/server/scripts/Northrend/AzjolNerub/Ahnkahet/boss_jedoga_shadowseeker.cpp
+++ b/src/server/scripts/Northrend/AzjolNerub/Ahnkahet/boss_jedoga_shadowseeker.cpp
@@ -212,7 +212,7 @@ struct boss_jedoga_shadowseeker : public BossAI
         {
             events.Reset();
             events.SetPhase(PHASE_TWO);
-            events.ScheduleEvent(EVENT_START_PHASE_TWO, Seconds(1));
+            events.ScheduleEvent(EVENT_START_PHASE_TWO, 1s);
         }
     }
 
@@ -222,7 +222,7 @@ struct boss_jedoga_shadowseeker : public BossAI
         {
             Talk(SAY_SACRIFICE);
             DoCastAOE(SPELL_SACRIFICE_BEAM);
-            events.ScheduleEvent(EVENT_END_PHASE_TWO, Seconds(3));
+            events.ScheduleEvent(EVENT_END_PHASE_TWO, 3s);
             events.RescheduleEvent(EVENT_SUMMON_VOLUNTEER, Seconds(15));
         }
     }
@@ -277,15 +277,15 @@ struct boss_jedoga_shadowseeker : public BossAI
                 me->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NOT_SELECTABLE);
                 me->SetReactState(REACT_AGGRESSIVE);
                 DoZoneInCombat();
-                events.ScheduleEvent(EVENT_CYCLONE_STRIKE, Seconds(3));
-                events.ScheduleEvent(EVENT_LIGHTNING_BOLT, Seconds(7));
-                events.ScheduleEvent(EVENT_THUNDERSHOCK, Seconds(12));
+                events.ScheduleEvent(EVENT_CYCLONE_STRIKE, 3s);
+                events.ScheduleEvent(EVENT_LIGHTNING_BOLT, 7s);
+                events.ScheduleEvent(EVENT_THUNDERSHOCK, 12s);
                 break;
             case POINT_PHASE_TWO:
-                events.ScheduleEvent(EVENT_FLY_DELAY, Seconds(2));
+                events.ScheduleEvent(EVENT_FLY_DELAY, 2s);
                 break;
             case POINT_PHASE_TWO_FLY:
-                events.ScheduleEvent(EVENT_CHOOSE_VOLUNTEER, Seconds(2));
+                events.ScheduleEvent(EVENT_CHOOSE_VOLUNTEER, 2s);
                 break;
             default:
                 break;
diff --git a/src/server/scripts/Northrend/AzjolNerub/Ahnkahet/boss_prince_taldaram.cpp b/src/server/scripts/Northrend/AzjolNerub/Ahnkahet/boss_prince_taldaram.cpp
index 9451f123ee2..80b9ecbc595 100644
--- a/src/server/scripts/Northrend/AzjolNerub/Ahnkahet/boss_prince_taldaram.cpp
+++ b/src/server/scripts/Northrend/AzjolNerub/Ahnkahet/boss_prince_taldaram.cpp
@@ -115,9 +115,9 @@ class boss_prince_taldaram : public CreatureScript
             {
                 _JustEngagedWith();
                 Talk(SAY_AGGRO);
-                events.ScheduleEvent(EVENT_BLOODTHIRST, 10000);
-                events.ScheduleEvent(EVENT_VANISH, urand(25000, 35000));
-                events.ScheduleEvent(EVENT_CONJURE_FLAME_SPHERES, 5000);
+                events.ScheduleEvent(EVENT_BLOODTHIRST, 10s);
+                events.ScheduleEvent(EVENT_VANISH, 25s, 35s);
+                events.ScheduleEvent(EVENT_CONJURE_FLAME_SPHERES, 5s);
             }
 
             void JustSummoned(Creature* summon) override
@@ -177,7 +177,7 @@ class boss_prince_taldaram : public CreatureScript
                     {
                         case EVENT_BLOODTHIRST:
                             DoCast(me, SPELL_BLOODTHIRST);
-                            events.ScheduleEvent(EVENT_BLOODTHIRST, 10000);
+                            events.ScheduleEvent(EVENT_BLOODTHIRST, 10s);
                             break;
                         case EVENT_CONJURE_FLAME_SPHERES:
                             // random target?
@@ -197,9 +197,9 @@ class boss_prince_taldaram : public CreatureScript
                                 Talk(SAY_VANISH);
                                 DoCast(me, SPELL_VANISH);
                                 events.DelayEvents(500);
-                                events.ScheduleEvent(EVENT_START_FEEDING, 2000);
+                                events.ScheduleEvent(EVENT_START_FEEDING, 2s);
                             }
-                            events.ScheduleEvent(EVENT_VANISH, urand(25000, 35000));
+                            events.ScheduleEvent(EVENT_VANISH, 25s, 35s);
                             break;
                         }
                         case EVENT_START_FEEDING:
@@ -209,7 +209,7 @@ class boss_prince_taldaram : public CreatureScript
                                 DoCast(embraceTarget, SPELL_SHADOWSTEP);
                                 DoCast(embraceTarget, SPELL_EMBRACE_OF_THE_VAMPYR);
                                 Talk(SAY_FEED);
-                                events.ScheduleEvent(EVENT_DONE_FEEDING, 20000);
+                                events.ScheduleEvent(EVENT_DONE_FEEDING, 20s);
                             }
                             break;
                         case EVENT_DONE_FEEDING:
@@ -322,8 +322,8 @@ class npc_prince_taldaram_flame_sphere : public CreatureScript
 
                 _flameSphereTargetGUID.Clear();
                 _events.Reset();
-                _events.ScheduleEvent(EVENT_START_MOVE, 3 * IN_MILLISECONDS);
-                _events.ScheduleEvent(EVENT_DESPAWN, 13 * IN_MILLISECONDS);
+                _events.ScheduleEvent(EVENT_START_MOVE, 3s);
+                _events.ScheduleEvent(EVENT_DESPAWN, 13s);
             }
 
             void SetGUID(ObjectGuid const& guid, int32 /*id*/) override
diff --git a/src/server/scripts/Northrend/AzjolNerub/AzjolNerub/boss_anubarak.cpp b/src/server/scripts/Northrend/AzjolNerub/AzjolNerub/boss_anubarak.cpp
index 3865f8e777d..43c291adfdf 100644
--- a/src/server/scripts/Northrend/AzjolNerub/AzjolNerub/boss_anubarak.cpp
+++ b/src/server/scripts/Northrend/AzjolNerub/AzjolNerub/boss_anubarak.cpp
@@ -143,7 +143,7 @@ public:
             instance->DoStartTimedAchievement(ACHIEVEMENT_TIMED_TYPE_EVENT, ACHIEV_GOTTA_GO_START_EVENT);
 
             events.SetPhase(PHASE_EMERGE);
-            events.ScheduleEvent(EVENT_CLOSE_DOOR, Seconds(5));
+            events.ScheduleEvent(EVENT_CLOSE_DOOR, 5s);
             events.ScheduleEvent(EVENT_POUND, randtime(Seconds(2), Seconds(4)), 0, PHASE_EMERGE);
             events.ScheduleEvent(EVENT_LEECHING_SWARM, randtime(Seconds(5), Seconds(7)), 0, PHASE_EMERGE);
             events.ScheduleEvent(EVENT_CARRION_BEETLES, randtime(Seconds(14), Seconds(17)), 0, PHASE_EMERGE);
@@ -315,7 +315,7 @@ public:
                 }
                 case GUID_TYPE_IMPALE:
                     _impaleTarget = guid;
-                    events.ScheduleEvent(EVENT_IMPALE, Seconds(4));
+                    events.ScheduleEvent(EVENT_IMPALE, 4s);
                     break;
             }
         }
diff --git a/src/server/scripts/Northrend/AzjolNerub/AzjolNerub/boss_hadronox.cpp b/src/server/scripts/Northrend/AzjolNerub/AzjolNerub/boss_hadronox.cpp
index 9b707af0aa0..8f39721bcd6 100644
--- a/src/server/scripts/Northrend/AzjolNerub/AzjolNerub/boss_hadronox.cpp
+++ b/src/server/scripts/Northrend/AzjolNerub/AzjolNerub/boss_hadronox.cpp
@@ -229,7 +229,7 @@ public:
             events.ScheduleEvent(EVENT_ACID_CLOUD, randtime(Seconds(7), Seconds(13)));
             events.ScheduleEvent(EVENT_WEB_GRAB, randtime(Seconds(13), Seconds(19)));
             events.ScheduleEvent(EVENT_PIERCE_ARMOR, randtime(Seconds(4), Seconds(7)));
-            events.ScheduleEvent(EVENT_PLAYER_CHECK, Seconds(1));
+            events.ScheduleEvent(EVENT_PLAYER_CHECK, 1s);
             me->setActive(true);
         }
 
diff --git a/src/server/scripts/Northrend/AzjolNerub/AzjolNerub/boss_krikthir_the_gatewatcher.cpp b/src/server/scripts/Northrend/AzjolNerub/AzjolNerub/boss_krikthir_the_gatewatcher.cpp
index 8f3aaf8d4af..d40783c56f0 100644
--- a/src/server/scripts/Northrend/AzjolNerub/AzjolNerub/boss_krikthir_the_gatewatcher.cpp
+++ b/src/server/scripts/Northrend/AzjolNerub/AzjolNerub/boss_krikthir_the_gatewatcher.cpp
@@ -183,7 +183,7 @@ class boss_krik_thir : public CreatureScript
                 summons.DoZoneInCombat();
 
                 events.CancelEvent(EVENT_SEND_GROUP);
-                events.ScheduleEvent(EVENT_SWARM, Seconds(5));
+                events.ScheduleEvent(EVENT_SWARM, 5s);
                 events.ScheduleEvent(EVENT_MIND_FLAY, randtime(Seconds(1), Seconds(3)));
 
                 BossAI::JustEngagedWith(who);
@@ -237,7 +237,7 @@ class boss_krik_thir : public CreatureScript
                             break;
                         _petsInCombat = true;
                         Talk(SAY_AGGRO);
-                        events.ScheduleEvent(EVENT_SEND_GROUP, Seconds(70));
+                        events.ScheduleEvent(EVENT_SEND_GROUP, 70s);
                         break;
                     case ACTION_PET_EVADE:
                         EnterEvadeMode(EVADE_REASON_OTHER);
@@ -258,7 +258,7 @@ class boss_krik_thir : public CreatureScript
                 if (me->HealthBelowPct(10) && !_hadFrenzy)
                 {
                     _hadFrenzy = true;
-                    events.ScheduleEvent(EVENT_FRENZY, Seconds(1));
+                    events.ScheduleEvent(EVENT_FRENZY, 1s);
                 }
 
                 while (uint32 eventId = events.ExecuteEvent())
@@ -781,7 +781,7 @@ class npc_anub_ar_shadowcaster : public CreatureScript
 
             void _JustEngagedWith() override
             {
-                _events.ScheduleEvent(EVENT_SHADOW_BOLT, Seconds(4));
+                _events.ScheduleEvent(EVENT_SHADOW_BOLT, 4s);
                 _events.ScheduleEvent(EVENT_SHADOW_NOVA, randtime(Seconds(10), Seconds(14)));
             }
 
diff --git a/src/server/scripts/Northrend/ChamberOfAspects/ObsidianSanctum/boss_sartharion.cpp b/src/server/scripts/Northrend/ChamberOfAspects/ObsidianSanctum/boss_sartharion.cpp
index 300d0dd1f69..1b61d6a9082 100644
--- a/src/server/scripts/Northrend/ChamberOfAspects/ObsidianSanctum/boss_sartharion.cpp
+++ b/src/server/scripts/Northrend/ChamberOfAspects/ObsidianSanctum/boss_sartharion.cpp
@@ -171,13 +171,13 @@ public:
 
             FetchDragons();
 
-            events.ScheduleEvent(EVENT_LAVA_STRIKE, 5000);
-            events.ScheduleEvent(EVENT_CLEAVE_ATTACK, 7000);
-            events.ScheduleEvent(EVENT_FLAME_BREATH, 20000);
-            events.ScheduleEvent(EVENT_TAIL_SWEEP, 20000);
-            events.ScheduleEvent(EVENT_FLAME_TSUNAMI, 30000);
-            events.ScheduleEvent(EVENT_CALL_TENEBRON, 30000);
-            events.ScheduleEvent(EVENT_CALL_SHADRON, 75000);
+            events.ScheduleEvent(EVENT_LAVA_STRIKE, 5s);
+            events.ScheduleEvent(EVENT_CLEAVE_ATTACK, 7s);
+            events.ScheduleEvent(EVENT_FLAME_BREATH, 20s);
+            events.ScheduleEvent(EVENT_TAIL_SWEEP, 20s);
+            events.ScheduleEvent(EVENT_FLAME_TSUNAMI, 30s);
+            events.ScheduleEvent(EVENT_CALL_TENEBRON, 30s);
+            events.ScheduleEvent(EVENT_CALL_SHADRON, 75s);
             events.ScheduleEvent(EVENT_CALL_VESPERON, 120000);
         }
 
@@ -447,20 +447,20 @@ public:
                                 break;
                             }
                         }
-                        events.ScheduleEvent(EVENT_FLAME_TSUNAMI, 30000);
+                        events.ScheduleEvent(EVENT_FLAME_TSUNAMI, 30s);
                         break;
                     case EVENT_FLAME_BREATH:
                         Talk(SAY_SARTHARION_BREATH);
                         DoCastVictim(SPELL_FLAME_BREATH);
-                        events.ScheduleEvent(EVENT_FLAME_BREATH, urand(25000, 35000));
+                        events.ScheduleEvent(EVENT_FLAME_BREATH, 25s, 35s);
                         break;
                     case EVENT_TAIL_SWEEP:
                         DoCastVictim(SPELL_TAIL_LASH);
-                        events.ScheduleEvent(EVENT_TAIL_SWEEP, urand(15000, 20000));
+                        events.ScheduleEvent(EVENT_TAIL_SWEEP, 15s, 20s);
                         break;
                     case EVENT_CLEAVE_ATTACK:
                         DoCastVictim(SPELL_CLEAVE);
-                        events.ScheduleEvent(EVENT_CLEAVE_ATTACK, urand(7000, 10000));
+                        events.ScheduleEvent(EVENT_CLEAVE_ATTACK, 7s, 10s);
                         break;
                     case EVENT_LAVA_STRIKE:
                         if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0))
diff --git a/src/server/scripts/Northrend/ChamberOfAspects/ObsidianSanctum/obsidian_sanctum.cpp b/src/server/scripts/Northrend/ChamberOfAspects/ObsidianSanctum/obsidian_sanctum.cpp
index 9ed88d881e2..ae7396768e6 100644
--- a/src/server/scripts/Northrend/ChamberOfAspects/ObsidianSanctum/obsidian_sanctum.cpp
+++ b/src/server/scripts/Northrend/ChamberOfAspects/ObsidianSanctum/obsidian_sanctum.cpp
@@ -189,8 +189,8 @@ struct dummy_dragonAI : public ScriptedAI
         Talk(SAY_AGGRO);
         DoZoneInCombat();
 
-        events.ScheduleEvent(EVENT_SHADOW_FISSURE, 5000);
-        events.ScheduleEvent(EVENT_SHADOW_BREATH, 20000);
+        events.ScheduleEvent(EVENT_SHADOW_FISSURE, 5s);
+        events.ScheduleEvent(EVENT_SHADOW_BREATH, 20s);
     }
 
     void SetData(uint32 type, uint32 value) override
@@ -241,7 +241,7 @@ struct dummy_dragonAI : public ScriptedAI
             waypointId = 0;
         }
 
-        events.ScheduleEvent(EVENT_FREE_MOVEMENT, 500);
+        events.ScheduleEvent(EVENT_FREE_MOVEMENT, 500ms);
     }
 
     // "opens" the portal and does the "opening" whisper
@@ -430,7 +430,7 @@ public:
         {
             dummy_dragonAI::JustEngagedWith(who);
 
-            events.ScheduleEvent(EVENT_HATCH_EGGS, 30000);
+            events.ScheduleEvent(EVENT_HATCH_EGGS, 30s);
         }
 
         void UpdateAI(uint32 diff) override
@@ -450,7 +450,7 @@ public:
                 {
                     case EVENT_HATCH_EGGS:
                         OpenPortal();
-                        events.ScheduleEvent(EVENT_HATCH_EGGS, 30000);
+                        events.ScheduleEvent(EVENT_HATCH_EGGS, 30s);
                         break;
                     default:
                         dummy_dragonAI::ExecuteEvent(eventId);
@@ -498,7 +498,7 @@ public:
         {
             dummy_dragonAI::JustEngagedWith(who);
 
-            events.ScheduleEvent(EVENT_ACOLYTE_SHADRON, 60000);
+            events.ScheduleEvent(EVENT_ACOLYTE_SHADRON, 1min);
         }
 
         void UpdateAI(uint32 diff) override
@@ -518,7 +518,7 @@ public:
                 {
                     case EVENT_ACOLYTE_SHADRON:
                         if (instance->GetBossState(DATA_PORTAL_OPEN) == NOT_STARTED)
-                            events.ScheduleEvent(EVENT_ACOLYTE_SHADRON, 10000);
+                            events.ScheduleEvent(EVENT_ACOLYTE_SHADRON, 10s);
                         else
                         {
                             if (me->HasAura(SPELL_GIFT_OF_TWILIGTH_SHA))
@@ -528,7 +528,7 @@ public:
 
                             instance->SetBossState(DATA_PORTAL_OPEN, IN_PROGRESS);
 
-                            events.ScheduleEvent(EVENT_ACOLYTE_SHADRON, urand(60000, 65000));
+                            events.ScheduleEvent(EVENT_ACOLYTE_SHADRON, 60s, 65s);
                         }
                         break;
                     default:
@@ -569,7 +569,7 @@ public:
         {
             dummy_dragonAI::JustEngagedWith(who);
 
-            events.ScheduleEvent(EVENT_ACOLYTE_VESPERON, 60000);
+            events.ScheduleEvent(EVENT_ACOLYTE_VESPERON, 1min);
         }
 
         void UpdateAI(uint32 diff) override
@@ -589,12 +589,12 @@ public:
                 {
                     case EVENT_ACOLYTE_VESPERON:
                         if (instance->GetBossState(DATA_PORTAL_OPEN) == IN_PROGRESS)
-                            events.ScheduleEvent(EVENT_ACOLYTE_VESPERON, 10000);
+                            events.ScheduleEvent(EVENT_ACOLYTE_VESPERON, 10s);
                         else
                         {
                             OpenPortal();
                             DoCastVictim(SPELL_TWILIGHT_TORMENT_VESP);
-                            events.ScheduleEvent(EVENT_ACOLYTE_VESPERON, urand(60000, 70000));
+                            events.ScheduleEvent(EVENT_ACOLYTE_VESPERON, 60s, 70s);
                         }
                         break;
                     default:
@@ -805,7 +805,7 @@ public:
         {
             me->AddAura(SPELL_TWILIGHT_SHIFT_ENTER, me);
 
-            events.ScheduleEvent(EVENT_TWILIGHT_EGGS, 20000);
+            events.ScheduleEvent(EVENT_TWILIGHT_EGGS, 20s);
         }
 
         void SpawnWhelps()
@@ -874,8 +874,8 @@ public:
         void Reset() override
         {
             me->SetReactState(REACT_PASSIVE);
-            events.ScheduleEvent(EVENT_TSUNAMI_TIMER, 100);
-            events.ScheduleEvent(EVENT_TSUNAMI_BUFF, 1000);
+            events.ScheduleEvent(EVENT_TSUNAMI_TIMER, 100ms);
+            events.ScheduleEvent(EVENT_TSUNAMI_BUFF, 1s);
             me->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NON_ATTACKABLE | UNIT_FLAG_NOT_SELECTABLE);
         }
 
@@ -889,12 +889,12 @@ public:
                 {
                     case EVENT_TSUNAMI_TIMER:
                         DoCast(me, SPELL_FLAME_TSUNAMI_DMG_AURA);
-                        events.ScheduleEvent(EVENT_TSUNAMI_TIMER, 500);
+                        events.ScheduleEvent(EVENT_TSUNAMI_TIMER, 500ms);
                         break;
                     case EVENT_TSUNAMI_BUFF:
                         if (Unit* lavaBlaze = GetClosestCreatureWithEntry(me, NPC_LAVA_BLAZE, 10.0f, true))
                             lavaBlaze->CastSpell(lavaBlaze, SPELL_FLAME_TSUNAMI_BUFF, true);
-                        events.ScheduleEvent(EVENT_TSUNAMI_BUFF, 1000);
+                        events.ScheduleEvent(EVENT_TSUNAMI_BUFF, 1s);
                         break;
                 }
             }
@@ -936,7 +936,7 @@ public:
             me->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NON_ATTACKABLE | UNIT_FLAG_NOT_SELECTABLE);
             me->AddAura(46265, me); // Wrong, can't find proper visual
             me->AddAura(69422, me);
-            events.ScheduleEvent(EVENT_VOID_BLAST, 5000);
+            events.ScheduleEvent(EVENT_VOID_BLAST, 5s);
         }
 
         void UpdateAI(uint32 diff) override
@@ -988,7 +988,7 @@ public:
         {
             me->RemoveAllAuras();
             DoZoneInCombat();
-            events.ScheduleEvent(EVENT_FADE_ARMOR, 1000);
+            events.ScheduleEvent(EVENT_FADE_ARMOR, 1s);
         }
 
         void UpdateAI(uint32 diff) override
@@ -1002,7 +1002,7 @@ public:
             if (events.ExecuteEvent() == EVENT_FADE_ARMOR)
             {
                 DoCastVictim(SPELL_FADE_ARMOR);
-                events.ScheduleEvent(EVENT_FADE_ARMOR, urand(5000, 10000));
+                events.ScheduleEvent(EVENT_FADE_ARMOR, 5s, 10s);
             }
 
             DoMeleeAttackIfReady();
diff --git a/src/server/scripts/Northrend/ChamberOfAspects/RubySanctum/boss_baltharus_the_warborn.cpp b/src/server/scripts/Northrend/ChamberOfAspects/RubySanctum/boss_baltharus_the_warborn.cpp
index 43668bba0cd..7d1707e6bb9 100644
--- a/src/server/scripts/Northrend/ChamberOfAspects/RubySanctum/boss_baltharus_the_warborn.cpp
+++ b/src/server/scripts/Northrend/ChamberOfAspects/RubySanctum/boss_baltharus_the_warborn.cpp
@@ -137,7 +137,7 @@ class boss_baltharus_the_warborn : public CreatureScript
             {
                 summons.Summon(summon);
                 summon->SetHealth(me->GetHealth());
-                events.ScheduleEvent(EVENT_SUMMONS_ATTACK, Seconds(2));
+                events.ScheduleEvent(EVENT_SUMMONS_ATTACK, 2s);
             }
 
             void DamageTaken(Unit* /*attacker*/, uint32& damage) override
@@ -256,9 +256,9 @@ class npc_baltharus_the_warborn_clone : public CreatureScript
             {
                 DoZoneInCombat();
                 events.Reset();
-                events.ScheduleEvent(EVENT_CLEAVE, Seconds(11));
-                events.ScheduleEvent(EVENT_BLADE_TEMPEST, Seconds(15));
-                events.ScheduleEvent(EVENT_ENERVATING_BRAND, Seconds(10));
+                events.ScheduleEvent(EVENT_CLEAVE, 11s);
+                events.ScheduleEvent(EVENT_BLADE_TEMPEST, 15s);
+                events.ScheduleEvent(EVENT_ENERVATING_BRAND, 10s);
             }
 
             void EnterEvadeMode(EvadeReason /*why*/) override { }
diff --git a/src/server/scripts/Northrend/ChamberOfAspects/RubySanctum/boss_general_zarithrian.cpp b/src/server/scripts/Northrend/ChamberOfAspects/RubySanctum/boss_general_zarithrian.cpp
index 4660609a578..69e593caaf2 100644
--- a/src/server/scripts/Northrend/ChamberOfAspects/RubySanctum/boss_general_zarithrian.cpp
+++ b/src/server/scripts/Northrend/ChamberOfAspects/RubySanctum/boss_general_zarithrian.cpp
@@ -92,9 +92,9 @@ class boss_general_zarithrian : public CreatureScript
             {
                 _JustEngagedWith();
                 Talk(SAY_AGGRO);
-                events.ScheduleEvent(EVENT_CLEAVE, Seconds(8));
-                events.ScheduleEvent(EVENT_INTIDMDATING_ROAR, Seconds(14));
-                events.ScheduleEvent(EVENT_SUMMON_ADDS, Seconds(15));
+                events.ScheduleEvent(EVENT_CLEAVE, 8s);
+                events.ScheduleEvent(EVENT_INTIDMDATING_ROAR, 14s);
+                events.ScheduleEvent(EVENT_SUMMON_ADDS, 15s);
                 if (Is25ManRaid())
                     events.ScheduleEvent(EVENT_SUMMON_ADDS2, Seconds(16));
             }
@@ -157,7 +157,7 @@ class boss_general_zarithrian : public CreatureScript
                             break;
                         case EVENT_CLEAVE:
                             DoCastVictim(SPELL_CLEAVE_ARMOR);
-                            events.ScheduleEvent(EVENT_CLEAVE, Seconds(15));
+                            events.ScheduleEvent(EVENT_CLEAVE, 15s);
                             break;
                         default:
                             break;
@@ -196,8 +196,8 @@ class npc_onyx_flamecaller : public CreatureScript
 
             void JustEngagedWith(Unit* /*who*/) override
             {
-                _events.ScheduleEvent(EVENT_BLAST_NOVA, Seconds(17));
-                _events.ScheduleEvent(EVENT_LAVA_GOUT, Seconds(3));
+                _events.ScheduleEvent(EVENT_BLAST_NOVA, 17s);
+                _events.ScheduleEvent(EVENT_LAVA_GOUT, 3s);
             }
 
             void EnterEvadeMode(EvadeReason /*why*/) override { }
diff --git a/src/server/scripts/Northrend/ChamberOfAspects/RubySanctum/boss_halion.cpp b/src/server/scripts/Northrend/ChamberOfAspects/RubySanctum/boss_halion.cpp
index ebc0c04935d..03ed429f04c 100644
--- a/src/server/scripts/Northrend/ChamberOfAspects/RubySanctum/boss_halion.cpp
+++ b/src/server/scripts/Northrend/ChamberOfAspects/RubySanctum/boss_halion.cpp
@@ -247,12 +247,12 @@ class boss_halion : public CreatureScript
 
                 _JustEngagedWith();
                 me->AddAura(SPELL_TWILIGHT_PRECISION, me);
-                events.ScheduleEvent(EVENT_ACTIVATE_FIREWALL, Seconds(5));
+                events.ScheduleEvent(EVENT_ACTIVATE_FIREWALL, 5s);
                 events.ScheduleEvent(EVENT_BREATH, randtime(Seconds(5), Seconds(15)));
                 events.ScheduleEvent(EVENT_CLEAVE, randtime(Seconds(6), Seconds(10)));
                 events.ScheduleEvent(EVENT_TAIL_LASH, randtime(Seconds(7), Seconds(12)));
                 events.ScheduleEvent(EVENT_FIERY_COMBUSTION, randtime(Seconds(15), Seconds(18)));
-                events.ScheduleEvent(EVENT_METEOR_STRIKE, Seconds(18));
+                events.ScheduleEvent(EVENT_METEOR_STRIKE, 18s);
 
                 instance->SendEncounterUnit(ENCOUNTER_FRAME_ENGAGE, me, 1);
 
@@ -357,14 +357,14 @@ class boss_halion : public CreatureScript
                                 me->CastSpell(_meteorStrikePos, SPELL_METEOR_STRIKE, me->GetGUID());
                                 Talk(SAY_METEOR_STRIKE);
                             }
-                            events.ScheduleEvent(EVENT_METEOR_STRIKE, Seconds(38));
+                            events.ScheduleEvent(EVENT_METEOR_STRIKE, 38s);
                             break;
                         }
                         case EVENT_FIERY_COMBUSTION:
                         {
                             if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 1, 0.0f, true, true, -SPELL_TWILIGHT_REALM))
                                 me->CastSpell(target, SPELL_FIERY_COMBUSTION, TRIGGERED_IGNORE_SET_FACING);
-                            events.ScheduleEvent(EVENT_FIERY_COMBUSTION, Seconds(25));
+                            events.ScheduleEvent(EVENT_FIERY_COMBUSTION, 25s);
                             break;
                         }
                         default:
@@ -417,8 +417,8 @@ class boss_twilight_halion : public CreatureScript
                 me->SetPhaseMask(0x20, true);
                 me->SetReactState(REACT_DEFENSIVE);
                 me->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_IN_COMBAT);
-                events.ScheduleEvent(EVENT_TAIL_LASH, Seconds(12));
-                events.ScheduleEvent(EVENT_SOUL_CONSUMPTION, Seconds(15));
+                events.ScheduleEvent(EVENT_TAIL_LASH, 12s);
+                events.ScheduleEvent(EVENT_SOUL_CONSUMPTION, 15s);
             }
 
             void JustEngagedWith(Unit* /*who*/) override
@@ -427,8 +427,8 @@ class boss_twilight_halion : public CreatureScript
 
                 _JustEngagedWith();
                 me->AddAura(SPELL_TWILIGHT_PRECISION, me);
-                events.ScheduleEvent(EVENT_CLEAVE, Seconds(3));
-                events.ScheduleEvent(EVENT_BREATH, Seconds(12));
+                events.ScheduleEvent(EVENT_CLEAVE, 3s);
+                events.ScheduleEvent(EVENT_BREATH, 12s);
 
                 instance->SendEncounterUnit(ENCOUNTER_FRAME_ENGAGE, me, 2);
             }
@@ -537,7 +537,7 @@ class boss_twilight_halion : public CreatureScript
                         case EVENT_SOUL_CONSUMPTION:
                             if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 1, 0.0f, true, true, SPELL_TWILIGHT_REALM))
                                 me->CastSpell(target, SPELL_SOUL_CONSUMPTION, TRIGGERED_IGNORE_SET_FACING);
-                            events.ScheduleEvent(EVENT_SOUL_CONSUMPTION, Seconds(20));
+                            events.ScheduleEvent(EVENT_SOUL_CONSUMPTION, 20s);
                             break;
                         default:
                             break;
@@ -610,8 +610,8 @@ class npc_halion_controller : public CreatureScript
                 _twilightDamageTaken = 0;
                 _materialDamageTaken = 0;
 
-                _events.ScheduleEvent(EVENT_TRIGGER_BERSERK, Minutes(8));
-                _events.ScheduleEvent(EVENT_EVADE_CHECK, Seconds(5));
+                _events.ScheduleEvent(EVENT_TRIGGER_BERSERK, 8min);
+                _events.ScheduleEvent(EVENT_EVADE_CHECK, 5s);
             }
 
             void JustExitedCombat() override
@@ -644,7 +644,7 @@ class npc_halion_controller : public CreatureScript
                     case ACTION_INTRO_HALION:
                         _events.Reset();
                         _events.SetPhase(PHASE_INTRO);
-                        _events.ScheduleEvent(EVENT_START_INTRO, Seconds(2));
+                        _events.ScheduleEvent(EVENT_START_INTRO, 2s);
                         break;
                     case ACTION_INTRO_HALION_2:
                         if (_instance->GetGuidData(DATA_HALION))
@@ -681,11 +681,11 @@ class npc_halion_controller : public CreatureScript
                         _instance->DoUpdateWorldState(WORLDSTATE_CORPOREALITY_MATERIAL, 50);
                         _instance->DoUpdateWorldState(WORLDSTATE_CORPOREALITY_TWILIGHT, 50);
 
-                        _events.ScheduleEvent(EVENT_CHECK_CORPOREALITY, Seconds(7));
+                        _events.ScheduleEvent(EVENT_CHECK_CORPOREALITY, 7s);
                         break;
                     }
                     case ACTION_ACTIVATE_EMBERS:
-                        _events.ScheduleEvent(EVENT_ACTIVATE_EMBERS, Seconds(6));
+                        _events.ScheduleEvent(EVENT_ACTIVATE_EMBERS, 6s);
                         break;
                     default:
                         break;
@@ -743,11 +743,11 @@ class npc_halion_controller : public CreatureScript
                         case EVENT_SHADOW_PULSARS_SHOOT:
                             if (Creature* orbCarrier = _instance->GetCreature(DATA_ORB_CARRIER))
                                 orbCarrier->AI()->DoAction(ACTION_WARNING_SHOOT);
-                            _events.ScheduleEvent(EVENT_SHADOW_PULSARS_SHOOT, Seconds(30));
+                            _events.ScheduleEvent(EVENT_SHADOW_PULSARS_SHOOT, 30s);
                             break;
                         case EVENT_CHECK_CORPOREALITY:
                             UpdateCorporeality();
-                            _events.ScheduleEvent(EVENT_CHECK_CORPOREALITY, Seconds(5));
+                            _events.ScheduleEvent(EVENT_CHECK_CORPOREALITY, 5s);
                             break;
                         case EVENT_ACTIVATE_EMBERS:
                             _summons.DoZoneInCombat(NPC_LIVING_EMBER);
@@ -791,7 +791,7 @@ class npc_halion_controller : public CreatureScript
                                 DoZoneInCombat();
                                 break;
                             case PHASE_TWO:
-                                _events.ScheduleEvent(EVENT_SHADOW_PULSARS_SHOOT, Seconds(35));
+                                _events.ScheduleEvent(EVENT_SHADOW_PULSARS_SHOOT, 35s);
                                 break;
                             default:
                                 break;
diff --git a/src/server/scripts/Northrend/ChamberOfAspects/RubySanctum/boss_saviana_ragefire.cpp b/src/server/scripts/Northrend/ChamberOfAspects/RubySanctum/boss_saviana_ragefire.cpp
index 3f2aef49d2c..9dd3eb859d3 100644
--- a/src/server/scripts/Northrend/ChamberOfAspects/RubySanctum/boss_saviana_ragefire.cpp
+++ b/src/server/scripts/Northrend/ChamberOfAspects/RubySanctum/boss_saviana_ragefire.cpp
@@ -110,7 +110,7 @@ class boss_saviana_ragefire : public CreatureScript
                 switch (point)
                 {
                     case POINT_FLIGHT:
-                        events.ScheduleEvent(EVENT_CONFLAGRATION, Seconds(1));
+                        events.ScheduleEvent(EVENT_CONFLAGRATION, 1s);
                         Talk(SAY_CONFLAGRATION);
                         break;
                     case POINT_LAND:
diff --git a/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/boss_anubarak_trial.cpp b/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/boss_anubarak_trial.cpp
index 493f245ac6c..d0c1299bc50 100644
--- a/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/boss_anubarak_trial.cpp
+++ b/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/boss_anubarak_trial.cpp
@@ -183,16 +183,16 @@ class boss_anubarak_trial : public CreatureScript
             {
                 _Reset();
                 events.SetPhase(PHASE_MELEE);
-                events.ScheduleEvent(EVENT_FREEZE_SLASH, 15*IN_MILLISECONDS, 0, PHASE_MELEE);
-                events.ScheduleEvent(EVENT_PENETRATING_COLD, 20*IN_MILLISECONDS, PHASE_MELEE);
-                events.ScheduleEvent(EVENT_SUMMON_NERUBIAN, 10*IN_MILLISECONDS, 0, PHASE_MELEE);
-                events.ScheduleEvent(EVENT_SUBMERGE, 80*IN_MILLISECONDS, 0, PHASE_MELEE);
-                events.ScheduleEvent(EVENT_BERSERK, 10*MINUTE*IN_MILLISECONDS);
+                events.ScheduleEvent(EVENT_FREEZE_SLASH, 15s, 0, PHASE_MELEE);
+                events.ScheduleEvent(EVENT_PENETRATING_COLD, 20s, PHASE_MELEE);
+                events.ScheduleEvent(EVENT_SUMMON_NERUBIAN, 10s, 0, PHASE_MELEE);
+                events.ScheduleEvent(EVENT_SUBMERGE, 80s, 0, PHASE_MELEE);
+                events.ScheduleEvent(EVENT_BERSERK, 10min);
                 if (IsHeroic())
-                    events.ScheduleEvent(EVENT_NERUBIAN_SHADOW_STRIKE, 30*IN_MILLISECONDS, 0, PHASE_MELEE);
+                    events.ScheduleEvent(EVENT_NERUBIAN_SHADOW_STRIKE, 30s, 0, PHASE_MELEE);
 
                 if (!IsHeroic())
-                    events.ScheduleEvent(EVENT_SUMMON_FROST_SPHERE, 20*IN_MILLISECONDS);
+                    events.ScheduleEvent(EVENT_SUMMON_FROST_SPHERE, 20s);
 
                 Initialize();
                 me->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NON_ATTACKABLE | UNIT_FLAG_NOT_SELECTABLE);
@@ -405,7 +405,7 @@ class boss_anubarak_trial : public CreatureScript
                             }
                             while
                                 (i != startAt);
-                            events.ScheduleEvent(EVENT_SUMMON_FROST_SPHERE, urand(20*IN_MILLISECONDS, 30*IN_MILLISECONDS));
+                            events.ScheduleEvent(EVENT_SUMMON_FROST_SPHERE, 20s, 30s);
                             break;
                         }
                         case EVENT_BERSERK:
diff --git a/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/boss_faction_champions.cpp b/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/boss_faction_champions.cpp
index 7d49f342ca3..07970c0ace8 100644
--- a/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/boss_faction_champions.cpp
+++ b/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/boss_faction_champions.cpp
@@ -587,9 +587,9 @@ struct boss_faction_championsAI : public BossAI
     void Reset() override
     {
         _teamInstance = instance->GetData(DATA_TEAM);
-        _events.ScheduleEvent(EVENT_THREAT, 5*IN_MILLISECONDS);
+        _events.ScheduleEvent(EVENT_THREAT, 5s);
         if (IsHeroic() && (_aiType != AI_PET))
-            _events.ScheduleEvent(EVENT_REMOVE_CC, 5*IN_MILLISECONDS);
+            _events.ScheduleEvent(EVENT_REMOVE_CC, 5s);
     }
 
     void JustReachedHome() override
@@ -720,7 +720,7 @@ struct boss_faction_championsAI : public BossAI
                 case EVENT_THREAT:
                     UpdatePower();
                     UpdateThreat();
-                    _events.ScheduleEvent(EVENT_THREAT, 4*IN_MILLISECONDS);
+                    _events.ScheduleEvent(EVENT_THREAT, 4s);
                     return;
                 case EVENT_REMOVE_CC:
                     if (me->HasBreakableByDamageCrowdControlAura())
@@ -762,14 +762,14 @@ class npc_toc_druid : public CreatureScript
             void Reset() override
             {
                 boss_faction_championsAI::Reset();
-                events.ScheduleEvent(EVENT_LIFEBLOOM, urand(5*IN_MILLISECONDS, 15*IN_MILLISECONDS));
-                events.ScheduleEvent(EVENT_NOURISH, urand(5*IN_MILLISECONDS, 15*IN_MILLISECONDS));
-                events.ScheduleEvent(EVENT_REGROWTH, urand(5*IN_MILLISECONDS, 15*IN_MILLISECONDS));
-                events.ScheduleEvent(EVENT_REJUVENATION, urand(5*IN_MILLISECONDS, 15*IN_MILLISECONDS));
-                events.ScheduleEvent(EVENT_TRANQUILITY, urand(5*IN_MILLISECONDS, 20*IN_MILLISECONDS));
-                events.ScheduleEvent(EVENT_HEAL_BARKSKIN, urand(15*IN_MILLISECONDS, 25*IN_MILLISECONDS));
-                events.ScheduleEvent(EVENT_THORNS, 2*IN_MILLISECONDS);
-                events.ScheduleEvent(EVENT_NATURE_GRASP, urand(3*IN_MILLISECONDS, 20*IN_MILLISECONDS));
+                events.ScheduleEvent(EVENT_LIFEBLOOM, 5s, 15s);
+                events.ScheduleEvent(EVENT_NOURISH, 5s, 15s);
+                events.ScheduleEvent(EVENT_REGROWTH, 5s, 15s);
+                events.ScheduleEvent(EVENT_REJUVENATION, 5s, 15s);
+                events.ScheduleEvent(EVENT_TRANQUILITY, 5s, 20s);
+                events.ScheduleEvent(EVENT_HEAL_BARKSKIN, 15s, 25s);
+                events.ScheduleEvent(EVENT_THORNS, 2s);
+                events.ScheduleEvent(EVENT_NATURE_GRASP, 3s, 20s);
                 SetEquipmentSlots(false, 51799, EQUIP_NO_CHANGE, EQUIP_NO_CHANGE);
             }
 
@@ -791,26 +791,26 @@ class npc_toc_druid : public CreatureScript
                         case EVENT_LIFEBLOOM:
                             if (Unit* target = DoSelectLowestHpFriendly(40.0f))
                                 DoCast(target, SPELL_LIFEBLOOM);
-                            events.ScheduleEvent(EVENT_LIFEBLOOM, urand(5*IN_MILLISECONDS, 15*IN_MILLISECONDS));
+                            events.ScheduleEvent(EVENT_LIFEBLOOM, 5s, 15s);
                             return;
                         case EVENT_NOURISH:
                             if (Unit* target = DoSelectLowestHpFriendly(40.0f))
                                 DoCast(target, SPELL_NOURISH);
-                            events.ScheduleEvent(EVENT_NOURISH, urand(5*IN_MILLISECONDS, 15*IN_MILLISECONDS));
+                            events.ScheduleEvent(EVENT_NOURISH, 5s, 15s);
                             return;
                         case EVENT_REGROWTH:
                             if (Unit* target = DoSelectLowestHpFriendly(40.0f))
                                 DoCast(target, SPELL_REGROWTH);
-                            events.ScheduleEvent(EVENT_REGROWTH, urand(5*IN_MILLISECONDS, 15*IN_MILLISECONDS));
+                            events.ScheduleEvent(EVENT_REGROWTH, 5s, 15s);
                             return;
                         case EVENT_REJUVENATION:
                             if (Unit* target = DoSelectLowestHpFriendly(40.0f))
                                 DoCast(target, SPELL_REJUVENATION);
-                            events.ScheduleEvent(EVENT_REJUVENATION, urand(5*IN_MILLISECONDS, 15*IN_MILLISECONDS));
+                            events.ScheduleEvent(EVENT_REJUVENATION, 5s, 15s);
                             return;
                         case EVENT_TRANQUILITY:
                             DoCastAOE(SPELL_TRANQUILITY);
-                            events.ScheduleEvent(EVENT_TRANQUILITY, urand(15*IN_MILLISECONDS, 40*IN_MILLISECONDS));
+                            events.ScheduleEvent(EVENT_TRANQUILITY, 15s, 40s);
                             return;
                         case EVENT_HEAL_BARKSKIN:
                             if (HealthBelowPct(30))
@@ -824,11 +824,11 @@ class npc_toc_druid : public CreatureScript
                         case EVENT_THORNS:
                             if (Creature* target = SelectRandomFriendlyMissingBuff(SPELL_THORNS))
                                 DoCast(target, SPELL_THORNS);
-                            events.ScheduleEvent(EVENT_THORNS, urand(25*IN_MILLISECONDS, 40*IN_MILLISECONDS));
+                            events.ScheduleEvent(EVENT_THORNS, 25s, 40s);
                             return;
                         case EVENT_NATURE_GRASP:
                             DoCast(me, SPELL_NATURE_GRASP);
-                            events.ScheduleEvent(EVENT_NATURE_GRASP, 60*IN_MILLISECONDS);
+                            events.ScheduleEvent(EVENT_NATURE_GRASP, 1min);
                             return;
                         default:
                             return;
@@ -855,13 +855,13 @@ class npc_toc_shaman : public CreatureScript
             void Reset() override
             {
                 boss_faction_championsAI::Reset();
-                events.ScheduleEvent(EVENT_HEALING_WAVE, urand(5*IN_MILLISECONDS, 10*IN_MILLISECONDS));
-                events.ScheduleEvent(EVENT_RIPTIDE, urand(5*IN_MILLISECONDS, 20*IN_MILLISECONDS));
-                events.ScheduleEvent(EVENT_SPIRIT_CLEANSE, urand(15*IN_MILLISECONDS, 25*IN_MILLISECONDS));
-                events.ScheduleEvent(EVENT_HEAL_BLOODLUST_HEROISM, 20*IN_MILLISECONDS);
-                events.ScheduleEvent(EVENT_HEX, urand(5*IN_MILLISECONDS, 30*IN_MILLISECONDS));
-                events.ScheduleEvent(EVENT_EARTH_SHIELD, 1*IN_MILLISECONDS);
-                events.ScheduleEvent(EVENT_HEAL_EARTH_SHOCK, urand(5*IN_MILLISECONDS, 30*IN_MILLISECONDS));
+                events.ScheduleEvent(EVENT_HEALING_WAVE, 5s, 10s);
+                events.ScheduleEvent(EVENT_RIPTIDE, 5s, 20s);
+                events.ScheduleEvent(EVENT_SPIRIT_CLEANSE, 15s, 25s);
+                events.ScheduleEvent(EVENT_HEAL_BLOODLUST_HEROISM, 20s);
+                events.ScheduleEvent(EVENT_HEX, 5s, 30s);
+                events.ScheduleEvent(EVENT_EARTH_SHIELD, 1s);
+                events.ScheduleEvent(EVENT_HEAL_EARTH_SHOCK, 5s, 30s);
                 SetEquipmentSlots(false, 49992, EQUIP_NO_CHANGE, EQUIP_NO_CHANGE);
             }
 
@@ -883,17 +883,17 @@ class npc_toc_shaman : public CreatureScript
                         case EVENT_HEALING_WAVE:
                             if (Unit* target = DoSelectLowestHpFriendly(40.0f))
                                 DoCast(target, SPELL_HEALING_WAVE);
-                            events.ScheduleEvent(EVENT_HEALING_WAVE, urand(3*IN_MILLISECONDS, 5*IN_MILLISECONDS));
+                            events.ScheduleEvent(EVENT_HEALING_WAVE, 3s, 5s);
                             return;
                         case EVENT_RIPTIDE:
                             if (Unit* target = DoSelectLowestHpFriendly(40.0f))
                                 DoCast(target, SPELL_RIPTIDE);
-                            events.ScheduleEvent(EVENT_RIPTIDE, urand(5*IN_MILLISECONDS, 15*IN_MILLISECONDS));
+                            events.ScheduleEvent(EVENT_RIPTIDE, 5s, 15s);
                             return;
                         case EVENT_SPIRIT_CLEANSE:
                             if (Unit* target = DoSelectLowestHpFriendly(40.0f))
                                 DoCast(target, SPELL_SPIRIT_CLEANSE);
-                            events.ScheduleEvent(EVENT_SPIRIT_CLEANSE, urand(15*IN_MILLISECONDS, 35*IN_MILLISECONDS));
+                            events.ScheduleEvent(EVENT_SPIRIT_CLEANSE, 15s, 35s);
                             return;
                         case EVENT_HEAL_BLOODLUST_HEROISM:
                             if (me->GetFaction()) // alliance = 1
@@ -911,17 +911,17 @@ class npc_toc_shaman : public CreatureScript
                         case EVENT_HEX:
                             if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0, NonTankTargetSelector(me)))
                                 DoCast(target, SPELL_HEX);
-                            events.ScheduleEvent(EVENT_HEX, urand(15*IN_MILLISECONDS, 30*IN_MILLISECONDS));
+                            events.ScheduleEvent(EVENT_HEX, 15s, 30s);
                             return;
                         case EVENT_EARTH_SHIELD:
                             if (Creature* target = SelectRandomFriendlyMissingBuff(SPELL_EARTH_SHIELD))
                                 DoCast(target, SPELL_EARTH_SHIELD);
-                            events.ScheduleEvent(EVENT_EARTH_SHIELD, urand(15*IN_MILLISECONDS, 30*IN_MILLISECONDS));
+                            events.ScheduleEvent(EVENT_EARTH_SHIELD, 15s, 30s);
                             return;
                         case EVENT_HEAL_EARTH_SHOCK:
                             if (Unit* target = SelectEnemyCaster(true))
                                 DoCast(target, SPELL_EARTH_SHOCK);
-                            events.ScheduleEvent(EVENT_HEAL_EARTH_SHOCK, urand(10*IN_MILLISECONDS, 20*IN_MILLISECONDS));
+                            events.ScheduleEvent(EVENT_HEAL_EARTH_SHOCK, 10s, 20s);
                             return;
                         default:
                             return;
@@ -948,14 +948,14 @@ class npc_toc_paladin : public CreatureScript
             void Reset() override
             {
                 boss_faction_championsAI::Reset();
-                events.ScheduleEvent(EVENT_HAND_OF_FREEDOM, urand(10*IN_MILLISECONDS, 20*IN_MILLISECONDS));
-                events.ScheduleEvent(EVENT_HEAL_DIVINE_SHIELD, 20*IN_MILLISECONDS);
-                events.ScheduleEvent(EVENT_CLEANSE, urand(20*IN_MILLISECONDS, 30*IN_MILLISECONDS));
-                events.ScheduleEvent(EVENT_FLASH_OF_LIGHT, urand(5*IN_MILLISECONDS, 10*IN_MILLISECONDS));
-                events.ScheduleEvent(EVENT_HOLY_LIGHT, urand(10*IN_MILLISECONDS, 15*IN_MILLISECONDS));
-                events.ScheduleEvent(EVENT_HOLY_SHOCK, urand(10*IN_MILLISECONDS, 15*IN_MILLISECONDS));
-                events.ScheduleEvent(EVENT_HEAL_HAND_OF_PROTECTION, urand(30*IN_MILLISECONDS, 60*IN_MILLISECONDS));
-                events.ScheduleEvent(EVENT_HAMMER_OF_JUSTICE, urand(10*IN_MILLISECONDS, 30*IN_MILLISECONDS));
+                events.ScheduleEvent(EVENT_HAND_OF_FREEDOM, 10s, 20s);
+                events.ScheduleEvent(EVENT_HEAL_DIVINE_SHIELD, 20s);
+                events.ScheduleEvent(EVENT_CLEANSE, 20s, 30s);
+                events.ScheduleEvent(EVENT_FLASH_OF_LIGHT, 5s, 10s);
+                events.ScheduleEvent(EVENT_HOLY_LIGHT, 10s, 15s);
+                events.ScheduleEvent(EVENT_HOLY_SHOCK, 10s, 15s);
+                events.ScheduleEvent(EVENT_HEAL_HAND_OF_PROTECTION, 30s, 60s);
+                events.ScheduleEvent(EVENT_HAMMER_OF_JUSTICE, 10s, 30s);
                 SetEquipmentSlots(false, 50771, 47079, EQUIP_NO_CHANGE);
             }
 
@@ -977,7 +977,7 @@ class npc_toc_paladin : public CreatureScript
                         case EVENT_HAND_OF_FREEDOM:
                             if (Unit* target = SelectRandomFriendlyMissingBuff(SPELL_HAND_OF_FREEDOM))
                                 DoCast(target, SPELL_HAND_OF_FREEDOM);
-                            events.ScheduleEvent(EVENT_HAND_OF_FREEDOM, urand(15*IN_MILLISECONDS, 35*IN_MILLISECONDS));
+                            events.ScheduleEvent(EVENT_HAND_OF_FREEDOM, 15s, 35s);
                             return;
                         case EVENT_HEAL_DIVINE_SHIELD:
                             if (HealthBelowPct(30) && !me->HasAura(SPELL_FORBEARANCE))
@@ -991,22 +991,22 @@ class npc_toc_paladin : public CreatureScript
                         case EVENT_CLEANSE:
                             if (Unit* target = DoSelectLowestHpFriendly(40.0f))
                                 DoCast(target, SPELL_CLEANSE);
-                            events.ScheduleEvent(EVENT_CLEANSE, urand(10*IN_MILLISECONDS, 30*IN_MILLISECONDS));
+                            events.ScheduleEvent(EVENT_CLEANSE, 10s, 30s);
                             return;
                         case EVENT_FLASH_OF_LIGHT:
                             if (Unit* target = DoSelectLowestHpFriendly(40.0f))
                                 DoCast(target, SPELL_FLASH_OF_LIGHT);
-                            events.ScheduleEvent(EVENT_FLASH_OF_LIGHT, urand(3*IN_MILLISECONDS, 5*IN_MILLISECONDS));
+                            events.ScheduleEvent(EVENT_FLASH_OF_LIGHT, 3s, 5s);
                             return;
                         case EVENT_HOLY_LIGHT:
                             if (Unit* target = DoSelectLowestHpFriendly(40.0f))
                                 DoCast(target, SPELL_HOLY_LIGHT);
-                            events.ScheduleEvent(EVENT_HOLY_LIGHT, urand(5*IN_MILLISECONDS, 10*IN_MILLISECONDS));
+                            events.ScheduleEvent(EVENT_HOLY_LIGHT, 5s, 10s);
                             return;
                         case EVENT_HOLY_SHOCK:
                             if (Unit* target = DoSelectLowestHpFriendly(40.0f))
                                 DoCast(target, SPELL_HOLY_SHOCK);
-                            events.ScheduleEvent(EVENT_HOLY_SHOCK, urand(10*IN_MILLISECONDS, 15*IN_MILLISECONDS));
+                            events.ScheduleEvent(EVENT_HOLY_SHOCK, 10s, 15s);
                             return;
                         case EVENT_HEAL_HAND_OF_PROTECTION:
                             if (Unit* target = DoSelectLowestHpFriendly(30.0f))
@@ -1025,7 +1025,7 @@ class npc_toc_paladin : public CreatureScript
                         case EVENT_HAMMER_OF_JUSTICE:
                             if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0, 15.0f, true))
                                 DoCast(target, SPELL_HAMMER_OF_JUSTICE);
-                            events.ScheduleEvent(EVENT_HAMMER_OF_JUSTICE, 40*IN_MILLISECONDS);
+                            events.ScheduleEvent(EVENT_HAMMER_OF_JUSTICE, 40s);
                             return;
                         default:
                             return;
@@ -1052,13 +1052,13 @@ class npc_toc_priest : public CreatureScript
             void Reset() override
             {
                 boss_faction_championsAI::Reset();
-                events.ScheduleEvent(EVENT_RENEW, urand(3*IN_MILLISECONDS, 10*IN_MILLISECONDS));
-                events.ScheduleEvent(EVENT_SHIELD, urand(5*IN_MILLISECONDS, 15*IN_MILLISECONDS));
-                events.ScheduleEvent(EVENT_FLASH_HEAL, urand(5*IN_MILLISECONDS, 10*IN_MILLISECONDS));
-                events.ScheduleEvent(EVENT_HEAL_DISPEL, urand(10*IN_MILLISECONDS, 20*IN_MILLISECONDS));
-                events.ScheduleEvent(EVENT_HEAL_PSYCHIC_SCREAM, urand(10*IN_MILLISECONDS, 30*IN_MILLISECONDS));
-                events.ScheduleEvent(EVENT_MANA_BURN, urand(15*IN_MILLISECONDS, 30*IN_MILLISECONDS));
-                events.ScheduleEvent(EVENT_PENANCE, urand(10*IN_MILLISECONDS, 20*IN_MILLISECONDS));
+                events.ScheduleEvent(EVENT_RENEW, 3s, 10s);
+                events.ScheduleEvent(EVENT_SHIELD, 5s, 15s);
+                events.ScheduleEvent(EVENT_FLASH_HEAL, 5s, 10s);
+                events.ScheduleEvent(EVENT_HEAL_DISPEL, 10s, 20s);
+                events.ScheduleEvent(EVENT_HEAL_PSYCHIC_SCREAM, 10s, 30s);
+                events.ScheduleEvent(EVENT_MANA_BURN, 15s, 30s);
+                events.ScheduleEvent(EVENT_PENANCE, 10s, 20s);
                 SetEquipmentSlots(false, 49992, EQUIP_NO_CHANGE, EQUIP_NO_CHANGE);
             }
 
@@ -1080,37 +1080,37 @@ class npc_toc_priest : public CreatureScript
                         case EVENT_RENEW:
                             if (Unit* target = DoSelectLowestHpFriendly(40.0f))
                                 DoCast(target, SPELL_RENEW);
-                            events.ScheduleEvent(EVENT_RENEW, urand(3*IN_MILLISECONDS, 5*IN_MILLISECONDS));
+                            events.ScheduleEvent(EVENT_RENEW, 3s, 5s);
                             return;
                         case EVENT_SHIELD:
                             if (Unit* target = DoSelectLowestHpFriendly(40.0f))
                                 DoCast(target, SPELL_SHIELD);
-                            events.ScheduleEvent(EVENT_SHIELD, urand(15*IN_MILLISECONDS, 35*IN_MILLISECONDS));
+                            events.ScheduleEvent(EVENT_SHIELD, 15s, 35s);
                             return;
                         case EVENT_FLASH_HEAL:
                             if (Unit* target = DoSelectLowestHpFriendly(40.0f))
                                 DoCast(target, SPELL_FLASH_HEAL);
-                            events.ScheduleEvent(EVENT_FLASH_HEAL, urand(3*IN_MILLISECONDS, 5*IN_MILLISECONDS));
+                            events.ScheduleEvent(EVENT_FLASH_HEAL, 3s, 5s);
                             return;
                         case EVENT_HEAL_DISPEL:
                             if (Unit* target = urand(0, 1) ? SelectTarget(SELECT_TARGET_RANDOM, 0, 30.0f, true) : DoSelectLowestHpFriendly(40.0f))
                                 DoCast(target, SPELL_DISPEL);
-                            events.ScheduleEvent(EVENT_HEAL_DISPEL, urand(10*IN_MILLISECONDS, 20*IN_MILLISECONDS));
+                            events.ScheduleEvent(EVENT_HEAL_DISPEL, 10s, 20s);
                             return;
                         case EVENT_HEAL_PSYCHIC_SCREAM:
                             if (EnemiesInRange(10.0f) >= 2)
                                 DoCastAOE(SPELL_PSYCHIC_SCREAM);
-                            events.ScheduleEvent(EVENT_HEAL_PSYCHIC_SCREAM, urand(10*IN_MILLISECONDS, 25*IN_MILLISECONDS));
+                            events.ScheduleEvent(EVENT_HEAL_PSYCHIC_SCREAM, 10s, 25s);
                             return;
                         case EVENT_MANA_BURN:
                             if (Unit* target = SelectEnemyCaster(false))
                                 DoCast(target, SPELL_MANA_BURN);
-                            events.ScheduleEvent(EVENT_MANA_BURN, urand(15*IN_MILLISECONDS, 30*IN_MILLISECONDS));
+                            events.ScheduleEvent(EVENT_MANA_BURN, 15s, 30s);
                             return;
                         case EVENT_PENANCE:
                             if (Unit* target = DoSelectLowestHpFriendly(40.0f))
                                 DoCast(target, SPELL_PENANCE);
-                            events.ScheduleEvent(EVENT_PENANCE, urand(10*IN_MILLISECONDS, 20*IN_MILLISECONDS));
+                            events.ScheduleEvent(EVENT_PENANCE, 10s, 20s);
                             return;
                         default:
                             return;
@@ -1140,14 +1140,14 @@ class npc_toc_shadow_priest : public CreatureScript
             void Reset() override
             {
                 boss_faction_championsAI::Reset();
-                events.ScheduleEvent(EVENT_SILENCE, urand(10*IN_MILLISECONDS, 25*IN_MILLISECONDS));
-                events.ScheduleEvent(EVENT_VAMPIRIC_TOUCH, urand(5*IN_MILLISECONDS, 15*IN_MILLISECONDS));
-                events.ScheduleEvent(EVENT_SW_PAIN, urand(3*IN_MILLISECONDS, 10*IN_MILLISECONDS));
-                events.ScheduleEvent(EVENT_MIND_BLAST, urand(5*IN_MILLISECONDS, 15*IN_MILLISECONDS));
-                events.ScheduleEvent(EVENT_HORROR, urand(10*IN_MILLISECONDS, 25*IN_MILLISECONDS));
-                events.ScheduleEvent(EVENT_DISPERSION, urand(20*IN_MILLISECONDS, 40*IN_MILLISECONDS));
-                events.ScheduleEvent(EVENT_DPS_DISPEL, urand(10*IN_MILLISECONDS, 20*IN_MILLISECONDS));
-                events.ScheduleEvent(EVENT_DPS_PSYCHIC_SCREAM, urand(10*IN_MILLISECONDS, 30*IN_MILLISECONDS));
+                events.ScheduleEvent(EVENT_SILENCE, 10s, 25s);
+                events.ScheduleEvent(EVENT_VAMPIRIC_TOUCH, 5s, 15s);
+                events.ScheduleEvent(EVENT_SW_PAIN, 3s, 10s);
+                events.ScheduleEvent(EVENT_MIND_BLAST, 5s, 15s);
+                events.ScheduleEvent(EVENT_HORROR, 10s, 25s);
+                events.ScheduleEvent(EVENT_DISPERSION, 20s, 40s);
+                events.ScheduleEvent(EVENT_DPS_DISPEL, 10s, 20s);
+                events.ScheduleEvent(EVENT_DPS_PSYCHIC_SCREAM, 10s, 30s);
                 SetEquipmentSlots(false, 50040, EQUIP_NO_CHANGE, EQUIP_NO_CHANGE);
                 DoCast(me, SPELL_SHADOWFORM);
             }
@@ -1170,25 +1170,25 @@ class npc_toc_shadow_priest : public CreatureScript
                         case EVENT_SILENCE:
                             if (Unit* target = SelectEnemyCaster(true))
                                 DoCast(target, SPELL_SILENCE);
-                            events.ScheduleEvent(EVENT_SILENCE, urand(10*IN_MILLISECONDS, 25*IN_MILLISECONDS));
+                            events.ScheduleEvent(EVENT_SILENCE, 10s, 25s);
                             return;
                         case EVENT_VAMPIRIC_TOUCH:
                             if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0, 30.0f, true))
                                 DoCast(target, SPELL_VAMPIRIC_TOUCH);
-                            events.ScheduleEvent(EVENT_VAMPIRIC_TOUCH, urand(10*IN_MILLISECONDS, 35*IN_MILLISECONDS));
+                            events.ScheduleEvent(EVENT_VAMPIRIC_TOUCH, 10s, 35s);
                             return;
                         case EVENT_SW_PAIN:
                             if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0, 40.0f, true))
                                 DoCast(target, SPELL_SW_PAIN);
-                            events.ScheduleEvent(EVENT_SW_PAIN, urand(10*IN_MILLISECONDS, 35*IN_MILLISECONDS));
+                            events.ScheduleEvent(EVENT_SW_PAIN, 10s, 35s);
                             return;
                         case EVENT_MIND_BLAST:
                             DoCastVictim(SPELL_MIND_BLAST);
-                            events.ScheduleEvent(EVENT_MIND_BLAST, urand(10*IN_MILLISECONDS, 20*IN_MILLISECONDS));
+                            events.ScheduleEvent(EVENT_MIND_BLAST, 10s, 20s);
                             return;
                         case EVENT_HORROR:
                             DoCastVictim(SPELL_HORROR);
-                            events.ScheduleEvent(EVENT_HORROR, urand(15*IN_MILLISECONDS, 35*IN_MILLISECONDS));
+                            events.ScheduleEvent(EVENT_HORROR, 15s, 35s);
                             return;
                         case EVENT_DISPERSION:
                             if (HealthBelowPct(40))
@@ -1202,12 +1202,12 @@ class npc_toc_shadow_priest : public CreatureScript
                         case EVENT_DPS_DISPEL:
                             if (Unit* target = urand(0, 1) ? SelectTarget(SELECT_TARGET_RANDOM, 0, 30.0f, true) : DoSelectLowestHpFriendly(40.0f))
                                 DoCast(target, SPELL_DISPEL);
-                            events.ScheduleEvent(EVENT_DPS_DISPEL, urand(10*IN_MILLISECONDS, 20*IN_MILLISECONDS));
+                            events.ScheduleEvent(EVENT_DPS_DISPEL, 10s, 20s);
                             return;
                         case EVENT_DPS_PSYCHIC_SCREAM:
                             if (EnemiesInRange(10.0f) >= 2)
                                 DoCastAOE(SPELL_PSYCHIC_SCREAM);
-                            events.ScheduleEvent(EVENT_DPS_PSYCHIC_SCREAM, urand(10*IN_MILLISECONDS, 25*IN_MILLISECONDS));
+                            events.ScheduleEvent(EVENT_DPS_PSYCHIC_SCREAM, 10s, 25s);
                             return;
                         default:
                             return;
@@ -1235,13 +1235,13 @@ class npc_toc_warlock : public CreatureScript
             void Reset() override
             {
                 boss_faction_championsAI::Reset();
-                events.ScheduleEvent(EVENT_HELLFIRE, urand(10*IN_MILLISECONDS, 30*IN_MILLISECONDS));
-                events.ScheduleEvent(EVENT_CORRUPTION, urand(2*IN_MILLISECONDS, 5*IN_MILLISECONDS));
-                events.ScheduleEvent(EVENT_CURSE_OF_AGONY, urand(5*IN_MILLISECONDS, 10*IN_MILLISECONDS));
-                events.ScheduleEvent(EVENT_CURSE_OF_EXHAUSTION, urand(5*IN_MILLISECONDS, 10*IN_MILLISECONDS));
-                events.ScheduleEvent(EVENT_FEAR, urand(5*IN_MILLISECONDS, 15*IN_MILLISECONDS));
-                events.ScheduleEvent(EVENT_SEARING_PAIN, urand(5*IN_MILLISECONDS, 12*IN_MILLISECONDS));
-                events.ScheduleEvent(EVENT_UNSTABLE_AFFLICTION, urand(7*IN_MILLISECONDS, 15*IN_MILLISECONDS));
+                events.ScheduleEvent(EVENT_HELLFIRE, 10s, 30s);
+                events.ScheduleEvent(EVENT_CORRUPTION, 2s, 5s);
+                events.ScheduleEvent(EVENT_CURSE_OF_AGONY, 5s, 10s);
+                events.ScheduleEvent(EVENT_CURSE_OF_EXHAUSTION, 5s, 10s);
+                events.ScheduleEvent(EVENT_FEAR, 5s, 15s);
+                events.ScheduleEvent(EVENT_SEARING_PAIN, 5s, 12s);
+                events.ScheduleEvent(EVENT_UNSTABLE_AFFLICTION, 7s, 15s);
                 SetEquipmentSlots(false, 49992, EQUIP_NO_CHANGE, EQUIP_NO_CHANGE);
             }
 
@@ -1269,36 +1269,36 @@ class npc_toc_warlock : public CreatureScript
                         case EVENT_HELLFIRE:
                             if (EnemiesInRange(10.0f) >= 2)
                                 DoCastAOE(SPELL_HELLFIRE);
-                            events.ScheduleEvent(EVENT_HELLFIRE, urand(10*IN_MILLISECONDS, 30*IN_MILLISECONDS));
+                            events.ScheduleEvent(EVENT_HELLFIRE, 10s, 30s);
                             return;
                         case EVENT_CORRUPTION:
                             if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0, 30.0f))
                                 DoCast(target, SPELL_CORRUPTION);
-                            events.ScheduleEvent(EVENT_CORRUPTION, urand(15*IN_MILLISECONDS, 25*IN_MILLISECONDS));
+                            events.ScheduleEvent(EVENT_CORRUPTION, 15s, 25s);
                             return;
                         case EVENT_CURSE_OF_AGONY:
                             if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0, 30.0f))
                                 DoCast(target, SPELL_CURSE_OF_AGONY);
-                            events.ScheduleEvent(EVENT_CURSE_OF_AGONY, urand(20*IN_MILLISECONDS, 35*IN_MILLISECONDS));
+                            events.ScheduleEvent(EVENT_CURSE_OF_AGONY, 20s, 35s);
                             return;
                         case EVENT_CURSE_OF_EXHAUSTION:
                             if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0, 30.0f))
                                 DoCast(target, SPELL_CURSE_OF_EXHAUSTION);
-                            events.ScheduleEvent(EVENT_CURSE_OF_EXHAUSTION, urand(20*IN_MILLISECONDS, 35*IN_MILLISECONDS));
+                            events.ScheduleEvent(EVENT_CURSE_OF_EXHAUSTION, 20s, 35s);
                             return;
                         case EVENT_FEAR:
                             if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0, 20.0f, true))
                                 DoCast(target, SPELL_FEAR);
-                            events.ScheduleEvent(EVENT_FEAR, urand(5*IN_MILLISECONDS, 20*IN_MILLISECONDS));
+                            events.ScheduleEvent(EVENT_FEAR, 5s, 20s);
                             return;
                         case EVENT_SEARING_PAIN:
                             DoCastVictim(SPELL_SEARING_PAIN);
-                            events.ScheduleEvent(EVENT_SEARING_PAIN, urand(10*IN_MILLISECONDS, 25*IN_MILLISECONDS));
+                            events.ScheduleEvent(EVENT_SEARING_PAIN, 10s, 25s);
                             return;
                         case EVENT_UNSTABLE_AFFLICTION:
                             if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0, 30.0f, true))
                                 DoCast(target, SPELL_UNSTABLE_AFFLICTION);
-                            events.ScheduleEvent(EVENT_UNSTABLE_AFFLICTION, urand(10*IN_MILLISECONDS, 25*IN_MILLISECONDS));
+                            events.ScheduleEvent(EVENT_UNSTABLE_AFFLICTION, 10s, 25s);
                             return;
                         default:
                             return;
@@ -1326,14 +1326,14 @@ class npc_toc_mage : public CreatureScript
             void Reset() override
             {
                 boss_faction_championsAI::Reset();
-                events.ScheduleEvent(EVENT_ARCANE_BARRAGE, urand(1*IN_MILLISECONDS, 5*IN_MILLISECONDS));
-                events.ScheduleEvent(EVENT_ARCANE_BLAST, urand(3*IN_MILLISECONDS, 5*IN_MILLISECONDS));
-                events.ScheduleEvent(EVENT_ARCANE_EXPLOSION, urand(5*IN_MILLISECONDS, 15*IN_MILLISECONDS));
-                events.ScheduleEvent(EVENT_BLINK, urand(15*IN_MILLISECONDS, 20*IN_MILLISECONDS));
-                events.ScheduleEvent(EVENT_COUNTERSPELL, urand(10*IN_MILLISECONDS, 20*IN_MILLISECONDS));
-                events.ScheduleEvent(EVENT_FROST_NOVA, urand(5*IN_MILLISECONDS, 20*IN_MILLISECONDS));
-                events.ScheduleEvent(EVENT_ICE_BLOCK, urand(10*IN_MILLISECONDS, 20*IN_MILLISECONDS));
-                events.ScheduleEvent(EVENT_POLYMORPH, urand(5*IN_MILLISECONDS, 15*IN_MILLISECONDS));
+                events.ScheduleEvent(EVENT_ARCANE_BARRAGE, 1s, 5s);
+                events.ScheduleEvent(EVENT_ARCANE_BLAST, 3s, 5s);
+                events.ScheduleEvent(EVENT_ARCANE_EXPLOSION, 5s, 15s);
+                events.ScheduleEvent(EVENT_BLINK, 15s, 20s);
+                events.ScheduleEvent(EVENT_COUNTERSPELL, 10s, 20s);
+                events.ScheduleEvent(EVENT_FROST_NOVA, 5s, 20s);
+                events.ScheduleEvent(EVENT_ICE_BLOCK, 10s, 20s);
+                events.ScheduleEvent(EVENT_POLYMORPH, 5s, 15s);
                 SetEquipmentSlots(false, 47524, EQUIP_NO_CHANGE, EQUIP_NO_CHANGE);
             }
 
@@ -1354,31 +1354,31 @@ class npc_toc_mage : public CreatureScript
                     {
                         case EVENT_ARCANE_BARRAGE:
                             DoCastVictim(SPELL_ARCANE_BARRAGE);
-                            events.ScheduleEvent(EVENT_ARCANE_BARRAGE, urand(5*IN_MILLISECONDS, 7*IN_MILLISECONDS));
+                            events.ScheduleEvent(EVENT_ARCANE_BARRAGE, 5s, 7s);
                             return;
                         case EVENT_ARCANE_BLAST:
                             DoCastVictim(SPELL_ARCANE_BLAST);
-                            events.ScheduleEvent(EVENT_ARCANE_BLAST, urand(5*IN_MILLISECONDS, 15*IN_MILLISECONDS));
+                            events.ScheduleEvent(EVENT_ARCANE_BLAST, 5s, 15s);
                             return;
                         case EVENT_ARCANE_EXPLOSION:
                             if (EnemiesInRange(10.0f) >= 2)
                                 DoCastAOE(SPELL_ARCANE_EXPLOSION);
-                            events.ScheduleEvent(EVENT_ARCANE_EXPLOSION, urand(10*IN_MILLISECONDS, 30*IN_MILLISECONDS));
+                            events.ScheduleEvent(EVENT_ARCANE_EXPLOSION, 10s, 30s);
                             return;
                         case EVENT_BLINK:
                             if (EnemiesInRange(10.0f) >= 2)
                                 DoCast(SPELL_BLINK);
-                            events.ScheduleEvent(EVENT_BLINK, urand(10*IN_MILLISECONDS, 30*IN_MILLISECONDS));
+                            events.ScheduleEvent(EVENT_BLINK, 10s, 30s);
                             return;
                         case EVENT_COUNTERSPELL:
                             if (Unit* target = SelectEnemyCaster(true))
                                 DoCast(target, SPELL_COUNTERSPELL);
-                            events.ScheduleEvent(EVENT_COUNTERSPELL, 24*IN_MILLISECONDS);
+                            events.ScheduleEvent(EVENT_COUNTERSPELL, 24s);
                             return;
                         case EVENT_FROST_NOVA:
                             if (EnemiesInRange(10.0f) >= 2)
                                 DoCastAOE(SPELL_FROST_NOVA);
-                            events.ScheduleEvent(EVENT_FROST_NOVA, 25*IN_MILLISECONDS);
+                            events.ScheduleEvent(EVENT_FROST_NOVA, 25s);
                             return;
                         case EVENT_ICE_BLOCK:
                             if (HealthBelowPct(30))
@@ -1392,7 +1392,7 @@ class npc_toc_mage : public CreatureScript
                         case EVENT_POLYMORPH:
                             if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0, NonTankTargetSelector(me)))
                                 DoCast(target, SPELL_POLYMORPH);
-                            events.ScheduleEvent(EVENT_POLYMORPH, urand(10*IN_MILLISECONDS, 30*IN_MILLISECONDS));
+                            events.ScheduleEvent(EVENT_POLYMORPH, 10s, 30s);
                             return;
                         default:
                             return;
@@ -1420,14 +1420,14 @@ class npc_toc_hunter : public CreatureScript
             void Reset() override
             {
                 boss_faction_championsAI::Reset();
-                events.ScheduleEvent(EVENT_AIMED_SHOT, urand(5*IN_MILLISECONDS, 10*IN_MILLISECONDS));
-                events.ScheduleEvent(EVENT_DETERRENCE, urand(10*IN_MILLISECONDS, 20*IN_MILLISECONDS));
-                events.ScheduleEvent(EVENT_DISENGAGE, urand(10*IN_MILLISECONDS, 20*IN_MILLISECONDS));
-                events.ScheduleEvent(EVENT_EXPLOSIVE_SHOT, urand(3*IN_MILLISECONDS, 5*IN_MILLISECONDS));
-                events.ScheduleEvent(EVENT_FROST_TRAP, urand(10*IN_MILLISECONDS, 20*IN_MILLISECONDS));
-                events.ScheduleEvent(EVENT_STEADY_SHOT, urand(5*IN_MILLISECONDS, 10*IN_MILLISECONDS));
-                events.ScheduleEvent(EVENT_WING_CLIP, urand(10*IN_MILLISECONDS, 20*IN_MILLISECONDS));
-                events.ScheduleEvent(EVENT_WYVERN_STING, urand(10*IN_MILLISECONDS, 25*IN_MILLISECONDS));
+                events.ScheduleEvent(EVENT_AIMED_SHOT, 5s, 10s);
+                events.ScheduleEvent(EVENT_DETERRENCE, 10s, 20s);
+                events.ScheduleEvent(EVENT_DISENGAGE, 10s, 20s);
+                events.ScheduleEvent(EVENT_EXPLOSIVE_SHOT, 3s, 5s);
+                events.ScheduleEvent(EVENT_FROST_TRAP, 10s, 20s);
+                events.ScheduleEvent(EVENT_STEADY_SHOT, 5s, 10s);
+                events.ScheduleEvent(EVENT_WING_CLIP, 10s, 20s);
+                events.ScheduleEvent(EVENT_WYVERN_STING, 10s, 25s);
                 SetEquipmentSlots(false, 47156, EQUIP_NO_CHANGE, 48711);
             }
 
@@ -1454,7 +1454,7 @@ class npc_toc_hunter : public CreatureScript
                     {
                         case EVENT_AIMED_SHOT:
                             DoCastVictim(SPELL_AIMED_SHOT);
-                            events.ScheduleEvent(EVENT_AIMED_SHOT, urand(10*IN_MILLISECONDS, 15*IN_MILLISECONDS));
+                            events.ScheduleEvent(EVENT_AIMED_SHOT, 10s, 15s);
                             return;
                         case EVENT_DETERRENCE:
                             if (HealthBelowPct(30))
@@ -1468,20 +1468,20 @@ class npc_toc_hunter : public CreatureScript
                         case EVENT_DISENGAGE:
                             if (EnemiesInRange(10.0f) >= 2)
                                 DoCast(SPELL_DISENGAGE);
-                            events.ScheduleEvent(EVENT_DISENGAGE, 30*IN_MILLISECONDS);
+                            events.ScheduleEvent(EVENT_DISENGAGE, 30s);
                             return;
                         case EVENT_EXPLOSIVE_SHOT:
                             DoCastVictim(SPELL_EXPLOSIVE_SHOT);
-                            events.ScheduleEvent(EVENT_EXPLOSIVE_SHOT, urand(6*IN_MILLISECONDS, 10*IN_MILLISECONDS));
+                            events.ScheduleEvent(EVENT_EXPLOSIVE_SHOT, 6s, 10s);
                             return;
                         case EVENT_FROST_TRAP:
                             if (EnemiesInRange(10.0f) >= 2)
                                 DoCastAOE(SPELL_FROST_TRAP);
-                            events.ScheduleEvent(EVENT_FROST_TRAP, 30*IN_MILLISECONDS);
+                            events.ScheduleEvent(EVENT_FROST_TRAP, 30s);
                             return;
                         case EVENT_STEADY_SHOT:
                             DoCastVictim(SPELL_STEADY_SHOT);
-                            events.ScheduleEvent(EVENT_STEADY_SHOT, urand(5*IN_MILLISECONDS, 15*IN_MILLISECONDS));
+                            events.ScheduleEvent(EVENT_STEADY_SHOT, 5s, 15s);
                             return;
                         case EVENT_WING_CLIP:
                             if (Unit* target = me->GetVictim())
@@ -1489,12 +1489,12 @@ class npc_toc_hunter : public CreatureScript
                                 if (me->GetDistance2d(target) < 6.0f)
                                     DoCast(target, SPELL_WING_CLIP);
                             }
-                            events.ScheduleEvent(EVENT_WING_CLIP, urand(15*IN_MILLISECONDS, 25*IN_MILLISECONDS));
+                            events.ScheduleEvent(EVENT_WING_CLIP, 15s, 25s);
                             return;
                         case EVENT_WYVERN_STING:
                             if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0, NonTankTargetSelector(me)))
                                 DoCast(target, SPELL_WYVERN_STING);
-                            events.ScheduleEvent(EVENT_WYVERN_STING, urand(10*IN_MILLISECONDS, 30*IN_MILLISECONDS));
+                            events.ScheduleEvent(EVENT_WYVERN_STING, 10s, 30s);
                             return;
                         default:
                             return;
@@ -1522,14 +1522,14 @@ class npc_toc_boomkin : public CreatureScript
             void Reset() override
             {
                 boss_faction_championsAI::Reset();
-                events.ScheduleEvent(EVENT_CYCLONE, urand(10*IN_MILLISECONDS, 20*IN_MILLISECONDS));
-                events.ScheduleEvent(EVENT_ENTANGLING_ROOTS, urand(10*IN_MILLISECONDS, 20*IN_MILLISECONDS));
-                events.ScheduleEvent(EVENT_FAERIE_FIRE, urand(2*IN_MILLISECONDS, 5*IN_MILLISECONDS));
-                events.ScheduleEvent(EVENT_FORCE_OF_NATURE, urand(20*IN_MILLISECONDS, 30*IN_MILLISECONDS));
-                events.ScheduleEvent(EVENT_INSECT_SWARM, urand(5*IN_MILLISECONDS, 10*IN_MILLISECONDS));
-                events.ScheduleEvent(EVENT_MOONFIRE, urand(10*IN_MILLISECONDS, 20*IN_MILLISECONDS));
-                events.ScheduleEvent(EVENT_STARFIRE, urand(10*IN_MILLISECONDS, 20*IN_MILLISECONDS));
-                events.ScheduleEvent(EVENT_DPS_BARKSKIN, urand(20*IN_MILLISECONDS, 30*IN_MILLISECONDS));
+                events.ScheduleEvent(EVENT_CYCLONE, 10s, 20s);
+                events.ScheduleEvent(EVENT_ENTANGLING_ROOTS, 10s, 20s);
+                events.ScheduleEvent(EVENT_FAERIE_FIRE, 2s, 5s);
+                events.ScheduleEvent(EVENT_FORCE_OF_NATURE, 20s, 30s);
+                events.ScheduleEvent(EVENT_INSECT_SWARM, 5s, 10s);
+                events.ScheduleEvent(EVENT_MOONFIRE, 10s, 20s);
+                events.ScheduleEvent(EVENT_STARFIRE, 10s, 20s);
+                events.ScheduleEvent(EVENT_DPS_BARKSKIN, 20s, 30s);
 
                 SetEquipmentSlots(false, 50966, EQUIP_NO_CHANGE, EQUIP_NO_CHANGE);
             }
@@ -1552,32 +1552,32 @@ class npc_toc_boomkin : public CreatureScript
                         case EVENT_CYCLONE:
                             if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0, NonTankTargetSelector(me)))
                                 DoCast(target, SPELL_CYCLONE);
-                            events.ScheduleEvent(EVENT_CYCLONE, urand(10*IN_MILLISECONDS, 20*IN_MILLISECONDS));
+                            events.ScheduleEvent(EVENT_CYCLONE, 10s, 20s);
                             return;
                         case EVENT_ENTANGLING_ROOTS:
                             if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0, 30.0f, true))
                                 DoCast(target, SPELL_ENTANGLING_ROOTS);
-                            events.ScheduleEvent(EVENT_ENTANGLING_ROOTS, urand(10*IN_MILLISECONDS, 20*IN_MILLISECONDS));
+                            events.ScheduleEvent(EVENT_ENTANGLING_ROOTS, 10s, 20s);
                             return;
                         case EVENT_FAERIE_FIRE:
                             DoCastVictim(SPELL_FAERIE_FIRE);
-                            events.ScheduleEvent(EVENT_FAERIE_FIRE, urand(30*IN_MILLISECONDS, 40*IN_MILLISECONDS));
+                            events.ScheduleEvent(EVENT_FAERIE_FIRE, 30s, 40s);
                             return;
                         case EVENT_FORCE_OF_NATURE:
                             DoCastVictim(SPELL_FORCE_OF_NATURE);
-                            events.ScheduleEvent(EVENT_FORCE_OF_NATURE, 180*IN_MILLISECONDS);
+                            events.ScheduleEvent(EVENT_FORCE_OF_NATURE, 2min);
                             return;
                         case EVENT_INSECT_SWARM:
                             DoCastVictim(SPELL_INSECT_SWARM);
-                            events.ScheduleEvent(EVENT_INSECT_SWARM, urand(15*IN_MILLISECONDS, 25*IN_MILLISECONDS));
+                            events.ScheduleEvent(EVENT_INSECT_SWARM, 15s, 25s);
                             return;
                         case EVENT_MOONFIRE:
                             DoCastVictim(SPELL_MOONFIRE);
-                            events.ScheduleEvent(EVENT_MOONFIRE, urand(15*IN_MILLISECONDS, 30*IN_MILLISECONDS));
+                            events.ScheduleEvent(EVENT_MOONFIRE, 15s, 30s);
                             return;
                         case EVENT_STARFIRE:
                             DoCastVictim(SPELL_STARFIRE);
-                            events.ScheduleEvent(EVENT_STARFIRE, urand(15*IN_MILLISECONDS, 30*IN_MILLISECONDS));
+                            events.ScheduleEvent(EVENT_STARFIRE, 15s, 30s);
                             return;
                         case EVENT_DPS_BARKSKIN:
                             if (HealthBelowPct(30))
@@ -1617,15 +1617,15 @@ class npc_toc_warrior : public CreatureScript
             void Reset() override
             {
                 boss_faction_championsAI::Reset();
-                events.ScheduleEvent(EVENT_BLADESTORM, urand(10*IN_MILLISECONDS, 15*IN_MILLISECONDS));
-                events.ScheduleEvent(EVENT_INTIMIDATING_SHOUT, urand(20*IN_MILLISECONDS, 25*IN_MILLISECONDS));
-                events.ScheduleEvent(EVENT_MORTAL_STRIKE, urand(5*IN_MILLISECONDS, 20*IN_MILLISECONDS));
-                events.ScheduleEvent(EVENT_WARR_CHARGE, 1*IN_MILLISECONDS);
-                events.ScheduleEvent(EVENT_DISARM, urand(5*IN_MILLISECONDS, 20*IN_MILLISECONDS));
-                events.ScheduleEvent(EVENT_OVERPOWER, urand(10*IN_MILLISECONDS, 20*IN_MILLISECONDS));
-                events.ScheduleEvent(EVENT_SUNDER_ARMOR, urand(5*IN_MILLISECONDS, 10*IN_MILLISECONDS));
-                events.ScheduleEvent(EVENT_SHATTERING_THROW, urand(20*IN_MILLISECONDS, 40*IN_MILLISECONDS));
-                events.ScheduleEvent(EVENT_RETALIATION, urand(5*IN_MILLISECONDS, 20*IN_MILLISECONDS));
+                events.ScheduleEvent(EVENT_BLADESTORM, 10s, 15s);
+                events.ScheduleEvent(EVENT_INTIMIDATING_SHOUT, 20s, 25s);
+                events.ScheduleEvent(EVENT_MORTAL_STRIKE, 5s, 20s);
+                events.ScheduleEvent(EVENT_WARR_CHARGE, 1s);
+                events.ScheduleEvent(EVENT_DISARM, 5s, 20s);
+                events.ScheduleEvent(EVENT_OVERPOWER, 10s, 20s);
+                events.ScheduleEvent(EVENT_SUNDER_ARMOR, 5s, 10s);
+                events.ScheduleEvent(EVENT_SHATTERING_THROW, 20s, 40s);
+                events.ScheduleEvent(EVENT_RETALIATION, 5s, 20s);
                 SetEquipmentSlots(false, 47427, 46964, EQUIP_NO_CHANGE);
             }
 
@@ -1646,31 +1646,31 @@ class npc_toc_warrior : public CreatureScript
                     {
                         case EVENT_BLADESTORM:
                             DoCastVictim(SPELL_BLADESTORM);
-                            events.ScheduleEvent(EVENT_BLADESTORM, 150*IN_MILLISECONDS);
+                            events.ScheduleEvent(EVENT_BLADESTORM, 150s);
                             return;
                         case EVENT_INTIMIDATING_SHOUT:
                             DoCastAOE(SPELL_INTIMIDATING_SHOUT);
-                            events.ScheduleEvent(EVENT_INTIMIDATING_SHOUT, 120*IN_MILLISECONDS);
+                            events.ScheduleEvent(EVENT_INTIMIDATING_SHOUT, 120s);
                             return;
                         case EVENT_MORTAL_STRIKE:
                             DoCastVictim(SPELL_MORTAL_STRIKE);
-                            events.ScheduleEvent(EVENT_MORTAL_STRIKE, urand(10*IN_MILLISECONDS, 25*IN_MILLISECONDS));
+                            events.ScheduleEvent(EVENT_MORTAL_STRIKE, 10s, 25s);
                             return;
                         case EVENT_WARR_CHARGE:
                             DoCastVictim(SPELL_CHARGE);
-                            events.ScheduleEvent(EVENT_WARR_CHARGE, urand(10*IN_MILLISECONDS, 20*IN_MILLISECONDS));
+                            events.ScheduleEvent(EVENT_WARR_CHARGE, 10s, 20s);
                             return;
                         case EVENT_DISARM:
                             DoCastVictim(SPELL_DISARM);
-                            events.ScheduleEvent(EVENT_DISARM, urand(15*IN_MILLISECONDS, 35*IN_MILLISECONDS));
+                            events.ScheduleEvent(EVENT_DISARM, 15s, 35s);
                             return;
                         case EVENT_OVERPOWER:
                             DoCastVictim(SPELL_OVERPOWER);
-                            events.ScheduleEvent(EVENT_OVERPOWER, urand(20*IN_MILLISECONDS, 40*IN_MILLISECONDS));
+                            events.ScheduleEvent(EVENT_OVERPOWER, 20s, 40s);
                             return;
                         case EVENT_SUNDER_ARMOR:
                             DoCastVictim(SPELL_SUNDER_ARMOR);
-                            events.ScheduleEvent(EVENT_SUNDER_ARMOR, urand(2*IN_MILLISECONDS, 5*IN_MILLISECONDS));
+                            events.ScheduleEvent(EVENT_SUNDER_ARMOR, 2s, 5s);
                             return;
                         case EVENT_SHATTERING_THROW:
                             if (Unit* target = me->GetVictim())
@@ -1718,13 +1718,13 @@ class npc_toc_dk : public CreatureScript
             void Reset() override
             {
                 boss_faction_championsAI::Reset();
-                events.ScheduleEvent(EVENT_CHAINS_OF_ICE, urand(5*IN_MILLISECONDS, 15*IN_MILLISECONDS));
-                events.ScheduleEvent(EVENT_DEATH_COIL, urand(10*IN_MILLISECONDS, 20*IN_MILLISECONDS));
-                events.ScheduleEvent(EVENT_DEATH_GRIP, urand(15*IN_MILLISECONDS, 25*IN_MILLISECONDS));
-                events.ScheduleEvent(EVENT_FROST_STRIKE, urand(5*IN_MILLISECONDS, 10*IN_MILLISECONDS));
-                events.ScheduleEvent(EVENT_ICEBOUND_FORTITUDE, urand(25*IN_MILLISECONDS, 35*IN_MILLISECONDS));
-                events.ScheduleEvent(EVENT_ICY_TOUCH, urand(10*IN_MILLISECONDS, 20*IN_MILLISECONDS));
-                events.ScheduleEvent(EVENT_STRANGULATE, urand(5*IN_MILLISECONDS, 25*IN_MILLISECONDS));
+                events.ScheduleEvent(EVENT_CHAINS_OF_ICE, 5s, 15s);
+                events.ScheduleEvent(EVENT_DEATH_COIL, 10s, 20s);
+                events.ScheduleEvent(EVENT_DEATH_GRIP, 15s, 25s);
+                events.ScheduleEvent(EVENT_FROST_STRIKE, 5s, 10s);
+                events.ScheduleEvent(EVENT_ICEBOUND_FORTITUDE, 25s, 35s);
+                events.ScheduleEvent(EVENT_ICY_TOUCH, 10s, 20s);
+                events.ScheduleEvent(EVENT_STRANGULATE, 5s, 25s);
                 SetEquipmentSlots(false, 47518, 51021, EQUIP_NO_CHANGE);
             }
 
@@ -1745,11 +1745,11 @@ class npc_toc_dk : public CreatureScript
                     {
                         case EVENT_CHAINS_OF_ICE:
                             DoCastVictim(SPELL_CHAINS_OF_ICE);
-                            events.ScheduleEvent(EVENT_CHAINS_OF_ICE, urand(15*IN_MILLISECONDS, 25*IN_MILLISECONDS));
+                            events.ScheduleEvent(EVENT_CHAINS_OF_ICE, 15s, 25s);
                             return;
                         case EVENT_DEATH_COIL:
                             DoCastVictim(SPELL_DEATH_COIL);
-                            events.ScheduleEvent(EVENT_DEATH_COIL, urand(5*IN_MILLISECONDS, 15*IN_MILLISECONDS));
+                            events.ScheduleEvent(EVENT_DEATH_COIL, 5s, 15s);
                             return;
                         case EVENT_DEATH_GRIP:
                             if (Unit* target = me->GetVictim())
@@ -1765,7 +1765,7 @@ class npc_toc_dk : public CreatureScript
                             return;
                         case EVENT_FROST_STRIKE:
                             DoCastVictim(SPELL_FROST_STRIKE);
-                            events.ScheduleEvent(EVENT_FROST_STRIKE, urand(6*IN_MILLISECONDS, 10*IN_MILLISECONDS));
+                            events.ScheduleEvent(EVENT_FROST_STRIKE, 6s, 10s);
                             return;
                         case EVENT_ICEBOUND_FORTITUDE:
                             if (HealthBelowPct(50))
@@ -1778,7 +1778,7 @@ class npc_toc_dk : public CreatureScript
                             return;
                         case EVENT_ICY_TOUCH:
                             DoCastVictim(SPELL_ICY_TOUCH);
-                            events.ScheduleEvent(EVENT_ICY_TOUCH, urand(10*IN_MILLISECONDS, 15*IN_MILLISECONDS));
+                            events.ScheduleEvent(EVENT_ICY_TOUCH, 10s, 15s);
                             return;
                         case EVENT_STRANGULATE:
                             if (Unit* target = SelectEnemyCaster(false))
@@ -1814,14 +1814,14 @@ class npc_toc_rogue : public CreatureScript
             void Reset() override
             {
                 boss_faction_championsAI::Reset();
-                events.ScheduleEvent(EVENT_FAN_OF_KNIVES, urand(5*IN_MILLISECONDS, 10*IN_MILLISECONDS));
-                events.ScheduleEvent(EVENT_BLIND, urand(10*IN_MILLISECONDS, 20*IN_MILLISECONDS));
-                events.ScheduleEvent(EVENT_CLOAK, urand(20*IN_MILLISECONDS, 30*IN_MILLISECONDS));
-                events.ScheduleEvent(EVENT_BLADE_FLURRY, urand(10*IN_MILLISECONDS, 20*IN_MILLISECONDS));
-                events.ScheduleEvent(EVENT_SHADOWSTEP, urand(20*IN_MILLISECONDS, 30*IN_MILLISECONDS));
-                events.ScheduleEvent(EVENT_HEMORRHAGE, urand(3*IN_MILLISECONDS, 10*IN_MILLISECONDS));
-                events.ScheduleEvent(EVENT_EVISCERATE, urand(20*IN_MILLISECONDS, 40*IN_MILLISECONDS));
-                events.ScheduleEvent(EVENT_WOUND_POISON, urand(5*IN_MILLISECONDS, 10*IN_MILLISECONDS));
+                events.ScheduleEvent(EVENT_FAN_OF_KNIVES, 5s, 10s);
+                events.ScheduleEvent(EVENT_BLIND, 10s, 20s);
+                events.ScheduleEvent(EVENT_CLOAK, 20s, 30s);
+                events.ScheduleEvent(EVENT_BLADE_FLURRY, 10s, 20s);
+                events.ScheduleEvent(EVENT_SHADOWSTEP, 20s, 30s);
+                events.ScheduleEvent(EVENT_HEMORRHAGE, 3s, 10s);
+                events.ScheduleEvent(EVENT_EVISCERATE, 20s, 40s);
+                events.ScheduleEvent(EVENT_WOUND_POISON, 5s, 10s);
                 SetEquipmentSlots(false, 47422, 49982, EQUIP_NO_CHANGE);
                 me->SetPowerType(POWER_ENERGY);
                 me->SetFullPower(POWER_ENERGY);
@@ -1845,12 +1845,12 @@ class npc_toc_rogue : public CreatureScript
                         case EVENT_FAN_OF_KNIVES:
                             if (EnemiesInRange(10.0f) >= 2)
                                 DoCastAOE(SPELL_FAN_OF_KNIVES);
-                            events.ScheduleEvent(EVENT_FAN_OF_KNIVES, urand(10*IN_MILLISECONDS, 20*IN_MILLISECONDS));
+                            events.ScheduleEvent(EVENT_FAN_OF_KNIVES, 10s, 20s);
                             return;
                         case EVENT_BLIND:
                             if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0, NonTankTargetSelector(me)))
                                 DoCast(target, SPELL_BLIND);
-                            events.ScheduleEvent(EVENT_BLIND, urand(10*IN_MILLISECONDS, 30*IN_MILLISECONDS));
+                            events.ScheduleEvent(EVENT_BLIND, 10s, 30s);
                             return;
                         case EVENT_CLOAK:
                             if (HealthBelowPct(50))
@@ -1884,15 +1884,15 @@ class npc_toc_rogue : public CreatureScript
                             return;
                         case EVENT_HEMORRHAGE:
                             DoCastVictim(SPELL_HEMORRHAGE);
-                            events.ScheduleEvent(EVENT_HEMORRHAGE, urand(3*IN_MILLISECONDS, 10*IN_MILLISECONDS));
+                            events.ScheduleEvent(EVENT_HEMORRHAGE, 3s, 10s);
                             return;
                         case EVENT_EVISCERATE:
                             DoCastVictim(SPELL_EVISCERATE);
-                            events.ScheduleEvent(EVENT_EVISCERATE, urand(30*IN_MILLISECONDS, 40*IN_MILLISECONDS));
+                            events.ScheduleEvent(EVENT_EVISCERATE, 30s, 40s);
                             return;
                         case EVENT_WOUND_POISON:
                             DoCastVictim(SPELL_WOUND_POISON);
-                            events.ScheduleEvent(EVENT_WOUND_POISON, urand(10*IN_MILLISECONDS, 20*IN_MILLISECONDS));
+                            events.ScheduleEvent(EVENT_WOUND_POISON, 10s, 20s);
                             return;
                         default:
                             return;
@@ -1929,12 +1929,12 @@ class npc_toc_enh_shaman : public CreatureScript
             void Reset() override
             {
                 boss_faction_championsAI::Reset();
-                events.ScheduleEvent(EVENT_DPS_EARTH_SHOCK, urand(5*IN_MILLISECONDS, 10*IN_MILLISECONDS));
-                events.ScheduleEvent(EVENT_LAVA_LASH, urand(3*IN_MILLISECONDS, 5*IN_MILLISECONDS));
-                events.ScheduleEvent(EVENT_STORMSTRIKE, urand(2*IN_MILLISECONDS, 5*IN_MILLISECONDS));
-                events.ScheduleEvent(EVENT_DPS_BLOODLUST_HEROISM, 20*IN_MILLISECONDS);
-                events.ScheduleEvent(EVENT_DEPLOY_TOTEM, 1*IN_MILLISECONDS);
-                events.ScheduleEvent(EVENT_WINDFURY, urand(20*IN_MILLISECONDS, 50*IN_MILLISECONDS));
+                events.ScheduleEvent(EVENT_DPS_EARTH_SHOCK, 5s, 10s);
+                events.ScheduleEvent(EVENT_LAVA_LASH, 3s, 5s);
+                events.ScheduleEvent(EVENT_STORMSTRIKE, 2s, 5s);
+                events.ScheduleEvent(EVENT_DPS_BLOODLUST_HEROISM, 20s);
+                events.ScheduleEvent(EVENT_DEPLOY_TOTEM, 1s);
+                events.ScheduleEvent(EVENT_WINDFURY, 20s, 50s);
 
                 Initialize();
                 SetEquipmentSlots(false, 51803, 48013, EQUIP_NO_CHANGE);
@@ -1993,15 +1993,15 @@ class npc_toc_enh_shaman : public CreatureScript
                         case EVENT_DPS_EARTH_SHOCK:
                             if (Unit* target = SelectEnemyCaster(true))
                                 DoCast(target, SPELL_EARTH_SHOCK);
-                            events.ScheduleEvent(EVENT_DPS_EARTH_SHOCK, urand(10*IN_MILLISECONDS, 15*IN_MILLISECONDS));
+                            events.ScheduleEvent(EVENT_DPS_EARTH_SHOCK, 10s, 15s);
                             return;
                         case EVENT_LAVA_LASH:
                             DoCastVictim(SPELL_LAVA_LASH);
-                            events.ScheduleEvent(EVENT_LAVA_LASH, urand(5*IN_MILLISECONDS, 15*IN_MILLISECONDS));
+                            events.ScheduleEvent(EVENT_LAVA_LASH, 5s, 15s);
                             return;
                         case EVENT_STORMSTRIKE:
                             DoCastVictim(SPELL_STORMSTRIKE);
-                            events.ScheduleEvent(EVENT_STORMSTRIKE, urand(8*IN_MILLISECONDS, 10*IN_MILLISECONDS));
+                            events.ScheduleEvent(EVENT_STORMSTRIKE, 8s, 10s);
                             return;
                         case EVENT_DPS_BLOODLUST_HEROISM:
                             if (me->GetFaction()) //Am i alliance?
@@ -2019,11 +2019,11 @@ class npc_toc_enh_shaman : public CreatureScript
                         case EVENT_DEPLOY_TOTEM:
                             if (_totemCount < 4 || me->GetDistance2d(_totemOldCenterX, _totemOldCenterY) > 20.0f)
                                 DeployTotem();
-                            events.ScheduleEvent(EVENT_DEPLOY_TOTEM, 1*IN_MILLISECONDS);
+                            events.ScheduleEvent(EVENT_DEPLOY_TOTEM, 1s);
                             return;
                         case EVENT_WINDFURY:
                             DoCastVictim(SPELL_WINDFURY);
-                            events.ScheduleEvent(EVENT_WINDFURY, urand(20*IN_MILLISECONDS, 60*IN_MILLISECONDS));
+                            events.ScheduleEvent(EVENT_WINDFURY, 20s, 60s);
                             return;
                         default:
                             return;
@@ -2053,14 +2053,14 @@ class npc_toc_retro_paladin : public CreatureScript
             void Reset() override
             {
                 boss_faction_championsAI::Reset();
-                events.ScheduleEvent(EVENT_AVENGING_WRATH, urand(25*IN_MILLISECONDS, 35*IN_MILLISECONDS));
-                events.ScheduleEvent(EVENT_CRUSADER_STRIKE, urand(5*IN_MILLISECONDS, 10*IN_MILLISECONDS));
-                events.ScheduleEvent(EVENT_DIVINE_STORM, urand(10*IN_MILLISECONDS, 20*IN_MILLISECONDS));
-                events.ScheduleEvent(EVENT_HAMMER_OF_JUSTICE_RET, urand(10*IN_MILLISECONDS, 30*IN_MILLISECONDS));
-                events.ScheduleEvent(EVENT_JUDGEMENT_OF_COMMAND, urand(5*IN_MILLISECONDS, 15*IN_MILLISECONDS));
-                events.ScheduleEvent(EVENT_REPENTANCE, urand(15*IN_MILLISECONDS, 30*IN_MILLISECONDS));
-                events.ScheduleEvent(EVENT_DPS_HAND_OF_PROTECTION, urand(20*IN_MILLISECONDS, 30*IN_MILLISECONDS));
-                events.ScheduleEvent(EVENT_DPS_DIVINE_SHIELD, urand(20*IN_MILLISECONDS, 30*IN_MILLISECONDS));
+                events.ScheduleEvent(EVENT_AVENGING_WRATH, 25s, 35s);
+                events.ScheduleEvent(EVENT_CRUSADER_STRIKE, 5s, 10s);
+                events.ScheduleEvent(EVENT_DIVINE_STORM, 10s, 20s);
+                events.ScheduleEvent(EVENT_HAMMER_OF_JUSTICE_RET, 10s, 30s);
+                events.ScheduleEvent(EVENT_JUDGEMENT_OF_COMMAND, 5s, 15s);
+                events.ScheduleEvent(EVENT_REPENTANCE, 15s, 30s);
+                events.ScheduleEvent(EVENT_DPS_HAND_OF_PROTECTION, 20s, 30s);
+                events.ScheduleEvent(EVENT_DPS_DIVINE_SHIELD, 20s, 30s);
                 SetEquipmentSlots(false, 47519, EQUIP_NO_CHANGE, EQUIP_NO_CHANGE);
             }
 
@@ -2087,29 +2087,29 @@ class npc_toc_retro_paladin : public CreatureScript
                     {
                         case EVENT_AVENGING_WRATH:
                             DoCast(SPELL_AVENGING_WRATH);
-                            events.ScheduleEvent(EVENT_AVENGING_WRATH, 180*IN_MILLISECONDS);
+                            events.ScheduleEvent(EVENT_AVENGING_WRATH, 2min);
                             return;
                         case EVENT_CRUSADER_STRIKE:
                             DoCastVictim(SPELL_CRUSADER_STRIKE);
-                            events.ScheduleEvent(EVENT_CRUSADER_STRIKE, urand(10*IN_MILLISECONDS, 15*IN_MILLISECONDS));
+                            events.ScheduleEvent(EVENT_CRUSADER_STRIKE, 10s, 15s);
                             return;
                         case EVENT_DIVINE_STORM:
                             if (EnemiesInRange(10.0f) >= 2)
                                 DoCast(SPELL_DIVINE_STORM);
-                            events.ScheduleEvent(EVENT_DIVINE_STORM, urand(10*IN_MILLISECONDS, 20*IN_MILLISECONDS));
+                            events.ScheduleEvent(EVENT_DIVINE_STORM, 10s, 20s);
                             return;
                         case EVENT_HAMMER_OF_JUSTICE_RET:
                             DoCastVictim(SPELL_HAMMER_OF_JUSTICE_RET);
-                            events.ScheduleEvent(EVENT_HAMMER_OF_JUSTICE_RET, 40*IN_MILLISECONDS);
+                            events.ScheduleEvent(EVENT_HAMMER_OF_JUSTICE_RET, 40s);
                             return;
                         case EVENT_JUDGEMENT_OF_COMMAND:
                             DoCastVictim(SPELL_JUDGEMENT_OF_COMMAND);
-                            events.ScheduleEvent(EVENT_JUDGEMENT_OF_COMMAND, urand(10*IN_MILLISECONDS, 15*IN_MILLISECONDS));
+                            events.ScheduleEvent(EVENT_JUDGEMENT_OF_COMMAND, 10s, 15s);
                             return;
                         case EVENT_REPENTANCE:
                             if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0, NonTankTargetSelector(me)))
                                 DoCast(target, SPELL_REPENTANCE);
-                            events.ScheduleEvent(EVENT_REPENTANCE, 60*IN_MILLISECONDS);
+                            events.ScheduleEvent(EVENT_REPENTANCE, 1min);
                             return;
                         case EVENT_DPS_HAND_OF_PROTECTION:
                             if (Unit* target = DoSelectLowestHpFriendly(30.0f))
@@ -2159,8 +2159,8 @@ class npc_toc_pet_warlock : public CreatureScript
             void Reset() override
             {
                 boss_faction_championsAI::Reset();
-                events.ScheduleEvent(EVENT_DEVOUR_MAGIC, urand(15*IN_MILLISECONDS, 30*IN_MILLISECONDS));
-                events.ScheduleEvent(EVENT_SPELL_LOCK, urand(15*IN_MILLISECONDS, 30*IN_MILLISECONDS));
+                events.ScheduleEvent(EVENT_DEVOUR_MAGIC, 15s, 30s);
+                events.ScheduleEvent(EVENT_SPELL_LOCK, 15s, 30s);
             }
 
             void UpdateAI(uint32 diff) override
@@ -2180,11 +2180,11 @@ class npc_toc_pet_warlock : public CreatureScript
                     {
                         case EVENT_DEVOUR_MAGIC:
                             DoCastVictim(SPELL_DEVOUR_MAGIC);
-                            events.ScheduleEvent(EVENT_DEVOUR_MAGIC, urand(8*IN_MILLISECONDS, 10*IN_MILLISECONDS));
+                            events.ScheduleEvent(EVENT_DEVOUR_MAGIC, 8s, 10s);
                             return;
                         case EVENT_SPELL_LOCK:
                             DoCast(SPELL_SPELL_LOCK);
-                            events.ScheduleEvent(EVENT_SPELL_LOCK, urand(24*IN_MILLISECONDS, 30*IN_MILLISECONDS));
+                            events.ScheduleEvent(EVENT_SPELL_LOCK, 24s, 30s);
                             return;
                         default:
                             return;
diff --git a/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/boss_northrend_beasts.cpp b/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/boss_northrend_beasts.cpp
index d0718b0745c..1f0e4ee46e2 100644
--- a/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/boss_northrend_beasts.cpp
+++ b/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/boss_northrend_beasts.cpp
@@ -878,7 +878,7 @@ struct boss_dreadscale : public boss_jormungarAI
     void MovementInform(uint32 type, uint32 pointId) override
     {
         if (type == SPLINE_CHAIN_MOTION_TYPE && pointId == POINT_INITIAL_MOVEMENT)
-            events.ScheduleEvent(EVENT_ENGAGE, Seconds(3));
+            events.ScheduleEvent(EVENT_ENGAGE, 3s);
     }
 };
 
@@ -900,7 +900,7 @@ struct boss_acidmaw : public boss_jormungarAI
         wasMobile = false;
         me->SetControlled(true, UNIT_STATE_ROOT);
         DoCastSelf(SPELL_GROUND_VISUAL_1, true);
-        events.ScheduleEvent(EVENT_ENGAGE, Seconds(3));
+        events.ScheduleEvent(EVENT_ENGAGE, 3s);
     }
 };
 
diff --git a/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/trial_of_the_crusader.cpp b/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/trial_of_the_crusader.cpp
index 0729f1508c2..d838c5d7ca8 100644
--- a/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/trial_of_the_crusader.cpp
+++ b/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/trial_of_the_crusader.cpp
@@ -672,7 +672,7 @@ struct npc_fizzlebang_toc : public ScriptedAI
     {
         me->SetReactState(REACT_PASSIVE);
         _events.Reset();
-        _events.ScheduleEvent(EVENT_START_MOVE, Seconds(1));
+        _events.ScheduleEvent(EVENT_START_MOVE, 1s);
     }
 
     void MovementInform(uint32 type, uint32 pointId) override
diff --git a/src/server/scripts/Northrend/DraktharonKeep/boss_king_dred.cpp b/src/server/scripts/Northrend/DraktharonKeep/boss_king_dred.cpp
index f438e7d5ed2..defbe9fb55c 100644
--- a/src/server/scripts/Northrend/DraktharonKeep/boss_king_dred.cpp
+++ b/src/server/scripts/Northrend/DraktharonKeep/boss_king_dred.cpp
@@ -80,12 +80,12 @@ class boss_king_dred : public CreatureScript
             {
                 _JustEngagedWith();
 
-                events.ScheduleEvent(EVENT_BELLOWING_ROAR, 33000);
-                events.ScheduleEvent(EVENT_GRIEVOUS_BITE, 20000);
+                events.ScheduleEvent(EVENT_BELLOWING_ROAR, 33s);
+                events.ScheduleEvent(EVENT_GRIEVOUS_BITE, 20s);
                 events.ScheduleEvent(EVENT_MANGLING_SLASH, 18500);
-                events.ScheduleEvent(EVENT_FEARSOME_ROAR, urand(10000, 20000));
-                events.ScheduleEvent(EVENT_PIERCING_SLASH, 17000);
-                events.ScheduleEvent(EVENT_RAPTOR_CALL, urand(20000, 25000));
+                events.ScheduleEvent(EVENT_FEARSOME_ROAR, 10s, 20s);
+                events.ScheduleEvent(EVENT_PIERCING_SLASH, 15s);
+                events.ScheduleEvent(EVENT_RAPTOR_CALL, 20s, 25s);
             }
 
             void DoAction(int32 action) override
@@ -123,11 +123,11 @@ class boss_king_dred : public CreatureScript
                     {
                         case EVENT_BELLOWING_ROAR:
                             DoCastAOE(SPELL_BELLOWING_ROAR);
-                            events.ScheduleEvent(EVENT_BELLOWING_ROAR, 33000);
+                            events.ScheduleEvent(EVENT_BELLOWING_ROAR, 33s);
                             break;
                         case EVENT_GRIEVOUS_BITE:
                             DoCastVictim(SPELL_GRIEVOUS_BITE);
-                            events.ScheduleEvent(EVENT_GRIEVOUS_BITE, 20000);
+                            events.ScheduleEvent(EVENT_GRIEVOUS_BITE, 20s);
                             break;
                         case EVENT_MANGLING_SLASH:
                             DoCastVictim(SPELL_MANGLING_SLASH);
@@ -135,11 +135,11 @@ class boss_king_dred : public CreatureScript
                             break;
                         case EVENT_FEARSOME_ROAR:
                             DoCastAOE(SPELL_FEARSOME_ROAR);
-                            events.ScheduleEvent(EVENT_FEARSOME_ROAR, urand(10000, 20000));
+                            events.ScheduleEvent(EVENT_FEARSOME_ROAR, 10s, 20s);
                             break;
                         case EVENT_PIERCING_SLASH:
                             DoCastVictim(SPELL_PIERCING_SLASH);
-                            events.ScheduleEvent(EVENT_PIERCING_SLASH, 17000);
+                            events.ScheduleEvent(EVENT_PIERCING_SLASH, 15s);
                             break;
                         case EVENT_RAPTOR_CALL:
                             DoCastVictim(SPELL_RAPTOR_CALL);
@@ -148,7 +148,7 @@ class boss_king_dred : public CreatureScript
 
                             me->GetClosePoint(x, y, z, me->GetCombatReach() / 3, 10.0f);
                             me->SummonCreature(RAND(NPC_DRAKKARI_GUTRIPPER, NPC_DRAKKARI_SCYTHECLAW), x, y, z, 0, TEMPSUMMON_DEAD_DESPAWN, 1000);
-                            events.ScheduleEvent(EVENT_RAPTOR_CALL, urand(20000, 25000));
+                            events.ScheduleEvent(EVENT_RAPTOR_CALL, 20s, 25s);
                             break;
                         default:
                             break;
diff --git a/src/server/scripts/Northrend/DraktharonKeep/boss_novos.cpp b/src/server/scripts/Northrend/DraktharonKeep/boss_novos.cpp
index fc05a67aa5b..fefd14f7195 100644
--- a/src/server/scripts/Northrend/DraktharonKeep/boss_novos.cpp
+++ b/src/server/scripts/Northrend/DraktharonKeep/boss_novos.cpp
@@ -153,12 +153,12 @@ public:
                 {
                     case EVENT_SUMMON_MINIONS:
                         DoCast(SPELL_SUMMON_MINIONS);
-                        events.ScheduleEvent(EVENT_SUMMON_MINIONS, 15000);
+                        events.ScheduleEvent(EVENT_SUMMON_MINIONS, 15s);
                         break;
                     case EVENT_ATTACK:
                         if (Unit* victim = SelectTarget(SELECT_TARGET_RANDOM))
                             DoCast(victim, RAND(SPELL_ARCANE_BLAST, SPELL_BLIZZARD, SPELL_FROSTBOLT, SPELL_WRATH_OF_MISERY));
-                        events.ScheduleEvent(EVENT_ATTACK, 3000);
+                        events.ScheduleEvent(EVENT_ATTACK, 3s);
                         break;
                     default:
                         break;
@@ -265,9 +265,9 @@ public:
                 Talk(SAY_ARCANE_FIELD);
                 SetSummonerStatus(false);
                 SetBubbled(false);
-                events.ScheduleEvent(EVENT_ATTACK, 3000);
+                events.ScheduleEvent(EVENT_ATTACK, 3s);
                 if (IsHeroic())
-                    events.ScheduleEvent(EVENT_SUMMON_MINIONS, 15000);
+                    events.ScheduleEvent(EVENT_SUMMON_MINIONS, 15s);
             }
             else if (ObjectGuid guid = instance->GetGuidData(DATA_NOVOS_SUMMONER_4))
                 if (Creature* crystalChannelTarget = ObjectAccessor::GetCreature(*me, guid))
diff --git a/src/server/scripts/Northrend/DraktharonKeep/boss_tharon_ja.cpp b/src/server/scripts/Northrend/DraktharonKeep/boss_tharon_ja.cpp
index 9c680fe4a5a..3b114808dc8 100644
--- a/src/server/scripts/Northrend/DraktharonKeep/boss_tharon_ja.cpp
+++ b/src/server/scripts/Northrend/DraktharonKeep/boss_tharon_ja.cpp
@@ -95,10 +95,10 @@ class boss_tharon_ja : public CreatureScript
                 Talk(SAY_AGGRO);
                 _JustEngagedWith();
 
-                events.ScheduleEvent(EVENT_DECAY_FLESH, 20000);
-                events.ScheduleEvent(EVENT_CURSE_OF_LIFE, 1000);
-                events.ScheduleEvent(EVENT_RAIN_OF_FIRE, urand(14000, 18000));
-                events.ScheduleEvent(EVENT_SHADOW_VOLLEY, urand(8000, 10000));
+                events.ScheduleEvent(EVENT_DECAY_FLESH, 20s);
+                events.ScheduleEvent(EVENT_CURSE_OF_LIFE, 1s);
+                events.ScheduleEvent(EVENT_RAIN_OF_FIRE, 14s, 18s);
+                events.ScheduleEvent(EVENT_SHADOW_VOLLEY, 8s, 10s);
             }
 
             void KilledUnit(Unit* who) override
@@ -133,34 +133,34 @@ class boss_tharon_ja : public CreatureScript
                         case EVENT_CURSE_OF_LIFE:
                             if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0, 100.0f, true))
                                 DoCast(target, SPELL_CURSE_OF_LIFE);
-                            events.ScheduleEvent(EVENT_CURSE_OF_LIFE, urand(10000, 15000));
+                            events.ScheduleEvent(EVENT_CURSE_OF_LIFE, 10s, 15s);
                             return;
                         case EVENT_SHADOW_VOLLEY:
                             DoCastVictim(SPELL_SHADOW_VOLLEY);
-                            events.ScheduleEvent(EVENT_SHADOW_VOLLEY, urand(8000, 10000));
+                            events.ScheduleEvent(EVENT_SHADOW_VOLLEY, 8s, 10s);
                             return;
                         case EVENT_RAIN_OF_FIRE:
                             if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0, 100.0f, true))
                                 DoCast(target, SPELL_RAIN_OF_FIRE);
-                            events.ScheduleEvent(EVENT_RAIN_OF_FIRE, urand(14000, 18000));
+                            events.ScheduleEvent(EVENT_RAIN_OF_FIRE, 14s, 18s);
                             return;
                         case EVENT_LIGHTNING_BREATH:
                             if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0, 100.0f, true))
                                 DoCast(target, SPELL_LIGHTNING_BREATH);
-                            events.ScheduleEvent(EVENT_LIGHTNING_BREATH, urand(6000, 7000));
+                            events.ScheduleEvent(EVENT_LIGHTNING_BREATH, 6s, 7s);
                             return;
                         case EVENT_EYE_BEAM:
                             if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0, 100.0f, true))
                                 DoCast(target, SPELL_EYE_BEAM);
-                            events.ScheduleEvent(EVENT_EYE_BEAM, urand(4000, 6000));
+                            events.ScheduleEvent(EVENT_EYE_BEAM, 4s, 6s);
                             return;
                         case EVENT_POISON_CLOUD:
                             DoCastAOE(SPELL_POISON_CLOUD);
-                            events.ScheduleEvent(EVENT_POISON_CLOUD, urand(10000, 12000));
+                            events.ScheduleEvent(EVENT_POISON_CLOUD, 10s, 12s);
                             return;
                         case EVENT_DECAY_FLESH:
                             DoCastAOE(SPELL_DECAY_FLESH);
-                            events.ScheduleEvent(EVENT_GOING_FLESH, 6000);
+                            events.ScheduleEvent(EVENT_GOING_FLESH, 6s);
                             return;
                         case EVENT_GOING_FLESH:
                             Talk(SAY_FLESH);
@@ -170,14 +170,14 @@ class boss_tharon_ja : public CreatureScript
                             DoCast(me, SPELL_DUMMY, true);
 
                             events.Reset();
-                            events.ScheduleEvent(EVENT_RETURN_FLESH, 20000);
-                            events.ScheduleEvent(EVENT_LIGHTNING_BREATH, urand(3000, 4000));
-                            events.ScheduleEvent(EVENT_EYE_BEAM, urand(4000, 8000));
-                            events.ScheduleEvent(EVENT_POISON_CLOUD, urand(6000, 7000));
+                            events.ScheduleEvent(EVENT_RETURN_FLESH, 20s);
+                            events.ScheduleEvent(EVENT_LIGHTNING_BREATH, 3s, 4s);
+                            events.ScheduleEvent(EVENT_EYE_BEAM, 4s, 8s);
+                            events.ScheduleEvent(EVENT_POISON_CLOUD, 6s, 7s);
                             break;
                         case EVENT_RETURN_FLESH:
                             DoCastAOE(SPELL_RETURN_FLESH);
-                            events.ScheduleEvent(EVENT_GOING_SKELETAL, 6000);
+                            events.ScheduleEvent(EVENT_GOING_SKELETAL, 6s);
                             return;
                         case EVENT_GOING_SKELETAL:
                             Talk(SAY_SKELETON);
@@ -185,10 +185,10 @@ class boss_tharon_ja : public CreatureScript
                             DoCastAOE(SPELL_CLEAR_GIFT_OF_THARON_JA, true);
 
                             events.Reset();
-                            events.ScheduleEvent(EVENT_DECAY_FLESH, 20000);
-                            events.ScheduleEvent(EVENT_CURSE_OF_LIFE, 1000);
-                            events.ScheduleEvent(EVENT_RAIN_OF_FIRE, urand(14000, 18000));
-                            events.ScheduleEvent(EVENT_SHADOW_VOLLEY, urand(8000, 10000));
+                            events.ScheduleEvent(EVENT_DECAY_FLESH, 20s);
+                            events.ScheduleEvent(EVENT_CURSE_OF_LIFE, 1s);
+                            events.ScheduleEvent(EVENT_RAIN_OF_FIRE, 14s, 18s);
+                            events.ScheduleEvent(EVENT_SHADOW_VOLLEY, 8s, 10s);
                             break;
                         default:
                             break;
diff --git a/src/server/scripts/Northrend/DraktharonKeep/boss_trollgore.cpp b/src/server/scripts/Northrend/DraktharonKeep/boss_trollgore.cpp
index 2aa752eca1c..88383395f7a 100644
--- a/src/server/scripts/Northrend/DraktharonKeep/boss_trollgore.cpp
+++ b/src/server/scripts/Northrend/DraktharonKeep/boss_trollgore.cpp
@@ -97,11 +97,11 @@ class boss_trollgore : public CreatureScript
                 _JustEngagedWith();
                 Talk(SAY_AGGRO);
 
-                events.ScheduleEvent(EVENT_CONSUME, 15000);
-                events.ScheduleEvent(EVENT_CRUSH, urand(1000, 5000));
-                events.ScheduleEvent(EVENT_INFECTED_WOUND, urand(10000, 60000));
-                events.ScheduleEvent(EVENT_CORPSE_EXPLODE, 3000);
-                events.ScheduleEvent(EVENT_SPAWN, urand(30000, 40000));
+                events.ScheduleEvent(EVENT_CONSUME, 15s);
+                events.ScheduleEvent(EVENT_CRUSH, 1s, 5s);
+                events.ScheduleEvent(EVENT_INFECTED_WOUND, 10s, 60s);
+                events.ScheduleEvent(EVENT_CORPSE_EXPLODE, 3s);
+                events.ScheduleEvent(EVENT_SPAWN, 30s, 40s);
             }
 
             void UpdateAI(uint32 diff) override
@@ -121,27 +121,27 @@ class boss_trollgore : public CreatureScript
                         case EVENT_CONSUME:
                             Talk(SAY_CONSUME);
                             DoCastAOE(SPELL_CONSUME);
-                            events.ScheduleEvent(EVENT_CONSUME, 15000);
+                            events.ScheduleEvent(EVENT_CONSUME, 15s);
                             break;
                         case EVENT_CRUSH:
                             DoCastVictim(SPELL_CRUSH);
-                            events.ScheduleEvent(EVENT_CRUSH, urand(10000, 15000));
+                            events.ScheduleEvent(EVENT_CRUSH, 10s, 15s);
                             break;
                         case EVENT_INFECTED_WOUND:
                             DoCastVictim(SPELL_INFECTED_WOUND);
-                            events.ScheduleEvent(EVENT_INFECTED_WOUND, urand(25000, 35000));
+                            events.ScheduleEvent(EVENT_INFECTED_WOUND, 25s, 35s);
                             break;
                         case EVENT_CORPSE_EXPLODE:
                             Talk(SAY_EXPLODE);
                             DoCastAOE(SPELL_CORPSE_EXPLODE);
-                            events.ScheduleEvent(EVENT_CORPSE_EXPLODE, urand(15000, 19000));
+                            events.ScheduleEvent(EVENT_CORPSE_EXPLODE, 15s, 19s);
                             break;
                         case EVENT_SPAWN:
                             for (uint8 i = 0; i < 3; ++i)
                                 if (Creature* trigger = ObjectAccessor::GetCreature(*me, instance->GetGuidData(DATA_TROLLGORE_INVADER_SUMMONER_1 + i)))
                                     trigger->CastSpell(trigger, RAND(SPELL_SUMMON_INVADER_A, SPELL_SUMMON_INVADER_B, SPELL_SUMMON_INVADER_C), me->GetGUID());
 
-                            events.ScheduleEvent(EVENT_SPAWN, urand(30000, 40000));
+                            events.ScheduleEvent(EVENT_SPAWN, 30s, 40s);
                             break;
                         default:
                             break;
diff --git a/src/server/scripts/Northrend/FrozenHalls/ForgeOfSouls/boss_bronjahm.cpp b/src/server/scripts/Northrend/FrozenHalls/ForgeOfSouls/boss_bronjahm.cpp
index d0c3a42f3ed..d40a41eb260 100644
--- a/src/server/scripts/Northrend/FrozenHalls/ForgeOfSouls/boss_bronjahm.cpp
+++ b/src/server/scripts/Northrend/FrozenHalls/ForgeOfSouls/boss_bronjahm.cpp
@@ -84,8 +84,8 @@ class boss_bronjahm : public CreatureScript
             {
                 _Reset();
                 events.SetPhase(PHASE_1);
-                events.ScheduleEvent(EVENT_SHADOW_BOLT, 2000);
-                events.ScheduleEvent(EVENT_MAGIC_BANE, urand(8000, 20000));
+                events.ScheduleEvent(EVENT_SHADOW_BOLT, 2s);
+                events.ScheduleEvent(EVENT_MAGIC_BANE, 8s, 20s);
                 events.ScheduleEvent(EVENT_CORRUPT_SOUL, urand(25000, 35000), 0, PHASE_1);
             }
 
@@ -169,19 +169,19 @@ class boss_bronjahm : public CreatureScript
                     {
                         case EVENT_MAGIC_BANE:
                             DoCastAOE(SPELL_MAGIC_S_BANE);
-                            events.ScheduleEvent(EVENT_MAGIC_BANE, urand(8000, 20000));
+                            events.ScheduleEvent(EVENT_MAGIC_BANE, 8s, 20s);
                             break;
                         case EVENT_SHADOW_BOLT:
                             if (events.IsInPhase(PHASE_2))
                             {
                                 DoCastVictim(SPELL_SHADOW_BOLT);
-                                events.ScheduleEvent(EVENT_SHADOW_BOLT, urand(1, 2) * IN_MILLISECONDS);
+                                events.ScheduleEvent(EVENT_SHADOW_BOLT, 1s, 2s);
                             }
                             else
                             {
                                 if (!me->IsWithinMeleeRange(me->GetVictim()))
                                     DoCastVictim(SPELL_SHADOW_BOLT);
-                                events.ScheduleEvent(EVENT_SHADOW_BOLT, 2 * IN_MILLISECONDS);
+                                events.ScheduleEvent(EVENT_SHADOW_BOLT, 2s);
                             }
                             break;
                         case EVENT_CORRUPT_SOUL:
diff --git a/src/server/scripts/Northrend/FrozenHalls/ForgeOfSouls/boss_devourer_of_souls.cpp b/src/server/scripts/Northrend/FrozenHalls/ForgeOfSouls/boss_devourer_of_souls.cpp
index d73f8a7f077..bfdadf8a625 100644
--- a/src/server/scripts/Northrend/FrozenHalls/ForgeOfSouls/boss_devourer_of_souls.cpp
+++ b/src/server/scripts/Northrend/FrozenHalls/ForgeOfSouls/boss_devourer_of_souls.cpp
@@ -162,11 +162,11 @@ class boss_devourer_of_souls : public CreatureScript
 
                 if (!me->FindNearestCreature(NPC_CRUCIBLE_OF_SOULS, 60)) // Prevent double spawn
                     instance->instance->SummonCreature(NPC_CRUCIBLE_OF_SOULS, CrucibleSummonPos);
-                events.ScheduleEvent(EVENT_PHANTOM_BLAST, 5000);
-                events.ScheduleEvent(EVENT_MIRRORED_SOUL, 8000);
-                events.ScheduleEvent(EVENT_WELL_OF_SOULS, 30000);
-                events.ScheduleEvent(EVENT_UNLEASHED_SOULS, 20000);
-                events.ScheduleEvent(EVENT_WAILING_SOULS, urand(60000, 70000));
+                events.ScheduleEvent(EVENT_PHANTOM_BLAST, 5s);
+                events.ScheduleEvent(EVENT_MIRRORED_SOUL, 8s);
+                events.ScheduleEvent(EVENT_WELL_OF_SOULS, 30s);
+                events.ScheduleEvent(EVENT_UNLEASHED_SOULS, 20s);
+                events.ScheduleEvent(EVENT_WAILING_SOULS, 60s, 70s);
             }
 
             void KilledUnit(Unit* victim) override
@@ -252,17 +252,17 @@ class boss_devourer_of_souls : public CreatureScript
                     {
                         case EVENT_PHANTOM_BLAST:
                             DoCastVictim(SPELL_PHANTOM_BLAST);
-                            events.ScheduleEvent(EVENT_PHANTOM_BLAST, 5000);
+                            events.ScheduleEvent(EVENT_PHANTOM_BLAST, 5s);
                             break;
                         case EVENT_MIRRORED_SOUL:
                             DoCastAOE(SPELL_MIRRORED_SOUL_TARGET_SELECTOR);
                             Talk(EMOTE_MIRRORED_SOUL);
-                            events.ScheduleEvent(EVENT_MIRRORED_SOUL, urand(15000, 30000));
+                            events.ScheduleEvent(EVENT_MIRRORED_SOUL, 15s, 30s);
                             break;
                         case EVENT_WELL_OF_SOULS:
                             if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0))
                                 DoCast(target, SPELL_WELL_OF_SOULS);
-                            events.ScheduleEvent(EVENT_WELL_OF_SOULS, 20000);
+                            events.ScheduleEvent(EVENT_WELL_OF_SOULS, 20s);
                             break;
                         case EVENT_UNLEASHED_SOULS:
                             if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0))
@@ -270,8 +270,8 @@ class boss_devourer_of_souls : public CreatureScript
                             me->SetDisplayId(DISPLAY_SORROW);
                             Talk(SAY_FACE_UNLEASH_SOUL);
                             Talk(EMOTE_UNLEASH_SOUL);
-                            events.ScheduleEvent(EVENT_UNLEASHED_SOULS, 30000);
-                            events.ScheduleEvent(EVENT_FACE_ANGER, 5000);
+                            events.ScheduleEvent(EVENT_UNLEASHED_SOULS, 30s);
+                            events.ScheduleEvent(EVENT_FACE_ANGER, 5s);
                             break;
                         case EVENT_FACE_ANGER:
                             me->SetDisplayId(DISPLAY_ANGER);
@@ -305,7 +305,7 @@ class boss_devourer_of_souls : public CreatureScript
 
                             wailingSoulTick = 15;
                             events.DelayEvents(18000); // no other events during wailing souls
-                            events.ScheduleEvent(EVENT_WAILING_SOULS_TICK, 3000); // first one after 3 secs.
+                            events.ScheduleEvent(EVENT_WAILING_SOULS_TICK, 3s); // first one after 3 secs.
                             break;
 
                         case EVENT_WAILING_SOULS_TICK:
@@ -316,14 +316,14 @@ class boss_devourer_of_souls : public CreatureScript
                             DoCast(me, SPELL_WAILING_SOULS);
 
                             if (--wailingSoulTick)
-                                events.ScheduleEvent(EVENT_WAILING_SOULS_TICK, 1000);
+                                events.ScheduleEvent(EVENT_WAILING_SOULS_TICK, 1s);
                             else
                             {
                                 me->SetReactState(REACT_AGGRESSIVE);
                                 me->SetDisplayId(DISPLAY_ANGER);
                                 me->SetControlled(false, UNIT_STATE_ROOT);
                                 me->GetMotionMaster()->MoveChase(me->GetVictim());
-                                events.ScheduleEvent(EVENT_WAILING_SOULS, urand(60000, 70000));
+                                events.ScheduleEvent(EVENT_WAILING_SOULS, 60s, 70s);
                             }
                             break;
                     }
diff --git a/src/server/scripts/Northrend/FrozenHalls/HallsOfReflection/boss_falric.cpp b/src/server/scripts/Northrend/FrozenHalls/HallsOfReflection/boss_falric.cpp
index bdea7ae88d6..4130e22a93d 100644
--- a/src/server/scripts/Northrend/FrozenHalls/HallsOfReflection/boss_falric.cpp
+++ b/src/server/scripts/Northrend/FrozenHalls/HallsOfReflection/boss_falric.cpp
@@ -79,9 +79,9 @@ class boss_falric : public CreatureScript
                 DoZoneInCombat();
                 instance->SetBossState(DATA_FALRIC, IN_PROGRESS);
 
-                events.ScheduleEvent(EVENT_QUIVERING_STRIKE, 23000);
-                events.ScheduleEvent(EVENT_IMPENDING_DESPAIR, 9000);
-                events.ScheduleEvent(EVENT_DEFILING_HORROR, urand(21000, 39000));
+                events.ScheduleEvent(EVENT_QUIVERING_STRIKE, 23s);
+                events.ScheduleEvent(EVENT_IMPENDING_DESPAIR, 9s);
+                events.ScheduleEvent(EVENT_DEFILING_HORROR, 21s, 39s);
             }
 
             void DamageTaken(Unit* /*attacker*/, uint32& damage) override
@@ -124,7 +124,7 @@ class boss_falric : public CreatureScript
                 {
                     case EVENT_QUIVERING_STRIKE:
                         DoCastVictim(SPELL_QUIVERING_STRIKE);
-                        events.ScheduleEvent(EVENT_QUIVERING_STRIKE, 10000);
+                        events.ScheduleEvent(EVENT_QUIVERING_STRIKE, 10s);
                         break;
                     case EVENT_IMPENDING_DESPAIR:
                         if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0, 45.0f, true))
@@ -132,11 +132,11 @@ class boss_falric : public CreatureScript
                             Talk(SAY_IMPENDING_DESPAIR);
                             DoCast(target, SPELL_IMPENDING_DESPAIR);
                         }
-                        events.ScheduleEvent(EVENT_IMPENDING_DESPAIR, 13000);
+                        events.ScheduleEvent(EVENT_IMPENDING_DESPAIR, 13s);
                         break;
                     case EVENT_DEFILING_HORROR:
                         DoCastAOE(SPELL_DEFILING_HORROR);
-                        events.ScheduleEvent(EVENT_DEFILING_HORROR, urand(21000, 39000));
+                        events.ScheduleEvent(EVENT_DEFILING_HORROR, 21s, 39s);
                         break;
                     default:
                         break;
diff --git a/src/server/scripts/Northrend/FrozenHalls/HallsOfReflection/boss_marwyn.cpp b/src/server/scripts/Northrend/FrozenHalls/HallsOfReflection/boss_marwyn.cpp
index cb0830a62f0..f8d354f8ebf 100644
--- a/src/server/scripts/Northrend/FrozenHalls/HallsOfReflection/boss_marwyn.cpp
+++ b/src/server/scripts/Northrend/FrozenHalls/HallsOfReflection/boss_marwyn.cpp
@@ -68,10 +68,10 @@ class boss_marwyn : public CreatureScript
                 DoZoneInCombat();
                 instance->SetBossState(DATA_MARWYN, IN_PROGRESS);
 
-                events.ScheduleEvent(EVENT_OBLITERATE, urand(8000, 13000));
-                events.ScheduleEvent(EVENT_WELL_OF_CORRUPTION, 13000);
-                events.ScheduleEvent(EVENT_CORRUPTED_FLESH, 20000);
-                events.ScheduleEvent(EVENT_SHARED_SUFFERING, urand(14000, 15000));
+                events.ScheduleEvent(EVENT_OBLITERATE, 8s, 13s);
+                events.ScheduleEvent(EVENT_WELL_OF_CORRUPTION, 12s);
+                events.ScheduleEvent(EVENT_CORRUPTED_FLESH, 20s);
+                events.ScheduleEvent(EVENT_SHARED_SUFFERING, 14s, 15s);
             }
 
             void JustDied(Unit* /*killer*/) override
@@ -101,22 +101,22 @@ class boss_marwyn : public CreatureScript
                 {
                     case EVENT_OBLITERATE:
                         DoCastVictim(SPELL_OBLITERATE);
-                        events.ScheduleEvent(EVENT_OBLITERATE, urand(8000, 13000));
+                        events.ScheduleEvent(EVENT_OBLITERATE, 8s, 13s);
                         break;
                     case EVENT_WELL_OF_CORRUPTION:
                         if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0, 100.0f, true))
                             DoCast(target, SPELL_WELL_OF_CORRUPTION);
-                        events.ScheduleEvent(EVENT_WELL_OF_CORRUPTION, 13000);
+                        events.ScheduleEvent(EVENT_WELL_OF_CORRUPTION, 13s);
                         break;
                     case EVENT_CORRUPTED_FLESH:
                         Talk(SAY_CORRUPTED_FLESH);
                         DoCastAOE(SPELL_CORRUPTED_FLESH);
-                        events.ScheduleEvent(EVENT_CORRUPTED_FLESH, 20000);
+                        events.ScheduleEvent(EVENT_CORRUPTED_FLESH, 20s);
                         break;
                     case EVENT_SHARED_SUFFERING:
                         if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0, 0.0f, true))
                             DoCast(target, SPELL_SHARED_SUFFERING);
-                        events.ScheduleEvent(EVENT_SHARED_SUFFERING, urand(14000, 15000));
+                        events.ScheduleEvent(EVENT_SHARED_SUFFERING, 14s, 15s);
                         break;
                     default:
                         break;
diff --git a/src/server/scripts/Northrend/FrozenHalls/HallsOfReflection/halls_of_reflection.cpp b/src/server/scripts/Northrend/FrozenHalls/HallsOfReflection/halls_of_reflection.cpp
index 929124519f2..61fe9de4a24 100644
--- a/src/server/scripts/Northrend/FrozenHalls/HallsOfReflection/halls_of_reflection.cpp
+++ b/src/server/scripts/Northrend/FrozenHalls/HallsOfReflection/halls_of_reflection.cpp
@@ -381,12 +381,12 @@ class npc_jaina_or_sylvanas_intro_hor : public CreatureScript
                 {
                     case 0:
                         player->PlayerTalkClass->SendCloseGossip();
-                        _events.ScheduleEvent(EVENT_START_INTRO, 1000);
+                        _events.ScheduleEvent(EVENT_START_INTRO, 1s);
                         me->RemoveFlag(UNIT_NPC_FLAGS, UNIT_NPC_FLAG_GOSSIP | UNIT_NPC_FLAG_QUESTGIVER);
                         break;
                     case 1:
                         player->PlayerTalkClass->SendCloseGossip();
-                        _events.ScheduleEvent(EVENT_SKIP_INTRO, 1000);
+                        _events.ScheduleEvent(EVENT_SKIP_INTRO, 1s);
                         me->RemoveFlag(UNIT_NPC_FLAGS, UNIT_NPC_FLAG_GOSSIP | UNIT_NPC_FLAG_QUESTGIVER);
                         break;
                     default:
@@ -627,7 +627,7 @@ class npc_jaina_or_sylvanas_intro_hor : public CreatureScript
                             lichking->GetMotionMaster()->MovePoint(0, LichKingIntroPosition[2]);
                             _lichkingGUID = lichking->GetGUID();
                             _events.ScheduleEvent(EVENT_OPEN_IMPENETRABLE_DOOR, 0);
-                            _events.ScheduleEvent(EVENT_CLOSE_IMPENETRABLE_DOOR, 4000);
+                            _events.ScheduleEvent(EVENT_CLOSE_IMPENETRABLE_DOOR, 4s);
                         }
                         if (Creature* uther = ObjectAccessor::GetCreature(*me, _utherGUID))
                         {
@@ -689,7 +689,7 @@ class npc_jaina_or_sylvanas_intro_hor : public CreatureScript
                             lichking->GetMotionMaster()->MovePoint(0, LichKingMoveAwayPos);
                         }
                         _events.ScheduleEvent(EVENT_INTRO_LK_7, 10000);
-                        _events.ScheduleEvent(EVENT_OPEN_IMPENETRABLE_DOOR, 5000);
+                        _events.ScheduleEvent(EVENT_OPEN_IMPENETRABLE_DOOR, 5s);
                         break;
                     case EVENT_INTRO_LK_7:
                         if (Creature* marwyn = ObjectAccessor::GetCreature(*me, _instance->GetGuidData(DATA_MARWYN)))
@@ -734,18 +734,18 @@ class npc_jaina_or_sylvanas_intro_hor : public CreatureScript
                             else
                                 lichking->AI()->Talk(SAY_LK_SYLVANAS_INTRO_END);
                         }
-                        _events.ScheduleEvent(EVENT_INTRO_END, 5000);
+                        _events.ScheduleEvent(EVENT_INTRO_END, 5s);
                         break;
                     case EVENT_INTRO_END:
                         _instance->SetData(DATA_INTRO_EVENT, DONE);
-                        _events.ScheduleEvent(EVENT_KORELN_LORALEN_DEATH, 8000);
+                        _events.ScheduleEvent(EVENT_KORELN_LORALEN_DEATH, 8s);
                         if (Creature* lichking = ObjectAccessor::GetCreature(*me, _lichkingGUID))
                         {
                             lichking->DespawnOrUnsummon(5000);
                             _lichkingGUID.Clear();
                         }
                         me->DespawnOrUnsummon(10000);
-                        _events.ScheduleEvent(EVENT_CLOSE_IMPENETRABLE_DOOR, 7000);
+                        _events.ScheduleEvent(EVENT_CLOSE_IMPENETRABLE_DOOR, 7s);
                         break;
                     case EVENT_SKIP_INTRO:
                         if (_instance->GetData(DATA_TEAM_IN_INSTANCE) == ALLIANCE)
@@ -763,7 +763,7 @@ class npc_jaina_or_sylvanas_intro_hor : public CreatureScript
                             lichking->SetReactState(REACT_PASSIVE);
                             _lichkingGUID = lichking->GetGUID();
                             _events.ScheduleEvent(EVENT_OPEN_IMPENETRABLE_DOOR, 0);
-                            _events.ScheduleEvent(EVENT_CLOSE_IMPENETRABLE_DOOR, 4000);
+                            _events.ScheduleEvent(EVENT_CLOSE_IMPENETRABLE_DOOR, 4s);
                         }
                         _events.ScheduleEvent(EVENT_INTRO_LK_4, 15000);
                         break;
@@ -836,7 +836,7 @@ class npc_jaina_or_sylvanas_escape_hor : public CreatureScript
             {
                 _events.Reset();
                 _icewall = 0;
-                _events.ScheduleEvent(EVENT_ESCAPE, 1000);
+                _events.ScheduleEvent(EVENT_ESCAPE, 1s);
                 _instance->DoStopTimedAchievement(ACHIEVEMENT_TIMED_TYPE_EVENT, ACHIEV_NOT_RETREATING_EVENT);
             }
 
@@ -1266,35 +1266,35 @@ class npc_the_lich_king_escape_hor : public CreatureScript
                     case 0: // 6 Ghouls, 1 Witch Doctor
                         DoZoneInCombat();
                         _events.ScheduleEvent(EVENT_REMORSELESS_WINTER, 0);
-                        _events.ScheduleEvent(EVENT_ESCAPE_SUMMON_GHOULS, 8000);
-                        _events.ScheduleEvent(EVENT_ESCAPE_SUMMON_WITCH_DOCTOR, 14000);
+                        _events.ScheduleEvent(EVENT_ESCAPE_SUMMON_GHOULS, 8s);
+                        _events.ScheduleEvent(EVENT_ESCAPE_SUMMON_WITCH_DOCTOR, 14s);
                         Talk(SAY_LK_ESCAPE_ICEWALL_SUMMONED_1);
                         break;
                     case 1: // 6 Ghouls, 2 Witch Doctor, 1 Lumbering Abomination
-                        _events.ScheduleEvent(EVENT_ESCAPE_SUMMON_GHOULS, 8000);
-                        _events.ScheduleEvent(EVENT_ESCAPE_SUMMON_LUMBERING_ABOMINATION, 13000);
-                        _events.ScheduleEvent(EVENT_ESCAPE_SUMMON_WITCH_DOCTOR, 16000);
-                        _events.ScheduleEvent(EVENT_ESCAPE_SUMMON_WITCH_DOCTOR, 18000);
+                        _events.ScheduleEvent(EVENT_ESCAPE_SUMMON_GHOULS, 8s);
+                        _events.ScheduleEvent(EVENT_ESCAPE_SUMMON_LUMBERING_ABOMINATION, 13s);
+                        _events.ScheduleEvent(EVENT_ESCAPE_SUMMON_WITCH_DOCTOR, 15s);
+                        _events.ScheduleEvent(EVENT_ESCAPE_SUMMON_WITCH_DOCTOR, 18s);
                         Talk(SAY_LK_ESCAPE_ICEWALL_SUMMONED_2);
                         break;
                     case 2: // 6 Ghouls, 2 Witch Doctor, 2 Lumbering Abomination
-                        _events.ScheduleEvent(EVENT_ESCAPE_SUMMON_GHOULS, 9000);
-                        _events.ScheduleEvent(EVENT_ESCAPE_SUMMON_LUMBERING_ABOMINATION, 14000);
-                        _events.ScheduleEvent(EVENT_ESCAPE_SUMMON_WITCH_DOCTOR, 17000);
-                        _events.ScheduleEvent(EVENT_ESCAPE_SUMMON_LUMBERING_ABOMINATION, 19000);
-                        _events.ScheduleEvent(EVENT_ESCAPE_SUMMON_WITCH_DOCTOR, 39000);
+                        _events.ScheduleEvent(EVENT_ESCAPE_SUMMON_GHOULS, 9s);
+                        _events.ScheduleEvent(EVENT_ESCAPE_SUMMON_LUMBERING_ABOMINATION, 14s);
+                        _events.ScheduleEvent(EVENT_ESCAPE_SUMMON_WITCH_DOCTOR, 15s);
+                        _events.ScheduleEvent(EVENT_ESCAPE_SUMMON_LUMBERING_ABOMINATION, 19s);
+                        _events.ScheduleEvent(EVENT_ESCAPE_SUMMON_WITCH_DOCTOR, 39s);
                         Talk(SAY_LK_ESCAPE_ICEWALL_SUMMONED_3);
                         break;
                     case 3: // 12 Ghouls, 4 Witch Doctor, 3 Lumbering Abomination
-                        _events.ScheduleEvent(EVENT_ESCAPE_SUMMON_GHOULS, 9000);
-                        _events.ScheduleEvent(EVENT_ESCAPE_SUMMON_WITCH_DOCTOR, 17000);
-                        _events.ScheduleEvent(EVENT_ESCAPE_SUMMON_WITCH_DOCTOR, 19000);
-                        _events.ScheduleEvent(EVENT_ESCAPE_SUMMON_LUMBERING_ABOMINATION, 40000);
-                        _events.ScheduleEvent(EVENT_ESCAPE_SUMMON_LUMBERING_ABOMINATION, 46000);
-                        _events.ScheduleEvent(EVENT_ESCAPE_SUMMON_GHOULS, 55000);
-                        _events.ScheduleEvent(EVENT_ESCAPE_SUMMON_WITCH_DOCTOR, 62000);
-                        _events.ScheduleEvent(EVENT_ESCAPE_SUMMON_WITCH_DOCTOR, 66000);
-                        _events.ScheduleEvent(EVENT_ESCAPE_SUMMON_LUMBERING_ABOMINATION, 14000);
+                        _events.ScheduleEvent(EVENT_ESCAPE_SUMMON_GHOULS, 9s);
+                        _events.ScheduleEvent(EVENT_ESCAPE_SUMMON_WITCH_DOCTOR, 15s);
+                        _events.ScheduleEvent(EVENT_ESCAPE_SUMMON_WITCH_DOCTOR, 19s);
+                        _events.ScheduleEvent(EVENT_ESCAPE_SUMMON_LUMBERING_ABOMINATION, 40s);
+                        _events.ScheduleEvent(EVENT_ESCAPE_SUMMON_LUMBERING_ABOMINATION, 45s);
+                        _events.ScheduleEvent(EVENT_ESCAPE_SUMMON_GHOULS, 55s);
+                        _events.ScheduleEvent(EVENT_ESCAPE_SUMMON_WITCH_DOCTOR, 62s);
+                        _events.ScheduleEvent(EVENT_ESCAPE_SUMMON_WITCH_DOCTOR, 65s);
+                        _events.ScheduleEvent(EVENT_ESCAPE_SUMMON_LUMBERING_ABOMINATION, 14s);
                         Talk(SAY_LK_ESCAPE_ICEWALL_SUMMONED_4);
                         break;
                     default:
@@ -1511,10 +1511,10 @@ class npc_ghostly_priest : public CreatureScript
 
             void JustEngagedWith(Unit* /*who*/) override
             {
-                _events.ScheduleEvent(EVENT_SHADOW_WORD_PAIN, urand(6000, 15000));
-                _events.ScheduleEvent(EVENT_CIRCLE_OF_DESTRUCTION, 12000);
-                _events.ScheduleEvent(EVENT_COWER_IN_FEAR, 10000);
-                _events.ScheduleEvent(EVENT_DARK_MENDING, 20000);
+                _events.ScheduleEvent(EVENT_SHADOW_WORD_PAIN, 6s, 15s);
+                _events.ScheduleEvent(EVENT_CIRCLE_OF_DESTRUCTION, 12s);
+                _events.ScheduleEvent(EVENT_COWER_IN_FEAR, 10s);
+                _events.ScheduleEvent(EVENT_DARK_MENDING, 20s);
             }
 
             void UpdateAI(uint32 diff) override
@@ -1532,29 +1532,29 @@ class npc_ghostly_priest : public CreatureScript
                     case EVENT_SHADOW_WORD_PAIN:
                         if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0, 40.0f, true))
                             DoCast(target, SPELL_SHADOW_WORD_PAIN);
-                        _events.ScheduleEvent(EVENT_SHADOW_WORD_PAIN, urand(6000, 15000));
+                        _events.ScheduleEvent(EVENT_SHADOW_WORD_PAIN, 6s, 15s);
                         break;
                     case EVENT_CIRCLE_OF_DESTRUCTION:
                         if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0, 10.0f, true))
                             DoCast(target, SPELL_CIRCLE_OF_DESTRUCTION);
-                        _events.ScheduleEvent(EVENT_CIRCLE_OF_DESTRUCTION, 12000);
+                        _events.ScheduleEvent(EVENT_CIRCLE_OF_DESTRUCTION, 12s);
                         break;
                     case EVENT_COWER_IN_FEAR:
                         if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0, 20.0f, true))
                             DoCast(target, SPELL_COWER_IN_FEAR);
-                        _events.ScheduleEvent(EVENT_COWER_IN_FEAR, 10000);
+                        _events.ScheduleEvent(EVENT_COWER_IN_FEAR, 10s);
                         break;
                     case EVENT_DARK_MENDING:
                         // find an ally with missing HP
                         if (Unit* target = DoSelectLowestHpFriendly(40, DUNGEON_MODE(30000, 50000)))
                         {
                             DoCast(target, SPELL_DARK_MENDING);
-                            _events.ScheduleEvent(EVENT_DARK_MENDING, 20000);
+                            _events.ScheduleEvent(EVENT_DARK_MENDING, 20s);
                         }
                         else
                         {
                             // no friendly unit with missing hp. re-check in just 5 sec.
-                            _events.ScheduleEvent(EVENT_DARK_MENDING, 5000);
+                            _events.ScheduleEvent(EVENT_DARK_MENDING, 5s);
                         }
                         break;
                     default:
@@ -1588,11 +1588,11 @@ class npc_phantom_mage : public CreatureScript
 
             void JustEngagedWith(Unit* /*who*/) override
             {
-                _events.ScheduleEvent(EVENT_FIREBALL, 3000);
-                _events.ScheduleEvent(EVENT_FLAMESTRIKE, 6000);
-                _events.ScheduleEvent(EVENT_FROSTBOLT, 9000);
-                _events.ScheduleEvent(EVENT_CHAINS_OF_ICE, 12000);
-                _events.ScheduleEvent(EVENT_HALLUCINATION, 40000);
+                _events.ScheduleEvent(EVENT_FIREBALL, 3s);
+                _events.ScheduleEvent(EVENT_FLAMESTRIKE, 6s);
+                _events.ScheduleEvent(EVENT_FROSTBOLT, 9s);
+                _events.ScheduleEvent(EVENT_CHAINS_OF_ICE, 12s);
+                _events.ScheduleEvent(EVENT_HALLUCINATION, 40s);
             }
 
             void UpdateAI(uint32 diff) override
@@ -1610,22 +1610,22 @@ class npc_phantom_mage : public CreatureScript
                     case EVENT_FIREBALL:
                         if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0, 40.0f, true))
                             DoCast(target, SPELL_FIREBALL);
-                        _events.ScheduleEvent(EVENT_FIREBALL, 15000);
+                        _events.ScheduleEvent(EVENT_FIREBALL, 15s);
                         break;
                     case EVENT_FLAMESTRIKE:
                         if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0, 40.0f, true))
                             DoCast(target, SPELL_FLAMESTRIKE);
-                        _events.ScheduleEvent(EVENT_FLAMESTRIKE, 15000);
+                        _events.ScheduleEvent(EVENT_FLAMESTRIKE, 15s);
                         break;
                     case EVENT_FROSTBOLT:
                         if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0, 40.0f, true))
                             DoCast(target, SPELL_FROSTBOLT);
-                        _events.ScheduleEvent(EVENT_FROSTBOLT, 15000);
+                        _events.ScheduleEvent(EVENT_FROSTBOLT, 15s);
                         break;
                     case EVENT_CHAINS_OF_ICE:
                         if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM))
                             DoCast(target, SPELL_CHAINS_OF_ICE);
-                        _events.ScheduleEvent(EVENT_CHAINS_OF_ICE, 15000);
+                        _events.ScheduleEvent(EVENT_CHAINS_OF_ICE, 15s);
                         break;
                     case EVENT_HALLUCINATION:
                         // removing any dots on mage or else the invisibility spell will break duration
@@ -1689,10 +1689,10 @@ class npc_shadowy_mercenary : public CreatureScript
 
             void JustEngagedWith(Unit* /*who*/) override
             {
-                _events.ScheduleEvent(EVENT_SHADOW_STEP, 23000);
-                _events.ScheduleEvent(EVENT_DEADLY_POISON, 5000);
-                _events.ScheduleEvent(EVENT_ENVENOMED_DAGGER_THROW, 10000);
-                _events.ScheduleEvent(EVENT_KIDNEY_SHOT, 12000);
+                _events.ScheduleEvent(EVENT_SHADOW_STEP, 23s);
+                _events.ScheduleEvent(EVENT_DEADLY_POISON, 5s);
+                _events.ScheduleEvent(EVENT_ENVENOMED_DAGGER_THROW, 10s);
+                _events.ScheduleEvent(EVENT_KIDNEY_SHOT, 12s);
             }
 
             void UpdateAI(uint32 diff) override
@@ -1710,20 +1710,20 @@ class npc_shadowy_mercenary : public CreatureScript
                     case EVENT_SHADOW_STEP:
                         if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0, 100.0f, true))
                             DoCast(target, SPELL_SHADOW_STEP);
-                        _events.ScheduleEvent(EVENT_SHADOW_STEP, 8000);
+                        _events.ScheduleEvent(EVENT_SHADOW_STEP, 8s);
                         break;
                     case EVENT_DEADLY_POISON:
                         DoCastVictim(SPELL_DEADLY_POISON);
-                        _events.ScheduleEvent(EVENT_DEADLY_POISON, 10000);
+                        _events.ScheduleEvent(EVENT_DEADLY_POISON, 10s);
                         break;
                     case EVENT_ENVENOMED_DAGGER_THROW:
                         if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0, 40.0f, true))
                             DoCast(target, SPELL_ENVENOMED_DAGGER_THROW);
-                        _events.ScheduleEvent(EVENT_ENVENOMED_DAGGER_THROW, 10000);
+                        _events.ScheduleEvent(EVENT_ENVENOMED_DAGGER_THROW, 10s);
                         break;
                     case EVENT_KIDNEY_SHOT:
                         DoCastVictim(SPELL_KIDNEY_SHOT);
-                        _events.ScheduleEvent(EVENT_KIDNEY_SHOT, 10000);
+                        _events.ScheduleEvent(EVENT_KIDNEY_SHOT, 10s);
                         break;
                     default:
                         break;
@@ -1750,9 +1750,9 @@ class npc_spectral_footman : public CreatureScript
 
             void JustEngagedWith(Unit* /*who*/) override
             {
-                _events.ScheduleEvent(EVENT_SPECTRAL_STRIKE, 14000);
-                _events.ScheduleEvent(EVENT_SHIELD_BASH, 10000);
-                _events.ScheduleEvent(EVENT_TORTURED_ENRAGE, 15000);
+                _events.ScheduleEvent(EVENT_SPECTRAL_STRIKE, 14s);
+                _events.ScheduleEvent(EVENT_SHIELD_BASH, 10s);
+                _events.ScheduleEvent(EVENT_TORTURED_ENRAGE, 15s);
             }
 
             void UpdateAI(uint32 diff) override
@@ -1769,15 +1769,15 @@ class npc_spectral_footman : public CreatureScript
                 {
                     case EVENT_SPECTRAL_STRIKE:
                         DoCastVictim(SPELL_SPECTRAL_STRIKE);
-                        _events.ScheduleEvent(EVENT_SPECTRAL_STRIKE, 5000);
+                        _events.ScheduleEvent(EVENT_SPECTRAL_STRIKE, 5s);
                         break;
                     case EVENT_SHIELD_BASH:
                         DoCastVictim(SPELL_SHIELD_BASH);
-                        _events.ScheduleEvent(EVENT_SHIELD_BASH, 5000);
+                        _events.ScheduleEvent(EVENT_SHIELD_BASH, 5s);
                         break;
                     case EVENT_TORTURED_ENRAGE:
                         DoCast(me, SPELL_TORTURED_ENRAGE);
-                        _events.ScheduleEvent(EVENT_TORTURED_ENRAGE, 15000);
+                        _events.ScheduleEvent(EVENT_TORTURED_ENRAGE, 15s);
                         break;
                     default:
                         break;
@@ -1805,9 +1805,9 @@ class npc_tortured_rifleman : public CreatureScript
             void JustEngagedWith(Unit* /*who*/) override
             {
                 _events.ScheduleEvent(EVENT_SHOOT, 1);
-                _events.ScheduleEvent(EVENT_CURSED_ARROW, 7000);
-                _events.ScheduleEvent(EVENT_FROST_TRAP, 10000);
-                _events.ScheduleEvent(EVENT_ICE_SHOT, 15000);
+                _events.ScheduleEvent(EVENT_CURSED_ARROW, 7s);
+                _events.ScheduleEvent(EVENT_FROST_TRAP, 10s);
+                _events.ScheduleEvent(EVENT_ICE_SHOT, 15s);
             }
 
             void UpdateAI(uint32 diff) override
@@ -1825,21 +1825,21 @@ class npc_tortured_rifleman : public CreatureScript
                     case EVENT_SHOOT:
                         if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0, 40.0f, true))
                             DoCast(target, SPELL_SHOOT);
-                        _events.ScheduleEvent(EVENT_SHOOT, 2000);
+                        _events.ScheduleEvent(EVENT_SHOOT, 2s);
                         break;
                     case EVENT_CURSED_ARROW:
                         if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0, 40.0f, true))
                             DoCast(target, SPELL_CURSED_ARROW);
-                        _events.ScheduleEvent(EVENT_CURSED_ARROW, 10000);
+                        _events.ScheduleEvent(EVENT_CURSED_ARROW, 10s);
                         break;
                     case EVENT_FROST_TRAP:
                         DoCast(me, SPELL_FROST_TRAP);
-                        _events.ScheduleEvent(EVENT_FROST_TRAP, 30000);
+                        _events.ScheduleEvent(EVENT_FROST_TRAP, 30s);
                         break;
                     case EVENT_ICE_SHOT:
                         if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0, 40.0f, true))
                             DoCast(target, SPELL_ICE_SHOT);
-                        _events.ScheduleEvent(EVENT_ICE_SHOT, 15000);
+                        _events.ScheduleEvent(EVENT_ICE_SHOT, 15s);
                         break;
                     default:
                         break;
@@ -1906,9 +1906,9 @@ class npc_frostsworn_general : public CreatureScript
             {
                 Talk(SAY_AGGRO);
                 DoZoneInCombat();
-                _events.ScheduleEvent(EVENT_SHIELD, 5000);
-                _events.ScheduleEvent(EVENT_SPIKE, 14000);
-                _events.ScheduleEvent(EVENT_CLONE, 22000);
+                _events.ScheduleEvent(EVENT_SHIELD, 5s);
+                _events.ScheduleEvent(EVENT_SPIKE, 14s);
+                _events.ScheduleEvent(EVENT_CLONE, 22s);
                 _instance->SetData(DATA_FROSTSWORN_GENERAL, IN_PROGRESS);
             }
 
@@ -1929,16 +1929,16 @@ class npc_frostsworn_general : public CreatureScript
                         case EVENT_SHIELD:
                             if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0, 45.0f, true))
                                 DoCast(target, SPELL_SHIELD_THROWN);
-                            _events.ScheduleEvent(EVENT_SHIELD, urand(8000, 12000));
+                            _events.ScheduleEvent(EVENT_SHIELD, 8s, 12s);
                             break;
                         case EVENT_SPIKE:
                             if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0, 45.0f, true))
                                 DoCast(target, SPELL_SPIKE);
-                            _events.ScheduleEvent(EVENT_SPIKE, urand(15000, 20000));
+                            _events.ScheduleEvent(EVENT_SPIKE, 15s, 20s);
                             break;
                         case EVENT_CLONE:
                             SummonClones();
-                            _events.ScheduleEvent(EVENT_CLONE, 60000);
+                            _events.ScheduleEvent(EVENT_CLONE, 1min);
                             break;
                         default:
                             break;
@@ -1990,7 +1990,7 @@ class npc_spiritual_reflection : public CreatureScript
 
             void JustEngagedWith(Unit* /*victim*/) override
             {
-                _events.ScheduleEvent(EVENT_BALEFUL_STRIKE, 3000);
+                _events.ScheduleEvent(EVENT_BALEFUL_STRIKE, 3s);
             }
 
             void JustDied(Unit* /*killer*/) override
@@ -2013,7 +2013,7 @@ class npc_spiritual_reflection : public CreatureScript
                     case EVENT_BALEFUL_STRIKE:
                         if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0, 8.0f, true))
                             DoCast(target, SPELL_BALEFUL_STRIKE);
-                        _events.ScheduleEvent(EVENT_BALEFUL_STRIKE, urand(3000, 8000));
+                        _events.ScheduleEvent(EVENT_BALEFUL_STRIKE, 3s, 8s);
                         break;
                     default:
                         break;
@@ -2209,7 +2209,7 @@ class npc_raging_ghoul : public CreatureScript
             void Reset() override
             {
                 npc_escape_event_trash::Reset();
-                _events.ScheduleEvent(EVENT_RAGING_GHOUL_JUMP, 5000);
+                _events.ScheduleEvent(EVENT_RAGING_GHOUL_JUMP, 5s);
             }
 
             void IsSummonedBy(Unit* summoner) override
@@ -2245,7 +2245,7 @@ class npc_raging_ghoul : public CreatureScript
                                 return;
                             }
                         }
-                        _events.ScheduleEvent(EVENT_RAGING_GHOUL_JUMP, 500);
+                        _events.ScheduleEvent(EVENT_RAGING_GHOUL_JUMP, 500ms);
                         break;
                     default:
                         break;
@@ -2273,9 +2273,9 @@ class npc_risen_witch_doctor : public CreatureScript
             void Reset() override
             {
                 npc_escape_event_trash::Reset();
-                _events.ScheduleEvent(EVENT_RISEN_WITCH_DOCTOR_SHADOW_BOLT, 6000);
-                _events.ScheduleEvent(EVENT_RISEN_WITCH_DOCTOR_SHADOW_BOLT_VOLLEY, 15000);
-                _events.ScheduleEvent(EVENT_RISEN_WITCH_DOCTOR_CURSE, 7000);
+                _events.ScheduleEvent(EVENT_RISEN_WITCH_DOCTOR_SHADOW_BOLT, 6s);
+                _events.ScheduleEvent(EVENT_RISEN_WITCH_DOCTOR_SHADOW_BOLT_VOLLEY, 15s);
+                _events.ScheduleEvent(EVENT_RISEN_WITCH_DOCTOR_CURSE, 7s);
             }
 
             void IsSummonedBy(Unit* summoner) override
@@ -2305,17 +2305,17 @@ class npc_risen_witch_doctor : public CreatureScript
                     case EVENT_RISEN_WITCH_DOCTOR_CURSE:
                         if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0, 30.0f, true))
                             DoCast(target, SPELL_CURSE_OF_DOOM);
-                        _events.ScheduleEvent(EVENT_RISEN_WITCH_DOCTOR_CURSE, urand(10000, 15000));
+                        _events.ScheduleEvent(EVENT_RISEN_WITCH_DOCTOR_CURSE, 10s, 15s);
                         break;
                     case EVENT_RISEN_WITCH_DOCTOR_SHADOW_BOLT:
                         if (Unit* target = SelectTarget(SELECT_TARGET_MAXTHREAT, 0, 20.0f, true))
                             DoCast(target, SPELL_SHADOW_BOLT);
-                        _events.ScheduleEvent(EVENT_RISEN_WITCH_DOCTOR_SHADOW_BOLT, urand(2000, 3000));
+                        _events.ScheduleEvent(EVENT_RISEN_WITCH_DOCTOR_SHADOW_BOLT, 2s, 3s);
                         break;
                     case EVENT_RISEN_WITCH_DOCTOR_SHADOW_BOLT_VOLLEY:
                         if (SelectTarget(SELECT_TARGET_RANDOM, 0, 30.0f, true))
                             DoCastAOE(SPELL_SHADOW_BOLT_VOLLEY);
-                        _events.ScheduleEvent(EVENT_RISEN_WITCH_DOCTOR_SHADOW_BOLT_VOLLEY, urand(15000, 22000));
+                        _events.ScheduleEvent(EVENT_RISEN_WITCH_DOCTOR_SHADOW_BOLT_VOLLEY, 15s, 22s);
                         break;
                     default:
                         break;
@@ -2343,8 +2343,8 @@ class npc_lumbering_abomination : public CreatureScript
             void Reset() override
             {
                 npc_escape_event_trash::Reset();
-                _events.ScheduleEvent(EVENT_LUMBERING_ABOMINATION_VOMIT_SPRAY, 15000);
-                _events.ScheduleEvent(EVENT_LUMBERING_ABOMINATION_CLEAVE, 6000);
+                _events.ScheduleEvent(EVENT_LUMBERING_ABOMINATION_VOMIT_SPRAY, 15s);
+                _events.ScheduleEvent(EVENT_LUMBERING_ABOMINATION_CLEAVE, 6s);
             }
 
             void UpdateAI(uint32 diff) override
@@ -2363,11 +2363,11 @@ class npc_lumbering_abomination : public CreatureScript
                 {
                     case EVENT_LUMBERING_ABOMINATION_VOMIT_SPRAY:
                         DoCastVictim(SPELL_VOMIT_SPRAY);
-                        _events.ScheduleEvent(EVENT_LUMBERING_ABOMINATION_VOMIT_SPRAY, urand(15000, 20000));
+                        _events.ScheduleEvent(EVENT_LUMBERING_ABOMINATION_VOMIT_SPRAY, 15s, 20s);
                         break;
                     case EVENT_LUMBERING_ABOMINATION_CLEAVE:
                         DoCastVictim(SPELL_CLEAVE);
-                        _events.ScheduleEvent(EVENT_LUMBERING_ABOMINATION_CLEAVE, urand(7000, 9000));
+                        _events.ScheduleEvent(EVENT_LUMBERING_ABOMINATION_CLEAVE, 7s, 9s);
                         break;
                     default:
                         break;
@@ -2504,7 +2504,7 @@ class npc_uther_quel_delar : public CreatureScript
                 switch (pointId)
                 {
                     case 1:
-                        _events.ScheduleEvent(EVENT_UTHER_FACING, 1000);
+                        _events.ScheduleEvent(EVENT_UTHER_FACING, 1s);
                         break;
                     default:
                         break;
@@ -2572,7 +2572,7 @@ class npc_uther_quel_delar : public CreatureScript
                         case EVENT_UTHER_FACING:
                             if (Creature* bunny = ObjectAccessor::GetCreature(*me, _instance->GetGuidData(DATA_FROSTMOURNE_ALTAR_BUNNY)))
                                 me->SetFacingToObject(bunny);
-                            _events.ScheduleEvent(EVENT_UTHER_KNEEL, 1000);
+                            _events.ScheduleEvent(EVENT_UTHER_KNEEL, 1s);
                             break;
                         case EVENT_UTHER_KNEEL:
                             me->HandleEmoteCommand(EMOTE_STATE_KNEEL);
@@ -2621,9 +2621,9 @@ class npc_quel_delar_sword : public CreatureScript
 
             void JustEngagedWith(Unit* /*victim*/) override
             {
-                _events.ScheduleEvent(EVENT_QUEL_DELAR_HEROIC_STRIKE, 4000);
-                _events.ScheduleEvent(EVENT_QUEL_DELAR_BLADESTORM, 6000);
-                _events.ScheduleEvent(EVENT_QUEL_DELAR_WHIRLWIND, 6000);
+                _events.ScheduleEvent(EVENT_QUEL_DELAR_HEROIC_STRIKE, 4s);
+                _events.ScheduleEvent(EVENT_QUEL_DELAR_BLADESTORM, 6s);
+                _events.ScheduleEvent(EVENT_QUEL_DELAR_WHIRLWIND, 6s);
             }
 
             void JustDied(Unit* /*killer*/) override
@@ -2664,7 +2664,7 @@ class npc_quel_delar_sword : public CreatureScript
                                 if (Creature* bunny = ObjectAccessor::GetCreature(*me, _instance->GetGuidData(DATA_FROSTMOURNE_ALTAR_BUNNY)))
                                     bunny->AI()->Talk(SAY_FROSTMOURNE_BUNNY);
                                 _intro = false;
-                                _events.ScheduleEvent(EVENT_QUEL_DELAR_FLIGHT_INIT, 2500);
+                                _events.ScheduleEvent(EVENT_QUEL_DELAR_FLIGHT_INIT, 2500ms);
                                 break;
                             case EVENT_QUEL_DELAR_FLIGHT_INIT:
                                 me->GetMotionMaster()->MoveTakeoff(POINT_TAKE_OFF, QuelDelarMovement[0]);
@@ -2672,14 +2672,14 @@ class npc_quel_delar_sword : public CreatureScript
                             case EVENT_QUEL_DELAR_FLIGHT:
                             {
                                 me->GetMotionMaster()->MoveCirclePath(QuelDelarCenterPos.GetPositionX(), QuelDelarCenterPos.GetPositionY(), 718.046f, 18.0f, true, 16);
-                                _events.ScheduleEvent(EVENT_QUEL_DELAR_LAND, 15000);
+                                _events.ScheduleEvent(EVENT_QUEL_DELAR_LAND, 15s);
                                 break;
                             }
                             case EVENT_QUEL_DELAR_LAND:
                                 me->StopMoving();
                                 me->GetMotionMaster()->Clear();
                                 me->GetMotionMaster()->MoveLand(0, QuelDelarMovement[1]);
-                                _events.ScheduleEvent(EVENT_QUEL_DELAR_FIGHT, 6000);
+                                _events.ScheduleEvent(EVENT_QUEL_DELAR_FIGHT, 6s);
                                 break;
                             case EVENT_QUEL_DELAR_FIGHT:
                                 Talk(SAY_QUEL_DELAR_SWORD);
@@ -2699,15 +2699,15 @@ class npc_quel_delar_sword : public CreatureScript
                         {
                             case EVENT_QUEL_DELAR_BLADESTORM:
                                 DoCast(me, SPELL_BLADESTORM);
-                                _events.ScheduleEvent(EVENT_QUEL_DELAR_BLADESTORM, 10000);
+                                _events.ScheduleEvent(EVENT_QUEL_DELAR_BLADESTORM, 10s);
                                 break;
                             case EVENT_QUEL_DELAR_HEROIC_STRIKE:
                                 DoCastVictim(SPELL_HEROIC_STRIKE);
-                                _events.ScheduleEvent(EVENT_QUEL_DELAR_HEROIC_STRIKE, 6000);
+                                _events.ScheduleEvent(EVENT_QUEL_DELAR_HEROIC_STRIKE, 6s);
                                 break;
                             case EVENT_QUEL_DELAR_WHIRLWIND:
                                 DoCastAOE(SPELL_WHIRLWIND);
-                                _events.ScheduleEvent(EVENT_QUEL_DELAR_WHIRLWIND, 1000);
+                                _events.ScheduleEvent(EVENT_QUEL_DELAR_WHIRLWIND, 1s);
                                 break;
                             default:
                                 break;
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 ecab990df1a..6f6f588cc4f 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
@@ -307,7 +307,7 @@ class instance_halls_of_reflection : public InstanceMapScript
                         if (state == DONE)
                         {
                             ++_waveCount;
-                            events.ScheduleEvent(EVENT_NEXT_WAVE, 60000);
+                            events.ScheduleEvent(EVENT_NEXT_WAVE, 1min);
                         }
                         break;
                     case DATA_MARWYN:
@@ -362,7 +362,7 @@ class instance_halls_of_reflection : public InstanceMapScript
                                 if (GameObject* icewall = instance->GetGameObject(IcewallGUID))
                                     icewall->Delete();
 
-                                events.ScheduleEvent(EVENT_SPAWN_ESCAPE_EVENT, 30000);
+                                events.ScheduleEvent(EVENT_SPAWN_ESCAPE_EVENT, 30s);
                                 break;
                             default:
                                 break;
@@ -454,7 +454,7 @@ class instance_halls_of_reflection : public InstanceMapScript
                             {
                                 if (Creature* bunny = instance->GetCreature(FrostmourneAltarBunnyGUID))
                                     bunny->CastSpell(nullptr, SPELL_ESSENCE_OF_CAPTURED);
-                                events.ScheduleEvent(EVENT_QUEL_DELAR_SUMMON_UTHER, 2000);
+                                events.ScheduleEvent(EVENT_QUEL_DELAR_SUMMON_UTHER, 2s);
                             }
                         }
                         _quelDelarState = data;
@@ -502,7 +502,7 @@ class instance_halls_of_reflection : public InstanceMapScript
                         }
 
                         ++_waveCount;
-                        events.ScheduleEvent(EVENT_NEXT_WAVE, 3000);
+                        events.ScheduleEvent(EVENT_NEXT_WAVE, 3s);
                         break;
                     }
                 }
@@ -575,7 +575,7 @@ class instance_halls_of_reflection : public InstanceMapScript
                                 }
                             }
                         }
-                        events.ScheduleEvent(EVENT_NEXT_WAVE, 5000);
+                        events.ScheduleEvent(EVENT_NEXT_WAVE, 5s);
                         break;
                     case EVENT_ADD_WAVE:
                         DoUpdateWorldState(WORLD_STATE_HOR_WAVES_ENABLED, 1);
@@ -607,7 +607,7 @@ class instance_halls_of_reflection : public InstanceMapScript
                             else if (_waveCount != 10)
                             {
                                 ++_waveCount;
-                                events.ScheduleEvent(EVENT_NEXT_WAVE, 5000);
+                                events.ScheduleEvent(EVENT_NEXT_WAVE, 5s);
                             }
                         }
                         break;
diff --git a/src/server/scripts/Northrend/FrozenHalls/PitOfSaron/boss_forgemaster_garfrost.cpp b/src/server/scripts/Northrend/FrozenHalls/PitOfSaron/boss_forgemaster_garfrost.cpp
index 464f78b7fb9..6f31703e067 100644
--- a/src/server/scripts/Northrend/FrozenHalls/PitOfSaron/boss_forgemaster_garfrost.cpp
+++ b/src/server/scripts/Northrend/FrozenHalls/PitOfSaron/boss_forgemaster_garfrost.cpp
@@ -110,7 +110,7 @@ class boss_garfrost : public CreatureScript
                 Talk(SAY_AGGRO);
                 DoCast(me, SPELL_PERMAFROST);
                 me->CallForHelp(70.0f);
-                events.ScheduleEvent(EVENT_THROW_SARONITE, 7000);
+                events.ScheduleEvent(EVENT_THROW_SARONITE, 7s);
             }
 
             void KilledUnit(Unit* victim) override
@@ -137,7 +137,7 @@ class boss_garfrost : public CreatureScript
                     Talk(SAY_PHASE2);
                     events.DelayEvents(8000);
                     DoCast(me, SPELL_THUNDERING_STOMP);
-                    events.ScheduleEvent(EVENT_FORGE_JUMP, 1500);
+                    events.ScheduleEvent(EVENT_FORGE_JUMP, 1500ms);
                     return;
                 }
 
@@ -147,7 +147,7 @@ class boss_garfrost : public CreatureScript
                     Talk(SAY_PHASE3);
                     events.DelayEvents(8000);
                     DoCast(me, SPELL_THUNDERING_STOMP);
-                    events.ScheduleEvent(EVENT_FORGE_JUMP, 1500);
+                    events.ScheduleEvent(EVENT_FORGE_JUMP, 1500ms);
                     return;
                 }
             }
@@ -168,7 +168,7 @@ class boss_garfrost : public CreatureScript
                     DoCast(me, SPELL_FORGE_MACE);
                     SetEquipmentSlots(false, EQUIP_ID_MACE);
                 }
-                events.ScheduleEvent(EVENT_RESUME_ATTACK, 5000);
+                events.ScheduleEvent(EVENT_RESUME_ATTACK, 5s);
             }
 
             void SpellHitTarget(Unit* target, SpellInfo const* spell) override
@@ -209,7 +209,7 @@ class boss_garfrost : public CreatureScript
                             break;
                         case EVENT_CHILLING_WAVE:
                             DoCast(me, SPELL_CHILLING_WAVE);
-                            events.ScheduleEvent(EVENT_CHILLING_WAVE, 40000, 0, PHASE_TWO);
+                            events.ScheduleEvent(EVENT_CHILLING_WAVE, 4s, 0, PHASE_TWO);
                             break;
                         case EVENT_DEEP_FREEZE:
                             if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0, 0.0f, true))
@@ -217,7 +217,7 @@ class boss_garfrost : public CreatureScript
                                 Talk(SAY_CAST_DEEP_FREEZE, target);
                                 DoCast(target, SPELL_DEEP_FREEZE);
                             }
-                            events.ScheduleEvent(EVENT_DEEP_FREEZE, 35000, 0, PHASE_THREE);
+                            events.ScheduleEvent(EVENT_DEEP_FREEZE, 35s, 0, PHASE_THREE);
                             break;
                         case EVENT_FORGE_JUMP:
                             me->AttackStop();
@@ -228,9 +228,9 @@ class boss_garfrost : public CreatureScript
                             break;
                         case EVENT_RESUME_ATTACK:
                             if (events.IsInPhase(PHASE_TWO))
-                                events.ScheduleEvent(EVENT_CHILLING_WAVE, 5000, 0, PHASE_TWO);
+                                events.ScheduleEvent(EVENT_CHILLING_WAVE, 5s, 0, PHASE_TWO);
                             else if (events.IsInPhase(PHASE_THREE))
-                                events.ScheduleEvent(EVENT_DEEP_FREEZE, 10000, 0, PHASE_THREE);
+                                events.ScheduleEvent(EVENT_DEEP_FREEZE, 10s, 0, PHASE_THREE);
                             AttackStart(me->GetVictim());
                             break;
                         default:
diff --git a/src/server/scripts/Northrend/FrozenHalls/PitOfSaron/boss_krickandick.cpp b/src/server/scripts/Northrend/FrozenHalls/PitOfSaron/boss_krickandick.cpp
index 966a1578e7f..c5e2598ccea 100644
--- a/src/server/scripts/Northrend/FrozenHalls/PitOfSaron/boss_krickandick.cpp
+++ b/src/server/scripts/Northrend/FrozenHalls/PitOfSaron/boss_krickandick.cpp
@@ -169,10 +169,10 @@ class boss_ick : public CreatureScript
                 if (Creature* krick = GetKrick())
                     krick->AI()->Talk(SAY_KRICK_AGGRO);
 
-                events.ScheduleEvent(EVENT_MIGHTY_KICK, 20000);
-                events.ScheduleEvent(EVENT_TOXIC_WASTE, 5000);
-                events.ScheduleEvent(EVENT_SHADOW_BOLT, 10000);
-                events.ScheduleEvent(EVENT_SPECIAL, urand(30000, 35000));
+                events.ScheduleEvent(EVENT_MIGHTY_KICK, 20s);
+                events.ScheduleEvent(EVENT_TOXIC_WASTE, 5s);
+                events.ScheduleEvent(EVENT_SHADOW_BOLT, 10s);
+                events.ScheduleEvent(EVENT_SPECIAL, 30s, 35s);
             }
 
             void EnterEvadeMode(EvadeReason why) override
@@ -237,22 +237,22 @@ class boss_ick : public CreatureScript
                             if (Creature* krick = GetKrick())
                                 if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0))
                                     krick->CastSpell(target, SPELL_TOXIC_WASTE);
-                            events.ScheduleEvent(EVENT_TOXIC_WASTE, urand(7000, 10000));
+                            events.ScheduleEvent(EVENT_TOXIC_WASTE, 7s, 10s);
                             break;
                         case EVENT_SHADOW_BOLT:
                             if (Creature* krick = GetKrick())
                                 if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 1))
                                     krick->CastSpell(target, SPELL_SHADOW_BOLT);
-                            events.ScheduleEvent(EVENT_SHADOW_BOLT, 15000);
+                            events.ScheduleEvent(EVENT_SHADOW_BOLT, 15s);
                             return;
                         case EVENT_MIGHTY_KICK:
                             DoCastVictim(SPELL_MIGHTY_KICK);
-                            events.ScheduleEvent(EVENT_MIGHTY_KICK, 25000);
+                            events.ScheduleEvent(EVENT_MIGHTY_KICK, 25s);
                             return;
                         case EVENT_SPECIAL:
                             //select one of these three special events
                             events.ScheduleEvent(RAND(EVENT_EXPLOSIVE_BARRAGE, EVENT_POISON_NOVA, EVENT_PURSUIT), 1000);
-                            events.ScheduleEvent(EVENT_SPECIAL, urand(23000, 28000));
+                            events.ScheduleEvent(EVENT_SPECIAL, 23s, 28s);
                             break;
                         case EVENT_EXPLOSIVE_BARRAGE:
                             if (Creature* krick = GetKrick())
@@ -492,7 +492,7 @@ class boss_krick : public CreatureScript
                                     jainaOrSylvanas->AI()->Talk(SAY_SYLVANAS_OUTRO_10);
                             }
                             // End of OUTRO. for now...
-                            _events.ScheduleEvent(EVENT_OUTRO_END, 3000);
+                            _events.ScheduleEvent(EVENT_OUTRO_END, 3s);
                             if (Creature* tyrannus = ObjectAccessor::GetCreature(*me, _tyrannusGUID))
                                 tyrannus->GetMotionMaster()->MovePoint(0, outroPos[7]);
                             break;
diff --git a/src/server/scripts/Northrend/FrozenHalls/PitOfSaron/boss_scourgelord_tyrannus.cpp b/src/server/scripts/Northrend/FrozenHalls/PitOfSaron/boss_scourgelord_tyrannus.cpp
index 2f351308e9f..7e1d880676b 100644
--- a/src/server/scripts/Northrend/FrozenHalls/PitOfSaron/boss_scourgelord_tyrannus.cpp
+++ b/src/server/scripts/Northrend/FrozenHalls/PitOfSaron/boss_scourgelord_tyrannus.cpp
@@ -213,7 +213,7 @@ class boss_tyrannus : public CreatureScript
                     events.ScheduleEvent(EVENT_INTRO_1, 14000, 0, PHASE_INTRO);
                     events.ScheduleEvent(EVENT_INTRO_2, 22000, 0, PHASE_INTRO);
                     events.ScheduleEvent(EVENT_INTRO_3, 34000, 0, PHASE_INTRO);
-                    events.ScheduleEvent(EVENT_COMBAT_START, 36000, 0, PHASE_INTRO);
+                    events.ScheduleEvent(EVENT_COMBAT_START, 36s, 0, PHASE_INTRO);
                     instance->SetBossState(DATA_TYRANNUS, IN_PROGRESS);
                 }
             }
@@ -247,24 +247,24 @@ class boss_tyrannus : public CreatureScript
                             me->SetReactState(REACT_AGGRESSIVE);
                             DoCast(me, SPELL_FULL_HEAL);
                             DoZoneInCombat();
-                            events.ScheduleEvent(EVENT_OVERLORD_BRAND, urand(5000, 7000));
-                            events.ScheduleEvent(EVENT_FORCEFUL_SMASH, urand(14000, 16000));
-                            events.ScheduleEvent(EVENT_MARK_OF_RIMEFANG, urand(25000, 27000));
+                            events.ScheduleEvent(EVENT_OVERLORD_BRAND, 5s, 7s);
+                            events.ScheduleEvent(EVENT_FORCEFUL_SMASH, 14s, 16s);
+                            events.ScheduleEvent(EVENT_MARK_OF_RIMEFANG, 25s, 27s);
                             break;
                         case EVENT_OVERLORD_BRAND:
                             if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 1, 0.0f, true))
                                 DoCast(target, SPELL_OVERLORD_BRAND);
-                            events.ScheduleEvent(EVENT_OVERLORD_BRAND, urand(11000, 12000));
+                            events.ScheduleEvent(EVENT_OVERLORD_BRAND, 11s, 12s);
                             break;
                         case EVENT_FORCEFUL_SMASH:
                             DoCastVictim(SPELL_FORCEFUL_SMASH);
-                            events.ScheduleEvent(EVENT_UNHOLY_POWER, 1000);
+                            events.ScheduleEvent(EVENT_UNHOLY_POWER, 1s);
                             break;
                         case EVENT_UNHOLY_POWER:
                             Talk(SAY_DARK_MIGHT_1);
                             Talk(SAY_DARK_MIGHT_2);
                             DoCast(me, SPELL_UNHOLY_POWER);
-                            events.ScheduleEvent(EVENT_FORCEFUL_SMASH, urand(40000, 48000));
+                            events.ScheduleEvent(EVENT_FORCEFUL_SMASH, 40s, 48s);
                             break;
                         case EVENT_MARK_OF_RIMEFANG:
                             Talk(SAY_MARK_RIMEFANG_1);
@@ -273,7 +273,7 @@ class boss_tyrannus : public CreatureScript
                                 Talk(SAY_MARK_RIMEFANG_2, target);
                                 DoCast(target, SPELL_MARK_OF_RIMEFANG);
                             }
-                            events.ScheduleEvent(EVENT_MARK_OF_RIMEFANG, urand(24000, 26000));
+                            events.ScheduleEvent(EVENT_MARK_OF_RIMEFANG, 24s, 26s);
                             break;
                     }
 
@@ -332,7 +332,7 @@ class boss_rimefang : public CreatureScript
                     _events.SetPhase(PHASE_COMBAT);
                     DoZoneInCombat();
                     _events.ScheduleEvent(EVENT_MOVE_NEXT, 500, 0, PHASE_COMBAT);
-                    _events.ScheduleEvent(EVENT_ICY_BLAST, 15000, 0, PHASE_COMBAT);
+                    _events.ScheduleEvent(EVENT_ICY_BLAST, 15s, 0, PHASE_COMBAT);
                 }
                 else if (actionId == ACTION_END_COMBAT)
                     _EnterEvadeMode();
@@ -343,7 +343,7 @@ class boss_rimefang : public CreatureScript
                 if (id == GUID_HOARFROST)
                 {
                     _hoarfrostTargetGUID = guid;
-                    _events.ScheduleEvent(EVENT_HOARFROST, 1000);
+                    _events.ScheduleEvent(EVENT_HOARFROST, 1s);
                 }
             }
 
@@ -363,12 +363,12 @@ class boss_rimefang : public CreatureScript
                                 _currentWaypoint = 1;
                             me->GetMotionMaster()->MovePoint(0, rimefangPos[_currentWaypoint]);
                             ++_currentWaypoint;
-                            _events.ScheduleEvent(EVENT_MOVE_NEXT, 2000, 0, PHASE_COMBAT);
+                            _events.ScheduleEvent(EVENT_MOVE_NEXT, 2s, 0, PHASE_COMBAT);
                             break;
                         case EVENT_ICY_BLAST:
                             if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0))
                                 DoCast(target, SPELL_ICY_BLAST);
-                            _events.ScheduleEvent(EVENT_ICY_BLAST, 15000, 0, PHASE_COMBAT);
+                            _events.ScheduleEvent(EVENT_ICY_BLAST, 15s, 0, PHASE_COMBAT);
                             break;
                         case EVENT_HOARFROST:
                             if (Unit* target = ObjectAccessor::GetUnit(*me, _hoarfrostTargetGUID))
diff --git a/src/server/scripts/Northrend/FrozenHalls/PitOfSaron/pit_of_saron.cpp b/src/server/scripts/Northrend/FrozenHalls/PitOfSaron/pit_of_saron.cpp
index 8036cc9634d..788d9bf1e9d 100644
--- a/src/server/scripts/Northrend/FrozenHalls/PitOfSaron/pit_of_saron.cpp
+++ b/src/server/scripts/Northrend/FrozenHalls/PitOfSaron/pit_of_saron.cpp
@@ -73,8 +73,8 @@ class npc_ymirjar_flamebearer : public CreatureScript
 
             void JustEngagedWith(Unit* /*who*/) override
             {
-                _events.ScheduleEvent(EVENT_FIREBALL, 4000);
-                _events.ScheduleEvent(EVENT_TACTICAL_BLINK, 15000);
+                _events.ScheduleEvent(EVENT_FIREBALL, 4s);
+                _events.ScheduleEvent(EVENT_TACTICAL_BLINK, 15s);
             }
 
             void UpdateAI(uint32 diff) override
diff --git a/src/server/scripts/Northrend/Gundrak/boss_drakkari_colossus.cpp b/src/server/scripts/Northrend/Gundrak/boss_drakkari_colossus.cpp
index bddb1a745f4..c8a81555972 100644
--- a/src/server/scripts/Northrend/Gundrak/boss_drakkari_colossus.cpp
+++ b/src/server/scripts/Northrend/Gundrak/boss_drakkari_colossus.cpp
@@ -112,7 +112,7 @@ class boss_drakkari_colossus : public CreatureScript
                     me->RemoveAura(SPELL_FREEZE_ANIM);
                 }
 
-                events.ScheduleEvent(EVENT_MIGHTY_BLOW, urand(10000, 30000));
+                events.ScheduleEvent(EVENT_MIGHTY_BLOW, 10s, 30s);
 
                 Initialize();
             }
@@ -208,7 +208,7 @@ class boss_drakkari_colossus : public CreatureScript
                     {
                         case EVENT_MIGHTY_BLOW:
                             DoCastVictim(SPELL_MIGHTY_BLOW);
-                            events.ScheduleEvent(EVENT_MIGHTY_BLOW, urand(5000, 15000));
+                            events.ScheduleEvent(EVENT_MIGHTY_BLOW, 5s, 15s);
                             break;
                     }
 
@@ -255,7 +255,7 @@ class boss_drakkari_elemental : public CreatureScript
             void Reset() override
             {
                 events.Reset();
-                events.ScheduleEvent(EVENT_SURGE, urand(5000, 15000));
+                events.ScheduleEvent(EVENT_SURGE, 5s, 15s);
 
                 me->AddAura(SPELL_MOJO_VOLLEY, me);
             }
@@ -286,7 +286,7 @@ class boss_drakkari_elemental : public CreatureScript
                             DoCast(SPELL_SURGE_VISUAL);
                             if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 1, 0.0f, true))
                                 DoCast(target, SPELL_SURGE);
-                            events.ScheduleEvent(EVENT_SURGE, urand(5000, 15000));
+                            events.ScheduleEvent(EVENT_SURGE, 5s, 15s);
                             break;
                     }
 
diff --git a/src/server/scripts/Northrend/Gundrak/boss_eck.cpp b/src/server/scripts/Northrend/Gundrak/boss_eck.cpp
index 6f391e17f66..6882a5f5eaf 100644
--- a/src/server/scripts/Northrend/Gundrak/boss_eck.cpp
+++ b/src/server/scripts/Northrend/Gundrak/boss_eck.cpp
@@ -68,10 +68,10 @@ class boss_eck : public CreatureScript
             void JustEngagedWith(Unit* /*who*/) override
             {
                 _JustEngagedWith();
-                events.ScheduleEvent(EVENT_BITE, 5 * IN_MILLISECONDS);
-                events.ScheduleEvent(EVENT_SPIT, 10 * IN_MILLISECONDS);
-                events.ScheduleEvent(EVENT_SPRING, 8 * IN_MILLISECONDS);
-                events.ScheduleEvent(EVENT_BERSERK, urand(60 * IN_MILLISECONDS, 90 * IN_MILLISECONDS)); // 60-90 secs according to wowwiki
+                events.ScheduleEvent(EVENT_BITE, 5s);
+                events.ScheduleEvent(EVENT_SPIT, 10s);
+                events.ScheduleEvent(EVENT_SPRING, 8s);
+                events.ScheduleEvent(EVENT_BERSERK, 60s, 90s); // 60-90 secs according to wowwiki
             }
 
             void DamageTaken(Unit* /*attacker*/, uint32& damage) override
@@ -89,16 +89,16 @@ class boss_eck : public CreatureScript
                 {
                     case EVENT_BITE:
                         DoCastVictim(SPELL_ECK_BITE);
-                        events.ScheduleEvent(EVENT_BITE, urand(8 * IN_MILLISECONDS, 12 * IN_MILLISECONDS));
+                        events.ScheduleEvent(EVENT_BITE, 8s, 12s);
                         break;
                     case EVENT_SPIT:
                         DoCastVictim(SPELL_ECK_SPIT);
-                        events.ScheduleEvent(EVENT_SPIT, urand(6 * IN_MILLISECONDS, 14 * IN_MILLISECONDS));
+                        events.ScheduleEvent(EVENT_SPIT, 6s, 14s);
                         break;
                     case EVENT_SPRING:
                         if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 1, 35.0f, true))
                             DoCast(target, RAND(SPELL_ECK_SPRING_1, SPELL_ECK_SPRING_2));
-                        events.ScheduleEvent(EVENT_SPRING, urand(5 * IN_MILLISECONDS, 10 * IN_MILLISECONDS));
+                        events.ScheduleEvent(EVENT_SPRING, 5s, 10s);
                         break;
                     case EVENT_BERSERK:
                         DoCast(me, SPELL_ECK_BERSERK);
diff --git a/src/server/scripts/Northrend/Gundrak/boss_gal_darah.cpp b/src/server/scripts/Northrend/Gundrak/boss_gal_darah.cpp
index da38a556474..6fe62af93c6 100644
--- a/src/server/scripts/Northrend/Gundrak/boss_gal_darah.cpp
+++ b/src/server/scripts/Northrend/Gundrak/boss_gal_darah.cpp
@@ -183,7 +183,7 @@ class boss_gal_darah : public CreatureScript
                         if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0, 60.0f, true))
                             DoCast(target, SPELL_IMPALING_CHARGE);
                         if (++_phaseCounter >= 2)
-                            events.ScheduleEvent(EVENT_TRANSFORM, 5 * IN_MILLISECONDS);
+                            events.ScheduleEvent(EVENT_TRANSFORM, 5s);
                         events.Repeat(Seconds(31));
                         break;
                     case EVENT_STOMP:
@@ -202,7 +202,7 @@ class boss_gal_darah : public CreatureScript
                     case EVENT_WHIRLING_SLASH:
                         DoCastVictim(SPELL_WHIRLING_SLASH);
                         if (++_phaseCounter >= 2)
-                            events.ScheduleEvent(EVENT_TRANSFORM, 5 * IN_MILLISECONDS);
+                            events.ScheduleEvent(EVENT_TRANSFORM, 5s);
                         events.Repeat(Seconds(21));
                         break;
                     case EVENT_ENRAGE:
diff --git a/src/server/scripts/Northrend/Gundrak/boss_moorabi.cpp b/src/server/scripts/Northrend/Gundrak/boss_moorabi.cpp
index e1e9117fb50..dc93098a91b 100644
--- a/src/server/scripts/Northrend/Gundrak/boss_moorabi.cpp
+++ b/src/server/scripts/Northrend/Gundrak/boss_moorabi.cpp
@@ -92,10 +92,10 @@ class boss_moorabi : public CreatureScript
                 DoCastSelf(SPELL_MOJO_FRENZY, true);
 
                 events.SetPhase(PHASE_COMBAT);
-                events.ScheduleEvent(EVENT_GROUND_TREMOR, Seconds(18));
-                events.ScheduleEvent(EVENT_NUMBLING_SHOUT, Seconds(10));
-                events.ScheduleEvent(EVENT_DETERMINED_STAB, Seconds(20));
-                events.ScheduleEvent(EVENT_TRANFORMATION, Seconds(12));
+                events.ScheduleEvent(EVENT_GROUND_TREMOR, 18s);
+                events.ScheduleEvent(EVENT_NUMBLING_SHOUT, 10s);
+                events.ScheduleEvent(EVENT_DETERMINED_STAB, 20s);
+                events.ScheduleEvent(EVENT_TRANFORMATION, 12s);
             }
 
             void EnterEvadeMode(EvadeReason /*why*/) override
diff --git a/src/server/scripts/Northrend/IcecrownCitadel/boss_blood_prince_council.cpp b/src/server/scripts/Northrend/IcecrownCitadel/boss_blood_prince_council.cpp
index b4017d47908..1fd43e7ec86 100644
--- a/src/server/scripts/Northrend/IcecrownCitadel/boss_blood_prince_council.cpp
+++ b/src/server/scripts/Northrend/IcecrownCitadel/boss_blood_prince_council.cpp
@@ -631,9 +631,9 @@ class boss_prince_keleseth_icc : public CreatureScript
 
             void ScheduleEvents() override
             {
-                events.ScheduleEvent(EVENT_BERSERK, Minutes(10));
-                events.ScheduleEvent(EVENT_SHADOW_RESONANCE, Seconds(10), Seconds(15));
-                events.ScheduleEvent(EVENT_SHADOW_LANCE, Seconds(2));
+                events.ScheduleEvent(EVENT_BERSERK, 10min);
+                events.ScheduleEvent(EVENT_SHADOW_RESONANCE, 10s, 15s);
+                events.ScheduleEvent(EVENT_SHADOW_LANCE, 2s);
 
                 if (IsHeroic())
                 {
@@ -709,9 +709,9 @@ class boss_prince_taldaram_icc : public CreatureScript
 
             void ScheduleEvents() override
             {
-                events.ScheduleEvent(EVENT_BERSERK, Minutes(10));
-                events.ScheduleEvent(EVENT_GLITTERING_SPARKS, Seconds(12), Seconds(15));
-                events.ScheduleEvent(EVENT_CONJURE_FLAME, Seconds(20));
+                events.ScheduleEvent(EVENT_BERSERK, 10min);
+                events.ScheduleEvent(EVENT_GLITTERING_SPARKS, 12s, 15s);
+                events.ScheduleEvent(EVENT_CONJURE_FLAME, 20s);
                 if (IsHeroic())
                     DoCastSelf(SPELL_SHADOW_PRISON, true);
             }
@@ -794,9 +794,9 @@ class boss_prince_valanar_icc : public CreatureScript
 
             void ScheduleEvents() override
             {
-                events.ScheduleEvent(EVENT_BERSERK, Minutes(10));
-                events.ScheduleEvent(EVENT_KINETIC_BOMB, Seconds(18), Seconds(24));
-                events.ScheduleEvent(EVENT_SHOCK_VORTEX, Seconds(15), Seconds(20));
+                events.ScheduleEvent(EVENT_BERSERK, 10min);
+                events.ScheduleEvent(EVENT_KINETIC_BOMB, 18s, 24s);
+                events.ScheduleEvent(EVENT_SHOCK_VORTEX, 15s, 20s);
                 if (IsHeroic())
                     DoCastSelf(SPELL_SHADOW_PRISON, true);
             }
@@ -1061,7 +1061,7 @@ class npc_kinetic_bomb : public CreatureScript
             void DoAction(int32 action) override
             {
                 if (action == SPELL_KINETIC_BOMB_EXPLOSION)
-                    _events.ScheduleEvent(EVENT_BOMB_DESPAWN, Seconds(1));
+                    _events.ScheduleEvent(EVENT_BOMB_DESPAWN, 1s);
 
                 else if (action == ACTION_KINETIC_BOMB_JUMP)
                 {
diff --git a/src/server/scripts/Northrend/IcecrownCitadel/boss_blood_queen_lana_thel.cpp b/src/server/scripts/Northrend/IcecrownCitadel/boss_blood_queen_lana_thel.cpp
index 0779aefa1ba..2209762a576 100644
--- a/src/server/scripts/Northrend/IcecrownCitadel/boss_blood_queen_lana_thel.cpp
+++ b/src/server/scripts/Northrend/IcecrownCitadel/boss_blood_queen_lana_thel.cpp
@@ -162,12 +162,12 @@ class boss_blood_queen_lana_thel : public CreatureScript
             {
                 _Reset();
                 events.ScheduleEvent(EVENT_BERSERK, 330000);
-                events.ScheduleEvent(EVENT_VAMPIRIC_BITE, 15000);
-                events.ScheduleEvent(EVENT_BLOOD_MIRROR, 2500, EVENT_GROUP_CANCELLABLE);
-                events.ScheduleEvent(EVENT_DELIRIOUS_SLASH, urand(20000, 24000), EVENT_GROUP_NORMAL);
-                events.ScheduleEvent(EVENT_PACT_OF_THE_DARKFALLEN, 15000, EVENT_GROUP_NORMAL);
+                events.ScheduleEvent(EVENT_VAMPIRIC_BITE, 15s);
+                events.ScheduleEvent(EVENT_BLOOD_MIRROR, 2500ms, EVENT_GROUP_CANCELLABLE);
+                events.ScheduleEvent(EVENT_DELIRIOUS_SLASH, 20s, 24s, EVENT_GROUP_NORMAL);
+                events.ScheduleEvent(EVENT_PACT_OF_THE_DARKFALLEN, 15s, EVENT_GROUP_NORMAL);
                 events.ScheduleEvent(EVENT_SWARMING_SHADOWS, 30500, EVENT_GROUP_NORMAL);
-                events.ScheduleEvent(EVENT_TWILIGHT_BLOODBOLT, urand(20000, 25000), EVENT_GROUP_NORMAL);
+                events.ScheduleEvent(EVENT_TWILIGHT_BLOODBOLT, 20s, 25s, EVENT_GROUP_NORMAL);
                 events.ScheduleEvent(EVENT_AIR_PHASE, 124000 + uint32(Is25ManRaid() ? 3000 : 0));
                 CleanAuras();
                 _vampires.clear();
@@ -317,13 +317,13 @@ class boss_blood_queen_lana_thel : public CreatureScript
                         events.ScheduleEvent(EVENT_AIR_PHASE, 100000 + uint32(Is25ManRaid() ? 0 : 20000));
                         events.RescheduleEvent(EVENT_SWARMING_SHADOWS, 30500, EVENT_GROUP_NORMAL);
                         events.RescheduleEvent(EVENT_PACT_OF_THE_DARKFALLEN, 25500, EVENT_GROUP_NORMAL);
-                        events.ScheduleEvent(EVENT_AIR_START_FLYING, 5000);
+                        events.ScheduleEvent(EVENT_AIR_START_FLYING, 5s);
                         break;
                     case POINT_AIR:
                         _bloodboltedPlayers.clear();
                         DoCast(me, SPELL_BLOODBOLT_WHIRL);
                         Talk(SAY_AIR_PHASE);
-                        events.ScheduleEvent(EVENT_AIR_FLY_DOWN, 10000);
+                        events.ScheduleEvent(EVENT_AIR_FLY_DOWN, 10s);
                         break;
                     case POINT_GROUND:
                         me->SetDisableGravity(false);
@@ -331,7 +331,7 @@ class boss_blood_queen_lana_thel : public CreatureScript
                         me->SetReactState(REACT_AGGRESSIVE);
                         if (Unit* victim = me->SelectVictim())
                             AttackStart(victim);
-                        events.ScheduleEvent(EVENT_BLOOD_MIRROR, 2500, EVENT_GROUP_CANCELLABLE);
+                        events.ScheduleEvent(EVENT_BLOOD_MIRROR, 2500ms, EVENT_GROUP_CANCELLABLE);
                         break;
                     case POINT_MINCHAR:
                         DoCast(me, SPELL_ANNIHILATE, true);
@@ -405,14 +405,14 @@ class boss_blood_queen_lana_thel : public CreatureScript
                                 else
                                     _offtankGUID.Clear();
                             }
-                            events.ScheduleEvent(EVENT_BLOOD_MIRROR, 2500, EVENT_GROUP_CANCELLABLE);
+                            events.ScheduleEvent(EVENT_BLOOD_MIRROR, 2500ms, EVENT_GROUP_CANCELLABLE);
                             break;
                         }
                         case EVENT_DELIRIOUS_SLASH:
                             if (_offtankGUID && !me->HasByteFlag(UNIT_FIELD_BYTES_1, UNIT_BYTES_1_OFFSET_ANIM_TIER, UNIT_BYTE1_FLAG_ALWAYS_STAND | UNIT_BYTE1_FLAG_HOVER))
                                 if (Player* _offtank = ObjectAccessor::GetPlayer(*me, _offtankGUID))
                                     DoCast(_offtank, SPELL_DELIRIOUS_SLASH);
-                            events.ScheduleEvent(EVENT_DELIRIOUS_SLASH, urand(20000, 24000), EVENT_GROUP_NORMAL);
+                            events.ScheduleEvent(EVENT_DELIRIOUS_SLASH, 20s, 24s, EVENT_GROUP_NORMAL);
                             break;
                         case EVENT_PACT_OF_THE_DARKFALLEN:
                         {
@@ -445,7 +445,7 @@ class boss_blood_queen_lana_thel : public CreatureScript
                             for (std::list<Player*>::iterator itr = targets.begin(); itr != targets.end(); ++itr)
                                 DoCast(*itr, SPELL_TWILIGHT_BLOODBOLT);
                             DoCast(me, SPELL_TWILIGHT_BLOODBOLT_TARGET);
-                            events.ScheduleEvent(EVENT_TWILIGHT_BLOODBOLT, urand(10000, 15000), EVENT_GROUP_NORMAL);
+                            events.ScheduleEvent(EVENT_TWILIGHT_BLOODBOLT, 10s, 15s, EVENT_GROUP_NORMAL);
                             break;
                         }
                         case EVENT_AIR_PHASE:
diff --git a/src/server/scripts/Northrend/IcecrownCitadel/boss_deathbringer_saurfang.cpp b/src/server/scripts/Northrend/IcecrownCitadel/boss_deathbringer_saurfang.cpp
index f12824e99e2..0d14f6c2d54 100644
--- a/src/server/scripts/Northrend/IcecrownCitadel/boss_deathbringer_saurfang.cpp
+++ b/src/server/scripts/Northrend/IcecrownCitadel/boss_deathbringer_saurfang.cpp
@@ -306,11 +306,11 @@ class boss_deathbringer_saurfang : public CreatureScript
                 _introDone = true;
 
                 Talk(SAY_AGGRO);
-                events.ScheduleEvent(EVENT_SUMMON_BLOOD_BEAST, 30000, 0, PHASE_COMBAT);
+                events.ScheduleEvent(EVENT_SUMMON_BLOOD_BEAST, 30s, 0, PHASE_COMBAT);
                 events.ScheduleEvent(EVENT_BERSERK, IsHeroic() ? 360000 : 480000, 0, PHASE_COMBAT);
                 events.ScheduleEvent(EVENT_BOILING_BLOOD, 15500, 0, PHASE_COMBAT);
-                events.ScheduleEvent(EVENT_BLOOD_NOVA, 17000, 0, PHASE_COMBAT);
-                events.ScheduleEvent(EVENT_RUNE_OF_BLOOD, 20000, 0, PHASE_COMBAT);
+                events.ScheduleEvent(EVENT_BLOOD_NOVA, 17s, 0, PHASE_COMBAT);
+                events.ScheduleEvent(EVENT_RUNE_OF_BLOOD, 20s, 0, PHASE_COMBAT);
 
                 _fallenChampionCastCount = 0;
                 instance->DoRemoveAurasDueToSpellOnPlayers(SPELL_MARK_OF_THE_FALLEN_CHAMPION);
@@ -503,9 +503,9 @@ class boss_deathbringer_saurfang : public CreatureScript
                                 for (uint32 i25 = 0; i25 < 3; ++i25)
                                     DoCast(me, SPELL_SUMMON_BLOOD_BEAST_25_MAN+i25);
                             Talk(SAY_BLOOD_BEASTS);
-                            events.ScheduleEvent(EVENT_SUMMON_BLOOD_BEAST, 40000, 0, PHASE_COMBAT);
+                            events.ScheduleEvent(EVENT_SUMMON_BLOOD_BEAST, 40s, 0, PHASE_COMBAT);
                             if (IsHeroic())
-                                events.ScheduleEvent(EVENT_SCENT_OF_BLOOD, 10000, 0, PHASE_COMBAT);
+                                events.ScheduleEvent(EVENT_SCENT_OF_BLOOD, 10s, 0, PHASE_COMBAT);
                             break;
                         case EVENT_BLOOD_NOVA:
                             DoCastAOE(SPELL_BLOOD_NOVA_TRIGGER);
@@ -576,7 +576,7 @@ class boss_deathbringer_saurfang : public CreatureScript
                             return;
 
                         events.ScheduleEvent(EVENT_INTRO_ALLIANCE_6, 6500+500, 0, PHASE_INTRO_A);
-                        events.ScheduleEvent(EVENT_INTRO_FINISH, 8000, 0, PHASE_INTRO_A);
+                        events.ScheduleEvent(EVENT_INTRO_FINISH, 8s, 0, PHASE_INTRO_A);
 
                         events.ScheduleEvent(EVENT_INTRO_HORDE_4, 6500, 0, PHASE_INTRO_H);
                         events.ScheduleEvent(EVENT_INTRO_HORDE_9, 46700+1000+500, 0, PHASE_INTRO_H);
diff --git a/src/server/scripts/Northrend/IcecrownCitadel/boss_festergut.cpp b/src/server/scripts/Northrend/IcecrownCitadel/boss_festergut.cpp
index 3c35c84129c..e579a73a021 100644
--- a/src/server/scripts/Northrend/IcecrownCitadel/boss_festergut.cpp
+++ b/src/server/scripts/Northrend/IcecrownCitadel/boss_festergut.cpp
@@ -97,9 +97,9 @@ class boss_festergut : public CreatureScript
             void Reset() override
             {
                 _Reset();
-                events.ScheduleEvent(EVENT_BERSERK, 300000);
-                events.ScheduleEvent(EVENT_INHALE_BLIGHT, urand(25000, 30000));
-                events.ScheduleEvent(EVENT_GAS_SPORE, urand(20000, 25000));
+                events.ScheduleEvent(EVENT_BERSERK, 5min);
+                events.ScheduleEvent(EVENT_INHALE_BLIGHT, 25s, 30s);
+                events.ScheduleEvent(EVENT_GAS_SPORE, 20s, 25s);
                 events.ScheduleEvent(EVENT_GASTRIC_BLOAT, urand(12500, 15000));
                 _maxInoculatedStack = 0;
                 _inhaleCounter = 0;
@@ -230,14 +230,14 @@ class boss_festergut : public CreatureScript
                                     DoCast(*itr, SPELL_VILE_GAS);
                             }
 
-                            events.ScheduleEvent(EVENT_VILE_GAS, urand(28000, 35000));
+                            events.ScheduleEvent(EVENT_VILE_GAS, 28s, 35s);
                             break;
                         }
                         case EVENT_GAS_SPORE:
                             Talk(EMOTE_WARN_GAS_SPORE);
                             Talk(EMOTE_GAS_SPORE);
                             me->CastSpell(me, SPELL_GAS_SPORE, CastSpellExtraArgs().AddSpellMod(SPELLVALUE_MAX_TARGETS, RAID_MODE<int32>(2, 3, 2, 3)));
-                            events.ScheduleEvent(EVENT_GAS_SPORE, urand(40000, 45000));
+                            events.ScheduleEvent(EVENT_GAS_SPORE, 40s, 45s);
                             events.RescheduleEvent(EVENT_VILE_GAS, urand(28000, 35000));
                             break;
                         case EVENT_GASTRIC_BLOAT:
@@ -310,8 +310,8 @@ class npc_stinky_icc : public CreatureScript
             void Reset() override
             {
                 _events.Reset();
-                _events.ScheduleEvent(EVENT_DECIMATE, urand(20000, 25000));
-                _events.ScheduleEvent(EVENT_MORTAL_WOUND, urand(3000, 7000));
+                _events.ScheduleEvent(EVENT_DECIMATE, 20s, 25s);
+                _events.ScheduleEvent(EVENT_MORTAL_WOUND, 3s, 7s);
             }
 
             void JustEngagedWith(Unit* /*target*/) override
@@ -335,7 +335,7 @@ class npc_stinky_icc : public CreatureScript
                     {
                         case EVENT_DECIMATE:
                             DoCastVictim(SPELL_DECIMATE);
-                            _events.ScheduleEvent(EVENT_DECIMATE, urand(20000, 25000));
+                            _events.ScheduleEvent(EVENT_DECIMATE, 20s, 25s);
                             break;
                         case EVENT_MORTAL_WOUND:
                             DoCastVictim(SPELL_MORTAL_WOUND);
diff --git a/src/server/scripts/Northrend/IcecrownCitadel/boss_icecrown_gunship_battle.cpp b/src/server/scripts/Northrend/IcecrownCitadel/boss_icecrown_gunship_battle.cpp
index b9fb998dd9f..9ded4a469cd 100644
--- a/src/server/scripts/Northrend/IcecrownCitadel/boss_icecrown_gunship_battle.cpp
+++ b/src/server/scripts/Northrend/IcecrownCitadel/boss_icecrown_gunship_battle.cpp
@@ -875,7 +875,7 @@ class npc_high_overlord_saurfang_igb : public CreatureScript
                 _events.SetPhase(PHASE_COMBAT);
                 DoCast(me, _instance->GetData(DATA_TEAM_IN_INSTANCE) == HORDE ? SPELL_FRIENDLY_BOSS_DAMAGE_MOD : SPELL_MELEE_TARGETING_ON_ORGRIMS_HAMMER, true);
                 DoCast(me, SPELL_BATTLE_FURY, true);
-                _events.ScheduleEvent(EVENT_CLEAVE, urand(2000, 10000));
+                _events.ScheduleEvent(EVENT_CLEAVE, 2s, 10s);
             }
 
             void EnterEvadeMode(EvadeReason /*why*/) override
@@ -925,9 +925,9 @@ class npc_high_overlord_saurfang_igb : public CreatureScript
                 }
                 else if (action == ACTION_SPAWN_ALL_ADDS)
                 {
-                    _events.ScheduleEvent(EVENT_ADDS, 12000);
-                    _events.ScheduleEvent(EVENT_CHECK_RIFLEMAN, 13000);
-                    _events.ScheduleEvent(EVENT_CHECK_MORTAR, 13000);
+                    _events.ScheduleEvent(EVENT_ADDS, 12s);
+                    _events.ScheduleEvent(EVENT_CHECK_RIFLEMAN, 13s);
+                    _events.ScheduleEvent(EVENT_CHECK_MORTAR, 13s);
                     if (Is25ManRaid())
                         _controller.SummonCreatures(SLOT_MAGE_1, SLOT_MORTAR_4);
                     else
@@ -1018,7 +1018,7 @@ class npc_high_overlord_saurfang_igb : public CreatureScript
                             if (_instance->GetBossState(DATA_ICECROWN_GUNSHIP_BATTLE) == IN_PROGRESS)
                             {
                                 _instance->DoCastSpellOnPlayers(SPELL_LOCK_PLAYERS_AND_TAP_CHEST);
-                                _events.ScheduleEvent(EVENT_KEEP_PLAYER_IN_COMBAT, urand(5000, 8000));
+                                _events.ScheduleEvent(EVENT_KEEP_PLAYER_IN_COMBAT, 5s, 8s);
                             }
                             break;
                         case EVENT_SUMMON_MAGE:
@@ -1036,8 +1036,8 @@ class npc_high_overlord_saurfang_igb : public CreatureScript
                             if (Transport* skybreaker = HashMapHolder<Transport>::Find(_instance->GetGuidData(DATA_ICECROWN_GUNSHIP_BATTLE)))
                                 skybreaker->SummonPassenger(NPC_TELEPORT_EXIT, SkybreakerTeleportExit, TEMPSUMMON_TIMED_DESPAWN, nullptr, 23000);
 
-                            _events.ScheduleEvent(EVENT_ADDS_BOARD_YELL, 6000);
-                            _events.ScheduleEvent(EVENT_ADDS, 60000);
+                            _events.ScheduleEvent(EVENT_ADDS_BOARD_YELL, 6s);
+                            _events.ScheduleEvent(EVENT_ADDS, 1min);
                             break;
                         case EVENT_ADDS_BOARD_YELL:
                             if (Creature* muradin = me->FindNearestCreature(NPC_IGB_MURADIN_BRONZEBEARD, 200.0f))
@@ -1052,7 +1052,7 @@ class npc_high_overlord_saurfang_igb : public CreatureScript
                                     _axethrowersYellCooldown = GameTime::GetGameTime() + 5;
                                 }
                             }
-                            _events.ScheduleEvent(EVENT_CHECK_RIFLEMAN, 1000);
+                            _events.ScheduleEvent(EVENT_CHECK_RIFLEMAN, 1s);
                             break;
                         case EVENT_CHECK_MORTAR:
                             if (_controller.SummonCreatures(SLOT_MORTAR_1, Is25ManRaid() ? SLOT_MORTAR_4 : SLOT_MORTAR_2))
@@ -1063,11 +1063,11 @@ class npc_high_overlord_saurfang_igb : public CreatureScript
                                     _rocketeersYellCooldown = GameTime::GetGameTime() + 5;
                                 }
                             }
-                            _events.ScheduleEvent(EVENT_CHECK_MORTAR, 1000);
+                            _events.ScheduleEvent(EVENT_CHECK_MORTAR, 1s);
                             break;
                         case EVENT_CLEAVE:
                             DoCastVictim(SPELL_CLEAVE);
-                            _events.ScheduleEvent(EVENT_CLEAVE, urand(2000, 10000));
+                            _events.ScheduleEvent(EVENT_CLEAVE, 2s, 10s);
                             break;
                         default:
                             break;
@@ -1139,7 +1139,7 @@ class npc_muradin_bronzebeard_igb : public CreatureScript
                 _events.SetPhase(PHASE_COMBAT);
                 DoCast(me, _instance->GetData(DATA_TEAM_IN_INSTANCE) == ALLIANCE ? SPELL_FRIENDLY_BOSS_DAMAGE_MOD : SPELL_MELEE_TARGETING_ON_SKYBREAKER, true);
                 DoCast(me, SPELL_BATTLE_FURY, true);
-                _events.ScheduleEvent(EVENT_CLEAVE, urand(2000, 10000));
+                _events.ScheduleEvent(EVENT_CLEAVE, 2s, 10s);
             }
 
             void EnterEvadeMode(EvadeReason /*why*/) override
@@ -1189,9 +1189,9 @@ class npc_muradin_bronzebeard_igb : public CreatureScript
                 }
                 else if (action == ACTION_SPAWN_ALL_ADDS)
                 {
-                    _events.ScheduleEvent(EVENT_ADDS, 12000);
-                    _events.ScheduleEvent(EVENT_CHECK_RIFLEMAN, 13000);
-                    _events.ScheduleEvent(EVENT_CHECK_MORTAR, 13000);
+                    _events.ScheduleEvent(EVENT_ADDS, 12s);
+                    _events.ScheduleEvent(EVENT_CHECK_RIFLEMAN, 13s);
+                    _events.ScheduleEvent(EVENT_CHECK_MORTAR, 13s);
                     if (Is25ManRaid())
                         _controller.SummonCreatures(SLOT_MAGE_1, SLOT_MORTAR_4);
                     else
@@ -1230,7 +1230,7 @@ class npc_muradin_bronzebeard_igb : public CreatureScript
                 _events.SetPhase(PHASE_INTRO);
                 _events.ScheduleEvent(EVENT_INTRO_A_1, 5000);
                 _events.ScheduleEvent(EVENT_INTRO_A_2, 10000, 0, PHASE_INTRO);
-                _events.ScheduleEvent(EVENT_INTRO_SUMMON_ORGRIMS_HAMMER, 28000, 0, PHASE_INTRO);
+                _events.ScheduleEvent(EVENT_INTRO_SUMMON_ORGRIMS_HAMMER, 28s, 0, PHASE_INTRO);
                 _events.ScheduleEvent(EVENT_INTRO_A_3, 33000, 0, PHASE_INTRO);
                 _events.ScheduleEvent(EVENT_INTRO_A_4, 39000, 0, PHASE_INTRO);
                 _events.ScheduleEvent(EVENT_INTRO_A_5, 45000, 0, PHASE_INTRO);
@@ -1286,7 +1286,7 @@ class npc_muradin_bronzebeard_igb : public CreatureScript
                             if (_instance->GetBossState(DATA_ICECROWN_GUNSHIP_BATTLE) == IN_PROGRESS)
                             {
                                 _instance->DoCastSpellOnPlayers(SPELL_LOCK_PLAYERS_AND_TAP_CHEST);
-                                _events.ScheduleEvent(EVENT_KEEP_PLAYER_IN_COMBAT, urand(5000, 8000));
+                                _events.ScheduleEvent(EVENT_KEEP_PLAYER_IN_COMBAT, 5s, 8s);
                             }
                             break;
                         case EVENT_SUMMON_MAGE:
@@ -1304,8 +1304,8 @@ class npc_muradin_bronzebeard_igb : public CreatureScript
                             if (Transport* orgrimsHammer = HashMapHolder<Transport>::Find(_instance->GetGuidData(DATA_ICECROWN_GUNSHIP_BATTLE)))
                                 orgrimsHammer->SummonPassenger(NPC_TELEPORT_EXIT, OrgrimsHammerTeleportExit, TEMPSUMMON_TIMED_DESPAWN, nullptr, 23000);
 
-                            _events.ScheduleEvent(EVENT_ADDS_BOARD_YELL, 6000);
-                            _events.ScheduleEvent(EVENT_ADDS, 60000);
+                            _events.ScheduleEvent(EVENT_ADDS_BOARD_YELL, 6s);
+                            _events.ScheduleEvent(EVENT_ADDS, 1min);
                             break;
                         case EVENT_ADDS_BOARD_YELL:
                             if (Creature* saurfang = me->FindNearestCreature(NPC_IGB_HIGH_OVERLORD_SAURFANG, 200.0f))
@@ -1320,7 +1320,7 @@ class npc_muradin_bronzebeard_igb : public CreatureScript
                                     _riflemanYellCooldown = GameTime::GetGameTime() + 5;
                                 }
                             }
-                            _events.ScheduleEvent(EVENT_CHECK_RIFLEMAN, 1000);
+                            _events.ScheduleEvent(EVENT_CHECK_RIFLEMAN, 1s);
                             break;
                         case EVENT_CHECK_MORTAR:
                             if (_controller.SummonCreatures(SLOT_MORTAR_1, Is25ManRaid() ? SLOT_MORTAR_4 : SLOT_MORTAR_2))
@@ -1331,11 +1331,11 @@ class npc_muradin_bronzebeard_igb : public CreatureScript
                                     _mortarYellCooldown = GameTime::GetGameTime() + 5;
                                 }
                             }
-                            _events.ScheduleEvent(EVENT_CHECK_MORTAR, 1000);
+                            _events.ScheduleEvent(EVENT_CHECK_MORTAR, 1s);
                             break;
                         case EVENT_CLEAVE:
                             DoCastVictim(SPELL_CLEAVE);
-                            _events.ScheduleEvent(EVENT_CLEAVE, urand(2000, 10000));
+                            _events.ScheduleEvent(EVENT_CLEAVE, 2s, 10s);
                             break;
                         default:
                             break;
@@ -1559,8 +1559,8 @@ class npc_gunship_boarding_leader : public CreatureScript
             void JustEngagedWith(Unit* target) override
             {
                 npc_gunship_boarding_addAI::JustEngagedWith(target);
-                _events.ScheduleEvent(EVENT_BLADESTORM, urand(13000, 18000));
-                _events.ScheduleEvent(EVENT_WOUNDING_STRIKE, urand(8000, 10000));
+                _events.ScheduleEvent(EVENT_BLADESTORM, 13s, 18s);
+                _events.ScheduleEvent(EVENT_WOUNDING_STRIKE, 8s, 10s);
             }
 
             void UpdateAI(uint32 diff) override
@@ -1585,11 +1585,11 @@ class npc_gunship_boarding_leader : public CreatureScript
                     {
                         case EVENT_BLADESTORM:
                             DoCastAOE(SPELL_BLADESTORM);
-                            _events.ScheduleEvent(EVENT_BLADESTORM, urand(25000, 30000));
+                            _events.ScheduleEvent(EVENT_BLADESTORM, 25s, 30s);
                             break;
                         case EVENT_WOUNDING_STRIKE:
                             DoCastVictim(SPELL_WOUNDING_STRIKE);
-                            _events.ScheduleEvent(EVENT_WOUNDING_STRIKE, urand(9000, 13000));
+                            _events.ScheduleEvent(EVENT_WOUNDING_STRIKE, 9s, 13s);
                             break;
                         default:
                             break;
diff --git a/src/server/scripts/Northrend/IcecrownCitadel/boss_lady_deathwhisper.cpp b/src/server/scripts/Northrend/IcecrownCitadel/boss_lady_deathwhisper.cpp
index 6e73bedbcf3..a5086cfef06 100644
--- a/src/server/scripts/Northrend/IcecrownCitadel/boss_lady_deathwhisper.cpp
+++ b/src/server/scripts/Northrend/IcecrownCitadel/boss_lady_deathwhisper.cpp
@@ -884,10 +884,10 @@ class npc_darnavan : public CreatureScript
             void Reset() override
             {
                 _events.Reset();
-                _events.ScheduleEvent(EVENT_DARNAVAN_BLADESTORM, Seconds(10));
-                _events.ScheduleEvent(EVENT_DARNAVAN_INTIMIDATING_SHOUT, Seconds(20), Seconds(25));
-                _events.ScheduleEvent(EVENT_DARNAVAN_MORTAL_STRIKE, Seconds(25), Seconds(30));
-                _events.ScheduleEvent(EVENT_DARNAVAN_SUNDER_ARMOR, Seconds(5), Seconds(8));
+                _events.ScheduleEvent(EVENT_DARNAVAN_BLADESTORM, 10s);
+                _events.ScheduleEvent(EVENT_DARNAVAN_INTIMIDATING_SHOUT, 20s, 25s);
+                _events.ScheduleEvent(EVENT_DARNAVAN_MORTAL_STRIKE, 25s, 30s);
+                _events.ScheduleEvent(EVENT_DARNAVAN_SUNDER_ARMOR, 5s, 8s);
                 Initialize();
             }
 
@@ -939,7 +939,7 @@ class npc_darnavan : public CreatureScript
                 {
                     DoCastVictim(SPELL_SHATTERING_THROW);
                     _canShatter = false;
-                    _events.ScheduleEvent(EVENT_DARNAVAN_SHATTERING_THROW, Seconds(30));
+                    _events.ScheduleEvent(EVENT_DARNAVAN_SHATTERING_THROW, 30s);
                     return;
                 }
 
@@ -947,7 +947,7 @@ class npc_darnavan : public CreatureScript
                 {
                     DoCastVictim(SPELL_CHARGE);
                     _canCharge = false;
-                    _events.ScheduleEvent(EVENT_DARNAVAN_CHARGE, Seconds(20));
+                    _events.ScheduleEvent(EVENT_DARNAVAN_CHARGE, 20s);
                     return;
                 }
 
@@ -957,7 +957,7 @@ class npc_darnavan : public CreatureScript
                     {
                         case EVENT_DARNAVAN_BLADESTORM:
                             DoCast(SPELL_BLADESTORM);
-                            _events.ScheduleEvent(EVENT_DARNAVAN_BLADESTORM, Seconds(90), Seconds(100));
+                            _events.ScheduleEvent(EVENT_DARNAVAN_BLADESTORM, 90s, 100s);
                             break;
                         case EVENT_DARNAVAN_CHARGE:
                             _canCharge = true;
@@ -968,14 +968,14 @@ class npc_darnavan : public CreatureScript
                             break;
                         case EVENT_DARNAVAN_MORTAL_STRIKE:
                             DoCastVictim(SPELL_MORTAL_STRIKE);
-                            _events.ScheduleEvent(EVENT_DARNAVAN_MORTAL_STRIKE, Seconds(15), Seconds(30));
+                            _events.ScheduleEvent(EVENT_DARNAVAN_MORTAL_STRIKE, 15s, 30s);
                             break;
                         case EVENT_DARNAVAN_SHATTERING_THROW:
                             _canShatter = true;
                             break;
                         case EVENT_DARNAVAN_SUNDER_ARMOR:
                             DoCastVictim(SPELL_SUNDER_ARMOR);
-                            _events.ScheduleEvent(EVENT_DARNAVAN_SUNDER_ARMOR, Seconds(3), Seconds(7));
+                            _events.ScheduleEvent(EVENT_DARNAVAN_SUNDER_ARMOR, 3s, 7s);
                             break;
                     }
                 }
diff --git a/src/server/scripts/Northrend/IcecrownCitadel/boss_lord_marrowgar.cpp b/src/server/scripts/Northrend/IcecrownCitadel/boss_lord_marrowgar.cpp
index bb1e60e6d96..cca71d9f4c7 100644
--- a/src/server/scripts/Northrend/IcecrownCitadel/boss_lord_marrowgar.cpp
+++ b/src/server/scripts/Northrend/IcecrownCitadel/boss_lord_marrowgar.cpp
@@ -150,11 +150,11 @@ class boss_lord_marrowgar : public CreatureScript
                 me->SetSpeedRate(MOVE_RUN, _baseSpeed);
                 me->RemoveAurasDueToSpell(SPELL_BONE_STORM);
                 me->RemoveAurasDueToSpell(SPELL_BERSERK);
-                events.ScheduleEvent(EVENT_ENABLE_BONE_SLICE, 10000);
-                events.ScheduleEvent(EVENT_BONE_SPIKE_GRAVEYARD, 15000, EVENT_GROUP_SPECIAL);
-                events.ScheduleEvent(EVENT_COLDFLAME, 5000, EVENT_GROUP_SPECIAL);
-                events.ScheduleEvent(EVENT_WARN_BONE_STORM, urand(45000, 50000));
-                events.ScheduleEvent(EVENT_ENRAGE, 600000);
+                events.ScheduleEvent(EVENT_ENABLE_BONE_SLICE, 10s);
+                events.ScheduleEvent(EVENT_BONE_SPIKE_GRAVEYARD, 15s, EVENT_GROUP_SPECIAL);
+                events.ScheduleEvent(EVENT_COLDFLAME, 5s, EVENT_GROUP_SPECIAL);
+                events.ScheduleEvent(EVENT_WARN_BONE_STORM, 45s, 50s);
+                events.ScheduleEvent(EVENT_ENRAGE, 10min);
                 _boneSlice = false;
                 _boneSpikeImmune.clear();
             }
@@ -205,7 +205,7 @@ class boss_lord_marrowgar : public CreatureScript
                         case EVENT_BONE_SPIKE_GRAVEYARD:
                             if (IsHeroic() || !me->HasAura(SPELL_BONE_STORM))
                                 DoCast(me, SPELL_BONE_SPIKE_GRAVEYARD);
-                            events.ScheduleEvent(EVENT_BONE_SPIKE_GRAVEYARD, urand(15000, 20000), EVENT_GROUP_SPECIAL);
+                            events.ScheduleEvent(EVENT_BONE_SPIKE_GRAVEYARD, 15s, 20s, EVENT_GROUP_SPECIAL);
                             break;
                         case EVENT_COLDFLAME:
                             _coldflameLastPos.Relocate(me);
@@ -214,7 +214,7 @@ class boss_lord_marrowgar : public CreatureScript
                                 DoCastAOE(SPELL_COLDFLAME_NORMAL);
                             else
                                 DoCast(me, SPELL_COLDFLAME_BONE_STORM);
-                            events.ScheduleEvent(EVENT_COLDFLAME, 5000, EVENT_GROUP_SPECIAL);
+                            events.ScheduleEvent(EVENT_COLDFLAME, 5s, EVENT_GROUP_SPECIAL);
                             break;
                         case EVENT_WARN_BONE_STORM:
                             _boneSlice = false;
@@ -223,7 +223,7 @@ class boss_lord_marrowgar : public CreatureScript
                             DoCast(me, SPELL_BONE_STORM);
                             events.DelayEvents(3000, EVENT_GROUP_SPECIAL);
                             events.ScheduleEvent(EVENT_BONE_STORM_BEGIN, 3050);
-                            events.ScheduleEvent(EVENT_WARN_BONE_STORM, urand(90000, 95000));
+                            events.ScheduleEvent(EVENT_WARN_BONE_STORM, 90s, 95s);
                             break;
                         case EVENT_BONE_STORM_BEGIN:
                             if (Aura* pStorm = me->GetAura(SPELL_BONE_STORM))
@@ -256,7 +256,7 @@ class boss_lord_marrowgar : public CreatureScript
                             me->GetMotionMaster()->MoveChase(me->GetVictim());
                             me->SetSpeedRate(MOVE_RUN, _baseSpeed);
                             events.CancelEvent(EVENT_BONE_STORM_MOVE);
-                            events.ScheduleEvent(EVENT_ENABLE_BONE_SLICE, 10000);
+                            events.ScheduleEvent(EVENT_ENABLE_BONE_SLICE, 10s);
                             if (!IsHeroic())
                                 events.RescheduleEvent(EVENT_BONE_SPIKE_GRAVEYARD, 15000, EVENT_GROUP_SPECIAL);
                             break;
@@ -408,7 +408,7 @@ class npc_coldflame : public CreatureScript
 
                 me->NearTeleportTo(pos.GetPositionX(), pos.GetPositionY(), me->GetPositionZ(), me->GetOrientation());
                 DoCast(SPELL_COLDFLAME_SUMMON);
-                _events.ScheduleEvent(EVENT_COLDFLAME_TRIGGER, 500);
+                _events.ScheduleEvent(EVENT_COLDFLAME_TRIGGER, 500ms);
             }
 
             void UpdateAI(uint32 diff) override
@@ -420,7 +420,7 @@ class npc_coldflame : public CreatureScript
                     Position newPos = me->GetNearPosition(5.0f, 0.0f);
                     me->NearTeleportTo(newPos.GetPositionX(), newPos.GetPositionY(), me->GetPositionZ(), me->GetOrientation());
                     DoCast(SPELL_COLDFLAME_SUMMON);
-                    _events.ScheduleEvent(EVENT_COLDFLAME_TRIGGER, 500);
+                    _events.ScheduleEvent(EVENT_COLDFLAME_TRIGGER, 500ms);
                 }
             }
 
@@ -467,7 +467,7 @@ class npc_bone_spike : public CreatureScript
             {
                 DoCast(summoner, SPELL_IMPALED);
                 summoner->CastSpell(me, SPELL_RIDE_VEHICLE, true);
-                _events.ScheduleEvent(EVENT_FAIL_BONED, 8000);
+                _events.ScheduleEvent(EVENT_FAIL_BONED, 8s);
                 _hasTrappedUnit = true;
             }
 
diff --git a/src/server/scripts/Northrend/IcecrownCitadel/boss_professor_putricide.cpp b/src/server/scripts/Northrend/IcecrownCitadel/boss_professor_putricide.cpp
index 6a3c459916a..329c3de9e7b 100644
--- a/src/server/scripts/Northrend/IcecrownCitadel/boss_professor_putricide.cpp
+++ b/src/server/scripts/Northrend/IcecrownCitadel/boss_professor_putricide.cpp
@@ -267,11 +267,11 @@ class boss_professor_putricide : public CreatureScript
 
                 me->setActive(true);
                 events.Reset();
-                events.ScheduleEvent(EVENT_BERSERK, 600000);
-                events.ScheduleEvent(EVENT_SLIME_PUDDLE, 10000);
-                events.ScheduleEvent(EVENT_UNSTABLE_EXPERIMENT, urand(30000, 35000));
+                events.ScheduleEvent(EVENT_BERSERK, 10min);
+                events.ScheduleEvent(EVENT_SLIME_PUDDLE, 10s);
+                events.ScheduleEvent(EVENT_UNSTABLE_EXPERIMENT, 30s, 35s);
                 if (IsHeroic())
-                    events.ScheduleEvent(EVENT_UNBOUND_PLAGUE, 20000);
+                    events.ScheduleEvent(EVENT_UNBOUND_PLAGUE, 20s);
 
                 SetPhase(PHASE_COMBAT_1);
                 Talk(SAY_AGGRO);
@@ -387,7 +387,7 @@ class boss_professor_putricide : public CreatureScript
                         instance->SetBossState(DATA_ROTFACE, IN_PROGRESS);   // needed here for delayed gate close
                         me->SetSpeedRate(MOVE_RUN, _baseSpeed);
                         DoAction(ACTION_ROTFACE_OOZE);
-                        events.ScheduleEvent(EVENT_ROTFACE_OOZE_FLOOD, 25000, 0, PHASE_ROTFACE);
+                        events.ScheduleEvent(EVENT_ROTFACE_OOZE_FLOOD, 25s, 0, PHASE_ROTFACE);
                         break;
                     case POINT_TABLE:
                         // stop attack
@@ -439,7 +439,7 @@ class boss_professor_putricide : public CreatureScript
                         DoCast(me, SPELL_RELEASE_GAS_VISUAL, true);
                         break;
                     case ACTION_FESTERGUT_DEATH:
-                        events.ScheduleEvent(EVENT_FESTERGUT_DIES, 4000, 0, PHASE_FESTERGUT);
+                        events.ScheduleEvent(EVENT_FESTERGUT_DIES, 4s, 0, PHASE_FESTERGUT);
                         break;
                     case ACTION_ROTFACE_COMBAT:
                     {
@@ -483,7 +483,7 @@ class boss_professor_putricide : public CreatureScript
                             _oozeFloodStage = 0;
                         break;
                     case ACTION_ROTFACE_DEATH:
-                        events.ScheduleEvent(EVENT_ROTFACE_DIES, 4500, 0, PHASE_ROTFACE);
+                        events.ScheduleEvent(EVENT_ROTFACE_DIES, 4500ms, 0, PHASE_ROTFACE);
                         break;
                     case ACTION_CHANGE_PHASE:
                         me->SetSpeedRate(MOVE_RUN, _baseSpeed*2.0f);
@@ -492,7 +492,7 @@ class boss_professor_putricide : public CreatureScript
                         if (!IsHeroic())
                         {
                             DoCast(me, SPELL_TEAR_GAS);
-                            events.ScheduleEvent(EVENT_TEAR_GAS, 2500);
+                            events.ScheduleEvent(EVENT_TEAR_GAS, 2500ms);
                         }
                         else
                         {
@@ -528,12 +528,12 @@ class boss_professor_putricide : public CreatureScript
                         {
                             case PHASE_COMBAT_1:
                                 SetPhase(PHASE_COMBAT_2);
-                                events.ScheduleEvent(EVENT_MALLEABLE_GOO, urand(21000, 26000));
-                                events.ScheduleEvent(EVENT_CHOKING_GAS_BOMB, urand(35000, 40000));
+                                events.ScheduleEvent(EVENT_MALLEABLE_GOO, 21s, 26s);
+                                events.ScheduleEvent(EVENT_CHOKING_GAS_BOMB, 35s, 40s);
                                 break;
                             case PHASE_COMBAT_2:
                                 SetPhase(PHASE_COMBAT_3);
-                                events.ScheduleEvent(EVENT_MUTATED_PLAGUE, 25000);
+                                events.ScheduleEvent(EVENT_MUTATED_PLAGUE, 25s);
                                 events.CancelEvent(EVENT_UNSTABLE_EXPERIMENT);
                                 break;
                             default:
@@ -596,7 +596,7 @@ class boss_professor_putricide : public CreatureScript
                             break;
                         case EVENT_ROTFACE_OOZE_FLOOD:
                             DoAction(ACTION_ROTFACE_OOZE);
-                            events.ScheduleEvent(EVENT_ROTFACE_OOZE_FLOOD, 25000, 0, PHASE_ROTFACE);
+                            events.ScheduleEvent(EVENT_ROTFACE_OOZE_FLOOD, 25s, 0, PHASE_ROTFACE);
                             break;
                         case EVENT_BERSERK:
                             Talk(SAY_BERSERK);
@@ -609,13 +609,13 @@ class boss_professor_putricide : public CreatureScript
                             if (!targets.empty())
                                 for (std::list<Unit*>::iterator itr = targets.begin(); itr != targets.end(); ++itr)
                                     DoCast(*itr, SPELL_SLIME_PUDDLE_TRIGGER);
-                            events.ScheduleEvent(EVENT_SLIME_PUDDLE, 35000);
+                            events.ScheduleEvent(EVENT_SLIME_PUDDLE, 35s);
                             break;
                         }
                         case EVENT_UNSTABLE_EXPERIMENT:
                             Talk(EMOTE_UNSTABLE_EXPERIMENT);
                             DoCast(me, SPELL_UNSTABLE_EXPERIMENT);
-                            events.ScheduleEvent(EVENT_UNSTABLE_EXPERIMENT, urand(35000, 40000));
+                            events.ScheduleEvent(EVENT_UNSTABLE_EXPERIMENT, 35s, 40s);
                             break;
                         case EVENT_TEAR_GAS:
                             me->GetMotionMaster()->MovePoint(POINT_TABLE, tablePos);
@@ -651,12 +651,12 @@ class boss_professor_putricide : public CreatureScript
                                     DoCast(target, SPELL_MALLEABLE_GOO);
                                 }
                             }
-                            events.ScheduleEvent(EVENT_MALLEABLE_GOO, urand(25000, 30000));
+                            events.ScheduleEvent(EVENT_MALLEABLE_GOO, 25s, 30s);
                             break;
                         case EVENT_CHOKING_GAS_BOMB:
                             Talk(EMOTE_CHOKING_GAS_BOMB);
                             DoCast(me, SPELL_CHOKING_GAS_BOMB);
-                            events.ScheduleEvent(EVENT_CHOKING_GAS_BOMB, urand(35000, 40000));
+                            events.ScheduleEvent(EVENT_CHOKING_GAS_BOMB, 35s, 40s);
                             break;
                         case EVENT_UNBOUND_PLAGUE:
                             if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0, NonTankTargetSelector(me)))
@@ -664,11 +664,11 @@ class boss_professor_putricide : public CreatureScript
                                 DoCast(target, SPELL_UNBOUND_PLAGUE);
                                 DoCast(target, SPELL_UNBOUND_PLAGUE_SEARCHER);
                             }
-                            events.ScheduleEvent(EVENT_UNBOUND_PLAGUE, 90000);
+                            events.ScheduleEvent(EVENT_UNBOUND_PLAGUE, 90s);
                             break;
                         case EVENT_MUTATED_PLAGUE:
                             DoCastVictim(SPELL_MUTATED_PLAGUE);
-                            events.ScheduleEvent(EVENT_MUTATED_PLAGUE, 10000);
+                            events.ScheduleEvent(EVENT_MUTATED_PLAGUE, 10s);
                             break;
                         case EVENT_PHASE_TRANSITION:
                         {
diff --git a/src/server/scripts/Northrend/IcecrownCitadel/boss_rotface.cpp b/src/server/scripts/Northrend/IcecrownCitadel/boss_rotface.cpp
index 02f7358c791..a6903a2bc7c 100644
--- a/src/server/scripts/Northrend/IcecrownCitadel/boss_rotface.cpp
+++ b/src/server/scripts/Northrend/IcecrownCitadel/boss_rotface.cpp
@@ -116,11 +116,11 @@ class boss_rotface : public CreatureScript
             void Reset() override
             {
                 _Reset();
-                events.ScheduleEvent(EVENT_SLIME_SPRAY, 20000);
-                events.ScheduleEvent(EVENT_HASTEN_INFECTIONS, 90000);
-                events.ScheduleEvent(EVENT_MUTATED_INFECTION, 14000);
+                events.ScheduleEvent(EVENT_SLIME_SPRAY, 20s);
+                events.ScheduleEvent(EVENT_HASTEN_INFECTIONS, 90s);
+                events.ScheduleEvent(EVENT_MUTATED_INFECTION, 14s);
                 if (IsHeroic())
-                    events.ScheduleEvent(EVENT_VILE_GAS, urand(22000, 27000));
+                    events.ScheduleEvent(EVENT_VILE_GAS, 22s, 27s);
 
                 infectionStage = 0;
                 infectionCooldown = 14000;
@@ -209,13 +209,13 @@ class boss_rotface : public CreatureScript
                                 Talk(EMOTE_SLIME_SPRAY);
                                 DoCast(me, SPELL_SLIME_SPRAY);
                             }
-                            events.ScheduleEvent(EVENT_SLIME_SPRAY, 20000);
+                            events.ScheduleEvent(EVENT_SLIME_SPRAY, 20s);
                             break;
                         case EVENT_HASTEN_INFECTIONS:
                             if (infectionStage++ < 4)
                             {
                                 infectionCooldown -= 2000;
-                                events.ScheduleEvent(EVENT_HASTEN_INFECTIONS, 90000);
+                                events.ScheduleEvent(EVENT_HASTEN_INFECTIONS, 90s);
                             }
                             break;
                         case EVENT_MUTATED_INFECTION:
@@ -224,7 +224,7 @@ class boss_rotface : public CreatureScript
                             break;
                         case EVENT_VILE_GAS:
                             DoCastAOE(SPELL_VILE_GAS_TRIGGER);
-                            events.ScheduleEvent(EVENT_VILE_GAS, urand(30000, 35000));
+                            events.ScheduleEvent(EVENT_VILE_GAS, 30s, 35s);
                             break;
                         default:
                             break;
@@ -264,7 +264,7 @@ class npc_little_ooze : public CreatureScript
                 DoCast(me, SPELL_LITTLE_OOZE_COMBINE, true);
                 DoCast(me, SPELL_WEAK_RADIATING_OOZE, true);
                 DoCast(me, SPELL_GREEN_ABOMINATION_HITTIN__YA_PROC, true);
-                events.ScheduleEvent(EVENT_STICKY_OOZE, 5000);
+                events.ScheduleEvent(EVENT_STICKY_OOZE, 5s);
                 AddThreat(summoner, 500000.0f);
             }
 
@@ -283,7 +283,7 @@ class npc_little_ooze : public CreatureScript
                 if (events.ExecuteEvent() == EVENT_STICKY_OOZE)
                 {
                     DoCastVictim(SPELL_STICKY_OOZE);
-                    events.ScheduleEvent(EVENT_STICKY_OOZE, 15000);
+                    events.ScheduleEvent(EVENT_STICKY_OOZE, 15s);
                 }
 
                 DoMeleeAttackIfReady();
@@ -317,7 +317,7 @@ class npc_big_ooze : public CreatureScript
                 DoCast(me, SPELL_RADIATING_OOZE, true);
                 DoCast(me, SPELL_UNSTABLE_OOZE, true);
                 DoCast(me, SPELL_GREEN_ABOMINATION_HITTIN__YA_PROC, true);
-                events.ScheduleEvent(EVENT_STICKY_OOZE, 5000);
+                events.ScheduleEvent(EVENT_STICKY_OOZE, 5s);
                 // register in Rotface's summons - not summoned with Rotface as owner
                 if (Creature* rotface = ObjectAccessor::GetCreature(*me, instance->GetGuidData(DATA_ROTFACE)))
                     rotface->AI()->JustSummoned(me);
@@ -349,7 +349,7 @@ class npc_big_ooze : public CreatureScript
                     {
                         case EVENT_STICKY_OOZE:
                             DoCastVictim(SPELL_STICKY_OOZE);
-                            events.ScheduleEvent(EVENT_STICKY_OOZE, 15000);
+                            events.ScheduleEvent(EVENT_STICKY_OOZE, 15s);
                         default:
                             break;
                     }
@@ -385,9 +385,9 @@ class npc_precious_icc : public CreatureScript
             void Reset() override
             {
                 _events.Reset();
-                _events.ScheduleEvent(EVENT_DECIMATE, urand(20000, 25000));
-                _events.ScheduleEvent(EVENT_MORTAL_WOUND, urand(3000, 7000));
-                _events.ScheduleEvent(EVENT_SUMMON_ZOMBIES, urand(20000, 22000));
+                _events.ScheduleEvent(EVENT_DECIMATE, 20s, 25s);
+                _events.ScheduleEvent(EVENT_MORTAL_WOUND, 3s, 7s);
+                _events.ScheduleEvent(EVENT_SUMMON_ZOMBIES, 20s, 22s);
                 _summons.DespawnAll();
             }
 
@@ -427,7 +427,7 @@ class npc_precious_icc : public CreatureScript
                     {
                         case EVENT_DECIMATE:
                             DoCastVictim(SPELL_DECIMATE);
-                            _events.ScheduleEvent(EVENT_DECIMATE, urand(20000, 25000));
+                            _events.ScheduleEvent(EVENT_DECIMATE, 20s, 25s);
                             break;
                         case EVENT_MORTAL_WOUND:
                             DoCastVictim(SPELL_MORTAL_WOUND);
@@ -437,7 +437,7 @@ class npc_precious_icc : public CreatureScript
                             Talk(EMOTE_PRECIOUS_ZOMBIES);
                             for (uint32 i = 0; i < 11; ++i)
                                 DoCast(me, SPELL_AWAKEN_PLAGUED_ZOMBIES, false);
-                            _events.ScheduleEvent(EVENT_SUMMON_ZOMBIES, urand(20000, 22000));
+                            _events.ScheduleEvent(EVENT_SUMMON_ZOMBIES, 20s, 22s);
                             break;
                         default:
                             break;
diff --git a/src/server/scripts/Northrend/IcecrownCitadel/boss_sindragosa.cpp b/src/server/scripts/Northrend/IcecrownCitadel/boss_sindragosa.cpp
index 2d190659d1d..d817c4d5707 100644
--- a/src/server/scripts/Northrend/IcecrownCitadel/boss_sindragosa.cpp
+++ b/src/server/scripts/Northrend/IcecrownCitadel/boss_sindragosa.cpp
@@ -242,13 +242,13 @@ class boss_sindragosa : public CreatureScript
             {
                 BossAI::Reset();
                 DoCast(me, SPELL_TANK_MARKER, true);
-                events.ScheduleEvent(EVENT_BERSERK, 600000);
-                events.ScheduleEvent(EVENT_CLEAVE, 10000, EVENT_GROUP_LAND_PHASE);
-                events.ScheduleEvent(EVENT_TAIL_SMASH, 20000, EVENT_GROUP_LAND_PHASE);
-                events.ScheduleEvent(EVENT_FROST_BREATH, urand(8000, 12000), EVENT_GROUP_LAND_PHASE);
-                events.ScheduleEvent(EVENT_UNCHAINED_MAGIC, urand(9000, 14000), EVENT_GROUP_LAND_PHASE);
+                events.ScheduleEvent(EVENT_BERSERK, 10min);
+                events.ScheduleEvent(EVENT_CLEAVE, 10s, EVENT_GROUP_LAND_PHASE);
+                events.ScheduleEvent(EVENT_TAIL_SMASH, 20s, EVENT_GROUP_LAND_PHASE);
+                events.ScheduleEvent(EVENT_FROST_BREATH, 8s, 12s, EVENT_GROUP_LAND_PHASE);
+                events.ScheduleEvent(EVENT_UNCHAINED_MAGIC, 9s, 14s, EVENT_GROUP_LAND_PHASE);
                 events.ScheduleEvent(EVENT_ICY_GRIP, 33500, EVENT_GROUP_LAND_PHASE);
-                events.ScheduleEvent(EVENT_AIR_PHASE, 50000);
+                events.ScheduleEvent(EVENT_AIR_PHASE, 50s);
                 Initialize();
 
                 if (instance->GetData(DATA_SINDRAGOSA_INTRO))
@@ -377,12 +377,12 @@ class boss_sindragosa : public CreatureScript
                         me->CastSpell(nullptr, SPELL_ICE_TOMB_TARGET, args);
                         me->SetFacingTo(float(M_PI), true);
                         events.ScheduleEvent(EVENT_AIR_MOVEMENT_FAR, 1);
-                        events.ScheduleEvent(EVENT_FROST_BOMB, 9000);
+                        events.ScheduleEvent(EVENT_FROST_BOMB, 9s);
                         break;
                     }
                     case POINT_AIR_PHASE_FAR:
                         me->SetFacingTo(float(M_PI), true);
-                        events.ScheduleEvent(EVENT_LAND, 30000);
+                        events.ScheduleEvent(EVENT_LAND, 30s);
                         break;
                     case POINT_LAND:
                         events.ScheduleEvent(EVENT_LAND_GROUND, 1);
@@ -410,7 +410,7 @@ class boss_sindragosa : public CreatureScript
                 if (!_isThirdPhase && !HealthAbovePct(35))
                 {
                     events.CancelEvent(EVENT_AIR_PHASE);
-                    events.ScheduleEvent(EVENT_THIRD_PHASE_CHECK, 1000);
+                    events.ScheduleEvent(EVENT_THIRD_PHASE_CHECK, 1s);
                     _isThirdPhase = true;
                 }
             }
@@ -462,29 +462,29 @@ class boss_sindragosa : public CreatureScript
                             break;
                         case EVENT_CLEAVE:
                             DoCastVictim(SPELL_CLEAVE);
-                            events.ScheduleEvent(EVENT_CLEAVE, urand(15000, 20000), EVENT_GROUP_LAND_PHASE);
+                            events.ScheduleEvent(EVENT_CLEAVE, 15s, 20s, EVENT_GROUP_LAND_PHASE);
                             break;
                         case EVENT_TAIL_SMASH:
                             DoCast(me, SPELL_TAIL_SMASH);
-                            events.ScheduleEvent(EVENT_TAIL_SMASH, urand(27000, 32000), EVENT_GROUP_LAND_PHASE);
+                            events.ScheduleEvent(EVENT_TAIL_SMASH, 27s, 32s, EVENT_GROUP_LAND_PHASE);
                             break;
                         case EVENT_FROST_BREATH:
                             DoCastVictim(_isThirdPhase ? SPELL_FROST_BREATH_P2 : SPELL_FROST_BREATH_P1);
-                            events.ScheduleEvent(EVENT_FROST_BREATH, urand(20000, 25000), EVENT_GROUP_LAND_PHASE);
+                            events.ScheduleEvent(EVENT_FROST_BREATH, 20s, 25s, EVENT_GROUP_LAND_PHASE);
                             break;
                         case EVENT_UNCHAINED_MAGIC:
                             Talk(SAY_UNCHAINED_MAGIC);
                             DoCast(me, SPELL_UNCHAINED_MAGIC);
-                            events.ScheduleEvent(EVENT_UNCHAINED_MAGIC, urand(30000, 35000), EVENT_GROUP_LAND_PHASE);
+                            events.ScheduleEvent(EVENT_UNCHAINED_MAGIC, 30s, 35s, EVENT_GROUP_LAND_PHASE);
                             break;
                         case EVENT_ICY_GRIP:
                             DoCast(me, SPELL_ICY_GRIP);
-                            events.ScheduleEvent(EVENT_BLISTERING_COLD, 1000, EVENT_GROUP_LAND_PHASE);
+                            events.ScheduleEvent(EVENT_BLISTERING_COLD, 1s, EVENT_GROUP_LAND_PHASE);
                             break;
                         case EVENT_BLISTERING_COLD:
                             Talk(EMOTE_WARN_BLISTERING_COLD);
                             DoCast(me, SPELL_BLISTERING_COLD);
-                            events.ScheduleEvent(EVENT_BLISTERING_COLD_YELL, 5000, EVENT_GROUP_LAND_PHASE);
+                            events.ScheduleEvent(EVENT_BLISTERING_COLD_YELL, 5s, EVENT_GROUP_LAND_PHASE);
                             break;
                         case EVENT_BLISTERING_COLD_YELL:
                             Talk(SAY_BLISTERING_COLD);
@@ -517,7 +517,7 @@ class boss_sindragosa : public CreatureScript
                             CastSpellExtraArgs args(TRIGGERED_FULL_MASK);
                             args.AddSpellMod(SPELLVALUE_MAX_TARGETS, 1);
                             me->CastSpell(nullptr, SPELL_ICE_TOMB_TARGET, args);
-                            events.ScheduleEvent(EVENT_ICE_TOMB, urand(16000, 23000));
+                            events.ScheduleEvent(EVENT_ICE_TOMB, 16s, 23s);
                             break;
                         }
                         case EVENT_FROST_BOMB:
@@ -528,7 +528,7 @@ class boss_sindragosa : public CreatureScript
                             destZ = 205.0f; // random number close to ground, get exact in next call
                             me->UpdateGroundPositionZ(destX, destY, destZ);
                             me->CastSpell({ destX, destY, destZ }, SPELL_FROST_BOMB_TRIGGER, false);
-                            events.ScheduleEvent(EVENT_FROST_BOMB, urand(6000, 8000));
+                            events.ScheduleEvent(EVENT_FROST_BOMB, 6s, 8s);
                             break;
                         }
                         case EVENT_LAND:
@@ -538,11 +538,11 @@ class boss_sindragosa : public CreatureScript
                             break;
                         }
                         case EVENT_LAND_GROUND:
-                            events.ScheduleEvent(EVENT_CLEAVE, urand(13000, 15000), EVENT_GROUP_LAND_PHASE);
-                            events.ScheduleEvent(EVENT_TAIL_SMASH, urand(19000, 23000), EVENT_GROUP_LAND_PHASE);
-                            events.ScheduleEvent(EVENT_FROST_BREATH, urand(10000, 15000), EVENT_GROUP_LAND_PHASE);
-                            events.ScheduleEvent(EVENT_UNCHAINED_MAGIC, urand(12000, 17000), EVENT_GROUP_LAND_PHASE);
-                            events.ScheduleEvent(EVENT_ICY_GRIP, urand(35000, 40000), EVENT_GROUP_LAND_PHASE);
+                            events.ScheduleEvent(EVENT_CLEAVE, 13s, 15s, EVENT_GROUP_LAND_PHASE);
+                            events.ScheduleEvent(EVENT_TAIL_SMASH, 19s, 23s, EVENT_GROUP_LAND_PHASE);
+                            events.ScheduleEvent(EVENT_FROST_BREATH, 10s, 15s, EVENT_GROUP_LAND_PHASE);
+                            events.ScheduleEvent(EVENT_UNCHAINED_MAGIC, 12s, 17s, EVENT_GROUP_LAND_PHASE);
+                            events.ScheduleEvent(EVENT_ICY_GRIP, 35s, 40s, EVENT_GROUP_LAND_PHASE);
                             me->GetMotionMaster()->MoveLand(POINT_LAND_GROUND, SindragosaLandPos);
                             break;
                         case EVENT_THIRD_PHASE_CHECK:
@@ -550,12 +550,12 @@ class boss_sindragosa : public CreatureScript
                             if (!_isInAirPhase)
                             {
                                 Talk(SAY_PHASE_2);
-                                events.ScheduleEvent(EVENT_ICE_TOMB, urand(7000, 10000));
-                                events.RescheduleEvent(EVENT_ICY_GRIP, urand(35000, 40000));
+                                events.ScheduleEvent(EVENT_ICE_TOMB, 7s, 10s);
+                                events.RescheduleEvent(EVENT_ICY_GRIP, 35s, 40s);
                                 DoCast(me, SPELL_MYSTIC_BUFFET, true);
                             }
                             else
-                                events.ScheduleEvent(EVENT_THIRD_PHASE_CHECK, 5000);
+                                events.ScheduleEvent(EVENT_THIRD_PHASE_CHECK, 5s);
                             break;
                         }
                         default:
@@ -684,9 +684,9 @@ class npc_spinestalker : public CreatureScript
             void Reset() override
             {
                 _events.Reset();
-                _events.ScheduleEvent(EVENT_BELLOWING_ROAR, urand(20000, 25000));
-                _events.ScheduleEvent(EVENT_CLEAVE_SPINESTALKER, urand(10000, 15000));
-                _events.ScheduleEvent(EVENT_TAIL_SWEEP, urand(8000, 12000));
+                _events.ScheduleEvent(EVENT_BELLOWING_ROAR, 20s, 25s);
+                _events.ScheduleEvent(EVENT_CLEAVE_SPINESTALKER, 10s, 15s);
+                _events.ScheduleEvent(EVENT_TAIL_SWEEP, 8s, 12s);
 
                 if (!_summoned)
                 {
@@ -763,15 +763,15 @@ class npc_spinestalker : public CreatureScript
                     {
                         case EVENT_BELLOWING_ROAR:
                             DoCast(me, SPELL_BELLOWING_ROAR);
-                            _events.ScheduleEvent(EVENT_BELLOWING_ROAR, urand(25000, 30000));
+                            _events.ScheduleEvent(EVENT_BELLOWING_ROAR, 25s, 30s);
                             break;
                         case EVENT_CLEAVE_SPINESTALKER:
                             DoCastVictim(SPELL_CLEAVE_SPINESTALKER);
-                            _events.ScheduleEvent(EVENT_CLEAVE_SPINESTALKER, urand(10000, 15000));
+                            _events.ScheduleEvent(EVENT_CLEAVE_SPINESTALKER, 10s, 15s);
                             break;
                         case EVENT_TAIL_SWEEP:
                             DoCast(me, SPELL_TAIL_SWEEP);
-                            _events.ScheduleEvent(EVENT_TAIL_SWEEP, urand(22000, 25000));
+                            _events.ScheduleEvent(EVENT_TAIL_SWEEP, 22s, 25s);
                             break;
                         default:
                             break;
@@ -823,8 +823,8 @@ class npc_rimefang : public CreatureScript
             void Reset() override
             {
                 _events.Reset();
-                _events.ScheduleEvent(EVENT_FROST_BREATH_RIMEFANG, urand(12000, 15000));
-                _events.ScheduleEvent(EVENT_ICY_BLAST, urand(30000, 35000));
+                _events.ScheduleEvent(EVENT_FROST_BREATH_RIMEFANG, 12s, 15s);
+                _events.ScheduleEvent(EVENT_ICY_BLAST, 30s, 35s);
                 Initialize();
 
                 if (!_summoned)
@@ -907,7 +907,7 @@ class npc_rimefang : public CreatureScript
                     {
                         case EVENT_FROST_BREATH_RIMEFANG:
                             DoCast(me, SPELL_FROST_BREATH);
-                            _events.ScheduleEvent(EVENT_FROST_BREATH_RIMEFANG, urand(35000, 40000));
+                            _events.ScheduleEvent(EVENT_FROST_BREATH_RIMEFANG, 35s, 40s);
                             break;
                         case EVENT_ICY_BLAST:
                         {
@@ -929,7 +929,7 @@ class npc_rimefang : public CreatureScript
                                     me->SetFacingToObject(target);
                                     DoCast(target, SPELL_ICY_BLAST);
                                 }
-                                _events.ScheduleEvent(EVENT_ICY_BLAST_CAST, 3000);
+                                _events.ScheduleEvent(EVENT_ICY_BLAST_CAST, 3s);
                             }
                             else if (Unit* victim = me->SelectVictim())
                             {
@@ -995,8 +995,8 @@ class npc_sindragosa_trash : public CreatureScript
                 // This is shared AI for handler and whelps
                 if (me->GetEntry() == NPC_FROSTWARDEN_HANDLER)
                 {
-                    _events.ScheduleEvent(EVENT_FROSTWARDEN_ORDER_WHELP, 3000);
-                    _events.ScheduleEvent(EVENT_CONCUSSIVE_SHOCK, urand(8000, 10000));
+                    _events.ScheduleEvent(EVENT_FROSTWARDEN_ORDER_WHELP, 3s);
+                    _events.ScheduleEvent(EVENT_CONCUSSIVE_SHOCK, 8s, 10s);
                 }
 
                 Initialize();
@@ -1042,11 +1042,11 @@ class npc_sindragosa_trash : public CreatureScript
                     {
                         case EVENT_FROSTWARDEN_ORDER_WHELP:
                             DoCast(me, SPELL_ORDER_WHELP);
-                            _events.ScheduleEvent(EVENT_FROSTWARDEN_ORDER_WHELP, 3000);
+                            _events.ScheduleEvent(EVENT_FROSTWARDEN_ORDER_WHELP, 3s);
                             break;
                         case EVENT_CONCUSSIVE_SHOCK:
                             DoCast(me, SPELL_CONCUSSIVE_SHOCK);
-                            _events.ScheduleEvent(EVENT_CONCUSSIVE_SHOCK, urand(10000, 13000));
+                            _events.ScheduleEvent(EVENT_CONCUSSIVE_SHOCK, 10s, 13s);
                             break;
                         default:
                             break;
diff --git a/src/server/scripts/Northrend/IcecrownCitadel/boss_the_lich_king.cpp b/src/server/scripts/Northrend/IcecrownCitadel/boss_the_lich_king.cpp
index 8d56c9cfb18..679a3c18316 100644
--- a/src/server/scripts/Northrend/IcecrownCitadel/boss_the_lich_king.cpp
+++ b/src/server/scripts/Northrend/IcecrownCitadel/boss_the_lich_king.cpp
@@ -575,11 +575,11 @@ class boss_the_lich_king : public CreatureScript
                 DoZoneInCombat();
 
                 events.SetPhase(PHASE_ONE);
-                events.ScheduleEvent(EVENT_SUMMON_SHAMBLING_HORROR, 20000, 0, PHASE_ONE);
-                events.ScheduleEvent(EVENT_SUMMON_DRUDGE_GHOUL, 10000, 0, PHASE_ONE);
-                events.ScheduleEvent(EVENT_INFEST, 5000, 0, PHASE_ONE);
-                events.ScheduleEvent(EVENT_NECROTIC_PLAGUE, urand(30000, 33000), 0, PHASE_ONE);
-                events.ScheduleEvent(EVENT_BERSERK, 900000, EVENT_GROUP_BERSERK);
+                events.ScheduleEvent(EVENT_SUMMON_SHAMBLING_HORROR, 20s, 0, PHASE_ONE);
+                events.ScheduleEvent(EVENT_SUMMON_DRUDGE_GHOUL, 10s, 0, PHASE_ONE);
+                events.ScheduleEvent(EVENT_INFEST, 5s, 0, PHASE_ONE);
+                events.ScheduleEvent(EVENT_NECROTIC_PLAGUE, 30s, 33s, 0, PHASE_ONE);
+                events.ScheduleEvent(EVENT_BERSERK, 15min, EVENT_GROUP_BERSERK);
                 if (IsHeroic())
                     events.ScheduleEvent(EVENT_SHADOW_TRAP, 15500, 0, PHASE_ONE);
             }
@@ -620,7 +620,7 @@ class boss_the_lich_king : public CreatureScript
                         events.ScheduleEvent(EVENT_INTRO_MOVE_1, 4000);
                         break;
                     case ACTION_START_ATTACK:
-                        events.ScheduleEvent(EVENT_START_ATTACK, 5000);
+                        events.ScheduleEvent(EVENT_START_ATTACK, 5s);
                         break;
                     case ACTION_PLAY_MUSIC:
                         me->GetMap()->SetZoneMusic(AREA_ICECROWN_CITADEL, MUSIC_FINAL);
@@ -715,7 +715,7 @@ class boss_the_lich_king : public CreatureScript
                     me->CastSpell(nullptr, SPELL_FURY_OF_FROSTMOURNE, TRIGGERED_NONE);
                     me->SetWalk(true);
                     events.ScheduleEvent(EVENT_OUTRO_TALK_1, 2600, 0, PHASE_OUTRO);
-                    events.ScheduleEvent(EVENT_OUTRO_EMOTE_TALK, 6600, 0, PHASE_OUTRO);
+                    events.ScheduleEvent(EVENT_OUTRO_EMOTE_TALK, 6600ms, 0, PHASE_OUTRO);
                     events.ScheduleEvent(EVENT_OUTRO_EMOTE_TALK, 17600, 0, PHASE_OUTRO);
                     events.ScheduleEvent(EVENT_OUTRO_EMOTE_TALK, 27600, 0, PHASE_OUTRO);
                     events.ScheduleEvent(EVENT_OUTRO_TALK_2, 34600, 0, PHASE_OUTRO);
@@ -764,7 +764,7 @@ class boss_the_lich_king : public CreatureScript
                         me->GetMap()->SetZoneOverrideLight(AREA_ICECROWN_CITADEL, LIGHT_SOULSTORM, 10000);
                         me->GetMap()->SetZoneWeather(AREA_ICECROWN_CITADEL, WEATHER_STATE_BLACKSNOW, 0.5f);
 
-                        events.ScheduleEvent(EVENT_OUTRO_SOUL_BARRAGE, 5000, 0, PHASE_OUTRO);
+                        events.ScheduleEvent(EVENT_OUTRO_SOUL_BARRAGE, 5s, 0, PHASE_OUTRO);
                         return;
                     }
                     case NPC_VILE_SPIRIT:
@@ -847,13 +847,13 @@ class boss_the_lich_king : public CreatureScript
                         me->GetMap()->SetZoneMusic(AREA_ICECROWN_CITADEL, MUSIC_SPECIAL);
                         DoCast(me, SPELL_REMORSELESS_WINTER_1);
                         events.ScheduleEvent(EVENT_QUAKE, 62500, 0, PHASE_TRANSITION);
-                        events.ScheduleEvent(EVENT_PAIN_AND_SUFFERING, 4000, 0, PHASE_TRANSITION);
-                        events.ScheduleEvent(EVENT_SUMMON_ICE_SPHERE, 8000, 0, PHASE_TRANSITION);
-                        events.ScheduleEvent(EVENT_SUMMON_RAGING_SPIRIT, 6000, 0, PHASE_TRANSITION);
-                        events.ScheduleEvent(EVENT_SUMMON_VALKYR, 78000, 0, PHASE_TWO);
-                        events.ScheduleEvent(EVENT_INFEST, 70000, 0, PHASE_TWO);
-                        events.ScheduleEvent(EVENT_DEFILE, 97000, 0, PHASE_TWO);
-                        events.ScheduleEvent(EVENT_SOUL_REAPER, 94000, 0, PHASE_TWO);
+                        events.ScheduleEvent(EVENT_PAIN_AND_SUFFERING, 4s, 0, PHASE_TRANSITION);
+                        events.ScheduleEvent(EVENT_SUMMON_ICE_SPHERE, 8s, 0, PHASE_TRANSITION);
+                        events.ScheduleEvent(EVENT_SUMMON_RAGING_SPIRIT, 6s, 0, PHASE_TRANSITION);
+                        events.ScheduleEvent(EVENT_SUMMON_VALKYR, 78s, 0, PHASE_TWO);
+                        events.ScheduleEvent(EVENT_INFEST, 70s, 0, PHASE_TWO);
+                        events.ScheduleEvent(EVENT_DEFILE, 97s, 0, PHASE_TWO);
+                        events.ScheduleEvent(EVENT_SOUL_REAPER, 94s, 0, PHASE_TWO);
                         break;
                     case POINT_CENTER_2:
                         me->SetFacingTo(0.0f);
@@ -862,8 +862,8 @@ class boss_the_lich_king : public CreatureScript
                         DoCast(me, SPELL_REMORSELESS_WINTER_2);
                         summons.DespawnEntry(NPC_VALKYR_SHADOWGUARD);
                         events.ScheduleEvent(EVENT_QUAKE_2, 62500, 0, PHASE_TRANSITION);
-                        events.ScheduleEvent(EVENT_PAIN_AND_SUFFERING, 6000, 0, PHASE_TRANSITION);
-                        events.ScheduleEvent(EVENT_SUMMON_ICE_SPHERE, 8000, 0, PHASE_TRANSITION);
+                        events.ScheduleEvent(EVENT_PAIN_AND_SUFFERING, 6s, 0, PHASE_TRANSITION);
+                        events.ScheduleEvent(EVENT_SUMMON_ICE_SPHERE, 8s, 0, PHASE_TRANSITION);
                         events.ScheduleEvent(EVENT_SUMMON_RAGING_SPIRIT_2, 5000, 0, PHASE_TRANSITION);
                         events.ScheduleEvent(EVENT_DEFILE, 95500, 0, PHASE_THREE);
                         events.ScheduleEvent(EVENT_SOUL_REAPER, 99500, 0, PHASE_THREE);
@@ -872,7 +872,7 @@ class boss_the_lich_king : public CreatureScript
                         break;
                     case POINT_LK_OUTRO_1:
                         events.ScheduleEvent(EVENT_OUTRO_TALK_4, 1, 0, PHASE_OUTRO);
-                        events.ScheduleEvent(EVENT_OUTRO_RAISE_DEAD, 1000, 0, PHASE_OUTRO);
+                        events.ScheduleEvent(EVENT_OUTRO_RAISE_DEAD, 1s, 0, PHASE_OUTRO);
                         events.ScheduleEvent(EVENT_OUTRO_TALK_5, 29000, 0, PHASE_OUTRO);
                         break;
                     case POINT_LK_OUTRO_2:
@@ -919,10 +919,10 @@ class boss_the_lich_king : public CreatureScript
                             Talk(SAY_LK_INTRO_2);
                             // for some reason blizz sends 2 emotes in row here so (we handle one in Talk)
                             me->HandleEmoteCommand(EMOTE_ONESHOT_TALK_NO_SHEATHE);
-                            events.ScheduleEvent(EVENT_EMOTE_CAST_SHOUT, 7000, 0, PHASE_INTRO);
+                            events.ScheduleEvent(EVENT_EMOTE_CAST_SHOUT, 7s, 0, PHASE_INTRO);
                             events.ScheduleEvent(EVENT_INTRO_EMOTE_1, 13000, 0, PHASE_INTRO);
-                            events.ScheduleEvent(EVENT_EMOTE_CAST_SHOUT, 18000, 0, PHASE_INTRO);
-                            events.ScheduleEvent(EVENT_INTRO_CAST_FREEZE, 31000, 0, PHASE_INTRO);
+                            events.ScheduleEvent(EVENT_EMOTE_CAST_SHOUT, 18s, 0, PHASE_INTRO);
+                            events.ScheduleEvent(EVENT_INTRO_CAST_FREEZE, 31s, 0, PHASE_INTRO);
                             break;
                         case EVENT_EMOTE_CAST_SHOUT:
                             DoCast(me, SPELL_EMOTE_SHOUT_NO_SHEATH, false);
@@ -933,7 +933,7 @@ class boss_the_lich_king : public CreatureScript
                         case EVENT_INTRO_CAST_FREEZE:
                             Talk(SAY_LK_INTRO_3);
                             DoCastAOE(SPELL_ICE_LOCK, false);
-                            events.ScheduleEvent(EVENT_FINISH_INTRO, 1000, 0, PHASE_INTRO);
+                            events.ScheduleEvent(EVENT_FINISH_INTRO, 1s, 0, PHASE_INTRO);
                             break;
                         case EVENT_FINISH_INTRO:
                             me->SetWalk(false);
@@ -945,11 +945,11 @@ class boss_the_lich_king : public CreatureScript
                         case EVENT_SUMMON_SHAMBLING_HORROR:
                             DoCast(me, SPELL_SUMMON_SHAMBLING_HORROR);
                             me->GetMap()->SetZoneMusic(AREA_ICECROWN_CITADEL, MUSIC_SPECIAL);
-                            events.ScheduleEvent(EVENT_SUMMON_SHAMBLING_HORROR, 60000, 0, PHASE_ONE);
+                            events.ScheduleEvent(EVENT_SUMMON_SHAMBLING_HORROR, 1min, 0, PHASE_ONE);
                             break;
                         case EVENT_SUMMON_DRUDGE_GHOUL:
                             DoCast(me, SPELL_SUMMON_DRUDGE_GHOULS);
-                            events.ScheduleEvent(EVENT_SUMMON_DRUDGE_GHOUL, 30000, 0, PHASE_ONE);
+                            events.ScheduleEvent(EVENT_SUMMON_DRUDGE_GHOUL, 30s, 0, PHASE_ONE);
                             break;
                         case EVENT_INFEST:
                             DoCast(me, SPELL_INFEST);
@@ -984,7 +984,7 @@ class boss_the_lich_king : public CreatureScript
                             Talk(SAY_LK_HARVEST_SOUL);
                             if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0, SpellTargetSelector(me, SPELL_HARVEST_SOUL)))
                                 DoCast(target, SPELL_HARVEST_SOUL);
-                            events.ScheduleEvent(EVENT_HARVEST_SOUL, 75000, 0, PHASE_THREE);
+                            events.ScheduleEvent(EVENT_HARVEST_SOUL, 75s, 0, PHASE_THREE);
                             break;
                         case EVENT_PAIN_AND_SUFFERING:
                             if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0, 0.0f, true))
@@ -1003,7 +1003,7 @@ class boss_the_lich_king : public CreatureScript
                         case EVENT_SUMMON_RAGING_SPIRIT_2:
                             if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0, 0.0f, true))
                                 me->CastSpell(target, SPELL_RAGING_SPIRIT, TRIGGERED_NONE);
-                            events.ScheduleEvent(EVENT_SUMMON_RAGING_SPIRIT, 18000, 0, PHASE_TRANSITION);
+                            events.ScheduleEvent(EVENT_SUMMON_RAGING_SPIRIT, 18s, 0, PHASE_TRANSITION);
                             break;
                         case EVENT_QUAKE:
                             events.SetPhase(PHASE_TWO);
@@ -1045,8 +1045,8 @@ class boss_the_lich_king : public CreatureScript
                             events.DelayEvents(50000, EVENT_GROUP_VILE_SPIRITS);
                             events.RescheduleEvent(EVENT_DEFILE, 50000, 0, PHASE_THREE);
                             events.RescheduleEvent(EVENT_SOUL_REAPER, urand(57000, 62000), 0, PHASE_THREE);
-                            events.ScheduleEvent(EVENT_START_ATTACK, 49000);
-                            events.ScheduleEvent(EVENT_FROSTMOURNE_HEROIC, 6500);
+                            events.ScheduleEvent(EVENT_START_ATTACK, 49s);
+                            events.ScheduleEvent(EVENT_FROSTMOURNE_HEROIC, 6500ms);
                             for (ObjectGuid guid : summons)
                             {
                                 if (Creature* summon = ObjectAccessor::GetCreature(*me, guid))
@@ -1212,8 +1212,8 @@ class npc_tirion_fordring_tft : public CreatureScript
                     case ACTION_OUTRO:
                         _events.SetPhase(PHASE_OUTRO);
                         _events.ScheduleEvent(EVENT_OUTRO_TALK_1, 7000, 0, PHASE_OUTRO);
-                        _events.ScheduleEvent(EVENT_OUTRO_BLESS, 18000, 0, PHASE_OUTRO);
-                        _events.ScheduleEvent(EVENT_OUTRO_REMOVE_ICE, 23000, 0, PHASE_OUTRO);
+                        _events.ScheduleEvent(EVENT_OUTRO_BLESS, 18s, 0, PHASE_OUTRO);
+                        _events.ScheduleEvent(EVENT_OUTRO_REMOVE_ICE, 23s, 0, PHASE_OUTRO);
                         _events.ScheduleEvent(EVENT_OUTRO_MOVE_1, 25000, 0, PHASE_OUTRO);
                         break;
                 }
@@ -1261,7 +1261,7 @@ class npc_tirion_fordring_tft : public CreatureScript
                         case EVENT_INTRO_TALK_1:
                             Talk(SAY_TIRION_INTRO_2);
                             _events.ScheduleEvent(EVENT_INTRO_EMOTE_1, 2000, 0, PHASE_INTRO);
-                            _events.ScheduleEvent(EVENT_INTRO_CHARGE, 5000, 0, PHASE_INTRO);
+                            _events.ScheduleEvent(EVENT_INTRO_CHARGE, 5s, 0, PHASE_INTRO);
                             break;
                         case EVENT_INTRO_EMOTE_1:
                             me->HandleEmoteCommand(EMOTE_ONESHOT_POINT_NO_SHEATHE);
@@ -1325,8 +1325,8 @@ class npc_shambling_horror_icc : public CreatureScript
             void Reset() override
             {
                 _events.Reset();
-                _events.ScheduleEvent(EVENT_SHOCKWAVE, urand(20000, 25000));
-                _events.ScheduleEvent(EVENT_ENRAGE, urand(11000, 14000));
+                _events.ScheduleEvent(EVENT_SHOCKWAVE, 20s, 25s);
+                _events.ScheduleEvent(EVENT_ENRAGE, 11s, 14s);
             }
 
             void DamageTaken(Unit* /*attacker*/, uint32& damage) override
@@ -1354,11 +1354,11 @@ class npc_shambling_horror_icc : public CreatureScript
                     {
                         case EVENT_SHOCKWAVE:
                             DoCast(me, SPELL_SHOCKWAVE);
-                            _events.ScheduleEvent(EVENT_SHOCKWAVE, urand(20000, 25000));
+                            _events.ScheduleEvent(EVENT_SHOCKWAVE, 20s, 25s);
                             break;
                         case EVENT_ENRAGE:
                             DoCast(me, SPELL_ENRAGE);
-                            _events.ScheduleEvent(EVENT_ENRAGE, urand(20000, 25000));
+                            _events.ScheduleEvent(EVENT_ENRAGE, 20s, 25s);
                             break;
                         default:
                             break;
@@ -1395,8 +1395,8 @@ class npc_raging_spirit : public CreatureScript
             {
                 me->SetReactState(REACT_PASSIVE);
                 _events.Reset();
-                _events.ScheduleEvent(EVENT_SET_AGRESSIVE, 2000);
-                _events.ScheduleEvent(EVENT_SOUL_SHRIEK, urand(12000, 15000));
+                _events.ScheduleEvent(EVENT_SET_AGRESSIVE, 2s);
+                _events.ScheduleEvent(EVENT_SOUL_SHRIEK, 12s, 15s);
                 DoCast(me, SPELL_PLAGUE_AVOIDANCE, true);
                 DoCast(me, SPELL_RAGING_SPIRIT_VISUAL, true);
                 if (TempSummon* summon = me->ToTempSummon())
@@ -1411,7 +1411,7 @@ class npc_raging_spirit : public CreatureScript
                 {
                     _events.Reset();
                     _events.SetPhase(PHASE_FROSTMOURNE);
-                    _events.ScheduleEvent(EVENT_SET_AGRESSIVE, 52000);
+                    _events.ScheduleEvent(EVENT_SET_AGRESSIVE, 52s);
                     me->SetReactState(REACT_PASSIVE);
                     me->AttackStop();
                     me->InterruptNonMeleeSpells(true);
@@ -1449,14 +1449,14 @@ class npc_raging_spirit : public CreatureScript
                     {
                         case EVENT_SOUL_SHRIEK:
                             DoCastAOE(SPELL_SOUL_SHRIEK);
-                            _events.ScheduleEvent(EVENT_SOUL_SHRIEK, urand(12000, 15000));
+                            _events.ScheduleEvent(EVENT_SOUL_SHRIEK, 12s, 15s);
                             break;
                         case EVENT_SET_AGRESSIVE:
                             me->SetReactState(REACT_AGGRESSIVE);
                             if (_events.IsInPhase(PHASE_FROSTMOURNE))
                             {
                                 _events.SetPhase(PHASE_THREE);
-                                _events.ScheduleEvent(EVENT_SOUL_SHRIEK, urand(12000, 15000));
+                                _events.ScheduleEvent(EVENT_SOUL_SHRIEK, 12s, 15s);
                             }
                             break;
                         default:
@@ -1500,7 +1500,7 @@ class npc_valkyr_shadowguard : public CreatureScript
             void IsSummonedBy(Unit* /*summoner*/) override
             {
                 _events.Reset();
-                _events.ScheduleEvent(EVENT_GRAB_PLAYER, 2500);
+                _events.ScheduleEvent(EVENT_GRAB_PLAYER, 2500ms);
             }
 
             void DamageTaken(Unit* /*attacker*/, uint32& damage) override
@@ -1558,7 +1558,7 @@ class npc_valkyr_shadowguard : public CreatureScript
                                 triggers.sort(Trinity::ObjectDistanceOrderPred(me));
                                 DoCast(target, SPELL_VALKYR_CARRY);
                                 _dropPoint.Relocate(triggers.front());
-                                _events.ScheduleEvent(EVENT_MOVE_TO_DROP_POS, 1500);
+                                _events.ScheduleEvent(EVENT_MOVE_TO_DROP_POS, 1500ms);
                             }
                         }
                         else
@@ -1566,7 +1566,7 @@ class npc_valkyr_shadowguard : public CreatureScript
                         break;
                     case POINT_SIPHON:
                         DoZoneInCombat();
-                        _events.ScheduleEvent(EVENT_LIFE_SIPHON, 2000);
+                        _events.ScheduleEvent(EVENT_LIFE_SIPHON, 2s);
                         break;
                     default:
                         break;
@@ -1596,7 +1596,7 @@ class npc_valkyr_shadowguard : public CreatureScript
                             if (!_grabbedPlayer)
                             {
                                 DoCastAOE(SPELL_VALKYR_TARGET_SEARCH);
-                                _events.ScheduleEvent(EVENT_GRAB_PLAYER, 2000);
+                                _events.ScheduleEvent(EVENT_GRAB_PLAYER, 2s);
                             }
                             break;
                         case EVENT_MOVE_TO_DROP_POS:
@@ -1605,7 +1605,7 @@ class npc_valkyr_shadowguard : public CreatureScript
                         case EVENT_LIFE_SIPHON:
                             if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 1))
                                 DoCast(target, SPELL_LIFE_SIPHON);
-                            _events.ScheduleEvent(EVENT_LIFE_SIPHON, 2500);
+                            _events.ScheduleEvent(EVENT_LIFE_SIPHON, 2500ms);
                             break;
                         case EVENT_MOVE_TO_CENTER:
                         {
@@ -1652,8 +1652,8 @@ class npc_strangulate_vehicle : public CreatureScript
                 me->SetFacingToObject(summoner);
                 DoCast(summoner, SPELL_HARVEST_SOUL_VEHICLE);
                 _events.Reset();
-                _events.ScheduleEvent(EVENT_MOVE_TO_LICH_KING, 2000);
-                _events.ScheduleEvent(EVENT_TELEPORT, 6000);
+                _events.ScheduleEvent(EVENT_MOVE_TO_LICH_KING, 2s);
+                _events.ScheduleEvent(EVENT_TELEPORT, 6s);
 
                 // this will let us easily access all creatures of this entry on heroic mode when its time to teleport back
                 if (Creature* lichKing = ObjectAccessor::GetCreature(*me, _instance->GetGuidData(DATA_THE_LICH_KING)))
@@ -1708,7 +1708,7 @@ class npc_strangulate_vehicle : public CreatureScript
                                 }
                             }
 
-                            _events.ScheduleEvent(EVENT_DESPAWN_SELF, 65000);
+                            _events.ScheduleEvent(EVENT_DESPAWN_SELF, 65s);
                             break;
                         case EVENT_MOVE_TO_LICH_KING:
                             if (Creature* lichKing = ObjectAccessor::GetCreature(*me, _instance->GetGuidData(DATA_THE_LICH_KING)))
@@ -1774,7 +1774,7 @@ class npc_terenas_menethil : public CreatureScript
                         _events.ScheduleEvent(EVENT_FROSTMOURNE_TALK_2, 11000, PHASE_FROSTMOURNE);
                         if (!IsHeroic())
                         {
-                            _events.ScheduleEvent(EVENT_DESTROY_SOUL, 60000, PHASE_FROSTMOURNE);
+                            _events.ScheduleEvent(EVENT_DESTROY_SOUL, 1min, PHASE_FROSTMOURNE);
                             _events.ScheduleEvent(EVENT_FROSTMOURNE_TALK_3, 25000);
                         }
                         break;
@@ -1806,7 +1806,7 @@ class npc_terenas_menethil : public CreatureScript
                     {
                         me->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NOT_SELECTABLE);
                         DoCast(SPELL_TERENAS_LOSES_INSIDE);
-                        _events.ScheduleEvent(EVENT_TELEPORT_BACK, 1000);
+                        _events.ScheduleEvent(EVENT_TELEPORT_BACK, 1s);
                         if (Creature* warden = me->FindNearestCreature(NPC_SPIRIT_WARDEN, 20.0f))
                         {
                             warden->CastSpell(nullptr, SPELL_DESTROY_SOUL, TRIGGERED_NONE);
@@ -1869,7 +1869,7 @@ class npc_terenas_menethil : public CreatureScript
                             if (Creature* warden = me->FindNearestCreature(NPC_SPIRIT_WARDEN, 20.0f))
                                 warden->CastSpell(nullptr, SPELL_DESTROY_SOUL, TRIGGERED_NONE);
                             DoCast(SPELL_TERENAS_LOSES_INSIDE);
-                            _events.ScheduleEvent(EVENT_TELEPORT_BACK, 1000);
+                            _events.ScheduleEvent(EVENT_TELEPORT_BACK, 1s);
                             break;
                         case EVENT_TELEPORT_BACK:
                             if (Creature* lichKing = ObjectAccessor::GetCreature(*me, _instance->GetGuidData(DATA_THE_LICH_KING)))
@@ -1911,7 +1911,7 @@ class npc_spirit_warden : public CreatureScript
             void Reset() override
             {
                 _events.Reset();
-                _events.ScheduleEvent(EVENT_SOUL_RIP, urand(12000, 15000));
+                _events.ScheduleEvent(EVENT_SOUL_RIP, 12s, 15s);
                 DoCast(SPELL_DARK_HUNGER);
             }
 
@@ -1934,7 +1934,7 @@ class npc_spirit_warden : public CreatureScript
                     {
                         case EVENT_SOUL_RIP:
                             DoCastVictim(SPELL_SOUL_RIP);
-                            _events.ScheduleEvent(EVENT_SOUL_RIP, urand(23000, 27000));
+                            _events.ScheduleEvent(EVENT_SOUL_RIP, 23s, 27s);
                             break;
                         default:
                             break;
@@ -1980,7 +1980,7 @@ class npc_spirit_bomb : public CreatureScript
                 if (type != POINT_MOTION_TYPE || point != POINT_GROUND)
                     return;
 
-                _events.ScheduleEvent(EVENT_BOMB_EXPLOSION, 3000);
+                _events.ScheduleEvent(EVENT_BOMB_EXPLOSION, 3s);
             }
 
             void AttackStart(Unit* /*victim*/) override
@@ -2030,13 +2030,13 @@ class npc_broken_frostmourne : public CreatureScript
             void IsSummonedBy(Unit* /*summoner*/) override
             {
                 _events.SetPhase(PHASE_OUTRO);
-                _events.ScheduleEvent(EVENT_OUTRO_KNOCK_BACK, 3000, 0, PHASE_OUTRO);
+                _events.ScheduleEvent(EVENT_OUTRO_KNOCK_BACK, 3s, 0, PHASE_OUTRO);
             }
 
             void DoAction(int32 action) override
             {
                 if (action == ACTION_SUMMON_TERENAS)
-                    _events.ScheduleEvent(EVENT_OUTRO_SUMMON_TERENAS, 6000, 0, PHASE_OUTRO);
+                    _events.ScheduleEvent(EVENT_OUTRO_SUMMON_TERENAS, 6s, 0, PHASE_OUTRO);
             }
 
             void EnterEvadeMode(EvadeReason /*why*/) override
diff --git a/src/server/scripts/Northrend/IcecrownCitadel/boss_valithria_dreamwalker.cpp b/src/server/scripts/Northrend/IcecrownCitadel/boss_valithria_dreamwalker.cpp
index af6c05f83b6..7752d697dab 100644
--- a/src/server/scripts/Northrend/IcecrownCitadel/boss_valithria_dreamwalker.cpp
+++ b/src/server/scripts/Northrend/IcecrownCitadel/boss_valithria_dreamwalker.cpp
@@ -315,8 +315,8 @@ class boss_valithria_dreamwalker : public CreatureScript
 
                 DoCast(me, SPELL_COPY_DAMAGE);
                 _instance->SendEncounterUnit(ENCOUNTER_FRAME_ENGAGE, me);
-                _events.ScheduleEvent(EVENT_INTRO_TALK, 15000);
-                _events.ScheduleEvent(EVENT_DREAM_PORTAL, urand(45000, 48000));
+                _events.ScheduleEvent(EVENT_INTRO_TALK, 15s);
+                _events.ScheduleEvent(EVENT_DREAM_PORTAL, 45s, 48s);
                 if (IsHeroic())
                     _events.ScheduleEvent(EVENT_BERSERK, 420000);
             }
@@ -337,7 +337,7 @@ class boss_valithria_dreamwalker : public CreatureScript
                     me->RemoveAurasDueToSpell(SPELL_CORRUPTION_VALITHRIA);
                     DoCast(me, SPELL_ACHIEVEMENT_CHECK);
                     DoCastAOE(SPELL_DREAMWALKERS_RAGE);
-                    _events.ScheduleEvent(EVENT_DREAM_SLIP, 3500);
+                    _events.ScheduleEvent(EVENT_DREAM_SLIP, 3500ms);
                     if (Creature* lichKing = ObjectAccessor::GetCreature(*me, _instance->GetGuidData(DATA_VALITHRIA_LICH_KING)))
                         lichKing->AI()->EnterEvadeMode();
                 }
@@ -441,7 +441,7 @@ class boss_valithria_dreamwalker : public CreatureScript
                                 Talk(SAY_VALITHRIA_DREAM_PORTAL);
                             for (uint32 i = 0; i < _portalCount; ++i)
                                 DoCast(me, SUMMON_PORTAL);
-                            _events.ScheduleEvent(EVENT_DREAM_PORTAL, urand(45000, 48000));
+                            _events.ScheduleEvent(EVENT_DREAM_PORTAL, 45s, 48s);
                             break;
                         case EVENT_DREAM_SLIP:
                             DoCast(me, SPELL_DREAM_SLIP);
@@ -580,11 +580,11 @@ class npc_the_lich_king_controller : public CreatureScript
             void Reset() override
             {
                 _events.Reset();
-                _events.ScheduleEvent(EVENT_GLUTTONOUS_ABOMINATION_SUMMONER, 5000);
-                _events.ScheduleEvent(EVENT_SUPPRESSER_SUMMONER, 10000);
-                _events.ScheduleEvent(EVENT_BLISTERING_ZOMBIE_SUMMONER, 15000);
-                _events.ScheduleEvent(EVENT_RISEN_ARCHMAGE_SUMMONER, 20000);
-                _events.ScheduleEvent(EVENT_BLAZING_SKELETON_SUMMONER, 30000);
+                _events.ScheduleEvent(EVENT_GLUTTONOUS_ABOMINATION_SUMMONER, 5s);
+                _events.ScheduleEvent(EVENT_SUPPRESSER_SUMMONER, 10s);
+                _events.ScheduleEvent(EVENT_BLISTERING_ZOMBIE_SUMMONER, 15s);
+                _events.ScheduleEvent(EVENT_RISEN_ARCHMAGE_SUMMONER, 20s);
+                _events.ScheduleEvent(EVENT_BLAZING_SKELETON_SUMMONER, 30s);
                 me->SetReactState(REACT_PASSIVE);
             }
 
@@ -689,9 +689,9 @@ class npc_risen_archmage : public CreatureScript
             void Reset() override
             {
                 _events.Reset();
-                _events.ScheduleEvent(EVENT_FROSTBOLT_VOLLEY, urand(5000, 15000));
-                _events.ScheduleEvent(EVENT_MANA_VOID, urand(20000, 25000));
-                _events.ScheduleEvent(EVENT_COLUMN_OF_FROST, urand(10000, 20000));
+                _events.ScheduleEvent(EVENT_FROSTBOLT_VOLLEY, 5s, 15s);
+                _events.ScheduleEvent(EVENT_MANA_VOID, 20s, 25s);
+                _events.ScheduleEvent(EVENT_COLUMN_OF_FROST, 10s, 20s);
                 Initialize();
             }
 
@@ -760,17 +760,17 @@ class npc_risen_archmage : public CreatureScript
                     {
                         case EVENT_FROSTBOLT_VOLLEY:
                             DoCast(me, SPELL_FROSTBOLT_VOLLEY);
-                            _events.ScheduleEvent(EVENT_FROSTBOLT_VOLLEY, urand(8000, 15000));
+                            _events.ScheduleEvent(EVENT_FROSTBOLT_VOLLEY, 8s, 15s);
                             break;
                         case EVENT_MANA_VOID:
                             if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 1, ManaVoidSelector(me)))
                                 DoCast(target, SPELL_MANA_VOID);
-                            _events.ScheduleEvent(EVENT_MANA_VOID, urand(20000, 25000));
+                            _events.ScheduleEvent(EVENT_MANA_VOID, 20s, 25s);
                             break;
                         case EVENT_COLUMN_OF_FROST:
                             if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 1, -10.0f, true))
                                 DoCast(target, SPELL_COLUMN_OF_FROST);
-                            _events.ScheduleEvent(EVENT_COLUMN_OF_FROST, urand(15000, 25000));
+                            _events.ScheduleEvent(EVENT_COLUMN_OF_FROST, 15s, 25s);
                             break;
                         default:
                             break;
@@ -806,8 +806,8 @@ class npc_blazing_skeleton : public CreatureScript
             void Reset() override
             {
                 _events.Reset();
-                _events.ScheduleEvent(EVENT_FIREBALL, urand(2000, 4000));
-                _events.ScheduleEvent(EVENT_LEY_WASTE, urand(15000, 20000));
+                _events.ScheduleEvent(EVENT_FIREBALL, 2s, 4s);
+                _events.ScheduleEvent(EVENT_LEY_WASTE, 15s, 20s);
             }
 
             void UpdateAI(uint32 diff) override
@@ -827,11 +827,11 @@ class npc_blazing_skeleton : public CreatureScript
                         case EVENT_FIREBALL:
                             if (!me->IsWithinMeleeRange(me->GetVictim()))
                                 DoCastVictim(SPELL_FIREBALL);
-                            _events.ScheduleEvent(EVENT_FIREBALL, urand(2000, 4000));
+                            _events.ScheduleEvent(EVENT_FIREBALL, 2s, 4s);
                             break;
                         case EVENT_LEY_WASTE:
                             DoCast(me, SPELL_LEY_WASTE);
-                            _events.ScheduleEvent(EVENT_LEY_WASTE, urand(15000, 20000));
+                            _events.ScheduleEvent(EVENT_LEY_WASTE, 15s, 20s);
                             break;
                         default:
                             break;
@@ -866,7 +866,7 @@ class npc_suppresser : public CreatureScript
             void Reset() override
             {
                 _events.Reset();
-                _events.ScheduleEvent(EVENT_SUPPRESSION, urand(10000, 15000));
+                _events.ScheduleEvent(EVENT_SUPPRESSION, 10s, 15s);
                 me->SetReactState(REACT_PASSIVE);
             }
 
@@ -910,7 +910,7 @@ class npc_suppresser : public CreatureScript
                     {
                         case EVENT_SUPPRESSION:
                             DoCastAOE(SPELL_SUPPRESSION);
-                            _events.ScheduleEvent(EVENT_SUPPRESSION, 5000);
+                            _events.ScheduleEvent(EVENT_SUPPRESSION, 5s);
                             break;
                         default:
                             break;
@@ -979,7 +979,7 @@ class npc_gluttonous_abomination : public CreatureScript
             void Reset() override
             {
                 _events.Reset();
-                _events.ScheduleEvent(EVENT_GUT_SPRAY, urand(10000, 13000));
+                _events.ScheduleEvent(EVENT_GUT_SPRAY, 10s, 13s);
             }
 
             void JustDied(Unit* /*killer*/) override
@@ -1003,7 +1003,7 @@ class npc_gluttonous_abomination : public CreatureScript
                     {
                         case EVENT_GUT_SPRAY:
                             DoCast(me, SPELL_GUT_SPRAY);
-                            _events.ScheduleEvent(EVENT_GUT_SPRAY, urand(10000, 13000));
+                            _events.ScheduleEvent(EVENT_GUT_SPRAY, 10s, 13s);
                             break;
                         default:
                             break;
@@ -1079,7 +1079,7 @@ class npc_dream_cloud : public CreatureScript
             void Reset() override
             {
                 _events.Reset();
-                _events.ScheduleEvent(EVENT_CHECK_PLAYER, 1000);
+                _events.ScheduleEvent(EVENT_CHECK_PLAYER, 1s);
                 me->SetCorpseDelay(0);  // remove corpse immediately
                 me->LoadCreaturesAddon();
             }
diff --git a/src/server/scripts/Northrend/IcecrownCitadel/icecrown_citadel.cpp b/src/server/scripts/Northrend/IcecrownCitadel/icecrown_citadel.cpp
index 21d6dfa30ee..46d67bdb90f 100644
--- a/src/server/scripts/Northrend/IcecrownCitadel/icecrown_citadel.cpp
+++ b/src/server/scripts/Northrend/IcecrownCitadel/icecrown_citadel.cpp
@@ -615,9 +615,9 @@ class npc_rotting_frost_giant : public CreatureScript
             void Reset() override
             {
                 _events.Reset();
-                _events.ScheduleEvent(EVENT_DEATH_PLAGUE, 15000);
-                _events.ScheduleEvent(EVENT_STOMP, urand(5000, 8000));
-                _events.ScheduleEvent(EVENT_ARCTIC_BREATH, urand(10000, 15000));
+                _events.ScheduleEvent(EVENT_DEATH_PLAGUE, 15s);
+                _events.ScheduleEvent(EVENT_STOMP, 5s, 8s);
+                _events.ScheduleEvent(EVENT_ARCTIC_BREATH, 10s, 15s);
             }
 
             void JustDied(Unit* /*killer*/) override
@@ -645,15 +645,15 @@ class npc_rotting_frost_giant : public CreatureScript
                                 Talk(EMOTE_DEATH_PLAGUE_WARNING, target);
                                 DoCast(target, SPELL_DEATH_PLAGUE);
                             }
-                            _events.ScheduleEvent(EVENT_DEATH_PLAGUE, 15000);
+                            _events.ScheduleEvent(EVENT_DEATH_PLAGUE, 15s);
                             break;
                         case EVENT_STOMP:
                             DoCastVictim(SPELL_STOMP);
-                            _events.ScheduleEvent(EVENT_STOMP, urand(15000, 18000));
+                            _events.ScheduleEvent(EVENT_STOMP, 15s, 18s);
                             break;
                         case EVENT_ARCTIC_BREATH:
                             DoCastVictim(SPELL_ARCTIC_BREATH);
-                            _events.ScheduleEvent(EVENT_ARCTIC_BREATH, urand(26000, 33000));
+                            _events.ScheduleEvent(EVENT_ARCTIC_BREATH, 26s, 33s);
                             break;
                         default:
                             break;
@@ -705,7 +705,7 @@ class npc_frost_freeze_trap : public CreatureScript
                 if (_events.ExecuteEvent() == EVENT_ACTIVATE_TRAP)
                 {
                     DoCast(me, SPELL_COLDFLAME_JETS);
-                    _events.ScheduleEvent(EVENT_ACTIVATE_TRAP, 22000);
+                    _events.ScheduleEvent(EVENT_ACTIVATE_TRAP, 22s);
                 }
             }
 
@@ -795,8 +795,8 @@ class boss_sister_svalna : public CreatureScript
                 if (Creature* crok = ObjectAccessor::GetCreature(*me, instance->GetGuidData(DATA_CROK_SCOURGEBANE)))
                     crok->AI()->Talk(SAY_CROK_COMBAT_SVALNA);
                 DoCastSelf(SPELL_DIVINE_SURGE, true);
-                events.ScheduleEvent(EVENT_SVALNA_COMBAT, 9000);
-                events.ScheduleEvent(EVENT_IMPALING_SPEAR, urand(40000, 50000));
+                events.ScheduleEvent(EVENT_SVALNA_COMBAT, 9s);
+                events.ScheduleEvent(EVENT_IMPALING_SPEAR, 40s, 50s);
                 events.ScheduleEvent(EVENT_AETHER_SHIELD, urand(100000, 110000));
             }
 
@@ -845,10 +845,10 @@ class boss_sister_svalna : public CreatureScript
                         me->SetFarVisible(true);
                         _isEventInProgress = true;
                         me->SetImmuneToAll(true);
-                        events.ScheduleEvent(EVENT_SVALNA_START, 25000);
+                        events.ScheduleEvent(EVENT_SVALNA_START, 25s);
                         break;
                     case ACTION_RESURRECT_CAPTAINS:
-                        events.ScheduleEvent(EVENT_SVALNA_RESURRECT, 7000);
+                        events.ScheduleEvent(EVENT_SVALNA_RESURRECT, 7s);
                         break;
                     case ACTION_CAPTAIN_DIES:
                         Talk(SAY_SVALNA_CAPTAIN_DEATH);
@@ -938,7 +938,7 @@ class boss_sister_svalna : public CreatureScript
                                 DoCast(me, SPELL_AETHER_SHIELD);
                                 DoCast(target, SPELL_IMPALING_SPEAR);
                             }
-                            events.ScheduleEvent(EVENT_IMPALING_SPEAR, urand(20000, 25000));
+                            events.ScheduleEvent(EVENT_IMPALING_SPEAR, 20s, 25s);
                             break;
                         default:
                             break;
@@ -990,7 +990,7 @@ class npc_crok_scourgebane : public CreatureScript
             {
                 _events.Reset();
                 _events.ScheduleEvent(EVENT_SCOURGE_STRIKE, urand(7500, 12500));
-                _events.ScheduleEvent(EVENT_DEATH_STRIKE, urand(25000, 30000));
+                _events.ScheduleEvent(EVENT_DEATH_STRIKE, 25s, 30s);
                 me->SetReactState(REACT_DEFENSIVE);
                 Initialize();
             }
@@ -1011,7 +1011,7 @@ class npc_crok_scourgebane : public CreatureScript
                     Talk(SAY_CROK_INTRO_1);
                     _events.ScheduleEvent(EVENT_ARNATH_INTRO_2, 7000);
                     _events.ScheduleEvent(EVENT_CROK_INTRO_3, 14000);
-                    _events.ScheduleEvent(EVENT_START_PATHING, 37000);
+                    _events.ScheduleEvent(EVENT_START_PATHING, 35s);
                     me->setActive(true);
                     me->SetFarVisible(true);
                     for (uint32 i = 0; i < 4; ++i)
@@ -1168,7 +1168,7 @@ class npc_crok_scourgebane : public CreatureScript
 
                     damage = 0;
                     DoCast(me, SPELL_ICEBOUND_ARMOR);
-                    _events.ScheduleEvent(EVENT_HEALTH_CHECK, 1000);
+                    _events.ScheduleEvent(EVENT_HEALTH_CHECK, 1s);
                 }
             }
 
@@ -1203,12 +1203,12 @@ class npc_crok_scourgebane : public CreatureScript
                             break;
                         case EVENT_SCOURGE_STRIKE:
                             DoCastVictim(SPELL_SCOURGE_STRIKE);
-                            _events.ScheduleEvent(EVENT_SCOURGE_STRIKE, urand(10000, 14000));
+                            _events.ScheduleEvent(EVENT_SCOURGE_STRIKE, 10s, 14s);
                             break;
                         case EVENT_DEATH_STRIKE:
                             if (HealthBelowPct(20))
                                 DoCastVictim(SPELL_DEATH_STRIKE);
-                            _events.ScheduleEvent(EVENT_DEATH_STRIKE, urand(5000, 10000));
+                            _events.ScheduleEvent(EVENT_DEATH_STRIKE, 5s, 10s);
                             break;
                         case EVENT_HEALTH_CHECK:
                             if (HealthAbovePct(15))
@@ -1220,7 +1220,7 @@ class npc_crok_scourgebane : public CreatureScript
                             {
                                 // looks totally hacky to me
                                 me->ModifyHealth(me->CountPctFromMaxHealth(5));
-                                _events.ScheduleEvent(EVENT_HEALTH_CHECK, 1000);
+                                _events.ScheduleEvent(EVENT_HEALTH_CHECK, 1s);
                             }
                             break;
                         default:
@@ -1395,11 +1395,11 @@ class npc_captain_arnath : public CreatureScript
             void Reset() override
             {
                 Events.Reset();
-                Events.ScheduleEvent(EVENT_ARNATH_FLASH_HEAL, urand(4000, 7000));
-                Events.ScheduleEvent(EVENT_ARNATH_PW_SHIELD, urand(8000, 14000));
-                Events.ScheduleEvent(EVENT_ARNATH_SMITE, urand(3000, 6000));
+                Events.ScheduleEvent(EVENT_ARNATH_FLASH_HEAL, 4s, 7s);
+                Events.ScheduleEvent(EVENT_ARNATH_PW_SHIELD, 8s, 14s);
+                Events.ScheduleEvent(EVENT_ARNATH_SMITE, 3s, 6s);
                 if (Is25ManRaid() && IsUndead)
-                    Events.ScheduleEvent(EVENT_ARNATH_DOMINATE_MIND, urand(22000, 27000));
+                    Events.ScheduleEvent(EVENT_ARNATH_DOMINATE_MIND, 22s, 27s);
             }
 
             void UpdateAI(uint32 diff) override
@@ -1419,23 +1419,23 @@ class npc_captain_arnath : public CreatureScript
                         case EVENT_ARNATH_FLASH_HEAL:
                             if (Creature* target = FindFriendlyCreature())
                                 DoCast(target, SPELL_FLASH_HEAL);
-                            Events.ScheduleEvent(EVENT_ARNATH_FLASH_HEAL, urand(6000, 9000));
+                            Events.ScheduleEvent(EVENT_ARNATH_FLASH_HEAL, 6s, 9s);
                             break;
                         case EVENT_ARNATH_PW_SHIELD:
                         {
                             std::list<Creature*> targets = DoFindFriendlyMissingBuff(40.0f, SPELL_POWER_WORD_SHIELD);
                             DoCast(Trinity::Containers::SelectRandomContainerElement(targets), SPELL_POWER_WORD_SHIELD);
-                            Events.ScheduleEvent(EVENT_ARNATH_PW_SHIELD, urand(15000, 20000));
+                            Events.ScheduleEvent(EVENT_ARNATH_PW_SHIELD, 15s, 20s);
                             break;
                         }
                         case EVENT_ARNATH_SMITE:
                             DoCastVictim(SPELL_SMITE);
-                            Events.ScheduleEvent(EVENT_ARNATH_SMITE, urand(4000, 7000));
+                            Events.ScheduleEvent(EVENT_ARNATH_SMITE, 4s, 7s);
                             break;
                         case EVENT_ARNATH_DOMINATE_MIND:
                             if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 1, 0.0f, true))
                                 DoCast(target, SPELL_DOMINATE_MIND);
-                            Events.ScheduleEvent(EVENT_ARNATH_DOMINATE_MIND, urand(28000, 37000));
+                            Events.ScheduleEvent(EVENT_ARNATH_DOMINATE_MIND, 28s, 37s);
                             break;
                         default:
                             break;
@@ -1479,11 +1479,11 @@ class npc_captain_brandon : public CreatureScript
             void Reset() override
             {
                 Events.Reset();
-                Events.ScheduleEvent(EVENT_BRANDON_CRUSADER_STRIKE, urand(6000, 10000));
-                Events.ScheduleEvent(EVENT_BRANDON_DIVINE_SHIELD, 500);
-                Events.ScheduleEvent(EVENT_BRANDON_JUDGEMENT_OF_COMMAND, urand(8000, 13000));
+                Events.ScheduleEvent(EVENT_BRANDON_CRUSADER_STRIKE, 6s, 10s);
+                Events.ScheduleEvent(EVENT_BRANDON_DIVINE_SHIELD, 500ms);
+                Events.ScheduleEvent(EVENT_BRANDON_JUDGEMENT_OF_COMMAND, 8s, 13s);
                 if (IsUndead)
-                    Events.ScheduleEvent(EVENT_BRANDON_HAMMER_OF_BETRAYAL, urand(25000, 30000));
+                    Events.ScheduleEvent(EVENT_BRANDON_HAMMER_OF_BETRAYAL, 25s, 30s);
             }
 
             void UpdateAI(uint32 diff) override
@@ -1502,21 +1502,21 @@ class npc_captain_brandon : public CreatureScript
                     {
                         case EVENT_BRANDON_CRUSADER_STRIKE:
                             DoCastVictim(SPELL_CRUSADER_STRIKE);
-                            Events.ScheduleEvent(EVENT_BRANDON_CRUSADER_STRIKE, urand(6000, 12000));
+                            Events.ScheduleEvent(EVENT_BRANDON_CRUSADER_STRIKE, 6s, 12s);
                             break;
                         case EVENT_BRANDON_DIVINE_SHIELD:
                             if (HealthBelowPct(20))
                                 DoCast(me, SPELL_DIVINE_SHIELD);
-                            Events.ScheduleEvent(EVENT_BRANDON_DIVINE_SHIELD, 500);
+                            Events.ScheduleEvent(EVENT_BRANDON_DIVINE_SHIELD, 500ms);
                             break;
                         case EVENT_BRANDON_JUDGEMENT_OF_COMMAND:
                             DoCastVictim(SPELL_JUDGEMENT_OF_COMMAND);
-                            Events.ScheduleEvent(EVENT_BRANDON_JUDGEMENT_OF_COMMAND, urand(8000, 13000));
+                            Events.ScheduleEvent(EVENT_BRANDON_JUDGEMENT_OF_COMMAND, 8s, 13s);
                             break;
                         case EVENT_BRANDON_HAMMER_OF_BETRAYAL:
                             if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 1, 0.0f, true))
                                 DoCast(target, SPELL_HAMMER_OF_BETRAYAL);
-                            Events.ScheduleEvent(EVENT_BRANDON_HAMMER_OF_BETRAYAL, urand(45000, 60000));
+                            Events.ScheduleEvent(EVENT_BRANDON_HAMMER_OF_BETRAYAL, 45s, 60s);
                             break;
                         default:
                             break;
@@ -1550,11 +1550,11 @@ class npc_captain_grondel : public CreatureScript
             void Reset() override
             {
                 Events.Reset();
-                Events.ScheduleEvent(EVENT_GRONDEL_CHARGE_CHECK, 500);
-                Events.ScheduleEvent(EVENT_GRONDEL_MORTAL_STRIKE, urand(8000, 14000));
-                Events.ScheduleEvent(EVENT_GRONDEL_SUNDER_ARMOR, urand(3000, 12000));
+                Events.ScheduleEvent(EVENT_GRONDEL_CHARGE_CHECK, 500ms);
+                Events.ScheduleEvent(EVENT_GRONDEL_MORTAL_STRIKE, 8s, 14s);
+                Events.ScheduleEvent(EVENT_GRONDEL_SUNDER_ARMOR, 3s, 12s);
                 if (IsUndead)
-                    Events.ScheduleEvent(EVENT_GRONDEL_CONFLAGRATION, urand(12000, 17000));
+                    Events.ScheduleEvent(EVENT_GRONDEL_CONFLAGRATION, 12s, 17s);
             }
 
             void UpdateAI(uint32 diff) override
@@ -1573,20 +1573,20 @@ class npc_captain_grondel : public CreatureScript
                     {
                         case EVENT_GRONDEL_CHARGE_CHECK:
                             DoCastVictim(SPELL_CHARGE);
-                            Events.ScheduleEvent(EVENT_GRONDEL_CHARGE_CHECK, 500);
+                            Events.ScheduleEvent(EVENT_GRONDEL_CHARGE_CHECK, 500ms);
                             break;
                         case EVENT_GRONDEL_MORTAL_STRIKE:
                             DoCastVictim(SPELL_MORTAL_STRIKE);
-                            Events.ScheduleEvent(EVENT_GRONDEL_MORTAL_STRIKE, urand(10000, 15000));
+                            Events.ScheduleEvent(EVENT_GRONDEL_MORTAL_STRIKE, 10s, 15s);
                             break;
                         case EVENT_GRONDEL_SUNDER_ARMOR:
                             DoCastVictim(SPELL_SUNDER_ARMOR);
-                            Events.ScheduleEvent(EVENT_GRONDEL_SUNDER_ARMOR, urand(5000, 17000));
+                            Events.ScheduleEvent(EVENT_GRONDEL_SUNDER_ARMOR, 5s, 17s);
                             break;
                         case EVENT_GRONDEL_CONFLAGRATION:
                             if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0, 0.0f, true))
                                 DoCast(target, SPELL_CONFLAGRATION);
-                            Events.ScheduleEvent(EVENT_GRONDEL_CONFLAGRATION, urand(10000, 15000));
+                            Events.ScheduleEvent(EVENT_GRONDEL_CONFLAGRATION, 10s, 15s);
                             break;
                         default:
                             break;
@@ -1620,9 +1620,9 @@ class npc_captain_rupert : public CreatureScript
             void Reset() override
             {
                 Events.Reset();
-                Events.ScheduleEvent(EVENT_RUPERT_FEL_IRON_BOMB, urand(15000, 20000));
-                Events.ScheduleEvent(EVENT_RUPERT_MACHINE_GUN, urand(25000, 30000));
-                Events.ScheduleEvent(EVENT_RUPERT_ROCKET_LAUNCH, urand(10000, 15000));
+                Events.ScheduleEvent(EVENT_RUPERT_FEL_IRON_BOMB, 15s, 20s);
+                Events.ScheduleEvent(EVENT_RUPERT_MACHINE_GUN, 25s, 30s);
+                Events.ScheduleEvent(EVENT_RUPERT_ROCKET_LAUNCH, 10s, 15s);
             }
 
             void UpdateAI(uint32 diff) override
@@ -1642,17 +1642,17 @@ class npc_captain_rupert : public CreatureScript
                         case EVENT_RUPERT_FEL_IRON_BOMB:
                             if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0))
                                 DoCast(target, SPELL_FEL_IRON_BOMB);
-                            Events.ScheduleEvent(EVENT_RUPERT_FEL_IRON_BOMB, urand(15000, 20000));
+                            Events.ScheduleEvent(EVENT_RUPERT_FEL_IRON_BOMB, 15s, 20s);
                             break;
                         case EVENT_RUPERT_MACHINE_GUN:
                             if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 1))
                                 DoCast(target, SPELL_MACHINE_GUN);
-                            Events.ScheduleEvent(EVENT_RUPERT_MACHINE_GUN, urand(25000, 30000));
+                            Events.ScheduleEvent(EVENT_RUPERT_MACHINE_GUN, 25s, 30s);
                             break;
                         case EVENT_RUPERT_ROCKET_LAUNCH:
                             if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 1))
                                 DoCast(target, SPELL_ROCKET_LAUNCH);
-                            Events.ScheduleEvent(EVENT_RUPERT_ROCKET_LAUNCH, urand(10000, 15000));
+                            Events.ScheduleEvent(EVENT_RUPERT_ROCKET_LAUNCH, 10s, 15s);
                             break;
                         default:
                             break;
@@ -1757,7 +1757,7 @@ class npc_arthas_teleport_visual : public CreatureScript
                 if (_instance->GetBossState(DATA_PROFESSOR_PUTRICIDE) == DONE &&
                     _instance->GetBossState(DATA_BLOOD_QUEEN_LANA_THEL) == DONE &&
                     _instance->GetBossState(DATA_SINDRAGOSA) == DONE)
-                    _events.ScheduleEvent(EVENT_SOUL_MISSILE, urand(1000, 6000));
+                    _events.ScheduleEvent(EVENT_SOUL_MISSILE, 1s, 6s);
             }
 
             void UpdateAI(uint32 diff) override
@@ -1770,7 +1770,7 @@ class npc_arthas_teleport_visual : public CreatureScript
                 if (_events.ExecuteEvent() == EVENT_SOUL_MISSILE)
                 {
                     DoCastAOE(SPELL_SOUL_MISSILE);
-                    _events.ScheduleEvent(EVENT_SOUL_MISSILE, urand(5000, 7000));
+                    _events.ScheduleEvent(EVENT_SOUL_MISSILE, 5s, 7s);
                 }
             }
 
diff --git a/src/server/scripts/Northrend/IcecrownCitadel/instance_icecrown_citadel.cpp b/src/server/scripts/Northrend/IcecrownCitadel/instance_icecrown_citadel.cpp
index c3828b2c7ff..59e3a590e66 100644
--- a/src/server/scripts/Northrend/IcecrownCitadel/instance_icecrown_citadel.cpp
+++ b/src/server/scripts/Northrend/IcecrownCitadel/instance_icecrown_citadel.cpp
@@ -850,7 +850,7 @@ class instance_icecrown_citadel : public InstanceMapScript
                                 loot->RemoveFlag(GAMEOBJECT_FLAGS, GO_FLAG_LOCKED | GO_FLAG_NOT_SELECTABLE | GO_FLAG_NODESPAWN);
                         }
                         else if (state == FAIL)
-                            Events.ScheduleEvent(EVENT_RESPAWN_GUNSHIP, 30000);
+                            Events.ScheduleEvent(EVENT_RESPAWN_GUNSHIP, 30s);
                         break;
                     case DATA_DEATHBRINGER_SAURFANG:
                         switch (state)
@@ -1075,7 +1075,7 @@ class instance_icecrown_citadel : public InstanceMapScript
                         switch (data)
                         {
                             case IN_PROGRESS:
-                                Events.ScheduleEvent(EVENT_UPDATE_EXECUTION_TIME, 60000);
+                                Events.ScheduleEvent(EVENT_UPDATE_EXECUTION_TIME, 1min);
                                 BloodQuickeningMinutes = 30;
                                 DoUpdateWorldState(WORLDSTATE_SHOW_TIMER, 1);
                                 DoUpdateWorldState(WORLDSTATE_EXECUTION_TIME, BloodQuickeningMinutes);
@@ -1352,7 +1352,7 @@ class instance_icecrown_citadel : public InstanceMapScript
                             --BloodQuickeningMinutes;
                             if (BloodQuickeningMinutes)
                             {
-                                Events.ScheduleEvent(EVENT_UPDATE_EXECUTION_TIME, 60000);
+                                Events.ScheduleEvent(EVENT_UPDATE_EXECUTION_TIME, 1min);
                                 DoUpdateWorldState(WORLDSTATE_SHOW_TIMER, 1);
                                 DoUpdateWorldState(WORLDSTATE_EXECUTION_TIME, BloodQuickeningMinutes);
                             }
@@ -1427,13 +1427,13 @@ class instance_icecrown_citadel : public InstanceMapScript
                     case EVENT_QUAKE:
                         if (GameObject* warning = instance->GetGameObject(FrozenThroneWarningGUID))
                             warning->SetGoState(GO_STATE_ACTIVE);
-                        Events.ScheduleEvent(EVENT_QUAKE_SHATTER, 5000);
+                        Events.ScheduleEvent(EVENT_QUAKE_SHATTER, 5s);
                         break;
                     case EVENT_SECOND_REMORSELESS_WINTER:
                         if (GameObject* platform = instance->GetGameObject(ArthasPlatformGUID))
                         {
                             platform->SetDestructibleState(GO_DESTRUCTIBLE_DESTROYED);
-                            Events.ScheduleEvent(EVENT_REBUILD_PLATFORM, 1500);
+                            Events.ScheduleEvent(EVENT_REBUILD_PLATFORM, 1500ms);
                         }
                         break;
                     case EVENT_TELEPORT_TO_FROSTMOURNE: // Harvest Soul (normal mode)
diff --git a/src/server/scripts/Northrend/IsleOfConquest/boss_ioc_horde_alliance.cpp b/src/server/scripts/Northrend/IsleOfConquest/boss_ioc_horde_alliance.cpp
index 50b5ceb3b30..9f87cec6577 100644
--- a/src/server/scripts/Northrend/IsleOfConquest/boss_ioc_horde_alliance.cpp
+++ b/src/server/scripts/Northrend/IsleOfConquest/boss_ioc_horde_alliance.cpp
@@ -62,10 +62,10 @@ public:
 
         void JustEngagedWith(Unit* /*who*/) override
         {
-            _events.ScheduleEvent(EVENT_BRUTAL_STRIKE, 5 * IN_MILLISECONDS);
+            _events.ScheduleEvent(EVENT_BRUTAL_STRIKE, 5s);
             _events.ScheduleEvent(EVENT_DAGGER_THROW,  7 * IN_MILLISECONDS);
             _events.ScheduleEvent(EVENT_CHECK_RANGE,   1 * IN_MILLISECONDS);
-            _events.ScheduleEvent(EVENT_CRUSHING_LEAP, 15 * IN_MILLISECONDS);
+            _events.ScheduleEvent(EVENT_CRUSHING_LEAP, 15s);
         }
 
         void SpellHit(Unit* caster, SpellInfo const* /*spell*/) override
@@ -90,23 +90,23 @@ public:
                 {
                     case EVENT_BRUTAL_STRIKE:
                         DoCastVictim(SPELL_BRUTAL_STRIKE);
-                        _events.ScheduleEvent(EVENT_BRUTAL_STRIKE, 5 * IN_MILLISECONDS);
+                        _events.ScheduleEvent(EVENT_BRUTAL_STRIKE, 5s);
                         break;
                     case EVENT_DAGGER_THROW:
                         if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 1))
                             DoCast(target, SPELL_DAGGER_THROW);
-                        _events.ScheduleEvent(EVENT_DAGGER_THROW, 7 * IN_MILLISECONDS);
+                        _events.ScheduleEvent(EVENT_DAGGER_THROW, 7s);
                         break;
                     case EVENT_CRUSHING_LEAP:
                         DoCastVictim(SPELL_CRUSHING_LEAP);
-                        _events.ScheduleEvent(EVENT_CRUSHING_LEAP, 25 * IN_MILLISECONDS);
+                        _events.ScheduleEvent(EVENT_CRUSHING_LEAP, 25s);
                         break;
                     case EVENT_CHECK_RANGE:
                         if (me->GetDistance(me->GetHomePosition()) > 25.0f)
                             DoCast(me, SPELL_RAGE);
                         else
                             me->RemoveAurasDueToSpell(SPELL_RAGE);
-                        _events.ScheduleEvent(EVENT_CHECK_RANGE, 1 * IN_MILLISECONDS);
+                        _events.ScheduleEvent(EVENT_CHECK_RANGE, 1s);
                         break;
                     default:
                         break;
diff --git a/src/server/scripts/Northrend/IsleOfConquest/isle_of_conquest.cpp b/src/server/scripts/Northrend/IsleOfConquest/isle_of_conquest.cpp
index 17b61d80251..5817e4232c7 100644
--- a/src/server/scripts/Northrend/IsleOfConquest/isle_of_conquest.cpp
+++ b/src/server/scripts/Northrend/IsleOfConquest/isle_of_conquest.cpp
@@ -102,7 +102,7 @@ class npc_ioc_gunship_captain : public CreatureScript
                 if (action == ACTION_GUNSHIP_READY)
                 {
                     DoCast(me, SPELL_SIMPLE_TELEPORT);
-                    _events.ScheduleEvent(EVENT_TALK, 3000);
+                    _events.ScheduleEvent(EVENT_TALK, 3s);
                 }
             }
 
@@ -114,7 +114,7 @@ class npc_ioc_gunship_captain : public CreatureScript
                     switch (eventId)
                     {
                         case EVENT_TALK:
-                            _events.ScheduleEvent(EVENT_DESPAWN, 1000);
+                            _events.ScheduleEvent(EVENT_DESPAWN, 1s);
                             Talk(SAY_ONBOARD);
                             DoCast(me, SPELL_TELEPORT_VISUAL_ONLY);
                             break;
diff --git a/src/server/scripts/Northrend/Naxxramas/boss_anubrekhan.cpp b/src/server/scripts/Northrend/Naxxramas/boss_anubrekhan.cpp
index c6476dd9ace..f9c205fc669 100644
--- a/src/server/scripts/Northrend/Naxxramas/boss_anubrekhan.cpp
+++ b/src/server/scripts/Northrend/Naxxramas/boss_anubrekhan.cpp
@@ -167,7 +167,7 @@ public:
             events.ScheduleEvent(EVENT_IMPALE, randtime(Seconds(10), Seconds(20)), 0, PHASE_NORMAL);
             events.ScheduleEvent(EVENT_SCARABS, randtime(Seconds(20), Seconds(30)), 0, PHASE_NORMAL);
             events.ScheduleEvent(EVENT_LOCUST, Minutes(1)+randtime(Seconds(40), Seconds(60)), 0, PHASE_NORMAL);
-            events.ScheduleEvent(EVENT_BERSERK, Minutes(10));
+            events.ScheduleEvent(EVENT_BERSERK, 10min);
 
             if (!Is25ManRaid())
                 events.ScheduleEvent(EVENT_SPAWN_GUARD, randtime(Seconds(15), Seconds(20)));
@@ -211,7 +211,7 @@ public:
                         events.SetPhase(PHASE_SWARM);
                         DoCast(me, SPELL_LOCUST_SWARM);
 
-                        events.ScheduleEvent(EVENT_SPAWN_GUARD, Seconds(3));
+                        events.ScheduleEvent(EVENT_SPAWN_GUARD, 3s);
                         events.ScheduleEvent(EVENT_LOCUST_ENDS, RAID_MODE(Seconds(19), Seconds(23)));
                         events.Repeat(Minutes(1)+Seconds(30));
                         break;
@@ -225,7 +225,7 @@ public:
                         break;
                     case EVENT_BERSERK:
                         DoCast(me, SPELL_BERSERK, true);
-                        events.ScheduleEvent(EVENT_BERSERK, Minutes(10));
+                        events.ScheduleEvent(EVENT_BERSERK, 10min);
                         break;
                 }
             }
diff --git a/src/server/scripts/Northrend/Naxxramas/boss_four_horsemen.cpp b/src/server/scripts/Northrend/Naxxramas/boss_four_horsemen.cpp
index afa32ff5c70..84629651ef4 100644
--- a/src/server/scripts/Northrend/Naxxramas/boss_four_horsemen.cpp
+++ b/src/server/scripts/Northrend/Naxxramas/boss_four_horsemen.cpp
@@ -409,8 +409,8 @@ class boss_four_horsemen_baron : public CreatureScript
                 else
                     AttackStart(threat.GetCurrentVictim());
 
-                events.ScheduleEvent(EVENT_BERSERK, Minutes(10));
-                events.ScheduleEvent(EVENT_MARK, Seconds(24));
+                events.ScheduleEvent(EVENT_BERSERK, 10min);
+                events.ScheduleEvent(EVENT_MARK, 24s);
                 events.ScheduleEvent(EVENT_UNHOLYSHADOW, randtime(Seconds(3), Seconds(7)));
             }
 
@@ -482,8 +482,8 @@ class boss_four_horsemen_thane : public CreatureScript
                 else
                     AttackStart(threat.GetCurrentVictim());
 
-                events.ScheduleEvent(EVENT_BERSERK, Minutes(10));
-                events.ScheduleEvent(EVENT_MARK, Seconds(24));
+                events.ScheduleEvent(EVENT_BERSERK, 10min);
+                events.ScheduleEvent(EVENT_MARK, 24s);
                 events.ScheduleEvent(EVENT_METEOR, randtime(Seconds(10), Seconds(25)));
             }
             void _UpdateAI(uint32 diff) override
@@ -548,8 +548,8 @@ class boss_four_horsemen_lady : public CreatureScript
             boss_four_horsemen_ladyAI(Creature* creature) : boss_four_horsemen_baseAI(creature, LADY, ladyPath) { }
             void BeginFighting() override
             {
-                events.ScheduleEvent(EVENT_BERSERK, Minutes(10));
-                events.ScheduleEvent(EVENT_MARK, Seconds(24));
+                events.ScheduleEvent(EVENT_BERSERK, 10min);
+                events.ScheduleEvent(EVENT_MARK, 24s);
                 events.ScheduleEvent(EVENT_VOIDZONE, randtime(Seconds(5), Seconds(10)));
             }
 
@@ -618,8 +618,8 @@ class boss_four_horsemen_sir : public CreatureScript
             boss_four_horsemen_sirAI(Creature* creature) : boss_four_horsemen_baseAI(creature, SIR, sirPath), _shouldSay(true) { }
             void BeginFighting() override
             {
-                events.ScheduleEvent(EVENT_BERSERK, Minutes(10));
-                events.ScheduleEvent(EVENT_MARK, Seconds(24));
+                events.ScheduleEvent(EVENT_BERSERK, 10min);
+                events.ScheduleEvent(EVENT_MARK, 24s);
                 events.ScheduleEvent(EVENT_HOLYWRATH, randtime(Seconds(13), Seconds(18)));
             }
 
diff --git a/src/server/scripts/Northrend/Naxxramas/boss_gluth.cpp b/src/server/scripts/Northrend/Naxxramas/boss_gluth.cpp
index c833ad54684..94e0a046a31 100644
--- a/src/server/scripts/Northrend/Naxxramas/boss_gluth.cpp
+++ b/src/server/scripts/Northrend/Naxxramas/boss_gluth.cpp
@@ -116,12 +116,12 @@ public:
         void JustEngagedWith(Unit* /*who*/) override
         {
             _JustEngagedWith();
-            events.ScheduleEvent(EVENT_WOUND, Seconds(10));
+            events.ScheduleEvent(EVENT_WOUND, 10s);
             events.ScheduleEvent(EVENT_ENRAGE, randtime(Seconds(16), Seconds(22)));
             events.ScheduleEvent(EVENT_DECIMATE, randtime(Minutes(1)+Seconds(50), Minutes(2)));
-            events.ScheduleEvent(EVENT_BERSERK, Minutes(8));
-            events.ScheduleEvent(EVENT_SUMMON, Seconds(15));
-            events.ScheduleEvent(EVENT_SEARCH_ZOMBIE_SINGLE, Seconds(12));
+            events.ScheduleEvent(EVENT_BERSERK, 8min);
+            events.ScheduleEvent(EVENT_SUMMON, 15s);
+            events.ScheduleEvent(EVENT_SEARCH_ZOMBIE_SINGLE, 12s);
         }
 
         void SummonedCreatureDies(Creature* summoned, Unit* /* who */) override
@@ -272,7 +272,7 @@ public:
         {
             if (id == 1){
                 me->GetMotionMaster()->MoveIdle();
-                events.ScheduleEvent(EVENT_KILL_ZOMBIE_SINGLE, Seconds(1));
+                events.ScheduleEvent(EVENT_KILL_ZOMBIE_SINGLE, 1s);
             }
 
         }
diff --git a/src/server/scripts/Northrend/Naxxramas/boss_grobbulus.cpp b/src/server/scripts/Northrend/Naxxramas/boss_grobbulus.cpp
index 240475c974e..9e1a5503583 100644
--- a/src/server/scripts/Northrend/Naxxramas/boss_grobbulus.cpp
+++ b/src/server/scripts/Northrend/Naxxramas/boss_grobbulus.cpp
@@ -57,10 +57,10 @@ class boss_grobbulus : public CreatureScript
             void JustEngagedWith(Unit* /*who*/) override
             {
                 _JustEngagedWith();
-                events.ScheduleEvent(EVENT_CLOUD, Seconds(15));
-                events.ScheduleEvent(EVENT_INJECT, Seconds(20));
+                events.ScheduleEvent(EVENT_CLOUD, 15s);
+                events.ScheduleEvent(EVENT_INJECT, 20s);
                 events.ScheduleEvent(EVENT_SPRAY, randtime(Seconds(15), Seconds(30))); // not sure
-                events.ScheduleEvent(EVENT_BERSERK, Minutes(12));
+                events.ScheduleEvent(EVENT_BERSERK, 12min);
             }
 
             void SpellHitTarget(Unit* target, SpellInfo const* spell) override
diff --git a/src/server/scripts/Northrend/Naxxramas/boss_heigan.cpp b/src/server/scripts/Northrend/Naxxramas/boss_heigan.cpp
index e4d9211af64..eabe02ce786 100644
--- a/src/server/scripts/Northrend/Naxxramas/boss_heigan.cpp
+++ b/src/server/scripts/Northrend/Naxxramas/boss_heigan.cpp
@@ -123,7 +123,7 @@ public:
             events.ScheduleEvent(EVENT_DISRUPT, randtime(Seconds(15), Seconds(20)), 0, PHASE_FIGHT);
             events.ScheduleEvent(EVENT_FEVER, randtime(Seconds(10), Seconds(20)), 0, PHASE_FIGHT);
             events.ScheduleEvent(EVENT_DANCE, Minutes(1) + Seconds(30), 0, PHASE_FIGHT);
-            events.ScheduleEvent(EVENT_ERUPT, Seconds(15));
+            events.ScheduleEvent(EVENT_ERUPT, 15s);
 
             _safetyDance = true;
 
diff --git a/src/server/scripts/Northrend/Naxxramas/boss_loatheb.cpp b/src/server/scripts/Northrend/Naxxramas/boss_loatheb.cpp
index a5c56b10a5e..17570a7dc0a 100644
--- a/src/server/scripts/Northrend/Naxxramas/boss_loatheb.cpp
+++ b/src/server/scripts/Northrend/Naxxramas/boss_loatheb.cpp
@@ -75,10 +75,10 @@ class boss_loatheb : public CreatureScript
             void JustEngagedWith(Unit* /*who*/) override
             {
                 _JustEngagedWith();
-                events.ScheduleEvent(EVENT_NECROTIC_AURA, Seconds(17));
-                events.ScheduleEvent(EVENT_DEATHBLOOM, Seconds(5));
-                events.ScheduleEvent(EVENT_SPORE, Seconds(18));
-                events.ScheduleEvent(EVENT_INEVITABLE_DOOM, Minutes(2));
+                events.ScheduleEvent(EVENT_NECROTIC_AURA, 17s);
+                events.ScheduleEvent(EVENT_DEATHBLOOM, 5s);
+                events.ScheduleEvent(EVENT_SPORE, 18s);
+                events.ScheduleEvent(EVENT_INEVITABLE_DOOM, 2min);
             }
 
             void SummonedCreatureDies(Creature* summon, Unit* /*killer*/) override
@@ -106,8 +106,8 @@ class boss_loatheb : public CreatureScript
                         case EVENT_NECROTIC_AURA:
                             DoCastAOE(SPELL_NECROTIC_AURA);
                             Talk(SAY_NECROTIC_AURA_APPLIED);
-                            events.ScheduleEvent(EVENT_NECROTIC_AURA_FADING, Seconds(14));
-                            events.ScheduleEvent(EVENT_NECROTIC_AURA_FADED, Seconds(17));
+                            events.ScheduleEvent(EVENT_NECROTIC_AURA_FADING, 14s);
+                            events.ScheduleEvent(EVENT_NECROTIC_AURA_FADED, 17s);
                             events.Repeat(Seconds(20));
                             break;
                         case EVENT_DEATHBLOOM:
diff --git a/src/server/scripts/Northrend/Naxxramas/boss_maexxna.cpp b/src/server/scripts/Northrend/Naxxramas/boss_maexxna.cpp
index c8fccc54b20..0f05f92ae18 100644
--- a/src/server/scripts/Northrend/Naxxramas/boss_maexxna.cpp
+++ b/src/server/scripts/Northrend/Naxxramas/boss_maexxna.cpp
@@ -107,11 +107,11 @@ public:
         void JustEngagedWith(Unit* /*who*/) override
         {
             _JustEngagedWith();
-            events.ScheduleEvent(EVENT_WRAP, Seconds(20));
-            events.ScheduleEvent(EVENT_SPRAY, Seconds(40));
+            events.ScheduleEvent(EVENT_WRAP, 20s);
+            events.ScheduleEvent(EVENT_SPRAY, 40s);
             events.ScheduleEvent(EVENT_SHOCK, randtime(Seconds(5), Seconds(10)));
             events.ScheduleEvent(EVENT_POISON, randtime(Seconds(10), Seconds(15)));
-            events.ScheduleEvent(EVENT_SUMMON, Seconds(30));
+            events.ScheduleEvent(EVENT_SUMMON, 30s);
         }
 
         void Reset() override
diff --git a/src/server/scripts/Northrend/Naxxramas/boss_patchwerk.cpp b/src/server/scripts/Northrend/Naxxramas/boss_patchwerk.cpp
index d7f4eba3e3c..81ef54f4ebf 100644
--- a/src/server/scripts/Northrend/Naxxramas/boss_patchwerk.cpp
+++ b/src/server/scripts/Northrend/Naxxramas/boss_patchwerk.cpp
@@ -98,8 +98,8 @@ public:
             _JustEngagedWith();
             Enraged = false;
             Talk(SAY_AGGRO);
-            events.ScheduleEvent(EVENT_HATEFUL, Seconds(1));
-            events.ScheduleEvent(EVENT_BERSERK, Minutes(6));
+            events.ScheduleEvent(EVENT_HATEFUL, 1s);
+            events.ScheduleEvent(EVENT_BERSERK, 6min);
 
             instance->DoStartTimedAchievement(ACHIEVEMENT_TIMED_TYPE_EVENT, ACHIEV_MAKE_QUICK_WERK_OF_HIM_STARTING_EVENT);
         }
@@ -165,7 +165,7 @@ public:
                     case EVENT_BERSERK:
                         DoCast(me, SPELL_BERSERK, true);
                         Talk(EMOTE_BERSERK);
-                        events.ScheduleEvent(EVENT_SLIME, Seconds(2));
+                        events.ScheduleEvent(EVENT_SLIME, 2s);
                         break;
                     case EVENT_SLIME:
                         DoCastAOE(SPELL_SLIME_BOLT, true);
diff --git a/src/server/scripts/Northrend/Naxxramas/boss_razuvious.cpp b/src/server/scripts/Northrend/Naxxramas/boss_razuvious.cpp
index 2b6968d26ea..64432edc737 100644
--- a/src/server/scripts/Northrend/Naxxramas/boss_razuvious.cpp
+++ b/src/server/scripts/Northrend/Naxxramas/boss_razuvious.cpp
@@ -123,10 +123,10 @@ public:
             me->StopMoving();
             summons.DoZoneInCombat();
             Talk(SAY_AGGRO);
-            events.ScheduleEvent(EVENT_ATTACK, Seconds(7));
-            events.ScheduleEvent(EVENT_STRIKE, Seconds(21));
-            events.ScheduleEvent(EVENT_SHOUT, Seconds(16));
-            events.ScheduleEvent(EVENT_KNIFE, Seconds(10));
+            events.ScheduleEvent(EVENT_ATTACK, 7s);
+            events.ScheduleEvent(EVENT_STRIKE, 21s);
+            events.ScheduleEvent(EVENT_SHOUT, 16s);
+            events.ScheduleEvent(EVENT_KNIFE, 10s);
         }
 
         void UpdateAI(uint32 diff) override
diff --git a/src/server/scripts/Northrend/Naxxramas/boss_sapphiron.cpp b/src/server/scripts/Northrend/Naxxramas/boss_sapphiron.cpp
index 8d2ba4ce1c6..b672c928232 100644
--- a/src/server/scripts/Northrend/Naxxramas/boss_sapphiron.cpp
+++ b/src/server/scripts/Northrend/Naxxramas/boss_sapphiron.cpp
@@ -183,7 +183,7 @@ class boss_sapphiron : public CreatureScript
 
                 events.SetPhase(PHASE_GROUND);
                 events.ScheduleEvent(EVENT_CHECK_RESISTS, 0s);
-                events.ScheduleEvent(EVENT_BERSERK, Minutes(15));
+                events.ScheduleEvent(EVENT_BERSERK, 15min);
                 EnterPhaseGround(true);
             }
 
@@ -215,7 +215,7 @@ class boss_sapphiron : public CreatureScript
                 if (param == ACTION_BIRTH)
                 {
                     events.SetPhase(PHASE_BIRTH);
-                    events.ScheduleEvent(EVENT_BIRTH, Seconds(23));
+                    events.ScheduleEvent(EVENT_BIRTH, 23s);
                 }
             }
 
diff --git a/src/server/scripts/Northrend/Naxxramas/boss_thaddius.cpp b/src/server/scripts/Northrend/Naxxramas/boss_thaddius.cpp
index 31c9b2715d6..18e2ecb307d 100644
--- a/src/server/scripts/Northrend/Naxxramas/boss_thaddius.cpp
+++ b/src/server/scripts/Northrend/Naxxramas/boss_thaddius.cpp
@@ -265,7 +265,7 @@ struct boss_thaddius : public BossAI
                         feugen->AI()->DoAction(ACTION_FEUGEN_REVIVING_FX);
                     feugenAlive = false;
                     if (stalaggAlive)
-                        events.ScheduleEvent(EVENT_REVIVE_FEUGEN, Seconds(5), 0, PHASE_PETS);
+                        events.ScheduleEvent(EVENT_REVIVE_FEUGEN, 5s, 0, PHASE_PETS);
                     else
                         Transition();
 
@@ -275,7 +275,7 @@ struct boss_thaddius : public BossAI
                         stalagg->AI()->DoAction(ACTION_STALAGG_REVIVING_FX);
                     stalaggAlive = false;
                     if (feugenAlive)
-                        events.ScheduleEvent(EVENT_REVIVE_STALAGG, Seconds(5), 0, PHASE_PETS);
+                        events.ScheduleEvent(EVENT_REVIVE_STALAGG, 5s, 0, PHASE_PETS);
                     else
                         Transition();
 
@@ -300,9 +300,9 @@ struct boss_thaddius : public BossAI
 
             me->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NOT_SELECTABLE);
 
-            events.ScheduleEvent(EVENT_TRANSITION_1, Seconds(10), 0, PHASE_TRANSITION);
-            events.ScheduleEvent(EVENT_TRANSITION_2, Seconds(12), 0, PHASE_TRANSITION);
-            events.ScheduleEvent(EVENT_TRANSITION_3, Seconds(14), 0, PHASE_TRANSITION);
+            events.ScheduleEvent(EVENT_TRANSITION_1, 10s, 0, PHASE_TRANSITION);
+            events.ScheduleEvent(EVENT_TRANSITION_2, 12s, 0, PHASE_TRANSITION);
+            events.ScheduleEvent(EVENT_TRANSITION_3, 14s, 0, PHASE_TRANSITION);
         }
 
         void BeginResetEncounter()
@@ -401,10 +401,10 @@ struct boss_thaddius : public BossAI
 
                         Talk(SAY_AGGRO);
 
-                        events.ScheduleEvent(EVENT_ENABLE_BALL_LIGHTNING, Seconds(5), 0, PHASE_THADDIUS);
-                        events.ScheduleEvent(EVENT_SHIFT, Seconds(10), 0, PHASE_THADDIUS);
-                        events.ScheduleEvent(EVENT_CHAIN, randtime(Seconds(10), Seconds(20)), 0, PHASE_THADDIUS);
-                        events.ScheduleEvent(EVENT_BERSERK, Minutes(6), 0, PHASE_THADDIUS);
+                        events.ScheduleEvent(EVENT_ENABLE_BALL_LIGHTNING, 5s, 0, PHASE_THADDIUS);
+                        events.ScheduleEvent(EVENT_SHIFT, 10s, 0, PHASE_THADDIUS);
+                        events.ScheduleEvent(EVENT_CHAIN, 10s, 20s, 0, PHASE_THADDIUS);
+                        events.ScheduleEvent(EVENT_BERSERK, 6min, 0, PHASE_THADDIUS);
 
                         break;
                     case EVENT_ENABLE_BALL_LIGHTNING:
@@ -413,8 +413,8 @@ struct boss_thaddius : public BossAI
                     case EVENT_SHIFT:
                         me->CastStop(); // shift overrides all other spells
                         DoCastAOE(SPELL_POLARITY_SHIFT);
-                        events.ScheduleEvent(EVENT_SHIFT_TALK, Seconds(3), PHASE_THADDIUS);
-                        events.ScheduleEvent(EVENT_SHIFT, Seconds(30), PHASE_THADDIUS);
+                        events.ScheduleEvent(EVENT_SHIFT_TALK, 3s, PHASE_THADDIUS);
+                        events.ScheduleEvent(EVENT_SHIFT, 30s, PHASE_THADDIUS);
                         break;
                     case EVENT_SHIFT_TALK:
                         Talk(SAY_ELECT);
diff --git a/src/server/scripts/Northrend/Naxxramas/instance_naxxramas.cpp b/src/server/scripts/Northrend/Naxxramas/instance_naxxramas.cpp
index 3c501aa3cd7..8c5b99bb034 100644
--- a/src/server/scripts/Northrend/Naxxramas/instance_naxxramas.cpp
+++ b/src/server/scripts/Northrend/Naxxramas/instance_naxxramas.cpp
@@ -127,7 +127,7 @@ class instance_naxxramas : public InstanceMapScript
                 playerDied              = 0;
 
                 nextFroggerWave         = 0;
-                events.ScheduleEvent(EVENT_SUMMON_FROGGER_WAVE, Seconds(1));
+                events.ScheduleEvent(EVENT_SUMMON_FROGGER_WAVE, 1s);
             }
 
             void OnCreatureCreate(Creature* creature) override
@@ -361,7 +361,7 @@ class instance_naxxramas : public InstanceMapScript
                             if (GameObject* teleporter = GetGameObject(DATA_NAXX_PORTAL_ARACHNID))
                                 teleporter->RemoveFlag(GAMEOBJECT_FLAGS, GO_FLAG_NOT_SELECTABLE);
 
-                            events.ScheduleEvent(EVENT_KELTHUZAD_WING_TAUNT, Seconds(6));
+                            events.ScheduleEvent(EVENT_KELTHUZAD_WING_TAUNT, 6s);
                         }
                         break;
                     case BOSS_LOATHEB:
@@ -370,7 +370,7 @@ class instance_naxxramas : public InstanceMapScript
                             if (GameObject* teleporter = GetGameObject(DATA_NAXX_PORTAL_PLAGUE))
                                 teleporter->RemoveFlag(GAMEOBJECT_FLAGS, GO_FLAG_NOT_SELECTABLE);
 
-                            events.ScheduleEvent(EVENT_KELTHUZAD_WING_TAUNT, Seconds(6));
+                            events.ScheduleEvent(EVENT_KELTHUZAD_WING_TAUNT, 6s);
                         }
                         break;
                     case BOSS_THADDIUS:
@@ -379,12 +379,12 @@ class instance_naxxramas : public InstanceMapScript
                             if (GameObject* teleporter = GetGameObject(DATA_NAXX_PORTAL_CONSTRUCT))
                                 teleporter->RemoveFlag(GAMEOBJECT_FLAGS, GO_FLAG_NOT_SELECTABLE);
 
-                            events.ScheduleEvent(EVENT_KELTHUZAD_WING_TAUNT, Seconds(6));
+                            events.ScheduleEvent(EVENT_KELTHUZAD_WING_TAUNT, 6s);
                         }
                         break;
                     case BOSS_GOTHIK:
                         if (state == DONE)
-                            events.ScheduleEvent(EVENT_DIALOGUE_GOTHIK_KORTHAZZ, Seconds(10));
+                            events.ScheduleEvent(EVENT_DIALOGUE_GOTHIK_KORTHAZZ, 10s);
                         break;
                     case BOSS_HORSEMEN:
                         if (state == DONE)
@@ -398,12 +398,12 @@ class instance_naxxramas : public InstanceMapScript
                             if (GameObject* teleporter = GetGameObject(DATA_NAXX_PORTAL_MILITARY))
                                 teleporter->RemoveFlag(GAMEOBJECT_FLAGS, GO_FLAG_NOT_SELECTABLE);
 
-                            events.ScheduleEvent(EVENT_KELTHUZAD_WING_TAUNT, Seconds(6));
+                            events.ScheduleEvent(EVENT_KELTHUZAD_WING_TAUNT, 6s);
                         }
                         break;
                     case BOSS_SAPPHIRON:
                         if (state == DONE)
-                            events.ScheduleEvent(EVENT_DIALOGUE_SAPPHIRON_KELTHUZAD, Seconds(6));
+                            events.ScheduleEvent(EVENT_DIALOGUE_SAPPHIRON_KELTHUZAD, 6s);
                         HandleGameObject(KelthuzadDoorGUID, false);
                         break;
                     case BOSS_KELTHUZAD:
@@ -429,17 +429,17 @@ class instance_naxxramas : public InstanceMapScript
                         case EVENT_DIALOGUE_GOTHIK_KORTHAZZ:
                             if (Creature* korthazz = instance->GetCreature(ThaneGUID))
                                 korthazz->AI()->Talk(SAY_DIALOGUE_GOTHIK_HORSEMAN);
-                            events.ScheduleEvent(EVENT_DIALOGUE_GOTHIK_ZELIEK, Seconds(5));
+                            events.ScheduleEvent(EVENT_DIALOGUE_GOTHIK_ZELIEK, 5s);
                             break;
                         case EVENT_DIALOGUE_GOTHIK_ZELIEK:
                             if (Creature* zeliek = instance->GetCreature(SirGUID))
                                 zeliek->AI()->Talk(SAY_DIALOGUE_GOTHIK_HORSEMAN);
-                            events.ScheduleEvent(EVENT_DIALOGUE_GOTHIK_BLAUMEUX, Seconds(6));
+                            events.ScheduleEvent(EVENT_DIALOGUE_GOTHIK_BLAUMEUX, 6s);
                             break;
                         case EVENT_DIALOGUE_GOTHIK_BLAUMEUX:
                             if (Creature* blaumeux = instance->GetCreature(LadyGUID))
                                 blaumeux->AI()->Talk(SAY_DIALOGUE_GOTHIK_HORSEMAN);
-                            events.ScheduleEvent(EVENT_DIALOGUE_GOTHIK_RIVENDARE, Seconds(6));
+                            events.ScheduleEvent(EVENT_DIALOGUE_GOTHIK_RIVENDARE, 6s);
                             break;
                         case EVENT_DIALOGUE_GOTHIK_RIVENDARE:
                             if (Creature* rivendare = instance->GetCreature(BaronGUID))
@@ -485,7 +485,7 @@ class instance_naxxramas : public InstanceMapScript
                         case EVENT_DIALOGUE_SAPPHIRON_KELTHUZAD:
                             if (Creature* kelthuzad = instance->GetCreature(KelthuzadGUID))
                                 kelthuzad->AI()->Talk(SAY_DIALOGUE_SAPPHIRON_KELTHUZAD);
-                            events.ScheduleEvent(EVENT_DIALOGUE_SAPPHIRON_LICHKING, Seconds(6));
+                            events.ScheduleEvent(EVENT_DIALOGUE_SAPPHIRON_LICHKING, 6s);
                             break;
                         case EVENT_DIALOGUE_SAPPHIRON_LICHKING:
                             if (Creature* lichKing = instance->GetCreature(LichKingGUID))
diff --git a/src/server/scripts/Northrend/Nexus/EyeOfEternity/boss_malygos.cpp b/src/server/scripts/Northrend/Nexus/EyeOfEternity/boss_malygos.cpp
index 675ca6fcd9c..e449db05fb1 100644
--- a/src/server/scripts/Northrend/Nexus/EyeOfEternity/boss_malygos.cpp
+++ b/src/server/scripts/Northrend/Nexus/EyeOfEternity/boss_malygos.cpp
@@ -542,10 +542,10 @@ public:
                     events.ScheduleEvent(EVENT_START_FIRST_RANDOM_PORTAL, 2*IN_MILLISECONDS, 1, _phase);
                     break;
                 case PHASE_ONE:
-                    events.ScheduleEvent(EVENT_ARCANE_BREATH, urand(8, 10)*IN_MILLISECONDS, 0, _phase);
-                    events.ScheduleEvent(EVENT_ARCANE_STORM, urand(3, 6)*IN_MILLISECONDS, 0, _phase);
-                    events.ScheduleEvent(EVENT_VORTEX, urand(30, 35)*IN_MILLISECONDS, 0, _phase);
-                    events.ScheduleEvent(EVENT_POWER_SPARKS, urand(20, 30)*IN_MILLISECONDS, 0, _phase);
+                    events.ScheduleEvent(EVENT_ARCANE_BREATH, 8s, 10s, 0, _phase);
+                    events.ScheduleEvent(EVENT_ARCANE_STORM, 3s, 6s, 0, _phase);
+                    events.ScheduleEvent(EVENT_VORTEX, 30s, 35s, 0, _phase);
+                    events.ScheduleEvent(EVENT_POWER_SPARKS, 20s, 30s, 0, _phase);
                     break;
                 case PHASE_TWO:
                     events.ScheduleEvent(EVENT_MOVE_TO_POINT_SURGE_P_TWO, 60*IN_MILLISECONDS, 0, _phase);
@@ -554,8 +554,8 @@ public:
                 case PHASE_THREE:
                     events.ScheduleEvent(EVENT_ARCANE_PULSE, 7*IN_MILLISECONDS, 0, _phase);
                     events.ScheduleEvent(EVENT_ARCANE_STORM, 10*IN_MILLISECONDS, 0, _phase);
-                    events.ScheduleEvent(EVENT_SURGE_OF_POWER_P_THREE, urand(4, 6)*IN_MILLISECONDS, 0, _phase);
-                    events.ScheduleEvent(EVENT_STATIC_FIELD, urand(20, 30)*IN_MILLISECONDS, 0, _phase);
+                    events.ScheduleEvent(EVENT_SURGE_OF_POWER_P_THREE, 4s, 6s, 0, _phase);
+                    events.ScheduleEvent(EVENT_STATIC_FIELD, 20s, 30s, 0, _phase);
                     break;
             }
         }
@@ -772,12 +772,12 @@ public:
                         break;
                     case EVENT_SAY_INTRO:
                         Talk(SAY_INTRO_EVENT);
-                        events.ScheduleEvent(EVENT_SAY_INTRO, urand(85, 95)*IN_MILLISECONDS, 1, PHASE_NOT_STARTED);
+                        events.ScheduleEvent(EVENT_SAY_INTRO, 85s, 95s, 1, PHASE_NOT_STARTED);
                         break;
                     case EVENT_VORTEX:
                         _executingVortex = true;
                         DoAction(ACTION_LIFT_IN_AIR);
-                        events.ScheduleEvent(EVENT_VORTEX, urand(60, 80)*IN_MILLISECONDS, 0, PHASE_ONE);
+                        events.ScheduleEvent(EVENT_VORTEX, 60s, 80s, 0, PHASE_ONE);
                         break;
                     case EVENT_MOVE_TO_VORTEX_POINT:
                         me->SetReactState(REACT_PASSIVE);
@@ -786,7 +786,7 @@ public:
                         break;
                     case EVENT_POWER_SPARKS:
                         instance->SetData(DATA_POWER_SPARKS_HANDLING, 0);
-                        events.ScheduleEvent(EVENT_POWER_SPARKS, urand(30, 35)*IN_MILLISECONDS, 0, PHASE_ONE);
+                        events.ScheduleEvent(EVENT_POWER_SPARKS, 30s, 35s, 0, PHASE_ONE);
                         break;
                     case EVENT_ARCANE_BREATH:
                         if (_executingVortex)
@@ -813,7 +813,7 @@ public:
                         else if (_phase == PHASE_THREE)
                         {
                             DoCastAOE(SPELL_ARCANE_STORM_P_III, true);
-                            events.ScheduleEvent(EVENT_ARCANE_STORM, urand(6, 12)*IN_MILLISECONDS, 0, PHASE_THREE);
+                            events.ScheduleEvent(EVENT_ARCANE_STORM, 6s, 12s, 0, PHASE_THREE);
                         }
                         break;
                     case EVENT_FLY_OUT_OF_PLATFORM:
@@ -893,7 +893,7 @@ public:
                             if (Creature* lastArcaneOverloadBunny = ObjectAccessor::GetCreature(*me, _arcaneOverloadGUID))
                                 DoCast(lastArcaneOverloadBunny, SPELL_ARCANE_BOMB_TRIGGER, true);
                         }
-                        events.ScheduleEvent(EVENT_SUMMON_ARCANE_BOMB, urand(15, 16)*IN_MILLISECONDS, 2, PHASE_TWO);
+                        events.ScheduleEvent(EVENT_SUMMON_ARCANE_BOMB, 15s, 16s, 2, PHASE_TWO);
                         break;
                     case EVENT_ARCANE_PULSE:
                         if (_preparingPulsesChecker < 2)
@@ -951,13 +951,13 @@ public:
                             DoCastAOE(SPELL_SURGE_OF_POWER_WARNING_SELECTOR_25, true);
                         }
 
-                        events.ScheduleEvent(EVENT_SURGE_OF_POWER_P_THREE, urand(9, 18)*IN_MILLISECONDS, 0, PHASE_THREE);
+                        events.ScheduleEvent(EVENT_SURGE_OF_POWER_P_THREE, 9s, 18s, 0, PHASE_THREE);
                         break;
                     case EVENT_STATIC_FIELD:
                         if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0, 60.0f, false, true, SPELL_RIDE_RED_DRAGON_BUDDY))
                             DoCast(target, SPELL_STATIC_FIELD_MISSLE, true);
 
-                        events.ScheduleEvent(EVENT_STATIC_FIELD, urand(15, 30)*IN_MILLISECONDS, 0, PHASE_THREE);
+                        events.ScheduleEvent(EVENT_STATIC_FIELD, 15s, 30s, 0, PHASE_THREE);
                         break;
                     case EVENT_PREVENT_SAY_SPAM_ON_KILL:
                         _killSpamFilter = false;
@@ -1320,8 +1320,8 @@ class npc_nexus_lord : public CreatureScript
             void DoAction(int32 /*action*/) override
             {
                 _events.ScheduleEvent(EVENT_NUKE_DUMMY, 1);
-                _events.ScheduleEvent(EVENT_ARCANE_SHOCK, 2*IN_MILLISECONDS);
-                _events.ScheduleEvent(EVENT_HASTE_BUFF, 12*IN_MILLISECONDS);
+                _events.ScheduleEvent(EVENT_ARCANE_SHOCK, 2s);
+                _events.ScheduleEvent(EVENT_HASTE_BUFF, 12s);
             }
 
             void UpdateAI(uint32 diff) override
@@ -1338,16 +1338,16 @@ class npc_nexus_lord : public CreatureScript
                         case EVENT_ARCANE_SHOCK:
                             if (Unit* victim = SelectTarget(SELECT_TARGET_RANDOM, 0, 5.0f, true))
                                 DoCast(victim, SPELL_ARCANE_SHOCK);
-                            _events.ScheduleEvent(EVENT_ARCANE_SHOCK, urand(7, 15)*IN_MILLISECONDS);
+                            _events.ScheduleEvent(EVENT_ARCANE_SHOCK, 7s, 15s);
                             break;
                         case EVENT_HASTE_BUFF:
                             DoCast(me, SPELL_HASTE);
-                            _events.ScheduleEvent(EVENT_HASTE_BUFF, 15*IN_MILLISECONDS);
+                            _events.ScheduleEvent(EVENT_HASTE_BUFF, 15s);
                             break;
                         case EVENT_NUKE_DUMMY:
                             DoCastVictim(SPELL_DUMMY_NUKE, true);
                             DoCast(me, SPELL_ALIGN_DISK_AGGRO, true);
-                            _events.ScheduleEvent(EVENT_NUKE_DUMMY, 1*IN_MILLISECONDS);
+                            _events.ScheduleEvent(EVENT_NUKE_DUMMY, 1s);
                             break;
                     }
                 }
@@ -1391,7 +1391,7 @@ class npc_scion_of_eternity : public CreatureScript
 
             void IsSummonedBy(Unit* /*summoner*/) override
             {
-                _events.ScheduleEvent(EVENT_ARCANE_BARRAGE, urand(14, 29)*IN_MILLISECONDS);
+                _events.ScheduleEvent(EVENT_ARCANE_BARRAGE, 14s, 29s);
             }
 
             void JustEngagedWith(Unit* /*who*/) override
@@ -1416,7 +1416,7 @@ class npc_scion_of_eternity : public CreatureScript
                     {
                         case EVENT_ARCANE_BARRAGE:
                             DoCast(me, SPELL_ARCANE_BARRAGE);
-                            _events.ScheduleEvent(EVENT_ARCANE_BARRAGE, urand(3, 15)*IN_MILLISECONDS);
+                            _events.ScheduleEvent(EVENT_ARCANE_BARRAGE, 3s, 15s);
                             break;
                     }
                 }
@@ -1511,7 +1511,7 @@ public:
             if (Player* player = summoner->ToPlayer())
             {
                 _summoner = player->GetGUID();
-                _events.ScheduleEvent(EVENT_CAST_RIDE_SPELL, 2*IN_MILLISECONDS);
+                _events.ScheduleEvent(EVENT_CAST_RIDE_SPELL, 2s);
             }
         }
 
diff --git a/src/server/scripts/Northrend/Nexus/Nexus/boss_keristrasza.cpp b/src/server/scripts/Northrend/Nexus/Nexus/boss_keristrasza.cpp
index 0dfee26e1d1..e24564c19b4 100644
--- a/src/server/scripts/Northrend/Nexus/Nexus/boss_keristrasza.cpp
+++ b/src/server/scripts/Northrend/Nexus/Nexus/boss_keristrasza.cpp
@@ -98,9 +98,9 @@ class boss_keristrasza : public CreatureScript
                 DoCastAOE(SPELL_INTENSE_COLD);
                 _JustEngagedWith();
 
-                events.ScheduleEvent(EVENT_CRYSTAL_FIRE_BREATH, 14000);
+                events.ScheduleEvent(EVENT_CRYSTAL_FIRE_BREATH, 14s);
                 events.ScheduleEvent(EVENT_CRYSTAL_CHAINS_CRYSTALIZE, DUNGEON_MODE(30000, 11000));
-                events.ScheduleEvent(EVENT_TAIL_SWEEP, 5000);
+                events.ScheduleEvent(EVENT_TAIL_SWEEP, 5s);
             }
 
             void JustDied(Unit* /*killer*/) override
@@ -184,11 +184,11 @@ class boss_keristrasza : public CreatureScript
                     {
                         case EVENT_CRYSTAL_FIRE_BREATH:
                             DoCastVictim(SPELL_CRYSTALFIRE_BREATH);
-                            events.ScheduleEvent(EVENT_CRYSTAL_FIRE_BREATH, 14000);
+                            events.ScheduleEvent(EVENT_CRYSTAL_FIRE_BREATH, 14s);
                             break;
                         case EVENT_CRYSTAL_CHAINS_CRYSTALIZE:
                             DoCast(me, SPELL_TAIL_SWEEP);
-                            events.ScheduleEvent(EVENT_CRYSTAL_CHAINS_CRYSTALIZE, 5000);
+                            events.ScheduleEvent(EVENT_CRYSTAL_CHAINS_CRYSTALIZE, 5s);
                             break;
                         case EVENT_TAIL_SWEEP:
                             Talk(SAY_CRYSTAL_NOVA);
diff --git a/src/server/scripts/Northrend/Nexus/Nexus/boss_nexus_commanders.cpp b/src/server/scripts/Northrend/Nexus/Nexus/boss_nexus_commanders.cpp
index e4adfdefb35..f5f7366a8d8 100644
--- a/src/server/scripts/Northrend/Nexus/Nexus/boss_nexus_commanders.cpp
+++ b/src/server/scripts/Northrend/Nexus/Nexus/boss_nexus_commanders.cpp
@@ -58,9 +58,9 @@ class boss_nexus_commanders : public CreatureScript
                 me->RemoveAurasDueToSpell(SPELL_FROZEN_PRISON);
                 DoCast(me, SPELL_BATTLE_SHOUT);
 
-                events.ScheduleEvent(EVENT_CHARGE_COMMANDER, urand(3000, 4000));
-                events.ScheduleEvent(EVENT_WHIRLWIND, urand(6000, 8000));
-                events.ScheduleEvent(EVENT_FRIGHTENING_SHOUT, urand(13000, 15000));
+                events.ScheduleEvent(EVENT_CHARGE_COMMANDER, 3s, 4s);
+                events.ScheduleEvent(EVENT_WHIRLWIND, 6s, 8s);
+                events.ScheduleEvent(EVENT_FRIGHTENING_SHOUT, 13s, 15s);
             }
 
             void ExecuteEvent(uint32 eventId) override
@@ -70,7 +70,7 @@ class boss_nexus_commanders : public CreatureScript
                     case EVENT_CHARGE_COMMANDER:
                         if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0, 100.0f, true))
                             DoCast(target, SPELL_CHARGE);
-                        events.ScheduleEvent(EVENT_CHARGE_COMMANDER, urand(11000, 15000));
+                        events.ScheduleEvent(EVENT_CHARGE_COMMANDER, 11s, 15s);
                         break;
                     case EVENT_WHIRLWIND:
                         DoCast(me, SPELL_WHIRLWIND);
@@ -78,7 +78,7 @@ class boss_nexus_commanders : public CreatureScript
                         break;
                     case EVENT_FRIGHTENING_SHOUT:
                         DoCastAOE(SPELL_FRIGHTENING_SHOUT);
-                        events.ScheduleEvent(EVENT_FRIGHTENING_SHOUT, urand(45000, 55000));
+                        events.ScheduleEvent(EVENT_FRIGHTENING_SHOUT, 45s, 55s);
                         break;
                     default:
                         break;
diff --git a/src/server/scripts/Northrend/Nexus/Nexus/boss_ormorok.cpp b/src/server/scripts/Northrend/Nexus/Nexus/boss_ormorok.cpp
index 1cce1b3cdae..cdcfc0b4279 100644
--- a/src/server/scripts/Northrend/Nexus/Nexus/boss_ormorok.cpp
+++ b/src/server/scripts/Northrend/Nexus/Nexus/boss_ormorok.cpp
@@ -89,11 +89,11 @@ public:
         {
             _JustEngagedWith();
 
-            events.ScheduleEvent(EVENT_CRYSTAL_SPIKES, 12000);
-            events.ScheduleEvent(EVENT_TRAMPLE, 10000);
-            events.ScheduleEvent(EVENT_SPELL_REFLECTION, 30000);
+            events.ScheduleEvent(EVENT_CRYSTAL_SPIKES, 12s);
+            events.ScheduleEvent(EVENT_TRAMPLE, 10s);
+            events.ScheduleEvent(EVENT_SPELL_REFLECTION, 30s);
             if (IsHeroic())
-                events.ScheduleEvent(EVENT_CRYSTALLINE_TANGLER, 17000);
+                events.ScheduleEvent(EVENT_CRYSTALLINE_TANGLER, 15s);
 
             Talk(SAY_AGGRO);
         }
@@ -136,22 +136,22 @@ public:
                 {
                     case EVENT_TRAMPLE:
                         DoCast(me, SPELL_TRAMPLE);
-                        events.ScheduleEvent(EVENT_TRAMPLE, 10000);
+                        events.ScheduleEvent(EVENT_TRAMPLE, 10s);
                         break;
                     case EVENT_SPELL_REFLECTION:
                         Talk(SAY_REFLECT);
                         DoCast(me, SPELL_SPELL_REFLECTION);
-                        events.ScheduleEvent(EVENT_SPELL_REFLECTION, 30000);
+                        events.ScheduleEvent(EVENT_SPELL_REFLECTION, 30s);
                         break;
                     case EVENT_CRYSTAL_SPIKES:
                         Talk(SAY_CRYSTAL_SPIKES);
                         DoCast(SPELL_CRYSTAL_SPIKES);
-                        events.ScheduleEvent(EVENT_CRYSTAL_SPIKES, 12000);
+                        events.ScheduleEvent(EVENT_CRYSTAL_SPIKES, 12s);
                         break;
                     case EVENT_CRYSTALLINE_TANGLER:
                         if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0, OrmorokTanglerPredicate(me)))
                             DoCast(target, SPELL_SUMMON_CRYSTALLINE_TANGLER);
-                        events.ScheduleEvent(EVENT_CRYSTALLINE_TANGLER, 17000);
+                        events.ScheduleEvent(EVENT_CRYSTALLINE_TANGLER, 15s);
                         break;
                     default:
                         break;
diff --git a/src/server/scripts/Northrend/Nexus/Oculus/boss_drakos.cpp b/src/server/scripts/Northrend/Nexus/Oculus/boss_drakos.cpp
index 9aafde5f576..2e01d4d5d8c 100644
--- a/src/server/scripts/Northrend/Nexus/Oculus/boss_drakos.cpp
+++ b/src/server/scripts/Northrend/Nexus/Oculus/boss_drakos.cpp
@@ -74,8 +74,8 @@ class boss_drakos : public CreatureScript
                 _Reset();
 
                 events.ScheduleEvent(EVENT_MAGIC_PULL, 15000);
-                events.ScheduleEvent(EVENT_STOMP, 17000);
-                events.ScheduleEvent(EVENT_BOMB_SUMMON, 2000);
+                events.ScheduleEvent(EVENT_STOMP, 15s);
+                events.ScheduleEvent(EVENT_BOMB_SUMMON, 2s);
 
                 Initialize();
             }
@@ -108,7 +108,7 @@ class boss_drakos : public CreatureScript
                                     me->SummonCreature(NPC_UNSTABLE_SPHERE, position);
                                 }
                             }
-                            events.ScheduleEvent(EVENT_BOMB_SUMMON, 2000);
+                            events.ScheduleEvent(EVENT_BOMB_SUMMON, 2s);
                             break;
                         case EVENT_MAGIC_PULL:
                             DoCast(SPELL_MAGIC_PULL);
@@ -118,7 +118,7 @@ class boss_drakos : public CreatureScript
                         case EVENT_STOMP:
                             Talk(SAY_STOMP);
                             DoCast(SPELL_THUNDERING_STOMP);
-                            events.ScheduleEvent(EVENT_STOMP, 17000);
+                            events.ScheduleEvent(EVENT_STOMP, 15s);
                             break;
                         default:
                             break;
diff --git a/src/server/scripts/Northrend/Nexus/Oculus/boss_eregos.cpp b/src/server/scripts/Northrend/Nexus/Oculus/boss_eregos.cpp
index ddeb1a44936..9106bdbfbaa 100644
--- a/src/server/scripts/Northrend/Nexus/Oculus/boss_eregos.cpp
+++ b/src/server/scripts/Northrend/Nexus/Oculus/boss_eregos.cpp
@@ -151,10 +151,10 @@ class boss_eregos : public CreatureScript
                     return;
 
                 events.SetPhase(PHASE_NORMAL);
-                events.ScheduleEvent(EVENT_ARCANE_BARRAGE, urand(3, 10) * IN_MILLISECONDS, 0, PHASE_NORMAL);
-                events.ScheduleEvent(EVENT_ARCANE_VOLLEY, urand(10, 25) * IN_MILLISECONDS, 0, PHASE_NORMAL);
-                events.ScheduleEvent(EVENT_ENRAGED_ASSAULT, urand(35, 50) * IN_MILLISECONDS, 0, PHASE_NORMAL);
-                events.ScheduleEvent(EVENT_SUMMON_LEY_WHELP, urand(15, 30) * IN_MILLISECONDS, 0, PHASE_NORMAL);
+                events.ScheduleEvent(EVENT_ARCANE_BARRAGE, 3s, 10s, 0, PHASE_NORMAL);
+                events.ScheduleEvent(EVENT_ARCANE_VOLLEY, 10s, 25s, 0, PHASE_NORMAL);
+                events.ScheduleEvent(EVENT_ENRAGED_ASSAULT, 35s, 50s, 0, PHASE_NORMAL);
+                events.ScheduleEvent(EVENT_SUMMON_LEY_WHELP, 15s, 30s, 0, PHASE_NORMAL);
             }
 
             void JustSummoned(Creature* summon) override
@@ -215,21 +215,21 @@ class boss_eregos : public CreatureScript
                     {
                         case EVENT_ARCANE_BARRAGE:
                             DoCastVictim(SPELL_ARCANE_BARRAGE);
-                            events.ScheduleEvent(EVENT_ARCANE_BARRAGE, urand(3, 10) * IN_MILLISECONDS, 0, PHASE_NORMAL);
+                            events.ScheduleEvent(EVENT_ARCANE_BARRAGE, 3s, 10s, 0, PHASE_NORMAL);
                             break;
                         case EVENT_ARCANE_VOLLEY:
                             DoCastAOE(SPELL_ARCANE_VOLLEY);
-                            events.ScheduleEvent(EVENT_ARCANE_VOLLEY, urand(10, 25) * IN_MILLISECONDS, 0, PHASE_NORMAL);
+                            events.ScheduleEvent(EVENT_ARCANE_VOLLEY, 10s, 25s, 0, PHASE_NORMAL);
                             break;
                         case EVENT_ENRAGED_ASSAULT:
                             Talk(SAY_ENRAGE);
                             DoCast(SPELL_ENRAGED_ASSAULT);
-                            events.ScheduleEvent(EVENT_ENRAGED_ASSAULT, urand(35, 50) * IN_MILLISECONDS, 0, PHASE_NORMAL);
+                            events.ScheduleEvent(EVENT_ENRAGED_ASSAULT, 35s, 50s, 0, PHASE_NORMAL);
                             break;
                         case EVENT_SUMMON_LEY_WHELP:
                             for (uint8 i = 0; i < 3; i++)
                                 DoCast(SPELL_SUMMON_LEY_WHELP);
-                            events.ScheduleEvent(EVENT_SUMMON_LEY_WHELP, urand(15, 30) * IN_MILLISECONDS, 0, PHASE_NORMAL);
+                            events.ScheduleEvent(EVENT_SUMMON_LEY_WHELP, 15s, 30s, 0, PHASE_NORMAL);
                             break;
                         default:
                             break;
diff --git a/src/server/scripts/Northrend/Nexus/Oculus/boss_varos.cpp b/src/server/scripts/Northrend/Nexus/Oculus/boss_varos.cpp
index f28253d6504..22744260a31 100644
--- a/src/server/scripts/Northrend/Nexus/Oculus/boss_varos.cpp
+++ b/src/server/scripts/Northrend/Nexus/Oculus/boss_varos.cpp
@@ -84,10 +84,10 @@ class boss_varos : public CreatureScript
             {
                 _Reset();
 
-                events.ScheduleEvent(EVENT_AMPLIFY_MAGIC, urand(20, 25) * IN_MILLISECONDS);
-                events.ScheduleEvent(EVENT_ENERGIZE_CORES_VISUAL, 5000);
+                events.ScheduleEvent(EVENT_AMPLIFY_MAGIC, 20s, 25s);
+                events.ScheduleEvent(EVENT_ENERGIZE_CORES_VISUAL, 5s);
                 // not sure if this is handled by a timer or hp percentage
-                events.ScheduleEvent(EVENT_CALL_AZURE, urand(15, 30) * IN_MILLISECONDS);
+                events.ScheduleEvent(EVENT_CALL_AZURE, 15s, 30s);
 
                 Initialize();
             }
@@ -132,19 +132,19 @@ class boss_varos : public CreatureScript
                                 coreEnergizeOrientation = Position::NormalizeOrientation(coreEnergizeOrientation - 2.0f);
 
                             DoCast(me, SPELL_ENERGIZE_CORES_VISUAL);
-                            events.ScheduleEvent(EVENT_ENERGIZE_CORES_VISUAL, 5000);
-                            events.ScheduleEvent(EVENT_ENERGIZE_CORES, 4000);
+                            events.ScheduleEvent(EVENT_ENERGIZE_CORES_VISUAL, 5s);
+                            events.ScheduleEvent(EVENT_ENERGIZE_CORES, 4s);
                             break;
                         case EVENT_CALL_AZURE:
                             // not sure how blizz handles this, i cant see any pattern between the differnt spells
                             DoCast(me, SPELL_CALL_AZURE_RING_CAPTAIN);
                             Talk(SAY_AZURE);
                             Talk(SAY_AZURE_EMOTE);
-                            events.ScheduleEvent(EVENT_CALL_AZURE, urand(20, 25) * IN_MILLISECONDS);
+                            events.ScheduleEvent(EVENT_CALL_AZURE, 20s, 25s);
                             break;
                         case EVENT_AMPLIFY_MAGIC:
                             DoCastVictim(SPELL_CALL_AMPLIFY_MAGIC);
-                            events.ScheduleEvent(EVENT_AMPLIFY_MAGIC, urand(17, 20) * IN_MILLISECONDS);
+                            events.ScheduleEvent(EVENT_AMPLIFY_MAGIC, 17s, 20s);
                             break;
                         default:
                             break;
diff --git a/src/server/scripts/Northrend/Nexus/Oculus/instance_oculus.cpp b/src/server/scripts/Northrend/Nexus/Oculus/instance_oculus.cpp
index f5db5ea7e25..332c57a8ab2 100644
--- a/src/server/scripts/Northrend/Nexus/Oculus/instance_oculus.cpp
+++ b/src/server/scripts/Northrend/Nexus/Oculus/instance_oculus.cpp
@@ -202,7 +202,7 @@ class instance_oculus : public InstanceMapScript
                             {
                                 eregos->SetPhaseMask(1, true);
                                 GreaterWhelps();
-                                events.ScheduleEvent(EVENT_EREGOS_INTRO, 5000);
+                                events.ScheduleEvent(EVENT_EREGOS_INTRO, 5s);
                             }
                         }
                         break;
diff --git a/src/server/scripts/Northrend/Nexus/Oculus/oculus.cpp b/src/server/scripts/Northrend/Nexus/Oculus/oculus.cpp
index befd9bcefdf..70d7e9466d2 100644
--- a/src/server/scripts/Northrend/Nexus/Oculus/oculus.cpp
+++ b/src/server/scripts/Northrend/Nexus/Oculus/oculus.cpp
@@ -327,15 +327,15 @@ class npc_ruby_emerald_amber_drake : public CreatureScript
                 if (apply)
                 {
                     if (_instance->GetBossState(DATA_VAROS) != DONE)
-                        _events.ScheduleEvent(EVENT_WELCOME, 10 * IN_MILLISECONDS);
+                        _events.ScheduleEvent(EVENT_WELCOME, 10s);
 
                     else if (_instance->GetBossState(DATA_UROM) == DONE)
-                        _events.ScheduleEvent(EVENT_SPECIAL_ATTACK, 10 * IN_MILLISECONDS);
+                        _events.ScheduleEvent(EVENT_SPECIAL_ATTACK, 10s);
                 }
                 else
                 {
                     _events.Reset();
-                    _events.ScheduleEvent(EVENT_TAKE_OFF, 2 * IN_MILLISECONDS);
+                    _events.ScheduleEvent(EVENT_TAKE_OFF, 2s);
                 }
             }
 
@@ -356,7 +356,7 @@ class npc_ruby_emerald_amber_drake : public CreatureScript
                         case EVENT_WELCOME:
                             if (Unit* creator = ObjectAccessor::GetUnit(*me, me->GetCreatorGUID()))
                                 Talk(WHISPER_DRAKES_WELCOME, creator);
-                            _events.ScheduleEvent(EVENT_ABILITIES, 5 * IN_MILLISECONDS);
+                            _events.ScheduleEvent(EVENT_ABILITIES, 5s);
                             break;
                         case EVENT_ABILITIES:
                             if (Unit* creator = ObjectAccessor::GetUnit(*me, me->GetCreatorGUID()))
@@ -370,7 +370,7 @@ class npc_ruby_emerald_amber_drake : public CreatureScript
                             if (Unit* creator = ObjectAccessor::GetUnit(*me, me->GetCreatorGUID()))
                                 Talk(WHISPER_DRAKES_LOWHEALTH, creator);
                             _healthWarning = false;
-                            _events.ScheduleEvent(EVENT_RESET_LOW_HEALTH, 25000);
+                            _events.ScheduleEvent(EVENT_RESET_LOW_HEALTH, 25s);
                             break;
                         case EVENT_RESET_LOW_HEALTH:
                             _healthWarning = true;
diff --git a/src/server/scripts/Northrend/Ulduar/HallsOfLightning/boss_loken.cpp b/src/server/scripts/Northrend/Ulduar/HallsOfLightning/boss_loken.cpp
index 73508df9562..49d87db36c3 100644
--- a/src/server/scripts/Northrend/Ulduar/HallsOfLightning/boss_loken.cpp
+++ b/src/server/scripts/Northrend/Ulduar/HallsOfLightning/boss_loken.cpp
@@ -108,8 +108,8 @@ public:
             Talk(SAY_AGGRO);
             events.SetPhase(PHASE_NORMAL);
             events.ScheduleEvent(EVENT_ARC_LIGHTNING, 15000);
-            events.ScheduleEvent(EVENT_LIGHTNING_NOVA, 20000);
-            events.ScheduleEvent(EVENT_RESUME_PULSING_SHOCKWAVE, 1000);
+            events.ScheduleEvent(EVENT_LIGHTNING_NOVA, 20s);
+            events.ScheduleEvent(EVENT_RESUME_PULSING_SHOCKWAVE, 1s);
             instance->DoStartTimedAchievement(ACHIEVEMENT_TIMED_TYPE_EVENT, ACHIEV_TIMELY_DEATH_START_EVENT);
         }
 
@@ -132,7 +132,7 @@ public:
             {
                 _isIntroDone = true;
                 Talk(SAY_INTRO_1);
-                events.ScheduleEvent(EVENT_INTRO_DIALOGUE, 20000, 0, PHASE_INTRO);
+                events.ScheduleEvent(EVENT_INTRO_DIALOGUE, 20s, 0, PHASE_INTRO);
             }
             BossAI::MoveInLineOfSight(who);
         }
@@ -151,7 +151,7 @@ public:
                     case EVENT_ARC_LIGHTNING:
                         if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0))
                             DoCast(target, SPELL_ARC_LIGHTNING);
-                        events.ScheduleEvent(EVENT_ARC_LIGHTNING, urand(15000, 16000));
+                        events.ScheduleEvent(EVENT_ARC_LIGHTNING, 15s, 16s);
                         break;
                     case EVENT_LIGHTNING_NOVA:
                         Talk(SAY_NOVA);
@@ -159,7 +159,7 @@ public:
                         DoCastAOE(SPELL_LIGHTNING_NOVA);
                         me->RemoveAurasDueToSpell(sSpellMgr->GetSpellIdForDifficulty(SPELL_PULSING_SHOCKWAVE, me));
                         events.ScheduleEvent(EVENT_RESUME_PULSING_SHOCKWAVE, DUNGEON_MODE(5000, 4000)); // Pause Pulsing Shockwave aura
-                        events.ScheduleEvent(EVENT_LIGHTNING_NOVA, urand(20000, 21000));
+                        events.ScheduleEvent(EVENT_LIGHTNING_NOVA, 20s, 21s);
                         break;
                     case EVENT_RESUME_PULSING_SHOCKWAVE:
                         DoCast(me, SPELL_PULSING_SHOCKWAVE_AURA, true);
diff --git a/src/server/scripts/Northrend/Ulduar/HallsOfLightning/boss_volkhan.cpp b/src/server/scripts/Northrend/Ulduar/HallsOfLightning/boss_volkhan.cpp
index c916d93fefc..077fcab300a 100644
--- a/src/server/scripts/Northrend/Ulduar/HallsOfLightning/boss_volkhan.cpp
+++ b/src/server/scripts/Northrend/Ulduar/HallsOfLightning/boss_volkhan.cpp
@@ -463,11 +463,11 @@ public:
                 {
                     case EVENT_BLAST:
                         DoCast(me, SPELL_BLAST_WAVE);
-                        events.ScheduleEvent(EVENT_BLAST, 20 * IN_MILLISECONDS);
+                        events.ScheduleEvent(EVENT_BLAST, 20s);
                         break;
                     case EVENT_IMMOLATION:
                         DoCastVictim(SPELL_IMMOLATION_STRIKE);
-                        events.ScheduleEvent(EVENT_BLAST, 5 * IN_MILLISECONDS);
+                        events.ScheduleEvent(EVENT_BLAST, 5s);
                         break;
                     default:
                         break;
diff --git a/src/server/scripts/Northrend/Ulduar/HallsOfStone/boss_krystallus.cpp b/src/server/scripts/Northrend/Ulduar/HallsOfStone/boss_krystallus.cpp
index 4278b42c53b..8b604782391 100644
--- a/src/server/scripts/Northrend/Ulduar/HallsOfStone/boss_krystallus.cpp
+++ b/src/server/scripts/Northrend/Ulduar/HallsOfStone/boss_krystallus.cpp
@@ -68,11 +68,11 @@ class boss_krystallus : public CreatureScript
                 Talk(SAY_AGGRO);
                 _JustEngagedWith();
 
-                events.ScheduleEvent(EVENT_BOULDER_TOSS, urand(3000, 9000));
-                events.ScheduleEvent(EVENT_GROUND_SLAM, urand(15000, 18000));
-                events.ScheduleEvent(EVENT_STOMP, urand(20000, 29000));
+                events.ScheduleEvent(EVENT_BOULDER_TOSS, 3s, 9s);
+                events.ScheduleEvent(EVENT_GROUND_SLAM, 15s, 18s);
+                events.ScheduleEvent(EVENT_STOMP, 20s, 29s);
                 if (IsHeroic())
-                    events.ScheduleEvent(EVENT_GROUND_SPIKE, urand(9000, 14000));
+                    events.ScheduleEvent(EVENT_GROUND_SPIKE, 9s, 14s);
             }
 
             void UpdateAI(uint32 diff) override
@@ -93,21 +93,21 @@ class boss_krystallus : public CreatureScript
                         case EVENT_BOULDER_TOSS:
                             if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0, 50.0f, true))
                                 DoCast(target, SPELL_BOULDER_TOSS);
-                            events.ScheduleEvent(EVENT_BOULDER_TOSS, urand(9000, 15000));
+                            events.ScheduleEvent(EVENT_BOULDER_TOSS, 9s, 15s);
                             break;
                         case EVENT_GROUND_SPIKE:
                             if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0, 100.0f, true))
                                 DoCast(target, SPELL_GROUND_SPIKE);
-                            events.ScheduleEvent(EVENT_GROUND_SPIKE, urand(12000, 17000));
+                            events.ScheduleEvent(EVENT_GROUND_SPIKE, 12s, 17s);
                             break;
                         case EVENT_GROUND_SLAM:
                             DoCast(me, SPELL_GROUND_SLAM);
-                            events.ScheduleEvent(EVENT_SHATTER, 10000);
-                            events.ScheduleEvent(EVENT_GROUND_SLAM, urand(15000, 18000));
+                            events.ScheduleEvent(EVENT_SHATTER, 10s);
+                            events.ScheduleEvent(EVENT_GROUND_SLAM, 15s, 18s);
                             break;
                         case EVENT_STOMP:
                             DoCast(me, SPELL_STOMP);
-                            events.ScheduleEvent(EVENT_STOMP, urand(20000, 29000));
+                            events.ScheduleEvent(EVENT_STOMP, 20s, 29s);
                             break;
                         case EVENT_SHATTER:
                             DoCast(me, SPELL_SHATTER);
diff --git a/src/server/scripts/Northrend/Ulduar/HallsOfStone/boss_maiden_of_grief.cpp b/src/server/scripts/Northrend/Ulduar/HallsOfStone/boss_maiden_of_grief.cpp
index 5435408edc9..4bfaac44f3e 100644
--- a/src/server/scripts/Northrend/Ulduar/HallsOfStone/boss_maiden_of_grief.cpp
+++ b/src/server/scripts/Northrend/Ulduar/HallsOfStone/boss_maiden_of_grief.cpp
@@ -63,10 +63,10 @@ class boss_maiden_of_grief : public CreatureScript
                 _Reset();
 
                 if (IsHeroic())
-                    events.ScheduleEvent(EVENT_PARTING_SORROW, urand(25000, 30000));
-                events.ScheduleEvent(EVENT_STORM_OF_GRIEF, 10000);
-                events.ScheduleEvent(EVENT_SHOCK_OF_SORROW, urand(20000, 25000));
-                events.ScheduleEvent(EVENT_PILLAR_OF_WOE, urand(5000, 15000));
+                    events.ScheduleEvent(EVENT_PARTING_SORROW, 25s, 30s);
+                events.ScheduleEvent(EVENT_STORM_OF_GRIEF, 10s);
+                events.ScheduleEvent(EVENT_SHOCK_OF_SORROW, 20s, 25s);
+                events.ScheduleEvent(EVENT_PILLAR_OF_WOE, 5s, 15s);
 
                 instance->DoStopTimedAchievement(ACHIEVEMENT_TIMED_TYPE_EVENT, ACHIEV_GOOD_GRIEF_START_EVENT);
             }
@@ -108,24 +108,24 @@ class boss_maiden_of_grief : public CreatureScript
                         case EVENT_PARTING_SORROW:
                             if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0, 0.0f, true))
                                 DoCast(target, SPELL_PARTING_SORROW);
-                            events.ScheduleEvent(EVENT_PARTING_SORROW, urand(30000, 40000));
+                            events.ScheduleEvent(EVENT_PARTING_SORROW, 30s, 40s);
                             break;
                         case EVENT_STORM_OF_GRIEF:
                             DoCastVictim(SPELL_STORM_OF_GRIEF, true);
-                            events.ScheduleEvent(EVENT_STORM_OF_GRIEF, urand(15000, 20000));
+                            events.ScheduleEvent(EVENT_STORM_OF_GRIEF, 15s, 20s);
                             break;
                         case EVENT_SHOCK_OF_SORROW:
                             ResetThreatList();
                             Talk(SAY_STUN);
                             DoCastAOE(SPELL_SHOCK_OF_SORROW);
-                            events.ScheduleEvent(EVENT_SHOCK_OF_SORROW, urand(20000, 30000));
+                            events.ScheduleEvent(EVENT_SHOCK_OF_SORROW, 20s, 30s);
                             break;
                         case EVENT_PILLAR_OF_WOE:
                             if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 1, 0.0f, true))
                                 DoCast(target, SPELL_PILLAR_OF_WOE);
                             else
                                 DoCastVictim(SPELL_PILLAR_OF_WOE);
-                            events.ScheduleEvent(EVENT_PILLAR_OF_WOE, urand(5000, 25000));
+                            events.ScheduleEvent(EVENT_PILLAR_OF_WOE, 5s, 25s);
                             break;
                         default:
                             break;
diff --git a/src/server/scripts/Northrend/Ulduar/HallsOfStone/boss_sjonnir.cpp b/src/server/scripts/Northrend/Ulduar/HallsOfStone/boss_sjonnir.cpp
index fef87f3cd7a..0b5257a1f05 100644
--- a/src/server/scripts/Northrend/Ulduar/HallsOfStone/boss_sjonnir.cpp
+++ b/src/server/scripts/Northrend/Ulduar/HallsOfStone/boss_sjonnir.cpp
@@ -106,12 +106,12 @@ class boss_sjonnir : public CreatureScript
                 _JustEngagedWith();
                 Talk(SAY_AGGRO);
 
-                events.ScheduleEvent(EVENT_CHAIN_LIGHTNING, urand(3000, 8000));
-                events.ScheduleEvent(EVENT_LIGHTNING_SHIELD, urand(20000, 25000));
-                events.ScheduleEvent(EVENT_STATIC_CHARGE, urand(20000, 25000));
-                events.ScheduleEvent(EVENT_LIGHTNING_RING, urand(30000, 35000));
-                events.ScheduleEvent(EVENT_SUMMON, 5000);
-                events.ScheduleEvent(EVENT_FRENZY, 300000);
+                events.ScheduleEvent(EVENT_CHAIN_LIGHTNING, 3s, 8s);
+                events.ScheduleEvent(EVENT_LIGHTNING_SHIELD, 20s, 25s);
+                events.ScheduleEvent(EVENT_STATIC_CHARGE, 20s, 25s);
+                events.ScheduleEvent(EVENT_LIGHTNING_RING, 30s, 35s);
+                events.ScheduleEvent(EVENT_SUMMON, 5s);
+                events.ScheduleEvent(EVENT_FRENZY, 5min);
             }
 
             void JustSummoned(Creature* summon) override
@@ -165,18 +165,18 @@ class boss_sjonnir : public CreatureScript
                         case EVENT_CHAIN_LIGHTNING:
                             if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0, 100, true))
                                 DoCast(target, SPELL_CHAIN_LIGHTING);
-                            events.ScheduleEvent(EVENT_CHAIN_LIGHTNING, urand(10000, 15000));
+                            events.ScheduleEvent(EVENT_CHAIN_LIGHTNING, 10s, 15s);
                             break;
                         case EVENT_LIGHTNING_SHIELD:
                             DoCast(me, SPELL_LIGHTING_SHIELD);
                             break;
                         case EVENT_STATIC_CHARGE:
                             DoCastVictim(SPELL_STATIC_CHARGE);
-                            events.ScheduleEvent(EVENT_STATIC_CHARGE, urand(20000, 25000));
+                            events.ScheduleEvent(EVENT_STATIC_CHARGE, 20s, 25s);
                             break;
                         case EVENT_LIGHTNING_RING:
                             DoCast(me, SPELL_LIGHTING_RING);
-                            events.ScheduleEvent(EVENT_LIGHTNING_RING, urand(30000, 35000));
+                            events.ScheduleEvent(EVENT_LIGHTNING_RING, 30s, 35s);
                             break;
                         case EVENT_SUMMON:
                         {
@@ -190,7 +190,7 @@ class boss_sjonnir : public CreatureScript
                             else
                                 me->SummonCreature(NPC_EARTHEN_DWARF, PipeLocations[summonPipe], TEMPSUMMON_CORPSE_TIMED_DESPAWN, 30000);
 
-                            events.ScheduleEvent(EVENT_SUMMON, 20000);
+                            events.ScheduleEvent(EVENT_SUMMON, 20s);
                             break;
                         }
                         case EVENT_FRENZY:
diff --git a/src/server/scripts/Northrend/Ulduar/Ulduar/boss_algalon_the_observer.cpp b/src/server/scripts/Northrend/Ulduar/Ulduar/boss_algalon_the_observer.cpp
index fcc1c1bcbaf..143c0d47546 100644
--- a/src/server/scripts/Northrend/Ulduar/Ulduar/boss_algalon_the_observer.cpp
+++ b/src/server/scripts/Northrend/Ulduar/Ulduar/boss_algalon_the_observer.cpp
@@ -596,7 +596,7 @@ struct boss_algalon_the_observer : public BossAI
                     Talk(EMOTE_ALGALON_COLLAPSING_STAR);
                     for (uint8 i = 0; i < COLLAPSING_STAR_COUNT; ++i)
                         me->SummonCreature(NPC_COLLAPSING_STAR, CollapsingStarPos[i], TEMPSUMMON_CORPSE_DESPAWN);
-                    events.Repeat(60s);
+                    events.Repeat(1min);
                     break;
                 case EVENT_BIG_BANG:
                 {
@@ -994,7 +994,7 @@ struct go_celestial_planetarium_access : public GameObjectAI
 
         // Start Algalon event
         me->SetFlag(GAMEOBJECT_FLAGS, GO_FLAG_IN_USE);
-        _events.ScheduleEvent(EVENT_DESPAWN_CONSOLE, 5000);
+        _events.ScheduleEvent(EVENT_DESPAWN_CONSOLE, 5s);
         if (Creature* brann = me->SummonCreature(NPC_BRANN_BRONZBEARD_ALG, BrannIntroSpawnPos))
             brann->AI()->DoAction(ACTION_START_INTRO);
 
diff --git a/src/server/scripts/Northrend/Ulduar/Ulduar/boss_assembly_of_iron.cpp b/src/server/scripts/Northrend/Ulduar/Ulduar/boss_assembly_of_iron.cpp
index ec6ef75d3a0..19862c64f03 100644
--- a/src/server/scripts/Northrend/Ulduar/Ulduar/boss_assembly_of_iron.cpp
+++ b/src/server/scripts/Northrend/Ulduar/Ulduar/boss_assembly_of_iron.cpp
@@ -165,8 +165,8 @@ class boss_steelbreaker : public CreatureScript
                 Talk(SAY_STEELBREAKER_AGGRO);
                 DoCast(me, SPELL_HIGH_VOLTAGE);
                 events.SetPhase(++phase);
-                events.ScheduleEvent(EVENT_BERSERK, 900000);
-                events.ScheduleEvent(EVENT_FUSION_PUNCH, 15000);
+                events.ScheduleEvent(EVENT_BERSERK, 15min);
+                events.ScheduleEvent(EVENT_FUSION_PUNCH, 15s);
             }
 
             uint32 GetData(uint32 type) const override
@@ -189,7 +189,7 @@ class boss_steelbreaker : public CreatureScript
                         if (phase >= 2)
                             events.RescheduleEvent(EVENT_STATIC_DISRUPTION, 30000);
                         if (phase >= 3)
-                            events.RescheduleEvent(EVENT_OVERWHELMING_POWER, urand(2000, 5000));
+                            events.RescheduleEvent(EVENT_OVERWHELMING_POWER, 2s, 5s);
                         break;
                     case ACTION_ADD_CHARGE:
                         DoCast(me, SPELL_ELECTRICAL_CHARGE, true);
@@ -253,12 +253,12 @@ class boss_steelbreaker : public CreatureScript
                         case EVENT_FUSION_PUNCH:
                             if (me->IsWithinMeleeRange(me->GetVictim()))
                                 DoCastVictim(SPELL_FUSION_PUNCH);
-                            events.ScheduleEvent(EVENT_FUSION_PUNCH, urand(13000, 22000));
+                            events.ScheduleEvent(EVENT_FUSION_PUNCH, 13s, 22s);
                             break;
                         case EVENT_STATIC_DISRUPTION:
                             if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0))
                                 DoCast(target, SPELL_STATIC_DISRUPTION);
-                            events.ScheduleEvent(EVENT_STATIC_DISRUPTION, urand(20000, 40000));
+                            events.ScheduleEvent(EVENT_STATIC_DISRUPTION, 20s, 40s);
                             break;
                         case EVENT_OVERWHELMING_POWER:
                             Talk(SAY_STEELBREAKER_POWER);
@@ -312,9 +312,9 @@ class boss_runemaster_molgeim : public CreatureScript
                 _JustEngagedWith();
                 Talk(SAY_MOLGEIM_AGGRO);
                 events.SetPhase(++phase);
-                events.ScheduleEvent(EVENT_BERSERK, 900000);
-                events.ScheduleEvent(EVENT_SHIELD_OF_RUNES, 30000);
-                events.ScheduleEvent(EVENT_RUNE_OF_POWER, 20000);
+                events.ScheduleEvent(EVENT_BERSERK, 15min);
+                events.ScheduleEvent(EVENT_SHIELD_OF_RUNES, 30s);
+                events.ScheduleEvent(EVENT_RUNE_OF_POWER, 20s);
             }
 
             uint32 GetData(uint32 type) const override
@@ -414,24 +414,24 @@ class boss_runemaster_molgeim : public CreatureScript
                                     break;
                             }
                             DoCast(target, SPELL_SUMMON_RUNE_OF_POWER);
-                            events.ScheduleEvent(EVENT_RUNE_OF_POWER, 60000);
+                            events.ScheduleEvent(EVENT_RUNE_OF_POWER, 1min);
                             break;
                         }
                         case EVENT_SHIELD_OF_RUNES:
                             DoCast(me, SPELL_SHIELD_OF_RUNES);
-                            events.ScheduleEvent(EVENT_SHIELD_OF_RUNES, urand(27000, 34000));
+                            events.ScheduleEvent(EVENT_SHIELD_OF_RUNES, 27s, 34s);
                             break;
                         case EVENT_RUNE_OF_DEATH:
                             Talk(SAY_MOLGEIM_RUNE_DEATH);
                             if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0))
                                 DoCast(target, SPELL_RUNE_OF_DEATH);
-                            events.ScheduleEvent(EVENT_RUNE_OF_DEATH, urand(30000, 40000));
+                            events.ScheduleEvent(EVENT_RUNE_OF_DEATH, 30s, 40s);
                             break;
                         case EVENT_RUNE_OF_SUMMONING:
                             Talk(SAY_MOLGEIM_SUMMON);
                             if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0))
                                 DoCast(target, SPELL_RUNE_OF_SUMMONING);
-                            events.ScheduleEvent(EVENT_RUNE_OF_SUMMONING, urand(30000, 45000));
+                            events.ScheduleEvent(EVENT_RUNE_OF_SUMMONING, 30s, 45s);
                             break;
                     }
 
@@ -491,9 +491,9 @@ class boss_stormcaller_brundir : public CreatureScript
                 _JustEngagedWith();
                 Talk(SAY_BRUNDIR_AGGRO);
                 events.SetPhase(++phase);
-                events.ScheduleEvent(EVENT_MOVE_POSITION, 1000);
-                events.ScheduleEvent(EVENT_BERSERK, 900000);
-                events.ScheduleEvent(EVENT_CHAIN_LIGHTNING, 4000);
+                events.ScheduleEvent(EVENT_MOVE_POSITION, 1s);
+                events.ScheduleEvent(EVENT_BERSERK, 15min);
+                events.ScheduleEvent(EVENT_CHAIN_LIGHTNING, 4s);
                 events.ScheduleEvent(EVENT_OVERLOAD, urand(60000, 120000));
             }
 
@@ -506,7 +506,7 @@ class boss_stormcaller_brundir : public CreatureScript
                         me->SetFullHealth();
                         me->AddAura(SPELL_SUPERCHARGE, me);
                         events.SetPhase(++phase);
-                        events.RescheduleEvent(EVENT_CHAIN_LIGHTNING, urand(7000, 12000));
+                        events.RescheduleEvent(EVENT_CHAIN_LIGHTNING, 7s, 12s);
                         events.RescheduleEvent(EVENT_OVERLOAD, urand(40000, 50000));
                         if (phase >= 2)
                             events.RescheduleEvent(EVENT_LIGHTNING_WHIRL, urand(15000, 250000));
@@ -574,7 +574,7 @@ class boss_stormcaller_brundir : public CreatureScript
                         case EVENT_CHAIN_LIGHTNING:
                             if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0))
                                 DoCast(target, SPELL_CHAIN_LIGHTNING);
-                            events.ScheduleEvent(EVENT_CHAIN_LIGHTNING, urand(7000, 10000));
+                            events.ScheduleEvent(EVENT_CHAIN_LIGHTNING, 7s, 10s);
                             break;
                         case EVENT_OVERLOAD:
                             Talk(EMOTE_BRUNDIR_OVERLOAD);
@@ -584,7 +584,7 @@ class boss_stormcaller_brundir : public CreatureScript
                             break;
                         case EVENT_LIGHTNING_WHIRL:
                             DoCast(SPELL_LIGHTNING_WHIRL);
-                            events.ScheduleEvent(EVENT_LIGHTNING_WHIRL, urand(15000, 20000));
+                            events.ScheduleEvent(EVENT_LIGHTNING_WHIRL, 15s, 20s);
                             break;
                         case EVENT_LIGHTNING_TENDRILS:
                             Talk(SAY_BRUNDIR_FLIGHT);
@@ -593,26 +593,26 @@ class boss_stormcaller_brundir : public CreatureScript
                             me->AttackStop();
                             me->SetHover(true);
                             events.DelayEvents(35000);
-                            events.ScheduleEvent(EVENT_FLIGHT, 2500);
+                            events.ScheduleEvent(EVENT_FLIGHT, 2500ms);
                             events.ScheduleEvent(EVENT_ENDFLIGHT, 32500);
-                            events.ScheduleEvent(EVENT_LIGHTNING_TENDRILS, 90000);
+                            events.ScheduleEvent(EVENT_LIGHTNING_TENDRILS, 90s);
                             break;
                         case EVENT_FLIGHT:
                             if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0))
                                 me->GetMotionMaster()->MovePoint(0, *target);
-                            events.ScheduleEvent(EVENT_FLIGHT, 6000);
+                            events.ScheduleEvent(EVENT_FLIGHT, 6s);
                             break;
                         case EVENT_ENDFLIGHT:
                             me->GetMotionMaster()->Initialize();
                             me->GetMotionMaster()->MovePoint(0, 1586.920166f, 119.848984f, me->GetPositionZ());
                             events.CancelEvent(EVENT_FLIGHT);
                             events.CancelEvent(EVENT_ENDFLIGHT);
-                            events.ScheduleEvent(EVENT_LAND, 4000);
+                            events.ScheduleEvent(EVENT_LAND, 4s);
                             break;
                         case EVENT_LAND:
                             me->SetHover(false);
                             events.CancelEvent(EVENT_LAND);
-                            events.ScheduleEvent(EVENT_GROUND, 2500);
+                            events.ScheduleEvent(EVENT_GROUND, 2500ms);
                             break;
                         case EVENT_GROUND:
                             me->RemoveAurasDueToSpell(sSpellMgr->GetSpellIdForDifficulty(SPELL_LIGHTNING_TENDRILS, me));
diff --git a/src/server/scripts/Northrend/Ulduar/Ulduar/boss_auriaya.cpp b/src/server/scripts/Northrend/Ulduar/Ulduar/boss_auriaya.cpp
index 413af0ef1f1..eee77fb71d4 100644
--- a/src/server/scripts/Northrend/Ulduar/Ulduar/boss_auriaya.cpp
+++ b/src/server/scripts/Northrend/Ulduar/Ulduar/boss_auriaya.cpp
@@ -162,11 +162,11 @@ struct boss_auriaya : public BossAI
         _JustEngagedWith();
         Talk(SAY_AGGRO);
         instance->SendEncounterUnit(ENCOUNTER_FRAME_ENGAGE, me);
-        events.ScheduleEvent(EVENT_SONIC_SCREECH, Seconds(48));
-        events.ScheduleEvent(EVENT_TERRIFYING_SCREECH, Seconds(38));
-        events.ScheduleEvent(EVENT_SUMMON_DEFENDER, Seconds(60));
-        events.ScheduleEvent(EVENT_SWARNING_GUARDIAN, Seconds(51));
-        events.ScheduleEvent(EVENT_BERSERK, Minutes(10));
+        events.ScheduleEvent(EVENT_SONIC_SCREECH, 48s);
+        events.ScheduleEvent(EVENT_TERRIFYING_SCREECH, 38s);
+        events.ScheduleEvent(EVENT_SUMMON_DEFENDER, 1min);
+        events.ScheduleEvent(EVENT_SWARNING_GUARDIAN, 51s);
+        events.ScheduleEvent(EVENT_BERSERK, 10min);
     }
 
     void KilledUnit(Unit* who) override
@@ -248,7 +248,7 @@ struct boss_auriaya : public BossAI
                 case EVENT_SUMMON_DEFENDER:
                     Talk(EMOTE_DEFENDER);
                     DoCastSelf(SPELL_DEFENDER_TRIGGER);
-                    events.ScheduleEvent(EVENT_ACTIVATE_DEFENDER, Seconds(2));
+                    events.ScheduleEvent(EVENT_ACTIVATE_DEFENDER, 2s);
                     break;
                 case EVENT_ACTIVATE_DEFENDER:
                     DoCastSelf(SPELL_ACTIVATE_DEFENDER);
@@ -290,7 +290,7 @@ struct npc_sanctum_sentry : public ScriptedAI
 
     void JustEngagedWith(Unit* /*who*/) override
     {
-        _events.ScheduleEvent(EVENT_RIP, Seconds(6));
+        _events.ScheduleEvent(EVENT_RIP, 6s);
         _events.ScheduleEvent(EVENT_SAVAGE_POUNCE, Milliseconds(1));
         me->SetWalk(false);
     }
@@ -356,7 +356,7 @@ struct npc_feral_defender : public ScriptedAI
         me->SetAuraStack(SPELL_FERAL_ESSENCE, me, 8);
         DoCastSelf(SPELL_RANDOM_AGRO_PERIODIC, true);
         _events.SetPhase(PHASE_NONE);
-        _events.ScheduleEvent(EVENT_START_COMBAT, Seconds(1));
+        _events.ScheduleEvent(EVENT_START_COMBAT, 1s);
 
         if (Creature* auriaya = _instance->GetCreature(BOSS_AURIAYA))
             auriaya->AI()->JustSummoned(me);
@@ -381,7 +381,7 @@ struct npc_feral_defender : public ScriptedAI
                     me->SetReactState(REACT_AGGRESSIVE);
                     if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0, 0.0f, true))
                         AttackStart(target);
-                    _events.ScheduleEvent(EVENT_RUSH, Seconds(1));
+                    _events.ScheduleEvent(EVENT_RUSH, 1s);
                     break;
                 case EVENT_RUSH:
                     if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 1, CatsTargetSelector(me, 10.0f, 11.0f)))
@@ -411,7 +411,7 @@ struct npc_feral_defender : public ScriptedAI
                     me->SetHover(false);
                     if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0, 0.0f, true))
                         AttackStart(target);
-                    _events.ScheduleEvent(EVENT_RUSH, Seconds(1));
+                    _events.ScheduleEvent(EVENT_RUSH, 1s);
                     break;
                 default:
                     break;
@@ -439,7 +439,7 @@ struct npc_feral_defender : public ScriptedAI
                 DoCastSelf(SPELL_SUMMON_ESSENCE, true);
                 DoCastSelf(SPELL_CLEAR_ALL_DEBUFFS, true);
                 ResetThreatList();
-                _events.ScheduleEvent(EVENT_RESPAWN_DEFENDER, Seconds(30));
+                _events.ScheduleEvent(EVENT_RESPAWN_DEFENDER, 30s);
                 _events.CancelEvent(EVENT_RUSH);
             }
         }
diff --git a/src/server/scripts/Northrend/Ulduar/Ulduar/boss_flame_leviathan.cpp b/src/server/scripts/Northrend/Ulduar/Ulduar/boss_flame_leviathan.cpp
index 7286ae41ca5..35382c31931 100644
--- a/src/server/scripts/Northrend/Ulduar/Ulduar/boss_flame_leviathan.cpp
+++ b/src/server/scripts/Northrend/Ulduar/Ulduar/boss_flame_leviathan.cpp
@@ -278,10 +278,10 @@ class boss_flame_leviathan : public CreatureScript
                 me->SetReactState(REACT_PASSIVE);
                 events.ScheduleEvent(EVENT_PURSUE, 1);
                 events.ScheduleEvent(EVENT_MISSILE, urand(1500, 4*IN_MILLISECONDS));
-                events.ScheduleEvent(EVENT_VENT, 20*IN_MILLISECONDS);
-                events.ScheduleEvent(EVENT_SHUTDOWN, 150*IN_MILLISECONDS);
-                events.ScheduleEvent(EVENT_SPEED, 15*IN_MILLISECONDS);
-                events.ScheduleEvent(EVENT_SUMMON, 1*IN_MILLISECONDS);
+                events.ScheduleEvent(EVENT_VENT, 20s);
+                events.ScheduleEvent(EVENT_SHUTDOWN, 150s);
+                events.ScheduleEvent(EVENT_SPEED, 15s);
+                events.ScheduleEvent(EVENT_SUMMON, 1s);
                 ActiveTower(); //void ActiveTower
             }
 
@@ -292,25 +292,25 @@ class boss_flame_leviathan : public CreatureScript
                     if (towerOfStorms)
                     {
                         me->AddAura(SPELL_BUFF_TOWER_OF_STORMS, me);
-                        events.ScheduleEvent(EVENT_THORIM_S_HAMMER, 35*IN_MILLISECONDS);
+                        events.ScheduleEvent(EVENT_THORIM_S_HAMMER, 35s);
                     }
 
                     if (towerOfFlames)
                     {
                         me->AddAura(SPELL_BUFF_TOWER_OF_FLAMES, me);
-                        events.ScheduleEvent(EVENT_MIMIRON_S_INFERNO, 70*IN_MILLISECONDS);
+                        events.ScheduleEvent(EVENT_MIMIRON_S_INFERNO, 70s);
                     }
 
                     if (towerOfFrost)
                     {
                         me->AddAura(SPELL_BUFF_TOWER_OF_FR0ST, me);
-                        events.ScheduleEvent(EVENT_HODIR_S_FURY, 105*IN_MILLISECONDS);
+                        events.ScheduleEvent(EVENT_HODIR_S_FURY, 105s);
                     }
 
                     if (towerOfLife)
                     {
                         me->AddAura(SPELL_BUFF_TOWER_OF_LIFE, me);
-                        events.ScheduleEvent(EVENT_FREYA_S_WARD, 140*IN_MILLISECONDS);
+                        events.ScheduleEvent(EVENT_FREYA_S_WARD, 140s);
                     }
 
                     if (!towerOfLife && !towerOfFrost && !towerOfFlames && !towerOfStorms)
@@ -384,7 +384,7 @@ class boss_flame_leviathan : public CreatureScript
                 if (Shutdown == RAID_MODE(TWO_SEATS, FOUR_SEATS))
                 {
                     Shutdown = 0;
-                    events.ScheduleEvent(EVENT_SHUTDOWN, 4000);
+                    events.ScheduleEvent(EVENT_SHUTDOWN, 4s);
                     me->RemoveAurasDueToSpell(SPELL_OVERLOAD_CIRCUIT);
                     me->InterruptNonMeleeSpells(true);
                     return;
@@ -400,25 +400,25 @@ class boss_flame_leviathan : public CreatureScript
                         case EVENT_PURSUE:
                             Talk(SAY_TARGET);
                             DoCast(SPELL_PURSUED);  // Will select target in spellscript
-                            events.ScheduleEvent(EVENT_PURSUE, 35*IN_MILLISECONDS);
+                            events.ScheduleEvent(EVENT_PURSUE, 35s);
                             break;
                         case EVENT_MISSILE:
                             DoCast(me, SPELL_MISSILE_BARRAGE, true);
-                            events.ScheduleEvent(EVENT_MISSILE, 2*IN_MILLISECONDS);
+                            events.ScheduleEvent(EVENT_MISSILE, 2s);
                             break;
                         case EVENT_VENT:
                             DoCastAOE(SPELL_FLAME_VENTS);
-                            events.ScheduleEvent(EVENT_VENT, 20*IN_MILLISECONDS);
+                            events.ScheduleEvent(EVENT_VENT, 20s);
                             break;
                         case EVENT_SPEED:
                             DoCastAOE(SPELL_GATHERING_SPEED);
-                            events.ScheduleEvent(EVENT_SPEED, 15*IN_MILLISECONDS);
+                            events.ScheduleEvent(EVENT_SPEED, 15s);
                             break;
                         case EVENT_SUMMON:
                             if (summons.size() < 15)
                                 if (Creature* lift = DoSummonFlyer(NPC_MECHANOLIFT, me, 30.0f, 50.0f, 0))
                                     lift->GetMotionMaster()->MoveRandom(100);
-                            events.ScheduleEvent(EVENT_SUMMON, 2*IN_MILLISECONDS);
+                            events.ScheduleEvent(EVENT_SUMMON, 2s);
                             break;
                         case EVENT_SHUTDOWN:
                             Talk(SAY_OVERLOAD);
@@ -426,13 +426,13 @@ class boss_flame_leviathan : public CreatureScript
                             me->CastSpell(me, SPELL_SYSTEMS_SHUTDOWN, true);
                             if (Shutout)
                                 Shutout = false;
-                            events.ScheduleEvent(EVENT_REPAIR, 4000);
+                            events.ScheduleEvent(EVENT_REPAIR, 4s);
                             events.DelayEvents(20 * IN_MILLISECONDS, 0);
                             break;
                         case EVENT_REPAIR:
                             Talk(EMOTE_REPAIR);
                             me->ClearUnitState(UNIT_STATE_STUNNED | UNIT_STATE_ROOT);
-                            events.ScheduleEvent(EVENT_SHUTDOWN, 150*IN_MILLISECONDS);
+                            events.ScheduleEvent(EVENT_SHUTDOWN, 150s);
                             events.CancelEvent(EVENT_REPAIR);
                             break;
                         case EVENT_THORIM_S_HAMMER: // Tower of Storms
diff --git a/src/server/scripts/Northrend/Ulduar/Ulduar/boss_freya.cpp b/src/server/scripts/Northrend/Ulduar/Ulduar/boss_freya.cpp
index 35d886e485c..1d0f7263bfb 100644
--- a/src/server/scripts/Northrend/Ulduar/Ulduar/boss_freya.cpp
+++ b/src/server/scripts/Northrend/Ulduar/Ulduar/boss_freya.cpp
@@ -359,19 +359,19 @@ class boss_freya : public CreatureScript
                 if (Elder[0] && Elder[0]->IsAlive())
                 {
                     Elder[0]->CastSpell(me, SPELL_BRIGHTLEAF_ESSENCE, true);
-                    events.ScheduleEvent(EVENT_UNSTABLE_ENERGY, urand(10000, 20000));
+                    events.ScheduleEvent(EVENT_UNSTABLE_ENERGY, 10s, 20s);
                 }
 
                 if (Elder[1] && Elder[1]->IsAlive())
                 {
                     Elder[1]->CastSpell(me, SPELL_STONEBARK_ESSENCE, true);
-                    events.ScheduleEvent(EVENT_GROUND_TREMOR, urand(10000, 20000));
+                    events.ScheduleEvent(EVENT_GROUND_TREMOR, 10s, 20s);
                 }
 
                 if (Elder[2] && Elder[2]->IsAlive())
                 {
                     Elder[2]->CastSpell(me, SPELL_IRONBRANCH_ESSENCE, true);
-                    events.ScheduleEvent(EVENT_STRENGTHENED_IRON_ROOTS, urand(10000, 20000));
+                    events.ScheduleEvent(EVENT_STRENGTHENED_IRON_ROOTS, 10s, 20s);
                 }
 
                 if (elderCount == 0)
@@ -383,10 +383,10 @@ class boss_freya : public CreatureScript
                 args.AddSpellMod(SPELLVALUE_AURA_STACK, 150);
                 me->CastSpell(me, SPELL_ATTUNED_TO_NATURE, args);
 
-                events.ScheduleEvent(EVENT_WAVE, 10000);
+                events.ScheduleEvent(EVENT_WAVE, 10s);
                 events.ScheduleEvent(EVENT_EONAR_GIFT, 25000);
-                events.ScheduleEvent(EVENT_ENRAGE, 600000);
-                events.ScheduleEvent(EVENT_SUNBEAM, urand(5000, 15000));
+                events.ScheduleEvent(EVENT_ENRAGE, 10min);
+                events.ScheduleEvent(EVENT_SUNBEAM, 5s, 15s);
             }
 
             uint32 GetData(uint32 type) const override
@@ -423,39 +423,39 @@ class boss_freya : public CreatureScript
                         case EVENT_SUNBEAM:
                             if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0, 100.0f, true))
                                 DoCast(target, SPELL_SUNBEAM);
-                            events.ScheduleEvent(EVENT_SUNBEAM, urand(10000, 15000));
+                            events.ScheduleEvent(EVENT_SUNBEAM, 10s, 15s);
                             break;
                         case EVENT_NATURE_BOMB:
                             DoCastAOE(SPELL_SUMMON_NATURE_BOMB, true);
-                            events.ScheduleEvent(EVENT_NATURE_BOMB, urand(10000, 12000));
+                            events.ScheduleEvent(EVENT_NATURE_BOMB, 10s, 12s);
                             break;
                         case EVENT_UNSTABLE_ENERGY:
                             if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0, 100.0f, true))
                                 DoCast(target, SPELL_FREYA_UNSTABLE_SUNBEAM, true);
-                            events.ScheduleEvent(EVENT_UNSTABLE_ENERGY, urand(15000, 20000));
+                            events.ScheduleEvent(EVENT_UNSTABLE_ENERGY, 15s, 20s);
                             break;
                         case EVENT_WAVE:
                             SpawnWave();
                             if (waveCount <= 6) // If set to 6 The Bombs appear during the Final Add wave
                                 events.ScheduleEvent(EVENT_WAVE, WAVE_TIME);
                             else
-                                events.ScheduleEvent(EVENT_NATURE_BOMB, urand(10000, 20000));
+                                events.ScheduleEvent(EVENT_NATURE_BOMB, 10s, 20s);
                             break;
                         case EVENT_EONAR_GIFT:
                             Talk(EMOTE_LIFEBINDERS_GIFT);
                             DoCast(me, SPELL_SUMMON_EONAR_GIFT);
-                            events.ScheduleEvent(EVENT_EONAR_GIFT, urand(40000, 50000));
+                            events.ScheduleEvent(EVENT_EONAR_GIFT, 40s, 50s);
                             break;
                         case EVENT_STRENGTHENED_IRON_ROOTS:
                             Talk(EMOTE_IRON_ROOTS);
                             if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0, 100.0f, true, true, -SPELL_ROOTS_FREYA))
                                 target->CastSpell(target, SPELL_ROOTS_FREYA, true); // This must be cast by Target self
-                            events.ScheduleEvent(EVENT_STRENGTHENED_IRON_ROOTS, urand(12000, 20000));
+                            events.ScheduleEvent(EVENT_STRENGTHENED_IRON_ROOTS, 12s, 20s);
                             break;
                         case EVENT_GROUND_TREMOR:
                             Talk(EMOTE_GROUND_TREMOR);
                             DoCastAOE(SPELL_FREYA_GROUND_TREMOR);
-                            events.ScheduleEvent(EVENT_GROUND_TREMOR, urand(25000, 28000));
+                            events.ScheduleEvent(EVENT_GROUND_TREMOR, 25s, 28s);
                             break;
                     }
 
@@ -709,9 +709,9 @@ class boss_elder_brightleaf : public CreatureScript
                 _Reset();
                 if (me->HasAura(SPELL_DRAINED_OF_POWER))
                     me->RemoveAurasDueToSpell(SPELL_DRAINED_OF_POWER);
-                events.ScheduleEvent(EVENT_SOLAR_FLARE, urand(5000, 7000));
-                events.ScheduleEvent(EVENT_UNSTABLE_SUN_BEAM, urand(7000, 12000));
-                events.ScheduleEvent(EVENT_FLUX, 5000);
+                events.ScheduleEvent(EVENT_SOLAR_FLARE, 5s, 7s);
+                events.ScheduleEvent(EVENT_UNSTABLE_SUN_BEAM, 7s, 12s);
+                events.ScheduleEvent(EVENT_FLUX, 5s);
             }
 
             void KilledUnit(Unit* who) override
@@ -749,7 +749,7 @@ class boss_elder_brightleaf : public CreatureScript
                     {
                         case EVENT_UNSTABLE_SUN_BEAM:
                             me->CastSpell(me, SPELL_UNSTABLE_SUN_BEAM_SUMMON, true);
-                            events.ScheduleEvent(EVENT_UNSTABLE_SUN_BEAM, urand(10000, 15000));
+                            events.ScheduleEvent(EVENT_UNSTABLE_SUN_BEAM, 10s, 15s);
                             break;
                         case EVENT_SOLAR_FLARE:
                         {
@@ -759,7 +759,7 @@ class boss_elder_brightleaf : public CreatureScript
                             CastSpellExtraArgs args;
                             args.AddSpellMod(SPELLVALUE_MAX_TARGETS, stackAmount);
                             me->CastSpell(me, SPELL_SOLAR_FLARE, args);
-                            events.ScheduleEvent(EVENT_SOLAR_FLARE, urand(5000, 10000));
+                            events.ScheduleEvent(EVENT_SOLAR_FLARE, 5s, 10s);
                             break;
                         }
                         case EVENT_FLUX:
@@ -767,7 +767,7 @@ class boss_elder_brightleaf : public CreatureScript
                             me->AddAura(SPELL_FLUX_AURA, me);
                             if (Aura* Flux = me->GetAura(SPELL_FLUX_AURA))
                                 Flux->SetStackAmount(urand(1, 8));
-                            events.ScheduleEvent(EVENT_FLUX, 7500);
+                            events.ScheduleEvent(EVENT_FLUX, 7500ms);
                             break;
                     }
 
@@ -812,8 +812,8 @@ class boss_elder_stonebark : public CreatureScript
                 _Reset();
                 if (me->HasAura(SPELL_DRAINED_OF_POWER))
                     me->RemoveAurasDueToSpell(SPELL_DRAINED_OF_POWER);
-                events.ScheduleEvent(EVENT_TREMOR, urand(10000, 12000));
-                events.ScheduleEvent(EVENT_FISTS, urand(25000, 35000));
+                events.ScheduleEvent(EVENT_TREMOR, 10s, 12s);
+                events.ScheduleEvent(EVENT_FISTS, 25s, 35s);
                 events.ScheduleEvent(EVENT_BARK, urand(37500, 40000));
             }
 
@@ -867,16 +867,16 @@ class boss_elder_stonebark : public CreatureScript
                     {
                         case EVENT_BARK:
                             DoCast(me, SPELL_PETRIFIED_BARK);
-                            events.ScheduleEvent(EVENT_BARK, urand(30000, 50000));
+                            events.ScheduleEvent(EVENT_BARK, 30s, 50s);
                             break;
                         case EVENT_FISTS:
                             DoCastVictim(SPELL_FISTS_OF_STONE);
-                            events.ScheduleEvent(EVENT_FISTS, urand(20000, 30000));
+                            events.ScheduleEvent(EVENT_FISTS, 20s, 30s);
                             break;
                         case EVENT_TREMOR:
                             if (!me->HasAura(SPELL_FISTS_OF_STONE))
                                 DoCastVictim(SPELL_GROUND_TREMOR);
-                            events.ScheduleEvent(EVENT_TREMOR, urand(10000, 20000));
+                            events.ScheduleEvent(EVENT_TREMOR, 10s, 20s);
                             break;
                     }
 
@@ -921,8 +921,8 @@ class boss_elder_ironbranch : public CreatureScript
                 _Reset();
                 if (me->HasAura(SPELL_DRAINED_OF_POWER))
                     me->RemoveAurasDueToSpell(SPELL_DRAINED_OF_POWER);
-                events.ScheduleEvent(EVENT_IMPALE, urand(18000, 22000));
-                events.ScheduleEvent(EVENT_IRON_ROOTS, urand(12000, 17000));
+                events.ScheduleEvent(EVENT_IMPALE, 18s, 22s);
+                events.ScheduleEvent(EVENT_IRON_ROOTS, 12s, 17s);
                 events.ScheduleEvent(EVENT_THORN_SWARM, urand(7500, 12500));
             }
 
@@ -961,16 +961,16 @@ class boss_elder_ironbranch : public CreatureScript
                     {
                         case EVENT_IMPALE:
                             DoCastVictim(SPELL_IMPALE);
-                            events.ScheduleEvent(EVENT_IMPALE, urand(15000, 25000));
+                            events.ScheduleEvent(EVENT_IMPALE, 15s, 25s);
                             break;
                         case EVENT_IRON_ROOTS:
                             if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0, 100.0f, true, true, -SPELL_ROOTS_IRONBRANCH))
                                 target->CastSpell(target, SPELL_ROOTS_IRONBRANCH, true);
-                            events.ScheduleEvent(EVENT_IRON_ROOTS, urand(10000, 20000));
+                            events.ScheduleEvent(EVENT_IRON_ROOTS, 10s, 20s);
                             break;
                         case EVENT_THORN_SWARM:
                             DoCastVictim(SPELL_THORN_SWARM);
-                            events.ScheduleEvent(EVENT_THORN_SWARM, urand(8000, 13000));
+                            events.ScheduleEvent(EVENT_THORN_SWARM, 8s, 13s);
                             break;
                     }
 
diff --git a/src/server/scripts/Northrend/Ulduar/Ulduar/boss_general_vezax.cpp b/src/server/scripts/Northrend/Ulduar/Ulduar/boss_general_vezax.cpp
index aa7f28a77ab..e61faa6013b 100644
--- a/src/server/scripts/Northrend/Ulduar/Ulduar/boss_general_vezax.cpp
+++ b/src/server/scripts/Northrend/Ulduar/Ulduar/boss_general_vezax.cpp
@@ -139,12 +139,12 @@ class boss_general_vezax : public CreatureScript
                 DoCast(me, SPELL_AURA_OF_DESPAIR);
                 CheckShamanisticRage();
 
-                events.ScheduleEvent(EVENT_SHADOW_CRASH, urand(8000, 10000));
-                events.ScheduleEvent(EVENT_SEARING_FLAMES, 12000);
-                events.ScheduleEvent(EVENT_MARK_OF_THE_FACELESS, urand(35000, 40000));
-                events.ScheduleEvent(EVENT_SARONITE_VAPORS, 30000);
-                events.ScheduleEvent(EVENT_SURGE_OF_DARKNESS, 60000);
-                events.ScheduleEvent(EVENT_BERSERK, 600000);
+                events.ScheduleEvent(EVENT_SHADOW_CRASH, 8s, 10s);
+                events.ScheduleEvent(EVENT_SEARING_FLAMES, 12s);
+                events.ScheduleEvent(EVENT_MARK_OF_THE_FACELESS, 35s, 40s);
+                events.ScheduleEvent(EVENT_SARONITE_VAPORS, 30s);
+                events.ScheduleEvent(EVENT_SURGE_OF_DARKNESS, 1min);
+                events.ScheduleEvent(EVENT_BERSERK, 10min);
             }
 
             void UpdateAI(uint32 diff) override
@@ -168,7 +168,7 @@ class boss_general_vezax : public CreatureScript
                                 target = SelectTarget(SELECT_TARGET_RANDOM, 0, 150.0f, true);
                             if (target)
                                 DoCast(target, SPELL_SHADOW_CRASH);
-                            events.ScheduleEvent(EVENT_SHADOW_CRASH, urand(8000, 12000));
+                            events.ScheduleEvent(EVENT_SHADOW_CRASH, 8s, 12s);
                             break;
                         }
                         case EVENT_SEARING_FLAMES:
@@ -182,18 +182,18 @@ class boss_general_vezax : public CreatureScript
                                 target = SelectTarget(SELECT_TARGET_RANDOM, 0, 150.0f, true);
                             if (target)
                                 DoCast(target, SPELL_MARK_OF_THE_FACELESS);
-                            events.ScheduleEvent(EVENT_MARK_OF_THE_FACELESS, urand(35000, 45000));
+                            events.ScheduleEvent(EVENT_MARK_OF_THE_FACELESS, 35s, 45s);
                             break;
                         }
                         case EVENT_SURGE_OF_DARKNESS:
                             Talk(EMOTE_SURGE_OF_DARKNESS);
                             Talk(SAY_SURGE_OF_DARKNESS);
                             DoCast(me, SPELL_SURGE_OF_DARKNESS);
-                            events.ScheduleEvent(EVENT_SURGE_OF_DARKNESS, urand(50000, 70000));
+                            events.ScheduleEvent(EVENT_SURGE_OF_DARKNESS, 50s, 70s);
                             break;
                         case EVENT_SARONITE_VAPORS:
                             DoCast(SPELL_SUMMON_SARONITE_VAPORS);
-                            events.ScheduleEvent(EVENT_SARONITE_VAPORS, urand(30000, 35000));
+                            events.ScheduleEvent(EVENT_SARONITE_VAPORS, 30s, 35s);
                             if (++vaporCount == 6 && smellSaronite)
                             {
                                 Talk(SAY_HARDMODE);
@@ -270,7 +270,7 @@ class boss_general_vezax : public CreatureScript
                         break;
                     case ACTION_ANIMUS_DIE:
                         me->RemoveAurasDueToSpell(SPELL_SARONITE_BARRIER);
-                        events.ScheduleEvent(EVENT_SEARING_FLAMES, urand(7000, 12000));
+                        events.ScheduleEvent(EVENT_SEARING_FLAMES, 7s, 12s);
                         animusDead = true;
                         break;
                 }
@@ -329,7 +329,7 @@ class boss_saronite_animus : public CreatureScript
             {
                 DoCast(me, SPELL_VISUAL_SARONITE_ANIMUS);
                 events.Reset();
-                events.ScheduleEvent(EVENT_PROFOUND_OF_DARKNESS, 3000);
+                events.ScheduleEvent(EVENT_PROFOUND_OF_DARKNESS, 3s);
             }
 
             void JustDied(Unit* /*killer*/) override
@@ -354,7 +354,7 @@ class boss_saronite_animus : public CreatureScript
                     {
                         case EVENT_PROFOUND_OF_DARKNESS:
                             DoCastAOE(SPELL_PROFOUND_OF_DARKNESS, true);
-                            events.ScheduleEvent(EVENT_PROFOUND_OF_DARKNESS, 3000);
+                            events.ScheduleEvent(EVENT_PROFOUND_OF_DARKNESS, 3s);
                             break;
                         default:
                             break;
@@ -396,7 +396,7 @@ class npc_saronite_vapors : public CreatureScript
             void Reset() override
             {
                 events.Reset();
-                events.ScheduleEvent(EVENT_RANDOM_MOVE, urand(5000, 7500));
+                events.ScheduleEvent(EVENT_RANDOM_MOVE, 5s, 7500ms);
             }
 
             void UpdateAI(uint32 diff) override
@@ -409,7 +409,7 @@ class npc_saronite_vapors : public CreatureScript
                     {
                         case EVENT_RANDOM_MOVE:
                             me->GetMotionMaster()->MoveRandom(30.0f);
-                            events.ScheduleEvent(EVENT_RANDOM_MOVE, urand(5000, 7500));
+                            events.ScheduleEvent(EVENT_RANDOM_MOVE, 5s, 7500ms);
                             break;
                         default:
                             break;
diff --git a/src/server/scripts/Northrend/Ulduar/Ulduar/boss_hodir.cpp b/src/server/scripts/Northrend/Ulduar/Ulduar/boss_hodir.cpp
index f35f2a82d62..f65857b2e48 100644
--- a/src/server/scripts/Northrend/Ulduar/Ulduar/boss_hodir.cpp
+++ b/src/server/scripts/Northrend/Ulduar/Ulduar/boss_hodir.cpp
@@ -368,12 +368,12 @@ class boss_hodir : public CreatureScript
                 iHaveTheCoolestFriends = true;
                 iCouldSayThatThisCacheWasRare = true;
 
-                events.ScheduleEvent(EVENT_ICICLE, 2000);
-                events.ScheduleEvent(EVENT_FREEZE, 25000);
-                events.ScheduleEvent(EVENT_BLOWS, urand(60000, 65000));
-                events.ScheduleEvent(EVENT_FLASH_FREEZE, 45000);
-                events.ScheduleEvent(EVENT_RARE_CACHE, 180000);
-                events.ScheduleEvent(EVENT_BERSERK, 480000);
+                events.ScheduleEvent(EVENT_ICICLE, 2s);
+                events.ScheduleEvent(EVENT_FREEZE, 25s);
+                events.ScheduleEvent(EVENT_BLOWS, 60s, 65s);
+                events.ScheduleEvent(EVENT_FLASH_FREEZE, 45s);
+                events.ScheduleEvent(EVENT_RARE_CACHE, 3min);
+                events.ScheduleEvent(EVENT_BERSERK, 8min);
             }
 
             void KilledUnit(Unit* who) override
@@ -435,7 +435,7 @@ class boss_hodir : public CreatureScript
                     {
                         case EVENT_FREEZE:
                             DoCastAOE(SPELL_FREEZE);
-                            events.ScheduleEvent(EVENT_FREEZE, urand(30000, 45000));
+                            events.ScheduleEvent(EVENT_FREEZE, 30s, 45s);
                             break;
                         case EVENT_ICICLE:
                             if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0, 100.0f, true))
@@ -449,7 +449,7 @@ class boss_hodir : public CreatureScript
                                 if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0, 100.0f, true))
                                     target->CastSpell(target, SPELL_ICICLE_SNOWDRIFT, true);
                             DoCast(SPELL_FLASH_FREEZE);
-                            events.ScheduleEvent(EVENT_FLASH_FREEZE_EFFECT, 500);
+                            events.ScheduleEvent(EVENT_FLASH_FREEZE_EFFECT, 500ms);
                             break;
                         case EVENT_FLASH_FREEZE_EFFECT:
                         {
@@ -459,14 +459,14 @@ class boss_hodir : public CreatureScript
                                 (*itr)->CastSpell(me, SPELL_FLASH_FREEZE_VISUAL, true);
                             FlashFreeze();
                             events.CancelEvent(EVENT_FLASH_FREEZE_EFFECT);
-                            events.ScheduleEvent(EVENT_FLASH_FREEZE, urand(25000, 35000));
+                            events.ScheduleEvent(EVENT_FLASH_FREEZE, 25s, 35s);
                             break;
                         }
                         case EVENT_BLOWS:
                             Talk(SAY_STALACTITE);
                             Talk(EMOTE_BLOWS);
                             DoCast(me, SPELL_FROZEN_BLOWS);
-                            events.ScheduleEvent(EVENT_BLOWS, urand(60000, 65000));
+                            events.ScheduleEvent(EVENT_BLOWS, 60s, 65s);
                             break;
                         case EVENT_RARE_CACHE:
                             Talk(SAY_HARD_MODE_FAILED);
@@ -661,8 +661,8 @@ class npc_hodir_priest : public CreatureScript
             void Reset() override
             {
                 events.Reset();
-                events.ScheduleEvent(EVENT_HEAL, urand(4000, 8000));
-                events.ScheduleEvent(EVENT_DISPEL_MAGIC, urand(15000, 20000));
+                events.ScheduleEvent(EVENT_HEAL, 4s, 8s);
+                events.ScheduleEvent(EVENT_DISPEL_MAGIC, 15s, 20s);
             }
 
             void UpdateAI(uint32 diff) override
@@ -687,7 +687,7 @@ class npc_hodir_priest : public CreatureScript
                     {
                         case EVENT_HEAL:
                             DoCastAOE(SPELL_GREATER_HEAL);
-                            events.ScheduleEvent(EVENT_HEAL, urand(7500, 10000));
+                            events.ScheduleEvent(EVENT_HEAL, 7500ms, 10s);
                             break;
                         case EVENT_DISPEL_MAGIC:
                         {
@@ -698,7 +698,7 @@ class npc_hodir_priest : public CreatureScript
                             for (std::list<Unit*>::iterator itr = TargetList.begin(); itr != TargetList.end(); ++itr)
                                 if ((*itr)->HasAura(SPELL_FREEZE))
                                     DoCast(*itr, SPELL_DISPEL_MAGIC, true);
-                            events.ScheduleEvent(EVENT_DISPEL_MAGIC, urand(15000, 20000));
+                            events.ScheduleEvent(EVENT_DISPEL_MAGIC, 15s, 20s);
                             break;
                         }
                         default:
@@ -744,7 +744,7 @@ class npc_hodir_shaman : public CreatureScript
             void Reset() override
             {
                 events.Reset();
-                events.ScheduleEvent(EVENT_STORM_CLOUD, urand(10000, 12500));
+                events.ScheduleEvent(EVENT_STORM_CLOUD, 10s, 12500ms);
             }
 
             void UpdateAI(uint32 diff) override
@@ -764,7 +764,7 @@ class npc_hodir_shaman : public CreatureScript
                         case EVENT_STORM_CLOUD:
                             if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0, 100.0f, true))
                                 DoCast(target, SPELL_STORM_CLOUD, true);
-                            events.ScheduleEvent(EVENT_STORM_CLOUD, urand(15000, 20000));
+                            events.ScheduleEvent(EVENT_STORM_CLOUD, 15s, 20s);
                             break;
                         default:
                             break;
@@ -809,7 +809,7 @@ class npc_hodir_druid : public CreatureScript
             void Reset() override
             {
                 events.Reset();
-                events.ScheduleEvent(EVENT_STARLIGHT, urand(15000, 17500));
+                events.ScheduleEvent(EVENT_STARLIGHT, 15s, 17500ms);
             }
 
             void UpdateAI(uint32 diff) override
@@ -828,7 +828,7 @@ class npc_hodir_druid : public CreatureScript
                     {
                         case EVENT_STARLIGHT:
                             DoCast(me, SPELL_STARLIGHT, true);
-                            events.ScheduleEvent(EVENT_STARLIGHT, urand(25000, 35000));
+                            events.ScheduleEvent(EVENT_STARLIGHT, 25s, 35s);
                             break;
                         default:
                             break;
@@ -874,8 +874,8 @@ class npc_hodir_mage : public CreatureScript
             {
                 events.Reset();
                 summons.DespawnAll();
-                events.ScheduleEvent(EVENT_CONJURE_FIRE, urand(10000, 12500));
-                events.ScheduleEvent(EVENT_MELT_ICE, 5000);
+                events.ScheduleEvent(EVENT_CONJURE_FIRE, 10s, 12500ms);
+                events.ScheduleEvent(EVENT_MELT_ICE, 5s);
             }
 
             void JustSummoned(Creature* summoned) override
@@ -908,12 +908,12 @@ class npc_hodir_mage : public CreatureScript
                             if (summons.size() >= RAID_MODE<uint64>(2, 4))
                                 break;
                             DoCast(me, SPELL_CONJURE_FIRE, true);
-                            events.ScheduleEvent(EVENT_CONJURE_FIRE, urand(15000, 20000));
+                            events.ScheduleEvent(EVENT_CONJURE_FIRE, 15s, 20s);
                             break;
                         case EVENT_MELT_ICE:
                             if (Creature* FlashFreeze = me->FindNearestCreature(NPC_FLASH_FREEZE, 50.0f, true))
                                 DoCast(FlashFreeze, SPELL_MELT_ICE, true);
-                            events.ScheduleEvent(EVENT_MELT_ICE, urand(10000, 15000));
+                            events.ScheduleEvent(EVENT_MELT_ICE, 10s, 15s);
                             break;
                     }
 
diff --git a/src/server/scripts/Northrend/Ulduar/Ulduar/boss_ignis.cpp b/src/server/scripts/Northrend/Ulduar/Ulduar/boss_ignis.cpp
index 042a5adce34..e27e0be7815 100644
--- a/src/server/scripts/Northrend/Ulduar/Ulduar/boss_ignis.cpp
+++ b/src/server/scripts/Northrend/Ulduar/Ulduar/boss_ignis.cpp
@@ -145,11 +145,11 @@ class boss_ignis : public CreatureScript
             {
                 _JustEngagedWith();
                 Talk(SAY_AGGRO);
-                events.ScheduleEvent(EVENT_JET, 30000);
+                events.ScheduleEvent(EVENT_JET, 30s);
                 events.ScheduleEvent(EVENT_SCORCH, 25000);
                 events.ScheduleEvent(EVENT_SLAG_POT, 35000);
                 events.ScheduleEvent(EVENT_CONSTRUCT, 15000);
-                events.ScheduleEvent(EVENT_END_POT, 40000);
+                events.ScheduleEvent(EVENT_END_POT, 40s);
                 events.ScheduleEvent(EVENT_BERSERK, 480000);
                 Initialize();
                 instance->DoStartTimedAchievement(ACHIEVEMENT_TIMED_TYPE_EVENT, ACHIEVEMENT_IGNIS_START_EVENT);
@@ -221,7 +221,7 @@ class boss_ignis : public CreatureScript
                         case EVENT_JET:
                             Talk(EMOTE_JETS);
                             DoCast(me, SPELL_FLAME_JETS);
-                            events.ScheduleEvent(EVENT_JET, urand(35000, 40000));
+                            events.ScheduleEvent(EVENT_JET, 35s, 40s);
                             break;
                         case EVENT_SLAG_POT:
                             if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 1, 100, true))
@@ -230,7 +230,7 @@ class boss_ignis : public CreatureScript
                                 _slagPotGUID = target->GetGUID();
                                 DoCast(target, SPELL_GRAB);
                                 events.DelayEvents(3000);
-                                events.ScheduleEvent(EVENT_GRAB_POT, 500);
+                                events.ScheduleEvent(EVENT_GRAB_POT, 500ms);
                             }
                             events.ScheduleEvent(EVENT_SLAG_POT, RAID_MODE(30000, 15000));
                             break;
@@ -239,7 +239,7 @@ class boss_ignis : public CreatureScript
                             {
                                 slagPotTarget->EnterVehicle(me, 0);
                                 events.CancelEvent(EVENT_GRAB_POT);
-                                events.ScheduleEvent(EVENT_CHANGE_POT, 1000);
+                                events.ScheduleEvent(EVENT_CHANGE_POT, 1s);
                             }
                             break;
                         case EVENT_CHANGE_POT:
@@ -248,7 +248,7 @@ class boss_ignis : public CreatureScript
                                 DoCast(slagPotTarget, SPELL_SLAG_POT, true);
                                 slagPotTarget->EnterVehicle(me, 1);
                                 events.CancelEvent(EVENT_CHANGE_POT);
-                                events.ScheduleEvent(EVENT_END_POT, 10000);
+                                events.ScheduleEvent(EVENT_END_POT, 10s);
                             }
                             break;
                         case EVENT_END_POT:
diff --git a/src/server/scripts/Northrend/Ulduar/Ulduar/boss_kologarn.cpp b/src/server/scripts/Northrend/Ulduar/Ulduar/boss_kologarn.cpp
index 8b03f77be73..6d19343218a 100644
--- a/src/server/scripts/Northrend/Ulduar/Ulduar/boss_kologarn.cpp
+++ b/src/server/scripts/Northrend/Ulduar/Ulduar/boss_kologarn.cpp
@@ -122,12 +122,12 @@ class boss_kologarn : public CreatureScript
             {
                 Talk(SAY_AGGRO);
 
-                events.ScheduleEvent(EVENT_MELEE_CHECK, 6000);
-                events.ScheduleEvent(EVENT_SMASH, 5000);
-                events.ScheduleEvent(EVENT_SWEEP, 19000);
+                events.ScheduleEvent(EVENT_MELEE_CHECK, 6s);
+                events.ScheduleEvent(EVENT_SMASH, 5s);
+                events.ScheduleEvent(EVENT_SWEEP, 19s);
                 events.ScheduleEvent(EVENT_STONE_GRIP, 25000);
-                events.ScheduleEvent(EVENT_FOCUSED_EYEBEAM, 21000);
-                events.ScheduleEvent(EVENT_ENRAGE, 600000);
+                events.ScheduleEvent(EVENT_FOCUSED_EYEBEAM, 21s);
+                events.ScheduleEvent(EVENT_ENRAGE, 10min);
 
                 if (Vehicle* vehicle = me->GetVehicleKit())
                     for (uint8 i = 0; i < 2; ++i)
@@ -169,7 +169,7 @@ class boss_kologarn : public CreatureScript
                     if (!apply && isEncounterInProgress)
                     {
                         Talk(SAY_LEFT_ARM_GONE);
-                        events.ScheduleEvent(EVENT_RESPAWN_LEFT_ARM, 40000);
+                        events.ScheduleEvent(EVENT_RESPAWN_LEFT_ARM, 40s);
                     }
                 }
 
@@ -179,7 +179,7 @@ class boss_kologarn : public CreatureScript
                     if (!apply && isEncounterInProgress)
                     {
                         Talk(SAY_RIGHT_ARM_GONE);
-                        events.ScheduleEvent(EVENT_RESPAWN_RIGHT_ARM, 40000);
+                        events.ScheduleEvent(EVENT_RESPAWN_RIGHT_ARM, 40s);
                     }
                 }
 
@@ -198,7 +198,7 @@ class boss_kologarn : public CreatureScript
                     }
 
                     if (!right && !left)
-                        events.ScheduleEvent(EVENT_STONE_SHOUT, 5000);
+                        events.ScheduleEvent(EVENT_STONE_SHOUT, 5s);
 
                     instance->DoStartTimedAchievement(ACHIEVEMENT_TIMED_TYPE_EVENT, CRITERIA_DISARMED);
                 }
@@ -258,23 +258,23 @@ class boss_kologarn : public CreatureScript
                         case EVENT_MELEE_CHECK:
                             if (!me->IsWithinMeleeRange(me->GetVictim()))
                                 DoCast(SPELL_PETRIFY_BREATH);
-                            events.ScheduleEvent(EVENT_MELEE_CHECK, 1 * IN_MILLISECONDS);
+                            events.ScheduleEvent(EVENT_MELEE_CHECK, 1s);
                             break;
                         case EVENT_SWEEP:
                             if (left)
                                 DoCast(me->FindNearestCreature(NPC_ARM_SWEEP_STALKER, 500.0f, true), SPELL_ARM_SWEEP, true);
-                            events.ScheduleEvent(EVENT_SWEEP, 25 * IN_MILLISECONDS);
+                            events.ScheduleEvent(EVENT_SWEEP, 25s);
                             break;
                         case EVENT_SMASH:
                             if (left && right)
                                 DoCastVictim(SPELL_TWO_ARM_SMASH);
                             else if (left || right)
                                 DoCastVictim(SPELL_ONE_ARM_SMASH);
-                            events.ScheduleEvent(EVENT_SMASH, 15 * IN_MILLISECONDS);
+                            events.ScheduleEvent(EVENT_SMASH, 15s);
                             break;
                         case EVENT_STONE_SHOUT:
                             DoCast(SPELL_STONE_SHOUT);
-                            events.ScheduleEvent(EVENT_STONE_SHOUT, 2 * IN_MILLISECONDS);
+                            events.ScheduleEvent(EVENT_STONE_SHOUT, 2s);
                             break;
                         case EVENT_ENRAGE:
                             DoCast(SPELL_BERSERK);
@@ -299,7 +299,7 @@ class boss_kologarn : public CreatureScript
                                 Talk(SAY_GRAB_PLAYER);
                                 Talk(EMOTE_STONE_GRIP);
                             }
-                            events.ScheduleEvent(EVENT_STONE_GRIP, 25 * IN_MILLISECONDS);
+                            events.ScheduleEvent(EVENT_STONE_GRIP, 25s);
                             break;
                         }
                         case EVENT_FOCUSED_EYEBEAM:
@@ -308,7 +308,7 @@ class boss_kologarn : public CreatureScript
                                 eyebeamTarget = eyebeamTargetUnit->GetGUID();
                                 DoCast(me, SPELL_SUMMON_FOCUSED_EYEBEAM, true);
                             }
-                            events.ScheduleEvent(EVENT_FOCUSED_EYEBEAM, urand(15, 35) * IN_MILLISECONDS);
+                            events.ScheduleEvent(EVENT_FOCUSED_EYEBEAM, 15s, 35s);
                             break;
                     }
 
diff --git a/src/server/scripts/Northrend/Ulduar/Ulduar/boss_mimiron.cpp b/src/server/scripts/Northrend/Ulduar/Ulduar/boss_mimiron.cpp
index 303cdd85a0e..313bf2bfa80 100644
--- a/src/server/scripts/Northrend/Ulduar/Ulduar/boss_mimiron.cpp
+++ b/src/server/scripts/Northrend/Ulduar/Ulduar/boss_mimiron.cpp
@@ -433,7 +433,7 @@ class boss_mimiron : public CreatureScript
                     button->SetFlag(GAMEOBJECT_FLAGS, GO_FLAG_NOT_SELECTABLE);
 
                 if (_fireFighter)
-                    events.ScheduleEvent(EVENT_SUMMON_FLAMES, 3000);
+                    events.ScheduleEvent(EVENT_SUMMON_FLAMES, 3s);
                 events.ScheduleEvent(EVENT_INTRO_1, 1500);
             }
 
@@ -735,16 +735,16 @@ class boss_leviathan_mk_ii : public CreatureScript
                         _fireFighter = true;
                         DoCast(me, SPELL_EMERGENCY_MODE);
                         DoCastAOE(SPELL_EMERGENCY_MODE_TURRET);
-                        events.ScheduleEvent(EVENT_FLAME_SUPPRESSANT_MK, 60000, 0, PHASE_LEVIATHAN_MK_II);
+                        events.ScheduleEvent(EVENT_FLAME_SUPPRESSANT_MK, 1min, 0, PHASE_LEVIATHAN_MK_II);
                         // Missing break intended.
                     case DO_START_MKII:
                         me->SetReactState(REACT_AGGRESSIVE);
                         events.SetPhase(PHASE_LEVIATHAN_MK_II);
 
-                        events.ScheduleEvent(EVENT_NAPALM_SHELL, 3000, 0, PHASE_LEVIATHAN_MK_II);
-                        events.ScheduleEvent(EVENT_PLASMA_BLAST, 15000, 0, PHASE_LEVIATHAN_MK_II);
-                        events.ScheduleEvent(EVENT_PROXIMITY_MINE, 5000);
-                        events.ScheduleEvent(EVENT_SHOCK_BLAST, 18000);
+                        events.ScheduleEvent(EVENT_NAPALM_SHELL, 3s, 0, PHASE_LEVIATHAN_MK_II);
+                        events.ScheduleEvent(EVENT_PLASMA_BLAST, 15s, 0, PHASE_LEVIATHAN_MK_II);
+                        events.ScheduleEvent(EVENT_PROXIMITY_MINE, 5s);
+                        events.ScheduleEvent(EVENT_SHOCK_BLAST, 18s);
                         break;
                     case DO_ASSEMBLED_COMBAT:
                         me->SetStandState(UNIT_STAND_STATE_STAND);
@@ -979,8 +979,8 @@ class boss_vx_001 : public CreatureScript
                     case DO_HARDMODE_VX001:
                         _fireFighter = true;
                         DoCast(me, SPELL_EMERGENCY_MODE);
-                        events.ScheduleEvent(EVENT_FROST_BOMB, 1000);
-                        events.ScheduleEvent(EVENT_FLAME_SUPPRESSANT_VX, 6000);
+                        events.ScheduleEvent(EVENT_FROST_BOMB, 1s);
+                        events.ScheduleEvent(EVENT_FLAME_SUPPRESSANT_VX, 6s);
                         // Missing break intended.
                     case DO_START_VX001:
                         me->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NON_ATTACKABLE | UNIT_FLAG_NOT_SELECTABLE);
@@ -991,8 +991,8 @@ class boss_vx_001 : public CreatureScript
                         DoCast(me, SPELL_HEAT_WAVE_AURA);
 
                         events.SetPhase(PHASE_VX_001);
-                        events.ScheduleEvent(EVENT_ROCKET_STRIKE, 20000);
-                        events.ScheduleEvent(EVENT_SPINNING_UP, urand(30000, 35000));
+                        events.ScheduleEvent(EVENT_ROCKET_STRIKE, 20s);
+                        events.ScheduleEvent(EVENT_SPINNING_UP, 30s, 35s);
                         events.ScheduleEvent(EVENT_RAPID_BURST, 500, 0, PHASE_VX_001);
                         break;
                     case DO_ASSEMBLED_COMBAT:
@@ -1000,11 +1000,11 @@ class boss_vx_001 : public CreatureScript
                         me->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NON_ATTACKABLE | UNIT_FLAG_NOT_SELECTABLE);
 
                         events.SetPhase(PHASE_VOL7RON);
-                        events.ScheduleEvent(EVENT_ROCKET_STRIKE, 20000);
-                        events.ScheduleEvent(EVENT_SPINNING_UP, urand(30000, 35000));
+                        events.ScheduleEvent(EVENT_ROCKET_STRIKE, 20s);
+                        events.ScheduleEvent(EVENT_SPINNING_UP, 30s, 35s);
                         events.ScheduleEvent(EVENT_HAND_PULSE, 500, 0, PHASE_VOL7RON);
                         if (_fireFighter)
-                            events.ScheduleEvent(EVENT_FROST_BOMB, 1000);
+                            events.ScheduleEvent(EVENT_FROST_BOMB, 1s);
                         break;
                     default:
                         break;
@@ -1062,7 +1062,7 @@ class boss_vx_001 : public CreatureScript
                             break;
                         case EVENT_ROCKET_STRIKE:
                             DoCastAOE(events.IsInPhase(PHASE_VX_001) ? SPELL_ROCKET_STRIKE_SINGLE : SPELL_ROCKET_STRIKE_BOTH);
-                            events.ScheduleEvent(EVENT_RELOAD, 10000);
+                            events.ScheduleEvent(EVENT_RELOAD, 10s);
                             events.RescheduleEvent(EVENT_ROCKET_STRIKE, urand(20000, 25000));
                             break;
                         case EVENT_RELOAD:
@@ -1158,7 +1158,7 @@ class boss_aerial_command_unit : public CreatureScript
                     case DO_HARDMODE_AERIAL:
                         fireFigther = true;
                         DoCast(me, SPELL_EMERGENCY_MODE);
-                        events.ScheduleEvent(EVENT_SUMMON_FIRE_BOTS, 1000, 0, PHASE_AERIAL_COMMAND_UNIT);
+                        events.ScheduleEvent(EVENT_SUMMON_FIRE_BOTS, 1s, 0, PHASE_AERIAL_COMMAND_UNIT);
                         // Missing break intended.
                     case DO_START_AERIAL:
                         me->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NON_ATTACKABLE | UNIT_FLAG_NOT_SELECTABLE);
@@ -1168,9 +1168,9 @@ class boss_aerial_command_unit : public CreatureScript
                         me->SetDisableGravity(false);
 
                         events.SetPhase(PHASE_AERIAL_COMMAND_UNIT);
-                        events.ScheduleEvent(EVENT_SUMMON_JUNK_BOT, 5000, 0, PHASE_AERIAL_COMMAND_UNIT);
-                        events.ScheduleEvent(EVENT_SUMMON_ASSAULT_BOT, 9000, 0, PHASE_AERIAL_COMMAND_UNIT);
-                        events.ScheduleEvent(EVENT_SUMMON_BOMB_BOT, 9000, 0, PHASE_AERIAL_COMMAND_UNIT);
+                        events.ScheduleEvent(EVENT_SUMMON_JUNK_BOT, 5s, 0, PHASE_AERIAL_COMMAND_UNIT);
+                        events.ScheduleEvent(EVENT_SUMMON_ASSAULT_BOT, 9s, 0, PHASE_AERIAL_COMMAND_UNIT);
+                        events.ScheduleEvent(EVENT_SUMMON_BOMB_BOT, 9s, 0, PHASE_AERIAL_COMMAND_UNIT);
                         break;
                     case DO_DISABLE_AERIAL:
                         me->CastStop();
@@ -1286,7 +1286,7 @@ class npc_mimiron_assault_bot : public CreatureScript
 
             void JustEngagedWith(Unit* /*who*/) override
             {
-                events.ScheduleEvent(EVENT_MAGNETIC_FIELD, 14000);
+                events.ScheduleEvent(EVENT_MAGNETIC_FIELD, 14s);
             }
 
             void UpdateAI(uint32 diff) override
@@ -1364,7 +1364,7 @@ class npc_mimiron_emergency_fire_bot : public CreatureScript
 
             void Reset() override
             {
-                events.ScheduleEvent(EVENT_WATER_SPRAY, 7000);
+                events.ScheduleEvent(EVENT_WATER_SPRAY, 7s);
                 isWaterSprayReady = true;
                 moveNew = true;
             }
@@ -1380,7 +1380,7 @@ class npc_mimiron_emergency_fire_bot : public CreatureScript
                     {
                         case EVENT_WATER_SPRAY:
                             isWaterSprayReady = true;
-                            events.RescheduleEvent(EVENT_WATER_SPRAY, urand(7000, 9000));
+                            events.RescheduleEvent(EVENT_WATER_SPRAY, 7s, 9s);
                             break;
                         default:
                             break;
@@ -1479,7 +1479,7 @@ class npc_mimiron_computer : public CreatureScript
                             break;
                         case EVENT_SELF_DESTRUCT_1:
                             Talk(SAY_SELF_DESTRUCT_1);
-                            events.ScheduleEvent(EVENT_SELF_DESTRUCT_FINALIZED, 60000);
+                            events.ScheduleEvent(EVENT_SELF_DESTRUCT_FINALIZED, 1min);
                             break;
                         case EVENT_SELF_DESTRUCT_FINALIZED:
                             Talk(SAY_SELF_DESTRUCT_FINALIZED);
@@ -1519,7 +1519,7 @@ class npc_mimiron_flames : public CreatureScript
 
             void Reset() override // Reset is possibly more suitable for this case.
             {
-                events.ScheduleEvent(EVENT_SPREAD_FLAMES, 4000);
+                events.ScheduleEvent(EVENT_SPREAD_FLAMES, 4s);
             }
 
             void UpdateAI(uint32 diff) override
@@ -1566,7 +1566,7 @@ class npc_mimiron_frost_bomb : public CreatureScript
 
             void Reset() override
             {
-                events.ScheduleEvent(EVENT_FROST_BOMB_EXPLOSION, 10000);
+                events.ScheduleEvent(EVENT_FROST_BOMB_EXPLOSION, 10s);
             }
 
             void UpdateAI(uint32 diff) override
@@ -1579,7 +1579,7 @@ class npc_mimiron_frost_bomb : public CreatureScript
                     {
                         case EVENT_FROST_BOMB_EXPLOSION:
                             DoCastAOE(SPELL_FROST_BOMB_EXPLOSION);
-                            events.ScheduleEvent(EVENT_FROST_BOMB_CLEAR_FIRES, 3000);
+                            events.ScheduleEvent(EVENT_FROST_BOMB_CLEAR_FIRES, 3s);
                             break;
                         case EVENT_FROST_BOMB_CLEAR_FIRES:
                             DoCastAOE(SPELL_CLEAR_FIRES);
@@ -1614,7 +1614,7 @@ class npc_mimiron_proximity_mine : public CreatureScript
 
             void Reset() override
             {
-                events.ScheduleEvent(EVENT_PROXIMITY_MINE_ARM, 1500);
+                events.ScheduleEvent(EVENT_PROXIMITY_MINE_ARM, 1500ms);
             }
 
             void UpdateAI(uint32 diff) override
diff --git a/src/server/scripts/Northrend/Ulduar/Ulduar/boss_razorscale.cpp b/src/server/scripts/Northrend/Ulduar/Ulduar/boss_razorscale.cpp
index 6cf9fa22145..831933d6d25 100644
--- a/src/server/scripts/Northrend/Ulduar/Ulduar/boss_razorscale.cpp
+++ b/src/server/scripts/Northrend/Ulduar/Ulduar/boss_razorscale.cpp
@@ -360,7 +360,7 @@ struct boss_razorscale : public BossAI
         instance->SendEncounterUnit(ENCOUNTER_FRAME_ENGAGE, me);
         ScheduleAirPhaseEvents();
         summons.DoAction(ACTION_START_FIGHT, DummyEntryCheckPredicate());
-        events.ScheduleEvent(EVENT_BERSERK, Minutes(15));
+        events.ScheduleEvent(EVENT_BERSERK, 15min);
         HandleMusic(true);
         me->SetByteFlag(UNIT_FIELD_BYTES_1, UNIT_BYTES_1_OFFSET_ANIM_TIER, UNIT_BYTE1_FLAG_ALWAYS_STAND | UNIT_BYTE1_FLAG_HOVER);
     }
@@ -715,7 +715,7 @@ struct npc_expedition_commander : public ScriptedAI
 
         _harpoons.clear();
         BuildBrokenHarpoons();
-        _events.ScheduleEvent(EVENT_HANDLE_DESTROY_HARPOON, Seconds(10));
+        _events.ScheduleEvent(EVENT_HANDLE_DESTROY_HARPOON, 10s);
     }
 
     void HandleControllersStopCast()
@@ -1261,15 +1261,15 @@ struct npc_darkrune_watcher : public ScriptedAI
     {
         _events.Reset();
         me->SetReactState(REACT_PASSIVE);
-        _events.ScheduleEvent(EVENT_START_COMBAT, Seconds(2));
+        _events.ScheduleEvent(EVENT_START_COMBAT, 2s);
         if (Creature* razorscale = _instance->GetCreature(BOSS_RAZORSCALE))
             razorscale->AI()->JustSummoned(me);
     }
 
     void JustEngagedWith(Unit* /*who*/) override
     {
-        _events.ScheduleEvent(EVENT_LIGHTNING_BOLT, Seconds(5));
-        _events.ScheduleEvent(EVENT_CHAIN_LIGHTNING, Seconds(34));
+        _events.ScheduleEvent(EVENT_LIGHTNING_BOLT, 5s);
+        _events.ScheduleEvent(EVENT_CHAIN_LIGHTNING, 34s);
     }
 
     void UpdateAI(uint32 diff) override
@@ -1322,14 +1322,14 @@ struct npc_darkrune_guardian : public ScriptedAI
     {
         _events.Reset();
         me->SetReactState(REACT_PASSIVE);
-        _events.ScheduleEvent(EVENT_START_COMBAT, Seconds(2));
+        _events.ScheduleEvent(EVENT_START_COMBAT, 2s);
         if (Creature* razorscale = _instance->GetCreature(BOSS_RAZORSCALE))
             razorscale->AI()->JustSummoned(me);
     }
 
     void JustEngagedWith(Unit* /*who*/) override
     {
-        _events.ScheduleEvent(EVENT_STORMSTRIKE, Seconds(23));
+        _events.ScheduleEvent(EVENT_STORMSTRIKE, 23s);
     }
 
     uint32 GetData(uint32 type) const override
@@ -1390,16 +1390,16 @@ struct npc_darkrune_sentinel : public ScriptedAI
     {
         _events.Reset();
         me->SetReactState(REACT_PASSIVE);
-        _events.ScheduleEvent(EVENT_START_COMBAT, Seconds(2));
+        _events.ScheduleEvent(EVENT_START_COMBAT, 2s);
         if (Creature* razorscale = _instance->GetCreature(BOSS_RAZORSCALE))
             razorscale->AI()->JustSummoned(me);
     }
 
     void JustEngagedWith(Unit* /*who*/) override
     {
-        _events.ScheduleEvent(EVENT_HEROIC_STRIKE, Seconds(9));
-        _events.ScheduleEvent(EVENT_BATTLE_SHOUT, Seconds(15));
-        _events.ScheduleEvent(EVENT_WHIRLWIND, Seconds(17));
+        _events.ScheduleEvent(EVENT_HEROIC_STRIKE, 9s);
+        _events.ScheduleEvent(EVENT_BATTLE_SHOUT, 15s);
+        _events.ScheduleEvent(EVENT_WHIRLWIND, 17s);
     }
 
     void UpdateAI(uint32 diff) override
diff --git a/src/server/scripts/Northrend/Ulduar/Ulduar/boss_thorim.cpp b/src/server/scripts/Northrend/Ulduar/Ulduar/boss_thorim.cpp
index eefb1f225dc..13b1ca85f6f 100644
--- a/src/server/scripts/Northrend/Ulduar/Ulduar/boss_thorim.cpp
+++ b/src/server/scripts/Northrend/Ulduar/Ulduar/boss_thorim.cpp
@@ -924,7 +924,7 @@ class boss_thorim : public CreatureScript
                 {
                     Talk(SAY_JUMPDOWN);
                     events.SetPhase(PHASE_2);
-                    events.ScheduleEvent(EVENT_JUMPDOWN, 8000);
+                    events.ScheduleEvent(EVENT_JUMPDOWN, 8s);
                     events.ScheduleEvent(EVENT_ACTIVATE_LIGHTNING_FIELD, 15000);
                     events.RescheduleEvent(EVENT_BERSERK, 300000, 0, PHASE_2);
 
@@ -1147,11 +1147,11 @@ class npc_thorim_pre_phase : public CreatureScript
             {
                 _events.Reset();
                 if (_info->PrimaryAbility)
-                    _events.ScheduleEvent(EVENT_PRIMARY_ABILITY, urand(3000, 6000));
+                    _events.ScheduleEvent(EVENT_PRIMARY_ABILITY, 3s, 6s);
                 if (_info->SecondaryAbility)
                     _events.ScheduleEvent(EVENT_SECONDARY_ABILITY, _info->SecondaryAbility == SPELL_SHOOT ? 2000 : urand(12000, 15000));
                 if (_info->ThirdAbility)
-                    _events.ScheduleEvent(EVENT_THIRD_ABILITY, urand(6000, 8000));
+                    _events.ScheduleEvent(EVENT_THIRD_ABILITY, 6s, 8s);
                 if (_info->Type == MERCENARY_SOLDIER)
                     SetCombatMovement(false);
             }
@@ -1182,19 +1182,19 @@ class npc_thorim_pre_phase : public CreatureScript
                         if (UseAbility(_info->PrimaryAbility))
                             _events.ScheduleEvent(eventId, urand(15000, 20000));
                         else
-                            _events.ScheduleEvent(eventId, 1000);
+                            _events.ScheduleEvent(eventId, 1s);
                         break;
                     case EVENT_SECONDARY_ABILITY:
                         if (UseAbility(_info->SecondaryAbility))
                             _events.ScheduleEvent(eventId, _info->SecondaryAbility == SPELL_SHOOT ? 2000 : urand(4000, 8000));
                         else
-                            _events.ScheduleEvent(eventId, 1000);
+                            _events.ScheduleEvent(eventId, 1s);
                         break;
                     case EVENT_THIRD_ABILITY:
                         if (UseAbility(_info->ThirdAbility))
-                            _events.ScheduleEvent(eventId, urand(6000, 8000));
+                            _events.ScheduleEvent(eventId, 6s, 8s);
                         else
-                            _events.ScheduleEvent(eventId, 1000);
+                            _events.ScheduleEvent(eventId, 1s);
                         break;
                     default:
                         break;
@@ -1250,13 +1250,13 @@ class npc_thorim_arena_phase : public CreatureScript
             {
                 _events.Reset();
                 if (_info->PrimaryAbility)
-                    _events.ScheduleEvent(EVENT_PRIMARY_ABILITY, urand(3000, 6000));
+                    _events.ScheduleEvent(EVENT_PRIMARY_ABILITY, 3s, 6s);
                 if (_info->SecondaryAbility)
-                    _events.ScheduleEvent(EVENT_SECONDARY_ABILITY, urand(7000, 9000));
+                    _events.ScheduleEvent(EVENT_SECONDARY_ABILITY, 7s, 9s);
                 if (_info->ThirdAbility)
-                    _events.ScheduleEvent(EVENT_THIRD_ABILITY, urand(6000, 8000));
+                    _events.ScheduleEvent(EVENT_THIRD_ABILITY, 6s, 8s);
                 if (_info->Type == DARK_RUNE_CHAMPION)
-                    _events.ScheduleEvent(EVENT_ABILITY_CHARGE, 8000);
+                    _events.ScheduleEvent(EVENT_ABILITY_CHARGE, 8s);
             }
 
             void JustEngagedWith(Unit* /*who*/) override
@@ -1307,7 +1307,7 @@ class npc_thorim_arena_phase : public CreatureScript
                         Unit* referer = me;
                         if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0, [referer](Unit* unit){ return unit->GetTypeId() == TYPEID_PLAYER && unit->IsInRange(referer, 8.0f, 25.0f); }))
                             DoCast(target, SPELL_CHARGE);
-                        _events.ScheduleEvent(eventId, 12000);
+                        _events.ScheduleEvent(eventId, 12s);
                         break;
                     }
                     default:
@@ -1411,7 +1411,7 @@ class npc_runic_colossus : public CreatureScript
                 if (action == ACTION_ACTIVATE_RUNIC_SMASH)
                 {
                     _runicActive = true;
-                    _events.ScheduleEvent(EVENT_RUNIC_SMASH, 7000);
+                    _events.ScheduleEvent(EVENT_RUNIC_SMASH, 7s);
                 }
             }
 
@@ -1434,9 +1434,9 @@ class npc_runic_colossus : public CreatureScript
             {
                 DoZoneInCombat();
                 _events.Reset();
-                _events.ScheduleEvent(EVENT_RUNIC_BARRIER, urand(12000, 15000));
-                _events.ScheduleEvent(EVENT_SMASH, urand(15000, 18000));
-                _events.ScheduleEvent(EVENT_RUNIC_CHARGE, urand(20000, 24000));
+                _events.ScheduleEvent(EVENT_RUNIC_BARRIER, 12s, 15s);
+                _events.ScheduleEvent(EVENT_SMASH, 15s, 18s);
+                _events.ScheduleEvent(EVENT_RUNIC_CHARGE, 20s, 24s);
             }
 
             void UpdateAI(uint32 diff) override
@@ -1522,7 +1522,7 @@ class npc_ancient_rune_giant : public CreatureScript
                 DoZoneInCombat();
                 _events.Reset();
                 _events.ScheduleEvent(EVENT_RUNIC_FORTIFICATION, 1);
-                _events.ScheduleEvent(EVENT_STOMP, urand(10000, 12000));
+                _events.ScheduleEvent(EVENT_STOMP, 10s, 12s);
                 _events.ScheduleEvent(EVENT_RUNE_DETONATION, 25000);
             }
 
@@ -1613,10 +1613,10 @@ class npc_sif : public CreatureScript
                     DoZoneInCombat(me);
                     Talk(SAY_SIF_EVENT);
                     _events.Reset();
-                    _events.ScheduleEvent(EVENT_FROSTBOLT, 2000);
+                    _events.ScheduleEvent(EVENT_FROSTBOLT, 2s);
                     _events.ScheduleEvent(EVENT_FROSTBOLT_VOLLEY, 15000);
-                    _events.ScheduleEvent(EVENT_BLINK, urand(20000, 25000));
-                    _events.ScheduleEvent(EVENT_BLIZZARD, 30000);
+                    _events.ScheduleEvent(EVENT_BLINK, 20s, 25s);
+                    _events.ScheduleEvent(EVENT_BLIZZARD, 30s);
                 }
             }
 
diff --git a/src/server/scripts/Northrend/Ulduar/Ulduar/boss_xt002.cpp b/src/server/scripts/Northrend/Ulduar/Ulduar/boss_xt002.cpp
index 3467c1e966d..c0659bc6a94 100644
--- a/src/server/scripts/Northrend/Ulduar/Ulduar/boss_xt002.cpp
+++ b/src/server/scripts/Northrend/Ulduar/Ulduar/boss_xt002.cpp
@@ -342,7 +342,7 @@ struct boss_xt002 : public BossAI
                     Talk(EMOTE_TYMPANIC_TANTRUM);
                     events.DelayEvents(10s, GROUP_SEARING_GRAVITY);
                     DoCastSelf(SPELL_TYMPANIC_TANTRUM);
-                    events.Repeat(60s);
+                    events.Repeat(1min);
                     break;
                 case EVENT_PHASE_CHECK:
                     if (me->HealthBelowPct(_exposeHeartPercent))
diff --git a/src/server/scripts/Northrend/Ulduar/Ulduar/boss_yogg_saron.cpp b/src/server/scripts/Northrend/Ulduar/Ulduar/boss_yogg_saron.cpp
index a9d28dd6561..086e3b37ed1 100644
--- a/src/server/scripts/Northrend/Ulduar/Ulduar/boss_yogg_saron.cpp
+++ b/src/server/scripts/Northrend/Ulduar/Ulduar/boss_yogg_saron.cpp
@@ -524,7 +524,7 @@ class boss_voice_of_yogg_saron : public CreatureScript
 
                 events.ScheduleEvent(EVENT_LOCK_DOOR, 15000);
                 events.ScheduleEvent(EVENT_SUMMON_GUARDIAN_OF_YOGG_SARON, _guardianTimer, 0, PHASE_ONE);
-                events.ScheduleEvent(EVENT_EXTINGUISH_ALL_LIFE, 900000);    // 15 minutes
+                events.ScheduleEvent(EVENT_EXTINGUISH_ALL_LIFE, 15min);    // 15 minutes
             }
 
             void JustDied(Unit* /*killer*/) override
@@ -560,7 +560,7 @@ class boss_voice_of_yogg_saron : public CreatureScript
                                 yogg->AI()->Talk(EMOTE_YOGG_SARON_EXTINGUISH_ALL_LIFE, me);
                                 yogg->CastSpell(nullptr, SPELL_EXTINGUISH_ALL_LIFE, true);
                             }
-                            events.ScheduleEvent(EVENT_EXTINGUISH_ALL_LIFE, 10000);    // cast it again after a short while, players can survive
+                            events.ScheduleEvent(EVENT_EXTINGUISH_ALL_LIFE, 10s);    // cast it again after a short while, players can survive
                             break;
                         case EVENT_SUMMON_GUARDIAN_OF_YOGG_SARON:
                             DoCastAOE(SPELL_SUMMON_GUARDIAN_2, { SPELLVALUE_MAX_TARGETS, 1 });
@@ -598,12 +598,12 @@ class boss_voice_of_yogg_saron : public CreatureScript
 
                             if (Creature* brain = instance->GetCreature(DATA_BRAIN_OF_YOGG_SARON))
                                 brain->AI()->DoAction(ACTION_INDUCE_MADNESS);
-                            events.ScheduleEvent(EVENT_ILLUSION, 80000, 0, PHASE_TWO);  // wowwiki says 80 secs, wowhead says something about 90 secs
+                            events.ScheduleEvent(EVENT_ILLUSION, 80s, 0, PHASE_TWO);  // wowwiki says 80 secs, wowhead says something about 90 secs
                             break;
                         }
                         case EVENT_SUMMON_IMMORTAL_GUARDIAN:
                             DoCastAOE(SPELL_IMMORTAL_GUARDIAN);
-                            events.ScheduleEvent(EVENT_SUMMON_IMMORTAL_GUARDIAN, 15000, 0, PHASE_THREE);
+                            events.ScheduleEvent(EVENT_SUMMON_IMMORTAL_GUARDIAN, 15s, 0, PHASE_THREE);
                             break;
                         default:
                             break;
@@ -627,14 +627,14 @@ class boss_voice_of_yogg_saron : public CreatureScript
                         events.ScheduleEvent(EVENT_SUMMON_CORRUPTOR_TENTACLE, 5s, EVENT_GROUP_SUMMON_TENTACLES, PHASE_TWO);
                         events.ScheduleEvent(EVENT_SUMMON_CONSTRICTOR_TENTACLE, 7s, EVENT_GROUP_SUMMON_TENTACLES, PHASE_TWO);
                         events.ScheduleEvent(EVENT_SUMMON_CRUSHER_TENTACLE, 5s, EVENT_GROUP_SUMMON_TENTACLES, PHASE_TWO);
-                        events.ScheduleEvent(EVENT_ILLUSION, 60000, 0, PHASE_TWO);
+                        events.ScheduleEvent(EVENT_ILLUSION, 1min, 0, PHASE_TWO);
                         break;
                     case ACTION_TOGGLE_SHATTERED_ILLUSION:
                         _illusionShattered = !_illusionShattered;
                         break;
                     case ACTION_PHASE_THREE:
                         events.SetPhase(PHASE_THREE);
-                        events.ScheduleEvent(EVENT_SUMMON_IMMORTAL_GUARDIAN, 1000, 0, PHASE_THREE);
+                        events.ScheduleEvent(EVENT_SUMMON_IMMORTAL_GUARDIAN, 1s, 0, PHASE_THREE);
                         break;
                     default:
                         break;
@@ -764,7 +764,7 @@ class boss_sara : public CreatureScript
             void JustEngagedWith(Unit* /*who*/) override
             {
                 Talk(SAY_SARA_AGGRO);
-                _events.ScheduleEvent(EVENT_SARAS_FERVOR, 5000, 0, PHASE_ONE);
+                _events.ScheduleEvent(EVENT_SARAS_FERVOR, 5s, 0, PHASE_ONE);
                 _events.ScheduleEvent(EVENT_SARAS_BLESSING, urand(10000, 30000), 0, PHASE_ONE);
                 _events.ScheduleEvent(EVENT_SARAS_ANGER, urand(15000, 25000), 0, PHASE_ONE);
             }
@@ -797,7 +797,7 @@ class boss_sara : public CreatureScript
                     {
                         case EVENT_SARAS_FERVOR:
                             DoCastAOE(SPELL_SARAS_FERVOR_TARGET_SELECTOR, { SPELLVALUE_MAX_TARGETS, 1 });
-                            _events.ScheduleEvent(EVENT_SARAS_FERVOR, 6000, 0, PHASE_ONE);
+                            _events.ScheduleEvent(EVENT_SARAS_FERVOR, 6s, 0, PHASE_ONE);
                             break;
                         case EVENT_SARAS_ANGER:
                             DoCastAOE(SPELL_SARAS_ANGER_TARGET_SELECTOR, { SPELLVALUE_MAX_TARGETS, 1 });
@@ -828,14 +828,14 @@ class boss_sara : public CreatureScript
                                 DoCast(yogg, SPELL_RIDE_YOGG_SARON_VEHICLE);
                             DoCast(me, SPELL_SHADOWY_BARRIER_SARA);
                             _events.SetPhase(PHASE_TWO);
-                            _events.ScheduleEvent(EVENT_DEATH_RAY, 20000, 0, PHASE_TWO);    // almost never cast at scheduled time, why?
-                            _events.ScheduleEvent(EVENT_MALADY_OF_THE_MIND, 18000, 0, PHASE_TWO);
+                            _events.ScheduleEvent(EVENT_DEATH_RAY, 20s, 0, PHASE_TWO);    // almost never cast at scheduled time, why?
+                            _events.ScheduleEvent(EVENT_MALADY_OF_THE_MIND, 18s, 0, PHASE_TWO);
                             _events.ScheduleEvent(EVENT_PSYCHOSIS, 1, 0, PHASE_TWO);
-                            _events.ScheduleEvent(EVENT_BRAIN_LINK, 23000, 0, PHASE_TWO);
+                            _events.ScheduleEvent(EVENT_BRAIN_LINK, 23s, 0, PHASE_TWO);
                             break;
                         case EVENT_DEATH_RAY:
                             DoCast(me, SPELL_DEATH_RAY);
-                            _events.ScheduleEvent(EVENT_DEATH_RAY, 21000, 0, PHASE_TWO);
+                            _events.ScheduleEvent(EVENT_DEATH_RAY, 21s, 0, PHASE_TWO);
                             break;
                         case EVENT_MALADY_OF_THE_MIND:
                             DoCastAOE(SPELL_MALADY_OF_THE_MIND, { SPELLVALUE_MAX_TARGETS, 1 });
@@ -843,7 +843,7 @@ class boss_sara : public CreatureScript
                             break;
                         case EVENT_PSYCHOSIS:
                             DoCastAOE(SPELL_PSYCHOSIS, { SPELLVALUE_MAX_TARGETS, 1 });
-                            _events.ScheduleEvent(EVENT_PSYCHOSIS, 4000, 0, PHASE_TWO);
+                            _events.ScheduleEvent(EVENT_PSYCHOSIS, 4s, 0, PHASE_TWO);
                             break;
                         case EVENT_BRAIN_LINK:
                             DoCastAOE(SPELL_BRAIN_LINK, { SPELLVALUE_MAX_TARGETS, 2 });
@@ -921,7 +921,7 @@ class boss_yogg_saron : public CreatureScript
             {
                 _events.Reset();
                 _events.SetPhase(PHASE_TWO);
-                _events.ScheduleEvent(EVENT_YELL_BOW_DOWN, 3000, 0, PHASE_TWO);
+                _events.ScheduleEvent(EVENT_YELL_BOW_DOWN, 3s, 0, PHASE_TWO);
                 DoCast(me, SPELL_SHADOWY_BARRIER_YOGG);
                 DoCast(me, SPELL_KNOCK_AWAY);
 
@@ -985,12 +985,12 @@ class boss_yogg_saron : public CreatureScript
                         case EVENT_SHADOW_BEACON:
                             DoCastAOE(SPELL_SHADOW_BEACON);
                             Talk(EMOTE_YOGG_SARON_EMPOWERING_SHADOWS);
-                            _events.ScheduleEvent(EVENT_SHADOW_BEACON, 45000, 0, PHASE_THREE);
+                            _events.ScheduleEvent(EVENT_SHADOW_BEACON, 45s, 0, PHASE_THREE);
                             break;
                         case EVENT_LUNATIC_GAZE:
                             DoCast(me, SPELL_LUNATIC_GAZE);
                             sCreatureTextMgr->SendSound(me, SOUND_LUNATIC_GAZE, CHAT_MSG_MONSTER_YELL, 0, TEXT_RANGE_NORMAL, TEAM_OTHER, false);
-                            _events.ScheduleEvent(EVENT_LUNATIC_GAZE, 12000, 0, PHASE_THREE);
+                            _events.ScheduleEvent(EVENT_LUNATIC_GAZE, 12s, 0, PHASE_THREE);
                             break;
                         case EVENT_DEAFENING_ROAR:
                             DoCastAOE(SPELL_DEAFENING_ROAR);
@@ -1010,8 +1010,8 @@ class boss_yogg_saron : public CreatureScript
                 {
                     case ACTION_PHASE_THREE:
                         _events.SetPhase(PHASE_THREE);
-                        _events.ScheduleEvent(EVENT_SHADOW_BEACON, 45000, 0, PHASE_THREE);
-                        _events.ScheduleEvent(EVENT_LUNATIC_GAZE, 12000, 0, PHASE_THREE);
+                        _events.ScheduleEvent(EVENT_SHADOW_BEACON, 45s, 0, PHASE_THREE);
+                        _events.ScheduleEvent(EVENT_LUNATIC_GAZE, 12s, 0, PHASE_THREE);
                         if (me->GetMap()->Is25ManRaid() && _instance->GetData(DATA_KEEPERS_COUNT) < 4)
                             _events.ScheduleEvent(EVENT_DEAFENING_ROAR, urand(20000, 25000), 0, PHASE_THREE);    // timer guessed
                         Talk(SAY_YOGG_SARON_PHASE_3);
@@ -1181,7 +1181,7 @@ class npc_guardian_of_yogg_saron : public CreatureScript
 
             void Reset() override
             {
-                _events.ScheduleEvent(EVENT_DARK_VOLLEY, urand(10000, 15000));
+                _events.ScheduleEvent(EVENT_DARK_VOLLEY, 10s, 15s);
             }
 
             void UpdateAI(uint32 diff) override
@@ -1200,7 +1200,7 @@ class npc_guardian_of_yogg_saron : public CreatureScript
                     {
                         case EVENT_DARK_VOLLEY:
                             DoCastAOE(SPELL_DARK_VOLLEY);
-                            _events.ScheduleEvent(EVENT_DARK_VOLLEY, urand(10000, 15000));
+                            _events.ScheduleEvent(EVENT_DARK_VOLLEY, 10s, 15s);
                             break;
                         default:
                             break;
@@ -1270,7 +1270,7 @@ class npc_corruptor_tentacle : public CreatureScript
                         case EVENT_CAST_RANDOM_SPELL:
                             if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM))
                                 DoCast(target, RAND(SPELL_BLACK_PLAGUE, SPELL_CURSE_OF_DOOM, SPELL_APATHY, SPELL_DRAINING_POISON));
-                            _events.ScheduleEvent(EVENT_CAST_RANDOM_SPELL, 3000);
+                            _events.ScheduleEvent(EVENT_CAST_RANDOM_SPELL, 3s);
                             break;
                         default:
                             break;
@@ -1353,7 +1353,7 @@ class npc_crusher_tentacle : public CreatureScript
                 DoCast(me, SPELL_FOCUSED_ANGER);
                 DoCastAOE(SPELL_ERUPT);
 
-                _events.ScheduleEvent(EVENT_DIMINISH_POWER, urand(6000, 8000));
+                _events.ScheduleEvent(EVENT_DIMINISH_POWER, 6s, 8s);
             }
 
             void UpdateAI(uint32 diff) override
@@ -1374,7 +1374,7 @@ class npc_crusher_tentacle : public CreatureScript
                     {
                         case EVENT_DIMINISH_POWER:
                             DoCast(SPELL_DIMINISH_POWER);
-                            _events.ScheduleEvent(EVENT_DIMINISH_POWER, urand(20000, 30000));
+                            _events.ScheduleEvent(EVENT_DIMINISH_POWER, 20s, 30s);
                             break;
                         default:
                             break;
@@ -1474,7 +1474,7 @@ class npc_immortal_guardian : public CreatureScript
             {
                 DoCast(me, SPELL_EMPOWERED);
                 DoCast(me, SPELL_RECENTLY_SPAWNED);
-                _events.ScheduleEvent(EVENT_DRAIN_LIFE, urand(3000, 13000));
+                _events.ScheduleEvent(EVENT_DRAIN_LIFE, 3s, 13s);
             }
 
             void DamageTaken(Unit* /*attacker*/, uint32& damage) override
@@ -1499,7 +1499,7 @@ class npc_immortal_guardian : public CreatureScript
                     {
                         case EVENT_DRAIN_LIFE:
                             DoCast(SPELL_DRAIN_LIFE);
-                            _events.ScheduleEvent(EVENT_DRAIN_LIFE, urand(20000, 30000));
+                            _events.ScheduleEvent(EVENT_DRAIN_LIFE, 20s, 30s);
                             break;
                         default:
                             break;
@@ -1680,7 +1680,7 @@ class npc_yogg_saron_keeper : public CreatureScript
                     }
                     case ACTION_FLASH_FREEZE:
                         DoCast(SPELL_FLASH_FREEZE_VISUAL);
-                        _events.ScheduleEvent(EVENT_HODIRS_PROTECTIVE_GAZE, urand(25000, 30000));
+                        _events.ScheduleEvent(EVENT_HODIRS_PROTECTIVE_GAZE, 25s, 30s);
                         break;
                 }
             }
diff --git a/src/server/scripts/Northrend/Ulduar/Ulduar/instance_ulduar.cpp b/src/server/scripts/Northrend/Ulduar/Ulduar/instance_ulduar.cpp
index 9037c81f9db..d5935e3f6f2 100644
--- a/src/server/scripts/Northrend/Ulduar/Ulduar/instance_ulduar.cpp
+++ b/src/server/scripts/Northrend/Ulduar/Ulduar/instance_ulduar.cpp
@@ -606,7 +606,7 @@ class instance_ulduar : public InstanceMapScript
                 {
                     case BOSS_LEVIATHAN:
                         if (state == DONE)
-                            _events.ScheduleEvent(EVENT_DESPAWN_LEVIATHAN_VEHICLES, 5 * IN_MILLISECONDS);
+                            _events.ScheduleEvent(EVENT_DESPAWN_LEVIATHAN_VEHICLES, 5s);
                         break;
                     case BOSS_IGNIS:
                     case BOSS_RAZORSCALE:
@@ -734,7 +734,7 @@ class instance_ulduar : public InstanceMapScript
                         ColossusData = data;
                         if (data >= 2 && GetBossState(BOSS_LEVIATHAN) == NOT_STARTED)
                         {
-                            _events.ScheduleEvent(EVENT_LEVIATHAN_BREAK_DOOR, 5 * IN_MILLISECONDS);
+                            _events.ScheduleEvent(EVENT_LEVIATHAN_BREAK_DOOR, 5s);
                             SaveToDB();
                         }
                         break;
@@ -761,7 +761,7 @@ class instance_ulduar : public InstanceMapScript
                         DoUpdateWorldState(WORLD_STATE_ALGALON_DESPAWN_TIMER, 60);
                         _algalonTimer = 60;
                         _events.ScheduleEvent(EVENT_DESPAWN_ALGALON, 3600000);
-                        _events.ScheduleEvent(EVENT_UPDATE_ALGALON_TIMER, 60000);
+                        _events.ScheduleEvent(EVENT_UPDATE_ALGALON_TIMER, 1min);
                         break;
                     case DATA_ALGALON_SUMMON_STATE:
                         _algalonSummoned = true;
@@ -949,7 +949,7 @@ class instance_ulduar : public InstanceMapScript
                     _summonAlgalon = true;
                     if (_algalonTimer && _algalonTimer <= 60)
                     {
-                        _events.ScheduleEvent(EVENT_UPDATE_ALGALON_TIMER, 60000);
+                        _events.ScheduleEvent(EVENT_UPDATE_ALGALON_TIMER, 1min);
                         DoUpdateWorldState(WORLD_STATE_ALGALON_TIMER_ENABLED, 1);
                         DoUpdateWorldState(WORLD_STATE_ALGALON_DESPAWN_TIMER, _algalonTimer);
                     }
@@ -988,7 +988,7 @@ class instance_ulduar : public InstanceMapScript
                             SaveToDB();
                             DoUpdateWorldState(WORLD_STATE_ALGALON_DESPAWN_TIMER, --_algalonTimer);
                             if (_algalonTimer)
-                                _events.ScheduleEvent(EVENT_UPDATE_ALGALON_TIMER, 60000);
+                                _events.ScheduleEvent(EVENT_UPDATE_ALGALON_TIMER, 1min);
                             else
                             {
                                 DoUpdateWorldState(WORLD_STATE_ALGALON_TIMER_ENABLED, 0);
diff --git a/src/server/scripts/Northrend/UtgardeKeep/UtgardeKeep/boss_ingvar_the_plunderer.cpp b/src/server/scripts/Northrend/UtgardeKeep/UtgardeKeep/boss_ingvar_the_plunderer.cpp
index 6b4e5f76711..116963dceee 100644
--- a/src/server/scripts/Northrend/UtgardeKeep/UtgardeKeep/boss_ingvar_the_plunderer.cpp
+++ b/src/server/scripts/Northrend/UtgardeKeep/UtgardeKeep/boss_ingvar_the_plunderer.cpp
@@ -124,7 +124,7 @@ class boss_ingvar_the_plunderer : public CreatureScript
                 if (damage >= me->GetHealth() && events.IsInPhase(PHASE_HUMAN))
                 {
                     events.SetPhase(PHASE_EVENT);
-                    events.ScheduleEvent(EVENT_SUMMON_BANSHEE, 3 * IN_MILLISECONDS, 0, PHASE_EVENT);
+                    events.ScheduleEvent(EVENT_SUMMON_BANSHEE, 3s, 0, PHASE_EVENT);
 
                     me->RemoveAllAuras();
                     me->StopMoving();
@@ -151,7 +151,7 @@ class boss_ingvar_the_plunderer : public CreatureScript
                 me->RemoveAura(SPELL_INGVAR_FEIGN_DEATH);
                 DoCast(me, SPELL_INGVAR_TRANSFORM, true);
                 me->UpdateEntry(NPC_INGVAR_UNDEAD);
-                events.ScheduleEvent(EVENT_JUST_TRANSFORMED, IN_MILLISECONDS / 2, 0, PHASE_EVENT);
+                events.ScheduleEvent(EVENT_JUST_TRANSFORMED, 500ms, 0, PHASE_EVENT);
             }
 
             void JustEngagedWith(Unit* /*who*/) override
@@ -162,10 +162,10 @@ class boss_ingvar_the_plunderer : public CreatureScript
 
                 Talk(SAY_AGGRO);
                 events.SetPhase(PHASE_HUMAN);
-                events.ScheduleEvent(EVENT_CLEAVE, urand(6, 12)*IN_MILLISECONDS, 0, PHASE_HUMAN);
-                events.ScheduleEvent(EVENT_STAGGERING_ROAR, urand(18, 21)*IN_MILLISECONDS, 0, PHASE_HUMAN);
-                events.ScheduleEvent(EVENT_ENRAGE, urand(7, 14)*IN_MILLISECONDS, 0, PHASE_HUMAN);
-                events.ScheduleEvent(EVENT_SMASH, urand(12, 17)*IN_MILLISECONDS, 0, PHASE_HUMAN);
+                events.ScheduleEvent(EVENT_CLEAVE, 6s, 12s, 0, PHASE_HUMAN);
+                events.ScheduleEvent(EVENT_STAGGERING_ROAR, 18s, 21s, 0, PHASE_HUMAN);
+                events.ScheduleEvent(EVENT_ENRAGE, 7s, 14s, 0, PHASE_HUMAN);
+                events.ScheduleEvent(EVENT_SMASH, 12s, 17s, 0, PHASE_HUMAN);
             }
 
             void AttackStart(Unit* who) override
@@ -184,9 +184,9 @@ class boss_ingvar_the_plunderer : public CreatureScript
             void ScheduleSecondPhase()
             {
                 events.SetPhase(PHASE_UNDEAD);
-                events.ScheduleEvent(EVENT_DARK_SMASH, urand(14, 18)*IN_MILLISECONDS, 0, PHASE_UNDEAD);
+                events.ScheduleEvent(EVENT_DARK_SMASH, 14s, 18s, 0, PHASE_UNDEAD);
                 events.ScheduleEvent(EVENT_DREADFUL_ROAR, 0, 0, PHASE_UNDEAD);
-                events.ScheduleEvent(EVENT_WOE_STRIKE, urand(10, 14)*IN_MILLISECONDS, 0, PHASE_UNDEAD);
+                events.ScheduleEvent(EVENT_WOE_STRIKE, 10s, 14s, 0, PHASE_UNDEAD);
                 events.ScheduleEvent(EVENT_SHADOW_AXE, 30*IN_MILLISECONDS, 0, PHASE_UNDEAD);
             }
 
@@ -213,19 +213,19 @@ class boss_ingvar_the_plunderer : public CreatureScript
                         // PHASE ONE
                         case EVENT_CLEAVE:
                             DoCastVictim(SPELL_CLEAVE);
-                            events.ScheduleEvent(EVENT_CLEAVE, urand(6, 12)*IN_MILLISECONDS, 0, PHASE_HUMAN);
+                            events.ScheduleEvent(EVENT_CLEAVE, 6s, 12s, 0, PHASE_HUMAN);
                             break;
                         case EVENT_STAGGERING_ROAR:
                             DoCast(me, SPELL_STAGGERING_ROAR);
-                            events.ScheduleEvent(EVENT_STAGGERING_ROAR, urand(18, 22)*IN_MILLISECONDS, 0, PHASE_HUMAN);
+                            events.ScheduleEvent(EVENT_STAGGERING_ROAR, 18s, 22s, 0, PHASE_HUMAN);
                             break;
                         case EVENT_ENRAGE:
                             DoCast(me, SPELL_ENRAGE);
-                            events.ScheduleEvent(EVENT_ENRAGE, urand(7, 14)*IN_MILLISECONDS, 0, PHASE_HUMAN);
+                            events.ScheduleEvent(EVENT_ENRAGE, 7s, 14s, 0, PHASE_HUMAN);
                             break;
                         case EVENT_SMASH:
                             DoCastAOE(SPELL_SMASH);
-                            events.ScheduleEvent(EVENT_SMASH, urand(12, 16)*IN_MILLISECONDS, 0, PHASE_HUMAN);
+                            events.ScheduleEvent(EVENT_SMASH, 12s, 16s, 0, PHASE_HUMAN);
                             break;
                         case EVENT_JUST_TRANSFORMED:
                             ScheduleSecondPhase();
@@ -245,15 +245,15 @@ class boss_ingvar_the_plunderer : public CreatureScript
                         // PHASE TWO
                         case EVENT_DARK_SMASH:
                             DoCastVictim(SPELL_DARK_SMASH);
-                            events.ScheduleEvent(EVENT_DARK_SMASH, urand(12, 16)*IN_MILLISECONDS, 0, PHASE_UNDEAD);
+                            events.ScheduleEvent(EVENT_DARK_SMASH, 12s, 16s, 0, PHASE_UNDEAD);
                             break;
                         case EVENT_DREADFUL_ROAR:
                             DoCast(me, SPELL_DREADFUL_ROAR);
-                            events.ScheduleEvent(EVENT_DREADFUL_ROAR, urand(18, 22)*IN_MILLISECONDS, 0, PHASE_UNDEAD);
+                            events.ScheduleEvent(EVENT_DREADFUL_ROAR, 18s, 22s, 0, PHASE_UNDEAD);
                             break;
                         case EVENT_WOE_STRIKE:
                             DoCastVictim(SPELL_WOE_STRIKE);
-                            events.ScheduleEvent(EVENT_WOE_STRIKE, urand(10, 14)*IN_MILLISECONDS, 0, PHASE_UNDEAD);
+                            events.ScheduleEvent(EVENT_WOE_STRIKE, 10s, 14s, 0, PHASE_UNDEAD);
                             break;
                         case EVENT_SHADOW_AXE:
                             if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 1, 0.0f, true))
diff --git a/src/server/scripts/Northrend/UtgardeKeep/UtgardeKeep/boss_keleseth.cpp b/src/server/scripts/Northrend/UtgardeKeep/UtgardeKeep/boss_keleseth.cpp
index be1b482aa60..35dacb2b9bf 100644
--- a/src/server/scripts/Northrend/UtgardeKeep/UtgardeKeep/boss_keleseth.cpp
+++ b/src/server/scripts/Northrend/UtgardeKeep/UtgardeKeep/boss_keleseth.cpp
@@ -131,9 +131,9 @@ class boss_keleseth : public CreatureScript
             void Reset() override
             {
                 _Reset();
-                events.ScheduleEvent(EVENT_SHADOWBOLT, urand(2, 3)*IN_MILLISECONDS);
-                events.ScheduleEvent(EVENT_FROST_TOMB, urand(14, 19)*IN_MILLISECONDS);
-                events.ScheduleEvent(EVENT_SUMMON_SKELETONS, 6*IN_MILLISECONDS);
+                events.ScheduleEvent(EVENT_SHADOWBOLT, 2s, 3s);
+                events.ScheduleEvent(EVENT_FROST_TOMB, 14s, 19s);
+                events.ScheduleEvent(EVENT_SUMMON_SKELETONS, 6s);
 
                 Initialize();
             }
@@ -199,7 +199,7 @@ class boss_keleseth : public CreatureScript
                             break;
                         case EVENT_SHADOWBOLT:
                             DoCastVictim(SPELL_SHADOWBOLT);
-                            events.ScheduleEvent(EVENT_SHADOWBOLT, urand(2, 3) * IN_MILLISECONDS);
+                            events.ScheduleEvent(EVENT_SHADOWBOLT, 2s, 3s);
                             break;
                         case EVENT_FROST_TOMB:
                             if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0, 100.0f, true, true, -SPELL_FROST_TOMB))
@@ -211,7 +211,7 @@ class boss_keleseth : public CreatureScript
                                 // checked from sniffs - the player casts the spell
                                 target->CastSpell(target, SPELL_FROST_TOMB_SUMMON, true);
                             }
-                            events.ScheduleEvent(EVENT_FROST_TOMB, urand(14, 19) * IN_MILLISECONDS);
+                            events.ScheduleEvent(EVENT_FROST_TOMB, 14s, 19s);
                             break;
                         default:
                             break;
@@ -253,7 +253,7 @@ class npc_vrykul_skeleton : public CreatureScript
             void Reset() override
             {
                 events.Reset();
-                events.ScheduleEvent(EVENT_DECREPIFY, urand(4, 6) * IN_MILLISECONDS);
+                events.ScheduleEvent(EVENT_DECREPIFY, 4s, 6s);
             }
 
             void DamageTaken(Unit* /*attacker*/, uint32& damage) override
@@ -271,7 +271,7 @@ class npc_vrykul_skeleton : public CreatureScript
                         me->SetStandState(UNIT_STAND_STATE_DEAD);
 
                         events.Reset();
-                        events.ScheduleEvent(EVENT_RESURRECT, urand(18, 22) * IN_MILLISECONDS);
+                        events.ScheduleEvent(EVENT_RESURRECT, 18s, 22s);
 
                         me->GetMotionMaster()->Clear();
                         me->GetMotionMaster()->MoveIdle();
@@ -296,11 +296,11 @@ class npc_vrykul_skeleton : public CreatureScript
                         case EVENT_DECREPIFY:
                             if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0, 0.0f, true, true, -SPELL_DECREPIFY))
                                 DoCast(target, SPELL_DECREPIFY);
-                            events.ScheduleEvent(EVENT_DECREPIFY, urand(1, 5)*IN_MILLISECONDS);
+                            events.ScheduleEvent(EVENT_DECREPIFY, 1s, 5s);
                             break;
                         case EVENT_RESURRECT:
-                            events.ScheduleEvent(EVENT_FULL_HEAL, 1 * IN_MILLISECONDS);
-                            events.ScheduleEvent(EVENT_SHADOW_FISSURE, 1 * IN_MILLISECONDS);
+                            events.ScheduleEvent(EVENT_FULL_HEAL, 1s);
+                            events.ScheduleEvent(EVENT_SHADOW_FISSURE, 1s);
                             break;
                         case EVENT_FULL_HEAL:
                             DoCast(me, SPELL_FULL_HEAL, true);
@@ -311,7 +311,7 @@ class npc_vrykul_skeleton : public CreatureScript
                             me->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NOT_SELECTABLE);
                             me->SetStandState(UNIT_STAND_STATE_STAND);
                             me->GetMotionMaster()->MoveChase(me->GetVictim());
-                            events.ScheduleEvent(EVENT_DECREPIFY, urand(4, 6) * IN_MILLISECONDS);
+                            events.ScheduleEvent(EVENT_DECREPIFY, 4s, 6s);
                             break;
                         default:
                             break;
diff --git a/src/server/scripts/Northrend/UtgardeKeep/UtgardeKeep/boss_skarvald_dalronn.cpp b/src/server/scripts/Northrend/UtgardeKeep/UtgardeKeep/boss_skarvald_dalronn.cpp
index ffccacde115..69f8ef76d70 100644
--- a/src/server/scripts/Northrend/UtgardeKeep/UtgardeKeep/boss_skarvald_dalronn.cpp
+++ b/src/server/scripts/Northrend/UtgardeKeep/UtgardeKeep/boss_skarvald_dalronn.cpp
@@ -141,7 +141,7 @@ struct generic_boss_controllerAI : public BossAI
         switch (actionId)
         {
             case ACTION_OTHER_JUST_DIED:
-                events.ScheduleEvent(EVENT_DEATH_RESPONSE, 2000);
+                events.ScheduleEvent(EVENT_DEATH_RESPONSE, 2s);
                 break;
             case ACTION_DESPAWN_SUMMONS:
                 summons.DespawnAll();
@@ -194,8 +194,8 @@ class boss_skarvald_the_constructor : public CreatureScript
                 if (!IsInGhostForm)
                     Talk(SAY_AGGRO);
 
-                events.ScheduleEvent(EVENT_SKARVALD_CHARGE, 5000);
-                events.ScheduleEvent(EVENT_STONE_STRIKE, 10000);
+                events.ScheduleEvent(EVENT_SKARVALD_CHARGE, 5s);
+                events.ScheduleEvent(EVENT_STONE_STRIKE, 10s);
             }
 
             void ExecuteEvent(uint32 eventId) override
@@ -205,11 +205,11 @@ class boss_skarvald_the_constructor : public CreatureScript
                     case EVENT_SKARVALD_CHARGE:
                         if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0, SkarvaldChargePredicate(me)))
                             DoCast(target, SPELL_CHARGE);
-                        events.ScheduleEvent(EVENT_CHARGE, urand(5000, 10000));
+                        events.ScheduleEvent(EVENT_CHARGE, 5s, 10s);
                         break;
                     case EVENT_STONE_STRIKE:
                         DoCastVictim(SPELL_STONE_STRIKE);
-                        events.ScheduleEvent(EVENT_STONE_STRIKE, urand(5000, 10000));
+                        events.ScheduleEvent(EVENT_STONE_STRIKE, 5s, 10s);
                         break;
                     default:
                         generic_boss_controllerAI::ExecuteEvent(eventId);
@@ -251,14 +251,14 @@ class boss_dalronn_the_controller : public CreatureScript
             {
                 generic_boss_controllerAI::JustEngagedWith(who);
 
-                events.ScheduleEvent(EVENT_SHADOW_BOLT, 1000);
-                events.ScheduleEvent(EVENT_DEBILITATE, 5000);
+                events.ScheduleEvent(EVENT_SHADOW_BOLT, 1s);
+                events.ScheduleEvent(EVENT_DEBILITATE, 5s);
 
                 if (!IsInGhostForm)
-                    events.ScheduleEvent(EVENT_DELAYED_AGGRO_SAY, 5000);
+                    events.ScheduleEvent(EVENT_DELAYED_AGGRO_SAY, 5s);
 
                 if (IsHeroic())
-                    events.ScheduleEvent(EVENT_SUMMON_SKELETONS, 10000);
+                    events.ScheduleEvent(EVENT_SUMMON_SKELETONS, 10s);
             }
 
             void ExecuteEvent(uint32 eventId) override
@@ -268,16 +268,16 @@ class boss_dalronn_the_controller : public CreatureScript
                     case EVENT_SHADOW_BOLT:
                         if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0, 45.0f, true))
                             DoCast(target, SPELL_SHADOW_BOLT);
-                        events.ScheduleEvent(EVENT_SHADOW_BOLT, 2100); //give a 100ms pause to try cast other spells
+                        events.ScheduleEvent(EVENT_SHADOW_BOLT, 2100ms); //give a 100ms pause to try cast other spells
                         break;
                     case EVENT_DEBILITATE:
                         if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0, 50.0f, true))
                             DoCast(target, SPELL_DEBILITATE);
-                        events.ScheduleEvent(EVENT_DEBILITATE, urand(5000, 10000));
+                        events.ScheduleEvent(EVENT_DEBILITATE, 5s, 10s);
                         break;
                     case EVENT_SUMMON_SKELETONS:
                         DoCast(me, SPELL_SUMMON_SKELETONS);
-                        events.ScheduleEvent(EVENT_SUMMON_SKELETONS, urand(10000, 30000));
+                        events.ScheduleEvent(EVENT_SUMMON_SKELETONS, 10s, 30s);
                         break;
                     case EVENT_DELAYED_AGGRO_SAY:
                         Talk(SAY_AGGRO);
diff --git a/src/server/scripts/Northrend/UtgardeKeep/UtgardeKeep/utgarde_keep.cpp b/src/server/scripts/Northrend/UtgardeKeep/UtgardeKeep/utgarde_keep.cpp
index c9ac3ce89d7..32aee12e182 100644
--- a/src/server/scripts/Northrend/UtgardeKeep/UtgardeKeep/utgarde_keep.cpp
+++ b/src/server/scripts/Northrend/UtgardeKeep/UtgardeKeep/utgarde_keep.cpp
@@ -274,9 +274,9 @@ class npc_enslaved_proto_drake : public CreatureScript
             void Reset() override
             {
                 _events.Reset();
-                _events.ScheduleEvent(EVENT_REND, urand(2000, 3000));
-                _events.ScheduleEvent(EVENT_FLAME_BREATH, urand(5500, 7000));
-                _events.ScheduleEvent(EVENT_KNOCKAWAY, urand(3500, 6000));
+                _events.ScheduleEvent(EVENT_REND, 2s, 3s);
+                _events.ScheduleEvent(EVENT_FLAME_BREATH, 5500ms, 7s);
+                _events.ScheduleEvent(EVENT_KNOCKAWAY, 3500ms, 6s);
             }
 
             void MovementInform(uint32 type, uint32 id) override
@@ -313,15 +313,15 @@ class npc_enslaved_proto_drake : public CreatureScript
                     {
                         case EVENT_REND:
                             DoCast(SPELL_REND);
-                            _events.ScheduleEvent(EVENT_REND, urand(15000, 20000));
+                            _events.ScheduleEvent(EVENT_REND, 15s, 20s);
                             break;
                         case EVENT_FLAME_BREATH:
                             DoCast(SPELL_FLAME_BREATH);
-                            _events.ScheduleEvent(EVENT_FLAME_BREATH, urand(11000, 12000));
+                            _events.ScheduleEvent(EVENT_FLAME_BREATH, 11s, 12s);
                             break;
                         case EVENT_KNOCKAWAY:
                             DoCast(SPELL_KNOCK_AWAY);
-                            _events.ScheduleEvent(EVENT_KNOCKAWAY, urand(7000, 8500));
+                            _events.ScheduleEvent(EVENT_KNOCKAWAY, 7s, 8500ms);
                             break;
                         default:
                             break;
diff --git a/src/server/scripts/Northrend/UtgardeKeep/UtgardePinnacle/boss_palehoof.cpp b/src/server/scripts/Northrend/UtgardeKeep/UtgardePinnacle/boss_palehoof.cpp
index 5fb2e62012f..a289a7c2252 100644
--- a/src/server/scripts/Northrend/UtgardeKeep/UtgardePinnacle/boss_palehoof.cpp
+++ b/src/server/scripts/Northrend/UtgardeKeep/UtgardePinnacle/boss_palehoof.cpp
@@ -223,9 +223,9 @@ public:
         {
             _JustEngagedWith();
             Talk(SAY_AGGRO);
-            events.ScheduleEvent(EVENT_ARCING_SMASH, Seconds(7));
-            events.ScheduleEvent(EVENT_IMPALE, Seconds(11));
-            events.ScheduleEvent(EVENT_WITHERING_ROAR, Seconds(12));
+            events.ScheduleEvent(EVENT_ARCING_SMASH, 7s);
+            events.ScheduleEvent(EVENT_IMPALE, 11s);
+            events.ScheduleEvent(EVENT_WITHERING_ROAR, 12s);
             instance->SendEncounterUnit(ENCOUNTER_FRAME_ENGAGE, me);
         }
 
@@ -374,9 +374,9 @@ public:
 
         void ScheduleTasks() override
         {
-            events.ScheduleEvent(EVENT_CRAZED, Seconds(10));
-            events.ScheduleEvent(EVENT_CHAIN_LIGHTNING, Seconds(12));
-            events.ScheduleEvent(EVENT_TERRIFYING_ROAR, Seconds(22));
+            events.ScheduleEvent(EVENT_CRAZED, 10s);
+            events.ScheduleEvent(EVENT_CHAIN_LIGHTNING, 12s);
+            events.ScheduleEvent(EVENT_TERRIFYING_ROAR, 22s);
         }
 
         void ExecuteEvent(uint32 eventId) override
@@ -418,8 +418,8 @@ public:
 
         void ScheduleTasks() override
         {
-            events.ScheduleEvent(EVENT_MORTAL_WOUND, Seconds(6));
-            events.ScheduleEvent(EVENT_ENRAGE, Seconds(16));
+            events.ScheduleEvent(EVENT_MORTAL_WOUND, 6s);
+            events.ScheduleEvent(EVENT_ENRAGE, 16s);
             events.ScheduleEvent(EVENT_ENRAGE_2, Minutes(1) + Seconds(30));
         }
 
@@ -461,9 +461,9 @@ public:
 
         void ScheduleTasks() override
         {
-            events.ScheduleEvent(EVENT_GORE, Seconds(10));
-            events.ScheduleEvent(EVENT_GRIEVOUS_WOUND, Seconds(12));
-            events.ScheduleEvent(EVENT_STOMP, Seconds(5));
+            events.ScheduleEvent(EVENT_GORE, 10s);
+            events.ScheduleEvent(EVENT_GRIEVOUS_WOUND, 12s);
+            events.ScheduleEvent(EVENT_STOMP, 5s);
         }
 
         void ExecuteEvent(uint32 eventId) override
@@ -506,9 +506,9 @@ public:
 
         void ScheduleTasks() override
         {
-            events.ScheduleEvent(EVENT_ACID_SPIT, Seconds(6));
-            events.ScheduleEvent(EVENT_ACID_SPLATTER, Seconds(16));
-            events.ScheduleEvent(EVENT_POISON_BREATH, Seconds(13));
+            events.ScheduleEvent(EVENT_ACID_SPIT, 6s);
+            events.ScheduleEvent(EVENT_ACID_SPLATTER, 16s);
+            events.ScheduleEvent(EVENT_POISON_BREATH, 13s);
         }
 
         void JustSummoned(Creature* summon) override
diff --git a/src/server/scripts/Northrend/UtgardeKeep/UtgardePinnacle/boss_svala.cpp b/src/server/scripts/Northrend/UtgardeKeep/UtgardePinnacle/boss_svala.cpp
index 96ea8405b0a..b6f03460326 100644
--- a/src/server/scripts/Northrend/UtgardeKeep/UtgardePinnacle/boss_svala.cpp
+++ b/src/server/scripts/Northrend/UtgardeKeep/UtgardePinnacle/boss_svala.cpp
@@ -201,7 +201,7 @@ class boss_svala : public CreatureScript
                         arthas->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NON_ATTACKABLE | UNIT_FLAG_NOT_SELECTABLE);
                         _arthasGUID = arthas->GetGUID();
                     }
-                    events.ScheduleEvent(EVENT_INTRO_SVALA_TALK_0, 1 * IN_MILLISECONDS, 0, INTRO);
+                    events.ScheduleEvent(EVENT_INTRO_SVALA_TALK_0, 1s, 0, INTRO);
                 }
             }
 
@@ -349,7 +349,7 @@ class boss_svala : public CreatureScript
                             break;
                         case EVENT_SINISTER_STRIKE:
                             DoCastVictim(SPELL_SINSTER_STRIKE);
-                            events.ScheduleEvent(EVENT_SINISTER_STRIKE, urand(5 * IN_MILLISECONDS, 9 * IN_MILLISECONDS), 0, NORMAL);
+                            events.ScheduleEvent(EVENT_SINISTER_STRIKE, 5s, 9s, 0, NORMAL);
                             break;
                         case EVENT_CALL_FLAMES:
                             if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0, 100.0f, true))
diff --git a/src/server/scripts/Northrend/UtgardeKeep/UtgardePinnacle/boss_ymiron.cpp b/src/server/scripts/Northrend/UtgardeKeep/UtgardePinnacle/boss_ymiron.cpp
index 1c666bc5139..c16ba2f1d65 100644
--- a/src/server/scripts/Northrend/UtgardeKeep/UtgardePinnacle/boss_ymiron.cpp
+++ b/src/server/scripts/Northrend/UtgardeKeep/UtgardePinnacle/boss_ymiron.cpp
@@ -142,9 +142,9 @@ public:
         {
             _JustEngagedWith();
             Talk(SAY_AGGRO);
-            events.ScheduleEvent(EVENT_BANE, urand(18000, 23000), EVENT_GROUP_BASE_SPELLS);
-            events.ScheduleEvent(EVENT_FETID_ROT, urand(8000, 13000), EVENT_GROUP_BASE_SPELLS);
-            events.ScheduleEvent(EVENT_DARK_SLASH, urand(28000, 33000), EVENT_GROUP_BASE_SPELLS);
+            events.ScheduleEvent(EVENT_BANE, 18s, 23s, EVENT_GROUP_BASE_SPELLS);
+            events.ScheduleEvent(EVENT_FETID_ROT, 8s, 13s, EVENT_GROUP_BASE_SPELLS);
+            events.ScheduleEvent(EVENT_DARK_SLASH, 28s, 33s, EVENT_GROUP_BASE_SPELLS);
             events.ScheduleEvent(EVENT_ANCESTORS_VENGEANCE, DUNGEON_MODE(60000, 45000), EVENT_GROUP_BASE_SPELLS);
         }
 
@@ -178,7 +178,7 @@ public:
                     ancestor->SetDisableGravity(true);
                     ActiveAncestorGUID = ancestor->GetGUID();
                 }
-                events.ScheduleEvent(EVENT_RESUME_COMBAT, 5000);
+                events.ScheduleEvent(EVENT_RESUME_COMBAT, 5s);
             }
         }
 
@@ -235,15 +235,15 @@ public:
             {
                 case EVENT_BANE:
                     DoCast(SPELL_BANE);
-                    events.ScheduleEvent(EVENT_BANE, urand(20000, 25000));
+                    events.ScheduleEvent(EVENT_BANE, 20s, 25s);
                     break;
                 case EVENT_FETID_ROT:
                     DoCastVictim(SPELL_FETID_ROT);
-                    events.ScheduleEvent(EVENT_FETID_ROT, urand(10000, 15000));
+                    events.ScheduleEvent(EVENT_FETID_ROT, 10s, 15s);
                     break;
                 case EVENT_DARK_SLASH:
                     DoCastVictim(SPELL_DARK_SLASH);
-                    events.ScheduleEvent(EVENT_DARK_SLASH, urand(30000, 35000));
+                    events.ScheduleEvent(EVENT_DARK_SLASH, 30s, 35s);
                     break;
                 case EVENT_ANCESTORS_VENGEANCE:
                     DoCast(me, SPELL_ANCESTORS_VENGEANCE);
@@ -258,16 +258,16 @@ public:
                     break;
                 case EVENT_HALDOR_SPIRIT_STRIKE:
                     DoCastVictim(SPELL_SPIRIT_STRIKE);
-                    events.ScheduleEvent(EVENT_HALDOR_SPIRIT_STRIKE, 5000);
+                    events.ScheduleEvent(EVENT_HALDOR_SPIRIT_STRIKE, 5s);
                     break;
                 case EVENT_RANULF_SPIRIT_BURST:
                     DoCast(me, SPELL_SPIRIT_BURST);
-                    events.ScheduleEvent(EVENT_RANULF_SPIRIT_BURST, 10000);
+                    events.ScheduleEvent(EVENT_RANULF_SPIRIT_BURST, 10s);
                     break;
                 case EVENT_TORGYN_SUMMON_AVENGING_SPIRITS:
                     for (uint8 i = 0; i < 4; ++i)
                         DoCast(SPELL_SUMMON_AVENGING_SPIRIT);
-                    events.ScheduleEvent(EVENT_TORGYN_SUMMON_AVENGING_SPIRITS, 15000);
+                    events.ScheduleEvent(EVENT_TORGYN_SUMMON_AVENGING_SPIRITS, 15s);
                     break;
                 default:
                     break;
diff --git a/src/server/scripts/Northrend/zone_borean_tundra.cpp b/src/server/scripts/Northrend/zone_borean_tundra.cpp
index e7aa7ab9fde..51fa7f16dda 100644
--- a/src/server/scripts/Northrend/zone_borean_tundra.cpp
+++ b/src/server/scripts/Northrend/zone_borean_tundra.cpp
@@ -2447,7 +2447,7 @@ public:
             if (Player* player = ObjectAccessor::GetPlayer(*me, _playerGUID))
                 me->SetFacingToObject(player);
 
-            _events.ScheduleEvent(EVENT_TALK, Seconds(1));
+            _events.ScheduleEvent(EVENT_TALK, 1s);
         }
 
         void UpdateAI(uint32 diff) override
@@ -2468,7 +2468,7 @@ public:
                         if (Player* player = ObjectAccessor::GetPlayer(*me, _playerGUID))
                             Talk(SAY_BLOODMAGE_LAURITH, player);
                         _playerGUID.Clear();
-                        _events.ScheduleEvent(EVENT_RESET_ORIENTATION, Seconds(5));
+                        _events.ScheduleEvent(EVENT_RESET_ORIENTATION, 5s);
                         break;
                     case EVENT_RESET_ORIENTATION:
                         me->SetFacingTo(me->GetHomePosition().GetOrientation());
diff --git a/src/server/scripts/Northrend/zone_dalaran.cpp b/src/server/scripts/Northrend/zone_dalaran.cpp
index 58f8b7456b5..93fed29e647 100644
--- a/src/server/scripts/Northrend/zone_dalaran.cpp
+++ b/src/server/scripts/Northrend/zone_dalaran.cpp
@@ -169,7 +169,7 @@ class npc_minigob_manabonk : public CreatureScript
             {
                 playerGuid = ObjectGuid();
                 me->SetVisible(false);
-                events.ScheduleEvent(EVENT_SELECT_TARGET, Seconds(1));
+                events.ScheduleEvent(EVENT_SELECT_TARGET, 1s);
             }
 
             void GetPlayersInDalaran(std::vector<Player*>& playerList) const
@@ -230,15 +230,15 @@ class npc_minigob_manabonk : public CreatureScript
                         }
                         case EVENT_LAUGH_1:
                             me->HandleEmoteCommand(EMOTE_ONESHOT_LAUGH_NO_SHEATHE);
-                            events.ScheduleEvent(EVENT_WANDER, Seconds(3));
+                            events.ScheduleEvent(EVENT_WANDER, 3s);
                             break;
                         case EVENT_WANDER:
                             me->GetMotionMaster()->MoveRandom(8);
-                            events.ScheduleEvent(EVENT_PAUSE, Minutes(1));
+                            events.ScheduleEvent(EVENT_PAUSE, 1min);
                             break;
                         case EVENT_PAUSE:
                             me->GetMotionMaster()->MoveIdle();
-                            events.ScheduleEvent(EVENT_CAST, Seconds(2));
+                            events.ScheduleEvent(EVENT_CAST, 2s);
                             break;
                         case EVENT_CAST:
                             if (Player* player = me->GetMap()->GetPlayer(playerGuid))
@@ -253,11 +253,11 @@ class npc_minigob_manabonk : public CreatureScript
                             break;
                         case EVENT_LAUGH_2:
                             me->HandleEmoteCommand(EMOTE_ONESHOT_LAUGH_NO_SHEATHE);
-                            events.ScheduleEvent(EVENT_BLINK, Seconds(3));
+                            events.ScheduleEvent(EVENT_BLINK, 3s);
                             break;
                         case EVENT_BLINK:
                             DoCastSelf(SPELL_IMPROVED_BLINK);
-                            events.ScheduleEvent(EVENT_DESPAWN, Seconds(4));
+                            events.ScheduleEvent(EVENT_DESPAWN, 4s);
                             break;
                         case EVENT_DESPAWN:
                             me->AddObjectToRemoveList();
diff --git a/src/server/scripts/Northrend/zone_dragonblight.cpp b/src/server/scripts/Northrend/zone_dragonblight.cpp
index ce7aba1311f..e1a4ab2db3e 100644
--- a/src/server/scripts/Northrend/zone_dragonblight.cpp
+++ b/src/server/scripts/Northrend/zone_dragonblight.cpp
@@ -166,8 +166,8 @@ class npc_commander_eligor_dawnbringer : public CreatureScript
                 for (ObjectGuid& guid : imageList)
                     guid.Clear();
 
-                _events.ScheduleEvent(EVENT_GET_TARGETS, 5000);
-                _events.ScheduleEvent(EVENT_START_RANDOM, 20000);
+                _events.ScheduleEvent(EVENT_GET_TARGETS, 5s);
+                _events.ScheduleEvent(EVENT_START_RANDOM, 20s);
             }
 
             void MovementInform(uint32 type, uint32 id) override
@@ -235,7 +235,7 @@ class npc_commander_eligor_dawnbringer : public CreatureScript
                             }
                             break;
                         case 5: // Home
-                            _events.ScheduleEvent(EVENT_START_RANDOM, 30000);
+                            _events.ScheduleEvent(EVENT_START_RANDOM, 30s);
                             break;
                         }
                     }
@@ -279,7 +279,7 @@ class npc_commander_eligor_dawnbringer : public CreatureScript
                     creature->SetEntry(entry);
                     creature->SetDisplayId(model);
                     creature->CastSpell(creature, SPELL_HEROIC_IMAGE_CHANNEL);
-                    _events.ScheduleEvent(EVENT_TALK_COMPLETE, 40000);
+                    _events.ScheduleEvent(EVENT_TALK_COMPLETE, 40s);
                 }
             }
 
@@ -303,7 +303,7 @@ class npc_commander_eligor_dawnbringer : public CreatureScript
                         case EVENT_START_RANDOM:
                             talkWing = urand (0, 4);
                             Talk(talkWing);
-                            _events.ScheduleEvent(EVENT_MOVE_TO_POINT, 8000);
+                            _events.ScheduleEvent(EVENT_MOVE_TO_POINT, 8s);
                             break;
                         case EVENT_MOVE_TO_POINT:
                             me->SetWalk(true);
@@ -313,7 +313,7 @@ class npc_commander_eligor_dawnbringer : public CreatureScript
                         case EVENT_TALK_COMPLETE:
                             talkWing = 5;
                             Talk(talkWing);
-                            _events.ScheduleEvent(EVENT_MOVE_TO_POINT, 5000);
+                            _events.ScheduleEvent(EVENT_MOVE_TO_POINT, 5s);
                             break;
                         case EVENT_GET_TARGETS:
                             StoreTargets();
@@ -635,8 +635,8 @@ class npc_torturer_lecraft : public CreatureScript
 
             void JustEngagedWith(Unit* who) override
             {
-                _events.ScheduleEvent(EVENT_HEMORRHAGE, urand(5000, 8000));
-                _events.ScheduleEvent(EVENT_KIDNEY_SHOT, urand(12000, 15000));
+                _events.ScheduleEvent(EVENT_HEMORRHAGE, 5s, 8s);
+                _events.ScheduleEvent(EVENT_KIDNEY_SHOT, 12s, 15s);
 
                 if (Player* player = who->ToPlayer())
                     Talk (SAY_AGGRO, player);
@@ -684,7 +684,7 @@ class npc_torturer_lecraft : public CreatureScript
                             break;
                         case EVENT_KIDNEY_SHOT:
                             DoCastVictim(SPELL_KIDNEY_SHOT);
-                            _events.ScheduleEvent(EVENT_KIDNEY_SHOT, urand(20000, 26000));
+                            _events.ScheduleEvent(EVENT_KIDNEY_SHOT, 20s, 26s);
                             break;
                         default:
                             break;
diff --git a/src/server/scripts/Northrend/zone_grizzly_hills.cpp b/src/server/scripts/Northrend/zone_grizzly_hills.cpp
index c85840a0e80..3929026a462 100644
--- a/src/server/scripts/Northrend/zone_grizzly_hills.cpp
+++ b/src/server/scripts/Northrend/zone_grizzly_hills.cpp
@@ -563,7 +563,7 @@ public:
 
     void JustEngagedWith(Unit* /*who*/) override
     {
-        _events.ScheduleEvent(EVENT_CHOP, Seconds(3), Seconds(6));
+        _events.ScheduleEvent(EVENT_CHOP, 3s, 6s);
     }
 
         void Reset() override
diff --git a/src/server/scripts/Northrend/zone_howling_fjord.cpp b/src/server/scripts/Northrend/zone_howling_fjord.cpp
index df864835012..8b6b4ea8eae 100644
--- a/src/server/scripts/Northrend/zone_howling_fjord.cpp
+++ b/src/server/scripts/Northrend/zone_howling_fjord.cpp
@@ -89,8 +89,8 @@ public:
 
         void StartEscort(Player* player)
         {
-            events.ScheduleEvent(EVENT_BEGIN, Seconds(2));
-            events.ScheduleEvent(EVENT_START_ESCORT, Seconds(6));
+            events.ScheduleEvent(EVENT_BEGIN, 2s);
+            events.ScheduleEvent(EVENT_START_ESCORT, 6s);
             _player = player->GetGUID();
         }
 
@@ -98,7 +98,7 @@ public:
         {
             PotTimer = 10000; //10 sec cooldown on potion
             events.Reset();
-            events.ScheduleEvent(EVENT_EMOTE_BEG, Seconds(2));
+            events.ScheduleEvent(EVENT_EMOTE_BEG, 2s);
             me->SetStandState(UNIT_STAND_STATE_KNEEL);
             _player = ObjectGuid();
         }
@@ -146,7 +146,7 @@ public:
                 {
                     case EVENT_EMOTE_BEG:
                         me->HandleEmoteCommand(EMOTE_ONESHOT_BEG);
-                        events.ScheduleEvent(EVENT_EMOTE_BEG, Seconds(25));
+                        events.ScheduleEvent(EVENT_EMOTE_BEG, 25s);
                         break;
                     case EVENT_BEGIN:
                         if (Player* player = ObjectAccessor::GetPlayer(*me, _player))
@@ -212,12 +212,12 @@ public:
             {
                 case 1:
                     events.ScheduleEvent(EVENT_TALK_1, Seconds(3));
-                    events.ScheduleEvent(EVENT_KNEEL, Seconds(5));
+                    events.ScheduleEvent(EVENT_KNEEL, 5s);
                     events.ScheduleEvent(EVENT_TALK_2, Seconds(6));
                     me->SetStandState(UNIT_STAND_STATE_STAND);
                     break;
                 case 12:
-                    events.ScheduleEvent(EVENT_BURN_CRATES, Seconds(1));
+                    events.ScheduleEvent(EVENT_BURN_CRATES, 1s);
                     events.ScheduleEvent(EVENT_TALK_3, Seconds(3));
                     break;
                 case 20:
@@ -229,7 +229,7 @@ public:
                     break;
                 case 28:
                     events.ScheduleEvent(EVENT_BURN_CRATES, 0);
-                    events.ScheduleEvent(EVENT_LAUGH, Seconds(7));
+                    events.ScheduleEvent(EVENT_LAUGH, 7s);
                     events.ScheduleEvent(EVENT_TALK_5, Seconds(9));
                     events.ScheduleEvent(EVENT_TALK_6, Seconds(17));
                     break;
@@ -514,7 +514,7 @@ public:
 
         void Reset() override
         {
-            events.ScheduleEvent(EVENT_CHECK_CHARMED, 1000);
+            events.ScheduleEvent(EVENT_CHECK_CHARMED, 1s);
         }
 
         void UpdateAI(uint32 diff) override
@@ -529,7 +529,7 @@ public:
                         if (!me->IsCharmedOwnedByPlayerOrPlayer())
                             me->DespawnOrUnsummon();
                         else
-                            events.ScheduleEvent(EVENT_CHECK_CHARMED, 1000);
+                            events.ScheduleEvent(EVENT_CHECK_CHARMED, 1s);
                         break;
                 }
             }
diff --git a/src/server/scripts/Northrend/zone_icecrown.cpp b/src/server/scripts/Northrend/zone_icecrown.cpp
index cbce40f67f6..5d2918cade1 100644
--- a/src/server/scripts/Northrend/zone_icecrown.cpp
+++ b/src/server/scripts/Northrend/zone_icecrown.cpp
@@ -218,7 +218,7 @@ class npc_tournament_training_dummy : public CreatureScript
                 Initialize();
 
                 events.Reset();
-                events.ScheduleEvent(EVENT_DUMMY_RECAST_DEFEND, 5000);
+                events.ScheduleEvent(EVENT_DUMMY_RECAST_DEFEND, 5s);
             }
 
             void EnterEvadeMode(EvadeReason why) override
@@ -289,13 +289,13 @@ class npc_tournament_training_dummy : public CreatureScript
                             }
                         }
                         isVulnerable = false;
-                        events.ScheduleEvent(EVENT_DUMMY_RECAST_DEFEND, 5000);
+                        events.ScheduleEvent(EVENT_DUMMY_RECAST_DEFEND, 5s);
                         break;
                     case EVENT_DUMMY_RESET:
                         if (UpdateVictim())
                         {
                             EnterEvadeMode(EVADE_REASON_OTHER);
-                            events.ScheduleEvent(EVENT_DUMMY_RESET, 10000);
+                            events.ScheduleEvent(EVENT_DUMMY_RESET, 10s);
                         }
                         break;
                 }
@@ -436,7 +436,7 @@ public:
             me->SetRegenerateHealth(false);
             DoCast(SPELL_THREAT_PULSE);
             Talk(BANNER_SAY);
-            events.ScheduleEvent(EVENT_SPAWN, 3000);
+            events.ScheduleEvent(EVENT_SPAWN, 3s);
         }
 
         void JustEngagedWith(Unit* /*who*/) override { }
@@ -555,8 +555,8 @@ public:
                             Mason3->GetMotionMaster()->MovePoint(0, Mason3Pos[2]);
                             Mason3->SetHomePosition(Mason3Pos[2]);
                         }
-                        events.ScheduleEvent(EVENT_START_FIGHT, 5000);
-                        events.ScheduleEvent(EVENT_MASON_ACTION, 15000);
+                        events.ScheduleEvent(EVENT_START_FIGHT, 5s);
+                        events.ScheduleEvent(EVENT_MASON_ACTION, 15s);
                     }
                     break;
                 case EVENT_MASON_ACTION:
@@ -584,7 +584,7 @@ public:
                             LK->AI()->Talk(LK_TALK_1);
                         if (Creature* Dalfors = ObjectAccessor::GetCreature(*me, guidDalfors))
                             Dalfors->AI()->Talk(DALFORS_SAY_START);
-                        events.ScheduleEvent(EVENT_WAVE_SPAWN, 1000);
+                        events.ScheduleEvent(EVENT_WAVE_SPAWN, 1s);
                     }
                     break;
                 case EVENT_WAVE_SPAWN:
@@ -634,9 +634,9 @@ public:
                         PhaseCount++;
 
                         if (PhaseCount < 8)
-                            events.ScheduleEvent(EVENT_WAVE_SPAWN, urand(10000, 20000));
+                            events.ScheduleEvent(EVENT_WAVE_SPAWN, 10s, 20s);
                         else
-                            events.ScheduleEvent(EVENT_HALOF, urand(10000, 20000));
+                            events.ScheduleEvent(EVENT_HALOF, 10s, 20s);
                     }
                     break;
                 case EVENT_HALOF:
@@ -681,7 +681,7 @@ public:
                         Summons.DespawnEntry(NPC_HALOF_THE_DEATHBRINGER);
                         if (Creature* Dalfors = ObjectAccessor::GetCreature(*me, guidDalfors))
                             Dalfors->AI()->Talk(DALFORS_YELL_FINISHED);
-                        events.ScheduleEvent(EVENT_ENDED, 10000);
+                        events.ScheduleEvent(EVENT_ENDED, 10s);
                     }
         }
     };
@@ -766,7 +766,7 @@ class npc_frostbrood_skytalon : public CreatureScript
                         break;
                     case SPELL_RIDE:
                         DoCastAOE(SPELL_PING_BUNNY);
-                        events.ScheduleEvent(EVENT_FLY_AWAY, 100);
+                        events.ScheduleEvent(EVENT_FLY_AWAY, 100ms);
                         break;
                 }
             }
diff --git a/src/server/scripts/Northrend/zone_storm_peaks.cpp b/src/server/scripts/Northrend/zone_storm_peaks.cpp
index 9fc29686972..e0b27a40642 100644
--- a/src/server/scripts/Northrend/zone_storm_peaks.cpp
+++ b/src/server/scripts/Northrend/zone_storm_peaks.cpp
@@ -279,7 +279,7 @@ public:
 
         void Reset() override
         {
-            events.ScheduleEvent(EVENT_CHECK_AREA, 5000);
+            events.ScheduleEvent(EVENT_CHECK_AREA, 5s);
         }
 
         void MovementInform(uint32 type, uint32 id) override
@@ -289,7 +289,7 @@ public:
 
             if (id == 15)
             // drake reached village
-            events.ScheduleEvent(EVENT_REACHED_HOME, 2000);
+            events.ScheduleEvent(EVENT_REACHED_HOME, 2s);
         }
 
         void UpdateAI(uint32 diff) override
@@ -310,7 +310,7 @@ public:
                             }
                     }
                     else
-                        events.ScheduleEvent(EVENT_CHECK_AREA, 5000);
+                        events.ScheduleEvent(EVENT_CHECK_AREA, 5s);
                     break;
                 case EVENT_REACHED_HOME:
                     if (Vehicle* vehicle = me->GetVehicleKit())
diff --git a/src/server/scripts/Northrend/zone_zuldrak.cpp b/src/server/scripts/Northrend/zone_zuldrak.cpp
index bd48058e499..377f15dd710 100644
--- a/src/server/scripts/Northrend/zone_zuldrak.cpp
+++ b/src/server/scripts/Northrend/zone_zuldrak.cpp
@@ -484,7 +484,7 @@ public:
             {
                 _playerGUID.Clear();
                 _getingredienttry = 0;
-                _events.ScheduleEvent(EVENT_TURN_TO_POT, urand(15000, 26000));
+                _events.ScheduleEvent(EVENT_TURN_TO_POT, 15s, 26s);
             }
 
             void SetData(uint32 type, uint32 data) override
@@ -521,12 +521,12 @@ public:
                         case EVENT_TURN_TO_POT:
                             me->SetFacingTo(6.230825f);
                             me->SetUInt32Value(UNIT_NPC_EMOTESTATE, EMOTE_STATE_USE_STANDING_NO_SHEATHE);
-                            _events.ScheduleEvent(EVENT_TURN_BACK, 11000);
+                            _events.ScheduleEvent(EVENT_TURN_BACK, 11s);
                             break;
                         case EVENT_TURN_BACK:
                             me->SetFacingTo(4.886922f);
                             me->SetUInt32Value(UNIT_NPC_EMOTESTATE, EMOTE_STATE_NONE);
-                            _events.ScheduleEvent(EVENT_TURN_TO_POT, urand(25000, 41000));
+                            _events.ScheduleEvent(EVENT_TURN_TO_POT, 25s, 41s);
                             break;
                         case EVENT_EASY_123:
                             if (Player* player = ObjectAccessor::GetPlayer(*me, _playerGUID))
diff --git a/src/server/scripts/Outland/Auchindoun/ManaTombs/boss_nexusprince_shaffar.cpp b/src/server/scripts/Outland/Auchindoun/ManaTombs/boss_nexusprince_shaffar.cpp
index c93a47b243b..243b0054f1f 100644
--- a/src/server/scripts/Outland/Auchindoun/ManaTombs/boss_nexusprince_shaffar.cpp
+++ b/src/server/scripts/Outland/Auchindoun/ManaTombs/boss_nexusprince_shaffar.cpp
@@ -110,9 +110,9 @@ class boss_nexusprince_shaffar : public CreatureScript
                 Talk(SAY_AGGRO);
                 _JustEngagedWith();
 
-                events.ScheduleEvent(EVENT_BEACON, 10000);
-                events.ScheduleEvent(EVENT_FIREBALL, 8000);
-                events.ScheduleEvent(EVENT_FROSTBOLT, 4000);
+                events.ScheduleEvent(EVENT_BEACON, 10s);
+                events.ScheduleEvent(EVENT_FIREBALL, 8s);
+                events.ScheduleEvent(EVENT_FROSTBOLT, 4s);
                 events.ScheduleEvent(EVENT_FROST_NOVA, 15000);
             }
 
@@ -160,20 +160,20 @@ class boss_nexusprince_shaffar : public CreatureScript
                             Talk(SAY_SUMMON);
 
                         DoCast(me, SPELL_ETHEREAL_BEACON, true);
-                        events.ScheduleEvent(EVENT_BEACON, 10000);
+                        events.ScheduleEvent(EVENT_BEACON, 10s);
                         break;
                     case EVENT_FIREBALL:
                         DoCastVictim(SPELL_FROSTBOLT);
-                        events.ScheduleEvent(EVENT_FIREBALL, urand(4500, 6000));
+                        events.ScheduleEvent(EVENT_FIREBALL, 4500ms, 6s);
                         break;
                     case EVENT_FROSTBOLT:
                         DoCastVictim(SPELL_FROSTBOLT);
-                        events.ScheduleEvent(EVENT_FROSTBOLT, urand(4500, 6000));
+                        events.ScheduleEvent(EVENT_FROSTBOLT, 4500ms, 6s);
                         break;
                     case EVENT_FROST_NOVA:
                         DoCast(me, SPELL_FROSTNOVA);
                         events.ScheduleEvent(EVENT_FROST_NOVA, urand(17500, 25000));
-                        events.ScheduleEvent(EVENT_BLINK, 1500);
+                        events.ScheduleEvent(EVENT_BLINK, 1500ms);
                         break;
                     default:
                         break;
@@ -217,7 +217,7 @@ class npc_ethereal_beacon : public CreatureScript
                         shaffar->AI()->AttackStart(who);
 
                 _events.ScheduleEvent(EVENT_APPRENTICE, DUNGEON_MODE(20000, 10000));
-                _events.ScheduleEvent(EVENT_ARCANE_BOLT, 1000);
+                _events.ScheduleEvent(EVENT_ARCANE_BOLT, 1s);
             }
 
             void JustSummoned(Creature* summoned) override
@@ -245,7 +245,7 @@ class npc_ethereal_beacon : public CreatureScript
                             break;
                         case EVENT_ARCANE_BOLT:
                             DoCastVictim(SPELL_ARCANE_BOLT);
-                            _events.ScheduleEvent(EVENT_ARCANE_BOLT, urand(2000, 4500));
+                            _events.ScheduleEvent(EVENT_ARCANE_BOLT, 2s, 4500ms);
                             break;
                         default:
                             break;
@@ -287,7 +287,7 @@ class npc_ethereal_apprentice : public CreatureScript
 
             void JustEngagedWith(Unit* /*who*/) override
             {
-                _events.ScheduleEvent(EVENT_ETHEREAL_APPRENTICE_FIREBOLT, 3000);
+                _events.ScheduleEvent(EVENT_ETHEREAL_APPRENTICE_FIREBOLT, 3s);
             }
 
             void UpdateAI(uint32 diff) override
@@ -306,11 +306,11 @@ class npc_ethereal_apprentice : public CreatureScript
                     {
                         case EVENT_ETHEREAL_APPRENTICE_FIREBOLT:
                             DoCastVictim(SPELL_ETHEREAL_APPRENTICE_FIREBOLT, true);
-                            _events.ScheduleEvent(EVENT_ETHEREAL_APPRENTICE_FROSTBOLT, 3000);
+                            _events.ScheduleEvent(EVENT_ETHEREAL_APPRENTICE_FROSTBOLT, 3s);
                             break;
                         case EVENT_ETHEREAL_APPRENTICE_FROSTBOLT:
                             DoCastVictim(SPELL_ETHEREAL_APPRENTICE_FROSTBOLT, true);
-                            _events.ScheduleEvent(EVENT_ETHEREAL_APPRENTICE_FIREBOLT, 3000);
+                            _events.ScheduleEvent(EVENT_ETHEREAL_APPRENTICE_FIREBOLT, 3s);
                             break;
                         default:
                             break;
@@ -347,7 +347,7 @@ public:
 
         void JustEngagedWith(Unit* /*who*/) override
         {
-            _events.ScheduleEvent(EVENT_DOUBLE_BREATH, urand(6000,9000));
+            _events.ScheduleEvent(EVENT_DOUBLE_BREATH, 6s, 9s);
         }
 
         void UpdateAI(uint32 diff) override
@@ -364,7 +364,7 @@ public:
                     case EVENT_DOUBLE_BREATH:
                         if (me->IsWithinDist(me->GetVictim(), ATTACK_DISTANCE))
                             DoCastVictim(SPELL_DOUBLE_BREATH);
-                        _events.ScheduleEvent(EVENT_DOUBLE_BREATH, urand(6000,9000));
+                        _events.ScheduleEvent(EVENT_DOUBLE_BREATH, 6s, 9s);
                         break;
                     default:
                         break;
diff --git a/src/server/scripts/Outland/Auchindoun/ManaTombs/boss_pandemonius.cpp b/src/server/scripts/Outland/Auchindoun/ManaTombs/boss_pandemonius.cpp
index ea8bb96d49b..0394cb27ef5 100644
--- a/src/server/scripts/Outland/Auchindoun/ManaTombs/boss_pandemonius.cpp
+++ b/src/server/scripts/Outland/Auchindoun/ManaTombs/boss_pandemonius.cpp
@@ -71,8 +71,8 @@ public:
         {
             _JustEngagedWith();
             Talk(SAY_AGGRO);
-            events.ScheduleEvent(EVENT_DARK_SHELL, 20000);
-            events.ScheduleEvent(EVENT_VOID_BLAST, urand(8000, 23000));
+            events.ScheduleEvent(EVENT_DARK_SHELL, 20s);
+            events.ScheduleEvent(EVENT_VOID_BLAST, 8s, 23s);
         }
 
         void ExecuteEvent(uint32 eventId) override
@@ -89,11 +89,11 @@ public:
                     if (VoidBlastCounter == 5)
                     {
                         VoidBlastCounter = 0;
-                        events.ScheduleEvent(EVENT_VOID_BLAST, urand(15000, 25000));
+                        events.ScheduleEvent(EVENT_VOID_BLAST, 15s, 25s);
                     }
                     else
                     {
-                        events.ScheduleEvent(EVENT_VOID_BLAST, 500);
+                        events.ScheduleEvent(EVENT_VOID_BLAST, 500ms);
                         events.DelayEvents(EVENT_DARK_SHELL, 500);
                     }
                     break;
@@ -102,7 +102,7 @@ public:
                         me->InterruptNonMeleeSpells(true);
                     Talk(EMOTE_DARK_SHELL);
                     DoCast(me, SPELL_DARK_SHELL);
-                    events.ScheduleEvent(EVENT_DARK_SHELL, 20000);
+                    events.ScheduleEvent(EVENT_DARK_SHELL, 20s);
                     break;
                 default:
                     break;
diff --git a/src/server/scripts/Outland/Auchindoun/SethekkHalls/boss_anzu.cpp b/src/server/scripts/Outland/Auchindoun/SethekkHalls/boss_anzu.cpp
index fcee93877af..17d1749662e 100644
--- a/src/server/scripts/Outland/Auchindoun/SethekkHalls/boss_anzu.cpp
+++ b/src/server/scripts/Outland/Auchindoun/SethekkHalls/boss_anzu.cpp
@@ -88,8 +88,8 @@ class boss_anzu : public CreatureScript
             void JustEngagedWith(Unit* /*who*/) override
             {
                 _JustEngagedWith();
-                events.ScheduleEvent(EVENT_PARALYZING_SCREECH, 14000);
-                events.ScheduleEvent(EVENT_CYCLONE_OF_FEATHERS, 5000);
+                events.ScheduleEvent(EVENT_PARALYZING_SCREECH, 14s);
+                events.ScheduleEvent(EVENT_CYCLONE_OF_FEATHERS, 5s);
             }
 
             void JustDied(Unit* /*killer*/) override
@@ -103,14 +103,14 @@ class boss_anzu : public CreatureScript
                 {
                     _under33Percent = true;
                     Talk(SAY_SUMMON_BROOD);
-                    events.ScheduleEvent(EVENT_SUMMON, 3000);
+                    events.ScheduleEvent(EVENT_SUMMON, 3s);
                 }
 
                 if (me->HealthBelowPctDamaged(66, damage) && !_under66Percent)
                 {
                     _under66Percent = true;
                     Talk(SAY_SUMMON_BROOD);
-                    events.ScheduleEvent(EVENT_SUMMON, 3000);
+                    events.ScheduleEvent(EVENT_SUMMON, 3s);
                 }
             }
 
@@ -127,12 +127,12 @@ class boss_anzu : public CreatureScript
                     {
                         case EVENT_PARALYZING_SCREECH:
                             DoCastVictim(SPELL_PARALYZING_SCREECH);
-                            events.ScheduleEvent(EVENT_PARALYZING_SCREECH, 26000);
+                            events.ScheduleEvent(EVENT_PARALYZING_SCREECH, 25s);
                             break;
                         case EVENT_CYCLONE_OF_FEATHERS:
                             if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0))
                                 DoCast(target, SPELL_CYCLONE_OF_FEATHERS);
-                            events.ScheduleEvent(EVENT_CYCLONE_OF_FEATHERS, 21000);
+                            events.ScheduleEvent(EVENT_CYCLONE_OF_FEATHERS, 21s);
                             break;
                         case EVENT_SUMMON:
                             // TODO: Add pathing for Brood of Anzu
@@ -140,7 +140,7 @@ class boss_anzu : public CreatureScript
                                 me->SummonCreature(NPC_BROOD_OF_ANZU, PosSummonBrood[i], TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 46000);
 
                             DoCast(me, SPELL_BANISH_SELF);
-                            events.ScheduleEvent(EVENT_SPELL_BOMB, 12000);
+                            events.ScheduleEvent(EVENT_SPELL_BOMB, 12s);
                             break;
                         case EVENT_SPELL_BOMB:
                             if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0))
diff --git a/src/server/scripts/Outland/Auchindoun/SethekkHalls/boss_darkweaver_syth.cpp b/src/server/scripts/Outland/Auchindoun/SethekkHalls/boss_darkweaver_syth.cpp
index 114f48a909f..2bd143dc9c3 100644
--- a/src/server/scripts/Outland/Auchindoun/SethekkHalls/boss_darkweaver_syth.cpp
+++ b/src/server/scripts/Outland/Auchindoun/SethekkHalls/boss_darkweaver_syth.cpp
@@ -92,10 +92,10 @@ public:
         void JustEngagedWith(Unit* /*who*/) override
         {
             _JustEngagedWith();
-            events.ScheduleEvent(EVENT_FLAME_SHOCK, 2000);
-            events.ScheduleEvent(EVENT_ARCANE_SHOCK, 4000);
-            events.ScheduleEvent(EVENT_FROST_SHOCK, 6000);
-            events.ScheduleEvent(EVENT_SHADOW_SHOCK, 8000);
+            events.ScheduleEvent(EVENT_FLAME_SHOCK, 2s);
+            events.ScheduleEvent(EVENT_ARCANE_SHOCK, 4s);
+            events.ScheduleEvent(EVENT_FROST_SHOCK, 6s);
+            events.ScheduleEvent(EVENT_SHADOW_SHOCK, 8s);
             events.ScheduleEvent(EVENT_CHAIN_LIGHTNING, 15000);
 
             Talk(SAY_AGGRO);
@@ -162,22 +162,22 @@ public:
                 case EVENT_FLAME_SHOCK:
                     if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0))
                         DoCast(target, SPELL_FLAME_SHOCK);
-                    events.ScheduleEvent(EVENT_FLAME_SHOCK, urand(10000, 15000));
+                    events.ScheduleEvent(EVENT_FLAME_SHOCK, 10s, 15s);
                     break;
                 case EVENT_ARCANE_SHOCK:
                     if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0))
                         DoCast(target, SPELL_ARCANE_SHOCK);
-                    events.ScheduleEvent(EVENT_ARCANE_SHOCK, urand(10000, 15000));
+                    events.ScheduleEvent(EVENT_ARCANE_SHOCK, 10s, 15s);
                     break;
                 case EVENT_FROST_SHOCK:
                     if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0))
                         DoCast(target, SPELL_FROST_SHOCK);
-                    events.ScheduleEvent(EVENT_FROST_SHOCK, urand(10000, 15000));
+                    events.ScheduleEvent(EVENT_FROST_SHOCK, 10s, 15s);
                     break;
                 case EVENT_SHADOW_SHOCK:
                     if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0))
                         DoCast(target, SPELL_SHADOW_SHOCK);
-                    events.ScheduleEvent(EVENT_SHADOW_SHOCK, urand(10000, 15000));
+                    events.ScheduleEvent(EVENT_SHADOW_SHOCK, 10s, 15s);
                     break;
                 case EVENT_CHAIN_LIGHTNING:
                     if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0))
diff --git a/src/server/scripts/Outland/Auchindoun/SethekkHalls/boss_talon_king_ikiss.cpp b/src/server/scripts/Outland/Auchindoun/SethekkHalls/boss_talon_king_ikiss.cpp
index 43c7de61d94..c330fa842a4 100644
--- a/src/server/scripts/Outland/Auchindoun/SethekkHalls/boss_talon_king_ikiss.cpp
+++ b/src/server/scripts/Outland/Auchindoun/SethekkHalls/boss_talon_king_ikiss.cpp
@@ -85,11 +85,11 @@ public:
         {
             _JustEngagedWith();
             Talk(SAY_AGGRO);
-            events.ScheduleEvent(EVENT_ARCANE_VOLLEY, 5000);
-            events.ScheduleEvent(EVENT_POLYMORPH, 8000);
+            events.ScheduleEvent(EVENT_ARCANE_VOLLEY, 5s);
+            events.ScheduleEvent(EVENT_POLYMORPH, 8s);
             events.ScheduleEvent(EVENT_BLINK, 35000);
             if (IsHeroic())
-                events.ScheduleEvent(EVENT_SLOW, urand(15000, 30000));
+                events.ScheduleEvent(EVENT_SLOW, 15s, 30s);
         }
 
         void ExecuteEvent(uint32 eventId) override
@@ -106,19 +106,19 @@ public:
                     break;
                 case EVENT_ARCANE_VOLLEY:
                     DoCast(me, SPELL_ARCANE_VOLLEY);
-                    events.ScheduleEvent(EVENT_ARCANE_VOLLEY, urand(7000, 12000));
+                    events.ScheduleEvent(EVENT_ARCANE_VOLLEY, 7s, 12s);
                     break;
                 case EVENT_SLOW:
                     DoCast(me, SPELL_SLOW);
-                    events.ScheduleEvent(EVENT_SLOW, urand(15000, 40000));
+                    events.ScheduleEvent(EVENT_SLOW, 15s, 40s);
                     break;
                 case EVENT_BLINK:
                     if (me->IsNonMeleeSpellCast(false))
                         me->InterruptNonMeleeSpells(false);
                     Talk(EMOTE_ARCANE_EXPLOSION);
                     DoCastAOE(SPELL_BLINK);
-                    events.ScheduleEvent(EVENT_BLINK, urand(35000, 40000));
-                    events.ScheduleEvent(EVENT_ARCANE_EXPLOSION, 1000);
+                    events.ScheduleEvent(EVENT_BLINK, 35s, 40s);
+                    events.ScheduleEvent(EVENT_ARCANE_EXPLOSION, 1s);
                     break;
                 case EVENT_ARCANE_EXPLOSION:
                     DoCast(me, SPELL_ARCANE_EXPLOSION);
diff --git a/src/server/scripts/Outland/Auchindoun/ShadowLabyrinth/boss_ambassador_hellmaw.cpp b/src/server/scripts/Outland/Auchindoun/ShadowLabyrinth/boss_ambassador_hellmaw.cpp
index 3bf7002c8ce..22f819d77bc 100644
--- a/src/server/scripts/Outland/Auchindoun/ShadowLabyrinth/boss_ambassador_hellmaw.cpp
+++ b/src/server/scripts/Outland/Auchindoun/ShadowLabyrinth/boss_ambassador_hellmaw.cpp
@@ -73,10 +73,10 @@ class boss_ambassador_hellmaw : public CreatureScript
                 _events.Reset();
                 _instance->SetBossState(DATA_AMBASSADOR_HELLMAW, NOT_STARTED);
 
-                _events.ScheduleEvent(EVENT_CORROSIVE_ACID, urand(5000, 10000));
-                _events.ScheduleEvent(EVENT_FEAR, urand(25000, 30000));
+                _events.ScheduleEvent(EVENT_CORROSIVE_ACID, 5s, 10s);
+                _events.ScheduleEvent(EVENT_FEAR, 25s, 30s);
                 if (IsHeroic())
-                    _events.ScheduleEvent(EVENT_BERSERK, 180000);
+                    _events.ScheduleEvent(EVENT_BERSERK, 3min);
 
                 DoAction(ACTION_AMBASSADOR_HELLMAW_BANISH);
             }
@@ -154,11 +154,11 @@ class boss_ambassador_hellmaw : public CreatureScript
                     {
                         case EVENT_CORROSIVE_ACID:
                             DoCastVictim(SPELL_CORROSIVE_ACID);
-                            _events.ScheduleEvent(EVENT_CORROSIVE_ACID, urand(15000, 25000));
+                            _events.ScheduleEvent(EVENT_CORROSIVE_ACID, 15s, 25s);
                             break;
                         case EVENT_FEAR:
                             DoCastAOE(SPELL_FEAR);
-                            _events.ScheduleEvent(EVENT_FEAR, urand(20000, 35000));
+                            _events.ScheduleEvent(EVENT_FEAR, 20s, 35s);
                             break;
                         case EVENT_BERSERK:
                             DoCast(me, SPELL_ENRAGE, true);
diff --git a/src/server/scripts/Outland/Auchindoun/ShadowLabyrinth/boss_blackheart_the_inciter.cpp b/src/server/scripts/Outland/Auchindoun/ShadowLabyrinth/boss_blackheart_the_inciter.cpp
index 81dcb72821b..cf66be683f4 100644
--- a/src/server/scripts/Outland/Auchindoun/ShadowLabyrinth/boss_blackheart_the_inciter.cpp
+++ b/src/server/scripts/Outland/Auchindoun/ShadowLabyrinth/boss_blackheart_the_inciter.cpp
@@ -83,8 +83,8 @@ struct boss_blackheart_the_inciter : public BossAI
     void JustEngagedWith(Unit* /*who*/) override
     {
         _JustEngagedWith();
-        events.ScheduleEvent(EVENT_INCITE_CHAOS, 20000);
-        events.ScheduleEvent(EVENT_CHARGE_ATTACK, 5000);
+        events.ScheduleEvent(EVENT_INCITE_CHAOS, 20s);
+        events.ScheduleEvent(EVENT_CHARGE_ATTACK, 5s);
         events.ScheduleEvent(EVENT_WAR_STOMP, 15000);
 
         Talk(SAY_AGGRO);
@@ -139,17 +139,17 @@ struct boss_blackheart_the_inciter : public BossAI
                         ResetThreatList();
                         DoCast(me, SPELL_INCITE_CHAOS);
                     }
-                    events.ScheduleEvent(EVENT_INCITE_CHAOS, 40000);
+                    events.ScheduleEvent(EVENT_INCITE_CHAOS, 40s);
                     break;
                 }
                 case EVENT_CHARGE_ATTACK:
                     if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0))
                         DoCast(target, SPELL_CHARGE);
-                    events.ScheduleEvent(EVENT_CHARGE, urand(15000, 25000));
+                    events.ScheduleEvent(EVENT_CHARGE, 15s, 25s);
                     break;
                 case EVENT_WAR_STOMP:
                     DoCast(me, SPELL_WAR_STOMP);
-                    events.ScheduleEvent(EVENT_WAR_STOMP, urand(18000, 24000));
+                    events.ScheduleEvent(EVENT_WAR_STOMP, 18s, 24s);
                     break;
             }
 
diff --git a/src/server/scripts/Outland/Auchindoun/ShadowLabyrinth/boss_grandmaster_vorpil.cpp b/src/server/scripts/Outland/Auchindoun/ShadowLabyrinth/boss_grandmaster_vorpil.cpp
index 154a65903ec..995c1db8a14 100644
--- a/src/server/scripts/Outland/Auchindoun/ShadowLabyrinth/boss_grandmaster_vorpil.cpp
+++ b/src/server/scripts/Outland/Auchindoun/ShadowLabyrinth/boss_grandmaster_vorpil.cpp
@@ -112,7 +112,7 @@ class boss_grandmaster_vorpil : public CreatureScript
                     if (Creature* portal = me->SummonCreature(NPC_VOID_PORTAL, VoidPortalCoords[i][0], VoidPortalCoords[i][1], VoidPortalCoords[i][2], 0, TEMPSUMMON_CORPSE_DESPAWN, 3000000))
                         portal->CastSpell(portal, SPELL_VOID_PORTAL_VISUAL, true);
 
-                events.ScheduleEvent(EVENT_SUMMON_TRAVELER, 5000);
+                events.ScheduleEvent(EVENT_SUMMON_TRAVELER, 5s);
             }
 
             void spawnVoidTraveler()
@@ -141,11 +141,11 @@ class boss_grandmaster_vorpil : public CreatureScript
             void JustEngagedWith(Unit* /*who*/) override
             {
                 _JustEngagedWith();
-                events.ScheduleEvent(EVENT_SHADOWBOLT_VOLLEY, urand(7000, 14000));
+                events.ScheduleEvent(EVENT_SHADOWBOLT_VOLLEY, 7s, 14s);
                 if (IsHeroic())
-                    events.ScheduleEvent(EVENT_BANISH, 17000);
+                    events.ScheduleEvent(EVENT_BANISH, 15s);
                 events.ScheduleEvent(EVENT_DRAW_SHADOWS, 45000);
-                events.ScheduleEvent(EVENT_SUMMON_TRAVELER, 90000);
+                events.ScheduleEvent(EVENT_SUMMON_TRAVELER, 90s);
 
                 Talk(SAY_AGGRO);
                 SummonPortals();
@@ -178,12 +178,12 @@ class boss_grandmaster_vorpil : public CreatureScript
                     {
                         case EVENT_SHADOWBOLT_VOLLEY:
                             DoCast(me, SPELL_SHADOWBOLT_VOLLEY);
-                            events.ScheduleEvent(EVENT_SHADOWBOLT_VOLLEY, urand(15000, 30000));
+                            events.ScheduleEvent(EVENT_SHADOWBOLT_VOLLEY, 15s, 30s);
                             break;
                         case EVENT_BANISH:
                             if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0, 30.0f, false))
                                  DoCast(target, SPELL_BANISH);
-                            events.ScheduleEvent(EVENT_BANISH, 16000);
+                            events.ScheduleEvent(EVENT_BANISH, 15s);
                             break;
                         case EVENT_DRAW_SHADOWS:
                             {
@@ -196,16 +196,16 @@ class boss_grandmaster_vorpil : public CreatureScript
                                 me->UpdatePosition(VorpilPosition);
                                 DoCast(me, SPELL_DRAW_SHADOWS, true);
                                 DoCast(me, SPELL_RAIN_OF_FIRE);
-                                events.ScheduleEvent(EVENT_SHADOWBOLT_VOLLEY, 6000);
-                                events.ScheduleEvent(EVENT_DRAW_SHADOWS, 30000);
+                                events.ScheduleEvent(EVENT_SHADOWBOLT_VOLLEY, 6s);
+                                events.ScheduleEvent(EVENT_DRAW_SHADOWS, 30s);
                                 break;
                             }
                         case EVENT_SUMMON_TRAVELER:
                             spawnVoidTraveler();
-                            events.ScheduleEvent(EVENT_SUMMON_TRAVELER, 10000);
+                            events.ScheduleEvent(EVENT_SUMMON_TRAVELER, 10s);
                             // enrage at 20%
                             if (HealthBelowPct(20))
-                                events.ScheduleEvent(EVENT_SUMMON_TRAVELER, 5000);
+                                events.ScheduleEvent(EVENT_SUMMON_TRAVELER, 5s);
                             break;
                     }
 
diff --git a/src/server/scripts/Outland/Auchindoun/ShadowLabyrinth/boss_murmur.cpp b/src/server/scripts/Outland/Auchindoun/ShadowLabyrinth/boss_murmur.cpp
index dd25ceeed55..fe4be5ba149 100644
--- a/src/server/scripts/Outland/Auchindoun/ShadowLabyrinth/boss_murmur.cpp
+++ b/src/server/scripts/Outland/Auchindoun/ShadowLabyrinth/boss_murmur.cpp
@@ -68,14 +68,14 @@ class boss_murmur : public CreatureScript
             void Reset() override
             {
                 _Reset();
-                events.ScheduleEvent(EVENT_SONIC_BOOM, 30000);
-                events.ScheduleEvent(EVENT_MURMURS_TOUCH, urand(8000, 20000));
-                events.ScheduleEvent(EVENT_RESONANCE, 5000);
-                events.ScheduleEvent(EVENT_MAGNETIC_PULL, urand(15000, 30000));
+                events.ScheduleEvent(EVENT_SONIC_BOOM, 30s);
+                events.ScheduleEvent(EVENT_MURMURS_TOUCH, 8s, 20s);
+                events.ScheduleEvent(EVENT_RESONANCE, 5s);
+                events.ScheduleEvent(EVENT_MAGNETIC_PULL, 15s, 30s);
                 if (IsHeroic())
                 {
                     events.ScheduleEvent(EVENT_THUNDERING_STORM, 15000);
-                    events.ScheduleEvent(EVENT_SONIC_SHOCK, 10000);
+                    events.ScheduleEvent(EVENT_SONIC_SHOCK, 10s);
                 }
 
                 // database should have `RegenHealth`=0 to prevent regen
@@ -112,29 +112,29 @@ class boss_murmur : public CreatureScript
                         case EVENT_SONIC_BOOM:
                             Talk(EMOTE_SONIC_BOOM);
                             DoCast(me, SPELL_SONIC_BOOM_CAST);
-                            events.ScheduleEvent(EVENT_SONIC_BOOM, 30000);
-                            events.ScheduleEvent(EVENT_RESONANCE, 1500);
+                            events.ScheduleEvent(EVENT_SONIC_BOOM, 30s);
+                            events.ScheduleEvent(EVENT_RESONANCE, 1500ms);
                             break;
                         case EVENT_MURMURS_TOUCH:
                             if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0, 80.0f, true))
                                 DoCast(target, SPELL_MURMURS_TOUCH);
-                            events.ScheduleEvent(EVENT_MURMURS_TOUCH, urand(25000, 35000));
+                            events.ScheduleEvent(EVENT_MURMURS_TOUCH, 25s, 35s);
                             break;
                         case EVENT_RESONANCE:
                             if (!(me->IsWithinMeleeRange(me->GetVictim())))
                             {
                                 DoCast(me, SPELL_RESONANCE);
-                                events.ScheduleEvent(EVENT_RESONANCE, 5000);
+                                events.ScheduleEvent(EVENT_RESONANCE, 5s);
                             }
                             break;
                         case EVENT_MAGNETIC_PULL:
                             if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0, 0.0f, true))
                             {
                                 DoCast(target, SPELL_MAGNETIC_PULL);
-                                events.ScheduleEvent(EVENT_MAGNETIC_PULL, urand(15000, 30000));
+                                events.ScheduleEvent(EVENT_MAGNETIC_PULL, 15s, 30s);
                                 break;
                             }
-                            events.ScheduleEvent(EVENT_MAGNETIC_PULL, 500);
+                            events.ScheduleEvent(EVENT_MAGNETIC_PULL, 500ms);
                             break;
                         case EVENT_THUNDERING_STORM:
                             DoCastAOE(SPELL_THUNDERING_STORM, true);
@@ -143,7 +143,7 @@ class boss_murmur : public CreatureScript
                         case EVENT_SONIC_SHOCK:
                             if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0, 20.0f, false))
                                 DoCast(target, SPELL_SONIC_SHOCK);
-                            events.ScheduleEvent(EVENT_SONIC_SHOCK, urand(10000, 20000));
+                            events.ScheduleEvent(EVENT_SONIC_SHOCK, 10s, 20s);
                             break;
                     }
 
diff --git a/src/server/scripts/Outland/BlackTemple/black_temple.cpp b/src/server/scripts/Outland/BlackTemple/black_temple.cpp
index 5ec56e03ea2..6fa826f7617 100644
--- a/src/server/scripts/Outland/BlackTemple/black_temple.cpp
+++ b/src/server/scripts/Outland/BlackTemple/black_temple.cpp
@@ -72,7 +72,7 @@ struct npc_wrathbone_flayer : public ScriptedAI
 
     void Reset() override
     {
-        _events.ScheduleEvent(EVENT_GET_CHANNELERS, 3000);
+        _events.ScheduleEvent(EVENT_GET_CHANNELERS, 3s);
         Initialize();
         _bloodmageList.clear();
         _deathshaperList.clear();
@@ -82,8 +82,8 @@ struct npc_wrathbone_flayer : public ScriptedAI
 
     void JustEngagedWith(Unit* /*who*/) override
     {
-        _events.ScheduleEvent(EVENT_CLEAVE, 5000);
-        _events.ScheduleEvent(EVENT_IGNORED, 7000);
+        _events.ScheduleEvent(EVENT_CLEAVE, 5s);
+        _events.ScheduleEvent(EVENT_IGNORED, 7s);
         _enteredCombat = true;
     }
 
@@ -121,7 +121,7 @@ struct npc_wrathbone_flayer : public ScriptedAI
                                     (*itr)->Respawn();
                             }
 
-                        _events.ScheduleEvent(EVENT_SET_CHANNELERS, 3000);
+                        _events.ScheduleEvent(EVENT_SET_CHANNELERS, 3s);
 
                         break;
                     }
@@ -135,7 +135,7 @@ struct npc_wrathbone_flayer : public ScriptedAI
                             if (Creature* deathshaper = ObjectAccessor::GetCreature(*me, guid))
                                 deathshaper->CastSpell(nullptr, SPELL_SUMMON_CHANNEL);
 
-                        _events.ScheduleEvent(EVENT_SET_CHANNELERS, 12000);
+                        _events.ScheduleEvent(EVENT_SET_CHANNELERS, 12s);
 
                         break;
                     }
@@ -156,12 +156,12 @@ struct npc_wrathbone_flayer : public ScriptedAI
             {
                 case EVENT_CLEAVE:
                     DoCastVictim(SPELL_CLEAVE);
-                    _events.ScheduleEvent(EVENT_CLEAVE, urand(1000, 2000));
+                    _events.ScheduleEvent(EVENT_CLEAVE, 1s, 2s);
                     break;
                 case EVENT_IGNORED:
                     if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0))
                         DoCast(target, SPELL_IGNORED);
-                    _events.ScheduleEvent(EVENT_IGNORED, 10000);
+                    _events.ScheduleEvent(EVENT_IGNORED, 10s);
                     break;
                 default:
                     break;
diff --git a/src/server/scripts/Outland/BlackTemple/boss_gurtogg_bloodboil.cpp b/src/server/scripts/Outland/BlackTemple/boss_gurtogg_bloodboil.cpp
index 504c21fcc27..a2e0cc72b3d 100644
--- a/src/server/scripts/Outland/BlackTemple/boss_gurtogg_bloodboil.cpp
+++ b/src/server/scripts/Outland/BlackTemple/boss_gurtogg_bloodboil.cpp
@@ -130,8 +130,8 @@ struct boss_gurtogg_bloodboil : public BossAI
     {
         Talk(SAY_AGGRO);
         _JustEngagedWith();
-        events.ScheduleEvent(EVENT_BERSERK, Minutes(10));
-        events.ScheduleEvent(EVENT_CHANGE_PHASE, Seconds(60));
+        events.ScheduleEvent(EVENT_BERSERK, 10min);
+        events.ScheduleEvent(EVENT_CHANGE_PHASE, 1min);
         ScheduleEvents();
     }
 
@@ -274,14 +274,14 @@ struct boss_gurtogg_bloodboil : public BossAI
         {
             events.SetPhase(PHASE_2);
             events.CancelEventGroup(GROUP_PHASE_1);
-            events.ScheduleEvent(EVENT_CHANGE_PHASE, Seconds(30));
+            events.ScheduleEvent(EVENT_CHANGE_PHASE, 30s);
             ScheduleEvents();
         }
         else if (events.IsInPhase(PHASE_2))
         {
             events.SetPhase(PHASE_1);
             events.CancelEventGroup(GROUP_PHASE_2);
-            events.ScheduleEvent(EVENT_CHANGE_PHASE, Seconds(60));
+            events.ScheduleEvent(EVENT_CHANGE_PHASE, 1min);
             me->ApplySpellImmune(0, IMMUNITY_STATE, SPELL_AURA_MOD_TAUNT, false);
             me->ApplySpellImmune(0, IMMUNITY_EFFECT, SPELL_EFFECT_ATTACK_ME, false);
             ScheduleEvents();
diff --git a/src/server/scripts/Outland/BlackTemple/boss_illidan.cpp b/src/server/scripts/Outland/BlackTemple/boss_illidan.cpp
index bf36ba6fd7b..72aab59df9c 100644
--- a/src/server/scripts/Outland/BlackTemple/boss_illidan.cpp
+++ b/src/server/scripts/Outland/BlackTemple/boss_illidan.cpp
@@ -493,8 +493,8 @@ struct boss_illidan_stormrage : public BossAI
         me->SetCanDualWield(true);
         if (GameObject* musicController = instance->GetGameObject(DATA_ILLIDAN_MUSIC_CONTROLLER))
             musicController->PlayDirectMusic(EVENT_BT_SUMMIT_WALK_3_SOUND_ID);
-        specialEvents.ScheduleEvent(EVENT_EVADE_CHECK, Seconds(10));
-        specialEvents.ScheduleEvent(EVENT_BERSERK, Minutes(25));
+        specialEvents.ScheduleEvent(EVENT_EVADE_CHECK, 10s);
+        specialEvents.ScheduleEvent(EVENT_BERSERK, 25min);
         ScheduleEvents(GROUP_PHASE_1, GROUP_PHASE_1);
         events.ScheduleEvent(EVENT_TAUNT, Seconds(30), Seconds(60), GROUP_PHASE_ALL);
     }
@@ -638,7 +638,7 @@ struct boss_illidan_stormrage : public BossAI
                 specialEvents.Reset();
                 DoCastSelf(SPELL_DEATH, true);
                 me->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NOT_SELECTABLE);
-                events.ScheduleEvent(EVENT_DEFEATED_TEXT, Seconds(4));
+                events.ScheduleEvent(EVENT_DEFEATED_TEXT, 4s);
                 break;
             default:
                 break;
@@ -949,7 +949,7 @@ struct boss_illidan_stormrage : public BossAI
                     DoCastSelf(SPELL_DEMON_TRANSFORM_1, true);
                     events.ScheduleEvent(EVENT_DEMON_TEXT, Seconds(2), GROUP_PHASE_ALL);
                     specialEvents.ScheduleEvent(EVENT_CANCEL_DEMON_FORM, Minutes(1) + Seconds(12));
-                    events.ScheduleEvent(EVENT_SCHEDULE_DEMON_SPELLS, Seconds(15));
+                    events.ScheduleEvent(EVENT_SCHEDULE_DEMON_SPELLS, 15s);
                     break;
                 case EVENT_SCHEDULE_DEMON_SPELLS:
                     ResetThreatList();
@@ -1013,7 +1013,7 @@ struct boss_illidan_stormrage : public BossAI
                     Talk(SAY_ILLIDAN_DEFEATED);
                     if (GameObject* musicController = instance->GetGameObject(DATA_ILLIDAN_MUSIC_CONTROLLER))
                         musicController->PlayDirectMusic(EVENT_BT_ARRIVAL_WALK_HERO_1_SOUND_ID);
-                    events.ScheduleEvent(EVENT_QUIET_SUICIDE, Seconds(18));
+                    events.ScheduleEvent(EVENT_QUIET_SUICIDE, 18s);
                     break;
                 case EVENT_QUIET_SUICIDE:
                 {
@@ -1121,28 +1121,28 @@ struct npc_akama_illidan : public ScriptedAI
                 _events.SetPhase(PHASE_INTRO);
                 me->RemoveFlag(UNIT_NPC_FLAGS, UNIT_NPC_FLAG_GOSSIP);
                 _events.SetPhase(PHASE_INTRO);
-                _events.ScheduleEvent(EVENT_TELEPORT, Seconds(1));
+                _events.ScheduleEvent(EVENT_TELEPORT, 1s);
                 _events.ScheduleEvent(EVENT_MOVE_TO_ILLIDARI_ROOM, Seconds(1) + Milliseconds(500));
                 break;
             case ACTION_OPEN_DOOR:
                 _instance->SetData(ACTION_OPEN_DOOR, 0);
-                _events.ScheduleEvent(EVENT_AKAMA_THANKS, Seconds(2));
+                _events.ScheduleEvent(EVENT_AKAMA_THANKS, 2s);
                 break;
             case ACTION_FREE:
-                _events.ScheduleEvent(EVENT_FREE, Seconds(14));
+                _events.ScheduleEvent(EVENT_FREE, 14s);
                 break;
             case ACTION_START_ENCOUNTER:
                 DoZoneInCombat();
-                _events.ScheduleEvent(EVENT_HEALING_POTION, Seconds(1));
+                _events.ScheduleEvent(EVENT_HEALING_POTION, 1s);
                 break;
             case ACTION_START_MINIONS:
-                _events.ScheduleEvent(EVENT_AKAMA_MINIONS, Seconds(8));
+                _events.ScheduleEvent(EVENT_AKAMA_MINIONS, 8s);
                 break;
             case ACTION_START_OUTRO:
                 me->SetReactState(REACT_PASSIVE);
                 me->AttackStop();
                 _events.Reset();
-                _events.ScheduleEvent(EVENT_AKAMA_MOVE_BACK, Seconds(2));
+                _events.ScheduleEvent(EVENT_AKAMA_MOVE_BACK, 2s);
                 break;
             default:
                 break;
@@ -1168,7 +1168,7 @@ struct npc_akama_illidan : public ScriptedAI
                 break;
             case POINT_STAIRS:
                 ChangeOrientation(6.265732f);
-                _events.ScheduleEvent(EVENT_AKAMA_SAY_DOOR, Seconds(5));
+                _events.ScheduleEvent(EVENT_AKAMA_SAY_DOOR, 5s);
                 break;
             case POINT_ILLIDAN_ROOM:
                 ChangeOrientation(2.129302f);
@@ -1177,7 +1177,7 @@ struct npc_akama_illidan : public ScriptedAI
                 break;
             case POINT_FACE_ILLIDAN:
                 ChangeOrientation(3.140537f);
-                _events.ScheduleEvent(EVENT_START_ILLIDAN, Seconds(2));
+                _events.ScheduleEvent(EVENT_START_ILLIDAN, 2s);
                 break;
             case POINT_TELEPORT:
                 DoCastSelf(SPELL_AKAMA_TELEPORT);
@@ -1189,13 +1189,13 @@ struct npc_akama_illidan : public ScriptedAI
                 me->SetReactState(REACT_AGGRESSIVE);
                 if (Creature* illidan = _instance->GetCreature(DATA_ILLIDAN_STORMRAGE))
                     illidan->AI()->DoAction(ACTION_START_MINIONS_WEAVE);
-                _events.ScheduleEvent(EVENT_CHAIN_LIGHTNING, Seconds(2));
+                _events.ScheduleEvent(EVENT_CHAIN_LIGHTNING, 2s);
                 break;
             case POINT_MOVE_BACK:
                 _events.ScheduleEvent(EVENT_AKAMA_MOVE_TO_ILLIDAN, Milliseconds(1));
                 break;
             case POINT_ILLIDAN:
-                _events.ScheduleEvent(EVENT_AKAMA_LIGHT_TEXT, Seconds(1));
+                _events.ScheduleEvent(EVENT_AKAMA_LIGHT_TEXT, 1s);
                 break;
             default:
                 break;
@@ -1230,15 +1230,15 @@ struct npc_akama_illidan : public ScriptedAI
                     break;
                 case EVENT_AKAMA_SAY_DOOR:
                     Talk(SAY_AKAMA_DOOR);
-                    _events.ScheduleEvent(EVENT_AKAMA_DOOR_FAIL, Seconds(4));
+                    _events.ScheduleEvent(EVENT_AKAMA_DOOR_FAIL, 4s);
                     break;
                 case EVENT_AKAMA_DOOR_FAIL:
                     DoCastSelf(SPELL_AKAMA_DOOR_FAIL);
-                    _events.ScheduleEvent(EVENT_AKAMA_SAY_ALONE, Seconds(10));
+                    _events.ScheduleEvent(EVENT_AKAMA_SAY_ALONE, 10s);
                     break;
                 case EVENT_AKAMA_SAY_ALONE:
                     Talk(SAY_AKAMA_ALONE);
-                    _events.ScheduleEvent(EVENT_SUMMON_SPIRITS, Seconds(7));
+                    _events.ScheduleEvent(EVENT_SUMMON_SPIRITS, 7s);
                     break;
                 case EVENT_SUMMON_SPIRITS:
                     me->SummonCreatureGroup(SUMMON_GROUP);
@@ -1252,7 +1252,7 @@ struct npc_akama_illidan : public ScriptedAI
                 case EVENT_SPIRIT_SAY_2:
                     if (Creature* olum = ObjectAccessor::GetCreature(*me, _spiritOfOlumGUID))
                         olum->AI()->Talk(SAY_SPIRIT_ALONE);
-                    _events.ScheduleEvent(EVENT_AKAMA_DOOR_SUCCESS, Seconds(6));
+                    _events.ScheduleEvent(EVENT_AKAMA_DOOR_SUCCESS, 6s);
                     break;
                 case EVENT_AKAMA_DOOR_SUCCESS:
                     DoCastSelf(SPELL_AKAMA_DOOR_CHANNEL);
@@ -1260,7 +1260,7 @@ struct npc_akama_illidan : public ScriptedAI
                         undalo->CastSpell((Unit*) nullptr, SPELL_DEATHSWORN_DOOR_CHANNEL);
                     if (Creature* olum = ObjectAccessor::GetCreature(*me, _spiritOfOlumGUID))
                         olum->CastSpell((Unit*) nullptr, SPELL_DEATHSWORN_DOOR_CHANNEL);
-                    _events.ScheduleEvent(EVENT_AKAMA_START_SOUND, Seconds(5));
+                    _events.ScheduleEvent(EVENT_AKAMA_START_SOUND, 5s);
                     break;
                 case EVENT_AKAMA_START_SOUND:
                     if (GameObject* musicController = _instance->GetGameObject(DATA_ILLIDAN_MUSIC_CONTROLLER))
@@ -1268,8 +1268,8 @@ struct npc_akama_illidan : public ScriptedAI
                     break;
                 case EVENT_AKAMA_THANKS:
                     Talk(SAY_AKAMA_SALUTE);
-                    _events.ScheduleEvent(EVENT_SPIRIT_SALUTE, Seconds(3));
-                    _events.ScheduleEvent(EVENT_RUN_FROM_ILLIDAN_ROOM, Seconds(7));
+                    _events.ScheduleEvent(EVENT_SPIRIT_SALUTE, 3s);
+                    _events.ScheduleEvent(EVENT_RUN_FROM_ILLIDAN_ROOM, 7s);
                     break;
                 case EVENT_SPIRIT_SALUTE:
                     if (Creature* undalo = ObjectAccessor::GetCreature(*me, _spiritOfUdaloGUID))
@@ -1292,11 +1292,11 @@ struct npc_akama_illidan : public ScriptedAI
                     break;
                 case EVENT_FREE:
                     Talk(SAY_AKAMA_FREE);
-                    _events.ScheduleEvent(EVENT_TIME_HAS_COME, Seconds(18));
+                    _events.ScheduleEvent(EVENT_TIME_HAS_COME, 18s);
                     break;
                 case EVENT_TIME_HAS_COME:
                     Talk(SAY_AKAMA_TIME_HAS_COME);
-                    _events.ScheduleEvent(EVENT_ROAR, Seconds(2));
+                    _events.ScheduleEvent(EVENT_ROAR, 2s);
                     break;
                 case EVENT_ROAR:
                     me->HandleEmoteCommand(EMOTE_ONESHOT_ROAR);
@@ -1312,14 +1312,14 @@ struct npc_akama_illidan : public ScriptedAI
                     break;
                 case EVENT_AKAMA_MINIONS:
                     Talk(SAY_AKAMA_MINIONS);
-                    _events.ScheduleEvent(EVENT_AKAMA_MINIONS_EMOTE, Seconds(2));
+                    _events.ScheduleEvent(EVENT_AKAMA_MINIONS_EMOTE, 2s);
                     break;
                 case EVENT_AKAMA_MINIONS_EMOTE:
                     me->SetReactState(REACT_PASSIVE);
                     me->AttackStop();
                     me->HandleEmoteCommand(EMOTE_ONESHOT_EXCLAMATION);
                     me->SetImmuneToNPC(true);
-                    _events.ScheduleEvent(EVENT_AKAMA_MINIONS_MOVE, Seconds(4));
+                    _events.ScheduleEvent(EVENT_AKAMA_MINIONS_MOVE, 4s);
                     break;
                 case EVENT_AKAMA_MINIONS_MOVE:
                     _isTeleportToMinions = true;
@@ -1341,11 +1341,11 @@ struct npc_akama_illidan : public ScriptedAI
                     break;
                 case EVENT_AKAMA_LIGHT_TEXT:
                     Talk(SAY_AKAMA_LIGHT);
-                    _events.ScheduleEvent(EVENT_FINAL_SALUTE, Seconds(4));
+                    _events.ScheduleEvent(EVENT_FINAL_SALUTE, 4s);
                     break;
                 case EVENT_FINAL_SALUTE:
                     me->HandleEmoteCommand(EMOTE_ONESHOT_SALUTE);
-                    _events.ScheduleEvent(EVENT_AKAMA_DESPAWN, Seconds(5));
+                    _events.ScheduleEvent(EVENT_AKAMA_DESPAWN, 5s);
                     break;
                 case EVENT_AKAMA_DESPAWN:
                     DoCastSelf(SPELL_AKAMA_DESPAWN, true);
@@ -1486,8 +1486,8 @@ struct npc_flame_of_azzinoth : public ScriptedAI
             illidan->AI()->JustSummoned(me);
         DoCastSelf(SPELL_FLAME_TEAR_OF_AZZINOTH, true); // Idk what this spell should do
         me->SetReactState(REACT_PASSIVE);
-        _events.ScheduleEvent(EVENT_ENGAGE, Seconds(3));
-        _events.ScheduleEvent(EVENT_FLAME_BLAST, Seconds(11));
+        _events.ScheduleEvent(EVENT_ENGAGE, 3s);
+        _events.ScheduleEvent(EVENT_FLAME_BLAST, 11s);
     }
 
     void UpdateAI(uint32 diff) override
@@ -1507,7 +1507,7 @@ struct npc_flame_of_azzinoth : public ScriptedAI
                 case EVENT_ENGAGE:
                     me->SetReactState(REACT_AGGRESSIVE);
                     DoZoneInCombat();
-                    _events.ScheduleEvent(EVENT_FLAME_CHARGE, Seconds(5));
+                    _events.ScheduleEvent(EVENT_FLAME_CHARGE, 5s);
                     break;
                 case EVENT_FLAME_CHARGE:
                     if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0, ChargeTargetSelector()))
@@ -1627,19 +1627,19 @@ struct npc_maiev : public ScriptedAI
             me->SetFacingToObject(illidan);
         me->SetReactState(REACT_PASSIVE);
         _events.SetPhase(PHASE_INTRO);
-        _events.ScheduleEvent(EVENT_MAIEV_APPEAR, Seconds(1));
-        _events.ScheduleEvent(EVENT_MAIEV_EXCLAMATION, Seconds(2));
-        _events.ScheduleEvent(EVENT_MAIEV_JUSTICE_TEXT, Seconds(14));
-        _events.ScheduleEvent(EVENT_TAUNT, Seconds(20), Seconds(60));
+        _events.ScheduleEvent(EVENT_MAIEV_APPEAR, 1s);
+        _events.ScheduleEvent(EVENT_MAIEV_EXCLAMATION, 2s);
+        _events.ScheduleEvent(EVENT_MAIEV_JUSTICE_TEXT, 14s);
+        _events.ScheduleEvent(EVENT_TAUNT, 20s, 1min);
         _canDown = true;
     }
 
     void JustEngagedWith(Unit* /*who*/) override
     {
         _events.SetPhase(PHASE_1);
-        _events.ScheduleEvent(EVENT_CAGE_TRAP, Seconds(30));
-        _events.ScheduleEvent(EVENT_SHADOW_STRIKE, Seconds(50));
-        _events.ScheduleEvent(EVENT_THROW_DAGGER, Seconds(1));
+        _events.ScheduleEvent(EVENT_CAGE_TRAP, 30s);
+        _events.ScheduleEvent(EVENT_SHADOW_STRIKE, 50s);
+        _events.ScheduleEvent(EVENT_THROW_DAGGER, 1s);
     }
 
     void DoAction(int32 actionId) override
@@ -1652,7 +1652,7 @@ struct npc_maiev : public ScriptedAI
             if (Creature* illidan = _instance->GetCreature(DATA_ILLIDAN_STORMRAGE))
                 me->SetFacingToObject(illidan);
             Talk(SAY_MAIEV_SHADOWSONG_FINISHED);
-            _events.ScheduleEvent(EVENT_MAIEV_OUTRO_TEXT, Seconds(28));
+            _events.ScheduleEvent(EVENT_MAIEV_OUTRO_TEXT, 28s);
         }
         else if (actionId == ACTION_MAIEV_DOWN_FADE)
             _canDown = true;
@@ -1691,15 +1691,15 @@ struct npc_maiev : public ScriptedAI
                     break;
                 case EVENT_MAIEV_JUSTICE_TEXT:
                     Talk(SAY_MAIEV_SHADOWSONG_JUSTICE);
-                    _events.ScheduleEvent(EVENT_MAIEV_YES, Seconds(2));
+                    _events.ScheduleEvent(EVENT_MAIEV_YES, 2s);
                     break;
                 case EVENT_MAIEV_YES:
                     me->HandleEmoteCommand(EMOTE_ONESHOT_YES);
-                    _events.ScheduleEvent(EVENT_MAIEV_ROAR, Seconds(3));
+                    _events.ScheduleEvent(EVENT_MAIEV_ROAR, 3s);
                     break;
                 case EVENT_MAIEV_ROAR:
                     me->HandleEmoteCommand(EMOTE_ONESHOT_ROAR);
-                    _events.ScheduleEvent(EVENT_MAIEV_COMBAT, Seconds(3));
+                    _events.ScheduleEvent(EVENT_MAIEV_COMBAT, 3s);
                     break;
                 case EVENT_MAIEV_COMBAT:
                     me->SetReactState(REACT_AGGRESSIVE);
@@ -1733,11 +1733,11 @@ struct npc_maiev : public ScriptedAI
                     break;
                 case EVENT_MAIEV_OUTRO_TEXT:
                     Talk(SAY_MAIEV_SHADOWSONG_OUTRO);
-                    _events.ScheduleEvent(EVENT_MAIEV_FAREWELL_TEXT, Seconds(11));
+                    _events.ScheduleEvent(EVENT_MAIEV_FAREWELL_TEXT, 11s);
                     break;
                 case EVENT_MAIEV_FAREWELL_TEXT:
                     Talk(SAY_MAIEV_SHADOWSONG_FAREWELL);
-                    _events.ScheduleEvent(EVENT_MAIEV_TELEPORT_DESPAWN, Seconds(3));
+                    _events.ScheduleEvent(EVENT_MAIEV_TELEPORT_DESPAWN, 3s);
                     break;
                 case EVENT_MAIEV_TELEPORT_DESPAWN:
                     DoCastSelf(SPELL_TELEPORT_VISUAL);
diff --git a/src/server/scripts/Outland/BlackTemple/boss_illidari_council.cpp b/src/server/scripts/Outland/BlackTemple/boss_illidari_council.cpp
index 9c1138b39d8..0eaf3212573 100644
--- a/src/server/scripts/Outland/BlackTemple/boss_illidari_council.cpp
+++ b/src/server/scripts/Outland/BlackTemple/boss_illidari_council.cpp
@@ -157,8 +157,8 @@ struct boss_illidari_council : public BossAI
                     DoZoneInCombat(council);
                 }
             }
-            events.ScheduleEvent(EVENT_EMPYREAL_EQUIVALENCY, Seconds(2));
-            events.ScheduleEvent(EVENT_BERSERK, Minutes(15));
+            events.ScheduleEvent(EVENT_EMPYREAL_EQUIVALENCY, 2s);
+            events.ScheduleEvent(EVENT_BERSERK, 15min);
             if (Creature* council = instance->GetCreature(CouncilData[urand(0, 3)]))
                 council->AI()->Talk(SAY_COUNCIL_AGRO);
         }
@@ -314,11 +314,11 @@ struct boss_gathios_the_shatterer : public IllidariCouncilBossAI
     void ScheduleEvents() override
     {
         DoCastSelf(SPELL_SEAL_OF_BLOOD);
-        events.ScheduleEvent(EVENT_BLESS, Seconds(20));
-        events.ScheduleEvent(EVENT_CONSECRATION, Seconds(10));
-        events.ScheduleEvent(EVENT_HAMMER_OF_JUSTICE, Seconds(10));
-        events.ScheduleEvent(EVENT_JUDGEMENT, Seconds(15));
-        events.ScheduleEvent(EVENT_AURA, Seconds(6));
+        events.ScheduleEvent(EVENT_BLESS, 20s);
+        events.ScheduleEvent(EVENT_CONSECRATION, 10s);
+        events.ScheduleEvent(EVENT_HAMMER_OF_JUSTICE, 10s);
+        events.ScheduleEvent(EVENT_JUDGEMENT, 15s);
+        events.ScheduleEvent(EVENT_AURA, 6s);
     }
 
     void ExecuteEvent(uint32 eventId) override
@@ -376,16 +376,16 @@ struct boss_high_nethermancer_zerevor : public IllidariCouncilBossAI
 
     void ScheduleEvents() override
     {
-        events.ScheduleEvent(EVENT_FLAMESTRIKE, Seconds(8));
-        events.ScheduleEvent(EVENT_BLIZZARD, Seconds(25));
-        events.ScheduleEvent(EVENT_ARCANE_EXPLOSION, Seconds(5));
+        events.ScheduleEvent(EVENT_FLAMESTRIKE, 8s);
+        events.ScheduleEvent(EVENT_BLIZZARD, 25s);
+        events.ScheduleEvent(EVENT_ARCANE_EXPLOSION, 5s);
         DoCastSelf(SPELL_DAMPEN_MAGIC);
     }
 
     void DoAction(int32 actionId) override
     {
         if (actionId == ACTION_REFRESH_DAMPEN)
-            events.ScheduleEvent(EVENT_DAMPEN_MAGIC, Seconds(50));
+            events.ScheduleEvent(EVENT_DAMPEN_MAGIC, 50s);
     }
     void ExecuteEvent(uint32 eventId) override
     {
@@ -410,7 +410,7 @@ struct boss_high_nethermancer_zerevor : public IllidariCouncilBossAI
                 {
                     DoCastSelf(SPELL_ARCANE_EXPLOSION);
                     _canUseArcaneExplosion = false;
-                    events.ScheduleEvent(EVENT_ARCANE_EXPLOSION_CHECK, Seconds(5));
+                    events.ScheduleEvent(EVENT_ARCANE_EXPLOSION_CHECK, 5s);
                 }
                 events.Repeat(Seconds(1));
                 break;
@@ -452,9 +452,9 @@ struct boss_lady_malande : public IllidariCouncilBossAI
 
     void ScheduleEvents() override
     {
-        events.ScheduleEvent(EVENT_CIRCLE_OF_HEALING, Seconds(20));
-        events.ScheduleEvent(EVENT_REFLECTIVE_SHIELD, Seconds(25));
-        events.ScheduleEvent(EVENT_DIVINE_WRATH, Seconds(32));
+        events.ScheduleEvent(EVENT_CIRCLE_OF_HEALING, 20s);
+        events.ScheduleEvent(EVENT_REFLECTIVE_SHIELD, 25s);
+        events.ScheduleEvent(EVENT_DIVINE_WRATH, 32s);
     }
 
     void HealReceived(Unit* /*who*/, uint32& addhealth) override
@@ -516,8 +516,8 @@ struct boss_veras_darkshadow : public IllidariCouncilBossAI
 
     void ScheduleEvents() override
     {
-        events.ScheduleEvent(EVENT_DEADLY_STRIKE, Seconds(18));
-        events.ScheduleEvent(EVENT_VANISH, Seconds(18));
+        events.ScheduleEvent(EVENT_DEADLY_STRIKE, 18s);
+        events.ScheduleEvent(EVENT_VANISH, 18s);
     }
 
     void ExecuteEvent(uint32 eventId) override
diff --git a/src/server/scripts/Outland/BlackTemple/boss_mother_shahraz.cpp b/src/server/scripts/Outland/BlackTemple/boss_mother_shahraz.cpp
index b9481c34c03..1b29454a9fb 100644
--- a/src/server/scripts/Outland/BlackTemple/boss_mother_shahraz.cpp
+++ b/src/server/scripts/Outland/BlackTemple/boss_mother_shahraz.cpp
@@ -121,12 +121,12 @@ struct boss_mother_shahraz : public BossAI
     {
         _JustEngagedWith();
         Talk(SAY_AGGRO);
-        events.ScheduleEvent(EVENT_SILENCING_SHRIEK, Seconds(22));
-        events.ScheduleEvent(EVENT_PRISMATIC_SHIELD, Seconds(15));
-        events.ScheduleEvent(EVENT_FATAL_ATTRACTION, Seconds(35));
-        events.ScheduleEvent(EVENT_RANDOM_BEAM, Seconds(6));
-        events.ScheduleEvent(EVENT_BERSERK, Minutes(10));
-        events.ScheduleEvent(EVENT_TAUNT, Seconds(35));
+        events.ScheduleEvent(EVENT_SILENCING_SHRIEK, 22s);
+        events.ScheduleEvent(EVENT_PRISMATIC_SHIELD, 15s);
+        events.ScheduleEvent(EVENT_FATAL_ATTRACTION, 35s);
+        events.ScheduleEvent(EVENT_RANDOM_BEAM, 6s);
+        events.ScheduleEvent(EVENT_BERSERK, 10min);
+        events.ScheduleEvent(EVENT_TAUNT, 35s);
     }
 
     void KilledUnit(Unit* victim) override
diff --git a/src/server/scripts/Outland/BlackTemple/boss_reliquary_of_souls.cpp b/src/server/scripts/Outland/BlackTemple/boss_reliquary_of_souls.cpp
index 672d0ba67ef..76b910ccae6 100644
--- a/src/server/scripts/Outland/BlackTemple/boss_reliquary_of_souls.cpp
+++ b/src/server/scripts/Outland/BlackTemple/boss_reliquary_of_souls.cpp
@@ -158,7 +158,7 @@ struct boss_reliquary_of_souls : public BossAI
             _inCombat = true;
             DoZoneInCombat();
             me->SetByteValue(UNIT_FIELD_BYTES_1, UNIT_BYTES_1_OFFSET_STAND_STATE, UNIT_STAND_STATE_STAND);
-            events.ScheduleEvent(EVENT_SUBMERGE, Seconds(10));
+            events.ScheduleEvent(EVENT_SUBMERGE, 10s);
         }
     }
 
@@ -182,13 +182,13 @@ struct boss_reliquary_of_souls : public BossAI
                 me->RemoveAurasDueToSpell(SPELL_SUBMERGE_VISUAL);
                 events.SetPhase(PHASE_ESSENCE_OF_DESIRE);
                 HandleSpirits();
-                events.ScheduleEvent(EVENT_SUBMERGE, Seconds(40));
+                events.ScheduleEvent(EVENT_SUBMERGE, 40s);
                 break;
             case ACTION_ESSENCE_OF_DESIRE_DEAD:
                 me->RemoveAurasDueToSpell(SPELL_SUBMERGE_VISUAL);
                 events.SetPhase(PHASE_ESSENCE_OF_ANGER);
                 HandleSpirits();
-                events.ScheduleEvent(EVENT_SUBMERGE, Seconds(40));
+                events.ScheduleEvent(EVENT_SUBMERGE, 40s);
                 break;
             case ACTION_KILL_SELF:
                 me->KillSelf();
@@ -270,7 +270,7 @@ struct boss_reliquary_of_souls : public BossAI
             {
                 case EVENT_SUBMERGE:
                     DoCastSelf(SPELL_SUBMERGE_VISUAL, true);
-                    events.ScheduleEvent(EVENT_SUMMON_ESSENCE, Seconds(3));
+                    events.ScheduleEvent(EVENT_SUMMON_ESSENCE, 3s);
                     break;
                 case EVENT_SUMMON_ESSENCE:
                 {
@@ -345,8 +345,8 @@ struct boss_essence_of_suffering : public BossAI
         me->setActive(true);
         DoZoneInCombat();
 
-        events.ScheduleEvent(EVENT_SOUL_DRAIN, Seconds(20));
-        events.ScheduleEvent(EVENT_FRENZY, Seconds(45));
+        events.ScheduleEvent(EVENT_SOUL_DRAIN, 20s);
+        events.ScheduleEvent(EVENT_FRENZY, 45s);
         Talk(SUFF_SAY_AGRO);
     }
 
@@ -415,9 +415,9 @@ struct boss_essence_of_desire : public BossAI
 
     void JustEngagedWith(Unit* /*who*/) override
     {
-        events.ScheduleEvent(EVENT_SPIRIT_SHOCK, Seconds(11));
-        events.ScheduleEvent(EVENT_RUNE_SHIELD, Seconds(16));
-        events.ScheduleEvent(EVENT_DEADEN, Seconds(31));
+        events.ScheduleEvent(EVENT_SPIRIT_SHOCK, 11s);
+        events.ScheduleEvent(EVENT_RUNE_SHIELD, 16s);
+        events.ScheduleEvent(EVENT_DEADEN, 31s);
 
         me->SetCombatPulseDelay(5);
         me->setActive(true);
@@ -529,9 +529,9 @@ struct boss_essence_of_anger : public BossAI
     {
         Talk(ANGER_SAY_FREED);
 
-        events.ScheduleEvent(EVENT_START_CHECK_TANKER, Seconds(5));
-        events.ScheduleEvent(EVENT_SOUL_SCREAM, Seconds(11));
-        events.ScheduleEvent(EVENT_SPITE, Seconds(20));
+        events.ScheduleEvent(EVENT_START_CHECK_TANKER, 5s);
+        events.ScheduleEvent(EVENT_SOUL_SCREAM, 11s);
+        events.ScheduleEvent(EVENT_SPITE, 20s);
         events.ScheduleEvent(EVENT_FREED_2, Seconds(1), Minutes(3));
 
         me->SetCombatPulseDelay(5);
@@ -588,7 +588,7 @@ struct boss_essence_of_anger : public BossAI
                     if (Unit* target = me->GetVictim())
                     {
                         _targetGUID = target->GetGUID();
-                        events.ScheduleEvent(EVENT_CHECK_TANKER, Seconds(1));
+                        events.ScheduleEvent(EVENT_CHECK_TANKER, 1s);
                     }
                     else
                         events.Repeat(Seconds(1));
diff --git a/src/server/scripts/Outland/BlackTemple/boss_shade_of_akama.cpp b/src/server/scripts/Outland/BlackTemple/boss_shade_of_akama.cpp
index 3535c5b4ea1..5d349bd0e14 100644
--- a/src/server/scripts/Outland/BlackTemple/boss_shade_of_akama.cpp
+++ b/src/server/scripts/Outland/BlackTemple/boss_shade_of_akama.cpp
@@ -220,7 +220,7 @@ struct boss_shade_of_akama : public BossAI
         me->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NOT_SELECTABLE);
         me->SetUInt32Value(UNIT_NPC_EMOTESTATE, EMOTE_STATE_STUN);
         me->SetWalk(true);
-        events.ScheduleEvent(EVENT_INITIALIZE_SPAWNERS, Seconds(1));
+        events.ScheduleEvent(EVENT_INITIALIZE_SPAWNERS, 1s);
         me->SummonCreatureGroup(SUMMON_GROUP_RESET);
     }
 
@@ -240,9 +240,9 @@ struct boss_shade_of_akama : public BossAI
     {
         if (spell->Id == SPELL_AKAMA_SOUL_CHANNEL)
         {
-            events.ScheduleEvent(EVENT_START_CHANNELERS_AND_SPAWNERS, Seconds(1));
+            events.ScheduleEvent(EVENT_START_CHANNELERS_AND_SPAWNERS, 1s);
             me->SetUInt32Value(UNIT_NPC_EMOTESTATE, EMOTE_STATE_NONE);
-            events.ScheduleEvent(EVENT_EVADE_CHECK, Seconds(10));
+            events.ScheduleEvent(EVENT_EVADE_CHECK, 10s);
             if (Creature* akama = instance->GetCreature(DATA_AKAMA_SHADE))
                 AttackStart(akama);
         }
@@ -392,8 +392,8 @@ struct npc_akama_shade : public ScriptedAI
             {
                 shade->RemoveAurasDueToSpell(SPELL_AKAMA_SOUL_CHANNEL);
                 AttackStart(shade);
-                _events.ScheduleEvent(EVENT_CHAIN_LIGHTNING, Seconds(2));
-                _events.ScheduleEvent(EVENT_DESTRUCTIVE_POISON, Seconds(5));
+                _events.ScheduleEvent(EVENT_CHAIN_LIGHTNING, 2s);
+                _events.ScheduleEvent(EVENT_DESTRUCTIVE_POISON, 5s);
             }
         }
     }
@@ -426,12 +426,12 @@ struct npc_akama_shade : public ScriptedAI
             return;
 
         if (pointId == AKAMA_CHANNEL_WAYPOINT)
-            _events.ScheduleEvent(EVENT_SHADE_CHANNEL, Seconds(1));
+            _events.ScheduleEvent(EVENT_SHADE_CHANNEL, 1s);
 
         else if (pointId == AKAMA_INTRO_WAYPOINT)
         {
             me->SetWalk(false);
-            _events.ScheduleEvent(EVENT_START_SOUL_RETRIEVE, Seconds(1));
+            _events.ScheduleEvent(EVENT_START_SOUL_RETRIEVE, 1s);
         }
     }
 
@@ -468,7 +468,7 @@ struct npc_akama_shade : public ScriptedAI
                     me->SetFacingTo(FACE_THE_PLATFORM);
                     DoCastSelf(SPELL_AKAMA_SOUL_CHANNEL);
                     me->SetFaction(FACTION_MONSTER_SPAR_BUDDY);
-                    _events.ScheduleEvent(EVENT_FIXATE, Seconds(5));
+                    _events.ScheduleEvent(EVENT_FIXATE, 5s);
                     break;
                 case EVENT_FIXATE:
                     DoCast(SPELL_FIXATE);
@@ -484,7 +484,7 @@ struct npc_akama_shade : public ScriptedAI
                 case EVENT_START_SOUL_RETRIEVE:
                     me->SetFacingTo(FACE_THE_DOOR);
                     DoCast(SPELL_AKAMA_SOUL_RETRIEVE);
-                    _events.ScheduleEvent(EVENT_START_BROKEN_FREE, Seconds(15));
+                    _events.ScheduleEvent(EVENT_START_BROKEN_FREE, 15s);
                     break;
                 case EVENT_START_BROKEN_FREE:
                     me->HandleEmoteCommand(EMOTE_ONESHOT_ROAR);
@@ -623,12 +623,12 @@ struct npc_creature_generator_akama : public ScriptedAI
                 if (_leftSide)
                 {
                     _events.ScheduleEvent(EVENT_SPAWN_WAVE_B, Milliseconds(100));
-                    _events.ScheduleEvent(EVENT_SUMMON_ASHTONGUE_SORCERER, Seconds(2), Seconds(5));
+                    _events.ScheduleEvent(EVENT_SUMMON_ASHTONGUE_SORCERER, 2s, 5s);
                 }
                 else
                 {
-                    _events.ScheduleEvent(EVENT_SPAWN_WAVE_B, Seconds(10));
-                    _events.ScheduleEvent(EVENT_SUMMON_ASHTONGUE_DEFENDER, Seconds(2), Seconds(5));
+                    _events.ScheduleEvent(EVENT_SPAWN_WAVE_B, 10s);
+                    _events.ScheduleEvent(EVENT_SUMMON_ASHTONGUE_DEFENDER, 2s, 5s);
                 }
                 break;
             case ACTION_STOP_SPAWNING:
@@ -789,10 +789,10 @@ struct npc_ashtongue_defender : public ScriptedAI
 
     void JustEngagedWith(Unit* /*who*/) override
     {
-        _events.ScheduleEvent(EVENT_HEROIC_STRIKE, Seconds(5));
-        _events.ScheduleEvent(EVENT_SHIELD_BASH, Seconds(10), Seconds(16));
-        _events.ScheduleEvent(EVENT_DEBILITATING_STRIKE, Seconds(10), Seconds(16));
-        _events.ScheduleEvent(EVENT_WINDFURY, Seconds(8), Seconds(12));
+        _events.ScheduleEvent(EVENT_HEROIC_STRIKE, 5s);
+        _events.ScheduleEvent(EVENT_SHIELD_BASH, 10s, 16s);
+        _events.ScheduleEvent(EVENT_DEBILITATING_STRIKE, 10s, 16s);
+        _events.ScheduleEvent(EVENT_WINDFURY, 8s, 12s);
     }
 
 
@@ -857,7 +857,7 @@ struct npc_ashtongue_rogue : public ScriptedAI
     void JustEngagedWith(Unit* /*who*/) override
     {
         _events.ScheduleEvent(EVENT_DEBILITATING_POISON, Milliseconds(500), Seconds(2));
-        _events.ScheduleEvent(EVENT_EVISCERATE, Seconds(2), Seconds(5));
+        _events.ScheduleEvent(EVENT_EVISCERATE, 2s, 5s);
     }
 
     void EnterEvadeMode(EvadeReason /*why*/) override { }
@@ -914,8 +914,8 @@ struct npc_ashtongue_elementalist : public ScriptedAI
 
     void JustEngagedWith(Unit* /*who*/) override
     {
-        _events.ScheduleEvent(EVENT_RAIN_OF_FIRE, Seconds(18));
-        _events.ScheduleEvent(EVENT_LIGHTNING_BOLT, Seconds(6));
+        _events.ScheduleEvent(EVENT_RAIN_OF_FIRE, 18s);
+        _events.ScheduleEvent(EVENT_LIGHTNING_BOLT, 6s);
     }
 
     void EnterEvadeMode(EvadeReason /*why*/) override { }
@@ -981,7 +981,7 @@ struct npc_ashtongue_spiritbinder : public ScriptedAI
 
     void JustEngagedWith(Unit* /*who*/) override
     {
-        _events.ScheduleEvent(EVENT_SPIRIT_HEAL, Seconds(5), Seconds(6));
+        _events.ScheduleEvent(EVENT_SPIRIT_HEAL, 5s, 6s);
     }
 
     void DamageTaken(Unit* /*who*/, uint32& /*damage*/) override
@@ -991,7 +991,7 @@ struct npc_ashtongue_spiritbinder : public ScriptedAI
             {
                 DoCastSelf(SPELL_SPIRIT_MEND);
                 _spiritMend = true;
-                _events.ScheduleEvent(EVENT_SPIRIT_MEND_RESET, Seconds(10), Seconds(15));
+                _events.ScheduleEvent(EVENT_SPIRIT_MEND_RESET, 10s, 15s);
             }
 
         if (!_chainHeal)
@@ -999,7 +999,7 @@ struct npc_ashtongue_spiritbinder : public ScriptedAI
             {
                 DoCastSelf(SPELL_CHAIN_HEAL);
                 _chainHeal = true;
-                _events.ScheduleEvent(EVENT_CHAIN_HEAL_RESET, Seconds(10), Seconds(15));
+                _events.ScheduleEvent(EVENT_CHAIN_HEAL_RESET, 10s, 15s);
             }
 
     }
diff --git a/src/server/scripts/Outland/BlackTemple/boss_supremus.cpp b/src/server/scripts/Outland/BlackTemple/boss_supremus.cpp
index bdb4ac7415b..f14f180815b 100644
--- a/src/server/scripts/Outland/BlackTemple/boss_supremus.cpp
+++ b/src/server/scripts/Outland/BlackTemple/boss_supremus.cpp
@@ -85,8 +85,8 @@ struct boss_supremus : public BossAI
     {
         _JustEngagedWith();
         ChangePhase();
-        events.ScheduleEvent(EVENT_BERSERK, Minutes(15));
-        events.ScheduleEvent(EVENT_FLAME, Seconds(20));
+        events.ScheduleEvent(EVENT_BERSERK, 15min);
+        events.ScheduleEvent(EVENT_FLAME, 20s);
     }
 
     void ChangePhase()
@@ -112,7 +112,7 @@ struct boss_supremus : public BossAI
         }
         ResetThreatList();
         DoZoneInCombat();
-        events.ScheduleEvent(EVENT_SWITCH_PHASE, Seconds(60));
+        events.ScheduleEvent(EVENT_SWITCH_PHASE, 1min);
     }
 
     Unit* CalculateHatefulStrikeTarget()
diff --git a/src/server/scripts/Outland/BlackTemple/boss_teron_gorefiend.cpp b/src/server/scripts/Outland/BlackTemple/boss_teron_gorefiend.cpp
index 72e85a5d135..c6d8343e0e6 100644
--- a/src/server/scripts/Outland/BlackTemple/boss_teron_gorefiend.cpp
+++ b/src/server/scripts/Outland/BlackTemple/boss_teron_gorefiend.cpp
@@ -126,11 +126,11 @@ struct boss_teron_gorefiend : public BossAI
         _JustEngagedWith();
         Talk(SAY_AGGRO);
         events.SetPhase(PHASE_COMBAT);
-        events.ScheduleEvent(EVENT_ENRAGE, Minutes(10));
-        events.ScheduleEvent(EVENT_INCINERATE, Seconds(12));
-        events.ScheduleEvent(EVENT_SUMMON_DOOM_BLOSSOM, Seconds(8));
-        events.ScheduleEvent(EVENT_SHADOW_DEATH, Seconds(8));
-        events.ScheduleEvent(EVENT_CRUSHING_SHADOWS, Seconds(18));
+        events.ScheduleEvent(EVENT_ENRAGE, 10min);
+        events.ScheduleEvent(EVENT_INCINERATE, 12s);
+        events.ScheduleEvent(EVENT_SUMMON_DOOM_BLOSSOM, 8s);
+        events.ScheduleEvent(EVENT_SHADOW_DEATH, 8s);
+        events.ScheduleEvent(EVENT_CRUSHING_SHADOWS, 18s);
     }
 
     void EnterEvadeMode(EvadeReason /*why*/) override
@@ -147,7 +147,7 @@ struct boss_teron_gorefiend : public BossAI
             instance->SetData(DATA_TERON_GOREFIEND_INTRO, 0);
             Talk(SAY_INTRO);
             events.SetPhase(PHASE_INTRO);
-            events.ScheduleEvent(EVENT_FINISH_INTRO, Seconds(20));
+            events.ScheduleEvent(EVENT_FINISH_INTRO, 20s);
         }
     }
 
diff --git a/src/server/scripts/Outland/BlackTemple/boss_warlord_najentus.cpp b/src/server/scripts/Outland/BlackTemple/boss_warlord_najentus.cpp
index e03dd231c7a..da706660947 100644
--- a/src/server/scripts/Outland/BlackTemple/boss_warlord_najentus.cpp
+++ b/src/server/scripts/Outland/BlackTemple/boss_warlord_najentus.cpp
@@ -105,11 +105,11 @@ struct boss_najentus : public BossAI
     {
         _JustEngagedWith();
         Talk(SAY_AGGRO);
-        events.ScheduleEvent(EVENT_NEEDLE, Seconds(2));
-        events.ScheduleEvent(EVENT_SHIELD, Seconds(60));
-        events.ScheduleEvent(EVENT_SPINE, Seconds(30));
-        events.ScheduleEvent(EVENT_BERSERK, Seconds(480));
-        events.ScheduleEvent(EVENT_YELL, Seconds(45), Seconds(100));
+        events.ScheduleEvent(EVENT_NEEDLE, 2s);
+        events.ScheduleEvent(EVENT_SHIELD, 1min);
+        events.ScheduleEvent(EVENT_SPINE, 30s);
+        events.ScheduleEvent(EVENT_BERSERK, 480s);
+        events.ScheduleEvent(EVENT_YELL, 45s, 100s);
     }
 
     uint32 GetData(uint32 data) const override
diff --git a/src/server/scripts/Outland/CoilfangReservoir/SteamVault/boss_hydromancer_thespia.cpp b/src/server/scripts/Outland/CoilfangReservoir/SteamVault/boss_hydromancer_thespia.cpp
index cee8aad089f..e57c02ab2b4 100644
--- a/src/server/scripts/Outland/CoilfangReservoir/SteamVault/boss_hydromancer_thespia.cpp
+++ b/src/server/scripts/Outland/CoilfangReservoir/SteamVault/boss_hydromancer_thespia.cpp
@@ -73,8 +73,8 @@ class boss_hydromancer_thespia : public CreatureScript
                 _JustEngagedWith();
 
                 events.ScheduleEvent(EVENT_LIGHTNING_CLOUD, 15000);
-                events.ScheduleEvent(EVENT_LUNG_BURST, 7000);
-                events.ScheduleEvent(EVENT_ENVELOPING_WINDS, 9000);
+                events.ScheduleEvent(EVENT_LUNG_BURST, 7s);
+                events.ScheduleEvent(EVENT_ENVELOPING_WINDS, 9s);
             }
 
             void ExecuteEvent(uint32 eventId) override
@@ -89,12 +89,12 @@ class boss_hydromancer_thespia : public CreatureScript
                             if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0, 30.0f, true))
                                 DoCast(target, SPELL_LIGHTNING_CLOUD);
 
-                        events.ScheduleEvent(EVENT_LIGHTNING_CLOUD, urand(15000, 25000));
+                        events.ScheduleEvent(EVENT_LIGHTNING_CLOUD, 15s, 25s);
                         break;
                     case EVENT_LUNG_BURST:
                         if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0, 40.0f, true))
                             DoCast(target, SPELL_LUNG_BURST);
-                        events.ScheduleEvent(EVENT_LUNG_BURST, urand(7000, 12000));
+                        events.ScheduleEvent(EVENT_LUNG_BURST, 7s, 12s);
                         break;
                     case EVENT_ENVELOPING_WINDS:
                         if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0, 35.0f, true))
@@ -104,7 +104,7 @@ class boss_hydromancer_thespia : public CreatureScript
                             if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0, 35.0f, true))
                                 DoCast(target, SPELL_ENVELOPING_WINDS);
 
-                        events.ScheduleEvent(EVENT_ENVELOPING_WINDS, urand(10000, 15000));
+                        events.ScheduleEvent(EVENT_ENVELOPING_WINDS, 10s, 15s);
                         break;
                     default:
                         break;
@@ -140,7 +140,7 @@ class npc_coilfang_waterelemental : public CreatureScript
 
             void JustEngagedWith(Unit* /*who*/) override
             {
-                _events.ScheduleEvent(EVENT_WATER_BOLT_VOLLEY, urand(3000, 6000));
+                _events.ScheduleEvent(EVENT_WATER_BOLT_VOLLEY, 3s, 6s);
             }
 
             void UpdateAI(uint32 diff) override
@@ -159,7 +159,7 @@ class npc_coilfang_waterelemental : public CreatureScript
                     {
                         case EVENT_WATER_BOLT_VOLLEY:
                             DoCast(me, SPELL_WATER_BOLT_VOLLEY);
-                            _events.ScheduleEvent(EVENT_WATER_BOLT_VOLLEY, urand(7000, 12000));
+                            _events.ScheduleEvent(EVENT_WATER_BOLT_VOLLEY, 7s, 12s);
                             break;
                         default:
                             break;
diff --git a/src/server/scripts/Outland/CoilfangReservoir/TheSlavePens/boss_ahune.cpp b/src/server/scripts/Outland/CoilfangReservoir/TheSlavePens/boss_ahune.cpp
index ec905fd47b2..7a6193102a2 100644
--- a/src/server/scripts/Outland/CoilfangReservoir/TheSlavePens/boss_ahune.cpp
+++ b/src/server/scripts/Outland/CoilfangReservoir/TheSlavePens/boss_ahune.cpp
@@ -215,7 +215,7 @@ struct boss_ahune : public BossAI
         if (action == ACTION_AHUNE_RETREAT)
         {
             Submerge();
-            events.ScheduleEvent(EVENT_EMERGE, Seconds(35));
+            events.ScheduleEvent(EVENT_EMERGE, 35s);
         }
     }
 
diff --git a/src/server/scripts/Outland/CoilfangReservoir/TheSlavePens/boss_mennu_the_betrayer.cpp b/src/server/scripts/Outland/CoilfangReservoir/TheSlavePens/boss_mennu_the_betrayer.cpp
index c8dbc4e1068..eeed56baff1 100644
--- a/src/server/scripts/Outland/CoilfangReservoir/TheSlavePens/boss_mennu_the_betrayer.cpp
+++ b/src/server/scripts/Outland/CoilfangReservoir/TheSlavePens/boss_mennu_the_betrayer.cpp
@@ -74,11 +74,11 @@ class boss_mennu_the_betrayer : public CreatureScript
             void JustEngagedWith(Unit* /*who*/) override
             {
                 _JustEngagedWith();
-                events.ScheduleEvent(EVENT_TAINTED_STONESKIN_TOTEM, 30000);
-                events.ScheduleEvent(EVENT_TAINTED_EARTHGRAB_TOTEM, 20000);
-                events.ScheduleEvent(EVENT_CORRUPTED_NOVA_TOTEM, 60000);
-                events.ScheduleEvent(EVENT_MENNUS_HEALING_WARD, urand(14000, 25000));
-                events.ScheduleEvent(EVENT_LIGHTNING_BOLT, urand(14000, 19000));
+                events.ScheduleEvent(EVENT_TAINTED_STONESKIN_TOTEM, 30s);
+                events.ScheduleEvent(EVENT_TAINTED_EARTHGRAB_TOTEM, 20s);
+                events.ScheduleEvent(EVENT_CORRUPTED_NOVA_TOTEM, 1min);
+                events.ScheduleEvent(EVENT_MENNUS_HEALING_WARD, 14s, 25s);
+                events.ScheduleEvent(EVENT_LIGHTNING_BOLT, 14s, 19s);
                 Talk(SAY_AGGRO);
             }
 
@@ -104,7 +104,7 @@ class boss_mennu_the_betrayer : public CreatureScript
                         case EVENT_TAINTED_STONESKIN_TOTEM:
                             if (HealthBelowPct(100))
                                 DoCast(me, SPELL_TAINTED_STONESKIN_TOTEM);
-                            events.ScheduleEvent(EVENT_TAINTED_STONESKIN_TOTEM, 30000);
+                            events.ScheduleEvent(EVENT_TAINTED_STONESKIN_TOTEM, 30s);
                             break;
                         case EVENT_TAINTED_EARTHGRAB_TOTEM:
                             DoCast(me, SPELL_TAINTED_EARTHGRAB_TOTEM);
@@ -114,11 +114,11 @@ class boss_mennu_the_betrayer : public CreatureScript
                             break;
                         case EVENT_MENNUS_HEALING_WARD:
                             DoCast(me, SPELL_MENNUS_HEALING_WARD);
-                            events.ScheduleEvent(EVENT_MENNUS_HEALING_WARD, urand(14000, 25000));
+                            events.ScheduleEvent(EVENT_MENNUS_HEALING_WARD, 14s, 25s);
                             break;
                         case EVENT_LIGHTNING_BOLT:
                             DoCastVictim(SPELL_LIGHTNING_BOLT, true);
-                            events.ScheduleEvent(EVENT_LIGHTNING_BOLT, urand(14000, 25000));
+                            events.ScheduleEvent(EVENT_LIGHTNING_BOLT, 14s, 25s);
                             break;
                         default:
                             break;
diff --git a/src/server/scripts/Outland/CoilfangReservoir/TheSlavePens/boss_quagmirran.cpp b/src/server/scripts/Outland/CoilfangReservoir/TheSlavePens/boss_quagmirran.cpp
index aecdef0c945..ca0c368e998 100644
--- a/src/server/scripts/Outland/CoilfangReservoir/TheSlavePens/boss_quagmirran.cpp
+++ b/src/server/scripts/Outland/CoilfangReservoir/TheSlavePens/boss_quagmirran.cpp
@@ -65,9 +65,9 @@ class boss_quagmirran : public CreatureScript
             {
                 _JustEngagedWith();
                 events.ScheduleEvent(EVENT_ACID_SPRAY, 25000);
-                events.ScheduleEvent(EVENT_CLEAVE, 9000);
-                events.ScheduleEvent(EVENT_UPPERCUT, 20000);
-                events.ScheduleEvent(EVENT_POISON_BOLT_VOLLEY, 31000);
+                events.ScheduleEvent(EVENT_CLEAVE, 9s);
+                events.ScheduleEvent(EVENT_UPPERCUT, 20s);
+                events.ScheduleEvent(EVENT_POISON_BOLT_VOLLEY, 31s);
             }
 
             void KilledUnit(Unit* /*victim*/) override { }
@@ -88,20 +88,20 @@ class boss_quagmirran : public CreatureScript
                     {
                         case EVENT_ACID_SPRAY:
                             DoCastAOE(SPELL_ACID_SPRAY);
-                            events.ScheduleEvent(EVENT_ACID_SPRAY, urand(20000, 25000));
+                            events.ScheduleEvent(EVENT_ACID_SPRAY, 20s, 25s);
                             break;
                         case EVENT_CLEAVE:
                             DoCastVictim(SPELL_CLEAVE, true);
-                            events.ScheduleEvent(EVENT_CLEAVE, urand(18000, 34000));
+                            events.ScheduleEvent(EVENT_CLEAVE, 18s, 34s);
                             break;
                         case EVENT_UPPERCUT:
                             if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 1, 10.0f, true))
                             DoCast(target, SPELL_UPPERCUT);
-                            events.ScheduleEvent(EVENT_UPPERCUT, 22000);
+                            events.ScheduleEvent(EVENT_UPPERCUT, 22s);
                             break;
                         case EVENT_POISON_BOLT_VOLLEY:
                             DoCast(me, SPELL_POISON_BOLT_VOLLEY);
-                            events.ScheduleEvent(EVENT_POISON_BOLT_VOLLEY, 24000);
+                            events.ScheduleEvent(EVENT_POISON_BOLT_VOLLEY, 24s);
                             break;
                         default:
                             break;
diff --git a/src/server/scripts/Outland/CoilfangReservoir/TheSlavePens/boss_rokmar_the_crackler.cpp b/src/server/scripts/Outland/CoilfangReservoir/TheSlavePens/boss_rokmar_the_crackler.cpp
index 15d6a08e32a..a3fed69e2ef 100644
--- a/src/server/scripts/Outland/CoilfangReservoir/TheSlavePens/boss_rokmar_the_crackler.cpp
+++ b/src/server/scripts/Outland/CoilfangReservoir/TheSlavePens/boss_rokmar_the_crackler.cpp
@@ -72,9 +72,9 @@ class boss_rokmar_the_crackler : public CreatureScript
             void JustEngagedWith(Unit* /*who*/) override
             {
                 _JustEngagedWith();
-                events.ScheduleEvent(EVENT_GRIEVOUS_WOUND, 10000);
-                events.ScheduleEvent(EVENT_ENSNARING_MOSS, 20000);
-                events.ScheduleEvent(EVENT_WATER_SPIT, 14000);
+                events.ScheduleEvent(EVENT_GRIEVOUS_WOUND, 10s);
+                events.ScheduleEvent(EVENT_ENSNARING_MOSS, 20s);
+                events.ScheduleEvent(EVENT_WATER_SPIT, 14s);
             }
 
             void KilledUnit(Unit* /*victim*/) override { }
@@ -95,15 +95,15 @@ class boss_rokmar_the_crackler : public CreatureScript
                     {
                         case EVENT_GRIEVOUS_WOUND:
                             DoCastVictim(SPELL_GRIEVOUS_WOUND, true);
-                            events.ScheduleEvent(EVENT_GRIEVOUS_WOUND, urand(20000, 30000));
+                            events.ScheduleEvent(EVENT_GRIEVOUS_WOUND, 20s, 30s);
                             break;
                         case EVENT_ENSNARING_MOSS:
                             DoCastAOE(SPELL_ENSNARING_MOSS);
-                            events.ScheduleEvent(EVENT_ENSNARING_MOSS, urand(20000, 30000));
+                            events.ScheduleEvent(EVENT_ENSNARING_MOSS, 20s, 30s);
                             break;
                         case EVENT_WATER_SPIT:
                             DoCastAOE(SPELL_WATER_SPIT);
-                            events.ScheduleEvent(EVENT_WATER_SPIT, urand(14000, 18000));
+                            events.ScheduleEvent(EVENT_WATER_SPIT, 14s, 18s);
                             break;
                         default:
                             break;
diff --git a/src/server/scripts/Outland/HellfireCitadel/BloodFurnace/boss_broggok.cpp b/src/server/scripts/Outland/HellfireCitadel/BloodFurnace/boss_broggok.cpp
index eb471ad95eb..88551936f2b 100644
--- a/src/server/scripts/Outland/HellfireCitadel/BloodFurnace/boss_broggok.cpp
+++ b/src/server/scripts/Outland/HellfireCitadel/BloodFurnace/boss_broggok.cpp
@@ -83,15 +83,15 @@ class boss_broggok : public CreatureScript
                 {
                     case EVENT_SLIME_SPRAY:
                         DoCastVictim(SPELL_SLIME_SPRAY);
-                        events.ScheduleEvent(EVENT_SLIME_SPRAY, urand(4000, 12000));
+                        events.ScheduleEvent(EVENT_SLIME_SPRAY, 4s, 12s);
                         break;
                     case EVENT_POISON_BOLT:
                         DoCastVictim(SPELL_POISON_BOLT);
-                        events.ScheduleEvent(EVENT_POISON_BOLT, urand(4000, 12000));
+                        events.ScheduleEvent(EVENT_POISON_BOLT, 4s, 12s);
                         break;
                     case EVENT_POISON_CLOUD:
                         DoCast(me, SPELL_POISON_CLOUD);
-                        events.ScheduleEvent(EVENT_POISON_CLOUD, 20000);
+                        events.ScheduleEvent(EVENT_POISON_CLOUD, 20s);
                         break;
                     default:
                         break;
@@ -109,9 +109,9 @@ class boss_broggok : public CreatureScript
                         me->SetReactState(REACT_AGGRESSIVE);
                         me->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NON_ATTACKABLE);
                         me->SetImmuneToAll(false);
-                        events.ScheduleEvent(EVENT_SLIME_SPRAY, 10000);
-                        events.ScheduleEvent(EVENT_POISON_BOLT, 7000);
-                        events.ScheduleEvent(EVENT_POISON_CLOUD, 5000);
+                        events.ScheduleEvent(EVENT_SLIME_SPRAY, 10s);
+                        events.ScheduleEvent(EVENT_POISON_BOLT, 7s);
+                        events.ScheduleEvent(EVENT_POISON_CLOUD, 5s);
                         break;
                     case ACTION_RESET_BROGGOK:
                         me->SetReactState(REACT_PASSIVE);
diff --git a/src/server/scripts/Outland/HellfireCitadel/BloodFurnace/boss_the_maker.cpp b/src/server/scripts/Outland/HellfireCitadel/BloodFurnace/boss_the_maker.cpp
index d0c817aafef..5caa97218b7 100644
--- a/src/server/scripts/Outland/HellfireCitadel/BloodFurnace/boss_the_maker.cpp
+++ b/src/server/scripts/Outland/HellfireCitadel/BloodFurnace/boss_the_maker.cpp
@@ -57,9 +57,9 @@ class boss_the_maker : public CreatureScript
                 Talk(SAY_AGGRO);
 
                 events.ScheduleEvent(EVENT_ACID_SPRAY, 15000);
-                events.ScheduleEvent(EVENT_EXPLODING_BREAKER, 6000);
+                events.ScheduleEvent(EVENT_EXPLODING_BREAKER, 6s);
                 events.ScheduleEvent(EVENT_DOMINATION, 120000);
-                events.ScheduleEvent(EVENT_KNOCKDOWN, 10000);
+                events.ScheduleEvent(EVENT_KNOCKDOWN, 10s);
             }
 
             void KilledUnit(Unit* who) override
@@ -80,12 +80,12 @@ class boss_the_maker : public CreatureScript
                 {
                     case EVENT_ACID_SPRAY:
                         DoCastVictim(SPELL_ACID_SPRAY);
-                        events.ScheduleEvent(EVENT_ACID_SPRAY, urand(15000, 23000));
+                        events.ScheduleEvent(EVENT_ACID_SPRAY, 15s, 23s);
                         break;
                     case EVENT_EXPLODING_BREAKER:
                         if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0, 30.0f, true))
                             DoCast(target, SPELL_EXPLODING_BREAKER);
-                        events.ScheduleEvent(EVENT_EXPLODING_BREAKER, urand(4000, 12000));
+                        events.ScheduleEvent(EVENT_EXPLODING_BREAKER, 4s, 12s);
                         break;
                     case EVENT_DOMINATION:
                         if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0, 0.0f, true))
@@ -94,7 +94,7 @@ class boss_the_maker : public CreatureScript
                         break;
                     case EVENT_KNOCKDOWN:
                         DoCastVictim(SPELL_KNOCKDOWN);
-                        events.ScheduleEvent(EVENT_KNOCKDOWN, urand(4000, 12000));
+                        events.ScheduleEvent(EVENT_KNOCKDOWN, 4s, 12s);
                         break;
                     default:
                         break;
diff --git a/src/server/scripts/Outland/HellfireCitadel/HellfireRamparts/boss_watchkeeper_gargolmar.cpp b/src/server/scripts/Outland/HellfireCitadel/HellfireRamparts/boss_watchkeeper_gargolmar.cpp
index b9f3feb7bf3..17b01873c38 100644
--- a/src/server/scripts/Outland/HellfireCitadel/HellfireRamparts/boss_watchkeeper_gargolmar.cpp
+++ b/src/server/scripts/Outland/HellfireCitadel/HellfireRamparts/boss_watchkeeper_gargolmar.cpp
@@ -79,8 +79,8 @@ class boss_watchkeeper_gargolmar : public CreatureScript
             void JustEngagedWith(Unit* /*who*/) override
             {
                 Talk(SAY_AGGRO);
-                events.ScheduleEvent(EVENT_MORTAL_WOUND, 5000);
-                events.ScheduleEvent(EVENT_SURGE, 4000);
+                events.ScheduleEvent(EVENT_MORTAL_WOUND, 5s);
+                events.ScheduleEvent(EVENT_SURGE, 4s);
                 _JustEngagedWith();
             }
 
@@ -139,7 +139,7 @@ class boss_watchkeeper_gargolmar : public CreatureScript
                             break;
                         case EVENT_RETALIATION:
                             DoCast(me, SPELL_RETALIATION);
-                            events.ScheduleEvent(EVENT_RETALIATION, 30000);
+                            events.ScheduleEvent(EVENT_RETALIATION, 30s);
                             break;
                         default:
                             break;
@@ -150,7 +150,7 @@ class boss_watchkeeper_gargolmar : public CreatureScript
                 {
                     if (HealthBelowPct(20))
                     {
-                        events.ScheduleEvent(EVENT_RETALIATION, 1000);
+                        events.ScheduleEvent(EVENT_RETALIATION, 1s);
                         retaliation = true;
                     }
                 }
diff --git a/src/server/scripts/Outland/HellfireCitadel/MagtheridonsLair/boss_magtheridon.cpp b/src/server/scripts/Outland/HellfireCitadel/MagtheridonsLair/boss_magtheridon.cpp
index 10ccf9b54da..c384c685373 100644
--- a/src/server/scripts/Outland/HellfireCitadel/MagtheridonsLair/boss_magtheridon.cpp
+++ b/src/server/scripts/Outland/HellfireCitadel/MagtheridonsLair/boss_magtheridon.cpp
@@ -141,7 +141,7 @@ class boss_magtheridon : public CreatureScript
             {
                 events.CancelEvent(EVENT_START_FIGHT);
                 events.CancelEvent(EVENT_NEARLY_EMOTE);
-                events.ScheduleEvent(EVENT_RELEASED, Seconds(6));
+                events.ScheduleEvent(EVENT_RELEASED, 6s);
                 Talk(EMOTE_BREAKS_FREE, me);
                 Talk(SAY_FREE);
                 me->RemoveAurasDueToSpell(SPELL_SHADOW_CAGE_C);
@@ -176,8 +176,8 @@ class boss_magtheridon : public CreatureScript
                     events.SetPhase(PHASE_1);
                     Talk(EMOTE_WEAKEN, me);
                     summons.DoZoneInCombat(NPC_HELLFIRE_CHANNELLER);
-                    events.ScheduleEvent(EVENT_START_FIGHT, Minutes(2));
-                    events.ScheduleEvent(EVENT_NEARLY_EMOTE, Seconds(60));
+                    events.ScheduleEvent(EVENT_START_FIGHT, 2min);
+                    events.ScheduleEvent(EVENT_NEARLY_EMOTE, 1min);
                     events.CancelEvent(EVENT_TAUNT);
                     instance->SetBossState(DATA_MAGTHERIDON, IN_PROGRESS);
                     instance->SetData(DATA_CALL_WARDERS, ACTION_ENABLE);
@@ -200,7 +200,7 @@ class boss_magtheridon : public CreatureScript
                     Talk(SAY_COLLAPSE);
                     instance->SetData(DATA_COLLAPSE, ACTION_ENABLE);
                     DoCastAOE(SPELL_CAMERA_SHAKE);
-                    events.ScheduleEvent(EVENT_COLLAPSE, Seconds(6));
+                    events.ScheduleEvent(EVENT_COLLAPSE, 6s);
                 }
             }
 
@@ -255,22 +255,22 @@ class boss_magtheridon : public CreatureScript
                             DoZoneInCombat();
                             events.SetPhase(PHASE_2);
                             instance->SetData(DATA_MANTICRON_CUBE, ACTION_ENABLE);
-                            events.ScheduleEvent(EVENT_CLEAVE, Seconds(10));
-                            events.ScheduleEvent(EVENT_BLAST_NOVA, Seconds(60));
-                            events.ScheduleEvent(EVENT_BLAZE, Seconds(20));
-                            events.ScheduleEvent(EVENT_QUAKE, Seconds(35));
-                            events.ScheduleEvent(EVENT_BERSERK, Minutes(20));
+                            events.ScheduleEvent(EVENT_CLEAVE, 10s);
+                            events.ScheduleEvent(EVENT_BLAST_NOVA, 1min);
+                            events.ScheduleEvent(EVENT_BLAZE, 20s);
+                            events.ScheduleEvent(EVENT_QUAKE, 35s);
+                            events.ScheduleEvent(EVENT_BERSERK, 20min);
                             break;
                         case EVENT_COLLAPSE:
                             instance->SetData(DATA_COLLAPSE_2, ACTION_ENABLE);
-                            events.ScheduleEvent(EVENT_DEBRIS_KNOCKDOWN, Seconds(4));
+                            events.ScheduleEvent(EVENT_DEBRIS_KNOCKDOWN, 4s);
                             break;
                         case EVENT_DEBRIS_KNOCKDOWN:
                             if (Creature* trigger = instance->GetCreature(DATA_WORLD_TRIGGER))
                             {
                                 trigger->CastSpell(trigger, SPELL_DEBRIS_KNOCKDOWN, true);
                                 me->SetReactState(REACT_AGGRESSIVE);
-                                events.ScheduleEvent(EVENT_DEBRIS, Seconds(20));
+                                events.ScheduleEvent(EVENT_DEBRIS, 20s);
                             }
                             break;
                         case EVENT_DEBRIS:
@@ -337,10 +337,10 @@ class npc_hellfire_channeler : public CreatureScript
                 if (Creature* magtheridon = _instance->GetCreature(DATA_MAGTHERIDON))
                     magtheridon->AI()->DoAction(ACTION_START_CHANNELERS_EVENT);
 
-                _events.ScheduleEvent(EVENT_SHADOWBOLT, Seconds(20));
-                _events.ScheduleEvent(EVENT_CHECK_FRIEND, Seconds(1));
-                _events.ScheduleEvent(EVENT_ABYSSAL, Seconds(30));
-                _events.ScheduleEvent(EVENT_FEAR, Seconds(15), Seconds(20));
+                _events.ScheduleEvent(EVENT_SHADOWBOLT, 20s);
+                _events.ScheduleEvent(EVENT_CHECK_FRIEND, 1s);
+                _events.ScheduleEvent(EVENT_ABYSSAL, 30s);
+                _events.ScheduleEvent(EVENT_FEAR, 15s, 20s);
 
             }
 
@@ -398,7 +398,7 @@ class npc_hellfire_channeler : public CreatureScript
                                 {
                                     DoCast(target, SPELL_DARK_MENDING);
                                     _canCastDarkMending = false;
-                                    _events.ScheduleEvent(EVENT_DARK_MENDING, Seconds(10), Seconds(20));
+                                    _events.ScheduleEvent(EVENT_DARK_MENDING, 10s, 20s);
                                 }
                             }
                             _events.Repeat(Seconds(1));
diff --git a/src/server/scripts/Outland/HellfireCitadel/ShatteredHalls/boss_nethekurse.cpp b/src/server/scripts/Outland/HellfireCitadel/ShatteredHalls/boss_nethekurse.cpp
index 6852ebbdd45..a81e5d8493f 100644
--- a/src/server/scripts/Outland/HellfireCitadel/ShatteredHalls/boss_nethekurse.cpp
+++ b/src/server/scripts/Outland/HellfireCitadel/ShatteredHalls/boss_nethekurse.cpp
@@ -330,7 +330,7 @@ class npc_fel_orc_convert : public CreatureScript
 
             void JustEngagedWith(Unit* /*who*/) override
             {
-                events.ScheduleEvent(EVENT_HEMORRHAGE, 3000);
+                events.ScheduleEvent(EVENT_HEMORRHAGE, 3s);
 
                 if (Creature* Kurse = ObjectAccessor::GetCreature(*me, instance->GetGuidData(NPC_GRAND_WARLOCK_NETHEKURSE)))
                     if (me->IsWithinDist(Kurse, 45.0f))
diff --git a/src/server/scripts/Outland/HellfireCitadel/ShatteredHalls/boss_warbringer_omrogg.cpp b/src/server/scripts/Outland/HellfireCitadel/ShatteredHalls/boss_warbringer_omrogg.cpp
index 3868e260c04..a26dfb9c85b 100644
--- a/src/server/scripts/Outland/HellfireCitadel/ShatteredHalls/boss_warbringer_omrogg.cpp
+++ b/src/server/scripts/Outland/HellfireCitadel/ShatteredHalls/boss_warbringer_omrogg.cpp
@@ -423,7 +423,7 @@ class npc_omrogg_heads : public CreatureScript
             {
                 if (data == SETDATA_DATA && value == SETDATA_YELL)
                 {
-                    events.ScheduleEvent(EVENT_DEATH_YELL, 4000);
+                    events.ScheduleEvent(EVENT_DEATH_YELL, 4s);
                 }
             }
 
diff --git a/src/server/scripts/Outland/TempestKeep/Eye/boss_kaelthas.cpp b/src/server/scripts/Outland/TempestKeep/Eye/boss_kaelthas.cpp
index 2ed16192e5d..1464d3ebcbf 100644
--- a/src/server/scripts/Outland/TempestKeep/Eye/boss_kaelthas.cpp
+++ b/src/server/scripts/Outland/TempestKeep/Eye/boss_kaelthas.cpp
@@ -366,7 +366,7 @@ struct advisorbase_ai : public ScriptedAI
             _hasRessurrected = true;
             me->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NOT_SELECTABLE | UNIT_FLAG_STUNNED);
             me->SetStandState(UNIT_STAND_STATE_STAND);
-            events.ScheduleEvent(EVENT_DELAYED_RESSURECTION, 2000);
+            events.ScheduleEvent(EVENT_DELAYED_RESSURECTION, 2s);
         }
     }
 
@@ -494,7 +494,7 @@ class boss_kaelthas : public CreatureScript
 
                         _phase = PHASE_INTRO;
                         instance->SetBossState(DATA_KAELTHAS, IN_PROGRESS);
-                        events.ScheduleEvent(EVENT_START_ENCOUNTER, 23000);
+                        events.ScheduleEvent(EVENT_START_ENCOUNTER, 23s);
                         break;
                     case ACTION_PREPARE_ADVISORS:
                         for (uint8 i = 0; i < MAX_ADVISORS; ++i)
@@ -516,7 +516,7 @@ class boss_kaelthas : public CreatureScript
                         {
                             case ADVISOR_THALADRED:
                                 Talk(SAY_INTRO_THALADRED);
-                                events.ScheduleEvent(EVENT_ACTIVE_ADVISOR, 7000);
+                                events.ScheduleEvent(EVENT_ACTIVE_ADVISOR, 7s);
                                 break;
                             case ADVISOR_SANGUINAR:
                                 Talk(SAY_INTRO_SANGUINAR);
@@ -524,20 +524,20 @@ class boss_kaelthas : public CreatureScript
                                 break;
                             case ADVISOR_CAPERNIAN:
                                 Talk(SAY_INTRO_CAPERNIAN);
-                                events.ScheduleEvent(EVENT_ACTIVE_ADVISOR, 7000);
+                                events.ScheduleEvent(EVENT_ACTIVE_ADVISOR, 7s);
                                 break;
                             case ADVISOR_TELONICUS:
                                 Talk(SAY_INTRO_TELONICUS);
-                                events.ScheduleEvent(EVENT_ACTIVE_ADVISOR, 8400);
+                                events.ScheduleEvent(EVENT_ACTIVE_ADVISOR, 8400ms);
                                 break;
                             case MAX_DEFEATED_ADVISORS:
                                 // Every advisor defeated - Phase 2 starts.
                                 Talk(SAY_PHASE2_WEAPON);
-                                events.ScheduleEvent(EVENT_SUMMON_WEAPONS, 3500);
+                                events.ScheduleEvent(EVENT_SUMMON_WEAPONS, 3500ms);
                                 break;
                             case MAX_KILLED_ADVISORS:
                                 // Every advisor killed - Phase 3 starts.
-                                events.ScheduleEvent(EVENT_ENGAGE_COMBAT, 5000);
+                                events.ScheduleEvent(EVENT_ENGAGE_COMBAT, 5s);
                                 break;
                             default:
                                 break;
@@ -608,14 +608,14 @@ class boss_kaelthas : public CreatureScript
                         me->SetDisableGravity(true);
                         //me->SetHover(true); -- Set in sniffs, but breaks his visual.
                         events.ScheduleEvent(EVENT_TRANSITION_2, 2000);
-                        events.ScheduleEvent(EVENT_SIZE_INCREASE, 5000);
+                        events.ScheduleEvent(EVENT_SIZE_INCREASE, 5s);
                         break;
                     case POINT_TRANSITION_HALFWAY_ASCENDING:
                         DoCast(me, SPELL_NETHER_BEAM_VISUAL3, true);
                         events.ScheduleEvent(EVENT_TRANSITION_3, 1000);
                         break;
                     case POINT_TRANSITION_TOP:
-                        events.ScheduleEvent(EVENT_EXPLODE, 10000);
+                        events.ScheduleEvent(EVENT_EXPLODE, 10s);
                         break;
                     case POINT_TRANSITION_HALFWAY_DESCENDING:
                         events.ScheduleEvent(EVENT_TRANSITION_5, 2000);
@@ -761,7 +761,7 @@ class boss_kaelthas : public CreatureScript
                             if (_pyrosCast < 3)
                             {
                                 DoCastVictim(SPELL_PYROBLAST);
-                                events.ScheduleEvent(EVENT_PYROBLAST_CAST, 3000);
+                                events.ScheduleEvent(EVENT_PYROBLAST_CAST, 3s);
                                 _pyrosCast++;
                             }
                             else
@@ -783,7 +783,7 @@ class boss_kaelthas : public CreatureScript
                                     DoCast(unit, SPELL_NETHER_BEAM);
 
                                 _netherbeamsCast++;
-                                events.ScheduleEvent(EVENT_NETHER_BEAM, 3000);
+                                events.ScheduleEvent(EVENT_NETHER_BEAM, 3s);
                             }
                             else
                                 _netherbeamsCast = 0;
@@ -823,22 +823,22 @@ class boss_kaelthas : public CreatureScript
                             if (GameObject* window = instance->GetGameObject(DATA_TEMPEST_BRIDGE_WINDOW))
                                 window->UseDoorOrButton();
 
-                            events.ScheduleEvent(EVENT_END_TRANSITION, 10000);
+                            events.ScheduleEvent(EVENT_END_TRANSITION, 10s);
                             break;
                         case EVENT_SIZE_INCREASE:
                             switch (_scaleStage)
                             {
                                 case 0:
                                     me->SetObjectScale(1.4f);
-                                    events.ScheduleEvent(EVENT_SIZE_INCREASE, 5000);
+                                    events.ScheduleEvent(EVENT_SIZE_INCREASE, 5s);
                                     break;
                                 case 1:
                                     me->SetObjectScale(1.8f);
-                                    events.ScheduleEvent(EVENT_SIZE_INCREASE, 3000);
+                                    events.ScheduleEvent(EVENT_SIZE_INCREASE, 3s);
                                     break;
                                 case 2:
                                     me->SetObjectScale(2.0f);
-                                    events.ScheduleEvent(EVENT_SIZE_INCREASE, 1000);
+                                    events.ScheduleEvent(EVENT_SIZE_INCREASE, 1s);
                                     break;
                                 case 3:
                                     me->SetObjectScale(2.2f);
diff --git a/src/server/scripts/Outland/TempestKeep/Eye/boss_void_reaver.cpp b/src/server/scripts/Outland/TempestKeep/Eye/boss_void_reaver.cpp
index 410480f5f50..ebabe28e45b 100644
--- a/src/server/scripts/Outland/TempestKeep/Eye/boss_void_reaver.cpp
+++ b/src/server/scripts/Outland/TempestKeep/Eye/boss_void_reaver.cpp
@@ -85,9 +85,9 @@ class boss_void_reaver : public CreatureScript
                 _JustEngagedWith();
 
                 events.ScheduleEvent(EVENT_POUNDING, 15000);
-                events.ScheduleEvent(EVENT_ARCANE_ORB, 3000);
-                events.ScheduleEvent(EVENT_KNOCK_AWAY, 30000);
-                events.ScheduleEvent(EVENT_BERSERK, 600000);
+                events.ScheduleEvent(EVENT_ARCANE_ORB, 3s);
+                events.ScheduleEvent(EVENT_KNOCK_AWAY, 30s);
+                events.ScheduleEvent(EVENT_BERSERK, 10min);
             }
 
             void UpdateAI(uint32 diff) override
@@ -128,7 +128,7 @@ class boss_void_reaver : public CreatureScript
                             if (target)
                                 me->CastSpell(target, SPELL_ARCANE_ORB);
 
-                            events.ScheduleEvent(EVENT_ARCANE_ORB, 3000);
+                            events.ScheduleEvent(EVENT_ARCANE_ORB, 3s);
                             break;
                         }
                         case EVENT_KNOCK_AWAY:
@@ -137,7 +137,7 @@ class boss_void_reaver : public CreatureScript
                             if (GetThreat(me->GetVictim()))
                                 ModifyThreatByPercent(me->GetVictim(), -25);
 
-                            events.ScheduleEvent(EVENT_KNOCK_AWAY, 30000);
+                            events.ScheduleEvent(EVENT_KNOCK_AWAY, 30s);
                             break;
                         case EVENT_BERSERK:
                             if (!Enraged)
diff --git a/src/server/scripts/Outland/TempestKeep/Mechanar/boss_gatewatcher_gyrokill.cpp b/src/server/scripts/Outland/TempestKeep/Mechanar/boss_gatewatcher_gyrokill.cpp
index 3ec963d4131..50f44a7816a 100644
--- a/src/server/scripts/Outland/TempestKeep/Mechanar/boss_gatewatcher_gyrokill.cpp
+++ b/src/server/scripts/Outland/TempestKeep/Mechanar/boss_gatewatcher_gyrokill.cpp
@@ -68,8 +68,8 @@ class boss_gatewatcher_gyrokill : public CreatureScript
             void JustEngagedWith(Unit* /*who*/) override
             {
                 _JustEngagedWith();
-                events.ScheduleEvent(EVENT_STREAM_OF_MACHINE_FLUID, 10000);
-                events.ScheduleEvent(EVENT_SAW_BLADE, 20000);
+                events.ScheduleEvent(EVENT_STREAM_OF_MACHINE_FLUID, 10s);
+                events.ScheduleEvent(EVENT_SAW_BLADE, 20s);
                 events.ScheduleEvent(EVENT_SHADOW_POWER, 25000);
                 Talk(SAY_AGGRO);
             }
@@ -95,16 +95,16 @@ class boss_gatewatcher_gyrokill : public CreatureScript
                     {
                         case EVENT_STREAM_OF_MACHINE_FLUID:
                             DoCastVictim(SPELL_STREAM_OF_MACHINE_FLUID, true);
-                            events.ScheduleEvent(EVENT_STREAM_OF_MACHINE_FLUID, urand(13000, 17000));
+                            events.ScheduleEvent(EVENT_STREAM_OF_MACHINE_FLUID, 13s, 17s);
                             break;
                         case EVENT_SAW_BLADE:
                             DoCast(me, SPELL_SAW_BLADE);
                             Talk(SAY_SAW_BLADEs);
-                            events.ScheduleEvent(EVENT_SAW_BLADE, urand(20000, 30000));
+                            events.ScheduleEvent(EVENT_SAW_BLADE, 20s, 30s);
                             break;
                         case EVENT_SHADOW_POWER:
                             DoCast(me, SPELL_SHADOW_POWER);
-                            events.ScheduleEvent(EVENT_SAW_BLADE, urand(25000, 35000));
+                            events.ScheduleEvent(EVENT_SAW_BLADE, 25s, 35s);
                             break;
                         default:
                             break;
diff --git a/src/server/scripts/Outland/TempestKeep/Mechanar/boss_gatewatcher_ironhand.cpp b/src/server/scripts/Outland/TempestKeep/Mechanar/boss_gatewatcher_ironhand.cpp
index 584706c13ba..fc5a0243cf4 100644
--- a/src/server/scripts/Outland/TempestKeep/Mechanar/boss_gatewatcher_ironhand.cpp
+++ b/src/server/scripts/Outland/TempestKeep/Mechanar/boss_gatewatcher_ironhand.cpp
@@ -99,7 +99,7 @@ class boss_gatewatcher_iron_hand : public CreatureScript
                     {
                         case EVENT_STREAM_OF_MACHINE_FLUID:
                             DoCastVictim(SPELL_STREAM_OF_MACHINE_FLUID, true);
-                            events.ScheduleEvent(EVENT_STREAM_OF_MACHINE_FLUID, urand(35000, 50000));
+                            events.ScheduleEvent(EVENT_STREAM_OF_MACHINE_FLUID, 35s, 50s);
                             break;
                         case EVENT_JACKHAMMER:
                             Talk(EMOTE_HAMMER);
@@ -107,11 +107,11 @@ class boss_gatewatcher_iron_hand : public CreatureScript
                             DoCastVictim(SPELL_JACKHAMMER, true);
                             if (roll_chance_i(50))
                                 Talk(SAY_HAMMER);
-                            events.ScheduleEvent(EVENT_JACKHAMMER, 30000);
+                            events.ScheduleEvent(EVENT_JACKHAMMER, 30s);
                             break;
                         case EVENT_SHADOW_POWER:
                             DoCast(me, SPELL_SHADOW_POWER);
-                            events.ScheduleEvent(EVENT_SHADOW_POWER, urand(20000, 28000));
+                            events.ScheduleEvent(EVENT_SHADOW_POWER, 20s, 28s);
                             break;
                         default:
                             break;
diff --git a/src/server/scripts/Outland/TempestKeep/Mechanar/boss_mechano_lord_capacitus.cpp b/src/server/scripts/Outland/TempestKeep/Mechanar/boss_mechano_lord_capacitus.cpp
index c8f1a3666aa..81e61522f29 100644
--- a/src/server/scripts/Outland/TempestKeep/Mechanar/boss_mechano_lord_capacitus.cpp
+++ b/src/server/scripts/Outland/TempestKeep/Mechanar/boss_mechano_lord_capacitus.cpp
@@ -80,13 +80,13 @@ class boss_mechano_lord_capacitus : public CreatureScript
             {
                 _JustEngagedWith();
                 Talk(YELL_AGGRO);
-                events.ScheduleEvent(EVENT_HEADCRACK, 10 * IN_MILLISECONDS);
-                events.ScheduleEvent(EVENT_REFLECTIVE_DAMAGE_SHIELD, 15 * IN_MILLISECONDS);
-                events.ScheduleEvent(EVENT_SUMMON_NETHER_CHARGE, 10 * IN_MILLISECONDS);
-                events.ScheduleEvent(EVENT_BERSERK, 3 * MINUTE * IN_MILLISECONDS);
+                events.ScheduleEvent(EVENT_HEADCRACK, 10s);
+                events.ScheduleEvent(EVENT_REFLECTIVE_DAMAGE_SHIELD, 15s);
+                events.ScheduleEvent(EVENT_SUMMON_NETHER_CHARGE, 10s);
+                events.ScheduleEvent(EVENT_BERSERK, 3min);
 
                 if (IsHeroic())
-                    events.ScheduleEvent(EVENT_POSITIVE_SHIFT, 15 * IN_MILLISECONDS);
+                    events.ScheduleEvent(EVENT_POSITIVE_SHIFT, 15s);
             }
 
             void KilledUnit(Unit* /*victim*/) override
@@ -116,27 +116,27 @@ class boss_mechano_lord_capacitus : public CreatureScript
                     {
                         case EVENT_HEADCRACK:
                             DoCastVictim(SPELL_HEADCRACK);
-                            events.ScheduleEvent(EVENT_HEADCRACK, 10 * IN_MILLISECONDS);
+                            events.ScheduleEvent(EVENT_HEADCRACK, 10s);
                             break;
                         case EVENT_REFLECTIVE_DAMAGE_SHIELD:
                             Talk(YELL_REFLECTIVE_DAMAGE_SHIELD);
                             DoCast(me, SPELL_REFLECTIVE_DAMAGE_SHIELD);
-                            events.ScheduleEvent(EVENT_REFLECTIVE_MAGIE_SHIELD, 30 * IN_MILLISECONDS);
+                            events.ScheduleEvent(EVENT_REFLECTIVE_MAGIE_SHIELD, 30s);
                             break;
                         case EVENT_REFLECTIVE_MAGIE_SHIELD:
                             Talk(YELL_REFLECTIVE_MAGIC_SHIELD);
                             DoCast(me, SPELL_REFLECTIVE_MAGIC_SHIELD);
-                            events.ScheduleEvent(EVENT_REFLECTIVE_DAMAGE_SHIELD, 30 * IN_MILLISECONDS);
+                            events.ScheduleEvent(EVENT_REFLECTIVE_DAMAGE_SHIELD, 30s);
                             break;
                         case EVENT_POSITIVE_SHIFT:
                             DoCastAOE(SPELL_POLARITY_SHIFT);
-                            events.ScheduleEvent(EVENT_POSITIVE_SHIFT, urand(45, 60) * IN_MILLISECONDS);
+                            events.ScheduleEvent(EVENT_POSITIVE_SHIFT, 45s, 60s);
                             break;
                         case EVENT_SUMMON_NETHER_CHARGE:
                         {
                             Position pos = me->GetRandomNearPosition(5.0f);
                             me->SummonCreature(NPC_NETHER_CHARGE, pos, TEMPSUMMON_TIMED_DESPAWN, 18000);
-                            events.ScheduleEvent(EVENT_SUMMON_NETHER_CHARGE, 10 * IN_MILLISECONDS);
+                            events.ScheduleEvent(EVENT_SUMMON_NETHER_CHARGE, 10s);
                             break;
                         }
                         case EVENT_BERSERK:
diff --git a/src/server/scripts/Outland/TempestKeep/Mechanar/boss_nethermancer_sepethrea.cpp b/src/server/scripts/Outland/TempestKeep/Mechanar/boss_nethermancer_sepethrea.cpp
index e364704c588..a797348fe32 100644
--- a/src/server/scripts/Outland/TempestKeep/Mechanar/boss_nethermancer_sepethrea.cpp
+++ b/src/server/scripts/Outland/TempestKeep/Mechanar/boss_nethermancer_sepethrea.cpp
@@ -72,11 +72,11 @@ class boss_nethermancer_sepethrea : public CreatureScript
             void JustEngagedWith(Unit* who) override
             {
                 _JustEngagedWith();
-                events.ScheduleEvent(EVENT_FROST_ATTACK, urand(7000, 10000));
-                events.ScheduleEvent(EVENT_ARCANE_BLAST, urand(12000, 18000));
-                events.ScheduleEvent(EVENT_DRAGONS_BREATH, urand(18000, 22000));
-                events.ScheduleEvent(EVENT_KNOCKBACK, urand(22000, 28000));
-                events.ScheduleEvent(EVENT_SOLARBURN, 30000);
+                events.ScheduleEvent(EVENT_FROST_ATTACK, 7s, 10s);
+                events.ScheduleEvent(EVENT_ARCANE_BLAST, 12s, 18s);
+                events.ScheduleEvent(EVENT_DRAGONS_BREATH, 18s, 22s);
+                events.ScheduleEvent(EVENT_KNOCKBACK, 22s, 28s);
+                events.ScheduleEvent(EVENT_SOLARBURN, 30s);
                 Talk(SAY_AGGRO);
                 DoCast(who, SPELL_SUMMON_RAGIN_FLAMES);
                 Talk(SAY_SUMMON);
@@ -109,7 +109,7 @@ class boss_nethermancer_sepethrea : public CreatureScript
                     {
                         case EVENT_FROST_ATTACK:
                             DoCastVictim(SPELL_FROST_ATTACK, true);
-                            events.ScheduleEvent(EVENT_FROST_ATTACK, urand(7000, 10000));
+                            events.ScheduleEvent(EVENT_FROST_ATTACK, 7s, 10s);
                             break;
                         case EVENT_ARCANE_BLAST:
                             DoCastVictim(SPELL_ARCANE_BLAST, true);
@@ -117,17 +117,17 @@ class boss_nethermancer_sepethrea : public CreatureScript
                             break;
                         case EVENT_DRAGONS_BREATH:
                             DoCastVictim(SPELL_DRAGONS_BREATH, true);
-                            events.ScheduleEvent(EVENT_DRAGONS_BREATH, urand(12000, 22000));
+                            events.ScheduleEvent(EVENT_DRAGONS_BREATH, 12s, 22s);
                             if (roll_chance_i(50))
                                 Talk(SAY_DRAGONS_BREATH);
                             break;
                         case EVENT_KNOCKBACK:
                             DoCastVictim(SPELL_KNOCKBACK, true);
-                            events.ScheduleEvent(EVENT_KNOCKBACK, urand(15000, 25000));
+                            events.ScheduleEvent(EVENT_KNOCKBACK, 15s, 25s);
                             break;
                         case EVENT_SOLARBURN:
                             DoCastVictim(SPELL_SOLARBURN, true);
-                            events.ScheduleEvent(EVENT_SOLARBURN, 30000);
+                            events.ScheduleEvent(EVENT_SOLARBURN, 30s);
                             break;
                         default:
                             break;
diff --git a/src/server/scripts/Outland/TempestKeep/Mechanar/boss_pathaleon_the_calculator.cpp b/src/server/scripts/Outland/TempestKeep/Mechanar/boss_pathaleon_the_calculator.cpp
index d7767be345f..11b0548b7ce 100644
--- a/src/server/scripts/Outland/TempestKeep/Mechanar/boss_pathaleon_the_calculator.cpp
+++ b/src/server/scripts/Outland/TempestKeep/Mechanar/boss_pathaleon_the_calculator.cpp
@@ -79,11 +79,11 @@ class boss_pathaleon_the_calculator : public CreatureScript
             void JustEngagedWith(Unit* /*who*/) override
             {
                 _JustEngagedWith();
-                events.ScheduleEvent(EVENT_SUMMON, 30000);
-                events.ScheduleEvent(EVENT_MANA_TAP, urand(12000, 20000));
-                events.ScheduleEvent(EVENT_ARCANE_TORRENT, urand(16000, 25000));
-                events.ScheduleEvent(EVENT_DOMINATION, urand(25000, 40000));
-                events.ScheduleEvent(EVENT_ARCANE_EXPLOSION, urand(8000, 13000));
+                events.ScheduleEvent(EVENT_SUMMON, 30s);
+                events.ScheduleEvent(EVENT_MANA_TAP, 12s, 20s);
+                events.ScheduleEvent(EVENT_ARCANE_TORRENT, 16s, 25s);
+                events.ScheduleEvent(EVENT_DOMINATION, 25s, 40s);
+                events.ScheduleEvent(EVENT_ARCANE_EXPLOSION, 8s, 13s);
                 Talk(SAY_AGGRO);
             }
 
@@ -131,24 +131,24 @@ class boss_pathaleon_the_calculator : public CreatureScript
                                 }
                             }
                             Talk(SAY_SUMMON);
-                            events.ScheduleEvent(EVENT_SUMMON, urand(30000, 45000));
+                            events.ScheduleEvent(EVENT_SUMMON, 30s, 45s);
                             break;
                         case EVENT_MANA_TAP:
                             DoCastVictim(SPELL_MANA_TAP, true);
-                            events.ScheduleEvent(EVENT_MANA_TAP, urand(14000, 22000));
+                            events.ScheduleEvent(EVENT_MANA_TAP, 14s, 22s);
                             break;
                         case EVENT_ARCANE_TORRENT:
                             DoCastVictim(SPELL_ARCANE_TORRENT, true);
-                            events.ScheduleEvent(EVENT_ARCANE_TORRENT, urand(12000, 18000));
+                            events.ScheduleEvent(EVENT_ARCANE_TORRENT, 12s, 18s);
                             break;
                         case EVENT_DOMINATION:
                             Talk(SAY_DOMINATION);
                             DoCastVictim(SPELL_DOMINATION, true);
-                            events.ScheduleEvent(EVENT_DOMINATION, urand(25000, 30000));
+                            events.ScheduleEvent(EVENT_DOMINATION, 25s, 30s);
                             break;
                         case EVENT_ARCANE_EXPLOSION: // Heroic only
                             DoCastVictim(H_SPELL_ARCANE_EXPLOSION, true);
-                            events.ScheduleEvent(EVENT_ARCANE_EXPLOSION, urand(10000, 14000));
+                            events.ScheduleEvent(EVENT_ARCANE_EXPLOSION, 10s, 14s);
                             break;
                         default:
                             break;
diff --git a/src/server/scripts/Outland/TempestKeep/arcatraz/boss_dalliah_the_doomsayer.cpp b/src/server/scripts/Outland/TempestKeep/arcatraz/boss_dalliah_the_doomsayer.cpp
index dce22c470b2..9d820af9c68 100644
--- a/src/server/scripts/Outland/TempestKeep/arcatraz/boss_dalliah_the_doomsayer.cpp
+++ b/src/server/scripts/Outland/TempestKeep/arcatraz/boss_dalliah_the_doomsayer.cpp
@@ -87,11 +87,11 @@ class boss_dalliah_the_doomsayer : public CreatureScript
             void JustEngagedWith(Unit* /*who*/) override
             {
                 _JustEngagedWith();
-                events.ScheduleEvent(EVENT_GIFT_OF_THE_DOOMSAYER, urand(1000, 4000));
-                events.ScheduleEvent(EVENT_WHIRLWIND, urand(7000, 9000));
+                events.ScheduleEvent(EVENT_GIFT_OF_THE_DOOMSAYER, 1s, 4s);
+                events.ScheduleEvent(EVENT_WHIRLWIND, 7s, 9s);
                 if (IsHeroic())
-                    events.ScheduleEvent(EVENT_SHADOW_WAVE, urand(11000, 16000));
-                events.ScheduleEvent(EVENT_ME_FIRST, 6000);
+                    events.ScheduleEvent(EVENT_SHADOW_WAVE, 11s, 16s);
+                events.ScheduleEvent(EVENT_ME_FIRST, 6s);
                 Talk(SAY_AGGRO);
             }
 
@@ -105,7 +105,7 @@ class boss_dalliah_the_doomsayer : public CreatureScript
                 switch (data)
                 {
                     case 1:
-                        events.ScheduleEvent(EVENT_SOCCOTHRATES_DEATH, 6000);
+                        events.ScheduleEvent(EVENT_SOCCOTHRATES_DEATH, 6s);
                         soccothratesDeath = true;
                         break;
                     default:
@@ -148,13 +148,13 @@ class boss_dalliah_the_doomsayer : public CreatureScript
                     {
                         case EVENT_GIFT_OF_THE_DOOMSAYER:
                             DoCastVictim(SPELL_GIFT_OF_THE_DOOMSAYER, true);
-                            events.ScheduleEvent(EVENT_GIFT_OF_THE_DOOMSAYER, urand(16000, 21000));
+                            events.ScheduleEvent(EVENT_GIFT_OF_THE_DOOMSAYER, 16s, 21s);
                             break;
                         case EVENT_WHIRLWIND:
                             DoCast(me, SPELL_WHIRLWIND);
                             Talk(SAY_WHIRLWIND);
-                            events.ScheduleEvent(EVENT_WHIRLWIND, urand(19000, 21000));
-                            events.ScheduleEvent(EVENT_HEAL, 6000);
+                            events.ScheduleEvent(EVENT_WHIRLWIND, 19s, 21s);
+                            events.ScheduleEvent(EVENT_HEAL, 6s);
                             break;
                         case EVENT_HEAL:
                             DoCast(me, SPELL_HEAL);
@@ -162,7 +162,7 @@ class boss_dalliah_the_doomsayer : public CreatureScript
                             break;
                         case EVENT_SHADOW_WAVE:
                             DoCastVictim(SPELL_SHADOW_WAVE, true);
-                            events.ScheduleEvent(EVENT_SHADOW_WAVE, urand(11000, 16000));
+                            events.ScheduleEvent(EVENT_SHADOW_WAVE, 11s, 16s);
                             break;
                         case EVENT_ME_FIRST:
                             if (Creature* soccothrates = ObjectAccessor::GetCreature(*me, instance->GetGuidData(DATA_SOCCOTHRATES)))
diff --git a/src/server/scripts/Outland/TempestKeep/arcatraz/boss_wrath_scryer_soccothrates.cpp b/src/server/scripts/Outland/TempestKeep/arcatraz/boss_wrath_scryer_soccothrates.cpp
index 812ca3e1132..49dd986d5a8 100644
--- a/src/server/scripts/Outland/TempestKeep/arcatraz/boss_wrath_scryer_soccothrates.cpp
+++ b/src/server/scripts/Outland/TempestKeep/arcatraz/boss_wrath_scryer_soccothrates.cpp
@@ -114,9 +114,9 @@ class boss_wrath_scryer_soccothrates : public CreatureScript
             void JustEngagedWith(Unit* /*who*/) override
             {
                 _JustEngagedWith();
-                events.ScheduleEvent(EVENT_FELFIRE_SHOCK, urand(12000, 14000));
-                events.ScheduleEvent(EVENT_KNOCK_AWAY, urand(11000, 12000));
-                events.ScheduleEvent(EVENT_ME_FIRST, 6000);
+                events.ScheduleEvent(EVENT_FELFIRE_SHOCK, 12s, 14s);
+                events.ScheduleEvent(EVENT_KNOCK_AWAY, 11s, 12s);
+                events.ScheduleEvent(EVENT_ME_FIRST, 6s);
                 Talk(SAY_AGGRO);
                 preFight = false;
             }
@@ -143,7 +143,7 @@ class boss_wrath_scryer_soccothrates : public CreatureScript
                 switch (data)
                 {
                     case 1:
-                        events.ScheduleEvent(EVENT_DALLIAH_DEATH, 6000);
+                        events.ScheduleEvent(EVENT_DALLIAH_DEATH, 6s);
                         dalliahDeath = true;
                         break;
                     default:
@@ -246,12 +246,12 @@ class boss_wrath_scryer_soccothrates : public CreatureScript
                     {
                         case EVENT_FELFIRE_SHOCK:
                             DoCastVictim(SPELL_FELFIRE_SHOCK, true);
-                            events.ScheduleEvent(EVENT_FELFIRE_SHOCK, urand(12000, 14000));
+                            events.ScheduleEvent(EVENT_FELFIRE_SHOCK, 12s, 14s);
                             break;
                         case EVENT_KNOCK_AWAY:
                             DoCast(me, SPELL_KNOCK_AWAY);
                             Talk(SAY_KNOCK_AWAY);
-                            events.ScheduleEvent(EVENT_KNOCK_AWAY, urand(11000, 12000));
+                            events.ScheduleEvent(EVENT_KNOCK_AWAY, 11s, 12s);
                             break;
                         case EVENT_ME_FIRST:
                             if (Creature* dalliah = ObjectAccessor::GetCreature(*me, instance->GetGuidData(DATA_DALLIAH)))
diff --git a/src/server/scripts/Outland/TempestKeep/arcatraz/boss_zereketh_the_unbound.cpp b/src/server/scripts/Outland/TempestKeep/arcatraz/boss_zereketh_the_unbound.cpp
index b51224570b8..042e8ccf577 100644
--- a/src/server/scripts/Outland/TempestKeep/arcatraz/boss_zereketh_the_unbound.cpp
+++ b/src/server/scripts/Outland/TempestKeep/arcatraz/boss_zereketh_the_unbound.cpp
@@ -66,7 +66,7 @@ class boss_zereketh_the_unbound : public CreatureScript
                 _JustEngagedWith();
                 events.ScheduleEvent(EVENT_VOID_ZONE, urand (6000, 10000));
                 events.ScheduleEvent(EVENT_SHADOW_NOVA, urand (6000, 10000));
-                events.ScheduleEvent(EVENT_SEED_OF_CORRUPTION, urand(12000, 20000));
+                events.ScheduleEvent(EVENT_SEED_OF_CORRUPTION, 12s, 20s);
                 Talk(SAY_AGGRO);
             }
 
@@ -102,7 +102,7 @@ class boss_zereketh_the_unbound : public CreatureScript
                         case EVENT_SEED_OF_CORRUPTION:
                             if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 1, 100, true))
                                 DoCast(target, SPELL_SEED_OF_CORRUPTION);
-                            events.ScheduleEvent(EVENT_SEED_OF_CORRUPTION, urand(12000, 20000));
+                            events.ScheduleEvent(EVENT_SEED_OF_CORRUPTION, 12s, 20s);
                             break;
                         default:
                             break;
diff --git a/src/server/scripts/Outland/TempestKeep/botanica/boss_thorngrin_the_tender.cpp b/src/server/scripts/Outland/TempestKeep/botanica/boss_thorngrin_the_tender.cpp
index 5bea3017ffa..b22be14450b 100644
--- a/src/server/scripts/Outland/TempestKeep/botanica/boss_thorngrin_the_tender.cpp
+++ b/src/server/scripts/Outland/TempestKeep/botanica/boss_thorngrin_the_tender.cpp
@@ -72,9 +72,9 @@ class boss_thorngrin_the_tender : public CreatureScript
             {
                 _JustEngagedWith();
                 Talk(SAY_AGGRO);
-                events.ScheduleEvent(EVENT_SACRIFICE, 5700);
+                events.ScheduleEvent(EVENT_SACRIFICE, 5700ms);
                 events.ScheduleEvent(EVENT_HELLFIRE, IsHeroic() ? urand(17400, 19300) : 18000);
-                events.ScheduleEvent(EVENT_ENRAGE, 12000);
+                events.ScheduleEvent(EVENT_ENRAGE, 12s);
             }
 
             void KilledUnit(Unit* /*victim*/) override
@@ -132,7 +132,7 @@ class boss_thorngrin_the_tender : public CreatureScript
                         case EVENT_ENRAGE:
                             Talk(EMOTE_ENRAGE);
                             DoCast(me, SPELL_ENRAGE);
-                            events.ScheduleEvent(EVENT_ENRAGE, 33000);
+                            events.ScheduleEvent(EVENT_ENRAGE, 33s);
                             break;
                         default:
                             break;
diff --git a/src/server/scripts/Outland/boss_doomlord_kazzak.cpp b/src/server/scripts/Outland/boss_doomlord_kazzak.cpp
index d0ac2fce4ba..86ceb87b1aa 100644
--- a/src/server/scripts/Outland/boss_doomlord_kazzak.cpp
+++ b/src/server/scripts/Outland/boss_doomlord_kazzak.cpp
@@ -73,14 +73,14 @@ class boss_doomlord_kazzak : public CreatureScript
             void Reset() override
             {
                 _events.Reset();
-                _events.ScheduleEvent(EVENT_SHADOW_VOLLEY, urand(6000, 10000));
-                _events.ScheduleEvent(EVENT_CLEAVE, 7000);
-                _events.ScheduleEvent(EVENT_THUNDERCLAP, urand(14000, 18000));
-                _events.ScheduleEvent(EVENT_VOID_BOLT, 30000);
+                _events.ScheduleEvent(EVENT_SHADOW_VOLLEY, 6s, 10s);
+                _events.ScheduleEvent(EVENT_CLEAVE, 7s);
+                _events.ScheduleEvent(EVENT_THUNDERCLAP, 14s, 18s);
+                _events.ScheduleEvent(EVENT_VOID_BOLT, 30s);
                 _events.ScheduleEvent(EVENT_MARK_OF_KAZZAK, 25000);
-                _events.ScheduleEvent(EVENT_ENRAGE, 60000);
-                _events.ScheduleEvent(EVENT_TWISTED_REFLECTION, 33000);
-                _events.ScheduleEvent(EVENT_BERSERK, 180000);
+                _events.ScheduleEvent(EVENT_ENRAGE, 1min);
+                _events.ScheduleEvent(EVENT_TWISTED_REFLECTION, 33s);
+                _events.ScheduleEvent(EVENT_BERSERK, 3min);
             }
 
             void JustAppeared() override
@@ -126,29 +126,29 @@ class boss_doomlord_kazzak : public CreatureScript
                     {
                         case EVENT_SHADOW_VOLLEY:
                             DoCastVictim(SPELL_SHADOW_VOLLEY);
-                            _events.ScheduleEvent(EVENT_SHADOW_VOLLEY, urand(4000, 6000));
+                            _events.ScheduleEvent(EVENT_SHADOW_VOLLEY, 4s, 6s);
                             break;
                         case EVENT_CLEAVE:
                             DoCastVictim(SPELL_CLEAVE);
-                            _events.ScheduleEvent(EVENT_CLEAVE, urand(8000, 12000));
+                            _events.ScheduleEvent(EVENT_CLEAVE, 8s, 12s);
                             break;
                         case EVENT_THUNDERCLAP:
                             DoCastVictim(SPELL_THUNDERCLAP);
-                            _events.ScheduleEvent(EVENT_THUNDERCLAP, urand(10000, 14000));
+                            _events.ScheduleEvent(EVENT_THUNDERCLAP, 10s, 14s);
                             break;
                         case EVENT_VOID_BOLT:
                             DoCastVictim(SPELL_VOID_BOLT);
-                            _events.ScheduleEvent(EVENT_VOID_BOLT, urand(15000, 18000));
+                            _events.ScheduleEvent(EVENT_VOID_BOLT, 15s, 18s);
                             break;
                         case EVENT_MARK_OF_KAZZAK:
                             if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0, 0.0f, true))
                                 DoCast(target, SPELL_MARK_OF_KAZZAK);
-                            _events.ScheduleEvent(EVENT_MARK_OF_KAZZAK, 20000);
+                            _events.ScheduleEvent(EVENT_MARK_OF_KAZZAK, 20s);
                             break;
                         case EVENT_ENRAGE:
                             Talk(EMOTE_FRENZY);
                             DoCast(me, SPELL_ENRAGE);
-                            _events.ScheduleEvent(EVENT_ENRAGE, 30000);
+                            _events.ScheduleEvent(EVENT_ENRAGE, 30s);
                             break;
                         case EVENT_TWISTED_REFLECTION:
                             if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0, 0.0f, true))
diff --git a/src/server/scripts/Outland/boss_doomwalker.cpp b/src/server/scripts/Outland/boss_doomwalker.cpp
index c9a025db8ef..5704c219e74 100644
--- a/src/server/scripts/Outland/boss_doomwalker.cpp
+++ b/src/server/scripts/Outland/boss_doomwalker.cpp
@@ -69,10 +69,10 @@ class boss_doomwalker : public CreatureScript
             {
                 _events.Reset();
                 _events.ScheduleEvent(EVENT_ENRAGE, 0);
-                _events.ScheduleEvent(EVENT_ARMOR, urand(5000, 13000));
-                _events.ScheduleEvent(EVENT_CHAIN, urand(10000, 30000));
-                _events.ScheduleEvent(EVENT_QUAKE, urand(25000, 35000));
-                _events.ScheduleEvent(EVENT_OVERRUN, urand(30000, 45000));
+                _events.ScheduleEvent(EVENT_ARMOR, 5s, 13s);
+                _events.ScheduleEvent(EVENT_CHAIN, 10s, 30s);
+                _events.ScheduleEvent(EVENT_QUAKE, 25s, 35s);
+                _events.ScheduleEvent(EVENT_OVERRUN, 30s, 45s);
                 Initialize();
             }
 
@@ -122,14 +122,14 @@ class boss_doomwalker : public CreatureScript
                             if (!HealthAbovePct(20))
                             {
                                 DoCast(me, SPELL_ENRAGE);
-                                _events.ScheduleEvent(EVENT_ENRAGE, 6000);
+                                _events.ScheduleEvent(EVENT_ENRAGE, 6s);
                                 _inEnrage = true;
                             }
                             break;
                         case EVENT_OVERRUN:
                             Talk(SAY_OVERRUN);
                             DoCastVictim(SPELL_OVERRUN);
-                            _events.ScheduleEvent(EVENT_OVERRUN, urand(25000, 40000));
+                            _events.ScheduleEvent(EVENT_OVERRUN, 25s, 40s);
                             break;
                         case EVENT_QUAKE:
                             if (urand(0, 1))
@@ -142,16 +142,16 @@ class boss_doomwalker : public CreatureScript
                                 me->RemoveAurasDueToSpell(SPELL_ENRAGE);
 
                             DoCast(me, SPELL_EARTHQUAKE);
-                            _events.ScheduleEvent(EVENT_QUAKE, urand(30000, 55000));
+                            _events.ScheduleEvent(EVENT_QUAKE, 30s, 55s);
                             break;
                         case EVENT_CHAIN:
                             if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 1, 0.0f, true))
                                 DoCast(target, SPELL_CHAIN_LIGHTNING);
-                            _events.ScheduleEvent(EVENT_CHAIN, urand(7000, 27000));
+                            _events.ScheduleEvent(EVENT_CHAIN, 7s, 27s);
                             break;
                         case EVENT_ARMOR:
                             DoCastVictim(SPELL_SUNDER_ARMOR);
-                            _events.ScheduleEvent(EVENT_ARMOR, urand(10000, 25000));
+                            _events.ScheduleEvent(EVENT_ARMOR, 10s, 25s);
                             break;
                         default:
                             break;
diff --git a/src/server/scripts/Outland/zone_blades_edge_mountains.cpp b/src/server/scripts/Outland/zone_blades_edge_mountains.cpp
index e1f83c14440..2d591f4d00b 100644
--- a/src/server/scripts/Outland/zone_blades_edge_mountains.cpp
+++ b/src/server/scripts/Outland/zone_blades_edge_mountains.cpp
@@ -461,18 +461,18 @@ class npc_simon_bunny : public CreatureScript
                         if (!CheckPlayer())
                             ResetNode();
                         else
-                            _events.ScheduleEvent(EVENT_SIMON_PERIODIC_PLAYER_CHECK, 2000);
+                            _events.ScheduleEvent(EVENT_SIMON_PERIODIC_PLAYER_CHECK, 2s);
                         break;
                     case EVENT_SIMON_SETUP_PRE_GAME:
                         SetUpPreGame();
                         _events.CancelEvent(EVENT_SIMON_GAME_TICK);
-                        _events.ScheduleEvent(EVENT_SIMON_PLAY_SEQUENCE, 1000);
+                        _events.ScheduleEvent(EVENT_SIMON_PLAY_SEQUENCE, 1s);
                         break;
                     case EVENT_SIMON_PLAY_SEQUENCE:
                         if (!playableSequence.empty())
                         {
                             PlayNextColor();
-                            _events.ScheduleEvent(EVENT_SIMON_PLAY_SEQUENCE, 1500);
+                            _events.ScheduleEvent(EVENT_SIMON_PLAY_SEQUENCE, 1500ms);
                         }
                         else
                         {
@@ -481,16 +481,16 @@ class npc_simon_bunny : public CreatureScript
                             playerSequence.clear();
                             PrepareClusters();
                             gameTicks = 0;
-                            _events.ScheduleEvent(EVENT_SIMON_GAME_TICK, 3000);
+                            _events.ScheduleEvent(EVENT_SIMON_GAME_TICK, 3s);
                         }
                         break;
                     case EVENT_SIMON_GAME_TICK:
                         DoCast(SPELL_AUDIBLE_GAME_TICK);
 
                         if (gameTicks > gameLevel)
-                            _events.ScheduleEvent(EVENT_SIMON_TOO_LONG_TIME, 500);
+                            _events.ScheduleEvent(EVENT_SIMON_TOO_LONG_TIME, 500ms);
                         else
-                            _events.ScheduleEvent(EVENT_SIMON_GAME_TICK, 3000);
+                            _events.ScheduleEvent(EVENT_SIMON_GAME_TICK, 3s);
                         gameTicks++;
                         break;
                     case EVENT_SIMON_RESET_CLUSTERS:
@@ -517,7 +517,7 @@ class npc_simon_bunny : public CreatureScript
                         if (gameLevel == 10)
                             ResetNode();
                         else
-                            _events.ScheduleEvent(EVENT_SIMON_SETUP_PRE_GAME, 1000);
+                            _events.ScheduleEvent(EVENT_SIMON_SETUP_PRE_GAME, 1s);
                         break;
                     case ACTION_SIMON_CORRECT_FULL_SEQUENCE:
                         gameLevel++;
@@ -549,7 +549,7 @@ class npc_simon_bunny : public CreatureScript
 
                 PlayColor(pressedColor);
                 playerSequence.push_back(pressedColor);
-                _events.ScheduleEvent(EVENT_SIMON_RESET_CLUSTERS, 500);
+                _events.ScheduleEvent(EVENT_SIMON_RESET_CLUSTERS, 500ms);
                 CheckPlayerSequence();
             }
 
@@ -636,8 +636,8 @@ class npc_simon_bunny : public CreatureScript
                 }
 
                 _events.Reset();
-                _events.ScheduleEvent(EVENT_SIMON_ROUND_FINISHED, 1000);
-                _events.ScheduleEvent(EVENT_SIMON_PERIODIC_PLAYER_CHECK, 2000);
+                _events.ScheduleEvent(EVENT_SIMON_ROUND_FINISHED, 1s);
+                _events.ScheduleEvent(EVENT_SIMON_PERIODIC_PLAYER_CHECK, 2s);
 
                 if (GameObject* relic = me->FindNearestGameObject(large ? GO_APEXIS_MONUMENT : GO_APEXIS_RELIC, searchDistance))
                     relic->SetFlag(GAMEOBJECT_FLAGS, GO_FLAG_NOT_SELECTABLE);
diff --git a/src/server/scripts/Outland/zone_hellfire_peninsula.cpp b/src/server/scripts/Outland/zone_hellfire_peninsula.cpp
index f483322b925..31f0dcf6d49 100644
--- a/src/server/scripts/Outland/zone_hellfire_peninsula.cpp
+++ b/src/server/scripts/Outland/zone_hellfire_peninsula.cpp
@@ -358,7 +358,7 @@ public:
         void Initialize()
         {
             helboarGUID.Clear();
-            _events.ScheduleEvent(EVENT_SEARCH_HELBOAR, Seconds(3));
+            _events.ScheduleEvent(EVENT_SEARCH_HELBOAR, 3s);
         }
 
         void Reset() override
@@ -376,7 +376,7 @@ public:
                 _events.CancelEvent(EVENT_SEARCH_HELBOAR);
                 me->HandleEmoteCommand(EMOTE_ONESHOT_ATTACK_UNARMED);
                 me->CastSpell(helboar, SPELL_FAKE_BLOOD);
-                _events.ScheduleEvent(EVENT_HELBOAR_FOUND, Seconds(2));
+                _events.ScheduleEvent(EVENT_HELBOAR_FOUND, 2s);
             }
         }
 
@@ -406,18 +406,18 @@ public:
                         {
                             me->HandleEmoteCommand(EMOTE_ONESHOT_ATTACK_UNARMED);
                             me->CastSpell(helboar, SPELL_FAKE_BLOOD);
-                            _events.ScheduleEvent(EVENT_SUMMON_POO, Seconds(1));
+                            _events.ScheduleEvent(EVENT_SUMMON_POO, 1s);
                         }
                         break;
                     case EVENT_SUMMON_POO:
                         DoCast(SPELL_SUMMON_POO);
-                        _events.ScheduleEvent(EVENT_FOLLOW_PLAYER, Seconds(2));
+                        _events.ScheduleEvent(EVENT_FOLLOW_PLAYER, 2s);
                         break;
                     case EVENT_FOLLOW_PLAYER:
                         me->SetWalk(false);
                         if (Player* owner = me->GetCharmerOrOwnerPlayerOrPlayerItself())
                             me->GetMotionMaster()->MoveFollow(owner, 0.0f, 0.0f);
-                        _events.ScheduleEvent(EVENT_SEARCH_HELBOAR, Seconds(3));
+                        _events.ScheduleEvent(EVENT_SEARCH_HELBOAR, 3s);
                         break;
                 }
             }
@@ -557,7 +557,7 @@ public:
 
                 success = false;
 
-                events.ScheduleEvent(EVENT_SUMMON_SKULL, 10000);
+                events.ScheduleEvent(EVENT_SUMMON_SKULL, 10s);
                 break;
             case ACTION_JULES_FLIGHT:
                 me->RemoveAura(SPELL_JULES_GOES_PRONE);
@@ -626,7 +626,7 @@ public:
                     for (uint8 i = 0; i < summonCount; i++)
                         me->SummonCreature(NPC_DARKNESS_RELEASED, me->GetPositionX(), me->GetPositionY(), me->GetPositionZ() + 1.5f, 0, TEMPSUMMON_MANUAL_DESPAWN);
 
-                    events.ScheduleEvent(EVENT_SUMMON_SKULL, urand(10000, 15000));
+                    events.ScheduleEvent(EVENT_SUMMON_SKULL, 10s, 15s);
                     break;
                 }
             }
@@ -728,7 +728,7 @@ public:
                 me->GetMotionMaster()->MovePoint(1, exorcismPos[1]);
 
             if (id == 1)
-                events.ScheduleEvent(EVENT_BARADAS_TALK, 2000);
+                events.ScheduleEvent(EVENT_BARADAS_TALK, 2s);
         }
 
         void JustDied(Unit* /*killer*/) override
@@ -755,24 +755,24 @@ public:
                                 me->SetFacingTo(1.513286f);
 
                                 me->HandleEmoteCommand(EMOTE_ONESHOT_KNEEL);
-                                events.ScheduleEvent(EVENT_BARADAS_TALK, 3000);
+                                events.ScheduleEvent(EVENT_BARADAS_TALK, 3s);
                                 step++;
                                 break;
                             case 1:
                                 DoCast(SPELL_BARADAS_COMMAND);
-                                events.ScheduleEvent(EVENT_BARADAS_TALK, 5000);
+                                events.ScheduleEvent(EVENT_BARADAS_TALK, 5s);
                                 step++;
                                 break;
                             case 2:
                                 Talk(SAY_BARADA_3);
-                                events.ScheduleEvent(EVENT_BARADAS_TALK, 7000);
+                                events.ScheduleEvent(EVENT_BARADAS_TALK, 7s);
                                 step++;
                                 break;
                             case 3:
                                 if (Creature* jules = ObjectAccessor::GetCreature(*me, julesGUID))
                                     jules->AI()->Talk(SAY_JULES_2);
 
-                                events.ScheduleEvent(EVENT_BARADAS_TALK, 18000);
+                                events.ScheduleEvent(EVENT_BARADAS_TALK, 18s);
                                 step++;
                                 break;
                             case 4:
@@ -782,98 +782,98 @@ public:
                                 if (Creature* jules = ObjectAccessor::GetCreature(*me, julesGUID))
                                     jules->AI()->DoAction(ACTION_JULES_HOVER);
 
-                                events.ScheduleEvent(EVENT_BARADAS_TALK, 11000);
+                                events.ScheduleEvent(EVENT_BARADAS_TALK, 11s);
                                 step++;
                                 break;
                             case 5:
                                 if (Creature* jules = ObjectAccessor::GetCreature(*me, julesGUID))
                                     jules->AI()->Talk(SAY_JULES_3);
 
-                                events.ScheduleEvent(EVENT_BARADAS_TALK, 13000);
+                                events.ScheduleEvent(EVENT_BARADAS_TALK, 13s);
                                 step++;
                                 break;
                             case 6:
                                 Talk(SAY_BARADA_4);
-                                events.ScheduleEvent(EVENT_BARADAS_TALK, 5000);
+                                events.ScheduleEvent(EVENT_BARADAS_TALK, 5s);
                                 step++;
                                 break;
                             case 7:
                                 if (Creature* jules = ObjectAccessor::GetCreature(*me, julesGUID))
                                     jules->AI()->Talk(SAY_JULES_3);
 
-                                events.ScheduleEvent(EVENT_BARADAS_TALK, 13000);
+                                events.ScheduleEvent(EVENT_BARADAS_TALK, 13s);
                                 step++;
                                 break;
                             case 8:
                                 Talk(SAY_BARADA_4);
-                                events.ScheduleEvent(EVENT_BARADAS_TALK, 12000);
+                                events.ScheduleEvent(EVENT_BARADAS_TALK, 12s);
                                 step++;
                                 break;
                             case 9:
                                 if (Creature* jules = ObjectAccessor::GetCreature(*me, julesGUID))
                                     jules->AI()->Talk(SAY_JULES_4);
 
-                                events.ScheduleEvent(EVENT_BARADAS_TALK, 12000);
+                                events.ScheduleEvent(EVENT_BARADAS_TALK, 12s);
                                 step++;
                                 break;
                             case 10:
                                 Talk(SAY_BARADA_4);
-                                events.ScheduleEvent(EVENT_BARADAS_TALK, 5000);
+                                events.ScheduleEvent(EVENT_BARADAS_TALK, 5s);
                                 step++;
                                 break;
                             case 11:
                                 if (Creature* jules = ObjectAccessor::GetCreature(*me, julesGUID))
                                     jules->AI()->DoAction(ACTION_JULES_FLIGHT);
 
-                                events.ScheduleEvent(EVENT_BARADAS_TALK, 10000);
+                                events.ScheduleEvent(EVENT_BARADAS_TALK, 10s);
                                 step++;
                                 break;
                             case 12:
                                 if (Creature* jules = ObjectAccessor::GetCreature(*me, julesGUID))
                                     jules->AI()->Talk(SAY_JULES_4);
 
-                                events.ScheduleEvent(EVENT_BARADAS_TALK, 8000);
+                                events.ScheduleEvent(EVENT_BARADAS_TALK, 8s);
                                 step++;
                                 break;
                             case 13:
                                 Talk(SAY_BARADA_5);
-                                events.ScheduleEvent(EVENT_BARADAS_TALK, 10000);
+                                events.ScheduleEvent(EVENT_BARADAS_TALK, 10s);
                                 step++;
                                 break;
                             case 14:
                                 if (Creature* jules = ObjectAccessor::GetCreature(*me, julesGUID))
                                     jules->AI()->Talk(SAY_JULES_4);
 
-                                events.ScheduleEvent(EVENT_BARADAS_TALK, 10000);
+                                events.ScheduleEvent(EVENT_BARADAS_TALK, 10s);
                                 step++;
                                 break;
                             case 15:
                                 Talk(SAY_BARADA_6);
-                                events.ScheduleEvent(EVENT_BARADAS_TALK, 10000);
+                                events.ScheduleEvent(EVENT_BARADAS_TALK, 10s);
                                 step++;
                                 break;
                             case 16:
                                 if (Creature* jules = ObjectAccessor::GetCreature(*me, julesGUID))
                                     jules->AI()->Talk(SAY_JULES_5);
 
-                                events.ScheduleEvent(EVENT_BARADAS_TALK, 10000);
+                                events.ScheduleEvent(EVENT_BARADAS_TALK, 10s);
                                 step++;
                                 break;
                             case 17:
                                 Talk(SAY_BARADA_7);
-                                events.ScheduleEvent(EVENT_BARADAS_TALK, 10000);
+                                events.ScheduleEvent(EVENT_BARADAS_TALK, 10s);
                                 step++;
                                 break;
                             case 18:
                                 if (Creature* jules = ObjectAccessor::GetCreature(*me, julesGUID))
                                     jules->AI()->Talk(SAY_JULES_3);
 
-                                events.ScheduleEvent(EVENT_BARADAS_TALK, 10000);
+                                events.ScheduleEvent(EVENT_BARADAS_TALK, 10s);
                                 step++;
                                 break;
                             case 19:
                                 Talk(SAY_BARADA_7);
-                                events.ScheduleEvent(EVENT_BARADAS_TALK, 10000);
+                                events.ScheduleEvent(EVENT_BARADAS_TALK, 10s);
                                 step++;
                                 break;
                             case 20:
@@ -883,7 +883,7 @@ public:
                                     jules->RemoveAura(SPELL_JULES_VOMITS_AURA);
                                 }
 
-                                events.ScheduleEvent(EVENT_BARADAS_TALK, 10000);
+                                events.ScheduleEvent(EVENT_BARADAS_TALK, 10s);
                                 step++;
                                 break;
                             case 21:
@@ -900,7 +900,7 @@ public:
                                 Talk(SAY_BARADA_8);
                                 me->GetMotionMaster()->MoveTargetedHome();
                                 EnterEvadeMode();
-                                events.ScheduleEvent(EVENT_RESET, Minutes(2));
+                                events.ScheduleEvent(EVENT_RESET, 2min);
                                 break;
                         }
                         break;
@@ -953,7 +953,7 @@ public:
             me->SetFacingToObject(player);
             me->RemoveFlag(UNIT_NPC_FLAGS, UNIT_NPC_FLAG_GOSSIP);
             _playerGUID = player->GetGUID();
-            _events.ScheduleEvent(EVENT_TALK, Seconds(2));
+            _events.ScheduleEvent(EVENT_TALK, 2s);
         }
 
         void Reset() override
@@ -979,7 +979,7 @@ public:
                 me->SetImmuneToPC(true);
                 Talk(SAY_DEFEATED);
 
-                _events.ScheduleEvent(EVENT_EVADE, Minutes(1));
+                _events.ScheduleEvent(EVENT_EVADE, 1min);
             }
         }
 
@@ -993,22 +993,22 @@ public:
                 {
                 case EVENT_TALK:
                     Talk(SAY_CHALLENGE);
-                    _events.ScheduleEvent(EVENT_ATTACK, Seconds(2));
+                    _events.ScheduleEvent(EVENT_ATTACK, 2s);
                     break;
                 case EVENT_ATTACK:
                     me->SetImmuneToPC(false);
                     me->SetFaction(FACTION_MONSTER_2);
                     me->EngageWithTarget(ObjectAccessor::GetPlayer(*me, _playerGUID));
                     _events.ScheduleEvent(EVENT_FIREBALL, 1);
-                    _events.ScheduleEvent(EVENT_FROSTNOVA, Seconds(5));
+                    _events.ScheduleEvent(EVENT_FROSTNOVA, 5s);
                     break;
                 case EVENT_FIREBALL:
                     DoCast(SPELL_FIREBALL);
-                    _events.ScheduleEvent(EVENT_FIREBALL, Seconds(10));
+                    _events.ScheduleEvent(EVENT_FIREBALL, 10s);
                     break;
                 case EVENT_FROSTNOVA:
                     DoCastAOE(SPELL_FROSTNOVA);
-                    _events.ScheduleEvent(EVENT_FROSTNOVA, Seconds(20));
+                    _events.ScheduleEvent(EVENT_FROSTNOVA, 20s);
                     break;
                 case EVENT_EVADE:
                     EnterEvadeMode();
@@ -1154,7 +1154,7 @@ struct npc_infernal_rain_hellfire : public ScriptedAI
         {
             case DATA_ACTIVE:
                 _events.ScheduleEvent(EVENT_INFERNAL_RAIN_CAST, 1s, 2s);
-                _events.ScheduleEvent(EVENT_INFERNAL_RAIN_STOP, 60s);
+                _events.ScheduleEvent(EVENT_INFERNAL_RAIN_STOP, 1min);
                 break;
             default:
                 break;
@@ -1220,7 +1220,7 @@ struct npc_fear_controller : public ScriptedAI
         if (data == DATA_ACTIVE)
         {
             _events.ScheduleEvent(EVENT_FEAR_CAST, 1s);
-            _events.ScheduleEvent(EVENT_FEAR_STOP, 60s);
+            _events.ScheduleEvent(EVENT_FEAR_STOP, 1min);
         }
     }
 
diff --git a/src/server/scripts/Outland/zone_netherstorm.cpp b/src/server/scripts/Outland/zone_netherstorm.cpp
index bdcdd944447..ef4f3cacb7a 100644
--- a/src/server/scripts/Outland/zone_netherstorm.cpp
+++ b/src/server/scripts/Outland/zone_netherstorm.cpp
@@ -731,7 +731,7 @@ public:
         void DoAction(int32 /*action*/) override
         {
             Talk(SAY_FREE);
-            _events.ScheduleEvent(EVENT_TELEPORT, Seconds(5));
+            _events.ScheduleEvent(EVENT_TELEPORT, 5s);
         }
 
         void UpdateAI(uint32 diff) override
diff --git a/src/server/scripts/Outland/zone_shadowmoon_valley.cpp b/src/server/scripts/Outland/zone_shadowmoon_valley.cpp
index 388c9c35942..3a549eef703 100644
--- a/src/server/scripts/Outland/zone_shadowmoon_valley.cpp
+++ b/src/server/scripts/Outland/zone_shadowmoon_valley.cpp
@@ -81,7 +81,7 @@ public:
             ground = me->GetPositionZ();
             me->UpdateGroundPositionZ(me->GetPositionX(), me->GetPositionY(), ground);
             SummonInfernal();
-            events.ScheduleEvent(EVENT_CAST_SUMMON_INFERNAL, urand(1000, 3000));
+            events.ScheduleEvent(EVENT_CAST_SUMMON_INFERNAL, 1s, 3s);
         }
 
         void SetData(uint32 id, uint32 data) override
@@ -111,7 +111,7 @@ public:
                     if (Unit* infernal = ObjectAccessor::GetUnit(*me, infernalGUID))
                         if (infernal->GetDisplayId() == MODEL_INVISIBLE)
                             me->CastSpell(infernal, SPELL_SUMMON_INFERNAL, true);
-                    events.ScheduleEvent(EVENT_CAST_SUMMON_INFERNAL, 12000);
+                    events.ScheduleEvent(EVENT_CAST_SUMMON_INFERNAL, 12s);
                     break;
                 }
                 default:
@@ -1465,15 +1465,15 @@ public:
                 case NPC_ENRAGED_FIRE_SPIRIT:
                     if (!me->GetAura(SPELL_FEL_FIRE_AURA))
                         DoCastSelf(SPELL_FEL_FIRE_AURA);
-                    _events.ScheduleEvent(EVENT_ENRAGED_FIRE_SPIRIT, Seconds(2), Seconds(10));
+                    _events.ScheduleEvent(EVENT_ENRAGED_FIRE_SPIRIT, 2s, 10s);
                     break;
                 case NPC_ENRAGED_EARTH_SPIRIT:
                     if (!me->GetAura(SPELL_FEL_FIRE_AURA))
                         DoCastSelf(SPELL_FEL_FIRE_AURA);
-                    _events.ScheduleEvent(EVENT_ENRAGED_EARTH_SPIRIT, Seconds(3), Seconds(4));
+                    _events.ScheduleEvent(EVENT_ENRAGED_EARTH_SPIRIT, 3s, 4s);
                     break;
                 case NPC_ENRAGED_AIR_SPIRIT:
-                    _events.ScheduleEvent(EVENT_ENRAGED_AIR_SPIRIT_CHAIN_LIGHTNING, Seconds(10));
+                    _events.ScheduleEvent(EVENT_ENRAGED_AIR_SPIRIT_CHAIN_LIGHTNING, 10s);
                     break;
                 default:
                     break;
@@ -1508,12 +1508,12 @@ public:
                     case EVENT_ENRAGED_AIR_SPIRIT_CHAIN_LIGHTNING:
                         if (UpdateVictim())
                             DoCastVictim(SPELL_CHAIN_LIGHTNING);
-                        _events.ScheduleEvent(EVENT_ENRAGED_AIR_SPIRIT_HURRICANE, Seconds(3), Seconds(5));
+                        _events.ScheduleEvent(EVENT_ENRAGED_AIR_SPIRIT_HURRICANE, 3s, 5s);
                         break;
                     case EVENT_ENRAGED_AIR_SPIRIT_HURRICANE:
                         if (UpdateVictim())
                             DoCastVictim(SPELL_HURRICANE);
-                        _events.ScheduleEvent(EVENT_ENRAGED_AIR_SPIRIT_CHAIN_LIGHTNING, Seconds(15), Seconds(20));
+                        _events.ScheduleEvent(EVENT_ENRAGED_AIR_SPIRIT_CHAIN_LIGHTNING, 15s, 20s);
                         break;
                     default:
                         break;
diff --git a/src/server/scripts/Pet/pet_generic.cpp b/src/server/scripts/Pet/pet_generic.cpp
index 059a9cb222c..b208551f41d 100644
--- a/src/server/scripts/Pet/pet_generic.cpp
+++ b/src/server/scripts/Pet/pet_generic.cpp
@@ -187,7 +187,7 @@ public:
         void Reset() override
         {
             _events.Reset();
-            _events.ScheduleEvent(EVENT_FOCUS, 1000);
+            _events.ScheduleEvent(EVENT_FOCUS, 1s);
         }
 
         void EnterEvadeMode(EvadeReason why) override
@@ -206,10 +206,10 @@ public:
             switch (emote)
             {
             case TEXT_EMOTE_BOW:
-                _events.ScheduleEvent(EVENT_FOCUS, 1000);
+                _events.ScheduleEvent(EVENT_FOCUS, 1s);
                 break;
             case TEXT_EMOTE_DRINK:
-                _events.ScheduleEvent(EVENT_DRINK, 1000);
+                _events.ScheduleEvent(EVENT_DRINK, 1s);
                 break;
             }
         }
@@ -229,11 +229,11 @@ public:
                 case EVENT_FOCUS:
                     if (Unit* owner = me->GetCharmerOrOwner())
                         me->SetFacingToObject(owner);
-                    _events.ScheduleEvent(EVENT_EMOTE, 1000);
+                    _events.ScheduleEvent(EVENT_EMOTE, 1s);
                     break;
                 case EVENT_EMOTE:
                     me->HandleEmoteCommand(EMOTE_ONESHOT_BOW);
-                    _events.ScheduleEvent(EVENT_FOLLOW, 1000);
+                    _events.ScheduleEvent(EVENT_FOLLOW, 1s);
                     break;
                 case EVENT_FOLLOW:
                     if (Unit* owner = me->GetCharmerOrOwner())
diff --git a/src/server/scripts/Pet/pet_shaman.cpp b/src/server/scripts/Pet/pet_shaman.cpp
index cca10c674ba..3a35dff4462 100644
--- a/src/server/scripts/Pet/pet_shaman.cpp
+++ b/src/server/scripts/Pet/pet_shaman.cpp
@@ -68,7 +68,7 @@ class npc_pet_shaman_earth_elemental : public CreatureScript
                 if (_events.ExecuteEvent() == EVENT_SHAMAN_ANGEREDEARTH)
                 {
                     DoCastVictim(SPELL_SHAMAN_ANGEREDEARTH);
-                    _events.ScheduleEvent(EVENT_SHAMAN_ANGEREDEARTH, urand(5000, 20000));
+                    _events.ScheduleEvent(EVENT_SHAMAN_ANGEREDEARTH, 5s, 20s);
                 }
 
                 DoMeleeAttackIfReady();
@@ -96,8 +96,8 @@ class npc_pet_shaman_fire_elemental : public CreatureScript
             void Reset() override
             {
                 _events.Reset();
-                _events.ScheduleEvent(EVENT_SHAMAN_FIRENOVA, urand(5000, 20000));
-                _events.ScheduleEvent(EVENT_SHAMAN_FIREBLAST, urand(5000, 20000));
+                _events.ScheduleEvent(EVENT_SHAMAN_FIRENOVA, 5s, 20s);
+                _events.ScheduleEvent(EVENT_SHAMAN_FIREBLAST, 5s, 20s);
                 _events.ScheduleEvent(EVENT_SHAMAN_FIRESHIELD, 0);
                 me->ApplySpellImmune(0, IMMUNITY_SCHOOL, SPELL_SCHOOL_MASK_FIRE, true);
             }
@@ -118,15 +118,15 @@ class npc_pet_shaman_fire_elemental : public CreatureScript
                     {
                         case EVENT_SHAMAN_FIRENOVA:
                             DoCastVictim(SPELL_SHAMAN_FIRENOVA);
-                            _events.ScheduleEvent(EVENT_SHAMAN_FIRENOVA, urand(5000, 20000));
+                            _events.ScheduleEvent(EVENT_SHAMAN_FIRENOVA, 5s, 20s);
                             break;
                         case EVENT_SHAMAN_FIRESHIELD:
                             DoCastVictim(SPELL_SHAMAN_FIRESHIELD);
-                            _events.ScheduleEvent(EVENT_SHAMAN_FIRESHIELD, 2000);
+                            _events.ScheduleEvent(EVENT_SHAMAN_FIRESHIELD, 2s);
                             break;
                         case EVENT_SHAMAN_FIREBLAST:
                             DoCastVictim(SPELL_SHAMAN_FIREBLAST);
-                            _events.ScheduleEvent(EVENT_SHAMAN_FIREBLAST, urand(5000, 20000));
+                            _events.ScheduleEvent(EVENT_SHAMAN_FIREBLAST, 5s, 20s);
                             break;
                         default:
                             break;
diff --git a/src/server/scripts/World/boss_emerald_dragons.cpp b/src/server/scripts/World/boss_emerald_dragons.cpp
index c7ee26287c1..fe42d4535cd 100644
--- a/src/server/scripts/World/boss_emerald_dragons.cpp
+++ b/src/server/scripts/World/boss_emerald_dragons.cpp
@@ -101,7 +101,7 @@ struct emerald_dragonAI : public WorldBossAI
         me->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NOT_SELECTABLE | UNIT_FLAG_NON_ATTACKABLE);
         me->SetReactState(REACT_AGGRESSIVE);
         DoCast(me, SPELL_MARK_OF_NATURE_AURA, true);
-        events.ScheduleEvent(EVENT_TAIL_SWEEP, 4000);
+        events.ScheduleEvent(EVENT_TAIL_SWEEP, 4s);
         events.ScheduleEvent(EVENT_NOXIOUS_BREATH, urand(7500, 15000));
         events.ScheduleEvent(EVENT_SEEPING_FOG, urand(12500, 20000));
     }
@@ -133,7 +133,7 @@ struct emerald_dragonAI : public WorldBossAI
             case EVENT_TAIL_SWEEP:
                 // Tail Sweep is cast every two seconds, no matter what goes on in front of the dragon
                 DoCast(me, SPELL_TAIL_SWEEP);
-                events.ScheduleEvent(EVENT_TAIL_SWEEP, 2000);
+                events.ScheduleEvent(EVENT_TAIL_SWEEP, 2s);
                 break;
         }
     }
@@ -271,7 +271,7 @@ class boss_ysondre : public CreatureScript
             {
                 Initialize();
                 emerald_dragonAI::Reset();
-                events.ScheduleEvent(EVENT_LIGHTNING_WAVE, 12000);
+                events.ScheduleEvent(EVENT_LIGHTNING_WAVE, 12s);
             }
 
             void JustEngagedWith(Unit* who) override
@@ -299,7 +299,7 @@ class boss_ysondre : public CreatureScript
                 {
                     case EVENT_LIGHTNING_WAVE:
                         DoCastVictim(SPELL_LIGHTNING_WAVE);
-                        events.ScheduleEvent(EVENT_LIGHTNING_WAVE, urand(10000, 20000));
+                        events.ScheduleEvent(EVENT_LIGHTNING_WAVE, 10s, 20s);
                         break;
                     default:
                         emerald_dragonAI::ExecuteEvent(eventId);
@@ -365,7 +365,7 @@ class boss_lethon : public CreatureScript
             {
                 Initialize();
                 emerald_dragonAI::Reset();
-                events.ScheduleEvent(EVENT_SHADOW_BOLT_WHIRL, 10000);
+                events.ScheduleEvent(EVENT_SHADOW_BOLT_WHIRL, 10s);
             }
 
             void JustEngagedWith(Unit* who) override
@@ -399,7 +399,7 @@ class boss_lethon : public CreatureScript
                 {
                     case EVENT_SHADOW_BOLT_WHIRL:
                         me->CastSpell(nullptr, SPELL_SHADOW_BOLT_WHIRL, false);
-                        events.ScheduleEvent(EVENT_SHADOW_BOLT_WHIRL, urand(15000, 30000));
+                        events.ScheduleEvent(EVENT_SHADOW_BOLT_WHIRL, 15s, 30s);
                         break;
                     default:
                         emerald_dragonAI::ExecuteEvent(eventId);
@@ -493,7 +493,7 @@ class boss_emeriss : public CreatureScript
             {
                 Initialize();
                 emerald_dragonAI::Reset();
-                events.ScheduleEvent(EVENT_VOLATILE_INFECTION, 12000);
+                events.ScheduleEvent(EVENT_VOLATILE_INFECTION, 12s);
             }
 
             void KilledUnit(Unit* who) override
@@ -597,8 +597,8 @@ class boss_taerar : public CreatureScript
                 Initialize();
 
                 emerald_dragonAI::Reset();
-                events.ScheduleEvent(EVENT_ARCANE_BLAST, 12000);
-                events.ScheduleEvent(EVENT_BELLOWING_ROAR, 30000);
+                events.ScheduleEvent(EVENT_ARCANE_BLAST, 12s);
+                events.ScheduleEvent(EVENT_BELLOWING_ROAR, 30s);
             }
 
             void JustEngagedWith(Unit* who) override
@@ -645,11 +645,11 @@ class boss_taerar : public CreatureScript
                 {
                     case EVENT_ARCANE_BLAST:
                         DoCast(SPELL_ARCANE_BLAST);
-                        events.ScheduleEvent(EVENT_ARCANE_BLAST, urand(7000, 12000));
+                        events.ScheduleEvent(EVENT_ARCANE_BLAST, 7s, 12s);
                         break;
                     case EVENT_BELLOWING_ROAR:
                         DoCast(SPELL_BELLOWING_ROAR);
-                        events.ScheduleEvent(EVENT_BELLOWING_ROAR, urand(20000, 30000));
+                        events.ScheduleEvent(EVENT_BELLOWING_ROAR, 20s, 30s);
                         break;
                     default:
                         emerald_dragonAI::ExecuteEvent(eventId);
diff --git a/src/server/scripts/World/go_scripts.cpp b/src/server/scripts/World/go_scripts.cpp
index 55ad8288099..4fed46f6348 100644
--- a/src/server/scripts/World/go_scripts.cpp
+++ b/src/server/scripts/World/go_scripts.cpp
@@ -1623,8 +1623,8 @@ public:
 
         go_brewfest_musicAI(GameObject* go) : GameObjectAI(go)
         {
-            _events.ScheduleEvent(EVENT_BM_SELECT_MUSIC, 1000);
-            _events.ScheduleEvent(EVENT_BM_START_MUSIC, 2000);
+            _events.ScheduleEvent(EVENT_BM_SELECT_MUSIC, 1s);
+            _events.ScheduleEvent(EVENT_BM_START_MUSIC, 2s);
         }
 
         void UpdateAI(uint32 diff) override
@@ -1736,7 +1736,7 @@ public:
                             break;
                     }
 
-                    _events.ScheduleEvent(EVENT_BM_START_MUSIC, 5000); // Every 5 second's SMSG_PLAY_MUSIC packet (PlayDirectMusic) is pushed to the client
+                    _events.ScheduleEvent(EVENT_BM_START_MUSIC, 5s); // Every 5 second's SMSG_PLAY_MUSIC packet (PlayDirectMusic) is pushed to the client
                     break;
                 default:
                     break;
@@ -1777,7 +1777,7 @@ public:
     {
         go_midsummer_musicAI(GameObject* go) : GameObjectAI(go)
         {
-            _events.ScheduleEvent(EVENT_MM_START_MUSIC, 1000);
+            _events.ScheduleEvent(EVENT_MM_START_MUSIC, 1s);
         }
 
         void UpdateAI(uint32 diff) override
@@ -1801,7 +1801,7 @@ public:
                             else
                                 me->PlayDirectMusic(EVENTMIDSUMMERFIREFESTIVAL_A, player);
                         }
-                        _events.ScheduleEvent(EVENT_MM_START_MUSIC, 5000); // Every 5 second's SMSG_PLAY_MUSIC packet (PlayDirectMusic) is pushed to the client (sniffed value)
+                        _events.ScheduleEvent(EVENT_MM_START_MUSIC, 5s); // Every 5 second's SMSG_PLAY_MUSIC packet (PlayDirectMusic) is pushed to the client (sniffed value)
                         break;
                     }
                 default:
@@ -1842,7 +1842,7 @@ public:
     {
         go_darkmoon_faire_musicAI(GameObject* go) : GameObjectAI(go)
         {
-            _events.ScheduleEvent(EVENT_DFM_START_MUSIC, 1000);
+            _events.ScheduleEvent(EVENT_DFM_START_MUSIC, 1s);
         }
 
         void UpdateAI(uint32 diff) override
@@ -1856,7 +1856,7 @@ public:
                     if (!IsHolidayActive(HOLIDAY_DARKMOON_FAIRE_ELWYNN) || !IsHolidayActive(HOLIDAY_DARKMOON_FAIRE_THUNDER) || !IsHolidayActive(HOLIDAY_DARKMOON_FAIRE_SHATTRATH))
                         break;
                     me->PlayDirectMusic(MUSIC_DARKMOON_FAIRE_MUSIC);
-                    _events.ScheduleEvent(EVENT_DFM_START_MUSIC, 5000);  // Every 5 second's SMSG_PLAY_MUSIC packet (PlayDirectMusic) is pushed to the client (sniffed value)
+                    _events.ScheduleEvent(EVENT_DFM_START_MUSIC, 5s);  // Every 5 second's SMSG_PLAY_MUSIC packet (PlayDirectMusic) is pushed to the client (sniffed value)
                     break;
                 default:
                     break;
@@ -1896,7 +1896,7 @@ public:
     {
         go_pirate_day_musicAI(GameObject* go) : GameObjectAI(go)
         {
-            _events.ScheduleEvent(EVENT_PDM_START_MUSIC, 1000);
+            _events.ScheduleEvent(EVENT_PDM_START_MUSIC, 1s);
         }
 
         void UpdateAI(uint32 diff) override
@@ -1910,7 +1910,7 @@ public:
                     if (!IsHolidayActive(HOLIDAY_PIRATES_DAY))
                         break;
                     me->PlayDirectMusic(MUSIC_PIRATE_DAY_MUSIC);
-                    _events.ScheduleEvent(EVENT_PDM_START_MUSIC, 5000);  // Every 5 second's SMSG_PLAY_MUSIC packet (PlayDirectMusic) is pushed to the client (sniffed value)
+                    _events.ScheduleEvent(EVENT_PDM_START_MUSIC, 5s);  // Every 5 second's SMSG_PLAY_MUSIC packet (PlayDirectMusic) is pushed to the client (sniffed value)
                     break;
                 default:
                     break;
diff --git a/src/server/scripts/World/npcs_special.cpp b/src/server/scripts/World/npcs_special.cpp
index e27fa9ab280..6c74a558762 100644
--- a/src/server/scripts/World/npcs_special.cpp
+++ b/src/server/scripts/World/npcs_special.cpp
@@ -575,7 +575,7 @@ public:
                 if (GameObject* go = me->FindNearestGameObject(GO_RIBBON_POLE, 10.0f))
                     me->CastSpell(go, SPELL_RED_FIRE_RING, true);
 
-                events.ScheduleEvent(EVENT_CAST_BLUE_FIRE_RING, Seconds(5));
+                events.ScheduleEvent(EVENT_CAST_BLUE_FIRE_RING, 5s);
             }
             break;
             case EVENT_CAST_BLUE_FIRE_RING:
@@ -589,7 +589,7 @@ public:
                 if (GameObject* go = me->FindNearestGameObject(GO_RIBBON_POLE, 10.0f))
                     me->CastSpell(go, SPELL_BLUE_FIRE_RING, true);
 
-                events.ScheduleEvent(EVENT_CAST_RED_FIRE_RING, Seconds(5));
+                events.ScheduleEvent(EVENT_CAST_RED_FIRE_RING, 5s);
             }
             break;
             }
@@ -2447,7 +2447,7 @@ public:
             if (summoner->GetTypeId() == TYPEID_PLAYER)
             {
                 summonerGUID = summoner->GetGUID();
-                events.ScheduleEvent(EVENT_TALK, 3000);
+                events.ScheduleEvent(EVENT_TALK, 3s);
             }
         }
author	DanVS <33371360+DanVS@users.noreply.github.com>	2018-09-17 16:38:22 +0000
committer	jackpoz <giacomopoz@gmail.com>	2018-09-17 18:38:22 +0200
commit	5b0f4009df4cde413c92c73467ca9a63e79a772b (patch)
tree	26e14700c4afaac9c5e0c09a1c9ec7a143291195
parent	28591fd1658e3e4842d64f330f27c233dc69aad2 (diff)