From 904d062c56cd5d038e5fe45da6752cfafeaae841 Mon Sep 17 00:00:00 2001
From: NotAdam <adam@notadam.me>
Date: Wed, 20 Feb 2019 19:54:59 +1100
Subject: [PATCH] update all the instance scripts to add missing ones and use
 new api

---
 src/scripts/instances/ScriptLoader.cpp        | 144 +++++++-
 .../deepdungeon/HeavenonHighFloors110.cpp     |  34 ++
 .../deepdungeon/HeavenonHighFloors1120.cpp    |  34 ++
 .../deepdungeon/HeavenonHighFloors2130.cpp    |  34 ++
 .../deepdungeon/HeavenonHighFloors3140.cpp    |  34 ++
 .../deepdungeon/HeavenonHighFloors4150.cpp    |  34 ++
 .../deepdungeon/HeavenonHighFloors5160.cpp    |  34 ++
 .../deepdungeon/HeavenonHighFloors6170.cpp    |  34 ++
 .../deepdungeon/HeavenonHighFloors7180.cpp    |  34 ++
 .../deepdungeon/HeavenonHighFloors8190.cpp    |  34 ++
 .../deepdungeon/HeavenonHighFloors91100.cpp   |  34 ++
 .../ThePalaceoftheDeadFloors101110.cpp        |  19 +-
 .../ThePalaceoftheDeadFloors110.cpp           |  14 +-
 .../ThePalaceoftheDeadFloors111120.cpp        |  14 +-
 .../ThePalaceoftheDeadFloors1120.cpp          |  14 +-
 .../ThePalaceoftheDeadFloors121130.cpp        |  14 +-
 .../ThePalaceoftheDeadFloors131140.cpp        |  14 +-
 .../ThePalaceoftheDeadFloors141150.cpp        |  14 +-
 .../ThePalaceoftheDeadFloors151160.cpp        |  14 +-
 .../ThePalaceoftheDeadFloors161170.cpp        |  14 +-
 .../ThePalaceoftheDeadFloors171180.cpp        |  14 +-
 .../ThePalaceoftheDeadFloors181190.cpp        |  14 +-
 .../ThePalaceoftheDeadFloors191200.cpp        |  14 +-
 .../ThePalaceoftheDeadFloors2130.cpp          |  14 +-
 .../ThePalaceoftheDeadFloors3140.cpp          |  37 +-
 .../ThePalaceoftheDeadFloors4150.cpp          |  37 +-
 .../ThePalaceoftheDeadFloors5160.cpp          |  14 +-
 .../ThePalaceoftheDeadFloors6170.cpp          |  14 +-
 .../ThePalaceoftheDeadFloors7180.cpp          |  14 +-
 .../ThePalaceoftheDeadFloors8190.cpp          |  19 +-
 .../ThePalaceoftheDeadFloors91100.cpp         |  19 +-
 src/scripts/instances/dungeons/AlaMhigo.cpp   |  50 ++-
 .../instances/dungeons/AmdaporKeep.cpp        | 334 +++++++----------
 .../instances/dungeons/AmdaporKeepHard.cpp    | 115 +++---
 .../instances/dungeons/BaelsarsWall.cpp       |  97 ++---
 .../instances/dungeons/BardamsMettle.cpp      |  43 ++-
 .../instances/dungeons/BrayfloxsLongstop.cpp  |  68 ++--
 .../dungeons/BrayfloxsLongstopHard.cpp        |  85 ++---
 .../instances/dungeons/CastrumAbania.cpp      |  75 +++-
 .../instances/dungeons/CastrumMeridianum.cpp  | 202 ++++-------
 .../instances/dungeons/CopperbellMines.cpp    | 163 +++------
 .../dungeons/CopperbellMinesHard.cpp          | 140 +++----
 src/scripts/instances/dungeons/CuttersCry.cpp | 116 +++---
 src/scripts/instances/dungeons/DomaCastle.cpp |  48 ++-
 .../instances/dungeons/DzemaelDarkhold.cpp    | 273 ++++++--------
 src/scripts/instances/dungeons/Halatali.cpp   | 149 +++-----
 .../instances/dungeons/HalataliHard.cpp       | 168 +++------
 .../instances/dungeons/HaukkeManor.cpp        | 125 +++----
 .../instances/dungeons/HaukkeManorHard.cpp    | 189 ++++------
 src/scripts/instances/dungeons/HellsLid.cpp   |  62 +++-
 .../instances/dungeons/HullbreakerIsle.cpp    | 190 ++++------
 .../dungeons/HullbreakerIsleHard.cpp          |  93 ++---
 .../instances/dungeons/KuganeCastle.cpp       |  80 +++-
 src/scripts/instances/dungeons/Neverreap.cpp  |  67 +++-
 .../instances/dungeons/PharosSirius.cpp       | 100 ++---
 .../instances/dungeons/PharosSiriusHard.cpp   |  94 ++---
 .../dungeons/SaintMociannesArboretum.cpp      |  44 ++-
 .../dungeons/SaintMociannesArboretumHard.cpp  |  68 ++++
 src/scripts/instances/dungeons/Sastasha.cpp   | 151 +++-----
 .../instances/dungeons/SastashaHard.cpp       | 123 +++----
 .../dungeons/ShisuioftheVioletTides.cpp       |  61 +++-
 src/scripts/instances/dungeons/Snowcloak.cpp  | 133 +++----
 src/scripts/instances/dungeons/SohmAl.cpp     |  41 ++-
 src/scripts/instances/dungeons/SohmAlHard.cpp |  61 +++-
 src/scripts/instances/dungeons/SohrKhai.cpp   |  47 ++-
 src/scripts/instances/dungeons/TheAery.cpp    |  39 +-
 .../TheAetherochemicalResearchFacility.cpp    |  51 ++-
 .../instances/dungeons/TheAntitower.cpp       |  70 +++-
 .../instances/dungeons/TheAurumVale.cpp       |  64 ++--
 src/scripts/instances/dungeons/TheBurn.cpp    |  64 ++++
 .../dungeons/TheDrownedCityofSkalla.cpp       |  48 ++-
 .../instances/dungeons/TheDuskVigil.cpp       |  60 ++-
 .../dungeons/TheFractalContinuum.cpp          |  82 ++++-
 .../dungeons/TheFractalContinuumHard.cpp      |  52 ++-
 .../instances/dungeons/TheGhimlytDark.cpp     |  78 ++++
 .../dungeons/TheGreatGubalLibrary.cpp         |  53 ++-
 .../dungeons/TheGreatGubalLibraryHard.cpp     |  63 +++-
 .../instances/dungeons/TheKeeperoftheLake.cpp | 103 ++----
 .../dungeons/TheLostCityofAmdapor.cpp         | 160 +++-----
 .../dungeons/TheLostCityofAmdaporHard.cpp     | 140 +++----
 .../instances/dungeons/ThePraetorium.cpp      | 343 ++++++------------
 .../instances/dungeons/TheSirensongSea.cpp    |  46 ++-
 .../instances/dungeons/TheStoneVigil.cpp      | 100 +++--
 .../instances/dungeons/TheStoneVigilHard.cpp  |  82 ++---
 .../dungeons/TheSunkenTempleofQarn.cpp        | 182 ++++------
 .../dungeons/TheSunkenTempleofQarnHard.cpp    | 160 +++-----
 .../instances/dungeons/TheSwallowsCompass.cpp |  74 ++++
 .../dungeons/TheTamTaraDeepcroft.cpp          |  86 ++---
 .../dungeons/TheTamTaraDeepcroftHard.cpp      | 212 +++++------
 .../instances/dungeons/TheTempleoftheFist.cpp |  56 ++-
 .../dungeons/TheThousandMawsofTotoRak.cpp     | 163 +++------
 src/scripts/instances/dungeons/TheVault.cpp   |  58 ++-
 .../instances/dungeons/TheWanderersPalace.cpp | 162 +++------
 .../dungeons/TheWanderersPalaceHard.cpp       | 104 ++----
 src/scripts/instances/dungeons/Xelphatol.cpp  |  54 ++-
 .../instances/events/TheHauntedManor.cpp      |  54 ++-
 .../events/TheValentionesCeremony.cpp         | 142 +++-----
 .../instances/goldsaucer/AirForceOne.cpp      |  37 ++
 .../mahjong/AdvancedMahjongRanked.cpp         |  33 ++
 .../FourplayerMahjongKuitanDisabled.cpp       |  33 ++
 .../FourplayerMahjongKuitanEnabled.cpp        |  33 ++
 .../mahjong/NoviceMahjongRanked.cpp           |  33 ++
 .../guildhests/AllsWellthatEndsintheWell.cpp  |  16 +-
 .../instances/guildhests/AnnoytheVoid.cpp     |   9 +-
 .../guildhests/BasicTrainingEnemyParties.cpp  |   9 +-
 .../BasicTrainingEnemyStrongholds.cpp         |  19 +-
 .../FlickingSticksandTakingNames.cpp          |  12 +-
 .../guildhests/HeroontheHalfShell.cpp         |   9 +-
 .../instances/guildhests/LongLivetheQueen.cpp |  58 ++-
 .../instances/guildhests/MorethanaFeeler.cpp  |   9 +-
 .../guildhests/PullingPoisonPosies.cpp        |   9 +-
 .../instances/guildhests/ShadowandClaw.cpp    |  58 ++-
 .../instances/guildhests/SolemnTrinity.cpp    |   9 +-
 .../instances/guildhests/StingingBack.cpp     |  16 +-
 .../instances/guildhests/UndertheArmor.cpp    |  12 +-
 src/scripts/instances/guildhests/WardUp.cpp   |   9 +-
 .../AccrueEnmityfromMultipleTargets.cpp       |  33 +-
 .../AssistAlliesinDefeatingaTarget.cpp        |  33 +-
 .../AvoidAreaofEffectAttacks.cpp              |  33 +-
 .../hallofthenovice/AvoidEngagedTargets.cpp   |  33 +-
 .../DefeatanOccupiedTarget.cpp                |  33 +-
 .../EngageEnemyReinforcements.cpp             |  33 +-
 .../hallofthenovice/EngageMultipleTargets.cpp |  33 +-
 .../hallofthenovice/ExecuteaComboinBattle.cpp |  33 +-
 .../ExecuteaCombotoIncreaseEnmity.cpp         |  33 +-
 .../ExecuteaRangedAttacktoIncreaseEnmity.cpp  |  35 +-
 .../hallofthenovice/FinalExercise.cpp         |  17 +-
 .../hallofthenovice/HealMultipleAllies.cpp    |  33 +-
 .../instances/hallofthenovice/HealanAlly.cpp  |  33 +-
 .../InteractwiththeBattlefield.cpp            |  33 +-
 .../maskedcarnivale/AChorusSlime.cpp          |  38 ++
 .../maskedcarnivale/ALittleKnightMusic.cpp    |  38 ++
 .../AllsWellThatStartsWell.cpp                |  38 ++
 .../AmazingTechnicolorPitFiends.cpp           |  38 ++
 .../maskedcarnivale/BeautyandaBeast.cpp       |  38 ++
 .../BehemothsandBroomsticks.cpp               |  38 ++
 .../maskedcarnivale/BlobsintheWoods.cpp       |  38 ++
 .../maskedcarnivale/BombedyofErrors.cpp       |  38 ++
 .../maskedcarnivale/ChimeraonaHotTinRoof.cpp  |  38 ++
 .../maskedcarnivale/DirtyRottenAzulmagia.cpp  |  38 ++
 .../instances/maskedcarnivale/EyeSociety.cpp  |  38 ++
 .../maskedcarnivale/GentlemenPreferSwords.cpp |  38 ++
 .../maskedcarnivale/HereComestheBoom.cpp      |  38 ++
 .../MidsummerNightsExplosion.cpp              |  38 ++
 .../instances/maskedcarnivale/MissTyphon.cpp  |  38 ++
 .../maskedcarnivale/MuchAdoAboutPudding.cpp   |  38 ++
 .../OnaClearDayYouCanSmellForever.cpp         |  38 ++
 .../SomeLikeItExcruciatinglyHot.cpp           |  38 ++
 .../maskedcarnivale/SunsetBullevard.cpp       |  38 ++
 .../maskedcarnivale/TheMeNobodyNodes.cpp      |  38 ++
 .../maskedcarnivale/ThePlantomoftheOpera.cpp  |  38 ++
 .../maskedcarnivale/TheSwordofMusic.cpp       |  38 ++
 .../maskedcarnivale/TheThreepennyTurtles.cpp  |  38 ++
 .../maskedcarnivale/ToKillaMockingslime.cpp   |  38 ++
 .../maskedcarnivale/WaitingforGolem.cpp       |  38 ++
 src/scripts/instances/pvp/Astragalos.cpp      |  61 ----
 src/scripts/instances/pvp/SealRockSeize.cpp   |  79 +++-
 .../pvp/TheBorderlandRuinsSecure.cpp          |  74 ++--
 .../instances/pvp/TheFeast4on4LightParty.cpp  |  41 ---
 .../instances/pvp/TheFeast4on4Ranked.cpp      |  37 --
 .../instances/pvp/TheFeast4on4Training.cpp    |  37 --
 .../pvp/TheFeastCustomMatchCrystalTower.cpp   |  45 ---
 .../TheFeastCustomMatchFeastingGrounds.cpp    |  41 ---
 .../pvp/TheFeastCustomMatchLichenweed.cpp     |  37 --
 src/scripts/instances/pvp/TheFeastRanked.cpp  |  45 ---
 .../instances/pvp/TheFeastTeamRanked.cpp      |  45 ---
 .../instances/pvp/TheFeastTraining.cpp        |  45 ---
 .../instances/pvp/TheFieldsofGloryShatter.cpp |  41 ++-
 .../instances/pvp/rivalwings/Astragalos.cpp   |  46 +++
 .../instances/pvp/rivalwings/HiddenGorge.cpp  |  45 +++
 .../pvp/thefeast/TheFeast4on4Ranked.cpp       |  34 ++
 .../pvp/thefeast/TheFeast4on4Training.cpp     |  34 ++
 .../TheFeastCustomMatchCrystalTower.cpp       |  34 ++
 .../TheFeastCustomMatchFeastingGrounds.cpp    |  36 ++
 .../TheFeastCustomMatchLichenweed.cpp         |  34 ++
 .../instances/pvp/thefeast/TheFeastRanked.cpp |  34 ++
 .../TheFeastTeamCustomMatchCrystalTower.cpp   |  34 ++
 .../pvp/thefeast/TheFeastTeamRanked.cpp       |  34 ++
 .../pvp/thefeast/TheFeastTraining.cpp         |  34 ++
 .../instances/questbattles/ABloodyReunion.cpp |  51 ++-
 .../questbattles/ASpectaclefortheAges.cpp     |  58 ++-
 .../instances/questbattles/BloodDragoon.cpp   |  43 ++-
 .../instances/questbattles/BloodontheDeck.cpp |  14 +-
 .../CuriousGorgeMeetsHisMatch.cpp             |  17 +-
 .../instances/questbattles/DarkwingDragon.cpp |  26 +-
 .../questbattles/EmissaryoftheDawn.cpp        |  36 ++
 .../instances/questbattles/InThalsName.cpp    |  14 +-
 .../questbattles/InterdimensionalRift.cpp     |  23 +-
 .../questbattles/ItsProbablyaTrap.cpp         |  21 +-
 .../instances/questbattles/MatsubaMayhem.cpp  |  21 +-
 src/scripts/instances/questbattles/Naadam.cpp |  26 +-
 .../questbattles/OneLifeforOneWorld.cpp       |  20 +-
 .../instances/questbattles/OurCompromise.cpp  |  15 +-
 .../questbattles/OurUnsungHeroes.cpp          | 140 +++----
 .../questbattles/RaisingtheSword.cpp          |  14 +-
 .../questbattles/ReturnoftheBull.cpp          |  50 ++-
 .../questbattles/TheBattleonBekko.cpp         |  15 +-
 .../TheCarteneauFlatsHeliodrome.cpp           |  74 ++--
 .../questbattles/TheFaceofTrueEvil.cpp        |   9 +-
 .../questbattles/TheHeartoftheProblem.cpp     |  26 +-
 .../TheOrphansandtheBrokenBlade.cpp           |   9 +-
 .../instances/questbattles/TheResonant.cpp    |  19 +-
 .../questbattles/TheWilloftheMoon.cpp         |  45 +++
 .../questbattles/WhenClansCollide.cpp         |  26 +-
 .../questbattles/WithHeartandSteel.cpp        | 104 +++++-
 .../raids/AlexanderTheArmoftheFather.cpp      |  32 +-
 .../AlexanderTheArmoftheFatherSavage.cpp      |  32 +-
 .../raids/AlexanderTheArmoftheSon.cpp         |  63 +++-
 .../raids/AlexanderTheArmoftheSonSavage.cpp   |  63 +++-
 .../raids/AlexanderTheBreathoftheCreator.cpp  |  39 +-
 .../AlexanderTheBreathoftheCreatorSavage.cpp  |  39 +-
 .../raids/AlexanderTheBurdenoftheFather.cpp   |  17 +-
 .../AlexanderTheBurdenoftheFatherSavage.cpp   |  17 +-
 .../raids/AlexanderTheBurdenoftheSon.cpp      |  20 +-
 .../AlexanderTheBurdenoftheSonSavage.cpp      |  20 +-
 .../raids/AlexanderTheCuffoftheFather.cpp     |  43 ++-
 .../AlexanderTheCuffoftheFatherSavage.cpp     |  43 ++-
 .../raids/AlexanderTheCuffoftheSon.cpp        |  43 ++-
 .../raids/AlexanderTheCuffoftheSonSavage.cpp  |  43 ++-
 .../raids/AlexanderTheEyesoftheCreator.cpp    |  43 ++-
 .../AlexanderTheEyesoftheCreatorSavage.cpp    |  43 ++-
 .../raids/AlexanderTheFistoftheFather.cpp     |  51 ++-
 .../AlexanderTheFistoftheFatherSavage.cpp     |  51 ++-
 .../raids/AlexanderTheFistoftheSon.cpp        |  42 ++-
 .../raids/AlexanderTheFistoftheSonSavage.cpp  |  42 ++-
 .../raids/AlexanderTheHeartoftheCreator.cpp   |  54 ++-
 .../AlexanderTheHeartoftheCreatorSavage.cpp   |  54 ++-
 .../raids/AlexanderTheSouloftheCreator.cpp    |  35 +-
 .../AlexanderTheSouloftheCreatorSavage.cpp    |  35 +-
 src/scripts/instances/raids/AlphascapeV10.cpp |  41 +++
 .../instances/raids/AlphascapeV10Savage.cpp   |  41 +++
 src/scripts/instances/raids/AlphascapeV20.cpp |  36 ++
 .../instances/raids/AlphascapeV20Savage.cpp   |  36 ++
 src/scripts/instances/raids/AlphascapeV30.cpp |  40 ++
 .../instances/raids/AlphascapeV30Savage.cpp   |  40 ++
 src/scripts/instances/raids/AlphascapeV40.cpp |  44 +++
 .../instances/raids/AlphascapeV40Savage.cpp   |  44 +++
 src/scripts/instances/raids/DeltascapeV10.cpp |  19 +-
 .../instances/raids/DeltascapeV10Savage.cpp   |  19 +-
 src/scripts/instances/raids/DeltascapeV20.cpp |  18 +-
 .../instances/raids/DeltascapeV20Savage.cpp   |  18 +-
 src/scripts/instances/raids/DeltascapeV30.cpp |  34 +-
 .../instances/raids/DeltascapeV30Savage.cpp   |  34 +-
 src/scripts/instances/raids/DeltascapeV40.cpp |  23 +-
 .../instances/raids/DeltascapeV40Savage.cpp   |  23 +-
 src/scripts/instances/raids/DunScaith.cpp     |  81 ++++-
 src/scripts/instances/raids/SigmascapeV10.cpp |  34 +-
 .../instances/raids/SigmascapeV10Savage.cpp   |  34 +-
 src/scripts/instances/raids/SigmascapeV20.cpp |  32 +-
 .../instances/raids/SigmascapeV20Savage.cpp   |  32 +-
 src/scripts/instances/raids/SigmascapeV30.cpp |  27 +-
 .../instances/raids/SigmascapeV30Savage.cpp   |  27 +-
 src/scripts/instances/raids/SigmascapeV40.cpp |  32 +-
 .../instances/raids/SigmascapeV40Savage.cpp   |  32 +-
 src/scripts/instances/raids/SyrcusTower.cpp   | 196 ++++------
 .../raids/TheBindingCoilofBahamutTurn1.cpp    | 113 +++---
 .../raids/TheBindingCoilofBahamutTurn2.cpp    | 114 +++---
 .../raids/TheBindingCoilofBahamutTurn3.cpp    | 151 +++-----
 .../raids/TheBindingCoilofBahamutTurn4.cpp    |  58 ++-
 .../raids/TheBindingCoilofBahamutTurn5.cpp    |  33 +-
 .../raids/TheFinalCoilofBahamutTurn1.cpp      |  81 ++---
 .../raids/TheFinalCoilofBahamutTurn2.cpp      | 106 ++----
 .../raids/TheFinalCoilofBahamutTurn3.cpp      |  31 +-
 .../raids/TheFinalCoilofBahamutTurn4.cpp      |  28 +-
 .../raids/TheLabyrinthoftheAncients.cpp       | 235 +++++-------
 .../instances/raids/TheOrbonneMonastery.cpp   | 106 ++++++
 .../instances/raids/TheRidoranaLighthouse.cpp | 109 ++++++
 .../raids/TheRoyalCityofRabanastre.cpp        | 114 +++++-
 .../TheSecondCoilofBahamutSavageTurn1.cpp     |  53 +--
 .../TheSecondCoilofBahamutSavageTurn2.cpp     |  54 +--
 .../TheSecondCoilofBahamutSavageTurn3.cpp     | 215 +++++------
 .../TheSecondCoilofBahamutSavageTurn4.cpp     |  48 +--
 .../raids/TheSecondCoilofBahamutTurn1.cpp     |  53 +--
 .../raids/TheSecondCoilofBahamutTurn2.cpp     |  54 +--
 .../raids/TheSecondCoilofBahamutTurn3.cpp     | 215 +++++------
 .../raids/TheSecondCoilofBahamutTurn4.cpp     |  48 +--
 .../TheUnendingCoilofBahamutUltimate.cpp      |  34 +-
 src/scripts/instances/raids/TheVoidArk.cpp    | 106 +++++-
 .../raids/TheWeaponsRefrainUltimate.cpp       |  44 +--
 .../instances/raids/TheWeepingCityofMhach.cpp | 104 +++++-
 .../instances/raids/TheWorldofDarkness.cpp    | 332 ++++++-----------
 .../instances/treasurehunt/TheAquapolis.cpp   | 302 ++++++---------
 .../treasurehunt/TheHiddenCanalsofUznair.cpp  | 136 ++++++-
 .../treasurehunt/TheLostCanalsofUznair.cpp    | 136 ++++++-
 .../TheShiftingAltarsofUznair.cpp             |  55 +++
 .../trials/ARelicReborntheChimera.cpp         |  58 ++-
 .../instances/trials/ARelicReborntheHydra.cpp | 149 +++-----
 .../trials/AkhAfahAmphitheatreExtreme.cpp     |  50 ++-
 .../trials/AkhAfahAmphitheatreHard.cpp        |  44 +--
 .../instances/trials/BattleintheBigKeep.cpp   | 334 +++++++----------
 .../instances/trials/BattleontheBigBridge.cpp |  38 +-
 src/scripts/instances/trials/CapeWestwind.cpp |  19 +-
 .../instances/trials/CastrumFluminis.cpp      |  48 +++
 .../instances/trials/ContainmentBayP1T6.cpp   |  22 +-
 .../trials/ContainmentBayP1T6Extreme.cpp      |  22 +-
 .../instances/trials/ContainmentBayS1T7.cpp   |  29 +-
 .../trials/ContainmentBayS1T7Extreme.cpp      |  29 +-
 .../instances/trials/ContainmentBayZ1T9.cpp   |  28 +-
 .../trials/ContainmentBayZ1T9Extreme.cpp      |  28 +-
 src/scripts/instances/trials/Emanation.cpp    |  16 +-
 .../instances/trials/EmanationExtreme.cpp     |  16 +-
 src/scripts/instances/trials/HellsKier.cpp    |  47 +++
 .../instances/trials/HellsKierExtreme.cpp     |  47 +++
 .../instances/trials/SpecialEventI.cpp        |  19 +-
 .../instances/trials/SpecialEventII.cpp       |  31 +-
 .../instances/trials/SpecialEventIII.cpp      |  18 +-
 .../instances/trials/TheBowlofEmbers.cpp      |  20 +-
 .../trials/TheBowlofEmbersExtreme.cpp         |  20 +-
 .../instances/trials/TheBowlofEmbersHard.cpp  |  20 +-
 src/scripts/instances/trials/TheChrysalis.cpp |  90 ++---
 .../instances/trials/TheDragonsNeck.cpp       | 168 +++------
 .../instances/trials/TheFinalStepsofFaith.cpp |  23 +-
 src/scripts/instances/trials/TheGreatHunt.cpp |  36 ++
 .../instances/trials/TheGreatHuntExtreme.cpp  |  36 ++
 .../instances/trials/TheHowlingEye.cpp        |  40 +-
 .../instances/trials/TheHowlingEyeExtreme.cpp |  40 +-
 .../instances/trials/TheHowlingEyeHard.cpp    |  40 +-
 src/scripts/instances/trials/TheJadeStoa.cpp  |  19 +-
 .../instances/trials/TheJadeStoaExtreme.cpp   |  19 +-
 .../trials/TheLimitlessBlueExtreme.cpp        |  24 +-
 .../instances/trials/TheLimitlessBlueHard.cpp |  26 +-
 .../trials/TheMinstrelsBalladNidhoggsRage.cpp |  23 +-
 .../TheMinstrelsBalladShinryusDomain.cpp      |  33 +-
 .../TheMinstrelsBalladThordansReign.cpp       |  69 +++-
 .../TheMinstrelsBalladTsukuyomisPain.cpp      |  48 +++
 .../trials/TheMinstrelsBalladUltimasBane.cpp  |  34 +-
 src/scripts/instances/trials/TheNavel.cpp     |  16 +-
 .../instances/trials/TheNavelExtreme.cpp      |  16 +-
 src/scripts/instances/trials/TheNavelHard.cpp |  16 +-
 .../instances/trials/ThePoolofTribute.cpp     |  18 +-
 .../trials/ThePoolofTributeExtreme.cpp        |  18 +-
 .../instances/trials/TheRoyalMenagerie.cpp    |  29 +-
 .../trials/TheSingularityReactor.cpp          |  69 +++-
 .../instances/trials/TheStepsofFaith.cpp      |  74 ++--
 .../trials/TheStrikingTreeExtreme.cpp         |  16 +-
 .../instances/trials/TheStrikingTreeHard.cpp  |  16 +-
 .../instances/trials/TheWhorleaterExtreme.cpp |  31 +-
 .../instances/trials/TheWhorleaterHard.cpp    |  31 +-
 .../instances/trials/TheWreathofSnakes.cpp    |  36 ++
 .../trials/TheWreathofSnakesExtreme.cpp       |  36 ++
 .../instances/trials/ThokastThokExtreme.cpp   |  36 +-
 .../instances/trials/ThokastThokHard.cpp      |  36 +-
 .../instances/trials/ThornmarchExtreme.cpp    |  16 +-
 .../instances/trials/ThornmarchHard.cpp       |  16 +-
 src/scripts/instances/trials/UrthsFount.cpp   |  16 +-
 345 files changed, 11387 insertions(+), 7993 deletions(-)
 create mode 100644 src/scripts/instances/deepdungeon/HeavenonHighFloors110.cpp
 create mode 100644 src/scripts/instances/deepdungeon/HeavenonHighFloors1120.cpp
 create mode 100644 src/scripts/instances/deepdungeon/HeavenonHighFloors2130.cpp
 create mode 100644 src/scripts/instances/deepdungeon/HeavenonHighFloors3140.cpp
 create mode 100644 src/scripts/instances/deepdungeon/HeavenonHighFloors4150.cpp
 create mode 100644 src/scripts/instances/deepdungeon/HeavenonHighFloors5160.cpp
 create mode 100644 src/scripts/instances/deepdungeon/HeavenonHighFloors6170.cpp
 create mode 100644 src/scripts/instances/deepdungeon/HeavenonHighFloors7180.cpp
 create mode 100644 src/scripts/instances/deepdungeon/HeavenonHighFloors8190.cpp
 create mode 100644 src/scripts/instances/deepdungeon/HeavenonHighFloors91100.cpp
 create mode 100644 src/scripts/instances/dungeons/SaintMociannesArboretumHard.cpp
 create mode 100644 src/scripts/instances/dungeons/TheBurn.cpp
 create mode 100644 src/scripts/instances/dungeons/TheGhimlytDark.cpp
 create mode 100644 src/scripts/instances/dungeons/TheSwallowsCompass.cpp
 create mode 100644 src/scripts/instances/goldsaucer/AirForceOne.cpp
 create mode 100644 src/scripts/instances/goldsaucer/mahjong/AdvancedMahjongRanked.cpp
 create mode 100644 src/scripts/instances/goldsaucer/mahjong/FourplayerMahjongKuitanDisabled.cpp
 create mode 100644 src/scripts/instances/goldsaucer/mahjong/FourplayerMahjongKuitanEnabled.cpp
 create mode 100644 src/scripts/instances/goldsaucer/mahjong/NoviceMahjongRanked.cpp
 create mode 100644 src/scripts/instances/maskedcarnivale/AChorusSlime.cpp
 create mode 100644 src/scripts/instances/maskedcarnivale/ALittleKnightMusic.cpp
 create mode 100644 src/scripts/instances/maskedcarnivale/AllsWellThatStartsWell.cpp
 create mode 100644 src/scripts/instances/maskedcarnivale/AmazingTechnicolorPitFiends.cpp
 create mode 100644 src/scripts/instances/maskedcarnivale/BeautyandaBeast.cpp
 create mode 100644 src/scripts/instances/maskedcarnivale/BehemothsandBroomsticks.cpp
 create mode 100644 src/scripts/instances/maskedcarnivale/BlobsintheWoods.cpp
 create mode 100644 src/scripts/instances/maskedcarnivale/BombedyofErrors.cpp
 create mode 100644 src/scripts/instances/maskedcarnivale/ChimeraonaHotTinRoof.cpp
 create mode 100644 src/scripts/instances/maskedcarnivale/DirtyRottenAzulmagia.cpp
 create mode 100644 src/scripts/instances/maskedcarnivale/EyeSociety.cpp
 create mode 100644 src/scripts/instances/maskedcarnivale/GentlemenPreferSwords.cpp
 create mode 100644 src/scripts/instances/maskedcarnivale/HereComestheBoom.cpp
 create mode 100644 src/scripts/instances/maskedcarnivale/MidsummerNightsExplosion.cpp
 create mode 100644 src/scripts/instances/maskedcarnivale/MissTyphon.cpp
 create mode 100644 src/scripts/instances/maskedcarnivale/MuchAdoAboutPudding.cpp
 create mode 100644 src/scripts/instances/maskedcarnivale/OnaClearDayYouCanSmellForever.cpp
 create mode 100644 src/scripts/instances/maskedcarnivale/SomeLikeItExcruciatinglyHot.cpp
 create mode 100644 src/scripts/instances/maskedcarnivale/SunsetBullevard.cpp
 create mode 100644 src/scripts/instances/maskedcarnivale/TheMeNobodyNodes.cpp
 create mode 100644 src/scripts/instances/maskedcarnivale/ThePlantomoftheOpera.cpp
 create mode 100644 src/scripts/instances/maskedcarnivale/TheSwordofMusic.cpp
 create mode 100644 src/scripts/instances/maskedcarnivale/TheThreepennyTurtles.cpp
 create mode 100644 src/scripts/instances/maskedcarnivale/ToKillaMockingslime.cpp
 create mode 100644 src/scripts/instances/maskedcarnivale/WaitingforGolem.cpp
 delete mode 100644 src/scripts/instances/pvp/Astragalos.cpp
 delete mode 100644 src/scripts/instances/pvp/TheFeast4on4LightParty.cpp
 delete mode 100644 src/scripts/instances/pvp/TheFeast4on4Ranked.cpp
 delete mode 100644 src/scripts/instances/pvp/TheFeast4on4Training.cpp
 delete mode 100644 src/scripts/instances/pvp/TheFeastCustomMatchCrystalTower.cpp
 delete mode 100644 src/scripts/instances/pvp/TheFeastCustomMatchFeastingGrounds.cpp
 delete mode 100644 src/scripts/instances/pvp/TheFeastCustomMatchLichenweed.cpp
 delete mode 100644 src/scripts/instances/pvp/TheFeastRanked.cpp
 delete mode 100644 src/scripts/instances/pvp/TheFeastTeamRanked.cpp
 delete mode 100644 src/scripts/instances/pvp/TheFeastTraining.cpp
 create mode 100644 src/scripts/instances/pvp/rivalwings/Astragalos.cpp
 create mode 100644 src/scripts/instances/pvp/rivalwings/HiddenGorge.cpp
 create mode 100644 src/scripts/instances/pvp/thefeast/TheFeast4on4Ranked.cpp
 create mode 100644 src/scripts/instances/pvp/thefeast/TheFeast4on4Training.cpp
 create mode 100644 src/scripts/instances/pvp/thefeast/TheFeastCustomMatchCrystalTower.cpp
 create mode 100644 src/scripts/instances/pvp/thefeast/TheFeastCustomMatchFeastingGrounds.cpp
 create mode 100644 src/scripts/instances/pvp/thefeast/TheFeastCustomMatchLichenweed.cpp
 create mode 100644 src/scripts/instances/pvp/thefeast/TheFeastRanked.cpp
 create mode 100644 src/scripts/instances/pvp/thefeast/TheFeastTeamCustomMatchCrystalTower.cpp
 create mode 100644 src/scripts/instances/pvp/thefeast/TheFeastTeamRanked.cpp
 create mode 100644 src/scripts/instances/pvp/thefeast/TheFeastTraining.cpp
 create mode 100644 src/scripts/instances/questbattles/EmissaryoftheDawn.cpp
 create mode 100644 src/scripts/instances/questbattles/TheWilloftheMoon.cpp
 create mode 100644 src/scripts/instances/raids/AlphascapeV10.cpp
 create mode 100644 src/scripts/instances/raids/AlphascapeV10Savage.cpp
 create mode 100644 src/scripts/instances/raids/AlphascapeV20.cpp
 create mode 100644 src/scripts/instances/raids/AlphascapeV20Savage.cpp
 create mode 100644 src/scripts/instances/raids/AlphascapeV30.cpp
 create mode 100644 src/scripts/instances/raids/AlphascapeV30Savage.cpp
 create mode 100644 src/scripts/instances/raids/AlphascapeV40.cpp
 create mode 100644 src/scripts/instances/raids/AlphascapeV40Savage.cpp
 create mode 100644 src/scripts/instances/raids/TheOrbonneMonastery.cpp
 create mode 100644 src/scripts/instances/raids/TheRidoranaLighthouse.cpp
 create mode 100644 src/scripts/instances/treasurehunt/TheShiftingAltarsofUznair.cpp
 create mode 100644 src/scripts/instances/trials/CastrumFluminis.cpp
 create mode 100644 src/scripts/instances/trials/HellsKier.cpp
 create mode 100644 src/scripts/instances/trials/HellsKierExtreme.cpp
 create mode 100644 src/scripts/instances/trials/TheGreatHunt.cpp
 create mode 100644 src/scripts/instances/trials/TheGreatHuntExtreme.cpp
 create mode 100644 src/scripts/instances/trials/TheMinstrelsBalladTsukuyomisPain.cpp
 create mode 100644 src/scripts/instances/trials/TheWreathofSnakes.cpp
 create mode 100644 src/scripts/instances/trials/TheWreathofSnakesExtreme.cpp

diff --git a/src/scripts/instances/ScriptLoader.cpp b/src/scripts/instances/ScriptLoader.cpp
index 1616c052..ea958b95 100644
--- a/src/scripts/instances/ScriptLoader.cpp
+++ b/src/scripts/instances/ScriptLoader.cpp
@@ -1,5 +1,15 @@
 #include <Script/NativeScriptApi.h>
 
+extern Sapphire::ScriptAPI::ScriptObject* makeScriptHeavenonHighFloors110();
+extern Sapphire::ScriptAPI::ScriptObject* makeScriptHeavenonHighFloors1120();
+extern Sapphire::ScriptAPI::ScriptObject* makeScriptHeavenonHighFloors2130();
+extern Sapphire::ScriptAPI::ScriptObject* makeScriptHeavenonHighFloors3140();
+extern Sapphire::ScriptAPI::ScriptObject* makeScriptHeavenonHighFloors4150();
+extern Sapphire::ScriptAPI::ScriptObject* makeScriptHeavenonHighFloors5160();
+extern Sapphire::ScriptAPI::ScriptObject* makeScriptHeavenonHighFloors6170();
+extern Sapphire::ScriptAPI::ScriptObject* makeScriptHeavenonHighFloors7180();
+extern Sapphire::ScriptAPI::ScriptObject* makeScriptHeavenonHighFloors8190();
+extern Sapphire::ScriptAPI::ScriptObject* makeScriptHeavenonHighFloors91100();
 extern Sapphire::ScriptAPI::ScriptObject* makeScriptThePalaceoftheDeadFloors101110();
 extern Sapphire::ScriptAPI::ScriptObject* makeScriptThePalaceoftheDeadFloors110();
 extern Sapphire::ScriptAPI::ScriptObject* makeScriptThePalaceoftheDeadFloors111120();
@@ -46,6 +56,7 @@ extern Sapphire::ScriptAPI::ScriptObject* makeScriptNeverreap();
 extern Sapphire::ScriptAPI::ScriptObject* makeScriptPharosSirius();
 extern Sapphire::ScriptAPI::ScriptObject* makeScriptPharosSiriusHard();
 extern Sapphire::ScriptAPI::ScriptObject* makeScriptSaintMociannesArboretum();
+extern Sapphire::ScriptAPI::ScriptObject* makeScriptSaintMociannesArboretumHard();
 extern Sapphire::ScriptAPI::ScriptObject* makeScriptSastasha();
 extern Sapphire::ScriptAPI::ScriptObject* makeScriptSastashaHard();
 extern Sapphire::ScriptAPI::ScriptObject* makeScriptShisuioftheVioletTides();
@@ -57,10 +68,12 @@ extern Sapphire::ScriptAPI::ScriptObject* makeScriptTheAery();
 extern Sapphire::ScriptAPI::ScriptObject* makeScriptTheAetherochemicalResearchFacility();
 extern Sapphire::ScriptAPI::ScriptObject* makeScriptTheAntitower();
 extern Sapphire::ScriptAPI::ScriptObject* makeScriptTheAurumVale();
+extern Sapphire::ScriptAPI::ScriptObject* makeScriptTheBurn();
 extern Sapphire::ScriptAPI::ScriptObject* makeScriptTheDrownedCityofSkalla();
 extern Sapphire::ScriptAPI::ScriptObject* makeScriptTheDuskVigil();
 extern Sapphire::ScriptAPI::ScriptObject* makeScriptTheFractalContinuum();
 extern Sapphire::ScriptAPI::ScriptObject* makeScriptTheFractalContinuumHard();
+extern Sapphire::ScriptAPI::ScriptObject* makeScriptTheGhimlytDark();
 extern Sapphire::ScriptAPI::ScriptObject* makeScriptTheGreatGubalLibrary();
 extern Sapphire::ScriptAPI::ScriptObject* makeScriptTheGreatGubalLibraryHard();
 extern Sapphire::ScriptAPI::ScriptObject* makeScriptTheKeeperoftheLake();
@@ -72,6 +85,7 @@ extern Sapphire::ScriptAPI::ScriptObject* makeScriptTheStoneVigil();
 extern Sapphire::ScriptAPI::ScriptObject* makeScriptTheStoneVigilHard();
 extern Sapphire::ScriptAPI::ScriptObject* makeScriptTheSunkenTempleofQarn();
 extern Sapphire::ScriptAPI::ScriptObject* makeScriptTheSunkenTempleofQarnHard();
+extern Sapphire::ScriptAPI::ScriptObject* makeScriptTheSwallowsCompass();
 extern Sapphire::ScriptAPI::ScriptObject* makeScriptTheTamTaraDeepcroft();
 extern Sapphire::ScriptAPI::ScriptObject* makeScriptTheTamTaraDeepcroftHard();
 extern Sapphire::ScriptAPI::ScriptObject* makeScriptTheTempleoftheFist();
@@ -82,6 +96,11 @@ extern Sapphire::ScriptAPI::ScriptObject* makeScriptTheWanderersPalaceHard();
 extern Sapphire::ScriptAPI::ScriptObject* makeScriptXelphatol();
 extern Sapphire::ScriptAPI::ScriptObject* makeScriptTheHauntedManor();
 extern Sapphire::ScriptAPI::ScriptObject* makeScriptTheValentionesCeremony();
+extern Sapphire::ScriptAPI::ScriptObject* makeScriptAirForceOne();
+extern Sapphire::ScriptAPI::ScriptObject* makeScriptAdvancedMahjongRanked();
+extern Sapphire::ScriptAPI::ScriptObject* makeScriptFourplayerMahjongKuitanDisabled();
+extern Sapphire::ScriptAPI::ScriptObject* makeScriptFourplayerMahjongKuitanEnabled();
+extern Sapphire::ScriptAPI::ScriptObject* makeScriptNoviceMahjongRanked();
 extern Sapphire::ScriptAPI::ScriptObject* makeScriptAllsWellthatEndsintheWell();
 extern Sapphire::ScriptAPI::ScriptObject* makeScriptAnnoytheVoid();
 extern Sapphire::ScriptAPI::ScriptObject* makeScriptBasicTrainingEnemyParties();
@@ -110,25 +129,52 @@ extern Sapphire::ScriptAPI::ScriptObject* makeScriptFinalExercise();
 extern Sapphire::ScriptAPI::ScriptObject* makeScriptHealMultipleAllies();
 extern Sapphire::ScriptAPI::ScriptObject* makeScriptHealanAlly();
 extern Sapphire::ScriptAPI::ScriptObject* makeScriptInteractwiththeBattlefield();
-extern Sapphire::ScriptAPI::ScriptObject* makeScriptAstragalos();
+extern Sapphire::ScriptAPI::ScriptObject* makeScriptAChorusSlime();
+extern Sapphire::ScriptAPI::ScriptObject* makeScriptALittleKnightMusic();
+extern Sapphire::ScriptAPI::ScriptObject* makeScriptAllsWellThatStartsWell();
+extern Sapphire::ScriptAPI::ScriptObject* makeScriptAmazingTechnicolorPitFiends();
+extern Sapphire::ScriptAPI::ScriptObject* makeScriptBeautyandaBeast();
+extern Sapphire::ScriptAPI::ScriptObject* makeScriptBehemothsandBroomsticks();
+extern Sapphire::ScriptAPI::ScriptObject* makeScriptBlobsintheWoods();
+extern Sapphire::ScriptAPI::ScriptObject* makeScriptBombedyofErrors();
+extern Sapphire::ScriptAPI::ScriptObject* makeScriptChimeraonaHotTinRoof();
+extern Sapphire::ScriptAPI::ScriptObject* makeScriptDirtyRottenAzulmagia();
+extern Sapphire::ScriptAPI::ScriptObject* makeScriptEyeSociety();
+extern Sapphire::ScriptAPI::ScriptObject* makeScriptGentlemenPreferSwords();
+extern Sapphire::ScriptAPI::ScriptObject* makeScriptHereComestheBoom();
+extern Sapphire::ScriptAPI::ScriptObject* makeScriptMidsummerNightsExplosion();
+extern Sapphire::ScriptAPI::ScriptObject* makeScriptMissTyphon();
+extern Sapphire::ScriptAPI::ScriptObject* makeScriptMuchAdoAboutPudding();
+extern Sapphire::ScriptAPI::ScriptObject* makeScriptOnaClearDayYouCanSmellForever();
+extern Sapphire::ScriptAPI::ScriptObject* makeScriptSomeLikeItExcruciatinglyHot();
+extern Sapphire::ScriptAPI::ScriptObject* makeScriptSunsetBullevard();
+extern Sapphire::ScriptAPI::ScriptObject* makeScriptTheMeNobodyNodes();
+extern Sapphire::ScriptAPI::ScriptObject* makeScriptThePlantomoftheOpera();
+extern Sapphire::ScriptAPI::ScriptObject* makeScriptTheSwordofMusic();
+extern Sapphire::ScriptAPI::ScriptObject* makeScriptTheThreepennyTurtles();
+extern Sapphire::ScriptAPI::ScriptObject* makeScriptToKillaMockingslime();
+extern Sapphire::ScriptAPI::ScriptObject* makeScriptWaitingforGolem();
 extern Sapphire::ScriptAPI::ScriptObject* makeScriptSealRockSeize();
 extern Sapphire::ScriptAPI::ScriptObject* makeScriptTheBorderlandRuinsSecure();
-extern Sapphire::ScriptAPI::ScriptObject* makeScriptTheFeast4on4LightParty();
+extern Sapphire::ScriptAPI::ScriptObject* makeScriptTheFieldsofGloryShatter();
+extern Sapphire::ScriptAPI::ScriptObject* makeScriptAstragalos();
+extern Sapphire::ScriptAPI::ScriptObject* makeScriptHiddenGorge();
 extern Sapphire::ScriptAPI::ScriptObject* makeScriptTheFeast4on4Ranked();
 extern Sapphire::ScriptAPI::ScriptObject* makeScriptTheFeast4on4Training();
 extern Sapphire::ScriptAPI::ScriptObject* makeScriptTheFeastCustomMatchCrystalTower();
 extern Sapphire::ScriptAPI::ScriptObject* makeScriptTheFeastCustomMatchFeastingGrounds();
 extern Sapphire::ScriptAPI::ScriptObject* makeScriptTheFeastCustomMatchLichenweed();
 extern Sapphire::ScriptAPI::ScriptObject* makeScriptTheFeastRanked();
+extern Sapphire::ScriptAPI::ScriptObject* makeScriptTheFeastTeamCustomMatchCrystalTower();
 extern Sapphire::ScriptAPI::ScriptObject* makeScriptTheFeastTeamRanked();
 extern Sapphire::ScriptAPI::ScriptObject* makeScriptTheFeastTraining();
-extern Sapphire::ScriptAPI::ScriptObject* makeScriptTheFieldsofGloryShatter();
 extern Sapphire::ScriptAPI::ScriptObject* makeScriptABloodyReunion();
 extern Sapphire::ScriptAPI::ScriptObject* makeScriptASpectaclefortheAges();
 extern Sapphire::ScriptAPI::ScriptObject* makeScriptBloodDragoon();
 extern Sapphire::ScriptAPI::ScriptObject* makeScriptBloodontheDeck();
 extern Sapphire::ScriptAPI::ScriptObject* makeScriptCuriousGorgeMeetsHisMatch();
 extern Sapphire::ScriptAPI::ScriptObject* makeScriptDarkwingDragon();
+extern Sapphire::ScriptAPI::ScriptObject* makeScriptEmissaryoftheDawn();
 extern Sapphire::ScriptAPI::ScriptObject* makeScriptInThalsName();
 extern Sapphire::ScriptAPI::ScriptObject* makeScriptInterdimensionalRift();
 extern Sapphire::ScriptAPI::ScriptObject* makeScriptItsProbablyaTrap();
@@ -145,6 +191,7 @@ extern Sapphire::ScriptAPI::ScriptObject* makeScriptTheFaceofTrueEvil();
 extern Sapphire::ScriptAPI::ScriptObject* makeScriptTheHeartoftheProblem();
 extern Sapphire::ScriptAPI::ScriptObject* makeScriptTheOrphansandtheBrokenBlade();
 extern Sapphire::ScriptAPI::ScriptObject* makeScriptTheResonant();
+extern Sapphire::ScriptAPI::ScriptObject* makeScriptTheWilloftheMoon();
 extern Sapphire::ScriptAPI::ScriptObject* makeScriptWhenClansCollide();
 extern Sapphire::ScriptAPI::ScriptObject* makeScriptWithHeartandSteel();
 extern Sapphire::ScriptAPI::ScriptObject* makeScriptAlexanderTheArmoftheFather();
@@ -171,6 +218,14 @@ extern Sapphire::ScriptAPI::ScriptObject* makeScriptAlexanderTheHeartoftheCreato
 extern Sapphire::ScriptAPI::ScriptObject* makeScriptAlexanderTheHeartoftheCreatorSavage();
 extern Sapphire::ScriptAPI::ScriptObject* makeScriptAlexanderTheSouloftheCreator();
 extern Sapphire::ScriptAPI::ScriptObject* makeScriptAlexanderTheSouloftheCreatorSavage();
+extern Sapphire::ScriptAPI::ScriptObject* makeScriptAlphascapeV10();
+extern Sapphire::ScriptAPI::ScriptObject* makeScriptAlphascapeV10Savage();
+extern Sapphire::ScriptAPI::ScriptObject* makeScriptAlphascapeV20();
+extern Sapphire::ScriptAPI::ScriptObject* makeScriptAlphascapeV20Savage();
+extern Sapphire::ScriptAPI::ScriptObject* makeScriptAlphascapeV30();
+extern Sapphire::ScriptAPI::ScriptObject* makeScriptAlphascapeV30Savage();
+extern Sapphire::ScriptAPI::ScriptObject* makeScriptAlphascapeV40();
+extern Sapphire::ScriptAPI::ScriptObject* makeScriptAlphascapeV40Savage();
 extern Sapphire::ScriptAPI::ScriptObject* makeScriptDeltascapeV10();
 extern Sapphire::ScriptAPI::ScriptObject* makeScriptDeltascapeV10Savage();
 extern Sapphire::ScriptAPI::ScriptObject* makeScriptDeltascapeV20();
@@ -199,6 +254,8 @@ extern Sapphire::ScriptAPI::ScriptObject* makeScriptTheFinalCoilofBahamutTurn2()
 extern Sapphire::ScriptAPI::ScriptObject* makeScriptTheFinalCoilofBahamutTurn3();
 extern Sapphire::ScriptAPI::ScriptObject* makeScriptTheFinalCoilofBahamutTurn4();
 extern Sapphire::ScriptAPI::ScriptObject* makeScriptTheLabyrinthoftheAncients();
+extern Sapphire::ScriptAPI::ScriptObject* makeScriptTheOrbonneMonastery();
+extern Sapphire::ScriptAPI::ScriptObject* makeScriptTheRidoranaLighthouse();
 extern Sapphire::ScriptAPI::ScriptObject* makeScriptTheRoyalCityofRabanastre();
 extern Sapphire::ScriptAPI::ScriptObject* makeScriptTheSecondCoilofBahamutSavageTurn1();
 extern Sapphire::ScriptAPI::ScriptObject* makeScriptTheSecondCoilofBahamutSavageTurn2();
@@ -216,6 +273,7 @@ extern Sapphire::ScriptAPI::ScriptObject* makeScriptTheWorldofDarkness();
 extern Sapphire::ScriptAPI::ScriptObject* makeScriptTheAquapolis();
 extern Sapphire::ScriptAPI::ScriptObject* makeScriptTheHiddenCanalsofUznair();
 extern Sapphire::ScriptAPI::ScriptObject* makeScriptTheLostCanalsofUznair();
+extern Sapphire::ScriptAPI::ScriptObject* makeScriptTheShiftingAltarsofUznair();
 extern Sapphire::ScriptAPI::ScriptObject* makeScriptARelicReborntheChimera();
 extern Sapphire::ScriptAPI::ScriptObject* makeScriptARelicReborntheHydra();
 extern Sapphire::ScriptAPI::ScriptObject* makeScriptAkhAfahAmphitheatreExtreme();
@@ -223,6 +281,7 @@ extern Sapphire::ScriptAPI::ScriptObject* makeScriptAkhAfahAmphitheatreHard();
 extern Sapphire::ScriptAPI::ScriptObject* makeScriptBattleintheBigKeep();
 extern Sapphire::ScriptAPI::ScriptObject* makeScriptBattleontheBigBridge();
 extern Sapphire::ScriptAPI::ScriptObject* makeScriptCapeWestwind();
+extern Sapphire::ScriptAPI::ScriptObject* makeScriptCastrumFluminis();
 extern Sapphire::ScriptAPI::ScriptObject* makeScriptContainmentBayP1T6();
 extern Sapphire::ScriptAPI::ScriptObject* makeScriptContainmentBayP1T6Extreme();
 extern Sapphire::ScriptAPI::ScriptObject* makeScriptContainmentBayS1T7();
@@ -231,6 +290,8 @@ extern Sapphire::ScriptAPI::ScriptObject* makeScriptContainmentBayZ1T9();
 extern Sapphire::ScriptAPI::ScriptObject* makeScriptContainmentBayZ1T9Extreme();
 extern Sapphire::ScriptAPI::ScriptObject* makeScriptEmanation();
 extern Sapphire::ScriptAPI::ScriptObject* makeScriptEmanationExtreme();
+extern Sapphire::ScriptAPI::ScriptObject* makeScriptHellsKier();
+extern Sapphire::ScriptAPI::ScriptObject* makeScriptHellsKierExtreme();
 extern Sapphire::ScriptAPI::ScriptObject* makeScriptSpecialEventI();
 extern Sapphire::ScriptAPI::ScriptObject* makeScriptSpecialEventII();
 extern Sapphire::ScriptAPI::ScriptObject* makeScriptSpecialEventIII();
@@ -240,6 +301,8 @@ extern Sapphire::ScriptAPI::ScriptObject* makeScriptTheBowlofEmbersHard();
 extern Sapphire::ScriptAPI::ScriptObject* makeScriptTheChrysalis();
 extern Sapphire::ScriptAPI::ScriptObject* makeScriptTheDragonsNeck();
 extern Sapphire::ScriptAPI::ScriptObject* makeScriptTheFinalStepsofFaith();
+extern Sapphire::ScriptAPI::ScriptObject* makeScriptTheGreatHunt();
+extern Sapphire::ScriptAPI::ScriptObject* makeScriptTheGreatHuntExtreme();
 extern Sapphire::ScriptAPI::ScriptObject* makeScriptTheHowlingEye();
 extern Sapphire::ScriptAPI::ScriptObject* makeScriptTheHowlingEyeExtreme();
 extern Sapphire::ScriptAPI::ScriptObject* makeScriptTheHowlingEyeHard();
@@ -250,6 +313,7 @@ extern Sapphire::ScriptAPI::ScriptObject* makeScriptTheLimitlessBlueHard();
 extern Sapphire::ScriptAPI::ScriptObject* makeScriptTheMinstrelsBalladNidhoggsRage();
 extern Sapphire::ScriptAPI::ScriptObject* makeScriptTheMinstrelsBalladShinryusDomain();
 extern Sapphire::ScriptAPI::ScriptObject* makeScriptTheMinstrelsBalladThordansReign();
+extern Sapphire::ScriptAPI::ScriptObject* makeScriptTheMinstrelsBalladTsukuyomisPain();
 extern Sapphire::ScriptAPI::ScriptObject* makeScriptTheMinstrelsBalladUltimasBane();
 extern Sapphire::ScriptAPI::ScriptObject* makeScriptTheNavel();
 extern Sapphire::ScriptAPI::ScriptObject* makeScriptTheNavelExtreme();
@@ -263,6 +327,8 @@ extern Sapphire::ScriptAPI::ScriptObject* makeScriptTheStrikingTreeExtreme();
 extern Sapphire::ScriptAPI::ScriptObject* makeScriptTheStrikingTreeHard();
 extern Sapphire::ScriptAPI::ScriptObject* makeScriptTheWhorleaterExtreme();
 extern Sapphire::ScriptAPI::ScriptObject* makeScriptTheWhorleaterHard();
+extern Sapphire::ScriptAPI::ScriptObject* makeScriptTheWreathofSnakes();
+extern Sapphire::ScriptAPI::ScriptObject* makeScriptTheWreathofSnakesExtreme();
 extern Sapphire::ScriptAPI::ScriptObject* makeScriptThokastThokExtreme();
 extern Sapphire::ScriptAPI::ScriptObject* makeScriptThokastThokHard();
 extern Sapphire::ScriptAPI::ScriptObject* makeScriptThornmarchExtreme();
@@ -271,6 +337,16 @@ extern Sapphire::ScriptAPI::ScriptObject* makeScriptUrthsFount();
 
 const Sapphire::ScriptAPI::ScriptObject* ptrs[] =
 {
+   makeScriptHeavenonHighFloors110(),
+   makeScriptHeavenonHighFloors1120(),
+   makeScriptHeavenonHighFloors2130(),
+   makeScriptHeavenonHighFloors3140(),
+   makeScriptHeavenonHighFloors4150(),
+   makeScriptHeavenonHighFloors5160(),
+   makeScriptHeavenonHighFloors6170(),
+   makeScriptHeavenonHighFloors7180(),
+   makeScriptHeavenonHighFloors8190(),
+   makeScriptHeavenonHighFloors91100(),
    makeScriptThePalaceoftheDeadFloors101110(),
    makeScriptThePalaceoftheDeadFloors110(),
    makeScriptThePalaceoftheDeadFloors111120(),
@@ -317,6 +393,7 @@ const Sapphire::ScriptAPI::ScriptObject* ptrs[] =
    makeScriptPharosSirius(),
    makeScriptPharosSiriusHard(),
    makeScriptSaintMociannesArboretum(),
+   makeScriptSaintMociannesArboretumHard(),
    makeScriptSastasha(),
    makeScriptSastashaHard(),
    makeScriptShisuioftheVioletTides(),
@@ -328,10 +405,12 @@ const Sapphire::ScriptAPI::ScriptObject* ptrs[] =
    makeScriptTheAetherochemicalResearchFacility(),
    makeScriptTheAntitower(),
    makeScriptTheAurumVale(),
+   makeScriptTheBurn(),
    makeScriptTheDrownedCityofSkalla(),
    makeScriptTheDuskVigil(),
    makeScriptTheFractalContinuum(),
    makeScriptTheFractalContinuumHard(),
+   makeScriptTheGhimlytDark(),
    makeScriptTheGreatGubalLibrary(),
    makeScriptTheGreatGubalLibraryHard(),
    makeScriptTheKeeperoftheLake(),
@@ -343,6 +422,7 @@ const Sapphire::ScriptAPI::ScriptObject* ptrs[] =
    makeScriptTheStoneVigilHard(),
    makeScriptTheSunkenTempleofQarn(),
    makeScriptTheSunkenTempleofQarnHard(),
+   makeScriptTheSwallowsCompass(),
    makeScriptTheTamTaraDeepcroft(),
    makeScriptTheTamTaraDeepcroftHard(),
    makeScriptTheTempleoftheFist(),
@@ -353,6 +433,11 @@ const Sapphire::ScriptAPI::ScriptObject* ptrs[] =
    makeScriptXelphatol(),
    makeScriptTheHauntedManor(),
    makeScriptTheValentionesCeremony(),
+   makeScriptAirForceOne(),
+   makeScriptAdvancedMahjongRanked(),
+   makeScriptFourplayerMahjongKuitanDisabled(),
+   makeScriptFourplayerMahjongKuitanEnabled(),
+   makeScriptNoviceMahjongRanked(),
    makeScriptAllsWellthatEndsintheWell(),
    makeScriptAnnoytheVoid(),
    makeScriptBasicTrainingEnemyParties(),
@@ -381,25 +466,52 @@ const Sapphire::ScriptAPI::ScriptObject* ptrs[] =
    makeScriptHealMultipleAllies(),
    makeScriptHealanAlly(),
    makeScriptInteractwiththeBattlefield(),
-   makeScriptAstragalos(),
+   makeScriptAChorusSlime(),
+   makeScriptALittleKnightMusic(),
+   makeScriptAllsWellThatStartsWell(),
+   makeScriptAmazingTechnicolorPitFiends(),
+   makeScriptBeautyandaBeast(),
+   makeScriptBehemothsandBroomsticks(),
+   makeScriptBlobsintheWoods(),
+   makeScriptBombedyofErrors(),
+   makeScriptChimeraonaHotTinRoof(),
+   makeScriptDirtyRottenAzulmagia(),
+   makeScriptEyeSociety(),
+   makeScriptGentlemenPreferSwords(),
+   makeScriptHereComestheBoom(),
+   makeScriptMidsummerNightsExplosion(),
+   makeScriptMissTyphon(),
+   makeScriptMuchAdoAboutPudding(),
+   makeScriptOnaClearDayYouCanSmellForever(),
+   makeScriptSomeLikeItExcruciatinglyHot(),
+   makeScriptSunsetBullevard(),
+   makeScriptTheMeNobodyNodes(),
+   makeScriptThePlantomoftheOpera(),
+   makeScriptTheSwordofMusic(),
+   makeScriptTheThreepennyTurtles(),
+   makeScriptToKillaMockingslime(),
+   makeScriptWaitingforGolem(),
    makeScriptSealRockSeize(),
    makeScriptTheBorderlandRuinsSecure(),
-   makeScriptTheFeast4on4LightParty(),
+   makeScriptTheFieldsofGloryShatter(),
+   makeScriptAstragalos(),
+   makeScriptHiddenGorge(),
    makeScriptTheFeast4on4Ranked(),
    makeScriptTheFeast4on4Training(),
    makeScriptTheFeastCustomMatchCrystalTower(),
    makeScriptTheFeastCustomMatchFeastingGrounds(),
    makeScriptTheFeastCustomMatchLichenweed(),
    makeScriptTheFeastRanked(),
+   makeScriptTheFeastTeamCustomMatchCrystalTower(),
    makeScriptTheFeastTeamRanked(),
    makeScriptTheFeastTraining(),
-   makeScriptTheFieldsofGloryShatter(),
    makeScriptABloodyReunion(),
    makeScriptASpectaclefortheAges(),
    makeScriptBloodDragoon(),
    makeScriptBloodontheDeck(),
    makeScriptCuriousGorgeMeetsHisMatch(),
    makeScriptDarkwingDragon(),
+   makeScriptEmissaryoftheDawn(),
    makeScriptInThalsName(),
    makeScriptInterdimensionalRift(),
    makeScriptItsProbablyaTrap(),
@@ -416,6 +528,7 @@ const Sapphire::ScriptAPI::ScriptObject* ptrs[] =
    makeScriptTheHeartoftheProblem(),
    makeScriptTheOrphansandtheBrokenBlade(),
    makeScriptTheResonant(),
+   makeScriptTheWilloftheMoon(),
    makeScriptWhenClansCollide(),
    makeScriptWithHeartandSteel(),
    makeScriptAlexanderTheArmoftheFather(),
@@ -442,6 +555,14 @@ const Sapphire::ScriptAPI::ScriptObject* ptrs[] =
    makeScriptAlexanderTheHeartoftheCreatorSavage(),
    makeScriptAlexanderTheSouloftheCreator(),
    makeScriptAlexanderTheSouloftheCreatorSavage(),
+   makeScriptAlphascapeV10(),
+   makeScriptAlphascapeV10Savage(),
+   makeScriptAlphascapeV20(),
+   makeScriptAlphascapeV20Savage(),
+   makeScriptAlphascapeV30(),
+   makeScriptAlphascapeV30Savage(),
+   makeScriptAlphascapeV40(),
+   makeScriptAlphascapeV40Savage(),
    makeScriptDeltascapeV10(),
    makeScriptDeltascapeV10Savage(),
    makeScriptDeltascapeV20(),
@@ -470,6 +591,8 @@ const Sapphire::ScriptAPI::ScriptObject* ptrs[] =
    makeScriptTheFinalCoilofBahamutTurn3(),
    makeScriptTheFinalCoilofBahamutTurn4(),
    makeScriptTheLabyrinthoftheAncients(),
+   makeScriptTheOrbonneMonastery(),
+   makeScriptTheRidoranaLighthouse(),
    makeScriptTheRoyalCityofRabanastre(),
    makeScriptTheSecondCoilofBahamutSavageTurn1(),
    makeScriptTheSecondCoilofBahamutSavageTurn2(),
@@ -487,6 +610,7 @@ const Sapphire::ScriptAPI::ScriptObject* ptrs[] =
    makeScriptTheAquapolis(),
    makeScriptTheHiddenCanalsofUznair(),
    makeScriptTheLostCanalsofUznair(),
+   makeScriptTheShiftingAltarsofUznair(),
    makeScriptARelicReborntheChimera(),
    makeScriptARelicReborntheHydra(),
    makeScriptAkhAfahAmphitheatreExtreme(),
@@ -494,6 +618,7 @@ const Sapphire::ScriptAPI::ScriptObject* ptrs[] =
    makeScriptBattleintheBigKeep(),
    makeScriptBattleontheBigBridge(),
    makeScriptCapeWestwind(),
+   makeScriptCastrumFluminis(),
    makeScriptContainmentBayP1T6(),
    makeScriptContainmentBayP1T6Extreme(),
    makeScriptContainmentBayS1T7(),
@@ -502,6 +627,8 @@ const Sapphire::ScriptAPI::ScriptObject* ptrs[] =
    makeScriptContainmentBayZ1T9Extreme(),
    makeScriptEmanation(),
    makeScriptEmanationExtreme(),
+   makeScriptHellsKier(),
+   makeScriptHellsKierExtreme(),
    makeScriptSpecialEventI(),
    makeScriptSpecialEventII(),
    makeScriptSpecialEventIII(),
@@ -511,6 +638,8 @@ const Sapphire::ScriptAPI::ScriptObject* ptrs[] =
    makeScriptTheChrysalis(),
    makeScriptTheDragonsNeck(),
    makeScriptTheFinalStepsofFaith(),
+   makeScriptTheGreatHunt(),
+   makeScriptTheGreatHuntExtreme(),
    makeScriptTheHowlingEye(),
    makeScriptTheHowlingEyeExtreme(),
    makeScriptTheHowlingEyeHard(),
@@ -521,6 +650,7 @@ const Sapphire::ScriptAPI::ScriptObject* ptrs[] =
    makeScriptTheMinstrelsBalladNidhoggsRage(),
    makeScriptTheMinstrelsBalladShinryusDomain(),
    makeScriptTheMinstrelsBalladThordansReign(),
+   makeScriptTheMinstrelsBalladTsukuyomisPain(),
    makeScriptTheMinstrelsBalladUltimasBane(),
    makeScriptTheNavel(),
    makeScriptTheNavelExtreme(),
@@ -534,6 +664,8 @@ const Sapphire::ScriptAPI::ScriptObject* ptrs[] =
    makeScriptTheStrikingTreeHard(),
    makeScriptTheWhorleaterExtreme(),
    makeScriptTheWhorleaterHard(),
+   makeScriptTheWreathofSnakes(),
+   makeScriptTheWreathofSnakesExtreme(),
    makeScriptThokastThokExtreme(),
    makeScriptThokastThokHard(),
    makeScriptThornmarchExtreme(),
diff --git a/src/scripts/instances/deepdungeon/HeavenonHighFloors110.cpp b/src/scripts/instances/deepdungeon/HeavenonHighFloors110.cpp
new file mode 100644
index 00000000..cefc58bf
--- /dev/null
+++ b/src/scripts/instances/deepdungeon/HeavenonHighFloors110.cpp
@@ -0,0 +1,34 @@
+#include <ScriptObject.h>
+#include <Territory/InstanceContent.h>
+
+using namespace Sapphire;
+
+class HeavenonHighFloors110 :
+  public Sapphire::ScriptAPI::InstanceContentScript
+{
+public:
+  HeavenonHighFloors110() :
+    Sapphire::ScriptAPI::InstanceContentScript( 60021 )
+  { }
+
+  void onInit( InstanceContent& instance ) override
+  {
+    instance.registerEObj( "sgvf_w_lvd_b0959", 2002872, 7394359, 4, { -300.000000f, -0.000008f, -325.000000f }, 1.000000f, 0.000000f ); 
+      // States -> vf_bextwall_on (id: 3) vf_bextwall_on2off (id: 4) vf_bextwall_off (id: 10) 
+
+  }
+
+  void onUpdate( InstanceContent& instance, uint32_t currTime ) override
+  {
+
+  }
+
+  void onEnterTerritory( InstanceContent& instance, Entity::Player& player, uint32_t eventId, uint16_t param1,
+                         uint16_t param2 ) override
+  {
+
+  }
+
+};
+
+EXPOSE_SCRIPT( HeavenonHighFloors110 );
\ No newline at end of file
diff --git a/src/scripts/instances/deepdungeon/HeavenonHighFloors1120.cpp b/src/scripts/instances/deepdungeon/HeavenonHighFloors1120.cpp
new file mode 100644
index 00000000..d3c2b474
--- /dev/null
+++ b/src/scripts/instances/deepdungeon/HeavenonHighFloors1120.cpp
@@ -0,0 +1,34 @@
+#include <ScriptObject.h>
+#include <Territory/InstanceContent.h>
+
+using namespace Sapphire;
+
+class HeavenonHighFloors1120 :
+  public Sapphire::ScriptAPI::InstanceContentScript
+{
+public:
+  HeavenonHighFloors1120() :
+    Sapphire::ScriptAPI::InstanceContentScript( 60022 )
+  { }
+
+  void onInit( InstanceContent& instance ) override
+  {
+    instance.registerEObj( "sgvf_w_lvd_b0959", 2002872, 7394576, 4, { -300.000000f, -0.000008f, -325.000000f }, 1.000000f, 0.000000f ); 
+      // States -> vf_bextwall_on (id: 3) vf_bextwall_on2off (id: 4) vf_bextwall_off (id: 10) 
+
+  }
+
+  void onUpdate( InstanceContent& instance, uint32_t currTime ) override
+  {
+
+  }
+
+  void onEnterTerritory( InstanceContent& instance, Entity::Player& player, uint32_t eventId, uint16_t param1,
+                         uint16_t param2 ) override
+  {
+
+  }
+
+};
+
+EXPOSE_SCRIPT( HeavenonHighFloors1120 );
\ No newline at end of file
diff --git a/src/scripts/instances/deepdungeon/HeavenonHighFloors2130.cpp b/src/scripts/instances/deepdungeon/HeavenonHighFloors2130.cpp
new file mode 100644
index 00000000..6a7bfed1
--- /dev/null
+++ b/src/scripts/instances/deepdungeon/HeavenonHighFloors2130.cpp
@@ -0,0 +1,34 @@
+#include <ScriptObject.h>
+#include <Territory/InstanceContent.h>
+
+using namespace Sapphire;
+
+class HeavenonHighFloors2130 :
+  public Sapphire::ScriptAPI::InstanceContentScript
+{
+public:
+  HeavenonHighFloors2130() :
+    Sapphire::ScriptAPI::InstanceContentScript( 60023 )
+  { }
+
+  void onInit( InstanceContent& instance ) override
+  {
+    instance.registerEObj( "sgvf_w_lvd_b0959", 2002872, 7385164, 4, { -300.000000f, -0.000008f, -325.000000f }, 1.000000f, 0.000000f ); 
+      // States -> vf_bextwall_on (id: 3) vf_bextwall_on2off (id: 4) vf_bextwall_off (id: 10) 
+
+  }
+
+  void onUpdate( InstanceContent& instance, uint32_t currTime ) override
+  {
+
+  }
+
+  void onEnterTerritory( InstanceContent& instance, Entity::Player& player, uint32_t eventId, uint16_t param1,
+                         uint16_t param2 ) override
+  {
+
+  }
+
+};
+
+EXPOSE_SCRIPT( HeavenonHighFloors2130 );
\ No newline at end of file
diff --git a/src/scripts/instances/deepdungeon/HeavenonHighFloors3140.cpp b/src/scripts/instances/deepdungeon/HeavenonHighFloors3140.cpp
new file mode 100644
index 00000000..b11dbcbb
--- /dev/null
+++ b/src/scripts/instances/deepdungeon/HeavenonHighFloors3140.cpp
@@ -0,0 +1,34 @@
+#include <ScriptObject.h>
+#include <Territory/InstanceContent.h>
+
+using namespace Sapphire;
+
+class HeavenonHighFloors3140 :
+  public Sapphire::ScriptAPI::InstanceContentScript
+{
+public:
+  HeavenonHighFloors3140() :
+    Sapphire::ScriptAPI::InstanceContentScript( 60024 )
+  { }
+
+  void onInit( InstanceContent& instance ) override
+  {
+    instance.registerEObj( "sgvf_w_lvd_b0959", 2002872, 7385164, 4, { -300.000000f, -0.000008f, -325.000000f }, 1.000000f, 0.000000f ); 
+      // States -> vf_bextwall_on (id: 3) vf_bextwall_on2off (id: 4) vf_bextwall_off (id: 10) 
+
+  }
+
+  void onUpdate( InstanceContent& instance, uint32_t currTime ) override
+  {
+
+  }
+
+  void onEnterTerritory( InstanceContent& instance, Entity::Player& player, uint32_t eventId, uint16_t param1,
+                         uint16_t param2 ) override
+  {
+
+  }
+
+};
+
+EXPOSE_SCRIPT( HeavenonHighFloors3140 );
\ No newline at end of file
diff --git a/src/scripts/instances/deepdungeon/HeavenonHighFloors4150.cpp b/src/scripts/instances/deepdungeon/HeavenonHighFloors4150.cpp
new file mode 100644
index 00000000..c7627e20
--- /dev/null
+++ b/src/scripts/instances/deepdungeon/HeavenonHighFloors4150.cpp
@@ -0,0 +1,34 @@
+#include <ScriptObject.h>
+#include <Territory/InstanceContent.h>
+
+using namespace Sapphire;
+
+class HeavenonHighFloors4150 :
+  public Sapphire::ScriptAPI::InstanceContentScript
+{
+public:
+  HeavenonHighFloors4150() :
+    Sapphire::ScriptAPI::InstanceContentScript( 60025 )
+  { }
+
+  void onInit( InstanceContent& instance ) override
+  {
+    instance.registerEObj( "sgvf_w_lvd_b0959", 2000608, 7376353, 4, { -300.897095f, 0.442359f, -324.271790f }, 1.000000f, 0.000000f ); 
+      // States -> vf_bextwall_on (id: 3) vf_bextwall_on2off (id: 4) vf_bextwall_off (id: 10) 
+
+  }
+
+  void onUpdate( InstanceContent& instance, uint32_t currTime ) override
+  {
+
+  }
+
+  void onEnterTerritory( InstanceContent& instance, Entity::Player& player, uint32_t eventId, uint16_t param1,
+                         uint16_t param2 ) override
+  {
+
+  }
+
+};
+
+EXPOSE_SCRIPT( HeavenonHighFloors4150 );
\ No newline at end of file
diff --git a/src/scripts/instances/deepdungeon/HeavenonHighFloors5160.cpp b/src/scripts/instances/deepdungeon/HeavenonHighFloors5160.cpp
new file mode 100644
index 00000000..0d9b8cf0
--- /dev/null
+++ b/src/scripts/instances/deepdungeon/HeavenonHighFloors5160.cpp
@@ -0,0 +1,34 @@
+#include <ScriptObject.h>
+#include <Territory/InstanceContent.h>
+
+using namespace Sapphire;
+
+class HeavenonHighFloors5160 :
+  public Sapphire::ScriptAPI::InstanceContentScript
+{
+public:
+  HeavenonHighFloors5160() :
+    Sapphire::ScriptAPI::InstanceContentScript( 60026 )
+  { }
+
+  void onInit( InstanceContent& instance ) override
+  {
+    instance.registerEObj( "sgvf_w_lvd_b0959", 2000608, 7376353, 4, { -300.897095f, 0.442359f, -324.271790f }, 1.000000f, 0.000000f ); 
+      // States -> vf_bextwall_on (id: 3) vf_bextwall_on2off (id: 4) vf_bextwall_off (id: 10) 
+
+  }
+
+  void onUpdate( InstanceContent& instance, uint32_t currTime ) override
+  {
+
+  }
+
+  void onEnterTerritory( InstanceContent& instance, Entity::Player& player, uint32_t eventId, uint16_t param1,
+                         uint16_t param2 ) override
+  {
+
+  }
+
+};
+
+EXPOSE_SCRIPT( HeavenonHighFloors5160 );
\ No newline at end of file
diff --git a/src/scripts/instances/deepdungeon/HeavenonHighFloors6170.cpp b/src/scripts/instances/deepdungeon/HeavenonHighFloors6170.cpp
new file mode 100644
index 00000000..06936409
--- /dev/null
+++ b/src/scripts/instances/deepdungeon/HeavenonHighFloors6170.cpp
@@ -0,0 +1,34 @@
+#include <ScriptObject.h>
+#include <Territory/InstanceContent.h>
+
+using namespace Sapphire;
+
+class HeavenonHighFloors6170 :
+  public Sapphire::ScriptAPI::InstanceContentScript
+{
+public:
+  HeavenonHighFloors6170() :
+    Sapphire::ScriptAPI::InstanceContentScript( 60027 )
+  { }
+
+  void onInit( InstanceContent& instance ) override
+  {
+    instance.registerEObj( "sgvf_w_lvd_b0959", 2000608, 7375355, 4, { -300.897095f, 0.442359f, -324.271790f }, 1.000000f, 0.000000f ); 
+      // States -> vf_bextwall_on (id: 3) vf_bextwall_on2off (id: 4) vf_bextwall_off (id: 10) 
+
+  }
+
+  void onUpdate( InstanceContent& instance, uint32_t currTime ) override
+  {
+
+  }
+
+  void onEnterTerritory( InstanceContent& instance, Entity::Player& player, uint32_t eventId, uint16_t param1,
+                         uint16_t param2 ) override
+  {
+
+  }
+
+};
+
+EXPOSE_SCRIPT( HeavenonHighFloors6170 );
\ No newline at end of file
diff --git a/src/scripts/instances/deepdungeon/HeavenonHighFloors7180.cpp b/src/scripts/instances/deepdungeon/HeavenonHighFloors7180.cpp
new file mode 100644
index 00000000..0092a40f
--- /dev/null
+++ b/src/scripts/instances/deepdungeon/HeavenonHighFloors7180.cpp
@@ -0,0 +1,34 @@
+#include <ScriptObject.h>
+#include <Territory/InstanceContent.h>
+
+using namespace Sapphire;
+
+class HeavenonHighFloors7180 :
+  public Sapphire::ScriptAPI::InstanceContentScript
+{
+public:
+  HeavenonHighFloors7180() :
+    Sapphire::ScriptAPI::InstanceContentScript( 60028 )
+  { }
+
+  void onInit( InstanceContent& instance ) override
+  {
+    instance.registerEObj( "sgvf_w_lvd_b0959", 2000608, 7375355, 4, { -300.897095f, 0.442359f, -324.271790f }, 1.000000f, 0.000000f ); 
+      // States -> vf_bextwall_on (id: 3) vf_bextwall_on2off (id: 4) vf_bextwall_off (id: 10) 
+
+  }
+
+  void onUpdate( InstanceContent& instance, uint32_t currTime ) override
+  {
+
+  }
+
+  void onEnterTerritory( InstanceContent& instance, Entity::Player& player, uint32_t eventId, uint16_t param1,
+                         uint16_t param2 ) override
+  {
+
+  }
+
+};
+
+EXPOSE_SCRIPT( HeavenonHighFloors7180 );
\ No newline at end of file
diff --git a/src/scripts/instances/deepdungeon/HeavenonHighFloors8190.cpp b/src/scripts/instances/deepdungeon/HeavenonHighFloors8190.cpp
new file mode 100644
index 00000000..b2797263
--- /dev/null
+++ b/src/scripts/instances/deepdungeon/HeavenonHighFloors8190.cpp
@@ -0,0 +1,34 @@
+#include <ScriptObject.h>
+#include <Territory/InstanceContent.h>
+
+using namespace Sapphire;
+
+class HeavenonHighFloors8190 :
+  public Sapphire::ScriptAPI::InstanceContentScript
+{
+public:
+  HeavenonHighFloors8190() :
+    Sapphire::ScriptAPI::InstanceContentScript( 60029 )
+  { }
+
+  void onInit( InstanceContent& instance ) override
+  {
+    instance.registerEObj( "sgvf_w_lvd_b0959", 2000608, 7359374, 4, { -300.897095f, 0.442359f, -324.271790f }, 1.000000f, 0.000000f ); 
+      // States -> vf_bextwall_on (id: 3) vf_bextwall_on2off (id: 4) vf_bextwall_off (id: 10) 
+
+  }
+
+  void onUpdate( InstanceContent& instance, uint32_t currTime ) override
+  {
+
+  }
+
+  void onEnterTerritory( InstanceContent& instance, Entity::Player& player, uint32_t eventId, uint16_t param1,
+                         uint16_t param2 ) override
+  {
+
+  }
+
+};
+
+EXPOSE_SCRIPT( HeavenonHighFloors8190 );
\ No newline at end of file
diff --git a/src/scripts/instances/deepdungeon/HeavenonHighFloors91100.cpp b/src/scripts/instances/deepdungeon/HeavenonHighFloors91100.cpp
new file mode 100644
index 00000000..2e84e6e5
--- /dev/null
+++ b/src/scripts/instances/deepdungeon/HeavenonHighFloors91100.cpp
@@ -0,0 +1,34 @@
+#include <ScriptObject.h>
+#include <Territory/InstanceContent.h>
+
+using namespace Sapphire;
+
+class HeavenonHighFloors91100 :
+  public Sapphire::ScriptAPI::InstanceContentScript
+{
+public:
+  HeavenonHighFloors91100() :
+    Sapphire::ScriptAPI::InstanceContentScript( 60030 )
+  { }
+
+  void onInit( InstanceContent& instance ) override
+  {
+    instance.registerEObj( "sgvf_w_lvd_b0959", 2000608, 7359374, 4, { -300.897095f, 0.442359f, -324.271790f }, 1.000000f, 0.000000f ); 
+      // States -> vf_bextwall_on (id: 3) vf_bextwall_on2off (id: 4) vf_bextwall_off (id: 10) 
+
+  }
+
+  void onUpdate( InstanceContent& instance, uint32_t currTime ) override
+  {
+
+  }
+
+  void onEnterTerritory( InstanceContent& instance, Entity::Player& player, uint32_t eventId, uint16_t param1,
+                         uint16_t param2 ) override
+  {
+
+  }
+
+};
+
+EXPOSE_SCRIPT( HeavenonHighFloors91100 );
\ No newline at end of file
diff --git a/src/scripts/instances/deepdungeon/ThePalaceoftheDeadFloors101110.cpp b/src/scripts/instances/deepdungeon/ThePalaceoftheDeadFloors101110.cpp
index 2b9f784b..8355a21b 100644
--- a/src/scripts/instances/deepdungeon/ThePalaceoftheDeadFloors101110.cpp
+++ b/src/scripts/instances/deepdungeon/ThePalaceoftheDeadFloors101110.cpp
@@ -9,26 +9,23 @@ class ThePalaceoftheDeadFloors101110 :
 public:
   ThePalaceoftheDeadFloors101110() :
     Sapphire::ScriptAPI::InstanceContentScript( 60011 )
-  {
-  }
+  { }
 
-  void onInit( InstanceContentPtr instance ) override
+  void onInit( InstanceContent& instance ) override
   {
-    instance->registerEObj( "sgvf_w_lvd_b0959", 2000608, 6527847, 4, { -300.000000f, 0.000026f, -237.000000f },
-                            1.000000f, 0.000000f );
-    // States -> vf_bextwall_on vf_bextwall_on2off vf_bextwall_off
-    instance->registerEObj( "sgvf_w_lvd_b0959_1", 2000608, 6544382, 4, { 301.149902f, -0.045413f, 285.247589f },
-                            1.000000f, 0.000000f );
-    // States -> vf_bextwall_on vf_bextwall_on2off vf_bextwall_off
+    instance.registerEObj( "sgvf_w_lvd_b0959", 2000608, 6527847, 4, { -300.000000f, 0.000026f, -237.000000f }, 1.000000f, 0.000000f ); 
+      // States -> vf_bextwall_on (id: 3) vf_bextwall_on2off (id: 4) vf_bextwall_off (id: 10) 
+    instance.registerEObj( "sgvf_w_lvd_b0959_1", 2000608, 6544382, 4, { 301.149902f, -0.045413f, 285.247589f }, 1.000000f, 0.000000f ); 
+      // States -> vf_bextwall_on (id: 3) vf_bextwall_on2off (id: 4) vf_bextwall_off (id: 10) 
 
   }
 
-  void onUpdate( InstanceContentPtr instance, uint32_t currTime ) override
+  void onUpdate( InstanceContent& instance, uint32_t currTime ) override
   {
 
   }
 
-  void onEnterTerritory( InstanceContentPtr instance, Entity::Player& player, uint32_t eventId, uint16_t param1,
+  void onEnterTerritory( InstanceContent& instance, Entity::Player& player, uint32_t eventId, uint16_t param1,
                          uint16_t param2 ) override
   {
 
diff --git a/src/scripts/instances/deepdungeon/ThePalaceoftheDeadFloors110.cpp b/src/scripts/instances/deepdungeon/ThePalaceoftheDeadFloors110.cpp
index e6229e52..0a46694d 100644
--- a/src/scripts/instances/deepdungeon/ThePalaceoftheDeadFloors110.cpp
+++ b/src/scripts/instances/deepdungeon/ThePalaceoftheDeadFloors110.cpp
@@ -9,23 +9,21 @@ class ThePalaceoftheDeadFloors110 :
 public:
   ThePalaceoftheDeadFloors110() :
     Sapphire::ScriptAPI::InstanceContentScript( 60001 )
-  {
-  }
+  { }
 
-  void onInit( InstanceContentPtr instance ) override
+  void onInit( InstanceContent& instance ) override
   {
-    instance->registerEObj( "sgvf_w_lvd_b0959", 2002872, 6324883, 4, { -300.000000f, -0.000010f, -220.000000f },
-                            1.000000f, 0.000000f );
-    // States -> vf_bextwall_on vf_bextwall_on2off vf_bextwall_off
+    instance.registerEObj( "sgvf_w_lvd_b0959", 2002872, 6324883, 4, { -300.000000f, -0.000010f, -220.000000f }, 1.000000f, 0.000000f ); 
+      // States -> vf_bextwall_on (id: 3) vf_bextwall_on2off (id: 4) vf_bextwall_off (id: 10) 
 
   }
 
-  void onUpdate( InstanceContentPtr instance, uint32_t currTime ) override
+  void onUpdate( InstanceContent& instance, uint32_t currTime ) override
   {
 
   }
 
-  void onEnterTerritory( InstanceContentPtr instance, Entity::Player& player, uint32_t eventId, uint16_t param1,
+  void onEnterTerritory( InstanceContent& instance, Entity::Player& player, uint32_t eventId, uint16_t param1,
                          uint16_t param2 ) override
   {
 
diff --git a/src/scripts/instances/deepdungeon/ThePalaceoftheDeadFloors111120.cpp b/src/scripts/instances/deepdungeon/ThePalaceoftheDeadFloors111120.cpp
index 39a35975..251cb9f9 100644
--- a/src/scripts/instances/deepdungeon/ThePalaceoftheDeadFloors111120.cpp
+++ b/src/scripts/instances/deepdungeon/ThePalaceoftheDeadFloors111120.cpp
@@ -9,23 +9,21 @@ class ThePalaceoftheDeadFloors111120 :
 public:
   ThePalaceoftheDeadFloors111120() :
     Sapphire::ScriptAPI::InstanceContentScript( 60012 )
-  {
-  }
+  { }
 
-  void onInit( InstanceContentPtr instance ) override
+  void onInit( InstanceContent& instance ) override
   {
-    instance->registerEObj( "sgvf_w_lvd_b0959", 2000608, 6535115, 4, { -300.000000f, 0.000026f, -237.000000f },
-                            1.000000f, 0.000000f );
-    // States -> vf_bextwall_on vf_bextwall_on2off vf_bextwall_off
+    instance.registerEObj( "sgvf_w_lvd_b0959", 2000608, 6535115, 4, { -300.000000f, 0.000026f, -237.000000f }, 1.000000f, 0.000000f ); 
+      // States -> vf_bextwall_on (id: 3) vf_bextwall_on2off (id: 4) vf_bextwall_off (id: 10) 
 
   }
 
-  void onUpdate( InstanceContentPtr instance, uint32_t currTime ) override
+  void onUpdate( InstanceContent& instance, uint32_t currTime ) override
   {
 
   }
 
-  void onEnterTerritory( InstanceContentPtr instance, Entity::Player& player, uint32_t eventId, uint16_t param1,
+  void onEnterTerritory( InstanceContent& instance, Entity::Player& player, uint32_t eventId, uint16_t param1,
                          uint16_t param2 ) override
   {
 
diff --git a/src/scripts/instances/deepdungeon/ThePalaceoftheDeadFloors1120.cpp b/src/scripts/instances/deepdungeon/ThePalaceoftheDeadFloors1120.cpp
index d7fbd1bd..549810e2 100644
--- a/src/scripts/instances/deepdungeon/ThePalaceoftheDeadFloors1120.cpp
+++ b/src/scripts/instances/deepdungeon/ThePalaceoftheDeadFloors1120.cpp
@@ -9,23 +9,21 @@ class ThePalaceoftheDeadFloors1120 :
 public:
   ThePalaceoftheDeadFloors1120() :
     Sapphire::ScriptAPI::InstanceContentScript( 60002 )
-  {
-  }
+  { }
 
-  void onInit( InstanceContentPtr instance ) override
+  void onInit( InstanceContent& instance ) override
   {
-    instance->registerEObj( "sgvf_w_lvd_b0959", 2000608, 6353850, 4, { -300.000000f, 0.000026f, -237.000000f },
-                            1.000000f, 0.000000f );
-    // States -> vf_bextwall_on vf_bextwall_on2off vf_bextwall_off
+    instance.registerEObj( "sgvf_w_lvd_b0959", 2000608, 6353850, 4, { -300.000000f, 0.000026f, -237.000000f }, 1.000000f, 0.000000f ); 
+      // States -> vf_bextwall_on (id: 3) vf_bextwall_on2off (id: 4) vf_bextwall_off (id: 10) 
 
   }
 
-  void onUpdate( InstanceContentPtr instance, uint32_t currTime ) override
+  void onUpdate( InstanceContent& instance, uint32_t currTime ) override
   {
 
   }
 
-  void onEnterTerritory( InstanceContentPtr instance, Entity::Player& player, uint32_t eventId, uint16_t param1,
+  void onEnterTerritory( InstanceContent& instance, Entity::Player& player, uint32_t eventId, uint16_t param1,
                          uint16_t param2 ) override
   {
 
diff --git a/src/scripts/instances/deepdungeon/ThePalaceoftheDeadFloors121130.cpp b/src/scripts/instances/deepdungeon/ThePalaceoftheDeadFloors121130.cpp
index 93a585b1..2c6abf19 100644
--- a/src/scripts/instances/deepdungeon/ThePalaceoftheDeadFloors121130.cpp
+++ b/src/scripts/instances/deepdungeon/ThePalaceoftheDeadFloors121130.cpp
@@ -9,23 +9,21 @@ class ThePalaceoftheDeadFloors121130 :
 public:
   ThePalaceoftheDeadFloors121130() :
     Sapphire::ScriptAPI::InstanceContentScript( 60013 )
-  {
-  }
+  { }
 
-  void onInit( InstanceContentPtr instance ) override
+  void onInit( InstanceContent& instance ) override
   {
-    instance->registerEObj( "sgvf_w_lvd_b0959", 2000608, 6535115, 4, { -300.000000f, 0.000026f, -237.000000f },
-                            1.000000f, 0.000000f );
-    // States -> vf_bextwall_on vf_bextwall_on2off vf_bextwall_off
+    instance.registerEObj( "sgvf_w_lvd_b0959", 2000608, 6535115, 4, { -300.000000f, 0.000026f, -237.000000f }, 1.000000f, 0.000000f ); 
+      // States -> vf_bextwall_on (id: 3) vf_bextwall_on2off (id: 4) vf_bextwall_off (id: 10) 
 
   }
 
-  void onUpdate( InstanceContentPtr instance, uint32_t currTime ) override
+  void onUpdate( InstanceContent& instance, uint32_t currTime ) override
   {
 
   }
 
-  void onEnterTerritory( InstanceContentPtr instance, Entity::Player& player, uint32_t eventId, uint16_t param1,
+  void onEnterTerritory( InstanceContent& instance, Entity::Player& player, uint32_t eventId, uint16_t param1,
                          uint16_t param2 ) override
   {
 
diff --git a/src/scripts/instances/deepdungeon/ThePalaceoftheDeadFloors131140.cpp b/src/scripts/instances/deepdungeon/ThePalaceoftheDeadFloors131140.cpp
index bcf8d2b4..2ebf15d8 100644
--- a/src/scripts/instances/deepdungeon/ThePalaceoftheDeadFloors131140.cpp
+++ b/src/scripts/instances/deepdungeon/ThePalaceoftheDeadFloors131140.cpp
@@ -9,23 +9,21 @@ class ThePalaceoftheDeadFloors131140 :
 public:
   ThePalaceoftheDeadFloors131140() :
     Sapphire::ScriptAPI::InstanceContentScript( 60014 )
-  {
-  }
+  { }
 
-  void onInit( InstanceContentPtr instance ) override
+  void onInit( InstanceContent& instance ) override
   {
-    instance->registerEObj( "sgvf_w_lvd_b0959", 2000608, 6535683, 4, { -300.000000f, -0.000205f, -237.000000f },
-                            1.000000f, 0.000000f );
-    // States -> vf_bextwall_on vf_bextwall_on2off vf_bextwall_off
+    instance.registerEObj( "sgvf_w_lvd_b0959", 2000608, 6535683, 4, { -300.000000f, -0.000205f, -237.000000f }, 1.000000f, 0.000000f ); 
+      // States -> vf_bextwall_on (id: 3) vf_bextwall_on2off (id: 4) vf_bextwall_off (id: 10) 
 
   }
 
-  void onUpdate( InstanceContentPtr instance, uint32_t currTime ) override
+  void onUpdate( InstanceContent& instance, uint32_t currTime ) override
   {
 
   }
 
-  void onEnterTerritory( InstanceContentPtr instance, Entity::Player& player, uint32_t eventId, uint16_t param1,
+  void onEnterTerritory( InstanceContent& instance, Entity::Player& player, uint32_t eventId, uint16_t param1,
                          uint16_t param2 ) override
   {
 
diff --git a/src/scripts/instances/deepdungeon/ThePalaceoftheDeadFloors141150.cpp b/src/scripts/instances/deepdungeon/ThePalaceoftheDeadFloors141150.cpp
index 9c6923bd..0a432cc8 100644
--- a/src/scripts/instances/deepdungeon/ThePalaceoftheDeadFloors141150.cpp
+++ b/src/scripts/instances/deepdungeon/ThePalaceoftheDeadFloors141150.cpp
@@ -9,23 +9,21 @@ class ThePalaceoftheDeadFloors141150 :
 public:
   ThePalaceoftheDeadFloors141150() :
     Sapphire::ScriptAPI::InstanceContentScript( 60015 )
-  {
-  }
+  { }
 
-  void onInit( InstanceContentPtr instance ) override
+  void onInit( InstanceContent& instance ) override
   {
-    instance->registerEObj( "sgvf_w_lvd_b0959", 2000608, 6535683, 4, { -300.000000f, -0.000205f, -237.000000f },
-                            1.000000f, 0.000000f );
-    // States -> vf_bextwall_on vf_bextwall_on2off vf_bextwall_off
+    instance.registerEObj( "sgvf_w_lvd_b0959", 2000608, 6535683, 4, { -300.000000f, -0.000205f, -237.000000f }, 1.000000f, 0.000000f ); 
+      // States -> vf_bextwall_on (id: 3) vf_bextwall_on2off (id: 4) vf_bextwall_off (id: 10) 
 
   }
 
-  void onUpdate( InstanceContentPtr instance, uint32_t currTime ) override
+  void onUpdate( InstanceContent& instance, uint32_t currTime ) override
   {
 
   }
 
-  void onEnterTerritory( InstanceContentPtr instance, Entity::Player& player, uint32_t eventId, uint16_t param1,
+  void onEnterTerritory( InstanceContent& instance, Entity::Player& player, uint32_t eventId, uint16_t param1,
                          uint16_t param2 ) override
   {
 
diff --git a/src/scripts/instances/deepdungeon/ThePalaceoftheDeadFloors151160.cpp b/src/scripts/instances/deepdungeon/ThePalaceoftheDeadFloors151160.cpp
index 1f2e4aeb..f2282e4e 100644
--- a/src/scripts/instances/deepdungeon/ThePalaceoftheDeadFloors151160.cpp
+++ b/src/scripts/instances/deepdungeon/ThePalaceoftheDeadFloors151160.cpp
@@ -9,23 +9,21 @@ class ThePalaceoftheDeadFloors151160 :
 public:
   ThePalaceoftheDeadFloors151160() :
     Sapphire::ScriptAPI::InstanceContentScript( 60016 )
-  {
-  }
+  { }
 
-  void onInit( InstanceContentPtr instance ) override
+  void onInit( InstanceContent& instance ) override
   {
-    instance->registerEObj( "sgvf_w_lvd_b0959", 2000608, 6534547, 4, { -301.179504f, 0.130118f, -301.014709f },
-                            1.000000f, -0.000000f );
-    // States -> vf_bextwall_on vf_bextwall_on2off vf_bextwall_off
+    instance.registerEObj( "sgvf_w_lvd_b0959", 2000608, 6534547, 4, { -301.179504f, 0.130118f, -301.014709f }, 1.000000f, -0.000000f ); 
+      // States -> vf_bextwall_on (id: 3) vf_bextwall_on2off (id: 4) vf_bextwall_off (id: 10) 
 
   }
 
-  void onUpdate( InstanceContentPtr instance, uint32_t currTime ) override
+  void onUpdate( InstanceContent& instance, uint32_t currTime ) override
   {
 
   }
 
-  void onEnterTerritory( InstanceContentPtr instance, Entity::Player& player, uint32_t eventId, uint16_t param1,
+  void onEnterTerritory( InstanceContent& instance, Entity::Player& player, uint32_t eventId, uint16_t param1,
                          uint16_t param2 ) override
   {
 
diff --git a/src/scripts/instances/deepdungeon/ThePalaceoftheDeadFloors161170.cpp b/src/scripts/instances/deepdungeon/ThePalaceoftheDeadFloors161170.cpp
index 34f6d95c..39a8ec6c 100644
--- a/src/scripts/instances/deepdungeon/ThePalaceoftheDeadFloors161170.cpp
+++ b/src/scripts/instances/deepdungeon/ThePalaceoftheDeadFloors161170.cpp
@@ -9,23 +9,21 @@ class ThePalaceoftheDeadFloors161170 :
 public:
   ThePalaceoftheDeadFloors161170() :
     Sapphire::ScriptAPI::InstanceContentScript( 60017 )
-  {
-  }
+  { }
 
-  void onInit( InstanceContentPtr instance ) override
+  void onInit( InstanceContent& instance ) override
   {
-    instance->registerEObj( "sgvf_w_lvd_b0959", 2000608, 6534547, 4, { -301.179504f, 0.130118f, -301.014709f },
-                            1.000000f, -0.000000f );
-    // States -> vf_bextwall_on vf_bextwall_on2off vf_bextwall_off
+    instance.registerEObj( "sgvf_w_lvd_b0959", 2000608, 6534547, 4, { -301.179504f, 0.130118f, -301.014709f }, 1.000000f, -0.000000f ); 
+      // States -> vf_bextwall_on (id: 3) vf_bextwall_on2off (id: 4) vf_bextwall_off (id: 10) 
 
   }
 
-  void onUpdate( InstanceContentPtr instance, uint32_t currTime ) override
+  void onUpdate( InstanceContent& instance, uint32_t currTime ) override
   {
 
   }
 
-  void onEnterTerritory( InstanceContentPtr instance, Entity::Player& player, uint32_t eventId, uint16_t param1,
+  void onEnterTerritory( InstanceContent& instance, Entity::Player& player, uint32_t eventId, uint16_t param1,
                          uint16_t param2 ) override
   {
 
diff --git a/src/scripts/instances/deepdungeon/ThePalaceoftheDeadFloors171180.cpp b/src/scripts/instances/deepdungeon/ThePalaceoftheDeadFloors171180.cpp
index 304cb387..824c8a0e 100644
--- a/src/scripts/instances/deepdungeon/ThePalaceoftheDeadFloors171180.cpp
+++ b/src/scripts/instances/deepdungeon/ThePalaceoftheDeadFloors171180.cpp
@@ -9,23 +9,21 @@ class ThePalaceoftheDeadFloors171180 :
 public:
   ThePalaceoftheDeadFloors171180() :
     Sapphire::ScriptAPI::InstanceContentScript( 60018 )
-  {
-  }
+  { }
 
-  void onInit( InstanceContentPtr instance ) override
+  void onInit( InstanceContent& instance ) override
   {
-    instance->registerEObj( "sgvf_w_lvd_b0959", 2000608, 6534547, 4, { -301.179504f, 0.130118f, -301.014709f },
-                            1.000000f, -0.000000f );
-    // States -> vf_bextwall_on vf_bextwall_on2off vf_bextwall_off
+    instance.registerEObj( "sgvf_w_lvd_b0959", 2000608, 6534547, 4, { -301.179504f, 0.130118f, -301.014709f }, 1.000000f, -0.000000f ); 
+      // States -> vf_bextwall_on (id: 3) vf_bextwall_on2off (id: 4) vf_bextwall_off (id: 10) 
 
   }
 
-  void onUpdate( InstanceContentPtr instance, uint32_t currTime ) override
+  void onUpdate( InstanceContent& instance, uint32_t currTime ) override
   {
 
   }
 
-  void onEnterTerritory( InstanceContentPtr instance, Entity::Player& player, uint32_t eventId, uint16_t param1,
+  void onEnterTerritory( InstanceContent& instance, Entity::Player& player, uint32_t eventId, uint16_t param1,
                          uint16_t param2 ) override
   {
 
diff --git a/src/scripts/instances/deepdungeon/ThePalaceoftheDeadFloors181190.cpp b/src/scripts/instances/deepdungeon/ThePalaceoftheDeadFloors181190.cpp
index 99b05df7..90a1fe6d 100644
--- a/src/scripts/instances/deepdungeon/ThePalaceoftheDeadFloors181190.cpp
+++ b/src/scripts/instances/deepdungeon/ThePalaceoftheDeadFloors181190.cpp
@@ -9,23 +9,21 @@ class ThePalaceoftheDeadFloors181190 :
 public:
   ThePalaceoftheDeadFloors181190() :
     Sapphire::ScriptAPI::InstanceContentScript( 60019 )
-  {
-  }
+  { }
 
-  void onInit( InstanceContentPtr instance ) override
+  void onInit( InstanceContent& instance ) override
   {
-    instance->registerEObj( "sgvf_w_lvd_b0959", 2000608, 6534547, 4, { -301.179504f, 0.130118f, -301.014709f },
-                            1.000000f, -0.000000f );
-    // States -> vf_bextwall_on vf_bextwall_on2off vf_bextwall_off
+    instance.registerEObj( "sgvf_w_lvd_b0959", 2000608, 6534547, 4, { -301.179504f, 0.130118f, -301.014709f }, 1.000000f, -0.000000f ); 
+      // States -> vf_bextwall_on (id: 3) vf_bextwall_on2off (id: 4) vf_bextwall_off (id: 10) 
 
   }
 
-  void onUpdate( InstanceContentPtr instance, uint32_t currTime ) override
+  void onUpdate( InstanceContent& instance, uint32_t currTime ) override
   {
 
   }
 
-  void onEnterTerritory( InstanceContentPtr instance, Entity::Player& player, uint32_t eventId, uint16_t param1,
+  void onEnterTerritory( InstanceContent& instance, Entity::Player& player, uint32_t eventId, uint16_t param1,
                          uint16_t param2 ) override
   {
 
diff --git a/src/scripts/instances/deepdungeon/ThePalaceoftheDeadFloors191200.cpp b/src/scripts/instances/deepdungeon/ThePalaceoftheDeadFloors191200.cpp
index cd494bc7..aaffba4f 100644
--- a/src/scripts/instances/deepdungeon/ThePalaceoftheDeadFloors191200.cpp
+++ b/src/scripts/instances/deepdungeon/ThePalaceoftheDeadFloors191200.cpp
@@ -9,23 +9,21 @@ class ThePalaceoftheDeadFloors191200 :
 public:
   ThePalaceoftheDeadFloors191200() :
     Sapphire::ScriptAPI::InstanceContentScript( 60020 )
-  {
-  }
+  { }
 
-  void onInit( InstanceContentPtr instance ) override
+  void onInit( InstanceContent& instance ) override
   {
-    instance->registerEObj( "sgvf_w_lvd_b0959", 2000608, 6534547, 4, { -301.179504f, 0.130118f, -301.014709f },
-                            1.000000f, -0.000000f );
-    // States -> vf_bextwall_on vf_bextwall_on2off vf_bextwall_off
+    instance.registerEObj( "sgvf_w_lvd_b0959", 2000608, 6534547, 4, { -301.179504f, 0.130118f, -301.014709f }, 1.000000f, -0.000000f ); 
+      // States -> vf_bextwall_on (id: 3) vf_bextwall_on2off (id: 4) vf_bextwall_off (id: 10) 
 
   }
 
-  void onUpdate( InstanceContentPtr instance, uint32_t currTime ) override
+  void onUpdate( InstanceContent& instance, uint32_t currTime ) override
   {
 
   }
 
-  void onEnterTerritory( InstanceContentPtr instance, Entity::Player& player, uint32_t eventId, uint16_t param1,
+  void onEnterTerritory( InstanceContent& instance, Entity::Player& player, uint32_t eventId, uint16_t param1,
                          uint16_t param2 ) override
   {
 
diff --git a/src/scripts/instances/deepdungeon/ThePalaceoftheDeadFloors2130.cpp b/src/scripts/instances/deepdungeon/ThePalaceoftheDeadFloors2130.cpp
index 52c74070..d88c7f76 100644
--- a/src/scripts/instances/deepdungeon/ThePalaceoftheDeadFloors2130.cpp
+++ b/src/scripts/instances/deepdungeon/ThePalaceoftheDeadFloors2130.cpp
@@ -9,23 +9,21 @@ class ThePalaceoftheDeadFloors2130 :
 public:
   ThePalaceoftheDeadFloors2130() :
     Sapphire::ScriptAPI::InstanceContentScript( 60003 )
-  {
-  }
+  { }
 
-  void onInit( InstanceContentPtr instance ) override
+  void onInit( InstanceContent& instance ) override
   {
-    instance->registerEObj( "sgvf_w_lvd_b0959", 2002872, 6387948, 4, { -300.000000f, -0.116918f, -237.513199f },
-                            1.000000f, 0.000000f );
-    // States -> vf_bextwall_on vf_bextwall_on2off vf_bextwall_off
+    instance.registerEObj( "sgvf_w_lvd_b0959", 2002872, 6387948, 4, { -300.000000f, -0.116918f, -237.513199f }, 1.000000f, 0.000000f ); 
+      // States -> vf_bextwall_on (id: 3) vf_bextwall_on2off (id: 4) vf_bextwall_off (id: 10) 
 
   }
 
-  void onUpdate( InstanceContentPtr instance, uint32_t currTime ) override
+  void onUpdate( InstanceContent& instance, uint32_t currTime ) override
   {
 
   }
 
-  void onEnterTerritory( InstanceContentPtr instance, Entity::Player& player, uint32_t eventId, uint16_t param1,
+  void onEnterTerritory( InstanceContent& instance, Entity::Player& player, uint32_t eventId, uint16_t param1,
                          uint16_t param2 ) override
   {
 
diff --git a/src/scripts/instances/deepdungeon/ThePalaceoftheDeadFloors3140.cpp b/src/scripts/instances/deepdungeon/ThePalaceoftheDeadFloors3140.cpp
index 2fab7167..af30b425 100644
--- a/src/scripts/instances/deepdungeon/ThePalaceoftheDeadFloors3140.cpp
+++ b/src/scripts/instances/deepdungeon/ThePalaceoftheDeadFloors3140.cpp
@@ -9,38 +9,29 @@ class ThePalaceoftheDeadFloors3140 :
 public:
   ThePalaceoftheDeadFloors3140() :
     Sapphire::ScriptAPI::InstanceContentScript( 60004 )
-  {
-  }
+  { }
 
-  void onInit( InstanceContentPtr instance ) override
+  void onInit( InstanceContent& instance ) override
   {
-    instance->registerEObj( "sgvf_w_lvd_b0959", 2000608, 6367892, 4, { -300.000000f, 0.000000f, -225.000000f },
-                            1.000000f, 0.000000f );
-    // States -> vf_bextwall_on vf_bextwall_on2off vf_bextwall_off
-    instance->registerEObj( "sgvf_w_lvd_b0959_1", 2002872, 6392196, 4, { 300.000000f, 0.000000f, 374.000000f },
-                            1.000000f, 0.000000f );
-    // States -> vf_bextwall_on vf_bextwall_on2off vf_bextwall_off
-    instance->registerEObj( "unknown_0", 2007351, 6277715, 4, { 300.036102f, 0.000000f, 373.916687f }, 1.000000f,
-                            0.000000f );
-    instance->registerEObj( "unknown_1", 2007352, 6394671, 4, { 307.159912f, 0.000000f, 370.556702f }, 1.000000f,
-                            0.000000f );
-    instance->registerEObj( "unknown_2", 2007353, 6394677, 4, { 305.303894f, 0.000000f, 380.231415f }, 1.000000f,
-                            0.000000f );
-    instance->registerEObj( "unknown_3", 2007354, 6394673, 4, { 296.024109f, -0.000000f, 381.100189f }, 1.000000f,
-                            0.000000f );
-    instance->registerEObj( "unknown_4", 2007355, 6394675, 4, { 291.561890f, 0.000000f, 372.412689f }, 1.000000f,
-                            0.000000f );
-    instance->registerEObj( "unknown_5", 2007356, 6394674, 4, { 298.511902f, 0.000000f, 366.134003f }, 1.000000f,
-                            0.000000f );
+    instance.registerEObj( "sgvf_w_lvd_b0959", 2000608, 6367892, 4, { -300.000000f, 0.000000f, -225.000000f }, 1.000000f, 0.000000f ); 
+      // States -> vf_bextwall_on (id: 3) vf_bextwall_on2off (id: 4) vf_bextwall_off (id: 10) 
+    instance.registerEObj( "sgvf_w_lvd_b0959_1", 2002872, 6392196, 4, { 300.000000f, 0.000000f, 374.000000f }, 1.000000f, 0.000000f ); 
+      // States -> vf_bextwall_on (id: 3) vf_bextwall_on2off (id: 4) vf_bextwall_off (id: 10) 
+    instance.registerEObj( "unknown_0", 2007351, 6277715, 4, { 300.036102f, 0.000000f, 373.916687f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_1", 2007352, 6394671, 4, { 307.159912f, 0.000000f, 370.556702f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_2", 2007353, 6394677, 4, { 305.303894f, 0.000000f, 380.231415f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_3", 2007354, 6394673, 4, { 296.024109f, -0.000000f, 381.100189f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_4", 2007355, 6394675, 4, { 291.561890f, 0.000000f, 372.412689f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_5", 2007356, 6394674, 4, { 298.511902f, 0.000000f, 366.134003f }, 1.000000f, 0.000000f ); 
 
   }
 
-  void onUpdate( InstanceContentPtr instance, uint32_t currTime ) override
+  void onUpdate( InstanceContent& instance, uint32_t currTime ) override
   {
 
   }
 
-  void onEnterTerritory( InstanceContentPtr instance, Entity::Player& player, uint32_t eventId, uint16_t param1,
+  void onEnterTerritory( InstanceContent& instance, Entity::Player& player, uint32_t eventId, uint16_t param1,
                          uint16_t param2 ) override
   {
 
diff --git a/src/scripts/instances/deepdungeon/ThePalaceoftheDeadFloors4150.cpp b/src/scripts/instances/deepdungeon/ThePalaceoftheDeadFloors4150.cpp
index 3c1256c6..142fd4a8 100644
--- a/src/scripts/instances/deepdungeon/ThePalaceoftheDeadFloors4150.cpp
+++ b/src/scripts/instances/deepdungeon/ThePalaceoftheDeadFloors4150.cpp
@@ -9,38 +9,29 @@ class ThePalaceoftheDeadFloors4150 :
 public:
   ThePalaceoftheDeadFloors4150() :
     Sapphire::ScriptAPI::InstanceContentScript( 60005 )
-  {
-  }
+  { }
 
-  void onInit( InstanceContentPtr instance ) override
+  void onInit( InstanceContent& instance ) override
   {
-    instance->registerEObj( "sgvf_w_lvd_b0959", 2000608, 6367892, 4, { -300.000000f, 0.000000f, -225.000000f },
-                            1.000000f, 0.000000f );
-    // States -> vf_bextwall_on vf_bextwall_on2off vf_bextwall_off
-    instance->registerEObj( "sgvf_w_lvd_b0959_1", 2002872, 6392196, 4, { 300.000000f, 0.000000f, 374.000000f },
-                            1.000000f, 0.000000f );
-    // States -> vf_bextwall_on vf_bextwall_on2off vf_bextwall_off
-    instance->registerEObj( "unknown_0", 2007351, 6277715, 4, { 300.036102f, 0.000000f, 373.916687f }, 1.000000f,
-                            0.000000f );
-    instance->registerEObj( "unknown_1", 2007352, 6394671, 4, { 307.159912f, 0.000000f, 370.556702f }, 1.000000f,
-                            0.000000f );
-    instance->registerEObj( "unknown_2", 2007353, 6394677, 4, { 305.303894f, 0.000000f, 380.231415f }, 1.000000f,
-                            0.000000f );
-    instance->registerEObj( "unknown_3", 2007354, 6394673, 4, { 296.024109f, -0.000000f, 381.100189f }, 1.000000f,
-                            0.000000f );
-    instance->registerEObj( "unknown_4", 2007355, 6394675, 4, { 291.561890f, 0.000000f, 372.412689f }, 1.000000f,
-                            0.000000f );
-    instance->registerEObj( "unknown_5", 2007356, 6394674, 4, { 298.511902f, 0.000000f, 366.134003f }, 1.000000f,
-                            0.000000f );
+    instance.registerEObj( "sgvf_w_lvd_b0959", 2000608, 6367892, 4, { -300.000000f, 0.000000f, -225.000000f }, 1.000000f, 0.000000f ); 
+      // States -> vf_bextwall_on (id: 3) vf_bextwall_on2off (id: 4) vf_bextwall_off (id: 10) 
+    instance.registerEObj( "sgvf_w_lvd_b0959_1", 2002872, 6392196, 4, { 300.000000f, 0.000000f, 374.000000f }, 1.000000f, 0.000000f ); 
+      // States -> vf_bextwall_on (id: 3) vf_bextwall_on2off (id: 4) vf_bextwall_off (id: 10) 
+    instance.registerEObj( "unknown_0", 2007351, 6277715, 4, { 300.036102f, 0.000000f, 373.916687f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_1", 2007352, 6394671, 4, { 307.159912f, 0.000000f, 370.556702f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_2", 2007353, 6394677, 4, { 305.303894f, 0.000000f, 380.231415f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_3", 2007354, 6394673, 4, { 296.024109f, -0.000000f, 381.100189f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_4", 2007355, 6394675, 4, { 291.561890f, 0.000000f, 372.412689f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_5", 2007356, 6394674, 4, { 298.511902f, 0.000000f, 366.134003f }, 1.000000f, 0.000000f ); 
 
   }
 
-  void onUpdate( InstanceContentPtr instance, uint32_t currTime ) override
+  void onUpdate( InstanceContent& instance, uint32_t currTime ) override
   {
 
   }
 
-  void onEnterTerritory( InstanceContentPtr instance, Entity::Player& player, uint32_t eventId, uint16_t param1,
+  void onEnterTerritory( InstanceContent& instance, Entity::Player& player, uint32_t eventId, uint16_t param1,
                          uint16_t param2 ) override
   {
 
diff --git a/src/scripts/instances/deepdungeon/ThePalaceoftheDeadFloors5160.cpp b/src/scripts/instances/deepdungeon/ThePalaceoftheDeadFloors5160.cpp
index dc91a46f..e5110430 100644
--- a/src/scripts/instances/deepdungeon/ThePalaceoftheDeadFloors5160.cpp
+++ b/src/scripts/instances/deepdungeon/ThePalaceoftheDeadFloors5160.cpp
@@ -9,23 +9,21 @@ class ThePalaceoftheDeadFloors5160 :
 public:
   ThePalaceoftheDeadFloors5160() :
     Sapphire::ScriptAPI::InstanceContentScript( 60006 )
-  {
-  }
+  { }
 
-  void onInit( InstanceContentPtr instance ) override
+  void onInit( InstanceContent& instance ) override
   {
-    instance->registerEObj( "sgvf_w_lvd_b0959", 2000608, 6521120, 4, { -300.000000f, 3.189805f, -241.061096f },
-                            1.000000f, 0.000000f );
-    // States -> vf_bextwall_on vf_bextwall_on2off vf_bextwall_off
+    instance.registerEObj( "sgvf_w_lvd_b0959", 2000608, 6521120, 4, { -300.000000f, 3.189805f, -241.061096f }, 1.000000f, 0.000000f ); 
+      // States -> vf_bextwall_on (id: 3) vf_bextwall_on2off (id: 4) vf_bextwall_off (id: 10) 
 
   }
 
-  void onUpdate( InstanceContentPtr instance, uint32_t currTime ) override
+  void onUpdate( InstanceContent& instance, uint32_t currTime ) override
   {
 
   }
 
-  void onEnterTerritory( InstanceContentPtr instance, Entity::Player& player, uint32_t eventId, uint16_t param1,
+  void onEnterTerritory( InstanceContent& instance, Entity::Player& player, uint32_t eventId, uint16_t param1,
                          uint16_t param2 ) override
   {
 
diff --git a/src/scripts/instances/deepdungeon/ThePalaceoftheDeadFloors6170.cpp b/src/scripts/instances/deepdungeon/ThePalaceoftheDeadFloors6170.cpp
index 3aca86c9..5c80e1ca 100644
--- a/src/scripts/instances/deepdungeon/ThePalaceoftheDeadFloors6170.cpp
+++ b/src/scripts/instances/deepdungeon/ThePalaceoftheDeadFloors6170.cpp
@@ -9,23 +9,21 @@ class ThePalaceoftheDeadFloors6170 :
 public:
   ThePalaceoftheDeadFloors6170() :
     Sapphire::ScriptAPI::InstanceContentScript( 60007 )
-  {
-  }
+  { }
 
-  void onInit( InstanceContentPtr instance ) override
+  void onInit( InstanceContent& instance ) override
   {
-    instance->registerEObj( "sgvf_w_lvd_b0959", 2000608, 6521120, 4, { -300.000000f, 3.189805f, -241.061096f },
-                            1.000000f, 0.000000f );
-    // States -> vf_bextwall_on vf_bextwall_on2off vf_bextwall_off
+    instance.registerEObj( "sgvf_w_lvd_b0959", 2000608, 6521120, 4, { -300.000000f, 3.189805f, -241.061096f }, 1.000000f, 0.000000f ); 
+      // States -> vf_bextwall_on (id: 3) vf_bextwall_on2off (id: 4) vf_bextwall_off (id: 10) 
 
   }
 
-  void onUpdate( InstanceContentPtr instance, uint32_t currTime ) override
+  void onUpdate( InstanceContent& instance, uint32_t currTime ) override
   {
 
   }
 
-  void onEnterTerritory( InstanceContentPtr instance, Entity::Player& player, uint32_t eventId, uint16_t param1,
+  void onEnterTerritory( InstanceContent& instance, Entity::Player& player, uint32_t eventId, uint16_t param1,
                          uint16_t param2 ) override
   {
 
diff --git a/src/scripts/instances/deepdungeon/ThePalaceoftheDeadFloors7180.cpp b/src/scripts/instances/deepdungeon/ThePalaceoftheDeadFloors7180.cpp
index 307f253c..baa626c9 100644
--- a/src/scripts/instances/deepdungeon/ThePalaceoftheDeadFloors7180.cpp
+++ b/src/scripts/instances/deepdungeon/ThePalaceoftheDeadFloors7180.cpp
@@ -9,23 +9,21 @@ class ThePalaceoftheDeadFloors7180 :
 public:
   ThePalaceoftheDeadFloors7180() :
     Sapphire::ScriptAPI::InstanceContentScript( 60008 )
-  {
-  }
+  { }
 
-  void onInit( InstanceContentPtr instance ) override
+  void onInit( InstanceContent& instance ) override
   {
-    instance->registerEObj( "sgvf_w_lvd_b0959", 2000608, 6521120, 4, { -300.000000f, 3.189805f, -241.061096f },
-                            1.000000f, 0.000000f );
-    // States -> vf_bextwall_on vf_bextwall_on2off vf_bextwall_off
+    instance.registerEObj( "sgvf_w_lvd_b0959", 2000608, 6521120, 4, { -300.000000f, 3.189805f, -241.061096f }, 1.000000f, 0.000000f ); 
+      // States -> vf_bextwall_on (id: 3) vf_bextwall_on2off (id: 4) vf_bextwall_off (id: 10) 
 
   }
 
-  void onUpdate( InstanceContentPtr instance, uint32_t currTime ) override
+  void onUpdate( InstanceContent& instance, uint32_t currTime ) override
   {
 
   }
 
-  void onEnterTerritory( InstanceContentPtr instance, Entity::Player& player, uint32_t eventId, uint16_t param1,
+  void onEnterTerritory( InstanceContent& instance, Entity::Player& player, uint32_t eventId, uint16_t param1,
                          uint16_t param2 ) override
   {
 
diff --git a/src/scripts/instances/deepdungeon/ThePalaceoftheDeadFloors8190.cpp b/src/scripts/instances/deepdungeon/ThePalaceoftheDeadFloors8190.cpp
index f61c333d..f5b76d47 100644
--- a/src/scripts/instances/deepdungeon/ThePalaceoftheDeadFloors8190.cpp
+++ b/src/scripts/instances/deepdungeon/ThePalaceoftheDeadFloors8190.cpp
@@ -9,26 +9,23 @@ class ThePalaceoftheDeadFloors8190 :
 public:
   ThePalaceoftheDeadFloors8190() :
     Sapphire::ScriptAPI::InstanceContentScript( 60009 )
-  {
-  }
+  { }
 
-  void onInit( InstanceContentPtr instance ) override
+  void onInit( InstanceContent& instance ) override
   {
-    instance->registerEObj( "sgvf_w_lvd_b0959", 2000608, 6527847, 4, { -300.000000f, 0.000026f, -237.000000f },
-                            1.000000f, 0.000000f );
-    // States -> vf_bextwall_on vf_bextwall_on2off vf_bextwall_off
-    instance->registerEObj( "sgvf_w_lvd_b0959_1", 2000608, 6544382, 4, { 301.149902f, -0.045413f, 285.247589f },
-                            1.000000f, 0.000000f );
-    // States -> vf_bextwall_on vf_bextwall_on2off vf_bextwall_off
+    instance.registerEObj( "sgvf_w_lvd_b0959", 2000608, 6527847, 4, { -300.000000f, 0.000026f, -237.000000f }, 1.000000f, 0.000000f ); 
+      // States -> vf_bextwall_on (id: 3) vf_bextwall_on2off (id: 4) vf_bextwall_off (id: 10) 
+    instance.registerEObj( "sgvf_w_lvd_b0959_1", 2000608, 6544382, 4, { 301.149902f, -0.045413f, 285.247589f }, 1.000000f, 0.000000f ); 
+      // States -> vf_bextwall_on (id: 3) vf_bextwall_on2off (id: 4) vf_bextwall_off (id: 10) 
 
   }
 
-  void onUpdate( InstanceContentPtr instance, uint32_t currTime ) override
+  void onUpdate( InstanceContent& instance, uint32_t currTime ) override
   {
 
   }
 
-  void onEnterTerritory( InstanceContentPtr instance, Entity::Player& player, uint32_t eventId, uint16_t param1,
+  void onEnterTerritory( InstanceContent& instance, Entity::Player& player, uint32_t eventId, uint16_t param1,
                          uint16_t param2 ) override
   {
 
diff --git a/src/scripts/instances/deepdungeon/ThePalaceoftheDeadFloors91100.cpp b/src/scripts/instances/deepdungeon/ThePalaceoftheDeadFloors91100.cpp
index 27344904..13a241d0 100644
--- a/src/scripts/instances/deepdungeon/ThePalaceoftheDeadFloors91100.cpp
+++ b/src/scripts/instances/deepdungeon/ThePalaceoftheDeadFloors91100.cpp
@@ -9,26 +9,23 @@ class ThePalaceoftheDeadFloors91100 :
 public:
   ThePalaceoftheDeadFloors91100() :
     Sapphire::ScriptAPI::InstanceContentScript( 60010 )
-  {
-  }
+  { }
 
-  void onInit( InstanceContentPtr instance ) override
+  void onInit( InstanceContent& instance ) override
   {
-    instance->registerEObj( "sgvf_w_lvd_b0959", 2000608, 6527847, 4, { -300.000000f, 0.000026f, -237.000000f },
-                            1.000000f, 0.000000f );
-    // States -> vf_bextwall_on vf_bextwall_on2off vf_bextwall_off
-    instance->registerEObj( "sgvf_w_lvd_b0959_1", 2000608, 6544382, 4, { 301.149902f, -0.045413f, 285.247589f },
-                            1.000000f, 0.000000f );
-    // States -> vf_bextwall_on vf_bextwall_on2off vf_bextwall_off
+    instance.registerEObj( "sgvf_w_lvd_b0959", 2000608, 6527847, 4, { -300.000000f, 0.000026f, -237.000000f }, 1.000000f, 0.000000f ); 
+      // States -> vf_bextwall_on (id: 3) vf_bextwall_on2off (id: 4) vf_bextwall_off (id: 10) 
+    instance.registerEObj( "sgvf_w_lvd_b0959_1", 2000608, 6544382, 4, { 301.149902f, -0.045413f, 285.247589f }, 1.000000f, 0.000000f ); 
+      // States -> vf_bextwall_on (id: 3) vf_bextwall_on2off (id: 4) vf_bextwall_off (id: 10) 
 
   }
 
-  void onUpdate( InstanceContentPtr instance, uint32_t currTime ) override
+  void onUpdate( InstanceContent& instance, uint32_t currTime ) override
   {
 
   }
 
-  void onEnterTerritory( InstanceContentPtr instance, Entity::Player& player, uint32_t eventId, uint16_t param1,
+  void onEnterTerritory( InstanceContent& instance, Entity::Player& player, uint32_t eventId, uint16_t param1,
                          uint16_t param2 ) override
   {
 
diff --git a/src/scripts/instances/dungeons/AlaMhigo.cpp b/src/scripts/instances/dungeons/AlaMhigo.cpp
index 64f6f2d4..0d32c8ec 100644
--- a/src/scripts/instances/dungeons/AlaMhigo.cpp
+++ b/src/scripts/instances/dungeons/AlaMhigo.cpp
@@ -9,20 +9,56 @@ class AlaMhigo :
 public:
   AlaMhigo() :
     Sapphire::ScriptAPI::InstanceContentScript( 56 )
+  { }
+
+  void onInit( InstanceContent& instance ) override
   {
+    instance.registerEObj( "sgvf_w_lvd_b0118", 2002872, 6894813, 4, { -209.363495f, 35.017460f, 72.069672f }, 1.000000f, 0.000000f ); 
+      // States -> vf_bextwall_on (id: 3) vf_bextwall_of (id: 4) 
+    instance.registerEObj( "sgvf_w_lvd_b0118_1", 2002872, 6894812, 4, { -172.226807f, 35.017342f, 72.369667f }, 1.000000f, 0.000000f ); 
+      // States -> vf_bextwall_on (id: 3) vf_bextwall_of (id: 4) 
+    instance.registerEObj( "unknown_0", 2002735, 0, 4, { -210.219406f, 35.017460f, 72.000000f }, 1.000000f, -1.570451f ); 
+    instance.registerEObj( "unknown_1", 2008685, 0, 4, { -192.767105f, 34.867069f, 71.984734f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "sgvf_w_lvd_b0118_2", 2002872, 6894833, 4, { 250.000000f, 106.496902f, -50.489590f }, 1.000000f, 0.000000f ); 
+      // States -> vf_bextwall_on (id: 3) vf_bextwall_of (id: 4) 
+    instance.registerEObj( "sgvf_w_lvd_b0118_3", 2002872, 6894834, 4, { 250.000000f, 106.496902f, -89.516243f }, 1.000000f, 0.000000f ); 
+      // States -> vf_bextwall_on (id: 3) vf_bextwall_of (id: 4) 
+    instance.registerEObj( "unknown_2", 2002735, 0, 4, { 250.000000f, 106.496902f, -50.000000f }, 1.000000f, -0.000000f ); 
+    instance.registerEObj( "sgvf_w_lvd_b0250", 2002872, 6895342, 4, { 248.500000f, 122.000000f, -329.291107f }, 1.000000f, -0.000000f ); 
+      // States -> vf_bextwall_on (id: 3) vf_bextwall_of (id: 4) 
+    instance.registerEObj( "unknown_3", 2007457, 6865535, 4, { 249.561295f, 121.995796f, -352.681793f }, 0.991760f, 0.000048f ); 
+    instance.registerEObj( "sgvf_w_lvd_b0249", 2007457, 6895343, 4, { 249.487595f, 122.005699f, -330.083801f }, 0.991760f, 0.000048f ); 
+      // States -> vf_line_on (id: 10) vf_line_of (id: 11) 
+    instance.registerEObj( "sgvf_w_lvd_b0250_1", 2002872, 6904529, 4, { 248.937500f, 122.000000f, -377.252899f }, 1.000000f, 0.000000f ); 
+      // States -> vf_bextwall_on (id: 3) vf_bextwall_of (id: 4) 
+    instance.registerEObj( "unknown_4", 2008350, 0, 4, { 250.000000f, 122.000000f, -353.000000f }, 1.000000f, -0.000000f ); 
+    instance.registerEObj( "unknown_5", 2007168, 0, 4, { 250.018997f, 121.995796f, -353.109009f }, 0.991760f, 0.000048f ); 
+    instance.registerEObj( "Entrance", 2000182, 6879593, 5, { -408.611298f, 2.500000f, 233.977905f }, 1.000000f, 0.000000f ); 
+      // States -> vf_lock_on (id: 11) vf_lock_of (id: 12) 
+    instance.registerEObj( "Shortcut", 2000700, 0, 4, { -398.118408f, 2.500000f, 236.857193f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "Exit", 2000139, 0, 4, { 250.007294f, 122.000000f, -370.492889f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_6", 2008319, 6844583, 4, { -342.881104f, 24.000010f, 149.680099f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_7", 2008319, 6844584, 4, { -258.130402f, 27.000010f, 99.970268f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_8", 2007457, 6840800, 4, { -100.167801f, 44.750629f, 73.001747f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_9", 2007457, 6853103, 4, { 193.710297f, 106.000000f, 128.847397f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_10", 2007457, 6847102, 4, { 263.424286f, 106.400002f, -8.750051f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_11", 2007457, 6847104, 4, { 249.800797f, 106.428101f, -108.873100f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_12", 2008335, 6844579, 4, { 233.630905f, 109.971703f, -155.596298f }, 0.991760f, 0.000048f ); 
+    instance.registerEObj( "unknown_13", 2008335, 6844578, 4, { 233.295197f, 109.971703f, -144.792892f }, 0.991760f, 0.000048f ); 
+    instance.registerEObj( "unknown_14", 2008335, 6844581, 4, { 224.912094f, 120.000000f, -248.707504f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_15", 2008335, 6844580, 4, { 210.809296f, 120.000000f, -248.716202f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_16", 2008336, 6845038, 4, { 249.895905f, 122.099899f, -294.475403f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_17", 2007457, 6942278, 4, { 233.967697f, 110.000000f, -150.215607f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_18", 2007457, 6942279, 4, { 217.761505f, 119.889999f, -247.455597f }, 0.991760f, 0.000048f ); 
+
   }
 
-  void onInit( InstanceContentPtr instance ) override
+  void onUpdate( InstanceContent& instance, uint32_t currTime ) override
   {
 
   }
 
-  void onUpdate( InstanceContentPtr instance, uint32_t currTime ) override
-  {
-
-  }
-
-  void onEnterTerritory( InstanceContentPtr instance, Entity::Player& player, uint32_t eventId, uint16_t param1,
+  void onEnterTerritory( InstanceContent& instance, Entity::Player& player, uint32_t eventId, uint16_t param1,
                          uint16_t param2 ) override
   {
 
diff --git a/src/scripts/instances/dungeons/AmdaporKeep.cpp b/src/scripts/instances/dungeons/AmdaporKeep.cpp
index ae0c7966..f65ab444 100644
--- a/src/scripts/instances/dungeons/AmdaporKeep.cpp
+++ b/src/scripts/instances/dungeons/AmdaporKeep.cpp
@@ -9,222 +9,142 @@ class AmdaporKeep :
 public:
   AmdaporKeep() :
     Sapphire::ScriptAPI::InstanceContentScript( 14 )
-  {
-  }
+  { }
 
-  void onInit( InstanceContentPtr instance ) override
+  void onInit( InstanceContent& instance ) override
   {
-    instance->registerEObj( "sgbg_f1d3_a1_gar2", 2000551, 4277027, 4, { -3.577190f, 48.000000f, -12.625050f },
-                            1.000000f, 0.000000f );
-    // States -> on off vfx_on
-    instance->registerEObj( "sgbg_f1d3_a1_gar2_1", 2000552, 4277005, 4, { 21.455280f, 48.000011f, -12.604770f },
-                            1.000000f, 0.000000f );
-    // States -> on off vfx_on
-    instance->registerEObj( "sgbg_f1d3_a1_gar2_2", 2000553, 4277029, 4, { -3.963791f, 48.000000f, 9.699657f },
-                            1.000000f, 0.000000f );
-    // States -> on off vfx_on
-    instance->registerEObj( "sgbg_f1d3_a1_gar2_3", 2000554, 4277028, 4, { 21.081841f, 47.999920f, 9.731779f },
-                            1.000000f, 0.000000f );
-    // States -> on off vfx_on
-    instance->registerEObj( "Entrance", 2000491, 4246565, 5, { -254.388702f, -8.857766f, -0.323940f }, 1.000000f,
-                            0.000000f );
-    // States -> vf_lock_on vf_lock_of
-    instance->registerEObj( "unknown_0", 2000492, 0, 4, { -266.179810f, -9.200000f, -0.162207f }, 1.000000f,
-                            0.000000f );
-    instance->registerEObj( "Exit", 2000493, 4246574, 4, { -12.466670f, 48.285069f, -0.015320f }, 0.991760f,
-                            0.000048f );
-    // States -> vf_htras1_on vf_htras1_of
-    instance->registerEObj( "sgvf_w_lvd_b0094", 2000494, 4246576, 4, { -81.527344f, 0.000003f, -1.602537f }, 1.000000f,
-                            0.000000f );
-    // States -> vf_line_on vf_line_of
-    instance->registerEObj( "sgvf_w_lvd_b0118", 2000495, 4246594, 4, { -81.412201f, 0.000003f, 0.186550f }, 1.000000f,
-                            0.000000f );
-    // States -> vf_bextwall_on vf_bextwall_of
-    instance->registerEObj( "sgvf_w_lvd_b0094_1", 2000496, 4246595, 4, { 199.816895f, 21.957701f, -104.781303f },
-                            0.991760f, 0.000048f );
-    // States -> vf_line_on vf_line_of
-    instance->registerEObj( "sgpl_w_lvd_b0118_f1d2", 2000497, 4246596, 4, { 200.915497f, 21.957701f, -104.598198f },
-                            0.991760f, 0.000048f );
-    // States -> vf_bextwall_on vf_bextwall_of
-    instance->registerEObj( "sgvf_w_lvd_b0249", 2000498, 4246617, 4, { 34.775269f, 48.081181f, 0.381470f }, 0.991760f,
-                            0.000048f );
-    // States -> vf_line_on vf_line_of
-    instance->registerEObj( "sgvf_w_lvd_b0250", 2000499, 4246618, 4, { 34.775269f, 48.081181f, -0.839294f }, 0.991760f,
-                            0.000048f );
-    // States -> vf_bextwall_on vf_bextwall_of
-    instance->registerEObj( "Shortcut", 2000700, 0, 4, { -246.833496f, -8.499996f, 4.016408f }, 1.000000f, 0.000000f );
-    instance->registerEObj( "Aetherialflow", 2000500, 4247835, 4, { -10.236110f, -0.000000f, -0.015320f }, 0.991760f,
-                            0.000048f );
-    instance->registerEObj( "PresenceChamberdoor", 2000502, 4308888, 4, { 60.483269f, 48.174511f, -0.015320f },
-                            0.991760f, 0.000048f );
-    instance->registerEObj( "BloodyTranseptdoor", 2000687, 4308274, 4, { 199.985397f, 22.200001f, -103.389503f },
-                            1.000000f, 0.000000f );
-    instance->registerEObj( "sgvf_f1d1_b0008", 2002741, 4388278, 4, { -82.462273f, 0.000002f, 0.045686f }, 1.000000f,
-                            0.000000f );
-    // States -> vf_baria1_off vf_baria_on
-    instance->registerEObj( "sgbg_f1d3_a1_gar1", 2000509, 4271520, 4, { 134.111496f, 22.079769f, -5.935791f },
-                            0.991760f, 0.000048f );
-    instance->registerEObj( "sgbg_f1d3_a1_gar1_1", 2000510, 4271522, 4, { 142.229202f, 22.079769f, -6.088379f },
-                            0.991760f, 0.000048f );
-    instance->registerEObj( "sgbg_f1d3_a1_gar1_2", 2000511, 4271529, 4, { 158.129196f, 22.079769f, -6.088379f },
-                            0.991760f, 0.000048f );
-    instance->registerEObj( "sgbg_f1d3_a1_gar1_3", 2000512, 4271531, 4, { 133.958893f, 22.079769f, 6.271362f },
-                            0.991760f, 0.000048f );
-    instance->registerEObj( "sgbg_f1d3_a1_gar1_4", 2000513, 4271532, 4, { 142.015594f, 22.079769f, 6.271362f },
-                            0.991760f, 0.000048f );
-    instance->registerEObj( "sgbg_f1d3_a1_gar1_5", 2000514, 4271533, 4, { 158.190201f, 22.079769f, 6.271362f },
-                            0.991760f, 0.000048f );
-    instance->registerEObj( "sgbg_f1d3_a1_gar1_6", 2000521, 4274657, 4, { 193.987900f, 22.110291f, 42.099609f },
-                            0.991760f, 0.000048f );
-    instance->registerEObj( "sgbg_f1d3_a1_gar1_7", 2000522, 4274656, 4, { 193.804794f, 22.079769f, 57.938480f },
-                            0.991760f, 0.000048f );
-    instance->registerEObj( "sgbg_f1d3_a1_gar1_8", 2000523, 4274655, 4, { 193.804794f, 22.079769f, 65.964722f },
-                            0.991760f, 0.000048f );
-    instance->registerEObj( "sgbg_f1d3_a1_gar1_9", 2000524, 4274661, 4, { 206.317093f, 22.079769f, 42.038570f },
-                            0.991760f, 0.000048f );
-    instance->registerEObj( "sgbg_f1d3_a1_gar1_10", 2000525, 4274660, 4, { 206.286697f, 22.079769f, 57.968990f },
-                            0.991760f, 0.000048f );
-    instance->registerEObj( "sgbg_f1d3_a1_gar1_11", 2000526, 4274659, 4, { 206.286697f, 22.079769f, 65.995239f },
-                            0.991760f, 0.000048f );
-    instance->registerEObj( "sgbg_f1d3_a1_gar1_12", 2000533, 4274648, 4, { 241.992798f, 22.079769f, -6.332520f },
-                            0.991760f, 0.000048f );
-    instance->registerEObj( "sgbg_f1d3_a1_gar1_13", 2000534, 4274649, 4, { 258.075806f, 22.079769f, -6.332520f },
-                            0.991760f, 0.000048f );
-    instance->registerEObj( "sgbg_f1d3_a1_gar1_14", 2000535, 4274650, 4, { 265.949493f, 22.079769f, -6.271484f },
-                            0.991760f, 0.000048f );
-    instance->registerEObj( "sgbg_f1d3_a1_gar1_15", 2000536, 4274651, 4, { 241.931793f, 22.079769f, 6.240906f },
-                            0.991760f, 0.000048f );
-    instance->registerEObj( "sgbg_f1d3_a1_gar1_16", 2000537, 4274652, 4, { 258.075806f, 22.079769f, 6.271362f },
-                            0.991760f, 0.000048f );
-    instance->registerEObj( "sgbg_f1d3_a1_gar1_17", 2000538, 4274653, 4, { 266.071503f, 22.079769f, 6.271362f },
-                            0.991760f, 0.000048f );
-    instance->registerEObj( "sgbg_f1d3_a1_gar1_18", 2000545, 4274662, 4, { 193.804794f, 22.079769f, -34.042912f },
-                            0.991760f, 0.000048f );
-    instance->registerEObj( "sgbg_f1d3_a1_gar1_19", 2000546, 4274667, 4, { 193.804794f, 22.079769f, -42.008121f },
-                            0.991760f, 0.000048f );
-    instance->registerEObj( "sgbg_f1d3_a1_gar1_20", 2000547, 4274666, 4, { 193.804794f, 22.079769f, -58.335270f },
-                            0.991760f, 0.000048f );
-    instance->registerEObj( "sgbg_f1d3_a1_gar1_21", 2000548, 4274663, 4, { 206.317093f, 22.079769f, -33.890320f },
-                            0.991760f, 0.000048f );
-    instance->registerEObj( "sgbg_f1d3_a1_gar1_22", 2000549, 4274665, 4, { 206.317093f, 22.079769f, -41.916561f },
-                            0.991760f, 0.000048f );
-    instance->registerEObj( "sgbg_f1d3_a1_gar1_23", 2000550, 4274664, 4, { 206.317093f, 22.079769f, -58.274231f },
-                            0.991760f, 0.000048f );
-    instance->registerEObj( "sgbg_f1d3_a1_gar2_4", 2000503, 4274671, 4, { 134.111496f, 22.079769f, -5.935791f },
-                            0.991760f, 0.000048f );
-    // States -> on off vfx_on
-    instance->registerEObj( "sgbg_f1d3_a1_gar2_5", 2000504, 4274672, 4, { 142.229202f, 22.079769f, -6.088379f },
-                            0.991760f, 0.000048f );
-    // States -> on off vfx_on
-    instance->registerEObj( "sgbg_f1d3_a1_gar2_6", 2000505, 4274673, 4, { 158.129196f, 22.079769f, -6.088379f },
-                            0.991760f, 0.000048f );
-    // States -> on off vfx_on
-    instance->registerEObj( "sgbg_f1d3_a1_gar2_7", 2000506, 4274674, 4, { 133.958893f, 22.079769f, 6.271362f },
-                            0.991760f, 0.000048f );
-    // States -> on off vfx_on
-    instance->registerEObj( "sgbg_f1d3_a1_gar2_8", 2000507, 4274675, 4, { 142.015594f, 22.079769f, 6.271362f },
-                            0.991760f, 0.000048f );
-    // States -> on off vfx_on
-    instance->registerEObj( "sgbg_f1d3_a1_gar2_9", 2000508, 4274676, 4, { 158.190201f, 22.079769f, 6.271362f },
-                            0.991760f, 0.000048f );
-    // States -> on off vfx_on
-    instance->registerEObj( "sgbg_f1d3_a1_gar2_10", 2000515, 4274685, 4, { 193.987900f, 22.110291f, 42.099609f },
-                            0.991760f, 0.000048f );
-    // States -> on off vfx_on
-    instance->registerEObj( "sgbg_f1d3_a1_gar2_11", 2000516, 4274684, 4, { 193.804794f, 22.079769f, 57.938480f },
-                            0.991760f, 0.000048f );
-    // States -> on off vfx_on
-    instance->registerEObj( "sgbg_f1d3_a1_gar2_12", 2000517, 4274683, 4, { 193.804794f, 22.079769f, 65.964722f },
-                            0.991760f, 0.000048f );
-    // States -> on off vfx_on
-    instance->registerEObj( "sgbg_f1d3_a1_gar2_13", 2000518, 4274688, 4, { 206.317093f, 22.079769f, 42.038570f },
-                            0.991760f, 0.000048f );
-    // States -> on off vfx_on
-    instance->registerEObj( "sgbg_f1d3_a1_gar2_14", 2000519, 4274687, 4, { 206.317093f, 22.079769f, 57.968990f },
-                            0.991760f, 0.000048f );
-    // States -> on off vfx_on
-    instance->registerEObj( "sgbg_f1d3_a1_gar2_15", 2000520, 4274686, 4, { 206.317093f, 22.079769f, 65.995239f },
-                            0.991760f, 0.000048f );
-    // States -> on off vfx_on
-    instance->registerEObj( "sgbg_f1d3_a1_gar2_16", 2000527, 4274677, 4, { 241.992798f, 22.079769f, -6.332520f },
-                            0.991760f, 0.000048f );
-    // States -> on off vfx_on
-    instance->registerEObj( "sgbg_f1d3_a1_gar2_17", 2000528, 4274678, 4, { 258.075806f, 22.079769f, -6.332520f },
-                            0.991760f, 0.000048f );
-    // States -> on off vfx_on
-    instance->registerEObj( "sgbg_f1d3_a1_gar2_18", 2000529, 4274679, 4, { 265.949493f, 22.079769f, -6.271484f },
-                            0.991760f, 0.000048f );
-    // States -> on off vfx_on
-    instance->registerEObj( "sgbg_f1d3_a1_gar2_19", 2000530, 4274680, 4, { 241.931793f, 22.079769f, 6.271362f },
-                            0.991760f, 0.000048f );
-    // States -> on off vfx_on
-    instance->registerEObj( "sgbg_f1d3_a1_gar2_20", 2000531, 4274681, 4, { 258.075806f, 22.079769f, 6.271362f },
-                            0.991760f, 0.000048f );
-    // States -> on off vfx_on
-    instance->registerEObj( "sgbg_f1d3_a1_gar2_21", 2000532, 4274682, 4, { 266.071503f, 22.079769f, 6.271362f },
-                            0.991760f, 0.000048f );
-    // States -> on off vfx_on
-    instance->registerEObj( "sgbg_f1d3_a1_gar2_22", 2000539, 4274689, 4, { 193.804794f, 22.079769f, -34.042912f },
-                            0.991760f, 0.000048f );
-    // States -> on off vfx_on
-    instance->registerEObj( "sgbg_f1d3_a1_gar2_23", 2000540, 4274694, 4, { 193.804794f, 22.079769f, -42.008121f },
-                            0.991760f, 0.000048f );
-    // States -> on off vfx_on
-    instance->registerEObj( "sgbg_f1d3_a1_gar2_24", 2000541, 4274693, 4, { 193.804794f, 22.079769f, -58.335270f },
-                            0.991760f, 0.000048f );
-    // States -> on off vfx_on
-    instance->registerEObj( "sgbg_f1d3_a1_gar2_25", 2000542, 4274690, 4, { 206.317093f, 22.079769f, -33.890320f },
-                            0.991760f, 0.000048f );
-    // States -> on off vfx_on
-    instance->registerEObj( "sgbg_f1d3_a1_gar2_26", 2000543, 4274692, 4, { 206.317093f, 22.079769f, -41.916561f },
-                            0.991760f, 0.000048f );
-    // States -> on off vfx_on
-    instance->registerEObj( "sgbg_f1d3_a1_gar2_27", 2000544, 4274691, 4, { 206.317093f, 22.079769f, -58.274231f },
-                            0.991760f, 0.000048f );
-    // States -> on off vfx_on
-    instance->registerEObj( "Entrance_1", 2000182, 5608623, 5, { -156.520401f, -2.800003f, -5.140180f }, 1.000000f,
-                            0.000000f );
-    // States -> vf_lock_on vf_lock_of
-    instance->registerEObj( "sgvf_w_lvd_b0118_1", 2002872, 5608617, 4, { -154.662003f, -2.800003f, 5.028913f },
-                            1.000000f, 0.000000f );
-    // States -> vf_bextwall_on vf_bextwall_of
-    instance->registerEObj( "unknown_1", 2002735, 0, 4, { -151.232193f, -2.822998f, 0.289556f }, 1.174927f,
-                            -1.570451f );
-    instance->registerEObj( "sgvf_w_lvd_b0118_2", 2005128, 5608619, 4, { -112.240501f, -2.800003f, -0.701091f },
-                            1.000000f, 0.000000f );
-    // States -> vf_bextwall_on vf_bextwall_of
-    instance->registerEObj( "unknown_2", 2002735, 0, 4, { -46.585720f, 0.045776f, 0.190301f }, 1.179312f, -1.570451f );
-    instance->registerEObj( "sgvf_w_lvd_b0118_3", 2002872, 5608620, 4, { -46.476231f, 0.000000f, -0.510445f },
-                            1.000000f, 0.000000f );
-    // States -> vf_bextwall_on vf_bextwall_of
-    instance->registerEObj( "Exit_1", 2000139, 0, 4, { -7.766907f, -0.015320f, 0.015198f }, 0.991760f, 0.000048f );
-    instance->registerEObj( "sgvf_f1d3_bo189", 2000561, 4248559, 4, { 200.121902f, 21.988159f, -114.000000f },
-                            1.000000f, 0.000048f );
-    instance->registerEObj( "sgbg_col_wall_00", 2000555, 4249099, 4, { 200.000000f, 21.988159f, -151.822800f },
-                            0.991760f, 0.000048f );
-    instance->registerEObj( "Aetherialflow_1", 2000501, 4247838, 4, { 200.061005f, 22.000000f, -165.266006f },
-                            0.991760f, 0.000048f );
-    instance->registerEObj( "sgbg_col_wall_00_1", 2000556, 4249100, 4, { 200.000000f, 21.988159f, -146.822800f },
-                            0.991760f, 0.000048f );
-    instance->registerEObj( "sgbg_col_wall_00_2", 2000557, 4249101, 4, { 200.000000f, 21.988159f, -141.822800f },
-                            0.991760f, 0.000048f );
-    instance->registerEObj( "sgbg_col_wall_00_3", 2000560, 4249104, 4, { 200.000000f, 21.988159f, -126.822800f },
-                            0.991760f, 0.000048f );
-    instance->registerEObj( "sgbg_col_wall_00_4", 2000602, 4253048, 4, { 200.000000f, 21.988159f, -121.822800f },
-                            0.991760f, 0.000048f );
-    instance->registerEObj( "sgbg_col_wall_00_5", 2000559, 4249103, 4, { 200.000000f, 21.988159f, -131.822800f },
-                            0.991760f, 0.000048f );
-    instance->registerEObj( "sgbg_col_wall_00_6", 2000558, 4249102, 4, { 200.000000f, 21.957701f, -136.838501f },
-                            0.991760f, 0.000048f );
+    instance.registerEObj( "sgbg_f1d3_a1_gar2", 2000551, 4277027, 4, { -3.577190f, 48.000000f, -12.625050f }, 1.000000f, 0.000000f ); 
+      // States -> on (id: 4) off (id: 5) vfx_on (id: 8) 
+    instance.registerEObj( "sgbg_f1d3_a1_gar2_1", 2000552, 4277005, 4, { 21.455280f, 48.000011f, -12.604770f }, 1.000000f, 0.000000f ); 
+      // States -> on (id: 4) off (id: 5) vfx_on (id: 8) 
+    instance.registerEObj( "sgbg_f1d3_a1_gar2_2", 2000553, 4277029, 4, { -3.963791f, 48.000000f, 9.699657f }, 1.000000f, 0.000000f ); 
+      // States -> on (id: 4) off (id: 5) vfx_on (id: 8) 
+    instance.registerEObj( "sgbg_f1d3_a1_gar2_3", 2000554, 4277028, 4, { 21.081841f, 47.999920f, 9.731779f }, 1.000000f, 0.000000f ); 
+      // States -> on (id: 4) off (id: 5) vfx_on (id: 8) 
+    instance.registerEObj( "Entrance", 2000491, 4246565, 5, { -254.388702f, -8.857766f, -0.323940f }, 1.000000f, 0.000000f ); 
+      // States -> vf_lock_on (id: 11) vf_lock_of (id: 12) 
+    instance.registerEObj( "unknown_0", 2000492, 0, 4, { -266.179810f, -9.200000f, -0.162207f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "Exit", 2000493, 4246574, 4, { -12.466670f, 48.285069f, -0.015320f }, 0.991760f, 0.000048f ); 
+      // States -> vf_htras1_on (id: 2) vf_htras1_of (id: 3) 
+    instance.registerEObj( "sgvf_w_lvd_b0094", 2000494, 4246576, 4, { -81.527344f, 0.000003f, -1.602537f }, 1.000000f, 0.000000f ); 
+      // States -> vf_line_on (id: 12) vf_line_of (id: 13) 
+    instance.registerEObj( "sgvf_w_lvd_b0118", 2000495, 4246594, 4, { -81.412201f, 0.000003f, 0.186550f }, 1.000000f, 0.000000f ); 
+      // States -> vf_bextwall_on (id: 3) vf_bextwall_of (id: 4) 
+    instance.registerEObj( "sgvf_w_lvd_b0094_1", 2000496, 4246595, 4, { 199.816895f, 21.957701f, -104.781303f }, 0.991760f, 0.000048f ); 
+      // States -> vf_line_on (id: 12) vf_line_of (id: 13) 
+    instance.registerEObj( "sgpl_w_lvd_b0118_f1d2", 2000497, 4246596, 4, { 200.915497f, 21.957701f, -104.598198f }, 0.991760f, 0.000048f ); 
+      // States -> vf_bextwall_on (id: 3) vf_bextwall_of (id: 4) 
+    instance.registerEObj( "sgvf_w_lvd_b0249", 2000498, 4246617, 4, { 34.775269f, 48.081181f, 0.381470f }, 0.991760f, 0.000048f ); 
+      // States -> vf_line_on (id: 10) vf_line_of (id: 11) 
+    instance.registerEObj( "sgvf_w_lvd_b0250", 2000499, 4246618, 4, { 34.775269f, 48.081181f, -0.839294f }, 0.991760f, 0.000048f ); 
+      // States -> vf_bextwall_on (id: 3) vf_bextwall_of (id: 4) 
+    instance.registerEObj( "Shortcut", 2000700, 0, 4, { -246.833496f, -8.499996f, 4.016408f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "Aetherialflow", 2000500, 4247835, 4, { -10.236110f, -0.000000f, -0.015320f }, 0.991760f, 0.000048f ); 
+    instance.registerEObj( "PresenceChamberdoor", 2000502, 4308888, 4, { 60.483269f, 48.174511f, -0.015320f }, 0.991760f, 0.000048f ); 
+    instance.registerEObj( "BloodyTranseptdoor", 2000687, 4308274, 4, { 199.985397f, 22.200001f, -103.389503f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "sgvf_f1d1_b0008", 2002741, 4388278, 4, { -82.462273f, 0.000002f, 0.045686f }, 1.000000f, 0.000000f ); 
+      // States -> vf_baria1_off (id: 3) vf_baria_on (id: 6) 
+    instance.registerEObj( "sgbg_f1d3_a1_gar1", 2000509, 4271520, 4, { 134.111496f, 22.079769f, -5.935791f }, 0.991760f, 0.000048f ); 
+    instance.registerEObj( "sgbg_f1d3_a1_gar1_1", 2000510, 4271522, 4, { 142.229202f, 22.079769f, -6.088379f }, 0.991760f, 0.000048f ); 
+    instance.registerEObj( "sgbg_f1d3_a1_gar1_2", 2000511, 4271529, 4, { 158.129196f, 22.079769f, -6.088379f }, 0.991760f, 0.000048f ); 
+    instance.registerEObj( "sgbg_f1d3_a1_gar1_3", 2000512, 4271531, 4, { 133.958893f, 22.079769f, 6.271362f }, 0.991760f, 0.000048f ); 
+    instance.registerEObj( "sgbg_f1d3_a1_gar1_4", 2000513, 4271532, 4, { 142.015594f, 22.079769f, 6.271362f }, 0.991760f, 0.000048f ); 
+    instance.registerEObj( "sgbg_f1d3_a1_gar1_5", 2000514, 4271533, 4, { 158.190201f, 22.079769f, 6.271362f }, 0.991760f, 0.000048f ); 
+    instance.registerEObj( "sgbg_f1d3_a1_gar1_6", 2000521, 4274657, 4, { 193.987900f, 22.110291f, 42.099609f }, 0.991760f, 0.000048f ); 
+    instance.registerEObj( "sgbg_f1d3_a1_gar1_7", 2000522, 4274656, 4, { 193.804794f, 22.079769f, 57.938480f }, 0.991760f, 0.000048f ); 
+    instance.registerEObj( "sgbg_f1d3_a1_gar1_8", 2000523, 4274655, 4, { 193.804794f, 22.079769f, 65.964722f }, 0.991760f, 0.000048f ); 
+    instance.registerEObj( "sgbg_f1d3_a1_gar1_9", 2000524, 4274661, 4, { 206.317093f, 22.079769f, 42.038570f }, 0.991760f, 0.000048f ); 
+    instance.registerEObj( "sgbg_f1d3_a1_gar1_10", 2000525, 4274660, 4, { 206.286697f, 22.079769f, 57.968990f }, 0.991760f, 0.000048f ); 
+    instance.registerEObj( "sgbg_f1d3_a1_gar1_11", 2000526, 4274659, 4, { 206.286697f, 22.079769f, 65.995239f }, 0.991760f, 0.000048f ); 
+    instance.registerEObj( "sgbg_f1d3_a1_gar1_12", 2000533, 4274648, 4, { 241.992798f, 22.079769f, -6.332520f }, 0.991760f, 0.000048f ); 
+    instance.registerEObj( "sgbg_f1d3_a1_gar1_13", 2000534, 4274649, 4, { 258.075806f, 22.079769f, -6.332520f }, 0.991760f, 0.000048f ); 
+    instance.registerEObj( "sgbg_f1d3_a1_gar1_14", 2000535, 4274650, 4, { 265.949493f, 22.079769f, -6.271484f }, 0.991760f, 0.000048f ); 
+    instance.registerEObj( "sgbg_f1d3_a1_gar1_15", 2000536, 4274651, 4, { 241.931793f, 22.079769f, 6.240906f }, 0.991760f, 0.000048f ); 
+    instance.registerEObj( "sgbg_f1d3_a1_gar1_16", 2000537, 4274652, 4, { 258.075806f, 22.079769f, 6.271362f }, 0.991760f, 0.000048f ); 
+    instance.registerEObj( "sgbg_f1d3_a1_gar1_17", 2000538, 4274653, 4, { 266.071503f, 22.079769f, 6.271362f }, 0.991760f, 0.000048f ); 
+    instance.registerEObj( "sgbg_f1d3_a1_gar1_18", 2000545, 4274662, 4, { 193.804794f, 22.079769f, -34.042912f }, 0.991760f, 0.000048f ); 
+    instance.registerEObj( "sgbg_f1d3_a1_gar1_19", 2000546, 4274667, 4, { 193.804794f, 22.079769f, -42.008121f }, 0.991760f, 0.000048f ); 
+    instance.registerEObj( "sgbg_f1d3_a1_gar1_20", 2000547, 4274666, 4, { 193.804794f, 22.079769f, -58.335270f }, 0.991760f, 0.000048f ); 
+    instance.registerEObj( "sgbg_f1d3_a1_gar1_21", 2000548, 4274663, 4, { 206.317093f, 22.079769f, -33.890320f }, 0.991760f, 0.000048f ); 
+    instance.registerEObj( "sgbg_f1d3_a1_gar1_22", 2000549, 4274665, 4, { 206.317093f, 22.079769f, -41.916561f }, 0.991760f, 0.000048f ); 
+    instance.registerEObj( "sgbg_f1d3_a1_gar1_23", 2000550, 4274664, 4, { 206.317093f, 22.079769f, -58.274231f }, 0.991760f, 0.000048f ); 
+    instance.registerEObj( "sgbg_f1d3_a1_gar2_4", 2000503, 4274671, 4, { 134.111496f, 22.079769f, -5.935791f }, 0.991760f, 0.000048f ); 
+      // States -> on (id: 4) off (id: 5) vfx_on (id: 8) 
+    instance.registerEObj( "sgbg_f1d3_a1_gar2_5", 2000504, 4274672, 4, { 142.229202f, 22.079769f, -6.088379f }, 0.991760f, 0.000048f ); 
+      // States -> on (id: 4) off (id: 5) vfx_on (id: 8) 
+    instance.registerEObj( "sgbg_f1d3_a1_gar2_6", 2000505, 4274673, 4, { 158.129196f, 22.079769f, -6.088379f }, 0.991760f, 0.000048f ); 
+      // States -> on (id: 4) off (id: 5) vfx_on (id: 8) 
+    instance.registerEObj( "sgbg_f1d3_a1_gar2_7", 2000506, 4274674, 4, { 133.958893f, 22.079769f, 6.271362f }, 0.991760f, 0.000048f ); 
+      // States -> on (id: 4) off (id: 5) vfx_on (id: 8) 
+    instance.registerEObj( "sgbg_f1d3_a1_gar2_8", 2000507, 4274675, 4, { 142.015594f, 22.079769f, 6.271362f }, 0.991760f, 0.000048f ); 
+      // States -> on (id: 4) off (id: 5) vfx_on (id: 8) 
+    instance.registerEObj( "sgbg_f1d3_a1_gar2_9", 2000508, 4274676, 4, { 158.190201f, 22.079769f, 6.271362f }, 0.991760f, 0.000048f ); 
+      // States -> on (id: 4) off (id: 5) vfx_on (id: 8) 
+    instance.registerEObj( "sgbg_f1d3_a1_gar2_10", 2000515, 4274685, 4, { 193.987900f, 22.110291f, 42.099609f }, 0.991760f, 0.000048f ); 
+      // States -> on (id: 4) off (id: 5) vfx_on (id: 8) 
+    instance.registerEObj( "sgbg_f1d3_a1_gar2_11", 2000516, 4274684, 4, { 193.804794f, 22.079769f, 57.938480f }, 0.991760f, 0.000048f ); 
+      // States -> on (id: 4) off (id: 5) vfx_on (id: 8) 
+    instance.registerEObj( "sgbg_f1d3_a1_gar2_12", 2000517, 4274683, 4, { 193.804794f, 22.079769f, 65.964722f }, 0.991760f, 0.000048f ); 
+      // States -> on (id: 4) off (id: 5) vfx_on (id: 8) 
+    instance.registerEObj( "sgbg_f1d3_a1_gar2_13", 2000518, 4274688, 4, { 206.317093f, 22.079769f, 42.038570f }, 0.991760f, 0.000048f ); 
+      // States -> on (id: 4) off (id: 5) vfx_on (id: 8) 
+    instance.registerEObj( "sgbg_f1d3_a1_gar2_14", 2000519, 4274687, 4, { 206.317093f, 22.079769f, 57.968990f }, 0.991760f, 0.000048f ); 
+      // States -> on (id: 4) off (id: 5) vfx_on (id: 8) 
+    instance.registerEObj( "sgbg_f1d3_a1_gar2_15", 2000520, 4274686, 4, { 206.317093f, 22.079769f, 65.995239f }, 0.991760f, 0.000048f ); 
+      // States -> on (id: 4) off (id: 5) vfx_on (id: 8) 
+    instance.registerEObj( "sgbg_f1d3_a1_gar2_16", 2000527, 4274677, 4, { 241.992798f, 22.079769f, -6.332520f }, 0.991760f, 0.000048f ); 
+      // States -> on (id: 4) off (id: 5) vfx_on (id: 8) 
+    instance.registerEObj( "sgbg_f1d3_a1_gar2_17", 2000528, 4274678, 4, { 258.075806f, 22.079769f, -6.332520f }, 0.991760f, 0.000048f ); 
+      // States -> on (id: 4) off (id: 5) vfx_on (id: 8) 
+    instance.registerEObj( "sgbg_f1d3_a1_gar2_18", 2000529, 4274679, 4, { 265.949493f, 22.079769f, -6.271484f }, 0.991760f, 0.000048f ); 
+      // States -> on (id: 4) off (id: 5) vfx_on (id: 8) 
+    instance.registerEObj( "sgbg_f1d3_a1_gar2_19", 2000530, 4274680, 4, { 241.931793f, 22.079769f, 6.271362f }, 0.991760f, 0.000048f ); 
+      // States -> on (id: 4) off (id: 5) vfx_on (id: 8) 
+    instance.registerEObj( "sgbg_f1d3_a1_gar2_20", 2000531, 4274681, 4, { 258.075806f, 22.079769f, 6.271362f }, 0.991760f, 0.000048f ); 
+      // States -> on (id: 4) off (id: 5) vfx_on (id: 8) 
+    instance.registerEObj( "sgbg_f1d3_a1_gar2_21", 2000532, 4274682, 4, { 266.071503f, 22.079769f, 6.271362f }, 0.991760f, 0.000048f ); 
+      // States -> on (id: 4) off (id: 5) vfx_on (id: 8) 
+    instance.registerEObj( "sgbg_f1d3_a1_gar2_22", 2000539, 4274689, 4, { 193.804794f, 22.079769f, -34.042912f }, 0.991760f, 0.000048f ); 
+      // States -> on (id: 4) off (id: 5) vfx_on (id: 8) 
+    instance.registerEObj( "sgbg_f1d3_a1_gar2_23", 2000540, 4274694, 4, { 193.804794f, 22.079769f, -42.008121f }, 0.991760f, 0.000048f ); 
+      // States -> on (id: 4) off (id: 5) vfx_on (id: 8) 
+    instance.registerEObj( "sgbg_f1d3_a1_gar2_24", 2000541, 4274693, 4, { 193.804794f, 22.079769f, -58.335270f }, 0.991760f, 0.000048f ); 
+      // States -> on (id: 4) off (id: 5) vfx_on (id: 8) 
+    instance.registerEObj( "sgbg_f1d3_a1_gar2_25", 2000542, 4274690, 4, { 206.317093f, 22.079769f, -33.890320f }, 0.991760f, 0.000048f ); 
+      // States -> on (id: 4) off (id: 5) vfx_on (id: 8) 
+    instance.registerEObj( "sgbg_f1d3_a1_gar2_26", 2000543, 4274692, 4, { 206.317093f, 22.079769f, -41.916561f }, 0.991760f, 0.000048f ); 
+      // States -> on (id: 4) off (id: 5) vfx_on (id: 8) 
+    instance.registerEObj( "sgbg_f1d3_a1_gar2_27", 2000544, 4274691, 4, { 206.317093f, 22.079769f, -58.274231f }, 0.991760f, 0.000048f ); 
+      // States -> on (id: 4) off (id: 5) vfx_on (id: 8) 
+    instance.registerEObj( "Entrance_1", 2000182, 5608623, 5, { -156.520401f, -2.800003f, -5.140180f }, 1.000000f, 0.000000f ); 
+      // States -> vf_lock_on (id: 11) vf_lock_of (id: 12) 
+    instance.registerEObj( "sgvf_w_lvd_b0118_1", 2002872, 5608617, 4, { -154.662003f, -2.800003f, 5.028913f }, 1.000000f, 0.000000f ); 
+      // States -> vf_bextwall_on (id: 3) vf_bextwall_of (id: 4) 
+    instance.registerEObj( "unknown_1", 2002735, 0, 4, { -151.232193f, -2.822998f, 0.289556f }, 1.174927f, -1.570451f ); 
+    instance.registerEObj( "sgvf_w_lvd_b0118_2", 2005128, 5608619, 4, { -112.240501f, -2.800003f, -0.701091f }, 1.000000f, 0.000000f ); 
+      // States -> vf_bextwall_on (id: 3) vf_bextwall_of (id: 4) 
+    instance.registerEObj( "unknown_2", 2002735, 0, 4, { -46.585720f, 0.045776f, 0.190301f }, 1.179312f, -1.570451f ); 
+    instance.registerEObj( "sgvf_w_lvd_b0118_3", 2002872, 5608620, 4, { -46.476231f, 0.000000f, -0.510445f }, 1.000000f, 0.000000f ); 
+      // States -> vf_bextwall_on (id: 3) vf_bextwall_of (id: 4) 
+    instance.registerEObj( "Exit_1", 2000139, 0, 4, { -7.766907f, -0.015320f, 0.015198f }, 0.991760f, 0.000048f ); 
+    instance.registerEObj( "sgvf_f1d3_bo189", 2000561, 4248559, 4, { 200.121902f, 21.988159f, -114.000000f }, 1.000000f, 0.000048f ); 
+    instance.registerEObj( "sgbg_col_wall_00", 2000555, 4249099, 4, { 200.000000f, 21.988159f, -151.822800f }, 0.991760f, 0.000048f ); 
+    instance.registerEObj( "Aetherialflow_1", 2000501, 4247838, 4, { 200.061005f, 22.000000f, -165.266006f }, 0.991760f, 0.000048f ); 
+    instance.registerEObj( "sgbg_col_wall_00_1", 2000556, 4249100, 4, { 200.000000f, 21.988159f, -146.822800f }, 0.991760f, 0.000048f ); 
+    instance.registerEObj( "sgbg_col_wall_00_2", 2000557, 4249101, 4, { 200.000000f, 21.988159f, -141.822800f }, 0.991760f, 0.000048f ); 
+    instance.registerEObj( "sgbg_col_wall_00_3", 2000560, 4249104, 4, { 200.000000f, 21.988159f, -126.822800f }, 0.991760f, 0.000048f ); 
+    instance.registerEObj( "sgbg_col_wall_00_4", 2000602, 4253048, 4, { 200.000000f, 21.988159f, -121.822800f }, 0.991760f, 0.000048f ); 
+    instance.registerEObj( "sgbg_col_wall_00_5", 2000559, 4249103, 4, { 200.000000f, 21.988159f, -131.822800f }, 0.991760f, 0.000048f ); 
+    instance.registerEObj( "sgbg_col_wall_00_6", 2000558, 4249102, 4, { 200.000000f, 21.957701f, -136.838501f }, 0.991760f, 0.000048f ); 
 
   }
 
-  void onUpdate( InstanceContentPtr instance, uint32_t currTime ) override
+  void onUpdate( InstanceContent& instance, uint32_t currTime ) override
   {
 
   }
 
-  void onEnterTerritory( InstanceContentPtr instance, Entity::Player& player, uint32_t eventId, uint16_t param1,
+  void onEnterTerritory( InstanceContent& instance, Entity::Player& player, uint32_t eventId, uint16_t param1,
                          uint16_t param2 ) override
   {
 
diff --git a/src/scripts/instances/dungeons/AmdaporKeepHard.cpp b/src/scripts/instances/dungeons/AmdaporKeepHard.cpp
index b175ba1f..5a62d259 100644
--- a/src/scripts/instances/dungeons/AmdaporKeepHard.cpp
+++ b/src/scripts/instances/dungeons/AmdaporKeepHard.cpp
@@ -9,86 +9,59 @@ class AmdaporKeepHard :
 public:
   AmdaporKeepHard() :
     Sapphire::ScriptAPI::InstanceContentScript( 29 )
-  {
-  }
+  { }
 
-  void onInit( InstanceContentPtr instance ) override
+  void onInit( InstanceContent& instance ) override
   {
-    instance->registerEObj( "sgvf_w_lvd_b0118", 2002872, 5040923, 4, { 203.452301f, 0.116688f, 208.657593f }, 1.000000f,
-                            0.000000f );
-    // States -> vf_bextwall_on vf_bextwall_of
-    instance->registerEObj( "unknown_0", 2002735, 0, 4, { 199.471802f, 0.116693f, 210.128204f }, 1.000000f, 0.000000f );
-    instance->registerEObj( "sgbg_f1d7_a4_scy01", 2005153, 5619221, 4, { 198.706802f, -20.000010f, 229.113907f },
-                            1.000000f, 0.000000f );
-    instance->registerEObj( "unknown_1", 2004696, 5009720, 4, { -200.316895f, -4.301562f, -43.621670f }, 1.000000f,
-                            0.000000f );
-    instance->registerEObj( "unknown_2", 2004697, 5009721, 4, { -47.771290f, -0.000000f, -71.658272f }, 1.000000f,
-                            0.000000f );
-    instance->registerEObj( "sgbg_f1d7_a1_evl01", 2004698, 5031991, 4, { -125.087196f, -2.000000f, 28.417601f },
-                            1.000000f, -0.000000f );
-    // States -> evils_def evils_off_anim evils_on evils_on_anim
-    instance->registerEObj( "sgvf_f1d7_b0574", 2004699, 5031992, 4, { -104.790604f, -2.000000f, 47.174728f }, 1.000000f,
-                            0.000000f );
-    // States -> vf_baria1_off vf_baria_on
-    instance->registerEObj( "unknown_3", 2004700, 0, 4, { 2.343430f, 48.179089f, -2.083742f }, 1.000000f, 0.000000f );
-    instance->registerEObj( "unknown_4", 2004702, 5009732, 4, { 125.604897f, 43.999989f, 3.999085f }, 1.000000f,
-                            0.005971f );
-    instance->registerEObj( "unknown_5", 2004701, 0, 4, { 149.666000f, 44.200001f, -0.006115f }, 1.000000f, 0.000000f );
-    instance->registerEObj( "unknown_6", 2004703, 5010816, 4, { 196.927399f, 44.000019f, -101.381798f }, 1.000000f,
-                            0.000000f );
-    instance->registerEObj( "sgbg_f1d7_a1_evl01_1", 2004704, 5032163, 4, { 199.696106f, 44.000000f, -181.197006f },
-                            1.000000f, 0.000000f );
-    // States -> evils_def evils_off_anim evils_on evils_on_anim
-    instance->registerEObj( "Aetherialflow", 2004705, 5032164, 4, { 199.682800f, 44.163898f, -180.392395f }, 1.000000f,
-                            -0.000000f );
-    instance->registerEObj( "Fellorb", 2004706, 5009746, 4, { 200.094101f, -0.000008f, 0.050249f }, 1.000000f,
-                            0.000000f );
-    instance->registerEObj( "Aetherialflow_1", 2004707, 5033533, 4, { 199.899506f, 0.000000f, -3.297300f }, 1.000000f,
-                            -0.000000f );
-    instance->registerEObj( "unknown_7", 2004768, 5033548, 4, { 210.649307f, 0.116687f, -6.120441f }, 1.000000f,
-                            0.000000f );
-    instance->registerEObj( "unknown_8", 2004769, 5033549, 4, { 189.489807f, 0.116688f, -6.804901f }, 1.000000f,
-                            0.000000f );
-    instance->registerEObj( "unknown_9", 2004770, 5033551, 4, { 204.506500f, 0.116687f, 9.902725f }, 1.000000f,
-                            0.000000f );
-    instance->registerEObj( "sgvf_w_lvd_b0118_1", 2004708, 5034801, 4, { -119.510101f, -2.400002f, 18.885540f },
-                            1.000000f, 0.000000f );
-    // States -> vf_bextwall_on vf_bextwall_of
-    instance->registerEObj( "sgvf_w_lvd_b0118_2", 2002872, 5034800, 4, { -130.314606f, -2.400000f, -18.221069f },
-                            1.000000f, 0.000000f );
-    // States -> vf_bextwall_on vf_bextwall_of
-    instance->registerEObj( "unknown_10", 2002735, 0, 4, { -125.041801f, -1.964380f, -20.543480f }, 1.000000f,
-                            0.000000f );
-    instance->registerEObj( "sgpl_f1d7_a1_gar0", 2004996, 5390927, 4, { -112.845497f, -2.400000f, 12.122500f },
-                            1.000000f, 0.785314f );
-    instance->registerEObj( "sgpl_f1d7_a1_gar0_1", 2004997, 5390928, 4, { -112.845497f, -2.400000f, -12.378100f },
-                            1.000000f, 0.785457f );
-    instance->registerEObj( "sgpl_f1d7_a1_gar0_2", 2004998, 5390929, 4, { -137.250000f, -2.400000f, 12.122500f },
-                            1.000000f, -0.785410f );
-    instance->registerEObj( "sgpl_f1d7_a1_gar0_3", 2004999, 5390930, 4, { -137.396194f, -2.400000f, -12.366500f },
-                            1.000000f, -0.785398f );
-    instance->registerEObj( "sgvf_w_lvd_b0118_3", 2004782, 5038257, 4, { 198.459198f, 43.991699f, -172.369705f },
-                            1.000000f, 0.000048f );
-    // States -> vf_bextwall_on vf_bextwall_of
-    instance->registerEObj( "sgvf_w_lvd_b0118_4", 2002872, 5038255, 4, { 197.802597f, 43.991699f, -125.932701f },
-                            1.000000f, -0.000000f );
-    // States -> vf_bextwall_on vf_bextwall_of
-    instance->registerEObj( "unknown_11", 2002735, 0, 4, { 199.511703f, 44.022221f, -130.601303f }, 1.000000f,
-                            -0.000000f );
-    instance->registerEObj( "Entrance", 2000182, 5018466, 5, { -255.724792f, -9.199999f, -5.249732f }, 1.000000f,
-                            0.000000f );
-    // States -> vf_lock_on vf_lock_of
-    instance->registerEObj( "Shortcut", 2000700, 0, 4, { -252.173401f, -9.199999f, 5.737248f }, 1.000000f, 0.000000f );
-    instance->registerEObj( "Exit", 2000139, 0, 4, { 200.798599f, -0.000008f, 240.880905f }, 1.000000f, 0.000000f );
+    instance.registerEObj( "sgvf_w_lvd_b0118", 2002872, 5040923, 4, { 203.452301f, 0.116688f, 208.657593f }, 1.000000f, 0.000000f ); 
+      // States -> vf_bextwall_on (id: 3) vf_bextwall_of (id: 4) 
+    instance.registerEObj( "unknown_0", 2002735, 0, 4, { 199.471802f, 0.116693f, 210.128204f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "sgbg_f1d7_a4_scy01", 2005153, 5619221, 4, { 198.706802f, -20.000010f, 229.113907f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_1", 2004696, 5009720, 4, { -200.316895f, -4.301562f, -43.621670f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_2", 2004697, 5009721, 4, { -47.771290f, -0.000000f, -71.658272f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "sgbg_f1d7_a1_evl01", 2004698, 5031991, 4, { -125.087196f, -2.000000f, 28.417601f }, 1.000000f, -0.000000f ); 
+      // States -> evils_def (id: 17) evils_off_anim (id: 22) evils_on (id: 23) evils_on_anim (id: 24) 
+    instance.registerEObj( "sgvf_f1d7_b0574", 2004699, 5031992, 4, { -104.790604f, -2.000000f, 47.174728f }, 1.000000f, 0.000000f ); 
+      // States -> vf_baria1_off (id: 3) vf_baria_on (id: 6) 
+    instance.registerEObj( "unknown_3", 2004700, 0, 4, { 2.343430f, 48.179089f, -2.083742f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_4", 2004702, 5009732, 4, { 125.604897f, 43.999989f, 3.999085f }, 1.000000f, 0.005971f ); 
+    instance.registerEObj( "unknown_5", 2004701, 0, 4, { 149.666000f, 44.200001f, -0.006115f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_6", 2004703, 5010816, 4, { 196.927399f, 44.000019f, -101.381798f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "sgbg_f1d7_a1_evl01_1", 2004704, 5032163, 4, { 199.696106f, 44.000000f, -181.197006f }, 1.000000f, 0.000000f ); 
+      // States -> evils_def (id: 17) evils_off_anim (id: 22) evils_on (id: 23) evils_on_anim (id: 24) 
+    instance.registerEObj( "Aetherialflow", 2004705, 5032164, 4, { 199.682800f, 44.163898f, -180.392395f }, 1.000000f, -0.000000f ); 
+    instance.registerEObj( "Fellorb", 2004706, 5009746, 4, { 200.094101f, -0.000008f, 0.050249f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "Aetherialflow_1", 2004707, 5033533, 4, { 199.899506f, 0.000000f, -3.297300f }, 1.000000f, -0.000000f ); 
+    instance.registerEObj( "unknown_7", 2004768, 5033548, 4, { 210.649307f, 0.116687f, -6.120441f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_8", 2004769, 5033549, 4, { 189.489807f, 0.116688f, -6.804901f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_9", 2004770, 5033551, 4, { 204.506500f, 0.116687f, 9.902725f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "sgvf_w_lvd_b0118_1", 2004708, 5034801, 4, { -119.510101f, -2.400002f, 18.885540f }, 1.000000f, 0.000000f ); 
+      // States -> vf_bextwall_on (id: 3) vf_bextwall_of (id: 4) 
+    instance.registerEObj( "sgvf_w_lvd_b0118_2", 2002872, 5034800, 4, { -130.314606f, -2.400000f, -18.221069f }, 1.000000f, 0.000000f ); 
+      // States -> vf_bextwall_on (id: 3) vf_bextwall_of (id: 4) 
+    instance.registerEObj( "unknown_10", 2002735, 0, 4, { -125.041801f, -1.964380f, -20.543480f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "sgpl_f1d7_a1_gar0", 2004996, 5390927, 4, { -112.845497f, -2.400000f, 12.122500f }, 1.000000f, 0.785314f ); 
+    instance.registerEObj( "sgpl_f1d7_a1_gar0_1", 2004997, 5390928, 4, { -112.845497f, -2.400000f, -12.378100f }, 1.000000f, 0.785457f ); 
+    instance.registerEObj( "sgpl_f1d7_a1_gar0_2", 2004998, 5390929, 4, { -137.250000f, -2.400000f, 12.122500f }, 1.000000f, -0.785410f ); 
+    instance.registerEObj( "sgpl_f1d7_a1_gar0_3", 2004999, 5390930, 4, { -137.396194f, -2.400000f, -12.366500f }, 1.000000f, -0.785398f ); 
+    instance.registerEObj( "sgvf_w_lvd_b0118_3", 2004782, 5038257, 4, { 198.459198f, 43.991699f, -172.369705f }, 1.000000f, 0.000048f ); 
+      // States -> vf_bextwall_on (id: 3) vf_bextwall_of (id: 4) 
+    instance.registerEObj( "sgvf_w_lvd_b0118_4", 2002872, 5038255, 4, { 197.802597f, 43.991699f, -125.932701f }, 1.000000f, -0.000000f ); 
+      // States -> vf_bextwall_on (id: 3) vf_bextwall_of (id: 4) 
+    instance.registerEObj( "unknown_11", 2002735, 0, 4, { 199.511703f, 44.022221f, -130.601303f }, 1.000000f, -0.000000f ); 
+    instance.registerEObj( "Entrance", 2000182, 5018466, 5, { -255.724792f, -9.199999f, -5.249732f }, 1.000000f, 0.000000f ); 
+      // States -> vf_lock_on (id: 11) vf_lock_of (id: 12) 
+    instance.registerEObj( "Shortcut", 2000700, 0, 4, { -252.173401f, -9.199999f, 5.737248f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "Exit", 2000139, 0, 4, { 200.798599f, -0.000008f, 240.880905f }, 1.000000f, 0.000000f ); 
 
   }
 
-  void onUpdate( InstanceContentPtr instance, uint32_t currTime ) override
+  void onUpdate( InstanceContent& instance, uint32_t currTime ) override
   {
 
   }
 
-  void onEnterTerritory( InstanceContentPtr instance, Entity::Player& player, uint32_t eventId, uint16_t param1,
+  void onEnterTerritory( InstanceContent& instance, Entity::Player& player, uint32_t eventId, uint16_t param1,
                          uint16_t param2 ) override
   {
 
diff --git a/src/scripts/instances/dungeons/BaelsarsWall.cpp b/src/scripts/instances/dungeons/BaelsarsWall.cpp
index 52b15330..53f63a77 100644
--- a/src/scripts/instances/dungeons/BaelsarsWall.cpp
+++ b/src/scripts/instances/dungeons/BaelsarsWall.cpp
@@ -9,76 +9,51 @@ class BaelsarsWall :
 public:
   BaelsarsWall() :
     Sapphire::ScriptAPI::InstanceContentScript( 48 )
-  {
-  }
+  { }
 
-  void onInit( InstanceContentPtr instance ) override
+  void onInit( InstanceContent& instance ) override
   {
-    instance->registerEObj( "unknown_0", 2002735, 0, 4, { -173.966797f, 3.049999f, 52.443710f }, 1.000000f, 0.000000f );
-    instance->registerEObj( "sgvf_w_lvd_b0118", 2002872, 6588628, 4, { -173.612198f, 3.049997f, 52.688000f }, 1.000000f,
-                            0.000000f );
-    // States -> vf_bextwall_on vf_bextwall_of
-    instance->registerEObj( "sgvf_w_lvd_b0118_1", 2002872, 6588629, 4, { -154.029907f, 3.049906f, 72.262756f },
-                            1.000000f, 0.000000f );
-    // States -> vf_bextwall_on vf_bextwall_of
-    instance->registerEObj( "unknown_1", 2002735, 0, 4, { 95.577843f, -300.028412f, 0.707827f }, 1.000000f,
-                            -1.570451f );
-    instance->registerEObj( "sgvf_w_lvd_b0118_2", 2002872, 6588652, 4, { 95.163948f, -300.028198f, 0.952097f },
-                            1.000000f, -1.570451f );
-    // States -> vf_bextwall_on vf_bextwall_of
-    instance->registerEObj( "sgvf_w_lvd_b0118_3", 2002872, 6588653, 4, { 135.748398f, -300.000092f, 0.172490f },
-                            1.000000f, 0.000000f );
-    // States -> vf_bextwall_on vf_bextwall_of
-    instance->registerEObj( "sgvf_w_lvd_b0118_4", 2002872, 6588667, 4, { 371.527588f, 212.000000f, 391.566010f },
-                            1.000000f, -0.000000f );
-    // States -> vf_bextwall_on vf_bextwall_of
-    instance->registerEObj( "unknown_2", 2002735, 0, 4, { 371.795685f, 212.000000f, 391.643097f }, 1.000000f,
-                            -1.570451f );
-    instance->registerEObj( "Shortcut", 2000700, 0, 4, { -230.764297f, -0.932137f, -173.143600f }, 1.000000f,
-                            0.000000f );
-    instance->registerEObj( "Exit", 2000139, 0, 4, { 352.071411f, 212.000000f, 391.988892f }, 0.991760f, 0.000048f );
-    instance->registerEObj( "Entrance", 2000182, 6562675, 5, { -228.044006f, -0.901261f, -183.153198f }, 1.000000f,
-                            0.000000f );
-    // States -> vf_lock_on vf_lock_of
-    instance->registerEObj( "Imperialidentificationkey", 2007567, 0, 4, { -202.837997f, -0.966086f, -62.488140f },
-                            1.000000f, 0.000000f );
-    instance->registerEObj( "Securityterminal", 2007571, 6640773, 4, { -206.023102f, 2.815013f, -48.897739f },
-                            1.000000f, 0.000000f );
-    instance->registerEObj( "unknown_3", 2007575, 6501039, 4, { -203.861694f, 1.804717f, -49.827511f }, 1.000000f,
-                            0.000000f );
-    instance->registerEObj( "Imperialidentificationkey_1", 2007568, 0, 4, { -176.569397f, 2.150000f, 17.400681f },
-                            1.000000f, 0.000000f );
-    instance->registerEObj( "Securityterminal_1", 2007572, 6516973, 4, { -187.083206f, 2.707914f, 19.031469f },
-                            1.000000f, 0.000000f );
-    instance->registerEObj( "unknown_4", 2007576, 6502290, 4, { -174.854904f, 2.100000f, 23.458460f }, 1.000000f,
-                            0.000000f );
-    instance->registerEObj( "unknown_5", 2007776, 6500492, 4, { -126.770897f, 2.000089f, 72.952606f }, 1.000000f,
-                            0.000000f );
-    instance->registerEObj( "Controlpanel", 2007580, 0, 4, { -0.003809f, -299.760315f, 0.024599f }, 2.000000f,
-                            0.000048f );
-    instance->registerEObj( "Controlpanel_1", 2007581, 0, 4, { 177.511993f, -298.963196f, 4.224624f }, 0.991760f,
-                            0.000048f );
-    instance->registerEObj( "Controlpanel_2", 2007582, 6523203, 4, { 177.434006f, -298.072601f, 6.243333f }, 1.000000f,
-                            0.000000f );
-    instance->registerEObj( "unknown_6", 2007601, 6516974, 4, { 176.321396f, -299.105713f, 0.250570f }, 1.000000f,
-                            0.000000f );
-    instance->registerEObj( "Imperialidentificationkey_2", 2007569, 0, 4, { 317.032288f, 169.000107f, 230.153503f },
-                            1.000000f, 0.000000f );
-    instance->registerEObj( "Securityterminal_2", 2007573, 6488516, 4, { 320.921600f, 169.867996f, 243.976807f },
-                            1.000000f, 0.000000f );
-    instance->registerEObj( "unknown_7", 2007577, 6488509, 4, { 328.225189f, 169.000107f, 244.581894f }, 1.000000f,
-                            0.000000f );
-    instance->registerEObj( "unknown_8", 2007578, 6777152, 4, { 382.790100f, 203.000000f, 357.169403f }, 1.000000f,
-                            0.000000f );
+    instance.registerEObj( "unknown_0", 2002735, 0, 4, { -173.966797f, 3.049999f, 52.443710f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "sgvf_w_lvd_b0118", 2002872, 6588628, 4, { -173.612198f, 3.049997f, 52.688000f }, 1.000000f, 0.000000f ); 
+      // States -> vf_bextwall_on (id: 3) vf_bextwall_of (id: 4) 
+    instance.registerEObj( "sgvf_w_lvd_b0118_1", 2002872, 6588629, 4, { -154.029907f, 3.049906f, 72.262756f }, 1.000000f, 0.000000f ); 
+      // States -> vf_bextwall_on (id: 3) vf_bextwall_of (id: 4) 
+    instance.registerEObj( "unknown_1", 2002735, 0, 4, { 95.577843f, -300.028412f, 0.707827f }, 1.000000f, -1.570451f ); 
+    instance.registerEObj( "sgvf_w_lvd_b0118_2", 2002872, 6588652, 4, { 95.163948f, -300.028198f, 0.952097f }, 1.000000f, -1.570451f ); 
+      // States -> vf_bextwall_on (id: 3) vf_bextwall_of (id: 4) 
+    instance.registerEObj( "sgvf_w_lvd_b0118_3", 2002872, 6588653, 4, { 135.748398f, -300.000092f, 0.172490f }, 1.000000f, 0.000000f ); 
+      // States -> vf_bextwall_on (id: 3) vf_bextwall_of (id: 4) 
+    instance.registerEObj( "sgvf_w_lvd_b0118_4", 2002872, 6588667, 4, { 371.527588f, 212.000000f, 391.566010f }, 1.000000f, -0.000000f ); 
+      // States -> vf_bextwall_on (id: 3) vf_bextwall_of (id: 4) 
+    instance.registerEObj( "unknown_2", 2002735, 0, 4, { 371.795685f, 212.000000f, 391.643097f }, 1.000000f, -1.570451f ); 
+    instance.registerEObj( "Shortcut", 2000700, 0, 4, { -230.764297f, -0.932137f, -173.143600f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "Exit", 2000139, 0, 4, { 352.071411f, 212.000000f, 391.988892f }, 0.991760f, 0.000048f ); 
+    instance.registerEObj( "Entrance", 2000182, 6562675, 5, { -228.044006f, -0.901261f, -183.153198f }, 1.000000f, 0.000000f ); 
+      // States -> vf_lock_on (id: 11) vf_lock_of (id: 12) 
+    instance.registerEObj( "Imperialidentificationkey", 2007567, 0, 4, { -202.837997f, -0.966086f, -62.488140f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "Securityterminal", 2007571, 6640773, 4, { -206.023102f, 2.815013f, -48.897739f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_3", 2007575, 6501039, 4, { -203.861694f, 1.804717f, -49.827511f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "Imperialidentificationkey_1", 2007568, 0, 4, { -176.569397f, 2.150000f, 17.400681f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "Securityterminal_1", 2007572, 6516973, 4, { -187.083206f, 2.707914f, 19.031469f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_4", 2007576, 6502290, 4, { -174.854904f, 2.100000f, 23.458460f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_5", 2007776, 6500492, 4, { -126.770897f, 2.000089f, 72.952606f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "Controlpanel", 2007580, 0, 4, { -0.003809f, -299.760315f, 0.024599f }, 2.000000f, 0.000048f ); 
+    instance.registerEObj( "Controlpanel_1", 2007581, 0, 4, { 177.511993f, -298.963196f, 4.224624f }, 0.991760f, 0.000048f ); 
+    instance.registerEObj( "Controlpanel_2", 2007582, 6523203, 4, { 177.434006f, -298.072601f, 6.243333f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_6", 2007601, 6516974, 4, { 176.321396f, -299.105713f, 0.250570f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "Imperialidentificationkey_2", 2007569, 0, 4, { 317.032288f, 169.000107f, 230.153503f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "Securityterminal_2", 2007573, 6488516, 4, { 320.921600f, 169.867996f, 243.976807f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_7", 2007577, 6488509, 4, { 328.225189f, 169.000107f, 244.581894f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_8", 2007578, 6777152, 4, { 382.790100f, 203.000000f, 357.169403f }, 1.000000f, 0.000000f ); 
 
   }
 
-  void onUpdate( InstanceContentPtr instance, uint32_t currTime ) override
+  void onUpdate( InstanceContent& instance, uint32_t currTime ) override
   {
 
   }
 
-  void onEnterTerritory( InstanceContentPtr instance, Entity::Player& player, uint32_t eventId, uint16_t param1,
+  void onEnterTerritory( InstanceContent& instance, Entity::Player& player, uint32_t eventId, uint16_t param1,
                          uint16_t param2 ) override
   {
 
diff --git a/src/scripts/instances/dungeons/BardamsMettle.cpp b/src/scripts/instances/dungeons/BardamsMettle.cpp
index a2299e48..37735a3a 100644
--- a/src/scripts/instances/dungeons/BardamsMettle.cpp
+++ b/src/scripts/instances/dungeons/BardamsMettle.cpp
@@ -9,20 +9,49 @@ class BardamsMettle :
 public:
   BardamsMettle() :
     Sapphire::ScriptAPI::InstanceContentScript( 53 )
+  { }
+
+  void onInit( InstanceContent& instance ) override
   {
+    instance.registerEObj( "sgvf_w_lvd_b0118", 2007896, 6803926, 4, { 3.704567f, -0.506593f, 225.007507f }, 1.000000f, 0.000000f ); 
+      // States -> vf_bextwall_on (id: 3) vf_bextwall_of (id: 4) 
+    instance.registerEObj( "sgvf_w_lvd_b0118_1", 2002872, 6805825, 4, { 4.867329f, -0.098875f, 275.309509f }, 1.000000f, 0.000000f ); 
+      // States -> vf_bextwall_on (id: 3) vf_bextwall_of (id: 4) 
+    instance.registerEObj( "unknown_0", 2002735, 0, 4, { 4.932000f, -0.320500f, 274.559509f }, 1.000000f, -0.000000f ); 
+    instance.registerEObj( "sgpl_w_transparent04", 2007899, 6802026, 4, { -28.138130f, -45.000000f, -32.892731f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "sgvf_w_lvd_b0118_2", 2002872, 6806775, 4, { -28.390051f, -45.148991f, 8.165403f }, 1.000000f, 0.000000f ); 
+      // States -> vf_bextwall_on (id: 3) vf_bextwall_of (id: 4) 
+    instance.registerEObj( "unknown_1", 2002735, 0, 4, { -28.551781f, -45.222500f, 5.617400f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_2", 2007903, 6773193, 4, { -18.557831f, -44.964081f, -0.932714f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_3", 2007904, 6773192, 4, { -30.723289f, -45.025860f, 1.953206f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_4", 2007905, 6773194, 4, { -42.383171f, -44.962471f, -5.125507f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_5", 2008196, 0, 4, { -37.125240f, -45.059940f, -9.414856f }, 0.991760f, 0.000048f ); 
+    instance.registerEObj( "unknown_6", 2008310, 6879064, 4, { -23.194941f, -45.000000f, -3.016589f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "sgbg_e3d2_d2_mete1", 2007457, 7008362, 4, { -28.500000f, -45.000000f, -14.000000f }, 1.000000f, -0.000000f ); 
+      // States -> b4_mete_off_01 (id: 1) b4_mete_off_02 (id: 2) b4_mete_on_01 (id: 3) b4_mete_off_03 (id: 4) b4_mete_on_02 (id: 5) b4_mete_on_03 (id: 6) b4_mete_on_04 (id: 7) b4_mete_on_05 (id: 8) b4_mete_on_06 (id: 9) b4_mete_fdout (id: 18) 
+    instance.registerEObj( "sgvf_w_lvd_b0118_3", 2002872, 6806776, 4, { 24.174879f, -167.392899f, -453.406586f }, 1.000000f, 0.000000f ); 
+      // States -> vf_bextwall_on (id: 3) vf_bextwall_of (id: 4) 
+    instance.registerEObj( "unknown_7", 2002735, 0, 4, { 24.419100f, -167.350601f, -455.580109f }, 1.000000f, -0.000000f ); 
+    instance.registerEObj( "unknown_8", 2007894, 6525794, 4, { -36.023540f, 4.305134f, 406.807404f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_9", 2007895, 6525806, 4, { 4.331786f, 1.464790f, 289.456207f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_10", 2007897, 6540078, 4, { -49.525101f, -45.174839f, 117.206200f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_11", 2007898, 6540093, 4, { -14.321400f, -42.200001f, 42.272179f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_12", 2007900, 6525664, 4, { -19.668949f, -188.037003f, -235.950302f }, 0.991760f, 0.000048f ); 
+    instance.registerEObj( "unknown_13", 2007901, 6525665, 4, { 25.192631f, -172.808502f, -362.417114f }, 0.991760f, 0.000048f ); 
+    instance.registerEObj( "unknown_14", 2007902, 6525180, 4, { 23.936859f, -172.125198f, -405.882996f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "Entrance", 2000182, 6797774, 5, { -23.838560f, 8.289917f, 482.742615f }, 1.000000f, 0.000000f ); 
+      // States -> vf_lock_on (id: 11) vf_lock_of (id: 12) 
+    instance.registerEObj( "Shortcut", 2000700, 0, 4, { -20.252930f, 8.134582f, 489.817200f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "Exit", 2000139, 0, 4, { 23.942671f, -167.617996f, -486.860809f }, 0.991760f, 0.000048f ); 
+
   }
 
-  void onInit( InstanceContentPtr instance ) override
+  void onUpdate( InstanceContent& instance, uint32_t currTime ) override
   {
 
   }
 
-  void onUpdate( InstanceContentPtr instance, uint32_t currTime ) override
-  {
-
-  }
-
-  void onEnterTerritory( InstanceContentPtr instance, Entity::Player& player, uint32_t eventId, uint16_t param1,
+  void onEnterTerritory( InstanceContent& instance, Entity::Player& player, uint32_t eventId, uint16_t param1,
                          uint16_t param2 ) override
   {
 
diff --git a/src/scripts/instances/dungeons/BrayfloxsLongstop.cpp b/src/scripts/instances/dungeons/BrayfloxsLongstop.cpp
index faf74eb3..1c30650c 100644
--- a/src/scripts/instances/dungeons/BrayfloxsLongstop.cpp
+++ b/src/scripts/instances/dungeons/BrayfloxsLongstop.cpp
@@ -9,56 +9,42 @@ class BrayfloxsLongstop :
 public:
   BrayfloxsLongstop() :
     Sapphire::ScriptAPI::InstanceContentScript( 8 )
-  {
-  }
+  { }
 
-  void onInit( InstanceContentPtr instance ) override
+  void onInit( InstanceContent& instance ) override
   {
-    instance->registerEObj( "unknown_0", 2001694, 0, 4, { -36.384769f, 34.915119f, -234.568405f }, 1.000000f,
-                            0.000000f );
-    instance->registerEObj( "unknown_1", 2001461, 0, 4, { 142.567200f, -1.266762f, 67.804497f }, 0.991760f, 0.000048f );
-    instance->registerEObj( "RunstopHeadgate", 2001462, 3996541, 4, { 105.920601f, 1.745684f, 11.445460f }, 1.000000f,
-                            0.000000f );
-    instance->registerEObj( "RunstopGutgate", 2001463, 3970152, 4, { 113.391296f, -0.849704f, -33.166710f }, 1.000000f,
-                            0.000000f );
-    instance->registerEObj( "RunstopBackgate", 2001464, 3970154, 4, { -19.424801f, 7.919373f, -71.122383f }, 0.991760f,
-                            0.000048f );
-    instance->registerEObj( "LongstopHeadgate", 2001465, 3970153, 4, { -113.634499f, 1.332127f, -58.144779f },
-                            1.000000f, 0.000000f );
-    instance->registerEObj( "LongstopGutgate", 2001466, 3976772, 4, { -89.831360f, 14.042510f, -96.676224f }, 1.000000f,
-                            0.000000f );
-    instance->registerEObj( "sgvf_w_lvd_b0118", 2001584, 4086949, 4, { 106.822800f, -1.629326f, 2.541263f }, 1.000000f,
-                            0.000000f );
-    // States -> vf_bextwall_on vf_bextwall_of
-    instance->registerEObj( "unknown_2", 2001585, 0, 4, { 110.429604f, -1.663330f, 3.311157f }, 0.991760f, 0.214809f );
-    instance->registerEObj( "sgvf_w_lvd_b0118_1", 2001586, 4088979, 4, { 8.021301f, 5.921407f, -69.090309f }, 1.000000f,
-                            0.000000f );
-    // States -> vf_bextwall_on vf_bextwall_of
-    instance->registerEObj( "unknown_3", 2001587, 0, 4, { 6.458210f, 5.902269f, -67.560417f }, 1.000000f, -0.788830f );
-    instance->registerEObj( "sgvf_w_lvd_b0118_2", 2001588, 4088985, 4, { -106.298798f, -2.123102f, -10.585170f },
-                            1.000000f, 0.000000f );
-    // States -> vf_bextwall_on vf_bextwall_of
-    instance->registerEObj( "unknown_4", 2001589, 0, 4, { -105.172897f, -2.123102f, -10.865350f }, 1.000000f,
-                            -0.043989f );
-    instance->registerEObj( "sgvf_w_lvd_b0118_3", 2001590, 4088991, 4, { -68.039551f, 33.716820f, -232.938904f },
-                            1.000000f, 0.000000f );
-    // States -> vf_bextwall_on vf_bextwall_of
-    instance->registerEObj( "unknown_5", 2001591, 0, 4, { -68.693542f, 33.682091f, -234.070496f }, 1.000000f,
-                            -1.318638f );
-    instance->registerEObj( "Entrance", 2000182, 4097104, 5, { 122.445702f, -1.119082f, 68.403687f }, 1.000000f,
-                            0.000000f );
-    // States -> vf_lock_on vf_lock_of
-    instance->registerEObj( "Shortcut", 2000700, 0, 4, { 113.256897f, -1.172536f, 59.115589f }, 1.000000f, 0.000000f );
-    instance->registerEObj( "Exit", 2000139, 0, 4, { -8.639429f, 35.641689f, -234.813797f }, 0.991760f, 0.000048f );
+    instance.registerEObj( "unknown_0", 2001694, 0, 4, { -36.384769f, 34.915119f, -234.568405f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_1", 2001461, 0, 4, { 142.567200f, -1.266762f, 67.804497f }, 0.991760f, 0.000048f ); 
+    instance.registerEObj( "RunstopHeadgate", 2001462, 3996541, 4, { 105.920601f, 1.745684f, 11.445460f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "RunstopGutgate", 2001463, 3970152, 4, { 113.391296f, -0.849704f, -33.166710f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "RunstopBackgate", 2001464, 3970154, 4, { -19.424801f, 7.919373f, -71.122383f }, 0.991760f, 0.000048f ); 
+    instance.registerEObj( "LongstopHeadgate", 2001465, 3970153, 4, { -113.634499f, 1.332127f, -58.144779f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "LongstopGutgate", 2001466, 3976772, 4, { -89.831360f, 14.042510f, -96.676224f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "sgvf_w_lvd_b0118", 2001584, 4086949, 4, { 106.822800f, -1.629326f, 2.541263f }, 1.000000f, 0.000000f ); 
+      // States -> vf_bextwall_on (id: 3) vf_bextwall_of (id: 4) 
+    instance.registerEObj( "unknown_2", 2001585, 0, 4, { 110.429604f, -1.663330f, 3.311157f }, 0.991760f, 0.214809f ); 
+    instance.registerEObj( "sgvf_w_lvd_b0118_1", 2001586, 4088979, 4, { 8.021301f, 5.921407f, -69.090309f }, 1.000000f, 0.000000f ); 
+      // States -> vf_bextwall_on (id: 3) vf_bextwall_of (id: 4) 
+    instance.registerEObj( "unknown_3", 2001587, 0, 4, { 6.458210f, 5.902269f, -67.560417f }, 1.000000f, -0.788830f ); 
+    instance.registerEObj( "sgvf_w_lvd_b0118_2", 2001588, 4088985, 4, { -106.298798f, -2.123102f, -10.585170f }, 1.000000f, 0.000000f ); 
+      // States -> vf_bextwall_on (id: 3) vf_bextwall_of (id: 4) 
+    instance.registerEObj( "unknown_4", 2001589, 0, 4, { -105.172897f, -2.123102f, -10.865350f }, 1.000000f, -0.043989f ); 
+    instance.registerEObj( "sgvf_w_lvd_b0118_3", 2001590, 4088991, 4, { -68.039551f, 33.716820f, -232.938904f }, 1.000000f, 0.000000f ); 
+      // States -> vf_bextwall_on (id: 3) vf_bextwall_of (id: 4) 
+    instance.registerEObj( "unknown_5", 2001591, 0, 4, { -68.693542f, 33.682091f, -234.070496f }, 1.000000f, -1.318638f ); 
+    instance.registerEObj( "Entrance", 2000182, 4097104, 5, { 122.445702f, -1.119082f, 68.403687f }, 1.000000f, 0.000000f ); 
+      // States -> vf_lock_on (id: 11) vf_lock_of (id: 12) 
+    instance.registerEObj( "Shortcut", 2000700, 0, 4, { 113.256897f, -1.172536f, 59.115589f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "Exit", 2000139, 0, 4, { -8.639429f, 35.641689f, -234.813797f }, 0.991760f, 0.000048f ); 
 
   }
 
-  void onUpdate( InstanceContentPtr instance, uint32_t currTime ) override
+  void onUpdate( InstanceContent& instance, uint32_t currTime ) override
   {
 
   }
 
-  void onEnterTerritory( InstanceContentPtr instance, Entity::Player& player, uint32_t eventId, uint16_t param1,
+  void onEnterTerritory( InstanceContent& instance, Entity::Player& player, uint32_t eventId, uint16_t param1,
                          uint16_t param2 ) override
   {
 
diff --git a/src/scripts/instances/dungeons/BrayfloxsLongstopHard.cpp b/src/scripts/instances/dungeons/BrayfloxsLongstopHard.cpp
index a9206452..38f225d0 100644
--- a/src/scripts/instances/dungeons/BrayfloxsLongstopHard.cpp
+++ b/src/scripts/instances/dungeons/BrayfloxsLongstopHard.cpp
@@ -9,67 +9,48 @@ class BrayfloxsLongstopHard :
 public:
   BrayfloxsLongstopHard() :
     Sapphire::ScriptAPI::InstanceContentScript( 20 )
-  {
-  }
+  { }
 
-  void onInit( InstanceContentPtr instance ) override
+  void onInit( InstanceContent& instance ) override
   {
-    instance->registerEObj( "unknown_0", 2003103, 0, 4, { -16.800230f, 25.375731f, -171.007904f }, 0.991760f,
-                            0.000048f );
-    instance->registerEObj( "RunstopHeadgate", 2002182, 4542379, 4, { 105.912804f, 1.724182f, 11.428960f }, 0.991760f,
-                            0.000048f );
-    instance->registerEObj( "sgvf_w_lvd_b0118", 2002183, 4621964, 4, { 111.650299f, 0.228821f, -49.790279f }, 0.991760f,
-                            0.000048f );
-    // States -> vf_bextwall_on vf_bextwall_of
-    instance->registerEObj( "Shortcut", 2000700, 0, 4, { -75.025421f, -1.210333f, 73.659332f }, 0.991760f, 0.000048f );
-    instance->registerEObj( "Entrance", 2000182, 4543753, 5, { -77.622681f, 0.605630f, 95.628304f }, 0.991760f,
-                            0.000048f );
-    // States -> vf_lock_on vf_lock_of
-    instance->registerEObj( "unknown_1", 2002326, 0, 4, { -3.491464f, -0.354560f, -24.718349f }, 1.000000f, 0.000000f );
-    instance->registerEObj( "Tinykey", 2002325, 0, 4, { -62.769581f, -0.332854f, 36.199650f }, 1.000000f, 0.000000f );
-    instance->registerEObj( "sgpl_w_lvd_b0118_wide", 2002872, 4543726, 4, { 111.888000f, -2.109839f, -6.942894f },
-                            0.991760f, 0.000048f );
-    // States -> vf_bextwall_on vf_bextwall_of
-    instance->registerEObj( "unknown_2", 2002735, 0, 4, { 114.658699f, -2.093417f, -6.149437f }, 1.100000f, 0.000000f );
-    instance->registerEObj( "unknown_3", 2002109, 4549243, 4, { 92.977211f, 5.002774f, -110.975502f }, 1.000000f,
-                            0.000000f );
-    instance->registerEObj( "unknown_4", 2002150, 4549448, 4, { 30.497520f, 8.248112f, -82.096916f }, 0.991760f,
-                            0.000048f );
-    instance->registerEObj( "unknown_5", 2002180, 4549459, 4, { 27.134510f, 7.114878f, -120.719704f }, 1.000000f,
-                            0.000000f );
-    instance->registerEObj( "unknown_6", 2002181, 4574849, 4, { 45.695850f, 7.015042f, -129.344604f }, 1.000000f,
-                            0.000000f );
-    instance->registerEObj( "Stolenwares", 2002262, 4598415, 4, { -28.610241f, 25.192631f, -174.631195f }, 0.991760f,
-                            -0.000527f );
-    // States -> vf_bextwall_on vf_bextwall_of
-    instance->registerEObj( "unknown_7", 2002735, 0, 4, { 44.686901f, 7.015000f, -131.547394f }, 0.500000f,
-                            -0.532325f );
-    instance->registerEObj( "sgvf_w_lvd_b0118_1", 2002872, 4543729, 4, { 44.232769f, 7.015042f, -129.352997f },
-                            0.991760f, 0.000048f );
-    // States -> vf_bextwall_on vf_bextwall_of
-    instance->registerEObj( "ブレイフロクスの抜道", 2003429, 0, 4, { 44.358749f, 7.554582f, -132.341095f }, 1.000000f,
-                            0.000000f );
-    instance->registerEObj( "Exit", 2000139, 0, 4, { -25.894650f, 35.019409f, -222.949600f }, 0.991760f, 0.000048f );
-    instance->registerEObj( "SwiftmakeCheckgate", 2002184, 4549240, 4, { -95.264717f, 12.888430f, -122.593300f },
-                            1.000000f, 0.000000f );
-    instance->registerEObj( "SwiftmakeCheckgate_1", 2002665, 4549241, 4, { -100.273201f, 20.310730f, -163.513397f },
-                            1.000000f, 0.000000f );
-    instance->registerEObj( "SwiftmakeCheckgate_2", 2002884, 4572942, 4, { -102.647499f, 21.011600f, -187.365494f },
-                            0.991760f, 0.000048f );
-    instance->registerEObj( "sgvf_w_lvd_b0250", 2002872, 4543735, 4, { -48.175251f, 34.706921f, -234.463196f },
-                            0.991760f, 0.000048f );
-    // States -> vf_bextwall_on vf_bextwall_of
-    instance->registerEObj( "unknown_8", 2002735, 0, 4, { -48.271229f, 34.918541f, -235.574203f }, 1.000000f,
-                            -1.497719f );
+    instance.registerEObj( "unknown_0", 2003103, 0, 4, { -16.800230f, 25.375731f, -171.007904f }, 0.991760f, 0.000048f ); 
+    instance.registerEObj( "RunstopHeadgate", 2002182, 4542379, 4, { 105.912804f, 1.724182f, 11.428960f }, 0.991760f, 0.000048f ); 
+    instance.registerEObj( "sgvf_w_lvd_b0118", 2002183, 4621964, 4, { 111.650299f, 0.228821f, -49.790279f }, 0.991760f, 0.000048f ); 
+      // States -> vf_bextwall_on (id: 3) vf_bextwall_of (id: 4) 
+    instance.registerEObj( "Shortcut", 2000700, 0, 4, { -75.025421f, -1.210333f, 73.659332f }, 0.991760f, 0.000048f ); 
+    instance.registerEObj( "Entrance", 2000182, 4543753, 5, { -77.622681f, 0.605630f, 95.628304f }, 0.991760f, 0.000048f ); 
+      // States -> vf_lock_on (id: 11) vf_lock_of (id: 12) 
+    instance.registerEObj( "unknown_1", 2002326, 0, 4, { -3.491464f, -0.354560f, -24.718349f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "Tinykey", 2002325, 0, 4, { -62.769581f, -0.332854f, 36.199650f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "sgpl_w_lvd_b0118_wide", 2002872, 4543726, 4, { 111.888000f, -2.109839f, -6.942894f }, 0.991760f, 0.000048f ); 
+      // States -> vf_bextwall_on (id: 3) vf_bextwall_of (id: 4) 
+    instance.registerEObj( "unknown_2", 2002735, 0, 4, { 114.658699f, -2.093417f, -6.149437f }, 1.100000f, 0.000000f ); 
+    instance.registerEObj( "unknown_3", 2002109, 4549243, 4, { 92.977211f, 5.002774f, -110.975502f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_4", 2002150, 4549448, 4, { 30.497520f, 8.248112f, -82.096916f }, 0.991760f, 0.000048f ); 
+    instance.registerEObj( "unknown_5", 2002180, 4549459, 4, { 27.134510f, 7.114878f, -120.719704f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_6", 2002181, 4574849, 4, { 45.695850f, 7.015042f, -129.344604f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "Stolenwares", 2002262, 4598415, 4, { -28.610241f, 25.192631f, -174.631195f }, 0.991760f, -0.000527f ); 
+      // States -> vf_bextwall_on (id: 3) vf_bextwall_of (id: 4) 
+    instance.registerEObj( "unknown_7", 2002735, 0, 4, { 44.686901f, 7.015000f, -131.547394f }, 0.500000f, -0.532325f ); 
+    instance.registerEObj( "sgvf_w_lvd_b0118_1", 2002872, 4543729, 4, { 44.232769f, 7.015042f, -129.352997f }, 0.991760f, 0.000048f ); 
+      // States -> vf_bextwall_on (id: 3) vf_bextwall_of (id: 4) 
+    instance.registerEObj( "ブレイフロクスの抜道", 2003429, 0, 4, { 44.358749f, 7.554582f, -132.341095f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "Exit", 2000139, 0, 4, { -25.894650f, 35.019409f, -222.949600f }, 0.991760f, 0.000048f ); 
+    instance.registerEObj( "SwiftmakeCheckgate", 2002184, 4549240, 4, { -95.264717f, 12.888430f, -122.593300f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "SwiftmakeCheckgate_1", 2002665, 4549241, 4, { -100.273201f, 20.310730f, -163.513397f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "SwiftmakeCheckgate_2", 2002884, 4572942, 4, { -102.647499f, 21.011600f, -187.365494f }, 0.991760f, 0.000048f ); 
+    instance.registerEObj( "sgvf_w_lvd_b0250", 2002872, 4543735, 4, { -48.175251f, 34.706921f, -234.463196f }, 0.991760f, 0.000048f ); 
+      // States -> vf_bextwall_on (id: 3) vf_bextwall_of (id: 4) 
+    instance.registerEObj( "unknown_8", 2002735, 0, 4, { -48.271229f, 34.918541f, -235.574203f }, 1.000000f, -1.497719f ); 
 
   }
 
-  void onUpdate( InstanceContentPtr instance, uint32_t currTime ) override
+  void onUpdate( InstanceContent& instance, uint32_t currTime ) override
   {
 
   }
 
-  void onEnterTerritory( InstanceContentPtr instance, Entity::Player& player, uint32_t eventId, uint16_t param1,
+  void onEnterTerritory( InstanceContent& instance, Entity::Player& player, uint32_t eventId, uint16_t param1,
                          uint16_t param2 ) override
   {
 
diff --git a/src/scripts/instances/dungeons/CastrumAbania.cpp b/src/scripts/instances/dungeons/CastrumAbania.cpp
index dbbfd2e5..78f625a0 100644
--- a/src/scripts/instances/dungeons/CastrumAbania.cpp
+++ b/src/scripts/instances/dungeons/CastrumAbania.cpp
@@ -9,20 +9,81 @@ class CastrumAbania :
 public:
   CastrumAbania() :
     Sapphire::ScriptAPI::InstanceContentScript( 55 )
+  { }
+
+  void onInit( InstanceContent& instance ) override
   {
+    instance.registerEObj( "unknown_0", 2002735, 0, 4, { 277.157013f, 20.000000f, -7.932621f }, 1.000000f, 0.305963f ); 
+    instance.registerEObj( "sgvf_w_lvd_b0118", 2002872, 6841714, 4, { 276.710388f, 20.000000f, -6.315289f }, 1.000000f, 0.000000f ); 
+      // States -> vf_bextwall_on (id: 3) vf_bextwall_of (id: 4) 
+    instance.registerEObj( "Exit", 2000139, 0, 4, { 286.855713f, 20.000000f, -43.546181f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_1", 2007457, 6777074, 4, { 281.592285f, 20.000000f, -45.737782f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "Entrance", 2000182, 6828612, 5, { -406.401794f, -17.924580f, 314.141907f }, 1.000000f, 0.000000f ); 
+      // States -> vf_lock_on (id: 11) vf_lock_of (id: 12) 
+    instance.registerEObj( "Shortcut", 2000700, 0, 4, { -414.573212f, -18.000120f, 306.364807f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_2", 2008027, 6738153, 4, { -362.172913f, -10.025270f, 237.292999f }, 0.991760f, 0.000048f ); 
+    instance.registerEObj( "unknown_3", 2008029, 6739981, 4, { -291.220795f, -6.000043f, 108.329102f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_4", 2008030, 6739980, 4, { -298.753113f, -6.000044f, 108.051498f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_5", 2008031, 6739979, 4, { -305.840515f, -6.000044f, 107.763603f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_6", 2008032, 6739982, 4, { -281.123505f, -6.000060f, 118.299301f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_7", 2008033, 6739984, 4, { -280.565704f, -6.000067f, 125.491203f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_8", 2008034, 6739983, 4, { -280.552185f, -6.000068f, 132.687302f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_9", 2008035, 6869663, 4, { -273.854889f, -6.000038f, 100.620499f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_10", 2008036, 6740009, 4, { -213.504593f, -6.129103f, 82.266739f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_11", 2008037, 6740016, 4, { -213.045807f, -1.999959f, 131.946198f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_12", 2008038, 6914793, 4, { -179.395294f, 2.138688f, 279.671387f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_13", 2008041, 6752603, 4, { -167.801697f, 2.138688f, 273.763214f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_14", 2008042, 6752604, 4, { -167.091507f, 2.138688f, 278.924805f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_15", 2008043, 6752601, 4, { -180.179504f, 2.138688f, 292.024200f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_16", 2008044, 6752602, 4, { -184.772797f, 2.138688f, 291.367188f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_17", 2008047, 6752608, 4, { -166.154602f, 2.000032f, 293.249298f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_18", 2008039, 6914794, 4, { -101.486900f, 6.138662f, 311.254791f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_19", 2008050, 6752644, 4, { -81.520500f, 6.000006f, 290.652313f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_20", 2008051, 6752643, 4, { -81.142883f, 6.000006f, 332.866211f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_21", 2008048, 6752633, 4, { -80.650719f, 6.138662f, 311.338989f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_22", 2008040, 6914795, 4, { -22.122820f, 10.138660f, 278.146912f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_23", 2008045, 6752689, 4, { -27.394449f, 10.138660f, 265.483795f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_24", 2008046, 6752679, 4, { -16.694490f, 10.138650f, 265.926208f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_25", 2008070, 6752690, 4, { -9.852131f, 10.138650f, 272.919403f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_26", 2008089, 6752691, 4, { -9.914229f, 10.138650f, 283.758392f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_27", 2008052, 6752695, 4, { -21.991831f, 9.999999f, 250.500702f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_28", 2008053, 6752694, 4, { 5.133811f, 9.999997f, 278.283295f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_29", 2008049, 6752681, 4, { -8.415267f, 9.999998f, 264.128204f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_30", 2008320, 6869673, 4, { -84.465187f, 6.000006f, 311.371613f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_31", 2008054, 6785102, 4, { 22.499630f, 14.184900f, 175.166702f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_32", 2008056, 6741815, 4, { 110.871597f, 26.000059f, 144.405807f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_33", 2008055, 6698733, 4, { 178.971298f, 20.000139f, 81.701027f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_34", 2008057, 6717638, 4, { 154.867996f, 20.000160f, 106.733902f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_35", 2008058, 6717639, 4, { 165.172699f, 20.000019f, 86.256683f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_36", 2008059, 6717640, 4, { 195.091507f, 20.000170f, 51.864651f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_37", 2008060, 6717641, 4, { 200.323502f, 20.000179f, 46.925930f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_38", 2008061, 6717642, 4, { 203.790298f, 20.000200f, 59.565971f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_39", 2008062, 6717643, 4, { 209.140793f, 20.000191f, 54.901482f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_40", 2008063, 6772873, 4, { 172.971100f, 20.100290f, 82.304329f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_41", 2008064, 6773603, 4, { 267.862396f, 20.100000f, 30.848459f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_42", 2008455, 6790661, 4, { 294.476715f, 20.000000f, -39.619999f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_43", 2008527, 6914797, 4, { 21.803070f, 14.184900f, 182.260696f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_44", 2007457, 6842146, 4, { 205.204193f, 20.000271f, 41.332821f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_45", 2007457, 6842148, 4, { 214.202393f, 20.000271f, 49.597000f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_46", 2002735, 0, 4, { -212.960007f, -2.000000f, 167.038193f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "sgvf_w_lvd_b0118_1", 2002872, 6841858, 4, { -212.643799f, -2.000000f, 164.712097f }, 1.000000f, 0.000000f ); 
+      // States -> vf_bextwall_on (id: 3) vf_bextwall_of (id: 4) 
+    instance.registerEObj( "sgvf_w_lvd_b0118_2", 2008071, 6841865, 4, { -212.474792f, -1.815126f, 204.927307f }, 1.000000f, 0.000000f ); 
+      // States -> vf_bextwall_on (id: 3) vf_bextwall_of (id: 4) 
+    instance.registerEObj( "sgvf_w_lvd_b0118_3", 2002872, 6841875, 4, { 10.483370f, 14.000030f, 208.476395f }, 1.000000f, 0.000000f ); 
+      // States -> vf_bextwall_on (id: 3) vf_bextwall_of (id: 4) 
+    instance.registerEObj( "unknown_47", 2002735, 0, 4, { 10.447360f, 14.000030f, 206.708298f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "sgvf_w_lvd_b0118_4", 2008072, 6841959, 4, { 28.276699f, 14.184900f, 186.737000f }, 1.000000f, 0.000000f ); 
+      // States -> vf_bextwall_on (id: 3) vf_bextwall_of (id: 4) 
+
   }
 
-  void onInit( InstanceContentPtr instance ) override
+  void onUpdate( InstanceContent& instance, uint32_t currTime ) override
   {
 
   }
 
-  void onUpdate( InstanceContentPtr instance, uint32_t currTime ) override
-  {
-
-  }
-
-  void onEnterTerritory( InstanceContentPtr instance, Entity::Player& player, uint32_t eventId, uint16_t param1,
+  void onEnterTerritory( InstanceContent& instance, Entity::Player& player, uint32_t eventId, uint16_t param1,
                          uint16_t param2 ) override
   {
 
diff --git a/src/scripts/instances/dungeons/CastrumMeridianum.cpp b/src/scripts/instances/dungeons/CastrumMeridianum.cpp
index 9f5e8106..abdebf29 100644
--- a/src/scripts/instances/dungeons/CastrumMeridianum.cpp
+++ b/src/scripts/instances/dungeons/CastrumMeridianum.cpp
@@ -9,143 +9,89 @@ class CastrumMeridianum :
 public:
   CastrumMeridianum() :
     Sapphire::ScriptAPI::InstanceContentScript( 15 )
-  {
-  }
+  { }
 
-  void onInit( InstanceContentPtr instance ) override
+  void onInit( InstanceContent& instance ) override
   {
-    instance->registerEObj( "sgvf_w_lvd_b0250", 2000593, 4249703, 4, { -67.576859f, 70.350082f, -36.382999f },
-                            1.000000f, 0.000000f );
-    // States -> vf_bextwall_on vf_bextwall_of
-    instance->registerEObj( "unknown_0", 2000594, 0, 4, { -72.778549f, 70.163177f, -38.339291f }, 1.000000f,
-                            1.406840f );
-    instance->registerEObj( "Magitekmissile", 2000662, 0, 4, { -108.687798f, 70.343590f, -8.558592f }, 1.400000f,
-                            -0.605074f );
-    instance->registerEObj( "Magitekmissile_1", 2000663, 0, 4, { -116.665100f, 70.390266f, -53.063919f }, 1.400000f,
-                            -0.849513f );
-    instance->registerEObj( "unknown_1", 2001149, 0, 4, { -72.778549f, 70.163177f, -38.339291f }, 1.000000f,
-                            1.406839f );
-    instance->registerEObj( "sgvf_w_lvd_b0118", 2000591, 4249720, 4, { -25.465830f, 83.385536f, -254.529602f },
-                            1.000000f, 0.000000f );
-    // States -> vf_bextwall_on vf_bextwall_of
-    instance->registerEObj( "unknown_2", 2000592, 0, 4, { -25.038260f, 81.798767f, -248.906296f }, 1.100000f,
-                            0.000000f );
-    instance->registerEObj( "Imperialidentificationkey", 2000870, 0, 4, { -67.439163f, 81.798767f, -231.079102f },
-                            1.000000f, 0.000000f );
-    instance->registerEObj( "unknown_3", 2000588, 0, 4, { 34.634392f, 71.755402f, -45.910198f }, 0.900000f, 1.543478f );
-    instance->registerEObj( "sgvf_w_lvd_b0118_1", 2000587, 4249693, 4, { 36.526970f, 70.598427f, -46.207680f },
-                            1.000000f, 0.000000f );
-    // States -> vf_bextwall_on vf_bextwall_of
-    instance->registerEObj( "Imperialidentificationkey_1", 2000869, 0, 4, { -7.280443f, 69.781212f, 27.170691f },
-                            1.000000f, 0.000000f );
-    instance->registerEObj( "unknown_4", 2000590, 0, 4, { -7.938801f, 70.550377f, 55.590679f }, 1.100000f, -0.213036f );
-    instance->registerEObj( "sgvf_w_lvd_b0118_2", 2000589, 4249713, 4, { -5.998041f, 70.281548f, 58.349812f },
-                            1.000000f, 0.000000f );
-    // States -> vf_bextwall_on vf_bextwall_of
-    instance->registerEObj( "Searchlightterminal", 2000564, 3169670, 4, { 213.829102f, 89.024597f, -107.133797f },
-                            1.000000f, 1.045186f );
-    // States -> blue_on red_on white_on
-    instance->registerEObj( "sgbg_w_emp_015_01a", 2000565, 4204866, 4, { 210.588501f, 88.962471f, -106.430901f },
-                            0.991760f, 0.000048f );
-    // States -> blue_on red_on light_off
-    instance->registerEObj( "Shortcut", 2000603, 0, 4, { 242.256302f, 87.579422f, -95.018204f }, 0.991760f, 0.000048f );
-    instance->registerEObj( "Disposalchute", 2000597, 0, 4, { 40.790581f, 71.410004f, -11.781850f }, 0.991760f,
-                            1.191010f );
-    instance->registerEObj( "unknown_5", 2000860, 3168876, 4, { 197.143005f, 92.716309f, -155.744797f }, 1.000000f,
-                            0.000000f );
-    instance->registerEObj( "unknown_6", 2000861, 3168877, 4, { 211.024704f, 89.452042f, -70.152588f }, 1.000000f,
-                            0.000000f );
-    instance->registerEObj( "Searchlightterminal_1", 2000873, 4317191, 4, { 206.509399f, 90.986397f, -79.219772f },
-                            1.000000f, 1.466079f );
-    // States -> blue_on red_on white_on
-    instance->registerEObj( "unknown_7", 2000566, 4204867, 4, { -62.804321f, 72.657097f, 180.368805f }, 1.000000f,
-                            0.000000f );
-    instance->registerEObj( "Searchlightterminal_2", 2000567, 4204869, 4, { -71.896492f, 74.742790f, 151.474503f },
-                            1.000000f, 0.000000f );
-    instance->registerEObj( "unknown_8", 2000569, 4204871, 4, { 1.863623f, 71.927399f, 89.175919f }, 1.000000f,
-                            0.000000f );
-    instance->registerEObj( "Unstablepaneling", 2000571, 3956106, 4, { 95.737846f, 64.963051f, 103.147400f }, 1.000000f,
-                            0.000000f );
-    instance->registerEObj( "unknown_9", 2000573, 3149745, 4, { 93.090912f, 66.531853f, 117.642097f }, 1.000000f,
-                            0.000000f );
-    instance->registerEObj( "unknown_10", 2000572, 4065604, 4, { 83.071327f, 60.587688f, 116.300903f }, 1.000000f,
-                            0.000000f );
-    instance->registerEObj( "Unstablepaneling_1", 2000574, 3956104, 4, { 104.309601f, 64.941147f, 67.240013f },
-                            1.000000f, 0.000000f );
-    instance->registerEObj( "unknown_11", 2000575, 4065628, 4, { 93.616432f, 60.529831f, 51.407162f }, 1.000000f,
-                            0.000000f );
-    instance->registerEObj( "unknown_12", 2000576, 3149747, 4, { 101.933800f, 66.905586f, 52.199631f }, 1.000000f,
-                            0.000000f );
-    instance->registerEObj( "unknown_13", 2000577, 3642024, 4, { 20.799950f, 70.334259f, 4.277452f }, 1.000000f,
-                            0.000000f );
-    instance->registerEObj( "unknown_14", 2000862, 3149816, 4, { -77.378540f, 78.416023f, 130.266205f }, 0.991760f,
-                            0.000048f );
-    instance->registerEObj( "Incendiary#37", 2000570, 0, 4, { 109.141098f, 64.757690f, 62.367512f }, 0.991760f,
-                            0.000048f );
-    instance->registerEObj( "Incendiary#37_1", 2001113, 0, 4, { 124.726898f, 64.689621f, 62.085869f }, 1.000000f,
-                            0.000000f );
-    instance->registerEObj( "unknown_15", 2001206, 0, 4, { 104.233803f, 66.103699f, 68.343483f }, 1.000000f,
-                            0.000000f );
-    instance->registerEObj( "unknown_16", 2001205, 0, 4, { 95.566910f, 66.188728f, 101.984398f }, 1.000000f,
-                            0.000000f );
-    instance->registerEObj( "unknown_17", 2000578, 3642033, 4, { 5.540902f, 70.172447f, -68.735893f }, 1.000000f,
-                            0.000000f );
-    instance->registerEObj( "unknown_18", 2000586, 3169187, 4, { -84.639374f, 86.075699f, -294.635010f }, 1.000000f,
-                            0.000000f );
-    instance->registerEObj( "Magitekterminal", 2000582, 0, 4, { -62.063919f, 69.259163f, -89.851593f }, 1.500000f,
-                            0.261981f );
-    instance->registerEObj( "Magitekterminal_1", 2000583, 0, 4, { -43.080639f, 69.331673f, -84.657654f }, 1.480042f,
-                            0.271375f );
-    instance->registerEObj( "unknown_19", 2000584, 3642010, 4, { -53.516090f, 69.940781f, -85.333992f }, 1.000000f,
-                            0.000000f );
-    instance->registerEObj( "unknown_20", 2000863, 3169178, 4, { 31.803410f, 83.652863f, -168.188904f }, 1.000000f,
-                            0.000000f );
-    instance->registerEObj( "Searchlightterminal_3", 2000568, 4204872, 4, { 24.724890f, 77.701874f, -154.365402f },
-                            0.991760f, 0.795709f );
-    // States -> blue_on red_on white_on
-    instance->registerEObj( "sgbg_w_emp_015_01a_1", 2000874, 4317259, 4, { 10.967040f, 74.960777f, -139.438599f },
-                            1.000000f, 0.000000f );
-    // States -> blue_on red_on light_off
-    instance->registerEObj( "unknown_21", 2001136, 4265914, 4, { -18.308630f, 81.798767f, -204.730896f }, 1.000000f,
-                            0.000000f );
-    instance->registerEObj( "unknown_22", 2001160, 4200584, 4, { 5.338250f, 70.502319f, -87.827461f }, 1.000000f,
-                            0.000000f );
-    instance->registerEObj( "unknown_23", 2001159, 4200444, 4, { 21.572090f, 70.516617f, 9.031565f }, 1.000000f,
-                            0.000000f );
-    instance->registerEObj( "MarkXLIIIantiaircraftcannon", 2000595, 0, 4, { -66.151108f, 69.594437f, -20.559780f },
-                            0.991760f, 1.356260f );
-    instance->registerEObj( "MarkXLIIIantiaircraftcannon_1", 2000600, 0, 4, { -70.083420f, 69.122810f, -65.019180f },
-                            0.991760f, 0.891590f );
-    instance->registerEObj( "MarkXLIIIantiaircraftcannon_2", 2000601, 0, 4, { -44.756939f, 67.998627f, -39.293011f },
-                            0.991760f, 1.490808f );
-    instance->registerEObj( "unknown_24", 2000865, 3169123, 4, { -27.982929f, 79.754509f, -48.873550f }, 1.000000f,
-                            0.000000f );
-    instance->registerEObj( "unknown_25", 2000865, 3284996, 4, { -19.120440f, 79.754509f, -11.464200f }, 1.000000f,
-                            0.000000f );
-    instance->registerEObj( "Searchlightterminal_4", 2000580, 4204877, 4, { -26.230459f, 79.754509f, -42.167561f },
-                            0.991760f, 1.557559f );
-    // States -> blue_on red_on white_on
-    instance->registerEObj( "Searchlightterminal_5", 2000581, 4265903, 4, { -23.853939f, 79.754509f, -15.348020f },
-                            0.991760f, 0.000048f );
-    // States -> blue_on red_on white_on
-    instance->registerEObj( "sgbg_w_emp_015_01a_2", 2000875, 4317262, 4, { -45.087860f, 67.998833f, -39.263939f },
-                            1.000000f, 0.000000f );
-    // States -> blue_on red_on light_off
-    instance->registerEObj( "Entrance", 2000562, 4247977, 5, { 257.286194f, 87.030891f, -99.538628f }, 1.000000f,
-                            0.000000f );
-    // States -> vf_lock_on vf_lock_of
-    instance->registerEObj( "unknown_26", 2000563, 0, 4, { 260.508087f, 86.897049f, -89.411842f }, 1.000000f,
-                            0.000000f );
-    instance->registerEObj( "Exit", 2000596, 0, 4, { -121.432404f, 70.350082f, -28.426470f }, 1.000000f, 0.000000f );
+    instance.registerEObj( "sgvf_w_lvd_b0250", 2000593, 4249703, 4, { -67.576859f, 70.350082f, -36.382999f }, 1.000000f, 0.000000f ); 
+      // States -> vf_bextwall_on (id: 3) vf_bextwall_of (id: 4) 
+    instance.registerEObj( "unknown_0", 2000594, 0, 4, { -72.778549f, 70.163177f, -38.339291f }, 1.000000f, 1.406840f ); 
+    instance.registerEObj( "Magitekmissile", 2000662, 0, 4, { -108.687798f, 70.343590f, -8.558592f }, 1.400000f, -0.605074f ); 
+    instance.registerEObj( "Magitekmissile_1", 2000663, 0, 4, { -116.665100f, 70.390266f, -53.063919f }, 1.400000f, -0.849513f ); 
+    instance.registerEObj( "unknown_1", 2001149, 0, 4, { -72.778549f, 70.163177f, -38.339291f }, 1.000000f, 1.406839f ); 
+    instance.registerEObj( "sgvf_w_lvd_b0118", 2000591, 4249720, 4, { -25.465830f, 83.385536f, -254.529602f }, 1.000000f, 0.000000f ); 
+      // States -> vf_bextwall_on (id: 3) vf_bextwall_of (id: 4) 
+    instance.registerEObj( "unknown_2", 2000592, 0, 4, { -25.038260f, 81.798767f, -248.906296f }, 1.100000f, 0.000000f ); 
+    instance.registerEObj( "Imperialidentificationkey", 2000870, 0, 4, { -67.439163f, 81.798767f, -231.079102f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_3", 2000588, 0, 4, { 34.634392f, 71.755402f, -45.910198f }, 0.900000f, 1.543478f ); 
+    instance.registerEObj( "sgvf_w_lvd_b0118_1", 2000587, 4249693, 4, { 36.526970f, 70.598427f, -46.207680f }, 1.000000f, 0.000000f ); 
+      // States -> vf_bextwall_on (id: 3) vf_bextwall_of (id: 4) 
+    instance.registerEObj( "Imperialidentificationkey_1", 2000869, 0, 4, { -7.280443f, 69.781212f, 27.170691f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_4", 2000590, 0, 4, { -7.938801f, 70.550377f, 55.590679f }, 1.100000f, -0.213036f ); 
+    instance.registerEObj( "sgvf_w_lvd_b0118_2", 2000589, 4249713, 4, { -5.998041f, 70.281548f, 58.349812f }, 1.000000f, 0.000000f ); 
+      // States -> vf_bextwall_on (id: 3) vf_bextwall_of (id: 4) 
+    instance.registerEObj( "Searchlightterminal", 2000564, 3169670, 4, { 213.829102f, 89.024597f, -107.133797f }, 1.000000f, 1.045186f ); 
+      // States -> blue_on (id: 4) red_on (id: 5) white_on (id: 6) 
+    instance.registerEObj( "sgbg_w_emp_015_01a", 2000565, 4204866, 4, { 210.588501f, 88.962471f, -106.430901f }, 0.991760f, 0.000048f ); 
+      // States -> blue_on (id: 5) red_on (id: 6) light_off (id: 7) 
+    instance.registerEObj( "Shortcut", 2000603, 0, 4, { 242.256302f, 87.579422f, -95.018204f }, 0.991760f, 0.000048f ); 
+    instance.registerEObj( "Disposalchute", 2000597, 0, 4, { 40.790581f, 71.410004f, -11.781850f }, 0.991760f, 1.191010f ); 
+    instance.registerEObj( "unknown_5", 2000860, 3168876, 4, { 197.143005f, 92.716309f, -155.744797f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_6", 2000861, 3168877, 4, { 211.024704f, 89.452042f, -70.152588f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "Searchlightterminal_1", 2000873, 4317191, 4, { 206.509399f, 90.986397f, -79.219772f }, 1.000000f, 1.466079f ); 
+      // States -> blue_on (id: 4) red_on (id: 5) white_on (id: 6) 
+    instance.registerEObj( "unknown_7", 2000566, 4204867, 4, { -62.804321f, 72.657097f, 180.368805f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "Searchlightterminal_2", 2000567, 4204869, 4, { -71.896492f, 74.742790f, 151.474503f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_8", 2000569, 4204871, 4, { 1.863623f, 71.927399f, 89.175919f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "Unstablepaneling", 2000571, 3956106, 4, { 95.737846f, 64.963051f, 103.147400f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_9", 2000573, 3149745, 4, { 93.090912f, 66.531853f, 117.642097f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_10", 2000572, 4065604, 4, { 83.071327f, 60.587688f, 116.300903f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "Unstablepaneling_1", 2000574, 3956104, 4, { 104.309601f, 64.941147f, 67.240013f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_11", 2000575, 4065628, 4, { 93.616432f, 60.529831f, 51.407162f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_12", 2000576, 3149747, 4, { 101.933800f, 66.905586f, 52.199631f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_13", 2000577, 3642024, 4, { 20.799950f, 70.334259f, 4.277452f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_14", 2000862, 3149816, 4, { -77.378540f, 78.416023f, 130.266205f }, 0.991760f, 0.000048f ); 
+    instance.registerEObj( "Incendiary#37", 2000570, 0, 4, { 109.141098f, 64.757690f, 62.367512f }, 0.991760f, 0.000048f ); 
+    instance.registerEObj( "Incendiary#37_1", 2001113, 0, 4, { 124.726898f, 64.689621f, 62.085869f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_15", 2001206, 0, 4, { 104.233803f, 66.103699f, 68.343483f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_16", 2001205, 0, 4, { 95.566910f, 66.188728f, 101.984398f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_17", 2000578, 3642033, 4, { 5.540902f, 70.172447f, -68.735893f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_18", 2000586, 3169187, 4, { -84.639374f, 86.075699f, -294.635010f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "Magitekterminal", 2000582, 0, 4, { -62.063919f, 69.259163f, -89.851593f }, 1.500000f, 0.261981f ); 
+    instance.registerEObj( "Magitekterminal_1", 2000583, 0, 4, { -43.080639f, 69.331673f, -84.657654f }, 1.480042f, 0.271375f ); 
+    instance.registerEObj( "unknown_19", 2000584, 3642010, 4, { -53.516090f, 69.940781f, -85.333992f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_20", 2000863, 3169178, 4, { 31.803410f, 83.652863f, -168.188904f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "Searchlightterminal_3", 2000568, 4204872, 4, { 24.724890f, 77.701874f, -154.365402f }, 0.991760f, 0.795709f ); 
+      // States -> blue_on (id: 4) red_on (id: 5) white_on (id: 6) 
+    instance.registerEObj( "sgbg_w_emp_015_01a_1", 2000874, 4317259, 4, { 10.967040f, 74.960777f, -139.438599f }, 1.000000f, 0.000000f ); 
+      // States -> blue_on (id: 5) red_on (id: 6) light_off (id: 7) 
+    instance.registerEObj( "unknown_21", 2001136, 4265914, 4, { -18.308630f, 81.798767f, -204.730896f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_22", 2001160, 4200584, 4, { 5.338250f, 70.502319f, -87.827461f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_23", 2001159, 4200444, 4, { 21.572090f, 70.516617f, 9.031565f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "MarkXLIIIantiaircraftcannon", 2000595, 0, 4, { -66.151108f, 69.594437f, -20.559780f }, 0.991760f, 1.356260f ); 
+    instance.registerEObj( "MarkXLIIIantiaircraftcannon_1", 2000600, 0, 4, { -70.083420f, 69.122810f, -65.019180f }, 0.991760f, 0.891590f ); 
+    instance.registerEObj( "MarkXLIIIantiaircraftcannon_2", 2000601, 0, 4, { -44.756939f, 67.998627f, -39.293011f }, 0.991760f, 1.490808f ); 
+    instance.registerEObj( "unknown_24", 2000865, 3169123, 4, { -27.982929f, 79.754509f, -48.873550f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_25", 2000865, 3284996, 4, { -19.120440f, 79.754509f, -11.464200f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "Searchlightterminal_4", 2000580, 4204877, 4, { -26.230459f, 79.754509f, -42.167561f }, 0.991760f, 1.557559f ); 
+      // States -> blue_on (id: 4) red_on (id: 5) white_on (id: 6) 
+    instance.registerEObj( "Searchlightterminal_5", 2000581, 4265903, 4, { -23.853939f, 79.754509f, -15.348020f }, 0.991760f, 0.000048f ); 
+      // States -> blue_on (id: 4) red_on (id: 5) white_on (id: 6) 
+    instance.registerEObj( "sgbg_w_emp_015_01a_2", 2000875, 4317262, 4, { -45.087860f, 67.998833f, -39.263939f }, 1.000000f, 0.000000f ); 
+      // States -> blue_on (id: 5) red_on (id: 6) light_off (id: 7) 
+    instance.registerEObj( "Entrance", 2000562, 4247977, 5, { 257.286194f, 87.030891f, -99.538628f }, 1.000000f, 0.000000f ); 
+      // States -> vf_lock_on (id: 11) vf_lock_of (id: 12) 
+    instance.registerEObj( "unknown_26", 2000563, 0, 4, { 260.508087f, 86.897049f, -89.411842f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "Exit", 2000596, 0, 4, { -121.432404f, 70.350082f, -28.426470f }, 1.000000f, 0.000000f ); 
 
   }
 
-  void onUpdate( InstanceContentPtr instance, uint32_t currTime ) override
+  void onUpdate( InstanceContent& instance, uint32_t currTime ) override
   {
 
   }
 
-  void onEnterTerritory( InstanceContentPtr instance, Entity::Player& player, uint32_t eventId, uint16_t param1,
+  void onEnterTerritory( InstanceContent& instance, Entity::Player& player, uint32_t eventId, uint16_t param1,
                          uint16_t param2 ) override
   {
 
diff --git a/src/scripts/instances/dungeons/CopperbellMines.cpp b/src/scripts/instances/dungeons/CopperbellMines.cpp
index 48a7fa47..b61d8144 100644
--- a/src/scripts/instances/dungeons/CopperbellMines.cpp
+++ b/src/scripts/instances/dungeons/CopperbellMines.cpp
@@ -9,120 +9,73 @@ class CopperbellMines :
 public:
   CopperbellMines() :
     Sapphire::ScriptAPI::InstanceContentScript( 3 )
-  {
-  }
+  { }
 
-  void onInit( InstanceContentPtr instance ) override
+  void onInit( InstanceContent& instance ) override
   {
-    instance->registerEObj( "unknown_0", 2000068, 0, 4, { 44.405670f, -9.596272f, -115.661201f }, 1.000000f,
-                            0.000000f );
-    instance->registerEObj( "sgvf_w_lvd_b0118", 2001526, 4056196, 4, { 42.862770f, -9.734462f, -118.006302f },
-                            1.000000f, 0.000000f );
-    // States -> vf_bextwall_on vf_bextwall_of
-    instance->registerEObj( "unknown_1", 2000069, 0, 4, { 35.776779f, -38.010250f, 86.627357f }, 1.000000f, 0.000000f );
-    instance->registerEObj( "sgvf_w_lvd_b0118_1", 2001527, 4056695, 4, { 34.781620f, -38.026581f, 85.051003f },
-                            1.000000f, 0.000000f );
-    // States -> vf_bextwall_on vf_bextwall_of
-    instance->registerEObj( "sgvf_w_lvd_b0118_2", 2001528, 4056696, 4, { -93.129417f, -57.842449f, 54.637360f },
-                            1.000000f, 0.000000f );
-    // States -> vf_bextwall_on vf_bextwall_of
-    instance->registerEObj( "unknown_2", 2000037, 0, 4, { -90.569702f, -57.860081f, 55.157581f }, 1.000000f,
-                            0.000000f );
-    instance->registerEObj( "unknown_3", 2000266, 3163462, 4, { -73.202423f, -55.895020f, 1.983328f }, 1.000000f,
-                            0.000000f );
-    instance->registerEObj( "unknown_4", 2000267, 3163472, 4, { -123.490501f, -56.689388f, 36.337471f }, 0.991760f,
-                            0.000048f );
-    instance->registerEObj( "Improvedblastingdevice", 2000184, 4093714, 4, { 30.553780f, -37.974628f, 110.802399f },
-                            1.000000f, 0.000000f );
-    instance->registerEObj( "unknown_5", 2000239, 4093740, 4, { 34.836300f, -38.021832f, 115.035202f }, 0.991760f,
-                            0.000048f );
-    instance->registerEObj( "Exit", 2000139, 0, 4, { -100.877403f, -56.042820f, -15.206130f }, 0.991760f, 0.000048f );
-    instance->registerEObj( "unknown_6", 2000186, 3163464, 4, { -127.532204f, -56.557701f, 13.108460f }, 1.000000f,
-                            0.000000f );
-    instance->registerEObj( "Tinykey", 2000159, 0, 4, { -209.307999f, 23.619301f, -210.254105f }, 0.991760f,
-                            0.000048f );
-    instance->registerEObj( "Sealedblastingdoor", 2000160, 4025573, 4, { -205.498901f, 23.819269f, -208.536697f },
-                            0.991760f, 0.000048f );
-    instance->registerEObj( "unknown_7", 2000161, 4024332, 4, { -184.037094f, 13.828580f, -208.114502f }, 0.991760f,
-                            0.000048f );
-    instance->registerEObj( "Liftlever", 2000162, 4018210, 4, { -191.827606f, 23.433090f, -205.127106f }, 0.991760f,
-                            0.000048f );
-    instance->registerEObj( "Liftlever_1", 2000163, 0, 4, { -183.969498f, 24.006029f, -205.712097f }, 0.991760f,
-                            1.570451f );
-    instance->registerEObj( "unknown_8", 2001559, 4023678, 4, { -189.593399f, 23.392031f, -208.209396f }, 0.991760f,
-                            0.000048f );
-    instance->registerEObj( "Entrance", 2000182, 4085080, 5, { -253.156403f, 23.528379f, -174.613998f }, 1.000000f,
-                            0.000000f );
-    // States -> vf_lock_on vf_lock_of
-    instance->registerEObj( "Shortcut", 2000700, 0, 4, { -237.184906f, 21.988159f, -166.420502f }, 0.991760f,
-                            0.000048f );
-    instance->registerEObj( "unknown_9", 2000167, 0, 4, { -81.437439f, -5.447510f, -171.343597f }, 0.991760f,
-                            0.000048f );
-    instance->registerEObj( "unknown_10", 2000168, 3163094, 4, { -74.540337f, -5.935791f, -162.462799f }, 0.991760f,
-                            0.000048f );
-    instance->registerEObj( "Firesand", 2000169, 0, 4, { -20.828609f, -8.071711f, -161.638901f }, 0.991760f,
-                            0.000048f );
-    instance->registerEObj( "Blastingdevice", 2000170, 4053820, 4, { 41.374290f, -9.249741f, -135.238800f }, 1.000000f,
-                            0.000000f );
-    instance->registerEObj( "Firesand_1", 2000172, 0, 4, { 53.101452f, -3.845266f, -153.826401f }, 0.991760f,
-                            0.901467f );
-    instance->registerEObj( "Sealedblastingdoor_1", 2000173, 4025574, 4, { 43.376751f, -9.109680f, -58.134281f },
-                            0.991760f, 0.000048f );
-    instance->registerEObj( "Liftlever_2", 2000174, 4018213, 4, { 55.344479f, -8.804504f, -1.751919f }, 0.991760f,
-                            0.000048f );
-    instance->registerEObj( "Liftlever_3", 2000175, 0, 4, { 55.965420f, -8.264337f, 6.017679f }, 0.991760f, 0.000048f );
-    instance->registerEObj( "Liftlever_4", 2000166, 0, 4, { -183.969498f, -6.008533f, -205.992905f }, 0.991760f,
-                            -1.570451f );
-    instance->registerEObj( "Liftlever_5", 2000165, 4018211, 4, { -176.318695f, -6.546204f, -210.956100f }, 0.991760f,
-                            0.000048f );
-    instance->registerEObj( "Tinykey_1", 2000178, 0, 4, { 42.903980f, -9.979086f, -69.086594f }, 0.991760f, 0.000048f );
-    instance->registerEObj( "unknown_11", 2001529, 4024331, 4, { 58.267658f, -19.085461f, 6.177349f }, 1.000000f,
-                            0.000000f );
-    instance->registerEObj( "Powderchamber", 2001536, 0, 4, { 43.821098f, -8.847800f, -128.329102f }, 0.991760f,
-                            0.000048f );
-    instance->registerEObj( "unknown_12", 2001560, 4023676, 4, { -178.386200f, -6.605137f, -207.831696f }, 1.000000f,
-                            0.000000f );
-    instance->registerEObj( "unknown_13", 2001561, 4023677, 4, { 58.670898f, -8.835022f, 0.472961f }, 0.991760f,
-                            0.000048f );
-    instance->registerEObj( "unknown_14", 2000171, 3163067, 4, { 43.472900f, -9.262273f, -126.115898f }, 0.991789f,
-                            0.000048f );
-    instance->registerEObj( "Liftlever_6", 2000176, 4018212, 4, { 61.119492f, -37.911671f, 13.438640f }, 1.000000f,
-                            0.000000f );
-    instance->registerEObj( "Liftlever_7", 2000177, 0, 4, { 55.985229f, -38.263531f, 6.003702f }, 0.991760f,
-                            0.000048f );
-    instance->registerEObj( "Firesand_2", 2000179, 0, 4, { 14.572330f, -42.069149f, 43.503422f }, 0.991760f,
-                            0.000048f );
-    instance->registerEObj( "Blastingdevice_1", 2000180, 4053821, 4, { 56.726372f, -37.999741f, 47.990452f }, 0.991760f,
-                            0.000048f );
-    instance->registerEObj( "Firesand_3", 2001531, 0, 4, { 93.184647f, -41.640049f, 67.395599f }, 1.000000f,
-                            0.000000f );
-    instance->registerEObj( "Firesand_4", 2001532, 0, 4, { 38.064529f, -38.712662f, 60.511768f }, 1.000000f,
-                            0.000000f );
-    instance->registerEObj( "Firesand_5", 2001533, 0, 4, { 31.755930f, -37.938789f, 114.646599f }, 1.000000f,
-                            -1.263692f );
-    instance->registerEObj( "Blastingdevice_2", 2001534, 4053822, 4, { 10.162710f, -36.846409f, 106.696999f },
-                            0.991760f, 0.000048f );
-    instance->registerEObj( "unknown_15", 2001535, 3163445, 4, { 5.569519f, -38.040829f, 111.711197f }, 0.991760f,
-                            0.000048f );
-    instance->registerEObj( "Powderchamber_1", 2001537, 0, 4, { 58.852821f, -37.774250f, 55.076962f }, 0.991760f,
-                            0.000048f );
-    instance->registerEObj( "Powderchamber_2", 2001538, 0, 4, { 6.485046f, -37.171558f, 113.633904f }, 0.991760f,
-                            0.000048f );
-    instance->registerEObj( "unknown_16", 2001562, 4023675, 4, { 57.846920f, -38.864811f, 11.550960f }, 0.991760f,
-                            0.000048f );
-    instance->registerEObj( "unknown_17", 2000181, 3163079, 4, { 57.479050f, -38.038540f, 56.536980f }, 1.000000f,
-                            0.000000f );
-    instance->registerEObj( "unknown_18", 2000185, 3163454, 4, { -55.588661f, -37.033691f, 94.193893f }, 0.991789f,
-                            0.000048f );
+    instance.registerEObj( "unknown_0", 2000068, 0, 4, { 44.405670f, -9.596272f, -115.661201f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "sgvf_w_lvd_b0118", 2001526, 4056196, 4, { 42.862770f, -9.734462f, -118.006302f }, 1.000000f, 0.000000f ); 
+      // States -> vf_bextwall_on (id: 3) vf_bextwall_of (id: 4) 
+    instance.registerEObj( "unknown_1", 2000069, 0, 4, { 35.776779f, -38.010250f, 86.627357f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "sgvf_w_lvd_b0118_1", 2001527, 4056695, 4, { 34.781620f, -38.026581f, 85.051003f }, 1.000000f, 0.000000f ); 
+      // States -> vf_bextwall_on (id: 3) vf_bextwall_of (id: 4) 
+    instance.registerEObj( "sgvf_w_lvd_b0118_2", 2001528, 4056696, 4, { -93.129417f, -57.842449f, 54.637360f }, 1.000000f, 0.000000f ); 
+      // States -> vf_bextwall_on (id: 3) vf_bextwall_of (id: 4) 
+    instance.registerEObj( "unknown_2", 2000037, 0, 4, { -90.569702f, -57.860081f, 55.157581f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_3", 2000266, 3163462, 4, { -73.202423f, -55.895020f, 1.983328f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_4", 2000267, 3163472, 4, { -123.490501f, -56.689388f, 36.337471f }, 0.991760f, 0.000048f ); 
+    instance.registerEObj( "Improvedblastingdevice", 2000184, 4093714, 4, { 30.553780f, -37.974628f, 110.802399f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_5", 2000239, 4093740, 4, { 34.836300f, -38.021832f, 115.035202f }, 0.991760f, 0.000048f ); 
+    instance.registerEObj( "Exit", 2000139, 0, 4, { -100.877403f, -56.042820f, -15.206130f }, 0.991760f, 0.000048f ); 
+    instance.registerEObj( "unknown_6", 2000186, 3163464, 4, { -127.532204f, -56.557701f, 13.108460f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "Tinykey", 2000159, 0, 4, { -209.307999f, 23.619301f, -210.254105f }, 0.991760f, 0.000048f ); 
+    instance.registerEObj( "Sealedblastingdoor", 2000160, 4025573, 4, { -205.498901f, 23.819269f, -208.536697f }, 0.991760f, 0.000048f ); 
+    instance.registerEObj( "unknown_7", 2000161, 4024332, 4, { -184.037094f, 13.828580f, -208.114502f }, 0.991760f, 0.000048f ); 
+    instance.registerEObj( "Liftlever", 2000162, 4018210, 4, { -191.827606f, 23.433090f, -205.127106f }, 0.991760f, 0.000048f ); 
+    instance.registerEObj( "Liftlever_1", 2000163, 0, 4, { -183.969498f, 24.006029f, -205.712097f }, 0.991760f, 1.570451f ); 
+    instance.registerEObj( "unknown_8", 2001559, 4023678, 4, { -189.593399f, 23.392031f, -208.209396f }, 0.991760f, 0.000048f ); 
+    instance.registerEObj( "Entrance", 2000182, 4085080, 5, { -253.156403f, 23.528379f, -174.613998f }, 1.000000f, 0.000000f ); 
+      // States -> vf_lock_on (id: 11) vf_lock_of (id: 12) 
+    instance.registerEObj( "Shortcut", 2000700, 0, 4, { -237.184906f, 21.988159f, -166.420502f }, 0.991760f, 0.000048f ); 
+    instance.registerEObj( "unknown_9", 2000167, 0, 4, { -81.437439f, -5.447510f, -171.343597f }, 0.991760f, 0.000048f ); 
+    instance.registerEObj( "unknown_10", 2000168, 3163094, 4, { -74.540337f, -5.935791f, -162.462799f }, 0.991760f, 0.000048f ); 
+    instance.registerEObj( "Firesand", 2000169, 0, 4, { -20.828609f, -8.071711f, -161.638901f }, 0.991760f, 0.000048f ); 
+    instance.registerEObj( "Blastingdevice", 2000170, 4053820, 4, { 41.374290f, -9.249741f, -135.238800f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "Firesand_1", 2000172, 0, 4, { 53.101452f, -3.845266f, -153.826401f }, 0.991760f, 0.901467f ); 
+    instance.registerEObj( "Sealedblastingdoor_1", 2000173, 4025574, 4, { 43.376751f, -9.109680f, -58.134281f }, 0.991760f, 0.000048f ); 
+    instance.registerEObj( "Liftlever_2", 2000174, 4018213, 4, { 55.344479f, -8.804504f, -1.751919f }, 0.991760f, 0.000048f ); 
+    instance.registerEObj( "Liftlever_3", 2000175, 0, 4, { 55.965420f, -8.264337f, 6.017679f }, 0.991760f, 0.000048f ); 
+    instance.registerEObj( "Liftlever_4", 2000166, 0, 4, { -183.969498f, -6.008533f, -205.992905f }, 0.991760f, -1.570451f ); 
+    instance.registerEObj( "Liftlever_5", 2000165, 4018211, 4, { -176.318695f, -6.546204f, -210.956100f }, 0.991760f, 0.000048f ); 
+    instance.registerEObj( "Tinykey_1", 2000178, 0, 4, { 42.903980f, -9.979086f, -69.086594f }, 0.991760f, 0.000048f ); 
+    instance.registerEObj( "unknown_11", 2001529, 4024331, 4, { 58.267658f, -19.085461f, 6.177349f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "Powderchamber", 2001536, 0, 4, { 43.821098f, -8.847800f, -128.329102f }, 0.991760f, 0.000048f ); 
+    instance.registerEObj( "unknown_12", 2001560, 4023676, 4, { -178.386200f, -6.605137f, -207.831696f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_13", 2001561, 4023677, 4, { 58.670898f, -8.835022f, 0.472961f }, 0.991760f, 0.000048f ); 
+    instance.registerEObj( "unknown_14", 2000171, 3163067, 4, { 43.472900f, -9.262273f, -126.115898f }, 0.991789f, 0.000048f ); 
+    instance.registerEObj( "Liftlever_6", 2000176, 4018212, 4, { 61.119492f, -37.911671f, 13.438640f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "Liftlever_7", 2000177, 0, 4, { 55.985229f, -38.263531f, 6.003702f }, 0.991760f, 0.000048f ); 
+    instance.registerEObj( "Firesand_2", 2000179, 0, 4, { 14.572330f, -42.069149f, 43.503422f }, 0.991760f, 0.000048f ); 
+    instance.registerEObj( "Blastingdevice_1", 2000180, 4053821, 4, { 56.726372f, -37.999741f, 47.990452f }, 0.991760f, 0.000048f ); 
+    instance.registerEObj( "Firesand_3", 2001531, 0, 4, { 93.184647f, -41.640049f, 67.395599f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "Firesand_4", 2001532, 0, 4, { 38.064529f, -38.712662f, 60.511768f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "Firesand_5", 2001533, 0, 4, { 31.755930f, -37.938789f, 114.646599f }, 1.000000f, -1.263692f ); 
+    instance.registerEObj( "Blastingdevice_2", 2001534, 4053822, 4, { 10.162710f, -36.846409f, 106.696999f }, 0.991760f, 0.000048f ); 
+    instance.registerEObj( "unknown_15", 2001535, 3163445, 4, { 5.569519f, -38.040829f, 111.711197f }, 0.991760f, 0.000048f ); 
+    instance.registerEObj( "Powderchamber_1", 2001537, 0, 4, { 58.852821f, -37.774250f, 55.076962f }, 0.991760f, 0.000048f ); 
+    instance.registerEObj( "Powderchamber_2", 2001538, 0, 4, { 6.485046f, -37.171558f, 113.633904f }, 0.991760f, 0.000048f ); 
+    instance.registerEObj( "unknown_16", 2001562, 4023675, 4, { 57.846920f, -38.864811f, 11.550960f }, 0.991760f, 0.000048f ); 
+    instance.registerEObj( "unknown_17", 2000181, 3163079, 4, { 57.479050f, -38.038540f, 56.536980f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_18", 2000185, 3163454, 4, { -55.588661f, -37.033691f, 94.193893f }, 0.991789f, 0.000048f ); 
 
   }
 
-  void onUpdate( InstanceContentPtr instance, uint32_t currTime ) override
+  void onUpdate( InstanceContent& instance, uint32_t currTime ) override
   {
 
   }
 
-  void onEnterTerritory( InstanceContentPtr instance, Entity::Player& player, uint32_t eventId, uint16_t param1,
+  void onEnterTerritory( InstanceContent& instance, Entity::Player& player, uint32_t eventId, uint16_t param1,
                          uint16_t param2 ) override
   {
 
diff --git a/src/scripts/instances/dungeons/CopperbellMinesHard.cpp b/src/scripts/instances/dungeons/CopperbellMinesHard.cpp
index 5a35de0e..32a1b45d 100644
--- a/src/scripts/instances/dungeons/CopperbellMinesHard.cpp
+++ b/src/scripts/instances/dungeons/CopperbellMinesHard.cpp
@@ -9,105 +9,65 @@ class CopperbellMinesHard :
 public:
   CopperbellMinesHard() :
     Sapphire::ScriptAPI::InstanceContentScript( 18 )
-  {
-  }
+  { }
 
-  void onInit( InstanceContentPtr instance ) override
+  void onInit( InstanceContent& instance ) override
   {
-    instance->registerEObj( "unknown_0", 2002930, 0, 4, { -90.674911f, -57.698959f, 55.099388f }, 1.000000f,
-                            0.000000f );
-    instance->registerEObj( "sgvf_w_lvd_b0118", 2002929, 4481287, 4, { -93.494362f, -57.942631f, 52.914669f },
-                            1.000000f, 0.000000f );
-    // States -> vf_bextwall_on vf_bextwall_of
-    instance->registerEObj( "Crystallizedrock", 2002947, 0, 4, { -104.992798f, -53.764061f, -21.253201f }, 1.000000f,
-                            0.000000f );
-    instance->registerEObj( "Crystallizedrock_1", 2003150, 0, 4, { -131.401993f, -56.204762f, 0.851171f }, 0.991760f,
-                            -0.745382f );
-    instance->registerEObj( "Crystallizedrock_2", 2003151, 0, 4, { -62.481171f, -59.339249f, 24.728519f }, 0.991760f,
-                            1.004150f );
-    instance->registerEObj( "Crystallizedrock_3", 2003152, 0, 4, { -86.379723f, -58.526180f, 47.109539f }, 0.991760f,
-                            0.098224f );
-    instance->registerEObj( "Crystallizedrock_4", 2003153, 0, 4, { -114.249298f, -57.590469f, 38.164780f }, 0.991760f,
-                            0.000048f );
-    instance->registerEObj( "Crystallizedrock_5", 2003154, 0, 4, { -78.472977f, -56.144230f, -6.125785f }, 0.991760f,
-                            0.703581f );
-    instance->registerEObj( "unknown_1", 2002735, 0, 4, { 66.489433f, -9.196375f, -91.109978f }, 1.000000f,
-                            -1.570451f );
-    instance->registerEObj( "sgvf_w_lvd_b0118_1", 2002872, 4481282, 4, { 69.178787f, -9.885409f, -91.345154f },
-                            1.000000f, 0.000000f );
-    // States -> vf_bextwall_on vf_bextwall_of
-    instance->registerEObj( "sgvf_w_lvd_b0118_2", 2002872, 4497376, 4, { 64.314568f, -9.885409f, -48.220890f },
-                            1.000000f, 0.000000f );
-    // States -> vf_bextwall_on vf_bextwall_of
-    instance->registerEObj( "unknown_2", 2002866, 4498423, 4, { 73.371529f, -11.611810f, -91.558388f }, 1.000000f,
-                            0.000000f );
-    instance->registerEObj( "unknown_3", 2002867, 4498424, 4, { 79.777977f, -11.999900f, -79.149048f }, 1.000000f,
-                            0.000000f );
-    instance->registerEObj( "unknown_4", 2002868, 4498425, 4, { 91.175873f, -12.124900f, -66.404877f }, 1.000000f,
-                            0.000000f );
-    instance->registerEObj( "unknown_5", 2002869, 4498426, 4, { 77.390869f, -12.124900f, -55.604710f }, 1.000000f,
-                            0.000000f );
-    instance->registerEObj( "unknown_6", 2002735, 0, 4, { 35.741501f, -38.003502f, 86.637199f }, 1.000000f,
-                            -0.000000f );
-    instance->registerEObj( "sgvf_w_lvd_b0118_3", 2002872, 4481286, 4, { 34.816029f, -37.807098f, 89.653633f },
-                            1.000000f, 0.000000f );
-    // States -> vf_bextwall_on vf_bextwall_of
-    instance->registerEObj( "Improvedblastingdevice", 2002870, 4500271, 4, { 39.532532f, -37.026131f, 113.598297f },
-                            1.000000f, 0.000000f );
-    instance->registerEObj( "sgvf_w_lvd_b0118_4", 2002948, 4508121, 4, { 6.729187f, -37.796692f, 112.748901f },
-                            0.991760f, 0.000048f );
-    // States -> vf_bextwall_on vf_bextwall_of
-    instance->registerEObj( "Liftlever", 2002902, 0, 4, { -184.034393f, 23.988701f, -205.737198f }, 1.000000f,
-                            -1.554668f );
-    instance->registerEObj( "Liftlever_1", 2002904, 0, 4, { -183.968002f, -6.010950f, -205.991592f }, 1.000000f,
-                            1.545402f );
-    instance->registerEObj( "unknown_7", 2002905, 4478636, 4, { -192.156906f, 22.842710f, -208.392502f }, 0.991760f,
-                            0.000048f );
-    instance->registerEObj( "unknown_8", 2002900, 4498399, 4, { -209.037796f, 23.594311f, -208.732300f }, 1.000000f,
-                            0.000000f );
-    instance->registerEObj( "Liftlever_2", 2002901, 4478628, 4, { -191.601700f, 23.360180f, -205.152100f }, 1.000000f,
-                            0.000000f );
-    instance->registerEObj( "Liftlever_3", 2002903, 4478629, 4, { -176.329803f, -6.592807f, -210.900894f }, 1.000000f,
-                            0.000000f );
-    instance->registerEObj( "unknown_9", 2002906, 4478634, 4, { -177.598907f, -6.741823f, -208.024597f }, 1.000000f,
-                            0.000000f );
-    instance->registerEObj( "unknown_10", 2002907, 4478650, 4, { -183.958496f, 8.816254f, -208.023193f }, 1.000000f,
-                            0.000000f );
-    instance->registerEObj( "unknown_11", 2002908, 4498400, 4, { -50.309021f, -3.189148f, -200.885101f }, 0.991760f,
-                            0.000048f );
-    instance->registerEObj( "unknown_12", 2002909, 4498416, 4, { 21.741100f, -9.932099f, -141.413300f }, 1.000000f,
-                            0.000000f );
-    instance->registerEObj( "unknown_13", 2002910, 4498406, 4, { -12.649780f, -6.958161f, -219.043304f }, 0.991760f,
-                            0.000048f );
-    instance->registerEObj( "unknown_14", 2002911, 4498409, 4, { 18.035469f, -6.958161f, -209.711594f }, 1.000000f,
-                            0.000000f );
-    instance->registerEObj( "unknown_15", 2002912, 4498410, 4, { 17.977119f, -7.000057f, -185.896194f }, 1.000000f,
-                            0.000000f );
-    instance->registerEObj( "unknown_16", 2002923, 4498451, 4, { 60.402431f, -38.719849f, 51.888512f }, 1.000000f,
-                            0.000000f );
-    instance->registerEObj( "unknown_17", 2002924, 4498457, 4, { 65.252907f, -38.455730f, 39.846581f }, 1.000000f,
-                            0.000000f );
-    instance->registerEObj( "unknown_18", 2002925, 4498456, 4, { 55.235111f, -38.564739f, 39.248360f }, 1.000000f,
-                            0.000000f );
-    instance->registerEObj( "unknown_19", 2002926, 4500996, 4, { -82.288239f, -39.313419f, 101.057198f }, 1.000000f,
-                            0.000000f );
-    instance->registerEObj( "Entrance", 2000182, 4481330, 5, { -253.156403f, 23.528379f, -174.613998f }, 1.000000f,
-                            0.000000f );
-    // States -> vf_lock_on vf_lock_of
-    instance->registerEObj( "Exit", 2000139, 0, 4, { -100.877403f, -56.042820f, -15.206130f }, 0.991760f, 0.000048f );
-    instance->registerEObj( "Shortcut", 2000700, 0, 4, { -237.184906f, 21.988159f, -166.420502f }, 0.991760f,
-                            0.000048f );
-    instance->registerEObj( "unknown_20", 2002899, 0, 4, { -267.241791f, 23.005880f, -170.712494f }, 1.000000f,
-                            0.000000f );
+    instance.registerEObj( "unknown_0", 2002930, 0, 4, { -90.674911f, -57.698959f, 55.099388f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "sgvf_w_lvd_b0118", 2002929, 4481287, 4, { -93.494362f, -57.942631f, 52.914669f }, 1.000000f, 0.000000f ); 
+      // States -> vf_bextwall_on (id: 3) vf_bextwall_of (id: 4) 
+    instance.registerEObj( "Crystallizedrock", 2002947, 0, 4, { -104.992798f, -53.764061f, -21.253201f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "Crystallizedrock_1", 2003150, 0, 4, { -131.401993f, -56.204762f, 0.851171f }, 0.991760f, -0.745382f ); 
+    instance.registerEObj( "Crystallizedrock_2", 2003151, 0, 4, { -62.481171f, -59.339249f, 24.728519f }, 0.991760f, 1.004150f ); 
+    instance.registerEObj( "Crystallizedrock_3", 2003152, 0, 4, { -86.379723f, -58.526180f, 47.109539f }, 0.991760f, 0.098224f ); 
+    instance.registerEObj( "Crystallizedrock_4", 2003153, 0, 4, { -114.249298f, -57.590469f, 38.164780f }, 0.991760f, 0.000048f ); 
+    instance.registerEObj( "Crystallizedrock_5", 2003154, 0, 4, { -78.472977f, -56.144230f, -6.125785f }, 0.991760f, 0.703581f ); 
+    instance.registerEObj( "unknown_1", 2002735, 0, 4, { 66.489433f, -9.196375f, -91.109978f }, 1.000000f, -1.570451f ); 
+    instance.registerEObj( "sgvf_w_lvd_b0118_1", 2002872, 4481282, 4, { 69.178787f, -9.885409f, -91.345154f }, 1.000000f, 0.000000f ); 
+      // States -> vf_bextwall_on (id: 3) vf_bextwall_of (id: 4) 
+    instance.registerEObj( "sgvf_w_lvd_b0118_2", 2002872, 4497376, 4, { 64.314568f, -9.885409f, -48.220890f }, 1.000000f, 0.000000f ); 
+      // States -> vf_bextwall_on (id: 3) vf_bextwall_of (id: 4) 
+    instance.registerEObj( "unknown_2", 2002866, 4498423, 4, { 73.371529f, -11.611810f, -91.558388f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_3", 2002867, 4498424, 4, { 79.777977f, -11.999900f, -79.149048f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_4", 2002868, 4498425, 4, { 91.175873f, -12.124900f, -66.404877f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_5", 2002869, 4498426, 4, { 77.390869f, -12.124900f, -55.604710f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_6", 2002735, 0, 4, { 35.741501f, -38.003502f, 86.637199f }, 1.000000f, -0.000000f ); 
+    instance.registerEObj( "sgvf_w_lvd_b0118_3", 2002872, 4481286, 4, { 34.816029f, -37.807098f, 89.653633f }, 1.000000f, 0.000000f ); 
+      // States -> vf_bextwall_on (id: 3) vf_bextwall_of (id: 4) 
+    instance.registerEObj( "Improvedblastingdevice", 2002870, 4500271, 4, { 39.532532f, -37.026131f, 113.598297f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "sgvf_w_lvd_b0118_4", 2002948, 4508121, 4, { 6.729187f, -37.796692f, 112.748901f }, 0.991760f, 0.000048f ); 
+      // States -> vf_bextwall_on (id: 3) vf_bextwall_of (id: 4) 
+    instance.registerEObj( "Liftlever", 2002902, 0, 4, { -184.034393f, 23.988701f, -205.737198f }, 1.000000f, -1.554668f ); 
+    instance.registerEObj( "Liftlever_1", 2002904, 0, 4, { -183.968002f, -6.010950f, -205.991592f }, 1.000000f, 1.545402f ); 
+    instance.registerEObj( "unknown_7", 2002905, 4478636, 4, { -192.156906f, 22.842710f, -208.392502f }, 0.991760f, 0.000048f ); 
+    instance.registerEObj( "unknown_8", 2002900, 4498399, 4, { -209.037796f, 23.594311f, -208.732300f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "Liftlever_2", 2002901, 4478628, 4, { -191.601700f, 23.360180f, -205.152100f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "Liftlever_3", 2002903, 4478629, 4, { -176.329803f, -6.592807f, -210.900894f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_9", 2002906, 4478634, 4, { -177.598907f, -6.741823f, -208.024597f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_10", 2002907, 4478650, 4, { -183.958496f, 8.816254f, -208.023193f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_11", 2002908, 4498400, 4, { -50.309021f, -3.189148f, -200.885101f }, 0.991760f, 0.000048f ); 
+    instance.registerEObj( "unknown_12", 2002909, 4498416, 4, { 21.741100f, -9.932099f, -141.413300f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_13", 2002910, 4498406, 4, { -12.649780f, -6.958161f, -219.043304f }, 0.991760f, 0.000048f ); 
+    instance.registerEObj( "unknown_14", 2002911, 4498409, 4, { 18.035469f, -6.958161f, -209.711594f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_15", 2002912, 4498410, 4, { 17.977119f, -7.000057f, -185.896194f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_16", 2002923, 4498451, 4, { 60.402431f, -38.719849f, 51.888512f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_17", 2002924, 4498457, 4, { 65.252907f, -38.455730f, 39.846581f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_18", 2002925, 4498456, 4, { 55.235111f, -38.564739f, 39.248360f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_19", 2002926, 4500996, 4, { -82.288239f, -39.313419f, 101.057198f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "Entrance", 2000182, 4481330, 5, { -253.156403f, 23.528379f, -174.613998f }, 1.000000f, 0.000000f ); 
+      // States -> vf_lock_on (id: 11) vf_lock_of (id: 12) 
+    instance.registerEObj( "Exit", 2000139, 0, 4, { -100.877403f, -56.042820f, -15.206130f }, 0.991760f, 0.000048f ); 
+    instance.registerEObj( "Shortcut", 2000700, 0, 4, { -237.184906f, 21.988159f, -166.420502f }, 0.991760f, 0.000048f ); 
+    instance.registerEObj( "unknown_20", 2002899, 0, 4, { -267.241791f, 23.005880f, -170.712494f }, 1.000000f, 0.000000f ); 
 
   }
 
-  void onUpdate( InstanceContentPtr instance, uint32_t currTime ) override
+  void onUpdate( InstanceContent& instance, uint32_t currTime ) override
   {
 
   }
 
-  void onEnterTerritory( InstanceContentPtr instance, Entity::Player& player, uint32_t eventId, uint16_t param1,
+  void onEnterTerritory( InstanceContent& instance, Entity::Player& player, uint32_t eventId, uint16_t param1,
                          uint16_t param2 ) override
   {
 
diff --git a/src/scripts/instances/dungeons/CuttersCry.cpp b/src/scripts/instances/dungeons/CuttersCry.cpp
index 352ca1e3..f6df2623 100644
--- a/src/scripts/instances/dungeons/CuttersCry.cpp
+++ b/src/scripts/instances/dungeons/CuttersCry.cpp
@@ -9,87 +9,59 @@ class CuttersCry :
 public:
   CuttersCry() :
     Sapphire::ScriptAPI::InstanceContentScript( 12 )
-  {
-  }
+  { }
 
-  void onInit( InstanceContentPtr instance ) override
+  void onInit( InstanceContent& instance ) override
   {
-    instance->registerEObj( "unknown_0", 2000659, 0, 4, { -190.040604f, -4.267580f, -210.611801f }, 1.000000f,
-                            0.000000f );
-    instance->registerEObj( "sgvf_w_btl_b0221", 2001133, 4323450, 4, { 268.610687f, -4.089700f, 104.917397f },
-                            1.000000f, 0.000000f );
-    instance->registerEObj( "sgvf_w_btl_b0221_1", 2001133, 4323451, 4, { 250.254807f, -3.751600f, 99.675102f },
-                            1.000000f, 0.000000f );
-    instance->registerEObj( "sgvf_w_btl_b0221_2", 2001133, 4323452, 4, { 268.589386f, -2.609000f, 88.017700f },
-                            1.000000f, 0.000000f );
-    instance->registerEObj( "sgvf_w_btl_b0221_3", 2001133, 4323453, 4, { 105.129799f, -0.534200f, 147.850800f },
-                            1.000000f, 0.000000f );
-    instance->registerEObj( "sgvf_w_btl_b0221_4", 2001133, 4323454, 4, { 119.166603f, 0.308000f, 155.483704f },
-                            1.000000f, 0.000000f );
-    instance->registerEObj( "sgvf_w_btl_b0221_5", 2001133, 4323455, 4, { 103.312500f, -0.406300f, 194.717194f },
-                            1.000000f, 0.000000f );
-    instance->registerEObj( "sgvf_w_btl_b0221_6", 2001133, 4323456, 4, { 73.898598f, 0.574600f, 187.497803f },
-                            1.000000f, 0.000000f );
-    instance->registerEObj( "sgvf_w_btl_b0221_7", 2001133, 4323457, 4, { 72.064903f, 0.259800f, 157.992203f },
-                            1.000000f, 0.000000f );
-    instance->registerEObj( "sgvf_w_btl_b0221_8", 2001133, 4323458, 4, { 116.819603f, -0.614000f, 179.620300f },
-                            1.000000f, 0.000000f );
-    instance->registerEObj( "sgvf_w_btl_b0221_9", 2001133, 4323459, 4, { -11.408770f, -1.184585f, 148.053894f },
-                            1.000000f, 0.000000f );
-    instance->registerEObj( "sgvf_w_btl_b0221_10", 2001133, 4323460, 4, { -46.669281f, 0.651785f, 135.550003f },
-                            1.000000f, 0.000000f );
-    instance->registerEObj( "sgvf_w_btl_b0221_11", 2001133, 4323462, 4, { -24.331600f, -1.221600f, 145.870697f },
-                            1.000000f, 0.000000f );
-    instance->registerEObj( "sgvf_w_btl_b0221_12", 2001133, 4323464, 4, { 15.181000f, -0.706100f, 126.443100f },
-                            1.000000f, 0.000000f );
-    instance->registerEObj( "sgvf_w_btl_b0221_13", 2001133, 4323468, 4, { -92.665901f, 4.399500f, 112.625504f },
-                            1.000000f, 0.000000f );
-    instance->registerEObj( "Entrance", 2000182, 4222581, 5, { 263.888306f, -0.101790f, 157.188995f }, 1.000000f,
-                            0.000000f );
-    // States -> vf_lock_on vf_lock_of
-    instance->registerEObj( "Shortcut", 2000700, 0, 4, { 265.520508f, 0.002038f, 142.558197f }, 1.000000f, 0.000000f );
-    instance->registerEObj( "Shiftingsands", 2000460, 4279880, 4, { 259.501709f, -3.500300f, 88.085403f }, 1.000000f,
-                            0.000000f );
-    // States -> vf_on disp_on disp_of
-    instance->registerEObj( "Shiftingsands_1", 2000461, 4279889, 4, { 79.087517f, 0.289220f, 152.208694f }, 0.991760f,
-                            0.000048f );
-    // States -> vf_on disp_on disp_of
-    instance->registerEObj( "sgvf_w_lvd_b0118", 2000462, 4222616, 4, { -46.215149f, 6.077029f, 159.979706f }, 1.000000f,
-                            0.000000f );
-    // States -> vf_bextwall_on vf_bextwall_of
-    instance->registerEObj( "unknown_1", 2000463, 0, 4, { -48.096859f, 5.781024f, 159.723999f }, 1.000000f, 0.000000f );
-    instance->registerEObj( "Shiftingsands_2", 2000464, 4279890, 4, { -8.133057f, -5.813782f, 215.716797f }, 0.991760f,
-                            0.000048f );
-    // States -> vf_on disp_on disp_of
-    instance->registerEObj( "Shiftingsands_3", 2000465, 4279892, 4, { 301.838593f, -0.717224f, -111.039902f },
-                            0.991760f, 0.000048f );
-    // States -> vf_on disp_on disp_of
-    instance->registerEObj( "Shiftingsands_4", 2000466, 4279893, 4, { 319.020294f, 0.259338f, -232.654297f }, 0.991760f,
-                            0.000048f );
-    // States -> vf_on disp_on disp_of
-    instance->registerEObj( "sgvf_w_lvd_b0118_1", 2000467, 4374288, 4, { -146.843597f, -0.005151f, 184.227493f },
-                            1.000000f, 0.000000f );
-    // States -> vf_bextwall_on vf_bextwall_of
-    instance->registerEObj( "unknown_2", 2000468, 0, 4, { -144.488297f, -0.192320f, 184.547104f }, 1.000000f,
-                            0.000000f );
-    instance->registerEObj( "Shiftingsands_5", 2000469, 4279894, 4, { -144.457199f, -3.646973f, 134.843994f },
-                            0.991760f, 0.000048f );
-    // States -> vf_on disp_on disp_of
-    instance->registerEObj( "sgvf_w_lvd_b0118_2", 2000471, 4222648, 4, { -182.117905f, -0.203522f, -160.895706f },
-                            1.000000f, 0.000000f );
-    // States -> vf_bextwall_on vf_bextwall_of
-    instance->registerEObj( "unknown_3", 2000472, 0, 4, { -179.869202f, -0.089300f, -160.548294f }, 1.000000f,
-                            0.000000f );
-    instance->registerEObj( "Exit", 2000139, 0, 4, { -180.661194f, -4.240662f, -222.797607f }, 1.000000f, 0.000000f );
+    instance.registerEObj( "unknown_0", 2000659, 0, 4, { -190.040604f, -4.267580f, -210.611801f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "sgvf_w_btl_b0221", 2001133, 4323450, 4, { 268.610687f, -4.089700f, 104.917397f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "sgvf_w_btl_b0221_1", 2001133, 4323451, 4, { 250.254807f, -3.751600f, 99.675102f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "sgvf_w_btl_b0221_2", 2001133, 4323452, 4, { 268.589386f, -2.609000f, 88.017700f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "sgvf_w_btl_b0221_3", 2001133, 4323453, 4, { 105.129799f, -0.534200f, 147.850800f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "sgvf_w_btl_b0221_4", 2001133, 4323454, 4, { 119.166603f, 0.308000f, 155.483704f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "sgvf_w_btl_b0221_5", 2001133, 4323455, 4, { 103.312500f, -0.406300f, 194.717194f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "sgvf_w_btl_b0221_6", 2001133, 4323456, 4, { 73.898598f, 0.574600f, 187.497803f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "sgvf_w_btl_b0221_7", 2001133, 4323457, 4, { 72.064903f, 0.259800f, 157.992203f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "sgvf_w_btl_b0221_8", 2001133, 4323458, 4, { 116.819603f, -0.614000f, 179.620300f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "sgvf_w_btl_b0221_9", 2001133, 4323459, 4, { -11.408770f, -1.184585f, 148.053894f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "sgvf_w_btl_b0221_10", 2001133, 4323460, 4, { -46.669281f, 0.651785f, 135.550003f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "sgvf_w_btl_b0221_11", 2001133, 4323462, 4, { -24.331600f, -1.221600f, 145.870697f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "sgvf_w_btl_b0221_12", 2001133, 4323464, 4, { 15.181000f, -0.706100f, 126.443100f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "sgvf_w_btl_b0221_13", 2001133, 4323468, 4, { -92.665901f, 4.399500f, 112.625504f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "Entrance", 2000182, 4222581, 5, { 263.888306f, -0.101790f, 157.188995f }, 1.000000f, 0.000000f ); 
+      // States -> vf_lock_on (id: 11) vf_lock_of (id: 12) 
+    instance.registerEObj( "Shortcut", 2000700, 0, 4, { 265.520508f, 0.002038f, 142.558197f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "Shiftingsands", 2000460, 4279880, 4, { 259.501709f, -3.500300f, 88.085403f }, 1.000000f, 0.000000f ); 
+      // States -> vf_on (id: 2) disp_on (id: 3) disp_of (id: 4) 
+    instance.registerEObj( "Shiftingsands_1", 2000461, 4279889, 4, { 79.087517f, 0.289220f, 152.208694f }, 0.991760f, 0.000048f ); 
+      // States -> vf_on (id: 2) disp_on (id: 3) disp_of (id: 4) 
+    instance.registerEObj( "sgvf_w_lvd_b0118", 2000462, 4222616, 4, { -46.215149f, 6.077029f, 159.979706f }, 1.000000f, 0.000000f ); 
+      // States -> vf_bextwall_on (id: 3) vf_bextwall_of (id: 4) 
+    instance.registerEObj( "unknown_1", 2000463, 0, 4, { -48.096859f, 5.781024f, 159.723999f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "Shiftingsands_2", 2000464, 4279890, 4, { -8.133057f, -5.813782f, 215.716797f }, 0.991760f, 0.000048f ); 
+      // States -> vf_on (id: 2) disp_on (id: 3) disp_of (id: 4) 
+    instance.registerEObj( "Shiftingsands_3", 2000465, 4279892, 4, { 301.838593f, -0.717224f, -111.039902f }, 0.991760f, 0.000048f ); 
+      // States -> vf_on (id: 2) disp_on (id: 3) disp_of (id: 4) 
+    instance.registerEObj( "Shiftingsands_4", 2000466, 4279893, 4, { 319.020294f, 0.259338f, -232.654297f }, 0.991760f, 0.000048f ); 
+      // States -> vf_on (id: 2) disp_on (id: 3) disp_of (id: 4) 
+    instance.registerEObj( "sgvf_w_lvd_b0118_1", 2000467, 4374288, 4, { -146.843597f, -0.005151f, 184.227493f }, 1.000000f, 0.000000f ); 
+      // States -> vf_bextwall_on (id: 3) vf_bextwall_of (id: 4) 
+    instance.registerEObj( "unknown_2", 2000468, 0, 4, { -144.488297f, -0.192320f, 184.547104f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "Shiftingsands_5", 2000469, 4279894, 4, { -144.457199f, -3.646973f, 134.843994f }, 0.991760f, 0.000048f ); 
+      // States -> vf_on (id: 2) disp_on (id: 3) disp_of (id: 4) 
+    instance.registerEObj( "sgvf_w_lvd_b0118_2", 2000471, 4222648, 4, { -182.117905f, -0.203522f, -160.895706f }, 1.000000f, 0.000000f ); 
+      // States -> vf_bextwall_on (id: 3) vf_bextwall_of (id: 4) 
+    instance.registerEObj( "unknown_3", 2000472, 0, 4, { -179.869202f, -0.089300f, -160.548294f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "Exit", 2000139, 0, 4, { -180.661194f, -4.240662f, -222.797607f }, 1.000000f, 0.000000f ); 
 
   }
 
-  void onUpdate( InstanceContentPtr instance, uint32_t currTime ) override
+  void onUpdate( InstanceContent& instance, uint32_t currTime ) override
   {
 
   }
 
-  void onEnterTerritory( InstanceContentPtr instance, Entity::Player& player, uint32_t eventId, uint16_t param1,
+  void onEnterTerritory( InstanceContent& instance, Entity::Player& player, uint32_t eventId, uint16_t param1,
                          uint16_t param2 ) override
   {
 
diff --git a/src/scripts/instances/dungeons/DomaCastle.cpp b/src/scripts/instances/dungeons/DomaCastle.cpp
index 7ddc71f1..df2c4b38 100644
--- a/src/scripts/instances/dungeons/DomaCastle.cpp
+++ b/src/scripts/instances/dungeons/DomaCastle.cpp
@@ -9,20 +9,54 @@ class DomaCastle :
 public:
   DomaCastle() :
     Sapphire::ScriptAPI::InstanceContentScript( 54 )
+  { }
+
+  void onInit( InstanceContent& instance ) override
   {
+    instance.registerEObj( "sgvf_w_lvd_b0250", 2002872, 6889640, 4, { -239.375000f, 67.999496f, -175.164597f }, 0.991760f, 1.326264f ); 
+      // States -> vf_bextwall_on (id: 3) vf_bextwall_of (id: 4) 
+    instance.registerEObj( "unknown_0", 2007791, 0, 4, { -240.158905f, 67.039032f, -177.843399f }, 0.750000f, 0.000048f ); 
+    instance.registerEObj( "sgvf_w_lvd_b0250_1", 2007457, 6889642, 4, { -241.910706f, 67.000000f, -215.185699f }, 1.000000f, 1.326214f ); 
+      // States -> vf_bextwall_on (id: 3) vf_bextwall_of (id: 4) 
+    instance.registerEObj( "unknown_1", 2007457, 6794570, 4, { 287.722412f, 21.499981f, 115.300598f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_2", 2007457, 6739699, 4, { 262.936493f, 21.500010f, 110.142799f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_3", 2007457, 6777815, 4, { 261.315491f, 25.500010f, -10.943810f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_4", 2007457, 6851198, 4, { 248.248901f, 20.000000f, 78.568604f }, 0.991760f, 0.000048f ); 
+    instance.registerEObj( "unknown_5", 2007457, 6928399, 4, { 264.958405f, 24.750000f, 121.939598f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_6", 2007457, 6952007, 4, { 285.857391f, 24.500000f, 90.541313f }, 0.991760f, 0.000048f ); 
+    instance.registerEObj( "unknown_7", 2007457, 6973643, 4, { 189.428497f, 36.749840f, 50.824680f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_8", 2007457, 6735489, 4, { 33.135330f, 40.000000f, 88.297363f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_9", 2007457, 6679193, 4, { -183.423004f, 44.000000f, 125.024200f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_10", 2007457, 6735529, 4, { -193.153900f, 46.551128f, 128.625107f }, 0.991760f, 0.000048f ); 
+    instance.registerEObj( "unknown_11", 2007457, 6732692, 4, { -240.779297f, 64.000023f, -93.377197f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_12", 2007457, 6732698, 4, { -240.802704f, 66.000023f, -140.615494f }, 0.991760f, 0.000048f ); 
+    instance.registerEObj( "unknown_13", 2007457, 6880936, 4, { -243.716507f, 48.000000f, 37.417641f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_14", 2007457, 6739904, 4, { -239.397202f, 45.467159f, 60.631378f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_15", 2007457, 6901296, 4, { -239.515396f, 44.299999f, 93.293831f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_16", 2007457, 6928755, 4, { -243.442398f, 56.000000f, -37.595749f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "sgvf_w_lvd_b0250_2", 2002872, 6889553, 4, { 148.284103f, 41.499981f, 20.913610f }, 1.000000f, 0.000000f ); 
+      // States -> vf_bextwall_on (id: 3) vf_bextwall_of (id: 4) 
+    instance.registerEObj( "unknown_17", 2007791, 0, 4, { 145.028793f, 40.575001f, 21.644630f }, 1.000000f, -1.335177f ); 
+    instance.registerEObj( "sgvf_w_lvd_b0250_3", 2007457, 6889570, 4, { 110.384399f, 41.489140f, 13.189620f }, 0.991760f, 0.063599f ); 
+      // States -> vf_bextwall_on (id: 3) vf_bextwall_of (id: 4) 
+    instance.registerEObj( "sgvf_w_lvd_b0250_4", 2002872, 6889631, 4, { -222.430801f, 45.500000f, 129.655899f }, 0.991760f, -0.233408f ); 
+      // States -> vf_bextwall_on (id: 3) vf_bextwall_of (id: 4) 
+    instance.registerEObj( "unknown_18", 2007791, 0, 4, { -219.254501f, 45.500000f, 130.342697f }, 1.000000f, -1.570796f ); 
+    instance.registerEObj( "sgvf_w_lvd_b0250_5", 2007457, 6889633, 4, { -242.418503f, 45.500000f, 113.102501f }, 1.000000f, -0.233499f ); 
+      // States -> vf_bextwall_on (id: 3) vf_bextwall_of (id: 4) 
+    instance.registerEObj( "Entrance", 2000182, 6881291, 5, { 341.375793f, 13.500000f, 180.479599f }, 1.000000f, 0.000000f ); 
+      // States -> vf_lock_on (id: 11) vf_lock_of (id: 12) 
+    instance.registerEObj( "Shortcut", 2000700, 0, 4, { 336.598785f, 16.739140f, 178.515305f }, 0.991760f, 0.158242f ); 
+    instance.registerEObj( "Exit", 2000139, 0, 4, { -239.781799f, 67.000000f, -212.105698f }, 1.000000f, 0.000000f ); 
+
   }
 
-  void onInit( InstanceContentPtr instance ) override
+  void onUpdate( InstanceContent& instance, uint32_t currTime ) override
   {
 
   }
 
-  void onUpdate( InstanceContentPtr instance, uint32_t currTime ) override
-  {
-
-  }
-
-  void onEnterTerritory( InstanceContentPtr instance, Entity::Player& player, uint32_t eventId, uint16_t param1,
+  void onEnterTerritory( InstanceContent& instance, Entity::Player& player, uint32_t eventId, uint16_t param1,
                          uint16_t param2 ) override
   {
 
diff --git a/src/scripts/instances/dungeons/DzemaelDarkhold.cpp b/src/scripts/instances/dungeons/DzemaelDarkhold.cpp
index 75e1c11e..70311986 100644
--- a/src/scripts/instances/dungeons/DzemaelDarkhold.cpp
+++ b/src/scripts/instances/dungeons/DzemaelDarkhold.cpp
@@ -9,184 +9,119 @@ class DzemaelDarkhold :
 public:
   DzemaelDarkhold() :
     Sapphire::ScriptAPI::InstanceContentScript( 13 )
-  {
-  }
+  { }
 
-  void onInit( InstanceContentPtr instance ) override
+  void onInit( InstanceContent& instance ) override
   {
-    instance->registerEObj( "埋門", 2000033, 3328371, 4, { 79.909241f, 1.268266f, 161.509598f }, 1.000000f, 0.000000f );
-    instance->registerEObj( "Exit", 2000066, 3328664, 4, { 144.020004f, -6.834667f, 162.001907f }, 1.000000f,
-                            0.000000f );
-    instance->registerEObj( "Grandhallgate", 2000438, 3328665, 4, { 98.210373f, -6.834594f, 111.974403f }, 1.000000f,
-                            0.000000f );
-    instance->registerEObj( "unknown_0", 2000453, 0, 4, { 79.384338f, -10.733530f, 106.701599f }, 1.000000f,
-                            -0.706750f );
-    instance->registerEObj( "sgvf_w_lvd_b0118", 2000452, 4229638, 4, { 76.745064f, -11.090400f, 105.321198f },
-                            1.000000f, 0.000000f );
-    // States -> vf_bextwall_on vf_bextwall_of
-    instance->registerEObj( "Magitektransporter", 2000458, 0, 4, { 23.358509f, -12.304620f, 57.612831f }, 1.000000f,
-                            0.000000f );
-    instance->registerEObj( "MagitekterminalI", 2000476, 4256808, 4, { 80.927979f, 1.365243f, 173.289703f }, 1.000000f,
-                            0.000000f );
-    // States -> vf_tarmn1_on vf_tarmn1_of vf_tarmn2_on vf_bg_on vf_bg_of
-    instance->registerEObj( "MagitekterminalIII", 2000478, 4256810, 4, { 124.023804f, -13.794070f, 123.296898f },
-                            1.000000f, 0.000000f );
-    // States -> vf_tarmn1_on vf_tarmn1_of vf_tarmn2_on vf_bg_on vf_bg_of
-    instance->registerEObj( "MagitekterminalIV", 2000479, 4256811, 4, { 140.853195f, -11.962310f, 113.256302f },
-                            1.000000f, 0.000000f );
-    // States -> vf_tarmn1_on vf_tarmn1_of vf_tarmn2_on vf_bg_on vf_bg_of
-    instance->registerEObj( "sgvf_r1r1_b0173", 2000276, 4255636, 4, { 36.155140f, 8.079000f, 207.374298f }, 1.000000f,
-                            0.000000f );
-    // States -> vfbright_b_on vfbright_b_off
-    instance->registerEObj( "sgvf_r1r1_b0173_1", 2000276, 4255639, 4, { 112.091797f, -3.877179f, 176.216904f },
-                            1.000000f, 0.000000f );
-    // States -> vfbright_b_on vfbright_b_off
-    instance->registerEObj( "sgvf_r1r1_b0173_2", 2000276, 4255640, 4, { 139.427399f, -10.726720f, 108.501404f },
-                            1.000000f, 0.000000f );
-    // States -> vfbright_b_on vfbright_b_off
-    instance->registerEObj( "sgvf_r1r1_b0173_3", 2000276, 4255644, 4, { 67.860687f, -14.328120f, 84.076920f },
-                            1.000000f, 0.000000f );
-    // States -> vfbright_b_on vfbright_b_off
-    instance->registerEObj( "sgvf_r1r1_b0173_4", 2000276, 4255645, 4, { 51.562908f, -11.769940f, 111.841400f },
-                            1.000000f, 0.000000f );
-    // States -> vfbright_b_on vfbright_b_off
-    instance->registerEObj( "sgvf_r1r1_b0173_5", 2000276, 4255646, 4, { 18.496250f, -15.965690f, 87.930252f },
-                            1.000000f, 0.000000f );
-    // States -> vfbright_b_on vfbright_b_off
-    instance->registerEObj( "sgvf_r1r1_b0173_6", 2000276, 4255648, 4, { 19.309570f, -10.954800f, 51.356911f },
-                            1.000000f, 0.000000f );
-    // States -> vfbright_b_on vfbright_b_off
-    instance->registerEObj( "unknown_1", 2000279, 4247600, 4, { 35.302368f, 8.108457f, 206.288605f }, 1.000000f,
-                            0.000000f );
-    instance->registerEObj( "unknown_2", 2000279, 4247601, 4, { 111.093102f, -3.403727f, 176.495895f }, 1.000000f,
-                            0.000000f );
-    instance->registerEObj( "unknown_3", 2000279, 4247603, 4, { 68.310699f, -14.257320f, 83.756592f }, 1.000000f,
-                            0.000000f );
-    instance->registerEObj( "unknown_4", 2000279, 4247604, 4, { 52.317631f, -11.815490f, 110.621300f }, 1.000000f,
-                            0.000000f );
-    instance->registerEObj( "unknown_5", 2000279, 4247605, 4, { 18.860821f, -14.036660f, 88.283234f }, 1.000000f,
-                            0.000000f );
-    instance->registerEObj( "unknown_6", 2000279, 4247606, 4, { 20.972610f, -11.172370f, 51.726391f }, 1.000000f,
-                            0.000000f );
-    instance->registerEObj( "unknown_7", 2000279, 4247602, 4, { 138.802094f, -10.764680f, 110.383400f }, 1.000000f,
-                            0.000000f );
-    instance->registerEObj( "Magitektransporter_1", 2000474, 0, 4, { -96.800278f, -30.000010f, -41.821941f }, 1.000000f,
-                            0.000000f );
-    instance->registerEObj( "unknown_8", 2000455, 0, 4, { -106.309601f, -26.688049f, -16.372990f }, 0.991760f,
-                            0.737616f );
-    instance->registerEObj( "sgvf_w_lvd_b0118_1", 2000454, 4233746, 4, { -107.679703f, -26.639919f, -15.815070f },
-                            1.000000f, 0.000000f );
-    // States -> vf_bextwall_on vf_bextwall_of
-    instance->registerEObj( "unknown_9", 2000487, 4184823, 4, { -111.157799f, -22.833250f, 2.271249f }, 1.000000f,
-                            0.000000f );
-    instance->registerEObj( "sgvf_r1r1_b0174", 2000490, 4255705, 4, { -242.711304f, -24.146959f, -32.381401f },
-                            1.000000f, 0.000000f );
-    // States -> vfbright_o_on vfbright_o_off
-    instance->registerEObj( "sgvf_r1r1_b0174_1", 2000490, 4255691, 4, { -261.321289f, -25.547960f, -34.986919f },
-                            1.000000f, 0.000000f );
-    // States -> vfbright_o_on vfbright_o_off
-    instance->registerEObj( "sgvf_r1r1_b0174_2", 2000490, 4255694, 4, { -261.811310f, -26.640051f, -20.854830f },
-                            1.000000f, 0.000000f );
-    // States -> vfbright_o_on vfbright_o_off
-    instance->registerEObj( "sgvf_r1r1_b0174_3", 2000490, 4255706, 4, { -237.266907f, -48.000000f, -0.833767f },
-                            1.000000f, 0.000000f );
-    // States -> vfbright_o_on vfbright_o_off
-    instance->registerEObj( "sgvf_r1r1_b0174_4", 2000490, 4255707, 4, { -217.921600f, -18.200211f, 20.315559f },
-                            1.000000f, 0.000000f );
-    // States -> vfbright_o_on vfbright_o_off
-    instance->registerEObj( "sgvf_r1r1_b0174_5", 2000490, 4255708, 4, { -169.460999f, -33.749729f, 51.753731f },
-                            1.000000f, 0.000000f );
-    // States -> vfbright_o_on vfbright_o_off
-    instance->registerEObj( "sgvf_r1r1_b0174_6", 2000490, 4255709, 4, { -166.205704f, -33.174091f, 41.379780f },
-                            1.000000f, 0.000000f );
-    // States -> vfbright_o_on vfbright_o_off
-    instance->registerEObj( "sgvf_r1r1_b0174_7", 2000490, 4255710, 4, { -136.133698f, -24.761801f, 11.194330f },
-                            1.000000f, 0.000000f );
-    // States -> vfbright_o_on vfbright_o_off
-    instance->registerEObj( "unknown_10", 2000280, 4247607, 4, { -260.415710f, -25.404510f, -36.083500f }, 1.000000f,
-                            0.000000f );
-    instance->registerEObj( "unknown_11", 2000280, 4247608, 4, { -262.467896f, -26.663879f, -21.408119f }, 1.000000f,
-                            0.000000f );
-    instance->registerEObj( "unknown_12", 2000280, 4247609, 4, { -241.470901f, -24.060431f, -29.972530f }, 1.000000f,
-                            0.000000f );
-    instance->registerEObj( "unknown_13", 2000280, 4247611, 4, { -238.320496f, -47.903111f, -3.008399f }, 1.000000f,
-                            0.000000f );
-    instance->registerEObj( "unknown_14", 2000280, 4247610, 4, { -219.957108f, -17.854340f, 18.911011f }, 1.000000f,
-                            0.000000f );
-    instance->registerEObj( "unknown_15", 2000280, 4247613, 4, { -168.223907f, -33.658329f, 50.704330f }, 1.000000f,
-                            0.000000f );
-    instance->registerEObj( "unknown_16", 2000280, 4247612, 4, { -165.114899f, -32.678890f, 41.844219f }, 1.000000f,
-                            0.000000f );
-    instance->registerEObj( "unknown_17", 2000280, 4247614, 4, { -133.651001f, -24.416229f, 10.934760f }, 1.000000f,
-                            0.000000f );
-    instance->registerEObj( "sgvf_w_emp_b0021", 2000488, 4233760, 4, { 13.842580f, -15.160090f, -143.072693f },
-                            1.000000f, 0.000000f );
-    // States -> vf_baria_on vf_baria_off
-    instance->registerEObj( "MagitekterminalVIII", 2000483, 4256818, 4, { -16.049601f, -17.297310f, -177.329498f },
-                            0.991760f, 0.000048f );
-    // States -> vf_tarmn1_on vf_tarmn1_of vf_tarmn2_on vf_bg_on vf_bg_of
-    instance->registerEObj( "MagitekterminalIX", 2000484, 4256819, 4, { -14.914310f, -21.075211f, -144.145996f },
-                            1.000000f, 0.000000f );
-    // States -> vf_tarmn1_on vf_tarmn1_of vf_tarmn2_on vf_bg_on vf_bg_of
-    instance->registerEObj( "unknown_18", 2000457, 0, 4, { 56.778809f, -36.148682f, -150.835495f }, 0.991760f,
-                            0.957075f );
-    instance->registerEObj( "sgvf_w_lvd_b0118_2", 2000456, 4233771, 4, { 55.222290f, -35.782471f, -150.255600f },
-                            0.991760f, 0.000048f );
-    // States -> vf_bextwall_on vf_bextwall_of
-    instance->registerEObj( "sgvf_r1r1_b0174_8", 2000490, 4255718, 4, { -48.459080f, -19.742540f, -176.405197f },
-                            0.991760f, 0.000048f );
-    // States -> vfbright_o_on vfbright_o_off
-    instance->registerEObj( "sgvf_r1r1_b0174_9", 2000490, 4255720, 4, { -11.239590f, -21.204630f, -144.906204f },
-                            0.991760f, 0.000048f );
-    // States -> vfbright_o_on vfbright_o_off
-    instance->registerEObj( "sgvf_r1r1_b0174_10", 2000490, 4255721, 4, { -15.353870f, -17.228140f, -178.818893f },
-                            0.991760f, 0.000048f );
-    // States -> vfbright_o_on vfbright_o_off
-    instance->registerEObj( "sgvf_r1r1_b0174_11", 2000490, 4255722, 4, { 29.525160f, -23.532890f, -108.452202f },
-                            0.991760f, 0.000048f );
-    // States -> vfbright_o_on vfbright_o_off
-    instance->registerEObj( "sgvf_r1r1_b0174_12", 2000490, 4255723, 4, { 27.773970f, -23.532040f, -114.936401f },
-                            0.991760f, 0.000048f );
-    // States -> vfbright_o_on vfbright_o_off
-    instance->registerEObj( "sgvf_r1r1_b0174_13", 2000490, 4255725, 4, { 64.981979f, -38.499950f, -172.408997f },
-                            0.991760f, 0.000048f );
-    // States -> vfbright_o_on vfbright_o_off
-    instance->registerEObj( "sgvf_r1r1_b0174_14", 2000490, 4255728, 4, { 70.785149f, -37.665981f, -203.212097f },
-                            0.991760f, 0.000048f );
-    // States -> vfbright_o_on vfbright_o_off
-    instance->registerEObj( "sgvf_r1r1_b0174_15", 2000490, 4255729, 4, { 105.072098f, -38.024330f, -158.260803f },
-                            0.991760f, 0.000048f );
-    // States -> vfbright_o_on vfbright_o_off
-    instance->registerEObj( "unknown_19", 2000280, 4246846, 4, { -45.950432f, -19.312410f, -177.762207f }, 1.000000f,
-                            0.000000f );
-    instance->registerEObj( "unknown_20", 2000280, 4246848, 4, { -14.610830f, -21.218700f, -145.140900f }, 1.000000f,
-                            0.000000f );
-    instance->registerEObj( "unknown_21", 2000280, 4246847, 4, { -16.411739f, -16.383909f, -180.914902f }, 1.000000f,
-                            0.000000f );
-    instance->registerEObj( "unknown_22", 2000280, 4246849, 4, { 26.993160f, -23.453131f, -107.682999f }, 0.991760f,
-                            0.000048f );
-    instance->registerEObj( "unknown_23", 2000280, 0, 4, { 32.493099f, -24.000099f, -113.021797f }, 1.000000f,
-                            0.000000f );
-    instance->registerEObj( "unknown_24", 2000280, 4246850, 4, { 66.021332f, -38.500019f, -172.238098f }, 1.000000f,
-                            0.000000f );
-    instance->registerEObj( "unknown_25", 2000280, 4246851, 4, { 70.452782f, -37.655048f, -202.913803f }, 1.000000f,
-                            0.000000f );
-    instance->registerEObj( "unknown_26", 2000280, 4246852, 4, { 103.330498f, -38.100510f, -159.167999f }, 1.000000f,
-                            0.000000f );
-    instance->registerEObj( "Exit_1", 2000139, 0, 4, { 79.243332f, -38.930771f, -182.480194f }, 1.000000f, 0.000000f );
-    instance->registerEObj( "Entrance", 2000182, 4229601, 5, { -48.620270f, 19.892130f, 221.013596f }, 1.000000f,
-                            0.000000f );
-    // States -> vf_lock_on vf_lock_of
-    instance->registerEObj( "Shortcut", 2000700, 0, 4, { -44.993790f, 14.002300f, 204.521896f }, 1.000000f, 0.000000f );
+    instance.registerEObj( "埋門", 2000033, 3328371, 4, { 79.909241f, 1.268266f, 161.509598f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "Exit", 2000066, 3328664, 4, { 144.020004f, -6.834667f, 162.001907f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "Grandhallgate", 2000438, 3328665, 4, { 98.210373f, -6.834594f, 111.974403f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_0", 2000453, 0, 4, { 79.384338f, -10.733530f, 106.701599f }, 1.000000f, -0.706750f ); 
+    instance.registerEObj( "sgvf_w_lvd_b0118", 2000452, 4229638, 4, { 76.745064f, -11.090400f, 105.321198f }, 1.000000f, 0.000000f ); 
+      // States -> vf_bextwall_on (id: 3) vf_bextwall_of (id: 4) 
+    instance.registerEObj( "Magitektransporter", 2000458, 0, 4, { 23.358509f, -12.304620f, 57.612831f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "MagitekterminalI", 2000476, 4256808, 4, { 80.927979f, 1.365243f, 173.289703f }, 1.000000f, 0.000000f ); 
+      // States -> vf_tarmn1_on (id: 3) vf_tarmn1_of (id: 4) vf_tarmn2_on (id: 12) vf_bg_on (id: 18) vf_bg_of (id: 28) 
+    instance.registerEObj( "MagitekterminalIII", 2000478, 4256810, 4, { 124.023804f, -13.794070f, 123.296898f }, 1.000000f, 0.000000f ); 
+      // States -> vf_tarmn1_on (id: 3) vf_tarmn1_of (id: 4) vf_tarmn2_on (id: 12) vf_bg_on (id: 18) vf_bg_of (id: 28) 
+    instance.registerEObj( "MagitekterminalIV", 2000479, 4256811, 4, { 140.853195f, -11.962310f, 113.256302f }, 1.000000f, 0.000000f ); 
+      // States -> vf_tarmn1_on (id: 3) vf_tarmn1_of (id: 4) vf_tarmn2_on (id: 12) vf_bg_on (id: 18) vf_bg_of (id: 28) 
+    instance.registerEObj( "sgvf_r1r1_b0173", 2000276, 4255636, 4, { 36.155140f, 8.079000f, 207.374298f }, 1.000000f, 0.000000f ); 
+      // States -> vfbright_b_on (id: 5) vfbright_b_off (id: 6) 
+    instance.registerEObj( "sgvf_r1r1_b0173_1", 2000276, 4255639, 4, { 112.091797f, -3.877179f, 176.216904f }, 1.000000f, 0.000000f ); 
+      // States -> vfbright_b_on (id: 5) vfbright_b_off (id: 6) 
+    instance.registerEObj( "sgvf_r1r1_b0173_2", 2000276, 4255640, 4, { 139.427399f, -10.726720f, 108.501404f }, 1.000000f, 0.000000f ); 
+      // States -> vfbright_b_on (id: 5) vfbright_b_off (id: 6) 
+    instance.registerEObj( "sgvf_r1r1_b0173_3", 2000276, 4255644, 4, { 67.860687f, -14.328120f, 84.076920f }, 1.000000f, 0.000000f ); 
+      // States -> vfbright_b_on (id: 5) vfbright_b_off (id: 6) 
+    instance.registerEObj( "sgvf_r1r1_b0173_4", 2000276, 4255645, 4, { 51.562908f, -11.769940f, 111.841400f }, 1.000000f, 0.000000f ); 
+      // States -> vfbright_b_on (id: 5) vfbright_b_off (id: 6) 
+    instance.registerEObj( "sgvf_r1r1_b0173_5", 2000276, 4255646, 4, { 18.496250f, -15.965690f, 87.930252f }, 1.000000f, 0.000000f ); 
+      // States -> vfbright_b_on (id: 5) vfbright_b_off (id: 6) 
+    instance.registerEObj( "sgvf_r1r1_b0173_6", 2000276, 4255648, 4, { 19.309570f, -10.954800f, 51.356911f }, 1.000000f, 0.000000f ); 
+      // States -> vfbright_b_on (id: 5) vfbright_b_off (id: 6) 
+    instance.registerEObj( "unknown_1", 2000279, 4247600, 4, { 35.302368f, 8.108457f, 206.288605f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_2", 2000279, 4247601, 4, { 111.093102f, -3.403727f, 176.495895f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_3", 2000279, 4247603, 4, { 68.310699f, -14.257320f, 83.756592f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_4", 2000279, 4247604, 4, { 52.317631f, -11.815490f, 110.621300f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_5", 2000279, 4247605, 4, { 18.860821f, -14.036660f, 88.283234f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_6", 2000279, 4247606, 4, { 20.972610f, -11.172370f, 51.726391f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_7", 2000279, 4247602, 4, { 138.802094f, -10.764680f, 110.383400f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "Magitektransporter_1", 2000474, 0, 4, { -96.800278f, -30.000010f, -41.821941f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_8", 2000455, 0, 4, { -106.309601f, -26.688049f, -16.372990f }, 0.991760f, 0.737616f ); 
+    instance.registerEObj( "sgvf_w_lvd_b0118_1", 2000454, 4233746, 4, { -107.679703f, -26.639919f, -15.815070f }, 1.000000f, 0.000000f ); 
+      // States -> vf_bextwall_on (id: 3) vf_bextwall_of (id: 4) 
+    instance.registerEObj( "unknown_9", 2000487, 4184823, 4, { -111.157799f, -22.833250f, 2.271249f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "sgvf_r1r1_b0174", 2000490, 4255705, 4, { -242.711304f, -24.146959f, -32.381401f }, 1.000000f, 0.000000f ); 
+      // States -> vfbright_o_on (id: 5) vfbright_o_off (id: 6) 
+    instance.registerEObj( "sgvf_r1r1_b0174_1", 2000490, 4255691, 4, { -261.321289f, -25.547960f, -34.986919f }, 1.000000f, 0.000000f ); 
+      // States -> vfbright_o_on (id: 5) vfbright_o_off (id: 6) 
+    instance.registerEObj( "sgvf_r1r1_b0174_2", 2000490, 4255694, 4, { -261.811310f, -26.640051f, -20.854830f }, 1.000000f, 0.000000f ); 
+      // States -> vfbright_o_on (id: 5) vfbright_o_off (id: 6) 
+    instance.registerEObj( "sgvf_r1r1_b0174_3", 2000490, 4255706, 4, { -237.266907f, -48.000000f, -0.833767f }, 1.000000f, 0.000000f ); 
+      // States -> vfbright_o_on (id: 5) vfbright_o_off (id: 6) 
+    instance.registerEObj( "sgvf_r1r1_b0174_4", 2000490, 4255707, 4, { -217.921600f, -18.200211f, 20.315559f }, 1.000000f, 0.000000f ); 
+      // States -> vfbright_o_on (id: 5) vfbright_o_off (id: 6) 
+    instance.registerEObj( "sgvf_r1r1_b0174_5", 2000490, 4255708, 4, { -169.460999f, -33.749729f, 51.753731f }, 1.000000f, 0.000000f ); 
+      // States -> vfbright_o_on (id: 5) vfbright_o_off (id: 6) 
+    instance.registerEObj( "sgvf_r1r1_b0174_6", 2000490, 4255709, 4, { -166.205704f, -33.174091f, 41.379780f }, 1.000000f, 0.000000f ); 
+      // States -> vfbright_o_on (id: 5) vfbright_o_off (id: 6) 
+    instance.registerEObj( "sgvf_r1r1_b0174_7", 2000490, 4255710, 4, { -136.133698f, -24.761801f, 11.194330f }, 1.000000f, 0.000000f ); 
+      // States -> vfbright_o_on (id: 5) vfbright_o_off (id: 6) 
+    instance.registerEObj( "unknown_10", 2000280, 4247607, 4, { -260.415710f, -25.404510f, -36.083500f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_11", 2000280, 4247608, 4, { -262.467896f, -26.663879f, -21.408119f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_12", 2000280, 4247609, 4, { -241.470901f, -24.060431f, -29.972530f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_13", 2000280, 4247611, 4, { -238.320496f, -47.903111f, -3.008399f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_14", 2000280, 4247610, 4, { -219.957108f, -17.854340f, 18.911011f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_15", 2000280, 4247613, 4, { -168.223907f, -33.658329f, 50.704330f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_16", 2000280, 4247612, 4, { -165.114899f, -32.678890f, 41.844219f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_17", 2000280, 4247614, 4, { -133.651001f, -24.416229f, 10.934760f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "sgvf_w_emp_b0021", 2000488, 4233760, 4, { 13.842580f, -15.160090f, -143.072693f }, 1.000000f, 0.000000f ); 
+      // States -> vf_baria_on (id: 1) vf_baria_off (id: 2) 
+    instance.registerEObj( "MagitekterminalVIII", 2000483, 4256818, 4, { -16.049601f, -17.297310f, -177.329498f }, 0.991760f, 0.000048f ); 
+      // States -> vf_tarmn1_on (id: 3) vf_tarmn1_of (id: 4) vf_tarmn2_on (id: 12) vf_bg_on (id: 18) vf_bg_of (id: 28) 
+    instance.registerEObj( "MagitekterminalIX", 2000484, 4256819, 4, { -14.914310f, -21.075211f, -144.145996f }, 1.000000f, 0.000000f ); 
+      // States -> vf_tarmn1_on (id: 3) vf_tarmn1_of (id: 4) vf_tarmn2_on (id: 12) vf_bg_on (id: 18) vf_bg_of (id: 28) 
+    instance.registerEObj( "unknown_18", 2000457, 0, 4, { 56.778809f, -36.148682f, -150.835495f }, 0.991760f, 0.957075f ); 
+    instance.registerEObj( "sgvf_w_lvd_b0118_2", 2000456, 4233771, 4, { 55.222290f, -35.782471f, -150.255600f }, 0.991760f, 0.000048f ); 
+      // States -> vf_bextwall_on (id: 3) vf_bextwall_of (id: 4) 
+    instance.registerEObj( "sgvf_r1r1_b0174_8", 2000490, 4255718, 4, { -48.459080f, -19.742540f, -176.405197f }, 0.991760f, 0.000048f ); 
+      // States -> vfbright_o_on (id: 5) vfbright_o_off (id: 6) 
+    instance.registerEObj( "sgvf_r1r1_b0174_9", 2000490, 4255720, 4, { -11.239590f, -21.204630f, -144.906204f }, 0.991760f, 0.000048f ); 
+      // States -> vfbright_o_on (id: 5) vfbright_o_off (id: 6) 
+    instance.registerEObj( "sgvf_r1r1_b0174_10", 2000490, 4255721, 4, { -15.353870f, -17.228140f, -178.818893f }, 0.991760f, 0.000048f ); 
+      // States -> vfbright_o_on (id: 5) vfbright_o_off (id: 6) 
+    instance.registerEObj( "sgvf_r1r1_b0174_11", 2000490, 4255722, 4, { 29.525160f, -23.532890f, -108.452202f }, 0.991760f, 0.000048f ); 
+      // States -> vfbright_o_on (id: 5) vfbright_o_off (id: 6) 
+    instance.registerEObj( "sgvf_r1r1_b0174_12", 2000490, 4255723, 4, { 27.773970f, -23.532040f, -114.936401f }, 0.991760f, 0.000048f ); 
+      // States -> vfbright_o_on (id: 5) vfbright_o_off (id: 6) 
+    instance.registerEObj( "sgvf_r1r1_b0174_13", 2000490, 4255725, 4, { 64.981979f, -38.499950f, -172.408997f }, 0.991760f, 0.000048f ); 
+      // States -> vfbright_o_on (id: 5) vfbright_o_off (id: 6) 
+    instance.registerEObj( "sgvf_r1r1_b0174_14", 2000490, 4255728, 4, { 70.785149f, -37.665981f, -203.212097f }, 0.991760f, 0.000048f ); 
+      // States -> vfbright_o_on (id: 5) vfbright_o_off (id: 6) 
+    instance.registerEObj( "sgvf_r1r1_b0174_15", 2000490, 4255729, 4, { 105.072098f, -38.024330f, -158.260803f }, 0.991760f, 0.000048f ); 
+      // States -> vfbright_o_on (id: 5) vfbright_o_off (id: 6) 
+    instance.registerEObj( "unknown_19", 2000280, 4246846, 4, { -45.950432f, -19.312410f, -177.762207f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_20", 2000280, 4246848, 4, { -14.610830f, -21.218700f, -145.140900f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_21", 2000280, 4246847, 4, { -16.411739f, -16.383909f, -180.914902f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_22", 2000280, 4246849, 4, { 26.993160f, -23.453131f, -107.682999f }, 0.991760f, 0.000048f ); 
+    instance.registerEObj( "unknown_23", 2000280, 0, 4, { 32.493099f, -24.000099f, -113.021797f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_24", 2000280, 4246850, 4, { 66.021332f, -38.500019f, -172.238098f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_25", 2000280, 4246851, 4, { 70.452782f, -37.655048f, -202.913803f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_26", 2000280, 4246852, 4, { 103.330498f, -38.100510f, -159.167999f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "Exit_1", 2000139, 0, 4, { 79.243332f, -38.930771f, -182.480194f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "Entrance", 2000182, 4229601, 5, { -48.620270f, 19.892130f, 221.013596f }, 1.000000f, 0.000000f ); 
+      // States -> vf_lock_on (id: 11) vf_lock_of (id: 12) 
+    instance.registerEObj( "Shortcut", 2000700, 0, 4, { -44.993790f, 14.002300f, 204.521896f }, 1.000000f, 0.000000f ); 
 
   }
 
-  void onUpdate( InstanceContentPtr instance, uint32_t currTime ) override
+  void onUpdate( InstanceContent& instance, uint32_t currTime ) override
   {
 
   }
 
-  void onEnterTerritory( InstanceContentPtr instance, Entity::Player& player, uint32_t eventId, uint16_t param1,
+  void onEnterTerritory( InstanceContent& instance, Entity::Player& player, uint32_t eventId, uint16_t param1,
                          uint16_t param2 ) override
   {
 
diff --git a/src/scripts/instances/dungeons/Halatali.cpp b/src/scripts/instances/dungeons/Halatali.cpp
index 20318d98..aa17de21 100644
--- a/src/scripts/instances/dungeons/Halatali.cpp
+++ b/src/scripts/instances/dungeons/Halatali.cpp
@@ -9,109 +9,70 @@ class Halatali :
 public:
   Halatali() :
     Sapphire::ScriptAPI::InstanceContentScript( 7 )
-  {
-  }
+  { }
 
-  void onInit( InstanceContentPtr instance ) override
+  void onInit( InstanceContent& instance ) override
   {
-    instance->registerEObj( "Entrance", 2000182, 4600269, 5, { -245.383194f, 17.225630f, 16.103081f }, 1.000000f,
-                            0.000000f );
-    // States -> vf_lock_on vf_lock_of
-    instance->registerEObj( "Exit", 2000139, 0, 4, { -279.773407f, 17.233170f, 19.434681f }, 1.000000f, 0.000000f );
-    instance->registerEObj( "unknown_0", 2001609, 0, 4, { 241.292603f, 11.057950f, 9.784212f }, 1.000000f, 0.000000f );
-    instance->registerEObj( "Entrance_1", 2001649, 4097866, 5, { 238.950500f, 9.900879f, -1.209344f }, 1.000000f,
-                            0.000000f );
-    // States -> vf_lock_on vf_lock_of
-    instance->registerEObj( "Exit_1", 2001610, 4097973, 4, { -280.512299f, 17.240601f, 20.057501f }, 1.000000f,
-                            0.000000f );
-    // States -> vf_htras1_on vf_htras1_of
-    instance->registerEObj( "sgvf_w_lvd_b0094", 2001611, 4097992, 4, { 19.113859f, 0.900208f, 98.170502f }, 0.991760f,
-                            0.000048f );
-    // States -> vf_line_on vf_line_of
-    instance->registerEObj( "sgvf_w_lvd_b0118", 2001612, 4098036, 4, { 17.948280f, 0.925217f, 99.310219f }, 1.000000f,
-                            0.000000f );
-    // States -> vf_bextwall_on vf_bextwall_of
-    instance->registerEObj( "sgvf_w_lvd_b0094_1", 2001613, 4098064, 4, { -120.074501f, -5.801239f, -111.402496f },
-                            1.000000f, 0.000000f );
-    // States -> vf_line_on vf_line_of
-    instance->registerEObj( "sgvf_w_lvd_b0118_1", 2001614, 4098077, 4, { -121.598503f, -5.727614f, -112.049599f },
-                            1.000000f, 0.000000f );
-    // States -> vf_bextwall_on vf_bextwall_of
-    instance->registerEObj( "sgvf_w_lvd_b0094_2", 2001615, 4098237, 4, { -228.286301f, 17.565599f, 16.208900f },
-                            1.000000f, 0.000048f );
-    // States -> vf_line_on vf_line_of
-    instance->registerEObj( "sgvf_w_lvd_b0118_2", 2001616, 4098241, 4, { -229.136703f, 17.565599f, 16.208900f },
-                            1.000000f, 0.000048f );
-    // States -> vf_bextwall_on vf_bextwall_of
-    instance->registerEObj( "unknown_1", 2001618, 4014394, 4, { 29.098881f, 1.785278f, 130.418793f }, 0.991760f,
-                            0.000048f );
-    instance->registerEObj( "Aetherialflow", 2001619, 0, 4, { 32.968849f, 3.815735f, 131.179199f }, 0.991760f,
-                            0.000048f );
-    instance->registerEObj( "unknown_2", 2001620, 2815987, 4, { 120.471397f, -0.516086f, -57.500610f }, 1.000000f,
-                            0.000000f );
-    instance->registerEObj( "unknown_3", 2001621, 4098194, 4, { -95.942581f, -9.659227f, -101.942596f }, 1.000000f,
-                            0.000000f );
-    instance->registerEObj( "unknown_4", 2001622, 4043181, 4, { -94.468628f, -2.151611f, -68.864014f }, 0.991760f,
-                            0.000048f );
-    instance->registerEObj( "Ludusdoor", 2001623, 4005252, 4, { -172.249695f, 12.559910f, 12.742130f }, 1.000000f,
-                            0.000000f );
-    instance->registerEObj( "Chainwinch", 2001624, 4016950, 4, { 74.518059f, -10.988300f, -107.067703f }, 1.000000f,
-                            0.000000f );
-    instance->registerEObj( "Chainwinch_1", 2001625, 4016951, 4, { 42.154171f, -10.941640f, -84.664078f }, 1.000000f,
-                            0.000000f );
-    instance->registerEObj( "Chainwinch_2", 2001626, 4016952, 4, { 17.515020f, -10.957320f, -190.023102f }, 1.000000f,
-                            0.000000f );
-    instance->registerEObj( "Chainwinch_3", 2001627, 4016953, 4, { -39.127491f, -11.066550f, -129.097504f }, 1.000000f,
-                            0.000000f );
-    instance->registerEObj( "Chainwinch_4", 2001628, 4016954, 4, { -82.474548f, -10.952540f, -113.137199f }, 0.991760f,
-                            0.000048f );
-    instance->registerEObj( "unknown_5", 2001634, 4082420, 4, { -129.441193f, 9.833186f, -0.625334f }, 1.000000f,
-                            0.000000f );
-    instance->registerEObj( "unknown_6", 2001635, 3629276, 4, { -3.044897f, 0.927666f, 144.884506f }, 1.000000f,
-                            0.000000f );
-    instance->registerEObj( "unknown_7", 2001636, 3629274, 4, { 27.769211f, 0.954134f, 166.929398f }, 1.000000f,
-                            0.000000f );
-    instance->registerEObj( "unknown_8", 2001637, 3629277, 4, { 69.039284f, 0.968122f, 137.080902f }, 1.000000f,
-                            0.000000f );
-    instance->registerEObj( "unknown_9", 2001638, 4016486, 4, { -19.781490f, 2.187618f, 152.349899f }, 1.000000f,
-                            0.000000f );
-    instance->registerEObj( "unknown_10", 2001639, 4016487, 4, { 24.469919f, 2.233563f, 180.853195f }, 1.000000f,
-                            0.000000f );
-    instance->registerEObj( "unknown_11", 2001640, 4016488, 4, { 89.225769f, 2.247621f, 140.072006f }, 1.000000f,
-                            0.000000f );
-    instance->registerEObj( "unknown_12", 2001641, 4018090, 4, { -277.600494f, 17.568609f, 40.599701f }, 1.000000f,
-                            0.000000f );
-    instance->registerEObj( "unknown_13", 2001642, 4018091, 4, { -255.703506f, 17.578291f, 47.590672f }, 1.000000f,
-                            0.000000f );
-    instance->registerEObj( "unknown_14", 2001643, 4018092, 4, { -237.108002f, 17.604349f, 38.970459f }, 1.000000f,
-                            0.000000f );
-    instance->registerEObj( "unknown_15", 2001644, 4018089, 4, { -279.140015f, 17.555901f, -2.742105f }, 1.000000f,
-                            0.000000f );
-    instance->registerEObj( "unknown_16", 2001645, 4018088, 4, { -261.194214f, 17.568060f, -11.064940f }, 1.000000f,
-                            0.000000f );
-    instance->registerEObj( "unknown_17", 2001646, 4018087, 4, { -239.163101f, 17.568661f, -4.435994f }, 1.000000f,
-                            0.000000f );
-    instance->registerEObj( "Aetherialflow_1", 2001647, 4103310, 4, { -177.996506f, -14.694460f, -133.043503f },
-                            0.991760f, 0.000048f );
-    // States -> tornade_off tornade_on
-    instance->registerEObj( "unknown_18", 2001648, 4105956, 4, { -171.435196f, -14.633480f, -127.946999f }, 0.991760f,
-                            0.000048f );
-    instance->registerEObj( "unknown_19", 2001650, 0, 4, { -230.125793f, 17.157061f, 16.380630f }, 1.000000f,
-                            0.000000f );
-    instance->registerEObj( "Shortcut", 2000700, 0, 4, { 242.225601f, 9.970665f, -11.333600f }, 1.000000f, 0.000000f );
-    instance->registerEObj( "unknown_20", 2001712, 0, 4, { -131.216003f, 10.073990f, -1.326215f }, 1.000000f,
-                            0.000000f );
-    instance->registerEObj( "unknown_21", 2000210, 0, 4, { -256.084503f, 17.537910f, 17.740490f }, 1.000000f,
-                            0.000000f );
+    instance.registerEObj( "Entrance", 2000182, 4600269, 5, { -245.383194f, 17.225630f, 16.103081f }, 1.000000f, 0.000000f ); 
+      // States -> vf_lock_on (id: 11) vf_lock_of (id: 12) 
+    instance.registerEObj( "Exit", 2000139, 0, 4, { -279.773407f, 17.233170f, 19.434681f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_0", 2001609, 0, 4, { 241.292603f, 11.057950f, 9.784212f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "Entrance_1", 2001649, 4097866, 5, { 238.950500f, 9.900879f, -1.209344f }, 1.000000f, 0.000000f ); 
+      // States -> vf_lock_on (id: 11) vf_lock_of (id: 12) 
+    instance.registerEObj( "Exit_1", 2001610, 4097973, 4, { -280.512299f, 17.240601f, 20.057501f }, 1.000000f, 0.000000f ); 
+      // States -> vf_htras1_on (id: 2) vf_htras1_of (id: 3) 
+    instance.registerEObj( "sgvf_w_lvd_b0094", 2001611, 4097992, 4, { 19.113859f, 0.900208f, 98.170502f }, 0.991760f, 0.000048f ); 
+      // States -> vf_line_on (id: 12) vf_line_of (id: 13) 
+    instance.registerEObj( "sgvf_w_lvd_b0118", 2001612, 4098036, 4, { 17.948280f, 0.925217f, 99.310219f }, 1.000000f, 0.000000f ); 
+      // States -> vf_bextwall_on (id: 3) vf_bextwall_of (id: 4) 
+    instance.registerEObj( "sgvf_w_lvd_b0094_1", 2001613, 4098064, 4, { -120.074501f, -5.801239f, -111.402496f }, 1.000000f, 0.000000f ); 
+      // States -> vf_line_on (id: 12) vf_line_of (id: 13) 
+    instance.registerEObj( "sgvf_w_lvd_b0118_1", 2001614, 4098077, 4, { -121.598503f, -5.727614f, -112.049599f }, 1.000000f, 0.000000f ); 
+      // States -> vf_bextwall_on (id: 3) vf_bextwall_of (id: 4) 
+    instance.registerEObj( "sgvf_w_lvd_b0094_2", 2001615, 4098237, 4, { -228.286301f, 17.565599f, 16.208900f }, 1.000000f, 0.000048f ); 
+      // States -> vf_line_on (id: 12) vf_line_of (id: 13) 
+    instance.registerEObj( "sgvf_w_lvd_b0118_2", 2001616, 4098241, 4, { -229.136703f, 17.565599f, 16.208900f }, 1.000000f, 0.000048f ); 
+      // States -> vf_bextwall_on (id: 3) vf_bextwall_of (id: 4) 
+    instance.registerEObj( "unknown_1", 2001618, 4014394, 4, { 29.098881f, 1.785278f, 130.418793f }, 0.991760f, 0.000048f ); 
+    instance.registerEObj( "Aetherialflow", 2001619, 0, 4, { 32.968849f, 3.815735f, 131.179199f }, 0.991760f, 0.000048f ); 
+    instance.registerEObj( "unknown_2", 2001620, 2815987, 4, { 120.471397f, -0.516086f, -57.500610f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_3", 2001621, 4098194, 4, { -95.942581f, -9.659227f, -101.942596f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_4", 2001622, 4043181, 4, { -94.468628f, -2.151611f, -68.864014f }, 0.991760f, 0.000048f ); 
+    instance.registerEObj( "Ludusdoor", 2001623, 4005252, 4, { -172.249695f, 12.559910f, 12.742130f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "Chainwinch", 2001624, 4016950, 4, { 74.518059f, -10.988300f, -107.067703f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "Chainwinch_1", 2001625, 4016951, 4, { 42.154171f, -10.941640f, -84.664078f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "Chainwinch_2", 2001626, 4016952, 4, { 17.515020f, -10.957320f, -190.023102f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "Chainwinch_3", 2001627, 4016953, 4, { -39.127491f, -11.066550f, -129.097504f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "Chainwinch_4", 2001628, 4016954, 4, { -82.474548f, -10.952540f, -113.137199f }, 0.991760f, 0.000048f ); 
+    instance.registerEObj( "unknown_5", 2001634, 4082420, 4, { -129.441193f, 9.833186f, -0.625334f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_6", 2001635, 3629276, 4, { -3.044897f, 0.927666f, 144.884506f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_7", 2001636, 3629274, 4, { 27.769211f, 0.954134f, 166.929398f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_8", 2001637, 3629277, 4, { 69.039284f, 0.968122f, 137.080902f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_9", 2001638, 4016486, 4, { -19.781490f, 2.187618f, 152.349899f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_10", 2001639, 4016487, 4, { 24.469919f, 2.233563f, 180.853195f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_11", 2001640, 4016488, 4, { 89.225769f, 2.247621f, 140.072006f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_12", 2001641, 4018090, 4, { -277.600494f, 17.568609f, 40.599701f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_13", 2001642, 4018091, 4, { -255.703506f, 17.578291f, 47.590672f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_14", 2001643, 4018092, 4, { -237.108002f, 17.604349f, 38.970459f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_15", 2001644, 4018089, 4, { -279.140015f, 17.555901f, -2.742105f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_16", 2001645, 4018088, 4, { -261.194214f, 17.568060f, -11.064940f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_17", 2001646, 4018087, 4, { -239.163101f, 17.568661f, -4.435994f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "Aetherialflow_1", 2001647, 4103310, 4, { -177.996506f, -14.694460f, -133.043503f }, 0.991760f, 0.000048f ); 
+      // States -> tornade_off (id: 2) tornade_on (id: 3) 
+    instance.registerEObj( "unknown_18", 2001648, 4105956, 4, { -171.435196f, -14.633480f, -127.946999f }, 0.991760f, 0.000048f ); 
+    instance.registerEObj( "unknown_19", 2001650, 0, 4, { -230.125793f, 17.157061f, 16.380630f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "Shortcut", 2000700, 0, 4, { 242.225601f, 9.970665f, -11.333600f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_20", 2001712, 0, 4, { -131.216003f, 10.073990f, -1.326215f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_21", 2000210, 0, 4, { -256.084503f, 17.537910f, 17.740490f }, 1.000000f, 0.000000f ); 
 
   }
 
-  void onUpdate( InstanceContentPtr instance, uint32_t currTime ) override
+  void onUpdate( InstanceContent& instance, uint32_t currTime ) override
   {
 
   }
 
-  void onEnterTerritory( InstanceContentPtr instance, Entity::Player& player, uint32_t eventId, uint16_t param1,
+  void onEnterTerritory( InstanceContent& instance, Entity::Player& player, uint32_t eventId, uint16_t param1,
                          uint16_t param2 ) override
   {
 
diff --git a/src/scripts/instances/dungeons/HalataliHard.cpp b/src/scripts/instances/dungeons/HalataliHard.cpp
index 1e5a594e..951943ed 100644
--- a/src/scripts/instances/dungeons/HalataliHard.cpp
+++ b/src/scripts/instances/dungeons/HalataliHard.cpp
@@ -9,123 +9,75 @@ class HalataliHard :
 public:
   HalataliHard() :
     Sapphire::ScriptAPI::InstanceContentScript( 21 )
-  {
-  }
+  { }
 
-  void onInit( InstanceContentPtr instance ) override
+  void onInit( InstanceContent& instance ) override
   {
-    instance->registerEObj( "Thalsscepter", 2003646, 0, 4, { -270.088409f, 17.593571f, 31.956100f }, 0.991760f,
-                            0.000048f );
-    instance->registerEObj( "unknown_0", 2003695, 4617495, 4, { -280.035614f, 17.622829f, 22.302071f }, 1.000000f,
-                            0.000000f );
-    instance->registerEObj( "unknown_1", 2003696, 4563389, 4, { -286.231689f, 17.622749f, 20.657721f }, 1.000000f,
-                            0.000000f );
-    instance->registerEObj( "Thalsscepter_1", 2003674, 0, 4, { -271.908386f, 17.593571f, 6.173567f }, 0.991760f,
-                            0.000048f );
-    instance->registerEObj( "Thalsscepter_2", 2003675, 0, 4, { -244.251801f, 17.593571f, 30.251480f }, 0.991760f,
-                            0.000048f );
-    instance->registerEObj( "Thalsscepter_3", 2003676, 0, 4, { -246.038696f, 17.593571f, 4.371015f }, 0.991760f,
-                            0.000048f );
-    instance->registerEObj( "Mammetactivator", 2003641, 4616318, 4, { -84.695412f, -10.178000f, -91.555862f },
-                            0.991760f, 0.000048f );
-    instance->registerEObj( "Shadowyorb", 2003642, 0, 4, { 163.469803f, 6.240906f, 219.745102f }, 0.991760f,
-                            0.000048f );
-    instance->registerEObj( "Shadowyorb_1", 2003643, 0, 4, { 154.283905f, 6.240900f, 239.520905f }, 0.991760f,
-                            0.000048f );
-    instance->registerEObj( "Shadowyorb_2", 2003644, 0, 4, { 143.742905f, 6.240900f, 210.525208f }, 1.000000f,
-                            0.000000f );
-    instance->registerEObj( "Shadowyorb_3", 2003645, 0, 4, { 134.607193f, 6.240900f, 230.328094f }, 1.000000f,
-                            0.000000f );
-    instance->registerEObj( "unknown_2", 2003569, 4603298, 4, { 148.951706f, 4.509544f, 224.628006f }, 1.000000f,
-                            0.000000f );
-    instance->registerEObj( "Exit", 2001610, 4569374, 4, { -278.262390f, 17.622650f, 19.181259f }, 0.991760f,
-                            0.000048f );
-    // States -> vf_htras1_on vf_htras1_of
-    instance->registerEObj( "Shortcut", 2000700, 0, 4, { 139.879395f, -0.228372f, -31.551029f }, 0.991760f, 0.000048f );
-    instance->registerEObj( "Entrance", 2000182, 4569369, 5, { 149.187393f, -0.228943f, -35.111019f }, 0.991760f,
-                            0.000048f );
-    // States -> vf_lock_on vf_lock_of
-    instance->registerEObj( "unknown_3", 2002575, 0, 4, { 160.775299f, -1.641945f, -10.606120f }, 0.991760f,
-                            -1.265160f );
-    instance->registerEObj( "unknown_4", 2002735, 0, 4, { -50.385818f, -10.178000f, -114.820198f }, 0.991760f,
-                            -1.005012f );
-    instance->registerEObj( "sgvf_w_lvd_b0118", 2002872, 4569384, 4, { -48.920971f, -10.792460f, -116.285103f },
-                            0.991760f, -1.062825f );
-    // States -> vf_bextwall_on vf_bextwall_of
-    instance->registerEObj( "unknown_5", 2002735, 0, 4, { 129.072403f, 4.509535f, 216.306305f }, 1.000000f, 1.129171f );
-    instance->registerEObj( "sgvf_w_lvd_b0118_1", 2002872, 4569379, 4, { 130.018494f, 4.509536f, 217.130295f },
-                            0.991760f, 0.000048f );
-    // States -> vf_bextwall_on vf_bextwall_of
-    instance->registerEObj( "unknown_6", 2002735, 0, 4, { -233.786301f, 17.622999f, 16.764700f }, 1.000000f,
-                            -1.486617f );
-    instance->registerEObj( "sgvf_w_lvd_b0118_2", 2002872, 4569389, 4, { -233.389206f, 17.622990f, 16.739140f },
-                            0.991760f, 0.000048f );
-    // States -> vf_bextwall_on vf_bextwall_of
-    instance->registerEObj( "unknown_7", 2003506, 4594991, 4, { 101.606300f, -4.171019f, -69.914146f }, 1.000000f,
-                            0.000000f );
-    instance->registerEObj( "unknown_8", 2003507, 4598981, 4, { -41.245178f, -10.879700f, -121.934898f }, 0.991760f,
-                            0.000048f );
-    instance->registerEObj( "unknown_9", 2003508, 4603945, 4, { -52.140079f, -10.696590f, -91.691528f }, 0.991760f,
-                            0.000048f );
-    instance->registerEObj( "unknown_10", 2003509, 4564172, 4, { 130.022095f, -0.534058f, 5.172791f }, 0.991760f,
-                            0.000048f );
-    instance->registerEObj( "unknown_11", 2003510, 4594992, 4, { 123.552200f, -2.731445f, 25.131590f }, 0.991760f,
-                            0.000048f );
-    instance->registerEObj( "unknown_12", 2003511, 4598084, 4, { 89.130997f, -3.711910f, 78.724213f }, 1.000000f,
-                            0.000000f );
-    instance->registerEObj( "unknown_13", 2003512, 4599477, 4, { 73.157578f, -3.335556f, 178.491302f }, 1.000000f,
-                            0.000000f );
-    instance->registerEObj( "unknown_14", 2003513, 4594999, 4, { 100.220802f, 0.477127f, 203.242798f }, 1.000000f,
-                            0.000000f );
-    instance->registerEObj( "unknown_15", 2003514, 4616527, 4, { 167.865707f, 4.509536f, 233.584396f }, 0.991760f,
-                            0.000048f );
-    instance->registerEObj( "unknown_16", 2003515, 4567234, 4, { -191.532196f, 4.456180f, 94.520203f }, 1.000000f,
-                            0.000000f );
-    instance->registerEObj( "unknown_17", 2003516, 4567237, 4, { -128.869400f, 12.073380f, 96.752960f }, 1.000000f,
-                            0.000000f );
-    instance->registerEObj( "unknown_18", 2003517, 4567232, 4, { -66.065460f, 14.565810f, 26.350080f }, 1.000000f,
-                            0.000000f );
-    instance->registerEObj( "unknown_19", 2003518, 4567230, 4, { -171.754501f, 12.467810f, 12.301850f }, 1.000000f,
-                            0.000000f );
-    instance->registerEObj( "unknown_20", 2003519, 4596306, 4, { -198.995102f, 11.315890f, 13.488570f }, 1.000000f,
-                            0.000000f );
-    instance->registerEObj( "unknown_21", 2003520, 4565306, 4, { 96.452271f, -3.738525f, 39.688599f }, 0.991760f,
-                            0.000048f );
-    instance->registerEObj( "unknown_22", 2003521, 4565309, 4, { 127.885902f, -3.738525f, 60.807129f }, 0.991760f,
-                            0.000048f );
-    instance->registerEObj( "unknown_23", 2003522, 4565307, 4, { 82.383423f, -3.646973f, 59.189701f }, 0.991760f,
-                            0.000048f );
-    instance->registerEObj( "unknown_24", 2003523, 4565308, 4, { 108.323700f, -3.738525f, 80.552368f }, 0.991760f,
-                            0.000048f );
-    instance->registerEObj( "unknown_25", 2003524, 4565302, 4, { -2.324507f, 0.927634f, 144.329300f }, 1.000000f,
-                            0.000000f );
-    instance->registerEObj( "unknown_26", 2003525, 4565303, 4, { 27.311819f, 0.927548f, 166.238098f }, 1.000000f,
-                            0.000000f );
-    instance->registerEObj( "unknown_27", 2003526, 4565305, 4, { 68.331223f, 0.927661f, 136.889404f }, 1.000000f,
-                            0.000000f );
-    instance->registerEObj( "unknown_28", 2003527, 4595900, 4, { 77.372299f, -10.608900f, -91.074203f }, 1.000000f,
-                            0.000000f );
-    instance->registerEObj( "unknown_29", 2003528, 4595901, 4, { 36.027271f, -9.635880f, -104.808601f }, 1.000000f,
-                            0.000000f );
-    instance->registerEObj( "unknown_30", 2003529, 4595903, 4, { 2.165477f, -11.282240f, -188.867599f }, 1.000000f,
-                            0.000000f );
-    instance->registerEObj( "unknown_31", 2003530, 4618276, 4, { -10.216280f, -11.049250f, -152.788300f }, 0.991760f,
-                            0.000048f );
-    instance->registerEObj( "unknown_32", 2003531, 4595904, 4, { -21.241859f, -11.023320f, -136.299393f }, 1.000000f,
-                            0.000000f );
-    instance->registerEObj( "Entrance_1", 2000182, 4970117, 5, { -243.015701f, 19.074579f, 10.923530f }, 1.000000f,
-                            0.000000f );
-    // States -> vf_lock_on vf_lock_of
-    instance->registerEObj( "Exit_1", 2000139, 0, 4, { -272.688904f, 19.074579f, 18.222231f }, 1.000000f, 0.000000f );
+    instance.registerEObj( "Thalsscepter", 2003646, 0, 4, { -270.088409f, 17.593571f, 31.956100f }, 0.991760f, 0.000048f ); 
+    instance.registerEObj( "unknown_0", 2003695, 4617495, 4, { -280.035614f, 17.622829f, 22.302071f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_1", 2003696, 4563389, 4, { -286.231689f, 17.622749f, 20.657721f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "Thalsscepter_1", 2003674, 0, 4, { -271.908386f, 17.593571f, 6.173567f }, 0.991760f, 0.000048f ); 
+    instance.registerEObj( "Thalsscepter_2", 2003675, 0, 4, { -244.251801f, 17.593571f, 30.251480f }, 0.991760f, 0.000048f ); 
+    instance.registerEObj( "Thalsscepter_3", 2003676, 0, 4, { -246.038696f, 17.593571f, 4.371015f }, 0.991760f, 0.000048f ); 
+    instance.registerEObj( "Mammetactivator", 2003641, 4616318, 4, { -84.695412f, -10.178000f, -91.555862f }, 0.991760f, 0.000048f ); 
+    instance.registerEObj( "Shadowyorb", 2003642, 0, 4, { 163.469803f, 6.240906f, 219.745102f }, 0.991760f, 0.000048f ); 
+    instance.registerEObj( "Shadowyorb_1", 2003643, 0, 4, { 154.283905f, 6.240900f, 239.520905f }, 0.991760f, 0.000048f ); 
+    instance.registerEObj( "Shadowyorb_2", 2003644, 0, 4, { 143.742905f, 6.240900f, 210.525208f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "Shadowyorb_3", 2003645, 0, 4, { 134.607193f, 6.240900f, 230.328094f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_2", 2003569, 4603298, 4, { 148.951706f, 4.509544f, 224.628006f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "Exit", 2001610, 4569374, 4, { -278.262390f, 17.622650f, 19.181259f }, 0.991760f, 0.000048f ); 
+      // States -> vf_htras1_on (id: 2) vf_htras1_of (id: 3) 
+    instance.registerEObj( "Shortcut", 2000700, 0, 4, { 139.879395f, -0.228372f, -31.551029f }, 0.991760f, 0.000048f ); 
+    instance.registerEObj( "Entrance", 2000182, 4569369, 5, { 149.187393f, -0.228943f, -35.111019f }, 0.991760f, 0.000048f ); 
+      // States -> vf_lock_on (id: 11) vf_lock_of (id: 12) 
+    instance.registerEObj( "unknown_3", 2002575, 0, 4, { 160.775299f, -1.641945f, -10.606120f }, 0.991760f, -1.265160f ); 
+    instance.registerEObj( "unknown_4", 2002735, 0, 4, { -50.385818f, -10.178000f, -114.820198f }, 0.991760f, -1.005012f ); 
+    instance.registerEObj( "sgvf_w_lvd_b0118", 2002872, 4569384, 4, { -48.920971f, -10.792460f, -116.285103f }, 0.991760f, -1.062825f ); 
+      // States -> vf_bextwall_on (id: 3) vf_bextwall_of (id: 4) 
+    instance.registerEObj( "unknown_5", 2002735, 0, 4, { 129.072403f, 4.509535f, 216.306305f }, 1.000000f, 1.129171f ); 
+    instance.registerEObj( "sgvf_w_lvd_b0118_1", 2002872, 4569379, 4, { 130.018494f, 4.509536f, 217.130295f }, 0.991760f, 0.000048f ); 
+      // States -> vf_bextwall_on (id: 3) vf_bextwall_of (id: 4) 
+    instance.registerEObj( "unknown_6", 2002735, 0, 4, { -233.786301f, 17.622999f, 16.764700f }, 1.000000f, -1.486617f ); 
+    instance.registerEObj( "sgvf_w_lvd_b0118_2", 2002872, 4569389, 4, { -233.389206f, 17.622990f, 16.739140f }, 0.991760f, 0.000048f ); 
+      // States -> vf_bextwall_on (id: 3) vf_bextwall_of (id: 4) 
+    instance.registerEObj( "unknown_7", 2003506, 4594991, 4, { 101.606300f, -4.171019f, -69.914146f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_8", 2003507, 4598981, 4, { -41.245178f, -10.879700f, -121.934898f }, 0.991760f, 0.000048f ); 
+    instance.registerEObj( "unknown_9", 2003508, 4603945, 4, { -52.140079f, -10.696590f, -91.691528f }, 0.991760f, 0.000048f ); 
+    instance.registerEObj( "unknown_10", 2003509, 4564172, 4, { 130.022095f, -0.534058f, 5.172791f }, 0.991760f, 0.000048f ); 
+    instance.registerEObj( "unknown_11", 2003510, 4594992, 4, { 123.552200f, -2.731445f, 25.131590f }, 0.991760f, 0.000048f ); 
+    instance.registerEObj( "unknown_12", 2003511, 4598084, 4, { 89.130997f, -3.711910f, 78.724213f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_13", 2003512, 4599477, 4, { 73.157578f, -3.335556f, 178.491302f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_14", 2003513, 4594999, 4, { 100.220802f, 0.477127f, 203.242798f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_15", 2003514, 4616527, 4, { 167.865707f, 4.509536f, 233.584396f }, 0.991760f, 0.000048f ); 
+    instance.registerEObj( "unknown_16", 2003515, 4567234, 4, { -191.532196f, 4.456180f, 94.520203f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_17", 2003516, 4567237, 4, { -128.869400f, 12.073380f, 96.752960f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_18", 2003517, 4567232, 4, { -66.065460f, 14.565810f, 26.350080f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_19", 2003518, 4567230, 4, { -171.754501f, 12.467810f, 12.301850f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_20", 2003519, 4596306, 4, { -198.995102f, 11.315890f, 13.488570f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_21", 2003520, 4565306, 4, { 96.452271f, -3.738525f, 39.688599f }, 0.991760f, 0.000048f ); 
+    instance.registerEObj( "unknown_22", 2003521, 4565309, 4, { 127.885902f, -3.738525f, 60.807129f }, 0.991760f, 0.000048f ); 
+    instance.registerEObj( "unknown_23", 2003522, 4565307, 4, { 82.383423f, -3.646973f, 59.189701f }, 0.991760f, 0.000048f ); 
+    instance.registerEObj( "unknown_24", 2003523, 4565308, 4, { 108.323700f, -3.738525f, 80.552368f }, 0.991760f, 0.000048f ); 
+    instance.registerEObj( "unknown_25", 2003524, 4565302, 4, { -2.324507f, 0.927634f, 144.329300f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_26", 2003525, 4565303, 4, { 27.311819f, 0.927548f, 166.238098f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_27", 2003526, 4565305, 4, { 68.331223f, 0.927661f, 136.889404f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_28", 2003527, 4595900, 4, { 77.372299f, -10.608900f, -91.074203f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_29", 2003528, 4595901, 4, { 36.027271f, -9.635880f, -104.808601f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_30", 2003529, 4595903, 4, { 2.165477f, -11.282240f, -188.867599f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_31", 2003530, 4618276, 4, { -10.216280f, -11.049250f, -152.788300f }, 0.991760f, 0.000048f ); 
+    instance.registerEObj( "unknown_32", 2003531, 4595904, 4, { -21.241859f, -11.023320f, -136.299393f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "Entrance_1", 2000182, 4970117, 5, { -243.015701f, 19.074579f, 10.923530f }, 1.000000f, 0.000000f ); 
+      // States -> vf_lock_on (id: 11) vf_lock_of (id: 12) 
+    instance.registerEObj( "Exit_1", 2000139, 0, 4, { -272.688904f, 19.074579f, 18.222231f }, 1.000000f, 0.000000f ); 
 
   }
 
-  void onUpdate( InstanceContentPtr instance, uint32_t currTime ) override
+  void onUpdate( InstanceContent& instance, uint32_t currTime ) override
   {
 
   }
 
-  void onEnterTerritory( InstanceContentPtr instance, Entity::Player& player, uint32_t eventId, uint16_t param1,
+  void onEnterTerritory( InstanceContent& instance, Entity::Player& player, uint32_t eventId, uint16_t param1,
                          uint16_t param2 ) override
   {
 
diff --git a/src/scripts/instances/dungeons/HaukkeManor.cpp b/src/scripts/instances/dungeons/HaukkeManor.cpp
index 7f5c9d0b..b1d6e713 100644
--- a/src/scripts/instances/dungeons/HaukkeManor.cpp
+++ b/src/scripts/instances/dungeons/HaukkeManor.cpp
@@ -9,92 +9,63 @@ class HaukkeManor :
 public:
   HaukkeManor() :
     Sapphire::ScriptAPI::InstanceContentScript( 6 )
-  {
-  }
+  { }
 
-  void onInit( InstanceContentPtr instance ) override
+  void onInit( InstanceContent& instance ) override
   {
-    instance->registerEObj( "Voidlamp", 2000366, 3873151, 4, { 19.527651f, 17.000000f, 22.036671f }, 0.991789f,
-                            0.785398f );
-    // States -> vf_slamp_on vf_slamp_of
-    instance->registerEObj( "Voidlamp_1", 2000367, 3873152, 4, { -24.524000f, 16.999901f, 22.023741f }, 1.000000f,
-                            -0.785398f );
-    // States -> vf_slamp_on vf_slamp_of
-    instance->registerEObj( "Voidlamp_2", 2000368, 3873153, 4, { 19.541849f, 16.999950f, -13.996940f }, 1.000000f,
-                            0.785398f );
-    // States -> vf_slamp_on vf_slamp_of
-    instance->registerEObj( "Voidlamp_3", 2000369, 3873154, 4, { -24.503330f, 16.999889f, -14.014120f }, 1.000000f,
-                            -0.785398f );
-    // States -> vf_slamp_on vf_slamp_of
-    instance->registerEObj( "Exit", 2000370, 0, 4, { -2.517786f, 16.952730f, 21.011629f }, 0.930753f, 0.000240f );
-    instance->registerEObj( "unknown_0", 2000371, 0, 4, { 81.895119f, 0.228838f, -0.106860f }, 0.900235f, 0.000336f );
-    instance->registerEObj( "Tinykey", 2000302, 0, 4, { 71.396912f, -0.001627f, 28.641140f }, 0.869717f, 0.932147f );
-    instance->registerEObj( "Tinykey_1", 2000303, 0, 4, { -26.322651f, -0.005771f, 50.722679f }, 0.778163f,
-                            -0.528574f );
-    instance->registerEObj( "Tinykey_2", 2000304, 0, 4, { -52.424351f, -0.002903f, 22.515909f }, 0.930753f, 0.987942f );
-    instance->registerEObj( "Tinykey_3", 2000305, 0, 4, { -68.498917f, -16.795919f, -8.967492f }, 0.869717f,
-                            1.115077f );
-    instance->registerEObj( "Tinykey_4", 2000306, 0, 4, { -46.234051f, -18.800501f, 38.557331f }, 0.900235f,
-                            0.549108f );
-    instance->registerEObj( "Tinykey_5", 2000307, 0, 4, { 14.015370f, -18.796499f, -43.227589f }, 0.900235f,
-                            0.868678f );
-    instance->registerEObj( "Tinykey_6", 2000308, 0, 4, { -11.804590f, -18.800249f, -50.647060f }, 0.991789f,
-                            0.312732f );
-    instance->registerEObj( "Lockeddoor", 2000329, 3457073, 4, { 0.509394f, 0.143553f, 56.976101f }, 0.991789f,
-                            0.000048f );
-    instance->registerEObj( "Lockeddoor_1", 2000331, 3457076, 4, { -16.586599f, 0.172088f, 84.043991f }, 0.961271f,
-                            0.000144f );
-    instance->registerEObj( "Lockeddoor_2", 2000337, 3457070, 4, { -48.657558f, 0.174862f, -36.017189f }, 0.991789f,
-                            0.000048f );
-    instance->registerEObj( "Lockeddoor_3", 2000338, 3457071, 4, { -48.701061f, 0.167371f, 36.007271f }, 0.930753f,
-                            0.000240f );
-    instance->registerEObj( "Lockeddoor_4", 2000339, 3457083, 4, { -25.116051f, -18.616779f, -34.637550f }, 0.961271f,
-                            0.000144f );
-    instance->registerEObj( "Lockeddoor_5", 2000343, 3457090, 4, { -1.899940f, -18.615101f, 34.620899f }, 0.961271f,
-                            0.000144f );
-    instance->registerEObj( "Lockeddoor_6", 2000344, 3457093, 4, { 25.192600f, -18.692350f, 34.531120f }, 0.930753f,
-                            0.000240f );
-    instance->registerEObj( "IvyDoor", 2000355, 3457081, 4, { -48.382030f, 0.425044f, -0.015306f }, 0.961271f,
-                            0.000144f );
-    instance->registerEObj( "CarnationDoor", 2000356, 3457082, 4, { -25.558910f, -18.570280f, -0.076342f }, 0.930753f,
-                            0.000240f );
-    instance->registerEObj( "LilyDoor", 2000357, 3449005, 4, { 22.842710f, 17.196871f, -0.015306f }, 0.991789f,
-                            0.000048f );
-    instance->registerEObj( "unknown_1", 2001080, 0, 4, { 22.000000f, 17.000000f, 0.000000f }, 0.575000f, -1.570451f );
-    instance->registerEObj( "unknown_2", 2001236, 3852702, 4, { 24.498400f, 0.449216f, 0.000000f }, 1.000000f,
-                            0.000000f );
-    instance->registerEObj( "Sealedbarrier", 2001233, 3909497, 4, { 46.699810f, 9.875019f, -0.253856f }, 1.000000f,
-                            0.000000f );
-    // States -> vf_baria1_off vf_baria_on
-    instance->registerEObj( "Yellowkey", 2000325, 0, 4, { -12.348700f, -18.803230f, 52.290878f }, 1.000000f,
-                            -0.839410f );
-    instance->registerEObj( "Lockeddoor_7", 2000345, 3457077, 4, { 16.464439f, 17.135830f, 84.153458f }, 0.930753f,
-                            0.000240f );
-    instance->registerEObj( "sgvf_w_lvd_b0094", 2001604, 4103506, 4, { -23.510660f, -0.000664f, 0.588553f }, 1.000000f,
-                            0.000000f );
-    // States -> vf_line_on vf_line_of
-    instance->registerEObj( "sgvf_w_lvd_b0118", 2001605, 4103511, 4, { -23.446470f, -0.000633f, -0.525669f }, 1.000000f,
-                            0.000000f );
-    // States -> vf_bextwall_on vf_bextwall_of
-    instance->registerEObj( "sgvf_w_lvd_b0094_1", 2001606, 4103508, 4, { -24.734859f, -18.800381f, 0.630995f },
-                            1.000000f, 0.000000f );
-    // States -> vf_line_on vf_line_of
-    instance->registerEObj( "sgpl_w_lvd_b0118_f1d2", 2001607, 4103512, 4, { -24.765221f, -18.800400f, -0.546668f },
-                            1.000000f, 0.000000f );
-    // States -> vf_bextwall_on vf_bextwall_of
-    instance->registerEObj( "Entrance", 2000182, 4143756, 5, { 73.330597f, 0.000000f, 0.000000f }, 0.991760f,
-                            0.000048f );
-    // States -> vf_lock_on vf_lock_of
-    instance->registerEObj( "Greenkey", 2000324, 0, 4, { 1.500000f, 0.007936f, -0.000000f }, 0.961271f, 0.638080f );
+    instance.registerEObj( "Voidlamp", 2000366, 3873151, 4, { 19.527651f, 17.000000f, 22.036671f }, 0.991789f, 0.785398f ); 
+      // States -> vf_slamp_on (id: 6) vf_slamp_of (id: 12) 
+    instance.registerEObj( "Voidlamp_1", 2000367, 3873152, 4, { -24.524000f, 16.999901f, 22.023741f }, 1.000000f, -0.785398f ); 
+      // States -> vf_slamp_on (id: 6) vf_slamp_of (id: 12) 
+    instance.registerEObj( "Voidlamp_2", 2000368, 3873153, 4, { 19.541849f, 16.999950f, -13.996940f }, 1.000000f, 0.785398f ); 
+      // States -> vf_slamp_on (id: 6) vf_slamp_of (id: 12) 
+    instance.registerEObj( "Voidlamp_3", 2000369, 3873154, 4, { -24.503330f, 16.999889f, -14.014120f }, 1.000000f, -0.785398f ); 
+      // States -> vf_slamp_on (id: 6) vf_slamp_of (id: 12) 
+    instance.registerEObj( "Exit", 2000370, 0, 4, { -2.517786f, 16.952730f, 21.011629f }, 0.930753f, 0.000240f ); 
+    instance.registerEObj( "unknown_0", 2000371, 0, 4, { 81.895119f, 0.228838f, -0.106860f }, 0.900235f, 0.000336f ); 
+    instance.registerEObj( "Tinykey", 2000302, 0, 4, { 71.396912f, -0.001627f, 28.641140f }, 0.869717f, 0.932147f ); 
+    instance.registerEObj( "Tinykey_1", 2000303, 0, 4, { -26.322651f, -0.005771f, 50.722679f }, 0.778163f, -0.528574f ); 
+    instance.registerEObj( "Tinykey_2", 2000304, 0, 4, { -52.424351f, -0.002903f, 22.515909f }, 0.930753f, 0.987942f ); 
+    instance.registerEObj( "Tinykey_3", 2000305, 0, 4, { -68.498917f, -16.795919f, -8.967492f }, 0.869717f, 1.115077f ); 
+    instance.registerEObj( "Tinykey_4", 2000306, 0, 4, { -46.234051f, -18.800501f, 38.557331f }, 0.900235f, 0.549108f ); 
+    instance.registerEObj( "Tinykey_5", 2000307, 0, 4, { 14.015370f, -18.796499f, -43.227589f }, 0.900235f, 0.868678f ); 
+    instance.registerEObj( "Tinykey_6", 2000308, 0, 4, { -11.804590f, -18.800249f, -50.647060f }, 0.991789f, 0.312732f ); 
+    instance.registerEObj( "Lockeddoor", 2000329, 3457073, 4, { 0.509394f, 0.143553f, 56.976101f }, 0.991789f, 0.000048f ); 
+    instance.registerEObj( "Lockeddoor_1", 2000331, 3457076, 4, { -16.586599f, 0.172088f, 84.043991f }, 0.961271f, 0.000144f ); 
+    instance.registerEObj( "Lockeddoor_2", 2000337, 3457070, 4, { -48.657558f, 0.174862f, -36.017189f }, 0.991789f, 0.000048f ); 
+    instance.registerEObj( "Lockeddoor_3", 2000338, 3457071, 4, { -48.701061f, 0.167371f, 36.007271f }, 0.930753f, 0.000240f ); 
+    instance.registerEObj( "Lockeddoor_4", 2000339, 3457083, 4, { -25.116051f, -18.616779f, -34.637550f }, 0.961271f, 0.000144f ); 
+    instance.registerEObj( "Lockeddoor_5", 2000343, 3457090, 4, { -1.899940f, -18.615101f, 34.620899f }, 0.961271f, 0.000144f ); 
+    instance.registerEObj( "Lockeddoor_6", 2000344, 3457093, 4, { 25.192600f, -18.692350f, 34.531120f }, 0.930753f, 0.000240f ); 
+    instance.registerEObj( "IvyDoor", 2000355, 3457081, 4, { -48.382030f, 0.425044f, -0.015306f }, 0.961271f, 0.000144f ); 
+    instance.registerEObj( "CarnationDoor", 2000356, 3457082, 4, { -25.558910f, -18.570280f, -0.076342f }, 0.930753f, 0.000240f ); 
+    instance.registerEObj( "LilyDoor", 2000357, 3449005, 4, { 22.842710f, 17.196871f, -0.015306f }, 0.991789f, 0.000048f ); 
+    instance.registerEObj( "unknown_1", 2001080, 0, 4, { 22.000000f, 17.000000f, 0.000000f }, 0.575000f, -1.570451f ); 
+    instance.registerEObj( "unknown_2", 2001236, 3852702, 4, { 24.498400f, 0.449216f, 0.000000f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "Sealedbarrier", 2001233, 3909497, 4, { 46.699810f, 9.875019f, -0.253856f }, 1.000000f, 0.000000f ); 
+      // States -> vf_baria1_off (id: 3) vf_baria_on (id: 6) 
+    instance.registerEObj( "Yellowkey", 2000325, 0, 4, { -12.348700f, -18.803230f, 52.290878f }, 1.000000f, -0.839410f ); 
+    instance.registerEObj( "Lockeddoor_7", 2000345, 3457077, 4, { 16.464439f, 17.135830f, 84.153458f }, 0.930753f, 0.000240f ); 
+    instance.registerEObj( "sgvf_w_lvd_b0094", 2001604, 4103506, 4, { -23.510660f, -0.000664f, 0.588553f }, 1.000000f, 0.000000f ); 
+      // States -> vf_line_on (id: 12) vf_line_of (id: 13) 
+    instance.registerEObj( "sgvf_w_lvd_b0118", 2001605, 4103511, 4, { -23.446470f, -0.000633f, -0.525669f }, 1.000000f, 0.000000f ); 
+      // States -> vf_bextwall_on (id: 3) vf_bextwall_of (id: 4) 
+    instance.registerEObj( "sgvf_w_lvd_b0094_1", 2001606, 4103508, 4, { -24.734859f, -18.800381f, 0.630995f }, 1.000000f, 0.000000f ); 
+      // States -> vf_line_on (id: 12) vf_line_of (id: 13) 
+    instance.registerEObj( "sgpl_w_lvd_b0118_f1d2", 2001607, 4103512, 4, { -24.765221f, -18.800400f, -0.546668f }, 1.000000f, 0.000000f ); 
+      // States -> vf_bextwall_on (id: 3) vf_bextwall_of (id: 4) 
+    instance.registerEObj( "Entrance", 2000182, 4143756, 5, { 73.330597f, 0.000000f, 0.000000f }, 0.991760f, 0.000048f ); 
+      // States -> vf_lock_on (id: 11) vf_lock_of (id: 12) 
+    instance.registerEObj( "Greenkey", 2000324, 0, 4, { 1.500000f, 0.007936f, -0.000000f }, 0.961271f, 0.638080f ); 
 
   }
 
-  void onUpdate( InstanceContentPtr instance, uint32_t currTime ) override
+  void onUpdate( InstanceContent& instance, uint32_t currTime ) override
   {
 
   }
 
-  void onEnterTerritory( InstanceContentPtr instance, Entity::Player& player, uint32_t eventId, uint16_t param1,
+  void onEnterTerritory( InstanceContent& instance, Entity::Player& player, uint32_t eventId, uint16_t param1,
                          uint16_t param2 ) override
   {
 
diff --git a/src/scripts/instances/dungeons/HaukkeManorHard.cpp b/src/scripts/instances/dungeons/HaukkeManorHard.cpp
index ec3c6ade..a549348e 100644
--- a/src/scripts/instances/dungeons/HaukkeManorHard.cpp
+++ b/src/scripts/instances/dungeons/HaukkeManorHard.cpp
@@ -9,130 +9,89 @@ class HaukkeManorHard :
 public:
   HaukkeManorHard() :
     Sapphire::ScriptAPI::InstanceContentScript( 19 )
-  {
-  }
+  { }
 
-  void onInit( InstanceContentPtr instance ) override
+  void onInit( InstanceContent& instance ) override
   {
-    instance->registerEObj( "unknown_0", 2002735, 0, 4, { -26.487801f, 17.000000f, -0.008300f }, 1.000000f,
-                            -1.570451f );
-    instance->registerEObj( "sgpl_w_lvd_b0118_f1d2", 2002872, 4497628, 4, { 0.000000f, 0.000000f, 0.000000f },
-                            1.000000f, 0.000000f );
-    // States -> vf_bextwall_on vf_bextwall_of
-    instance->registerEObj( "sgbg_f1d4_c1_ori01", 2002873, 4498555, 4, { -1.869557f, 17.000000f, 15.055300f },
-                            1.000000f, 0.000000f );
-    // States -> vf_fire_on0 vf_fire_on vf_fire_oｆ0 vf_fire_oｆ
-    instance->registerEObj( "sgbg_f1d4_c1_ori01_1", 2002874, 4498556, 4, { -5.211004f, 17.000000f, -10.575720f },
-                            1.000000f, 0.000000f );
-    // States -> vf_fire_on0 vf_fire_on vf_fire_oｆ0 vf_fire_oｆ
-    instance->registerEObj( "unknown_1", 2003318, 4484553, 4, { 23.178410f, 16.983280f, 0.137329f }, 0.991760f,
-                            0.000048f );
-    instance->registerEObj( "unknown_2", 2002735, 0, 4, { 25.786711f, 0.000000f, 0.119909f }, 1.000000f, -1.570451f );
-    instance->registerEObj( "sgvf_w_lvd_b0118", 2002872, 4505837, 4, { 23.084200f, 0.000000f, -1.591900f }, 1.000000f,
-                            -1.570796f );
-    // States -> vf_bextwall_on vf_bextwall_of
-    instance->registerEObj( "sgvf_w_lvd_b0118_1", 2003126, 4521780, 4, { -20.141510f, -0.000000f, -0.141697f },
-                            1.000000f, 0.000000f );
-    // States -> vf_bextwall_on vf_bextwall_of
-    instance->registerEObj( "unknown_3", 2002735, 0, 4, { -24.169260f, -18.905939f, -0.137390f }, 0.991760f,
-                            -1.551983f );
-    instance->registerEObj( "sgvf_w_lvd_b0118_2", 2002872, 4509134, 4, { -22.072941f, -18.814390f, -0.320496f },
-                            0.991760f, 0.000048f );
-    // States -> vf_bextwall_on vf_bextwall_of
-    instance->registerEObj( "unknown_4", 2002997, 0, 4, { -20.433430f, -18.936470f, 0.755735f }, 1.000000f, 0.000000f );
-    instance->registerEObj( "LilyDoor", 2002915, 4484551, 4, { -28.152889f, 16.983280f, 0.015198f }, 0.991760f,
-                            0.000048f );
-    instance->registerEObj( "sgbg_f1d4_d1_gago1", 2002917, 4505698, 4, { -36.195190f, 16.983280f, -5.685384f },
-                            0.991760f, 0.000048f );
-    // States -> bg_gago1_on bg_gago1_oｆｆ bg_gago1_out
-    instance->registerEObj( "Crystalball", 2002916, 4488372, 4, { 28.044069f, 16.983280f, 0.168350f }, 0.991760f,
-                            0.811345f );
-    instance->registerEObj( "sgbg_f1d4_d1_gago1_1", 2003319, 4544200, 4, { -36.143250f, 17.000000f, 7.445584f },
-                            1.000000f, 0.000000f );
-    // States -> bg_gago1_on bg_gago1_oｆｆ bg_gago1_out
-    instance->registerEObj( "Lockeddoor", 2003315, 4484546, 4, { 15.988830f, 17.000000f, -82.166763f }, 1.000000f,
-                            0.000000f );
-    instance->registerEObj( "Tinykey", 2003312, 0, 4, { 23.053480f, 17.000000f, -63.610909f }, 1.000000f, 0.000000f );
-    instance->registerEObj( "Lockeddoor_1", 2003316, 4484554, 4, { 0.701762f, 17.000000f, -96.124260f }, 1.000000f,
-                            0.000000f );
-    instance->registerEObj( "Lockeddoor_2", 2003317, 4484573, 4, { -15.941600f, 17.000000f, -86.214546f }, 1.000000f,
-                            0.000000f );
-    instance->registerEObj( "Tinykey_1", 2003314, 0, 4, { 11.497100f, 17.000000f, -97.655212f }, 1.000000f, 0.000000f );
-    instance->registerEObj( "Tinykey_2", 2003430, 0, 4, { -10.688510f, 17.000000f, -98.849060f }, 1.000000f,
-                            0.000000f );
-    instance->registerEObj( "unknown_5", 2002938, 4484560, 4, { 16.478939f, 0.000000f, -83.923622f }, 1.000000f,
-                            0.000000f );
-    instance->registerEObj( "Crystalball_1", 2002941, 4488371, 4, { -43.455170f, -0.000000f, 13.580270f }, 1.000000f,
-                            -1.392958f );
-    instance->registerEObj( "RoseDoor", 2002943, 0, 4, { 27.084721f, -0.015320f, 0.045776f }, 0.991760f, 0.000048f );
-    instance->registerEObj( "Redkey", 2002942, 0, 4, { 58.672710f, 0.000000f, -30.483391f }, 1.000000f, -0.000345f );
-    instance->registerEObj( "unknown_6", 2002937, 4484569, 4, { -16.476231f, 0.000000f, -69.988670f }, 1.000000f,
-                            0.000000f );
-    instance->registerEObj( "unknown_7", 2002944, 4499358, 4, { -16.603889f, 0.000000f, -68.606903f }, 1.000000f,
-                            0.000000f );
-    instance->registerEObj( "unknown_8", 2002945, 4499362, 4, { 16.527910f, 0.000000f, -85.147072f }, 1.000000f,
-                            0.000000f );
-    instance->registerEObj( "Voidlamp", 2002939, 4488368, 4, { -29.871300f, -0.015320f, -70.456650f }, 0.991760f,
-                            1.074421f );
-    // States -> vf_slamp_on0 vf_slamp_of vf_slamp_hide vf_slamp_on1
-    instance->registerEObj( "Voidlamp_1", 2002940, 4488367, 4, { -17.039709f, 0.000000f, -84.537079f }, 1.000000f,
-                            -1.569551f );
-    // States -> vf_slamp_on0 vf_slamp_of vf_slamp_hide vf_slamp_on1
-    instance->registerEObj( "Sealedbarrier", 2003321, 4545173, 4, { 29.337740f, 0.000000f, -1.101776f }, 1.000000f,
-                            0.000000f );
-    // States -> bg_barrier1_on bg_barrier1_off bg_barrier1_out
-    instance->registerEObj( "Lockeddoor_3", 2003320, 4484571, 4, { 46.738281f, -0.015320f, -35.965580f }, 0.991760f,
-                            0.000048f );
-    instance->registerEObj( "Tinykey_3", 2003313, 0, 4, { 43.982948f, 0.000000f, -34.342270f }, 1.000000f, 0.000000f );
-    instance->registerEObj( "sgbg_f1d4_v1_lmp1", 2003463, 4588435, 4, { -5.889304f, 0.000000f, -71.199730f }, 1.000000f,
-                            0.000000f );
-    // States -> vf_slamp_on0 vf_slamp_of vf_slamp_hide vf_slamp_on1
-    instance->registerEObj( "sgbg_f1d4_v1_lmp1_1", 2003464, 4588440, 4, { 6.823740f, 0.000000f, -82.895660f },
-                            1.000000f, 0.000000f );
-    // States -> vf_slamp_on0 vf_slamp_of vf_slamp_hide vf_slamp_on1
-    instance->registerEObj( "sgbg_f1d4_v1_lmp1_2", 2003465, 4588441, 4, { 16.834749f, 0.000000f, -70.555031f },
-                            1.000000f, 0.000000f );
-    // States -> vf_slamp_on0 vf_slamp_of vf_slamp_hide vf_slamp_on1
-    instance->registerEObj( "sgbg_f1d4_v1_lmp1_3", 2003466, 4588442, 4, { 27.007900f, 0.000000f, -82.771332f },
-                            1.000000f, 0.000000f );
-    // States -> vf_slamp_on0 vf_slamp_of vf_slamp_hide vf_slamp_on1
-    instance->registerEObj( "sgbg_f1d4_v1_lmp1_4", 2003467, 4588444, 4, { 34.488140f, -0.000000f, -61.907959f },
-                            1.000000f, 0.010569f );
-    // States -> vf_slamp_on0 vf_slamp_of vf_slamp_hide vf_slamp_on1
-    instance->registerEObj( "sgbg_f1d4_v1_lmp1_5", 2003468, 4588448, 4, { 48.546879f, 0.000000f, -53.979691f },
-                            1.000000f, 0.009430f );
-    // States -> vf_slamp_on0 vf_slamp_of vf_slamp_hide vf_slamp_on1
-    instance->registerEObj( "sgbg_f1d4_v1_lmp1_6", 2003469, 4588445, 4, { 24.192520f, 0.000000f, -55.798260f },
-                            1.000000f, 0.000000f );
-    // States -> vf_slamp_on0 vf_slamp_of vf_slamp_hide vf_slamp_on1
-    instance->registerEObj( "unknown_9", 2002951, 4486667, 4, { -25.301229f, -18.799990f, -33.673420f }, 1.000000f,
-                            0.000000f );
-    instance->registerEObj( "unknown_10", 2002952, 4486668, 4, { 1.978515f, -18.799990f, -34.167542f }, 1.000000f,
-                            0.000000f );
-    instance->registerEObj( "unknown_11", 2002953, 0, 4, { 25.467291f, -18.814390f, 33.859741f }, 0.991760f,
-                            0.000048f );
-    instance->registerEObj( "unknown_12", 2002954, 4486671, 4, { -2.139196f, -18.799990f, 34.235821f }, 1.000000f,
-                            0.000000f );
-    instance->registerEObj( "Sealedbarrier_1", 2002955, 4508183, 4, { -25.881571f, -18.799999f, 0.041033f }, 1.000000f,
-                            0.000000f );
-    // States -> bg_barrier1_on bg_barrier1_off bg_barrier1_out
-    instance->registerEObj( "unknown_13", 2003322, 4486669, 4, { 28.549561f, -18.799999f, -33.402039f }, 0.991760f,
-                            0.000048f );
-    instance->registerEObj( "Entrance", 2000182, 4488394, 5, { 73.319580f, -0.015320f, -0.015320f }, 0.991760f,
-                            0.000048f );
-    // States -> vf_lock_on vf_lock_of
-    instance->registerEObj( "Exit", 2000139, 0, 4, { 17.397711f, -18.804060f, 0.066881f }, 0.900200f, 0.000335f );
-    instance->registerEObj( "Shortcut", 2000700, 0, 4, { 72.756577f, 0.000000f, 5.215310f }, 1.000000f, 0.000000f );
-    instance->registerEObj( "unknown_14", 2002913, 0, 4, { 81.361702f, 0.249998f, -0.409441f }, 1.000000f, 0.000000f );
+    instance.registerEObj( "unknown_0", 2002735, 0, 4, { -26.487801f, 17.000000f, -0.008300f }, 1.000000f, -1.570451f ); 
+    instance.registerEObj( "sgpl_w_lvd_b0118_f1d2", 2002872, 4497628, 4, { 0.000000f, 0.000000f, 0.000000f }, 1.000000f, 0.000000f ); 
+      // States -> vf_bextwall_on (id: 3) vf_bextwall_of (id: 4) 
+    instance.registerEObj( "sgbg_f1d4_c1_ori01", 2002873, 4498555, 4, { -1.869557f, 17.000000f, 15.055300f }, 1.000000f, 0.000000f ); 
+      // States -> vf_fire_on0 (id: 9) vf_fire_on (id: 10) vf_fire_oｆ0 (id: 11) vf_fire_oｆ (id: 12) 
+    instance.registerEObj( "sgbg_f1d4_c1_ori01_1", 2002874, 4498556, 4, { -5.211004f, 17.000000f, -10.575720f }, 1.000000f, 0.000000f ); 
+      // States -> vf_fire_on0 (id: 9) vf_fire_on (id: 10) vf_fire_oｆ0 (id: 11) vf_fire_oｆ (id: 12) 
+    instance.registerEObj( "unknown_1", 2003318, 4484553, 4, { 23.178410f, 16.983280f, 0.137329f }, 0.991760f, 0.000048f ); 
+    instance.registerEObj( "unknown_2", 2002735, 0, 4, { 25.786711f, 0.000000f, 0.119909f }, 1.000000f, -1.570451f ); 
+    instance.registerEObj( "sgvf_w_lvd_b0118", 2002872, 4505837, 4, { 23.084200f, 0.000000f, -1.591900f }, 1.000000f, -1.570796f ); 
+      // States -> vf_bextwall_on (id: 3) vf_bextwall_of (id: 4) 
+    instance.registerEObj( "sgvf_w_lvd_b0118_1", 2003126, 4521780, 4, { -20.141510f, -0.000000f, -0.141697f }, 1.000000f, 0.000000f ); 
+      // States -> vf_bextwall_on (id: 3) vf_bextwall_of (id: 4) 
+    instance.registerEObj( "unknown_3", 2002735, 0, 4, { -24.169260f, -18.905939f, -0.137390f }, 0.991760f, -1.551983f ); 
+    instance.registerEObj( "sgvf_w_lvd_b0118_2", 2002872, 4509134, 4, { -22.072941f, -18.814390f, -0.320496f }, 0.991760f, 0.000048f ); 
+      // States -> vf_bextwall_on (id: 3) vf_bextwall_of (id: 4) 
+    instance.registerEObj( "unknown_4", 2002997, 0, 4, { -20.433430f, -18.936470f, 0.755735f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "LilyDoor", 2002915, 4484551, 4, { -28.152889f, 16.983280f, 0.015198f }, 0.991760f, 0.000048f ); 
+    instance.registerEObj( "sgbg_f1d4_d1_gago1", 2002917, 4505698, 4, { -36.195190f, 16.983280f, -5.685384f }, 0.991760f, 0.000048f ); 
+      // States -> bg_gago1_on (id: 2) bg_gago1_oｆｆ (id: 3) bg_gago1_out (id: 4) 
+    instance.registerEObj( "Crystalball", 2002916, 4488372, 4, { 28.044069f, 16.983280f, 0.168350f }, 0.991760f, 0.811345f ); 
+    instance.registerEObj( "sgbg_f1d4_d1_gago1_1", 2003319, 4544200, 4, { -36.143250f, 17.000000f, 7.445584f }, 1.000000f, 0.000000f ); 
+      // States -> bg_gago1_on (id: 2) bg_gago1_oｆｆ (id: 3) bg_gago1_out (id: 4) 
+    instance.registerEObj( "Lockeddoor", 2003315, 4484546, 4, { 15.988830f, 17.000000f, -82.166763f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "Tinykey", 2003312, 0, 4, { 23.053480f, 17.000000f, -63.610909f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "Lockeddoor_1", 2003316, 4484554, 4, { 0.701762f, 17.000000f, -96.124260f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "Lockeddoor_2", 2003317, 4484573, 4, { -15.941600f, 17.000000f, -86.214546f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "Tinykey_1", 2003314, 0, 4, { 11.497100f, 17.000000f, -97.655212f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "Tinykey_2", 2003430, 0, 4, { -10.688510f, 17.000000f, -98.849060f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_5", 2002938, 4484560, 4, { 16.478939f, 0.000000f, -83.923622f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "Crystalball_1", 2002941, 4488371, 4, { -43.455170f, -0.000000f, 13.580270f }, 1.000000f, -1.392958f ); 
+    instance.registerEObj( "RoseDoor", 2002943, 0, 4, { 27.084721f, -0.015320f, 0.045776f }, 0.991760f, 0.000048f ); 
+    instance.registerEObj( "Redkey", 2002942, 0, 4, { 58.672710f, 0.000000f, -30.483391f }, 1.000000f, -0.000345f ); 
+    instance.registerEObj( "unknown_6", 2002937, 4484569, 4, { -16.476231f, 0.000000f, -69.988670f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_7", 2002944, 4499358, 4, { -16.603889f, 0.000000f, -68.606903f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_8", 2002945, 4499362, 4, { 16.527910f, 0.000000f, -85.147072f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "Voidlamp", 2002939, 4488368, 4, { -29.871300f, -0.015320f, -70.456650f }, 0.991760f, 1.074421f ); 
+      // States -> vf_slamp_on0 (id: 6) vf_slamp_of (id: 12) vf_slamp_hide (id: 22) vf_slamp_on1 (id: 23) 
+    instance.registerEObj( "Voidlamp_1", 2002940, 4488367, 4, { -17.039709f, 0.000000f, -84.537079f }, 1.000000f, -1.569551f ); 
+      // States -> vf_slamp_on0 (id: 6) vf_slamp_of (id: 12) vf_slamp_hide (id: 22) vf_slamp_on1 (id: 23) 
+    instance.registerEObj( "Sealedbarrier", 2003321, 4545173, 4, { 29.337740f, 0.000000f, -1.101776f }, 1.000000f, 0.000000f ); 
+      // States -> bg_barrier1_on (id: 3) bg_barrier1_off (id: 4) bg_barrier1_out (id: 5) 
+    instance.registerEObj( "Lockeddoor_3", 2003320, 4484571, 4, { 46.738281f, -0.015320f, -35.965580f }, 0.991760f, 0.000048f ); 
+    instance.registerEObj( "Tinykey_3", 2003313, 0, 4, { 43.982948f, 0.000000f, -34.342270f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "sgbg_f1d4_v1_lmp1", 2003463, 4588435, 4, { -5.889304f, 0.000000f, -71.199730f }, 1.000000f, 0.000000f ); 
+      // States -> vf_slamp_on0 (id: 6) vf_slamp_of (id: 12) vf_slamp_hide (id: 22) vf_slamp_on1 (id: 23) 
+    instance.registerEObj( "sgbg_f1d4_v1_lmp1_1", 2003464, 4588440, 4, { 6.823740f, 0.000000f, -82.895660f }, 1.000000f, 0.000000f ); 
+      // States -> vf_slamp_on0 (id: 6) vf_slamp_of (id: 12) vf_slamp_hide (id: 22) vf_slamp_on1 (id: 23) 
+    instance.registerEObj( "sgbg_f1d4_v1_lmp1_2", 2003465, 4588441, 4, { 16.834749f, 0.000000f, -70.555031f }, 1.000000f, 0.000000f ); 
+      // States -> vf_slamp_on0 (id: 6) vf_slamp_of (id: 12) vf_slamp_hide (id: 22) vf_slamp_on1 (id: 23) 
+    instance.registerEObj( "sgbg_f1d4_v1_lmp1_3", 2003466, 4588442, 4, { 27.007900f, 0.000000f, -82.771332f }, 1.000000f, 0.000000f ); 
+      // States -> vf_slamp_on0 (id: 6) vf_slamp_of (id: 12) vf_slamp_hide (id: 22) vf_slamp_on1 (id: 23) 
+    instance.registerEObj( "sgbg_f1d4_v1_lmp1_4", 2003467, 4588444, 4, { 34.488140f, -0.000000f, -61.907959f }, 1.000000f, 0.010569f ); 
+      // States -> vf_slamp_on0 (id: 6) vf_slamp_of (id: 12) vf_slamp_hide (id: 22) vf_slamp_on1 (id: 23) 
+    instance.registerEObj( "sgbg_f1d4_v1_lmp1_5", 2003468, 4588448, 4, { 48.546879f, 0.000000f, -53.979691f }, 1.000000f, 0.009430f ); 
+      // States -> vf_slamp_on0 (id: 6) vf_slamp_of (id: 12) vf_slamp_hide (id: 22) vf_slamp_on1 (id: 23) 
+    instance.registerEObj( "sgbg_f1d4_v1_lmp1_6", 2003469, 4588445, 4, { 24.192520f, 0.000000f, -55.798260f }, 1.000000f, 0.000000f ); 
+      // States -> vf_slamp_on0 (id: 6) vf_slamp_of (id: 12) vf_slamp_hide (id: 22) vf_slamp_on1 (id: 23) 
+    instance.registerEObj( "unknown_9", 2002951, 4486667, 4, { -25.301229f, -18.799990f, -33.673420f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_10", 2002952, 4486668, 4, { 1.978515f, -18.799990f, -34.167542f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_11", 2002953, 0, 4, { 25.467291f, -18.814390f, 33.859741f }, 0.991760f, 0.000048f ); 
+    instance.registerEObj( "unknown_12", 2002954, 4486671, 4, { -2.139196f, -18.799990f, 34.235821f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "Sealedbarrier_1", 2002955, 4508183, 4, { -25.881571f, -18.799999f, 0.041033f }, 1.000000f, 0.000000f ); 
+      // States -> bg_barrier1_on (id: 3) bg_barrier1_off (id: 4) bg_barrier1_out (id: 5) 
+    instance.registerEObj( "unknown_13", 2003322, 4486669, 4, { 28.549561f, -18.799999f, -33.402039f }, 0.991760f, 0.000048f ); 
+    instance.registerEObj( "Entrance", 2000182, 4488394, 5, { 73.319580f, -0.015320f, -0.015320f }, 0.991760f, 0.000048f ); 
+      // States -> vf_lock_on (id: 11) vf_lock_of (id: 12) 
+    instance.registerEObj( "Exit", 2000139, 0, 4, { 17.397711f, -18.804060f, 0.066881f }, 0.900200f, 0.000335f ); 
+    instance.registerEObj( "Shortcut", 2000700, 0, 4, { 72.756577f, 0.000000f, 5.215310f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_14", 2002913, 0, 4, { 81.361702f, 0.249998f, -0.409441f }, 1.000000f, 0.000000f ); 
 
   }
 
-  void onUpdate( InstanceContentPtr instance, uint32_t currTime ) override
+  void onUpdate( InstanceContent& instance, uint32_t currTime ) override
   {
 
   }
 
-  void onEnterTerritory( InstanceContentPtr instance, Entity::Player& player, uint32_t eventId, uint16_t param1,
+  void onEnterTerritory( InstanceContent& instance, Entity::Player& player, uint32_t eventId, uint16_t param1,
                          uint16_t param2 ) override
   {
 
diff --git a/src/scripts/instances/dungeons/HellsLid.cpp b/src/scripts/instances/dungeons/HellsLid.cpp
index 00afb776..a58285e8 100644
--- a/src/scripts/instances/dungeons/HellsLid.cpp
+++ b/src/scripts/instances/dungeons/HellsLid.cpp
@@ -9,20 +9,68 @@ class HellsLid :
 public:
   HellsLid() :
     Sapphire::ScriptAPI::InstanceContentScript( 59 )
+  { }
+
+  void onInit( InstanceContent& instance ) override
   {
+    instance.registerEObj( "unknown_0", 2007457, 7170401, 4, { -71.824219f, 36.942020f, 308.278015f }, 0.991760f, 0.000048f ); 
+    instance.registerEObj( "unknown_1", 2007457, 7170402, 4, { -74.204651f, 2.975464f, 288.624390f }, 0.991760f, 0.000048f ); 
+    instance.registerEObj( "unknown_2", 2007457, 7170403, 4, { -74.725868f, 2.999996f, 204.499496f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "sgvf_e3d5_b1364", 2007457, 7253595, 4, { -82.098160f, 3.000000f, 259.118103f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "sgvf_e3d5_b1364_1", 2007457, 7253596, 4, { -82.556618f, 3.000000f, 259.252808f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "sgvf_e3d5_b1364_2", 2007457, 7253597, 4, { -82.556618f, 3.000000f, 259.252808f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "sgvf_e3d5_b1364_3", 2007457, 7253612, 4, { -63.482540f, 2.975464f, 256.192291f }, 0.991760f, 0.000048f ); 
+    instance.registerEObj( "sgvf_e3d5_b1364_4", 2007457, 7253613, 4, { -63.482540f, 2.975464f, 256.192291f }, 0.991760f, 0.000048f ); 
+    instance.registerEObj( "sgvf_e3d5_b1364_5", 2007457, 7253614, 4, { -63.482540f, 2.975464f, 256.192291f }, 0.991760f, 0.000048f ); 
+    instance.registerEObj( "sgvf_e3d5_b1364_6", 2007457, 7253621, 4, { -83.775871f, 3.000000f, 228.598297f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "sgvf_e3d5_b1364_7", 2007457, 7253622, 4, { -83.775871f, 3.000000f, 228.598297f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "sgvf_e3d5_b1364_8", 2007457, 7253623, 4, { -83.775871f, 3.000000f, 228.598297f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "sgvf_e3d5_b1364_9", 2007457, 7253630, 4, { -63.137959f, 2.999996f, 217.910294f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "sgvf_e3d5_b1364_10", 2007457, 7253631, 4, { -63.137959f, 2.999996f, 217.910294f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "sgvf_e3d5_b1364_11", 2007457, 7253632, 4, { -63.137959f, 2.999996f, 217.910294f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_3", 2002735, 0, 4, { -70.236214f, -2.994005f, 150.513504f }, 0.991760f, 0.000048f ); 
+    instance.registerEObj( "sgvf_w_lvd_b0118", 2007457, 7173420, 4, { -67.025093f, -3.000000f, 145.419205f }, 1.000000f, 0.000000f ); 
+      // States -> vf_bextwall_on (id: 3) vf_bextwall_of (id: 4) 
+    instance.registerEObj( "sgvf_w_lvd_b0118_1", 2007457, 7173423, 4, { -67.025078f, -2.956286f, 106.833702f }, 1.000000f, 0.000000f ); 
+      // States -> vf_bextwall_on (id: 3) vf_bextwall_of (id: 4) 
+    instance.registerEObj( "sgbg_e3d5_a1_gmc05", 2007457, 7229619, 4, { -78.515167f, -3.000000f, 126.046402f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "sgbg_e3d5_a1_gmc05_1", 2007457, 7229620, 4, { -65.781677f, -3.006042f, 126.756599f }, 0.991760f, 0.000048f ); 
+    instance.registerEObj( "sgbg_e3d5_a1_gmc06", 2007457, 7229622, 4, { -78.080513f, -3.006042f, 134.996597f }, 0.991760f, 0.000048f ); 
+    instance.registerEObj( "sgbg_e3d5_a1_gmc06_1", 2007457, 7229623, 4, { -63.370731f, -3.006042f, 134.752396f }, 0.991760f, 0.000048f ); 
+    instance.registerEObj( "sgvf_e3d5_b1365", 2007457, 7242616, 4, { -45.700809f, -8.255188f, 23.636169f }, 0.991760f, 0.000048f ); 
+    instance.registerEObj( "sgvf_e3d5_b1365_1", 2007457, 7245584, 4, { 26.736940f, -16.665211f, 27.040310f }, 0.991760f, 0.000048f ); 
+    instance.registerEObj( "unknown_4", 2007457, 7167237, 4, { 55.466431f, -16.525570f, 30.044920f }, 0.991760f, 0.000048f ); 
+    instance.registerEObj( "unknown_5", 2007457, 7167239, 4, { 57.053471f, -25.528379f, -52.079102f }, 0.991760f, 0.000048f ); 
+    instance.registerEObj( "unknown_6", 2002735, 0, 4, { 59.280998f, -26.000000f, -100.623596f }, 1.250000f, 0.000048f ); 
+    instance.registerEObj( "sgvf_w_lvd_b0118_2", 2007457, 7173646, 4, { 63.367290f, -26.500000f, -104.259499f }, 1.000000f, 0.000000f ); 
+      // States -> vf_bextwall_on (id: 3) vf_bextwall_of (id: 4) 
+    instance.registerEObj( "sgvf_w_lvd_b0118_3", 2007457, 7173648, 4, { 61.874378f, -26.500059f, -136.133804f }, 1.000000f, 0.000000f ); 
+      // States -> vf_bextwall_on (id: 3) vf_bextwall_of (id: 4) 
+    instance.registerEObj( "unknown_7", 2007457, 7167248, 4, { 60.837650f, -96.757507f, -322.591003f }, 0.991760f, 0.000048f ); 
+    instance.registerEObj( "unknown_8", 2007457, 7167249, 4, { 61.997311f, -93.000023f, -421.408386f }, 0.991760f, 0.000048f ); 
+    instance.registerEObj( "unknown_9", 2002735, 0, 4, { 62.119381f, -88.000000f, -455.242706f }, 0.991760f, 0.000048f ); 
+    instance.registerEObj( "sgvf_w_lvd_b0118_4", 2007457, 7174030, 4, { 62.878109f, -88.000000f, -458.344788f }, 1.000000f, 0.000000f ); 
+      // States -> vf_bextwall_on (id: 3) vf_bextwall_of (id: 4) 
+    instance.registerEObj( "unknown_10", 2007457, 7207905, 4, { 57.755989f, -88.029297f, -476.778687f }, 0.991760f, 0.000048f ); 
+    instance.registerEObj( "unknown_11", 2009378, 0, 4, { 62.000000f, -90.000000f, -475.000000f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_12", 2009379, 0, 4, { 61.997311f, -90.013000f, -475.028595f }, 0.991760f, 0.000048f ); 
+    instance.registerEObj( "unknown_13", 2009380, 0, 4, { 61.997311f, -90.013000f, -475.028595f }, 0.991760f, 0.000048f ); 
+    instance.registerEObj( "unknown_14", 2009381, 0, 4, { 62.000000f, -90.000000f, -475.000000f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_15", 2009382, 0, 4, { 61.997311f, -90.013000f, -475.028595f }, 0.991760f, 0.000048f ); 
+    instance.registerEObj( "unknown_16", 2009383, 0, 4, { 62.000000f, -90.000000f, -475.000000f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "Entrance", 2000182, 7167443, 5, { -121.331703f, 65.000000f, 474.948303f }, 1.000000f, 0.000000f ); 
+      // States -> vf_lock_on (id: 11) vf_lock_of (id: 12) 
+    instance.registerEObj( "Exit", 2000139, 0, 4, { 62.058472f, -88.000000f, -489.921387f }, 0.991760f, 0.000048f ); 
+    instance.registerEObj( "Shortcut", 2000700, 0, 4, { -113.603500f, 65.000000f, 469.016510f }, 0.991760f, 0.000048f ); 
+
   }
 
-  void onInit( InstanceContentPtr instance ) override
+  void onUpdate( InstanceContent& instance, uint32_t currTime ) override
   {
 
   }
 
-  void onUpdate( InstanceContentPtr instance, uint32_t currTime ) override
-  {
-
-  }
-
-  void onEnterTerritory( InstanceContentPtr instance, Entity::Player& player, uint32_t eventId, uint16_t param1,
+  void onEnterTerritory( InstanceContent& instance, Entity::Player& player, uint32_t eventId, uint16_t param1,
                          uint16_t param2 ) override
   {
 
diff --git a/src/scripts/instances/dungeons/HullbreakerIsle.cpp b/src/scripts/instances/dungeons/HullbreakerIsle.cpp
index 1435466d..acd69221 100644
--- a/src/scripts/instances/dungeons/HullbreakerIsle.cpp
+++ b/src/scripts/instances/dungeons/HullbreakerIsle.cpp
@@ -9,133 +9,87 @@ class HullbreakerIsle :
 public:
   HullbreakerIsle() :
     Sapphire::ScriptAPI::InstanceContentScript( 23 )
-  {
-  }
+  { }
 
-  void onInit( InstanceContentPtr instance ) override
+  void onInit( InstanceContent& instance ) override
   {
-    instance->registerEObj( "sgvf_w_btl_b0485", 2004341, 4797423, 4, { -368.761902f, 1.900000f, 20.220869f }, 1.000000f,
-                            -0.000000f );
-    // States -> omen fukidasi end_0f end_anm omen1
-    instance->registerEObj( "sgvf_w_btl_b0485_1", 2004342, 4797424, 4, { -367.525085f, 1.900000f, 26.995680f },
-                            1.000000f, -0.000000f );
-    // States -> omen fukidasi end_0f end_anm omen1
-    instance->registerEObj( "sgvf_w_btl_b0485_2", 2004343, 4797425, 4, { -371.746185f, 1.900000f, 32.584270f },
-                            1.000000f, -0.000000f );
-    // States -> omen fukidasi end_0f end_anm omen1
-    instance->registerEObj( "sgvf_w_btl_b0485_3", 2004338, 4797426, 4, { -362.507385f, 1.900000f, 48.482269f },
-                            1.000000f, -0.000000f );
-    // States -> omen fukidasi end_0f end_anm omen1
-    instance->registerEObj( "sgvf_w_btl_b0485_4", 2004339, 4797427, 4, { -355.184601f, 1.899924f, 47.853260f },
-                            1.000000f, -0.000000f );
-    // States -> omen fukidasi end_0f end_anm omen1
-    instance->registerEObj( "sgvf_w_btl_b0485_5", 2004340, 4797428, 4, { -349.628601f, 1.899914f, 52.138340f },
-                            1.000000f, -0.000000f );
-    // States -> omen fukidasi end_0f end_anm omen1
-    instance->registerEObj( "sgvf_w_btl_b0485_6", 2004335, 4797429, 4, { -334.406708f, 1.899990f, 43.799950f },
-                            1.000000f, -0.000000f );
-    // States -> omen fukidasi end_0f end_anm omen1
-    instance->registerEObj( "sgvf_w_btl_b0485_7", 2004336, 4797430, 4, { -336.870087f, 1.900000f, 37.104382f },
-                            1.000000f, -0.000000f );
-    // States -> omen fukidasi end_0f end_anm omen1
-    instance->registerEObj( "sgvf_w_btl_b0485_8", 2004337, 4797431, 4, { -332.837006f, 1.900000f, 30.666309f },
-                            1.000000f, -0.000000f );
-    // States -> omen fukidasi end_0f end_anm omen1
-    instance->registerEObj( "sgvf_w_btl_b0485_9", 2004344, 4797421, 4, { -341.024414f, 1.880961f, 15.649740f },
-                            1.000000f, -0.000000f );
-    // States -> omen fukidasi end_0f end_anm omen1
-    instance->registerEObj( "sgvf_w_btl_b0485_10", 2004345, 4797419, 4, { -348.232788f, 1.900000f, 15.852800f },
-                            1.000000f, -0.000000f );
-    // States -> omen fukidasi end_0f end_anm omen1
-    instance->registerEObj( "sgvf_w_btl_b0485_11", 2004346, 4797422, 4, { -353.540588f, 1.899946f, 11.553900f },
-                            1.000000f, -0.000000f );
-    // States -> omen fukidasi end_0f end_anm omen1
-    instance->registerEObj( "Entrance", 2000182, 4685106, 5, { 320.642792f, 3.735552f, 302.314301f }, 0.991760f,
-                            0.000048f );
-    // States -> vf_lock_on vf_lock_of
-    instance->registerEObj( "unknown_0", 2002735, 0, 4, { 220.874298f, 64.988159f, 13.046390f }, 0.991760f, 0.000048f );
-    instance->registerEObj( "sgvf_w_lvd_b0118", 2002872, 4685143, 4, { 220.800797f, 64.801514f, 13.539410f }, 1.000000f,
-                            0.000000f );
-    // States -> vf_bextwall_on vf_bextwall_of
-    instance->registerEObj( "sgvf_w_lvd_b0250", 2004050, 4685147, 4, { 219.745102f, 64.682983f, -33.707211f },
-                            0.991760f, 0.000048f );
-    // States -> vf_bextwall_on vf_bextwall_of
-    instance->registerEObj( "sgpl_w_transparent05", 2004049, 4685157, 4, { 219.958694f, 65.018677f, 47.991199f },
-                            0.991760f, 0.000048f );
-    instance->registerEObj( "unknown_1", 2002735, 0, 4, { -60.079769f, 44.339741f, -124.669800f }, 1.000000f,
-                            -1.570451f );
-    instance->registerEObj( "sgvf_w_lvd_b0118_1", 2002872, 4685162, 4, { -61.990799f, 44.123230f, -125.263000f },
-                            1.000000f, -1.570451f );
-    // States -> vf_bextwall_on vf_bextwall_of
-    instance->registerEObj( "sgvf_w_lvd_b0118_2", 2004051, 4685163, 4, { -98.791832f, 44.299992f, -124.783699f },
-                            1.000000f, 0.000000f );
-    // States -> vf_bextwall_on vf_bextwall_of
-    instance->registerEObj( "unknown_2", 2002735, 0, 4, { -315.480286f, 1.957748f, 33.432499f }, 0.991760f,
-                            -1.184874f );
-    instance->registerEObj( "sgvf_w_lvd_b0118_3", 2002872, 4685167, 4, { -314.885803f, 1.999334f, 32.833080f },
-                            1.000000f, 0.000000f );
-    // States -> vf_bextwall_on vf_bextwall_of
-    instance->registerEObj( "Shortcut", 2000700, 0, 4, { 325.360901f, 6.499028f, 292.726807f }, 0.991760f, 0.000048f );
-    instance->registerEObj( "unknown_3", 2004052, 4584550, 4, { 165.269104f, 52.440060f, -190.280197f }, 1.000000f,
-                            0.000000f );
-    instance->registerEObj( "Stonepedestal", 2004057, 4588393, 4, { 163.784195f, 52.706680f, -185.027100f }, 1.000000f,
-                            0.000000f );
-    instance->registerEObj( "unknown_4", 2004053, 4584553, 4, { -35.849411f, 44.986191f, -124.177696f }, 1.000000f,
-                            0.000000f );
-    instance->registerEObj( "Stonepedestal_1", 2004058, 4588617, 4, { -32.145729f, 44.996059f, -118.336502f },
-                            1.000000f, 0.000000f );
-    instance->registerEObj( "Stonepedestal_2", 2004059, 4588610, 4, { -32.404221f, 44.937031f, -128.964096f },
-                            1.000000f, 0.000000f );
-    instance->registerEObj( "Exit", 2000139, 0, 4, { -326.989685f, 2.000000f, 43.114891f }, 1.000000f, 0.000000f );
-    instance->registerEObj( "Treasurecoffer", 2004074, 0, 4, { 191.947693f, 59.006939f, -163.899307f }, 1.000000f,
-                            0.000000f );
-    instance->registerEObj( "Treasurecoffer_1", 2004075, 0, 4, { 194.472900f, 59.156731f, -165.022003f }, 1.000000f,
-                            0.000000f );
-    instance->registerEObj( "Treasurecoffer_2", 2004076, 0, 4, { 196.017197f, 59.853050f, -161.548294f }, 1.000000f,
-                            0.000000f );
-    instance->registerEObj( "Treasurecoffer_3", 2004077, 0, 4, { 198.798004f, 60.096630f, -162.115204f }, 1.000000f,
-                            0.000000f );
-    instance->registerEObj( "Treasurecoffer_4", 2004078, 0, 4, { 199.929993f, 60.852970f, -158.189896f }, 1.000000f,
-                            0.000000f );
-    instance->registerEObj( "Treasurecoffer_5", 2004079, 0, 4, { 203.014206f, 61.084290f, -158.453995f }, 1.000000f,
-                            0.000000f );
-    instance->registerEObj( "Wildbananatree", 2004062, 4706914, 4, { 206.036896f, 65.302567f, -27.040119f }, 0.991760f,
-                            0.000048f );
-    instance->registerEObj( "Wildbananatree_1", 2004063, 4722842, 4, { 199.376907f, 64.682983f, -11.735090f },
-                            0.991760f, 0.000048f );
-    instance->registerEObj( "Wildbananatree_2", 2004064, 4706915, 4, { 205.968002f, 64.690811f, 3.866779f }, 0.991760f,
-                            0.000048f );
-    instance->registerEObj( "Wildbananatree_3", 2004065, 4706916, 4, { 236.652100f, 64.927116f, -28.061340f },
-                            0.991760f, 0.000048f );
-    instance->registerEObj( "unknown_5", 2004066, 0, 4, { 206.655502f, 65.036621f, -25.903111f }, 0.991760f,
-                            -1.260904f );
-    instance->registerEObj( "unknown_6", 2004067, 0, 4, { 200.604294f, 64.690804f, -10.987260f }, 0.991760f,
-                            -0.736456f );
-    instance->registerEObj( "unknown_7", 2004068, 0, 4, { 206.716095f, 64.690811f, 3.346290f }, 0.991760f, -0.921409f );
-    instance->registerEObj( "unknown_8", 2004069, 0, 4, { 235.736603f, 64.682983f, -27.115360f }, 0.991760f,
-                            0.613842f );
-    instance->registerEObj( "unknown_9", 2004060, 4585424, 4, { -218.153107f, -0.000002f, -6.398464f }, 1.000000f,
-                            0.000000f );
-    instance->registerEObj( "unknown_10", 2004061, 4585624, 4, { -307.270905f, 4.409851f, 14.023010f }, 0.991760f,
-                            0.000048f );
-    instance->registerEObj( "Wildbananatree_4", 2004070, 4722840, 4, { 241.380005f, 64.956383f, -12.841170f },
-                            1.000000f, 0.000000f );
-    instance->registerEObj( "Wildbananatree_5", 2004071, 4706917, 4, { 234.644501f, 64.824364f, 2.652663f }, 1.000000f,
-                            0.000000f );
-    instance->registerEObj( "unknown_11", 2004072, 0, 4, { 239.884903f, 64.690811f, -12.610960f }, 1.000000f,
-                            0.600320f );
-    instance->registerEObj( "unknown_12", 2004073, 0, 4, { 233.623596f, 64.760551f, 2.089992f }, 1.000000f, 0.684586f );
-    instance->registerEObj( "unknown_13", 2004129, 0, 4, { -80.000000f, 44.200001f, -124.500000f }, 1.000000f,
-                            0.000000f );
+    instance.registerEObj( "sgvf_w_btl_b0485", 2004341, 4797423, 4, { -368.761902f, 1.900000f, 20.220869f }, 1.000000f, -0.000000f ); 
+      // States -> omen (id: 3) fukidasi (id: 4) end_0f (id: 5) end_anm (id: 6) omen1 (id: 8) 
+    instance.registerEObj( "sgvf_w_btl_b0485_1", 2004342, 4797424, 4, { -367.525085f, 1.900000f, 26.995680f }, 1.000000f, -0.000000f ); 
+      // States -> omen (id: 3) fukidasi (id: 4) end_0f (id: 5) end_anm (id: 6) omen1 (id: 8) 
+    instance.registerEObj( "sgvf_w_btl_b0485_2", 2004343, 4797425, 4, { -371.746185f, 1.900000f, 32.584270f }, 1.000000f, -0.000000f ); 
+      // States -> omen (id: 3) fukidasi (id: 4) end_0f (id: 5) end_anm (id: 6) omen1 (id: 8) 
+    instance.registerEObj( "sgvf_w_btl_b0485_3", 2004338, 4797426, 4, { -362.507385f, 1.900000f, 48.482269f }, 1.000000f, -0.000000f ); 
+      // States -> omen (id: 3) fukidasi (id: 4) end_0f (id: 5) end_anm (id: 6) omen1 (id: 8) 
+    instance.registerEObj( "sgvf_w_btl_b0485_4", 2004339, 4797427, 4, { -355.184601f, 1.899924f, 47.853260f }, 1.000000f, -0.000000f ); 
+      // States -> omen (id: 3) fukidasi (id: 4) end_0f (id: 5) end_anm (id: 6) omen1 (id: 8) 
+    instance.registerEObj( "sgvf_w_btl_b0485_5", 2004340, 4797428, 4, { -349.628601f, 1.899914f, 52.138340f }, 1.000000f, -0.000000f ); 
+      // States -> omen (id: 3) fukidasi (id: 4) end_0f (id: 5) end_anm (id: 6) omen1 (id: 8) 
+    instance.registerEObj( "sgvf_w_btl_b0485_6", 2004335, 4797429, 4, { -334.406708f, 1.899990f, 43.799950f }, 1.000000f, -0.000000f ); 
+      // States -> omen (id: 3) fukidasi (id: 4) end_0f (id: 5) end_anm (id: 6) omen1 (id: 8) 
+    instance.registerEObj( "sgvf_w_btl_b0485_7", 2004336, 4797430, 4, { -336.870087f, 1.900000f, 37.104382f }, 1.000000f, -0.000000f ); 
+      // States -> omen (id: 3) fukidasi (id: 4) end_0f (id: 5) end_anm (id: 6) omen1 (id: 8) 
+    instance.registerEObj( "sgvf_w_btl_b0485_8", 2004337, 4797431, 4, { -332.837006f, 1.900000f, 30.666309f }, 1.000000f, -0.000000f ); 
+      // States -> omen (id: 3) fukidasi (id: 4) end_0f (id: 5) end_anm (id: 6) omen1 (id: 8) 
+    instance.registerEObj( "sgvf_w_btl_b0485_9", 2004344, 4797421, 4, { -341.024414f, 1.880961f, 15.649740f }, 1.000000f, -0.000000f ); 
+      // States -> omen (id: 3) fukidasi (id: 4) end_0f (id: 5) end_anm (id: 6) omen1 (id: 8) 
+    instance.registerEObj( "sgvf_w_btl_b0485_10", 2004345, 4797419, 4, { -348.232788f, 1.900000f, 15.852800f }, 1.000000f, -0.000000f ); 
+      // States -> omen (id: 3) fukidasi (id: 4) end_0f (id: 5) end_anm (id: 6) omen1 (id: 8) 
+    instance.registerEObj( "sgvf_w_btl_b0485_11", 2004346, 4797422, 4, { -353.540588f, 1.899946f, 11.553900f }, 1.000000f, -0.000000f ); 
+      // States -> omen (id: 3) fukidasi (id: 4) end_0f (id: 5) end_anm (id: 6) omen1 (id: 8) 
+    instance.registerEObj( "Entrance", 2000182, 4685106, 5, { 320.642792f, 3.735552f, 302.314301f }, 0.991760f, 0.000048f ); 
+      // States -> vf_lock_on (id: 11) vf_lock_of (id: 12) 
+    instance.registerEObj( "unknown_0", 2002735, 0, 4, { 220.874298f, 64.988159f, 13.046390f }, 0.991760f, 0.000048f ); 
+    instance.registerEObj( "sgvf_w_lvd_b0118", 2002872, 4685143, 4, { 220.800797f, 64.801514f, 13.539410f }, 1.000000f, 0.000000f ); 
+      // States -> vf_bextwall_on (id: 3) vf_bextwall_of (id: 4) 
+    instance.registerEObj( "sgvf_w_lvd_b0250", 2004050, 4685147, 4, { 219.745102f, 64.682983f, -33.707211f }, 0.991760f, 0.000048f ); 
+      // States -> vf_bextwall_on (id: 3) vf_bextwall_of (id: 4) 
+    instance.registerEObj( "sgpl_w_transparent05", 2004049, 4685157, 4, { 219.958694f, 65.018677f, 47.991199f }, 0.991760f, 0.000048f ); 
+    instance.registerEObj( "unknown_1", 2002735, 0, 4, { -60.079769f, 44.339741f, -124.669800f }, 1.000000f, -1.570451f ); 
+    instance.registerEObj( "sgvf_w_lvd_b0118_1", 2002872, 4685162, 4, { -61.990799f, 44.123230f, -125.263000f }, 1.000000f, -1.570451f ); 
+      // States -> vf_bextwall_on (id: 3) vf_bextwall_of (id: 4) 
+    instance.registerEObj( "sgvf_w_lvd_b0118_2", 2004051, 4685163, 4, { -98.791832f, 44.299992f, -124.783699f }, 1.000000f, 0.000000f ); 
+      // States -> vf_bextwall_on (id: 3) vf_bextwall_of (id: 4) 
+    instance.registerEObj( "unknown_2", 2002735, 0, 4, { -315.480286f, 1.957748f, 33.432499f }, 0.991760f, -1.184874f ); 
+    instance.registerEObj( "sgvf_w_lvd_b0118_3", 2002872, 4685167, 4, { -314.885803f, 1.999334f, 32.833080f }, 1.000000f, 0.000000f ); 
+      // States -> vf_bextwall_on (id: 3) vf_bextwall_of (id: 4) 
+    instance.registerEObj( "Shortcut", 2000700, 0, 4, { 325.360901f, 6.499028f, 292.726807f }, 0.991760f, 0.000048f ); 
+    instance.registerEObj( "unknown_3", 2004052, 4584550, 4, { 165.269104f, 52.440060f, -190.280197f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "Stonepedestal", 2004057, 4588393, 4, { 163.784195f, 52.706680f, -185.027100f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_4", 2004053, 4584553, 4, { -35.849411f, 44.986191f, -124.177696f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "Stonepedestal_1", 2004058, 4588617, 4, { -32.145729f, 44.996059f, -118.336502f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "Stonepedestal_2", 2004059, 4588610, 4, { -32.404221f, 44.937031f, -128.964096f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "Exit", 2000139, 0, 4, { -326.989685f, 2.000000f, 43.114891f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "Treasurecoffer", 2004074, 0, 4, { 191.947693f, 59.006939f, -163.899307f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "Treasurecoffer_1", 2004075, 0, 4, { 194.472900f, 59.156731f, -165.022003f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "Treasurecoffer_2", 2004076, 0, 4, { 196.017197f, 59.853050f, -161.548294f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "Treasurecoffer_3", 2004077, 0, 4, { 198.798004f, 60.096630f, -162.115204f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "Treasurecoffer_4", 2004078, 0, 4, { 199.929993f, 60.852970f, -158.189896f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "Treasurecoffer_5", 2004079, 0, 4, { 203.014206f, 61.084290f, -158.453995f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "Wildbananatree", 2004062, 4706914, 4, { 206.036896f, 65.302567f, -27.040119f }, 0.991760f, 0.000048f ); 
+    instance.registerEObj( "Wildbananatree_1", 2004063, 4722842, 4, { 199.376907f, 64.682983f, -11.735090f }, 0.991760f, 0.000048f ); 
+    instance.registerEObj( "Wildbananatree_2", 2004064, 4706915, 4, { 205.968002f, 64.690811f, 3.866779f }, 0.991760f, 0.000048f ); 
+    instance.registerEObj( "Wildbananatree_3", 2004065, 4706916, 4, { 236.652100f, 64.927116f, -28.061340f }, 0.991760f, 0.000048f ); 
+    instance.registerEObj( "unknown_5", 2004066, 0, 4, { 206.655502f, 65.036621f, -25.903111f }, 0.991760f, -1.260904f ); 
+    instance.registerEObj( "unknown_6", 2004067, 0, 4, { 200.604294f, 64.690804f, -10.987260f }, 0.991760f, -0.736456f ); 
+    instance.registerEObj( "unknown_7", 2004068, 0, 4, { 206.716095f, 64.690811f, 3.346290f }, 0.991760f, -0.921409f ); 
+    instance.registerEObj( "unknown_8", 2004069, 0, 4, { 235.736603f, 64.682983f, -27.115360f }, 0.991760f, 0.613842f ); 
+    instance.registerEObj( "unknown_9", 2004060, 4585424, 4, { -218.153107f, -0.000002f, -6.398464f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_10", 2004061, 4585624, 4, { -307.270905f, 4.409851f, 14.023010f }, 0.991760f, 0.000048f ); 
+    instance.registerEObj( "Wildbananatree_4", 2004070, 4722840, 4, { 241.380005f, 64.956383f, -12.841170f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "Wildbananatree_5", 2004071, 4706917, 4, { 234.644501f, 64.824364f, 2.652663f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_11", 2004072, 0, 4, { 239.884903f, 64.690811f, -12.610960f }, 1.000000f, 0.600320f ); 
+    instance.registerEObj( "unknown_12", 2004073, 0, 4, { 233.623596f, 64.760551f, 2.089992f }, 1.000000f, 0.684586f ); 
+    instance.registerEObj( "unknown_13", 2004129, 0, 4, { -80.000000f, 44.200001f, -124.500000f }, 1.000000f, 0.000000f ); 
 
   }
 
-  void onUpdate( InstanceContentPtr instance, uint32_t currTime ) override
+  void onUpdate( InstanceContent& instance, uint32_t currTime ) override
   {
 
   }
 
-  void onEnterTerritory( InstanceContentPtr instance, Entity::Player& player, uint32_t eventId, uint16_t param1,
+  void onEnterTerritory( InstanceContent& instance, Entity::Player& player, uint32_t eventId, uint16_t param1,
                          uint16_t param2 ) override
   {
 
diff --git a/src/scripts/instances/dungeons/HullbreakerIsleHard.cpp b/src/scripts/instances/dungeons/HullbreakerIsleHard.cpp
index 2a4a67c2..a545e5c1 100644
--- a/src/scripts/instances/dungeons/HullbreakerIsleHard.cpp
+++ b/src/scripts/instances/dungeons/HullbreakerIsleHard.cpp
@@ -9,73 +9,50 @@ class HullbreakerIsleHard :
 public:
   HullbreakerIsleHard() :
     Sapphire::ScriptAPI::InstanceContentScript( 45 )
-  {
-  }
+  { }
 
-  void onInit( InstanceContentPtr instance ) override
+  void onInit( InstanceContent& instance ) override
   {
-    instance->registerEObj( "unknown_0", 2002735, 0, 4, { -343.904602f, 7.822294f, 39.109711f }, 0.500000f, 0.498864f );
-    instance->registerEObj( "sgvf_w_lvd_b0118", 2002872, 6253922, 4, { -342.837006f, 6.196667f, 36.610142f }, 1.000000f,
-                            0.000000f );
-    // States -> vf_bextwall_on vf_bextwall_of
-    instance->registerEObj( "Exit", 2000139, 0, 4, { -360.775909f, 7.864089f, 68.887756f }, 1.000000f, 0.000000f );
-    instance->registerEObj( "Treasurecoffer", 2007257, 0, 4, { -350.992401f, 7.892528f, 56.902512f }, 1.000000f,
-                            0.000000f );
-    instance->registerEObj( "Treasurecoffer_1", 2007258, 0, 4, { -354.052490f, 7.892528f, 54.626640f }, 1.000000f,
-                            0.000000f );
-    instance->registerEObj( "unknown_1", 2007359, 0, 4, { -352.179810f, 7.927567f, 63.128880f }, 1.000000f, 0.000000f );
-    instance->registerEObj( "Entrance", 2000182, 6245769, 5, { 322.891693f, 3.635096f, 313.253510f }, 1.000000f,
-                            0.000000f );
-    // States -> vf_lock_on vf_lock_of
-    instance->registerEObj( "Shortcut", 2000700, 0, 4, { 328.376587f, 5.844693f, 298.411591f }, 1.000000f, 0.000000f );
-    instance->registerEObj( "unknown_2", 2007025, 6235928, 4, { 307.237701f, 11.852150f, 276.543915f }, 1.000000f,
-                            0.000000f );
-    instance->registerEObj( "unknown_3", 2007026, 6240784, 4, { 286.591309f, 19.136169f, 239.456497f }, 1.000000f,
-                            0.000000f );
-    instance->registerEObj( "unknown_4", 2007027, 6239711, 4, { 306.575897f, 31.887329f, 181.107697f }, 1.000000f,
-                            0.000000f );
-    instance->registerEObj( "unknown_5", 2007028, 6244799, 4, { 220.128998f, 63.509621f, 114.498398f }, 1.000000f,
-                            0.000000f );
-    instance->registerEObj( "unknown_6", 2007156, 6249693, 4, { 308.747314f, 51.440979f, 125.671898f }, 1.000000f,
-                            0.000000f );
-    instance->registerEObj( "unknown_7", 2007157, 6249706, 4, { 313.862793f, 51.438110f, 123.826897f }, 0.991760f,
-                            0.000048f );
-    instance->registerEObj( "unknown_8", 2007030, 6244507, 4, { 60.801022f, 85.774963f, -64.387527f }, 1.000000f,
-                            0.000000f );
-    instance->registerEObj( "unknown_9", 2007034, 6232348, 4, { -35.186840f, 44.985500f, -123.946198f }, 1.000000f,
-                            0.000000f );
-    instance->registerEObj( "unknown_10", 2007035, 6243845, 4, { -235.700607f, 0.607149f, 8.445139f }, 1.000000f,
-                            0.000000f );
-    instance->registerEObj( "unknown_11", 2007036, 6243848, 4, { -284.362396f, 0.606121f, 11.598470f }, 1.000000f,
-                            0.000000f );
-    instance->registerEObj( "unknown_12", 2007037, 6243852, 4, { -334.528412f, 1.244455f, 21.911160f }, 1.000000f,
-                            0.000000f );
-    instance->registerEObj( "unknown_13", 2002735, 0, 4, { 222.214600f, 65.079712f, 11.398440f }, 1.400000f,
-                            0.000048f );
-    instance->registerEObj( "sgvf_w_lvd_b0118_1", 2002872, 6253107, 4, { 221.229599f, 65.079712f, 13.333970f },
-                            0.991760f, 0.000048f );
-    // States -> vf_bextwall_on vf_bextwall_of
-    instance->registerEObj( "unknown_14", 2007072, 6241286, 4, { 198.155396f, 64.976288f, -11.912840f }, 1.000000f,
-                            0.000000f );
-    instance->registerEObj( "unknown_15", 2002735, 0, 4, { -60.746220f, 44.327389f, -123.705002f }, 0.991760f,
-                            -1.570451f );
-    instance->registerEObj( "sgvf_w_lvd_b0118_2", 2002872, 6253215, 4, { -58.605789f, 45.157280f, -124.548203f },
-                            1.000000f, 0.000000f );
-    // States -> vf_bextwall_on vf_bextwall_of
-    instance->registerEObj( "sgvf_w_lvd_b0118_3", 2007073, 6253218, 4, { -102.000999f, 45.915119f, -123.827301f },
-                            1.000000f, 0.000000f );
-    // States -> vf_bextwall_on vf_bextwall_of
-    instance->registerEObj( "unknown_16", 2007260, 6252642, 4, { -76.831734f, 44.106281f, -123.152199f }, 1.000000f,
-                            0.000000f );
+    instance.registerEObj( "unknown_0", 2002735, 0, 4, { -343.904602f, 7.822294f, 39.109711f }, 0.500000f, 0.498864f ); 
+    instance.registerEObj( "sgvf_w_lvd_b0118", 2002872, 6253922, 4, { -343.716888f, 7.647682f, 38.636318f }, 1.000000f, 0.000000f ); 
+      // States -> vf_bextwall_on (id: 3) vf_bextwall_of (id: 4) 
+    instance.registerEObj( "Exit", 2000139, 0, 4, { -360.775909f, 7.864089f, 68.887756f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "Treasurecoffer", 2007257, 0, 4, { -350.992401f, 7.892528f, 56.902512f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "Treasurecoffer_1", 2007258, 0, 4, { -354.052490f, 7.892528f, 54.626640f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_1", 2007359, 0, 4, { -352.179810f, 7.927567f, 63.128880f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "Entrance", 2000182, 6245769, 5, { 322.891693f, 3.635096f, 313.253510f }, 1.000000f, 0.000000f ); 
+      // States -> vf_lock_on (id: 11) vf_lock_of (id: 12) 
+    instance.registerEObj( "Shortcut", 2000700, 0, 4, { 328.376587f, 5.844693f, 298.411591f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_2", 2007025, 6235928, 4, { 307.237701f, 11.852150f, 276.543915f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_3", 2007026, 6240784, 4, { 286.591309f, 19.136169f, 239.456497f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_4", 2007027, 6239711, 4, { 306.575897f, 31.887329f, 181.107697f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_5", 2007028, 6244799, 4, { 220.128998f, 63.509621f, 114.498398f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_6", 2007156, 6249693, 4, { 308.747314f, 51.440979f, 125.671898f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_7", 2007157, 6249706, 4, { 313.862793f, 51.438110f, 123.826897f }, 0.991760f, 0.000048f ); 
+    instance.registerEObj( "unknown_8", 2007030, 6244507, 4, { 60.801022f, 85.774963f, -64.387527f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_9", 2007034, 6232348, 4, { -35.186840f, 44.985500f, -123.946198f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_10", 2007035, 6243845, 4, { -235.700607f, 0.607149f, 8.445139f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_11", 2007036, 6243848, 4, { -284.362396f, 0.606121f, 11.598470f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_12", 2007037, 6243852, 4, { -334.528412f, 1.244455f, 21.911160f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_13", 2002735, 0, 4, { 222.214600f, 65.079712f, 11.398440f }, 1.400000f, 0.000048f ); 
+    instance.registerEObj( "sgvf_w_lvd_b0118_1", 2002872, 6253107, 4, { 221.229599f, 65.079712f, 13.333970f }, 0.991760f, 0.000048f ); 
+      // States -> vf_bextwall_on (id: 3) vf_bextwall_of (id: 4) 
+    instance.registerEObj( "unknown_14", 2007072, 6241286, 4, { 198.155396f, 64.976288f, -11.912840f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_15", 2002735, 0, 4, { -60.746220f, 44.327389f, -123.705002f }, 0.991760f, -1.570451f ); 
+    instance.registerEObj( "sgvf_w_lvd_b0118_2", 2002872, 6253215, 4, { -58.605789f, 45.157280f, -124.548203f }, 1.000000f, 0.000000f ); 
+      // States -> vf_bextwall_on (id: 3) vf_bextwall_of (id: 4) 
+    instance.registerEObj( "sgvf_w_lvd_b0118_3", 2007073, 6253218, 4, { -102.000999f, 45.915119f, -123.827301f }, 1.000000f, 0.000000f ); 
+      // States -> vf_bextwall_on (id: 3) vf_bextwall_of (id: 4) 
+    instance.registerEObj( "unknown_16", 2007260, 6252642, 4, { -76.831734f, 44.106281f, -123.152199f }, 1.000000f, 0.000000f ); 
 
   }
 
-  void onUpdate( InstanceContentPtr instance, uint32_t currTime ) override
+  void onUpdate( InstanceContent& instance, uint32_t currTime ) override
   {
 
   }
 
-  void onEnterTerritory( InstanceContentPtr instance, Entity::Player& player, uint32_t eventId, uint16_t param1,
+  void onEnterTerritory( InstanceContent& instance, Entity::Player& player, uint32_t eventId, uint16_t param1,
                          uint16_t param2 ) override
   {
 
diff --git a/src/scripts/instances/dungeons/KuganeCastle.cpp b/src/scripts/instances/dungeons/KuganeCastle.cpp
index 2a900410..1ef7c6ae 100644
--- a/src/scripts/instances/dungeons/KuganeCastle.cpp
+++ b/src/scripts/instances/dungeons/KuganeCastle.cpp
@@ -9,20 +9,86 @@ class KuganeCastle :
 public:
   KuganeCastle() :
     Sapphire::ScriptAPI::InstanceContentScript( 57 )
+  { }
+
+  void onInit( InstanceContent& instance ) override
   {
+    instance.registerEObj( "sgvf_w_lvd_b0118", 2002872, 6891156, 4, { 280.110413f, -75.860001f, 341.057800f }, 1.000000f, 0.000000f ); 
+      // States -> vf_bextwall_on (id: 3) vf_bextwall_of (id: 4) 
+    instance.registerEObj( "unknown_0", 2002735, 0, 4, { 280.000000f, -75.860001f, 338.900696f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "Exit", 2000139, 0, 4, { 280.000000f, -75.860001f, 375.299988f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_1", 2007457, 0, 4, { 280.179993f, -75.859993f, 363.578888f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "Pileofgold", 2007814, 0, 4, { 289.943695f, -75.859993f, 360.566986f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_2", 2007815, 0, 4, { 279.957306f, -75.883118f, 375.295685f }, 0.991760f, 0.000048f ); 
+    instance.registerEObj( "unknown_3", 2002735, 0, 4, { -110.000000f, 0.000003f, 0.000000f }, 1.000000f, -1.570796f ); 
+    instance.registerEObj( "sgvf_w_lvd_b0118_1", 2002872, 6886643, 4, { -108.904198f, 0.000003f, -0.184188f }, 1.000000f, 0.000000f ); 
+      // States -> vf_bextwall_on (id: 3) vf_bextwall_of (id: 4) 
+    instance.registerEObj( "sgvf_w_lvd_b0118_2", 2002872, 6886655, 4, { -147.474503f, 0.100000f, -0.110550f }, 1.000000f, 0.000000f ); 
+      // States -> vf_bextwall_on (id: 3) vf_bextwall_of (id: 4) 
+    instance.registerEObj( "unknown_4", 2002735, 0, 4, { 280.000000f, -90.771896f, 28.200001f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_5", 2007457, 6795321, 4, { 294.636414f, -90.775902f, 64.530403f }, 0.991760f, 0.000048f ); 
+    instance.registerEObj( "unknown_6", 2007457, 6795322, 4, { 284.810699f, -90.771896f, 64.853622f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_7", 2007457, 6795323, 4, { 275.195496f, -90.771896f, 64.375351f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_8", 2007457, 6795324, 4, { 264.569000f, -90.771896f, 65.125214f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_9", 2007457, 6795325, 4, { 295.691193f, -90.771896f, 55.563641f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_10", 2007457, 6795326, 4, { 284.563385f, -90.771896f, 57.046230f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_11", 2007457, 6795327, 4, { 274.879486f, -90.771896f, 57.698601f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_12", 2007457, 6795328, 4, { 264.951508f, -90.771896f, 57.270260f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_13", 2007457, 6795329, 4, { 294.813904f, -90.771896f, 45.369381f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_14", 2007457, 6795330, 4, { 284.412811f, -90.775940f, 44.846191f }, 0.991760f, 0.000048f ); 
+    instance.registerEObj( "unknown_15", 2007457, 6795331, 4, { 274.009003f, -90.771896f, 44.232479f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_16", 2007457, 6795332, 4, { 264.546387f, -90.771896f, 44.505569f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_17", 2007457, 6795333, 4, { 294.721802f, -90.771896f, 35.522999f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_18", 2007457, 6795334, 4, { 284.550293f, -90.771896f, 35.573021f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_19", 2007457, 6795335, 4, { 274.647095f, -90.775940f, 36.026489f }, 0.991760f, 0.000048f ); 
+    instance.registerEObj( "unknown_20", 2007457, 6795336, 4, { 265.028992f, -90.771896f, 35.466030f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "sgvf_w_lvd_b0118_3", 2002872, 6972248, 4, { 279.929291f, -90.862122f, 25.802130f }, 1.000000f, 0.000000f ); 
+      // States -> vf_bextwall_on (id: 3) vf_bextwall_of (id: 4) 
+    instance.registerEObj( "sgvf_w_lvd_b0118_4", 2002872, 6972249, 4, { 279.425995f, -90.862122f, 73.752983f }, 1.000000f, 0.000000f ); 
+      // States -> vf_bextwall_on (id: 3) vf_bextwall_of (id: 4) 
+    instance.registerEObj( "unknown_21", 2007457, 6795811, 4, { -18.923059f, -4.000000f, -47.771740f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_22", 2007457, 6795812, 4, { -82.884247f, 0.000003f, -0.161598f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_23", 2007457, 6795813, 4, { -179.231201f, 4.000000f, -0.161991f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_24", 2007812, 0, 4, { -60.365211f, -6.291489f, 11.147480f }, 1.000000f, -1.570451f ); 
+    instance.registerEObj( "unknown_25", 2007812, 0, 4, { -60.697491f, -6.291489f, -12.243330f }, 1.000000f, -1.570451f ); 
+    instance.registerEObj( "unknown_26", 2007812, 0, 4, { -64.355148f, -6.291490f, 11.308300f }, 1.000000f, -1.570451f ); 
+    instance.registerEObj( "unknown_27", 2007812, 0, 4, { -64.521027f, -6.291490f, -11.570270f }, 1.000000f, -1.570451f ); 
+    instance.registerEObj( "unknown_28", 2007812, 0, 4, { -55.949509f, -6.291489f, 9.962895f }, 1.000000f, -1.570451f ); 
+    instance.registerEObj( "unknown_29", 2007812, 0, 4, { -56.575081f, -6.291490f, -10.074280f }, 1.000000f, -1.570451f ); 
+    instance.registerEObj( "sgbg_e3d4_a1_leav1", 2007457, 6993778, 4, { -11.244300f, -5.961200f, -57.744499f }, 1.000000f, -0.872665f ); 
+    instance.registerEObj( "sgbg_e3d4_a1_leav1_1", 2007457, 6994112, 4, { -17.911301f, -5.796600f, -65.317596f }, 1.000000f, -1.570451f ); 
+    instance.registerEObj( "unknown_30", 2007812, 0, 4, { -49.310871f, -6.291489f, 10.600000f }, 1.000000f, -1.570451f ); 
+    instance.registerEObj( "unknown_31", 2007812, 0, 4, { -49.310860f, -6.291490f, -10.674300f }, 1.000000f, -1.570451f ); 
+    instance.registerEObj( "unknown_32", 2007457, 6795420, 4, { 248.664993f, -94.824402f, -117.732498f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_33", 2007457, 6795421, 4, { 279.489410f, -92.996399f, 3.845758f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_34", 2007457, 6795419, 4, { 280.175507f, -92.998596f, 93.664139f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_35", 2007813, 0, 4, { 248.706802f, -94.834801f, -131.982498f }, 1.000000f, -3.141593f ); 
+    instance.registerEObj( "unknown_36", 2007813, 0, 4, { 286.988312f, -92.855598f, -10.582000f }, 1.000000f, 0.785398f ); 
+    instance.registerEObj( "unknown_37", 2007813, 0, 4, { 273.011108f, -92.855598f, -10.581000f }, 1.000000f, -0.785398f ); 
+    instance.registerEObj( "unknown_38", 2007813, 0, 4, { 279.995697f, -92.851196f, -21.638639f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_39", 2007813, 0, 4, { 279.987701f, -92.881706f, -7.278625f }, 0.991760f, 0.000048f ); 
+    instance.registerEObj( "unknown_40", 2007457, 6795337, 4, { 279.713104f, -83.786652f, 143.480499f }, 0.991760f, 0.000048f ); 
+    instance.registerEObj( "unknown_41", 2007457, 6795422, 4, { 280.061096f, -73.914101f, 313.413391f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_42", 2007457, 6795342, 4, { 289.140198f, -73.914101f, 284.393890f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_43", 2007457, 6795343, 4, { 288.888214f, -73.914200f, 303.585907f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_44", 2007457, 6795341, 4, { 271.105591f, -73.914101f, 284.355804f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_45", 2007457, 6795345, 4, { 271.048309f, -73.914200f, 302.845795f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_46", 2007457, 6795344, 4, { 289.058899f, -73.914101f, 291.958588f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_47", 2007457, 6795346, 4, { 288.715912f, -73.914299f, 310.894012f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_48", 2007457, 6795338, 4, { 271.824585f, -73.914101f, 292.335999f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_49", 2007457, 6795339, 4, { 271.103790f, -73.914299f, 311.710388f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "Entrance", 2000182, 6881046, 5, { 66.323036f, -6.000000f, -68.720047f }, 1.000000f, 0.000000f ); 
+      // States -> vf_lock_on (id: 11) vf_lock_of (id: 12) 
+    instance.registerEObj( "Shortcut", 2000700, 0, 4, { 49.699169f, -6.000000f, -60.817249f }, 1.000000f, 1.570796f ); 
+
   }
 
-  void onInit( InstanceContentPtr instance ) override
+  void onUpdate( InstanceContent& instance, uint32_t currTime ) override
   {
 
   }
 
-  void onUpdate( InstanceContentPtr instance, uint32_t currTime ) override
-  {
-
-  }
-
-  void onEnterTerritory( InstanceContentPtr instance, Entity::Player& player, uint32_t eventId, uint16_t param1,
+  void onEnterTerritory( InstanceContent& instance, Entity::Player& player, uint32_t eventId, uint16_t param1,
                          uint16_t param2 ) override
   {
 
diff --git a/src/scripts/instances/dungeons/Neverreap.cpp b/src/scripts/instances/dungeons/Neverreap.cpp
index 391cf12b..3dfbe019 100644
--- a/src/scripts/instances/dungeons/Neverreap.cpp
+++ b/src/scripts/instances/dungeons/Neverreap.cpp
@@ -9,20 +9,73 @@ class Neverreap :
 public:
   Neverreap() :
     Sapphire::ScriptAPI::InstanceContentScript( 33 )
+  { }
+
+  void onInit( InstanceContent& instance ) override
   {
+    instance.registerEObj( "Vanutotem", 2005373, 0, 4, { 171.495407f, 64.000000f, -17.861130f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "Vanutotem_1", 2005374, 0, 4, { 172.963303f, 64.000000f, -17.254971f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "Vanutotem_2", 2005375, 0, 4, { 173.628693f, 64.000000f, -16.836420f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "Vanutotem_3", 2005376, 0, 4, { 173.837097f, 64.000000f, -15.707030f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "Vanutotem_4", 2005377, 0, 4, { 172.736298f, 64.000000f, -15.517540f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "Vanutotem_5", 2005378, 0, 4, { 172.030807f, 64.000000f, -15.895150f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "Vanutotem_6", 2005379, 0, 4, { 171.188904f, 64.000000f, -16.423241f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "Vanutotem_7", 2005380, 0, 4, { 170.423996f, 64.000000f, -18.803040f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "Vanutotem_8", 2005381, 0, 4, { 169.871201f, 64.000000f, -17.785959f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "Vanutotem_9", 2005382, 0, 4, { 170.450607f, 64.000000f, -15.978460f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "Vanutotem_10", 2005383, 0, 4, { 169.593307f, 64.000000f, -15.827410f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "Vanutotem_11", 2005384, 0, 4, { 170.206100f, 64.000000f, -15.102260f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "Cloudaltar", 2005130, 5786938, 4, { -160.917892f, 5.000000f, 291.800598f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "sgvf_a2d2_b0636", 2005135, 5887646, 4, { -160.814896f, 4.989685f, 291.432007f }, 0.991760f, 0.000048f ); 
+      // States -> bef_offer (id: 2) aft_offer (id: 3) bef2aft (id: 4) 
+    instance.registerEObj( "Cloudaltar_1", 2005131, 5786940, 4, { -87.421448f, 21.000000f, 290.602692f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "sgvf_a2d2_b0636_1", 2005136, 5887670, 4, { -97.348267f, 21.000000f, 290.468292f }, 1.000000f, 0.000000f ); 
+      // States -> bef_offer (id: 2) aft_offer (id: 3) bef2aft (id: 4) 
+    instance.registerEObj( "sgvf_a2d2_b0636_2", 2005137, 5887709, 4, { -1.889378f, 43.351429f, 215.919601f }, 1.000000f, 0.000000f ); 
+      // States -> bef_offer (id: 2) aft_offer (id: 3) bef2aft (id: 4) 
+    instance.registerEObj( "Cloudaltar_2", 2005132, 5786943, 4, { -4.570463f, 44.541019f, 216.505707f }, 0.991760f, 0.000048f ); 
+    instance.registerEObj( "sgvf_w_lvd_b0118", 2002872, 5778078, 4, { 74.175919f, 38.000000f, 213.378998f }, 1.000000f, 0.179771f ); 
+      // States -> vf_bextwall_on (id: 3) vf_bextwall_of (id: 4) 
+    instance.registerEObj( "Cloudaltar_3", 2005133, 5786946, 4, { 77.225830f, 37.979610f, 211.596802f }, 0.991760f, 0.000048f ); 
+    instance.registerEObj( "sgvf_w_lvd_b0118_1", 2002872, 5789280, 4, { -5.153300f, 43.220901f, 215.814102f }, 1.000000f, -0.000000f ); 
+      // States -> vf_bextwall_on (id: 3) vf_bextwall_of (id: 4) 
+    instance.registerEObj( "unknown_0", 2002587, 0, 4, { -5.153300f, 43.138199f, 214.261093f }, 1.000000f, 1.561701f ); 
+    instance.registerEObj( "sgvf_a2d2_b0636_3", 2005137, 5887710, 4, { 79.964493f, 38.000000f, 209.654800f }, 1.000000f, 0.000000f ); 
+      // States -> bef_offer (id: 2) aft_offer (id: 3) bef2aft (id: 4) 
+    instance.registerEObj( "unknown_1", 2005139, 5606925, 4, { 132.122696f, 55.455528f, 135.050995f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_2", 2005140, 5606936, 4, { 142.889496f, 67.000000f, 67.840523f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "sgvf_w_lvd_b0118_2", 2002872, 5777608, 4, { 165.085007f, 63.500000f, 10.671380f }, 1.000000f, 0.065608f ); 
+      // States -> vf_bextwall_on (id: 3) vf_bextwall_of (id: 4) 
+    instance.registerEObj( "sgvf_w_lvd_b0118_3", 2002872, 5777614, 4, { 178.430206f, 64.000000f, -23.500389f }, 1.000000f, 0.154718f ); 
+      // States -> vf_bextwall_on (id: 3) vf_bextwall_of (id: 4) 
+    instance.registerEObj( "unknown_3", 2002735, 0, 4, { 163.308899f, 63.926491f, 9.173799f }, 1.000000f, 0.342174f ); 
+    instance.registerEObj( "unknown_4", 2005142, 0, 4, { 177.194199f, 60.250000f, -155.280502f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "Exit", 2000139, 0, 4, { 172.014893f, 58.670898f, -358.327606f }, 0.991760f, 0.000048f ); 
+    instance.registerEObj( "sgvf_w_lvd_b0250", 2002872, 5615523, 4, { 175.494003f, 59.281250f, -305.348297f }, 0.991760f, 0.000048f ); 
+      // States -> vf_bextwall_on (id: 3) vf_bextwall_of (id: 4) 
+    instance.registerEObj( "unknown_5", 2002587, 0, 4, { 175.127701f, 59.281250f, -310.170197f }, 0.991760f, 0.000048f ); 
+    instance.registerEObj( "Cloudaltar_4", 2005134, 5786958, 4, { 164.310806f, 60.349369f, -127.550201f }, 0.991760f, 0.000048f ); 
+    instance.registerEObj( "sgvf_a2d2_b0711", 2005143, 5900091, 4, { 164.190903f, 61.358318f, -219.399506f }, 1.000000f, 0.000000f ); 
+      // States -> bub_init (id: 1) bub_loop (id: 2) 
+    instance.registerEObj( "sgvf_a2d2_b0642", 2005146, 5894450, 4, { 175.280396f, 59.281250f, -309.102112f }, 0.991760f, 0.000048f ); 
+      // States -> wind_on (id: 2) wind_off (id: 3) 
+    instance.registerEObj( "sgvf_a2d2_b0645", 2005144, 5893679, 4, { 158.342804f, 60.440922f, -191.393906f }, 0.991760f, 0.000048f ); 
+      // States -> init (id: 2) loop2init (id: 3) loop (id: 4) init2loop (id: 5) 
+    instance.registerEObj( "sgvf_a2d2_b0645_1", 2005145, 5893776, 4, { 162.635193f, 59.999939f, -271.153412f }, 1.000000f, 0.000000f ); 
+      // States -> init (id: 2) loop2init (id: 3) loop (id: 4) init2loop (id: 5) 
+    instance.registerEObj( "unknown_6", 2005141, 5764461, 4, { 165.941803f, 60.440899f, -205.985107f }, 1.000000f, 0.000047f ); 
+    instance.registerEObj( "Entrance", 2000182, 5614672, 5, { -195.491302f, -0.022185f, 305.059296f }, 1.000000f, -0.128295f ); 
+      // States -> vf_lock_on (id: 11) vf_lock_of (id: 12) 
+    instance.registerEObj( "Shortcut", 2000700, 0, 4, { -179.874603f, 2.417616f, 306.529602f }, 1.000000f, 0.000000f ); 
+
   }
 
-  void onInit( InstanceContentPtr instance ) override
+  void onUpdate( InstanceContent& instance, uint32_t currTime ) override
   {
 
   }
 
-  void onUpdate( InstanceContentPtr instance, uint32_t currTime ) override
-  {
-
-  }
-
-  void onEnterTerritory( InstanceContentPtr instance, Entity::Player& player, uint32_t eventId, uint16_t param1,
+  void onEnterTerritory( InstanceContent& instance, Entity::Player& player, uint32_t eventId, uint16_t param1,
                          uint16_t param2 ) override
   {
 
diff --git a/src/scripts/instances/dungeons/PharosSirius.cpp b/src/scripts/instances/dungeons/PharosSirius.cpp
index 0af8693d..30ace42e 100644
--- a/src/scripts/instances/dungeons/PharosSirius.cpp
+++ b/src/scripts/instances/dungeons/PharosSirius.cpp
@@ -9,76 +9,54 @@ class PharosSirius :
 public:
   PharosSirius() :
     Sapphire::ScriptAPI::InstanceContentScript( 17 )
-  {
-  }
+  { }
 
-  void onInit( InstanceContentPtr instance ) override
+  void onInit( InstanceContent& instance ) override
   {
-    instance->registerEObj( "Entrance", 2002718, 4378108, 5, { 88.730026f, 0.300000f, 69.993042f }, 0.991760f,
-                            0.000048f );
-    // States -> vf_lock_on vf_lock_of
-    instance->registerEObj( "unknown_0", 2002719, 0, 4, { 118.749496f, 0.300000f, 70.000000f }, 1.000000f, 0.000000f );
-    instance->registerEObj( "Exit", 2000139, 0, 4, { -18.275600f, 193.987900f, 0.000000f }, 0.991760f, 0.000048f );
-    instance->registerEObj( "unknown_1", 2002735, 0, 4, { 42.000000f, 30.001560f, -31.911860f }, 1.000000f, 0.000000f );
-    instance->registerEObj( "sgpl_w_lvd_b0118_f1d2", 2002720, 4378115, 4, { 41.977539f, 30.001610f, -32.837688f },
-                            0.991760f, 0.000048f );
-    // States -> vf_bextwall_on vf_bextwall_of
-    instance->registerEObj( "unknown_2", 2002723, 4391376, 4, { 23.849791f, 29.984011f, -56.015869f }, 0.991760f,
-                            0.000048f );
-    instance->registerEObj( "unknown_3", 2002735, 0, 4, { 21.750000f, 90.008011f, 0.000000f }, 1.000000f, -1.570796f );
-    instance->registerEObj( "sgvf_w_lvd_b0118", 2002721, 4378121, 4, { 20.298759f, 90.000008f, 0.000000f }, 1.000000f,
-                            0.000000f );
-    // States -> vf_bextwall_on vf_bextwall_of
-    instance->registerEObj( "sgvf_w_lvd_b0118_1", 2002724, 4378123, 4, { -20.870550f, 90.000008f, 0.000000f },
-                            1.000000f, 0.000000f );
-    // States -> vf_bextwall_on vf_bextwall_of
-    instance->registerEObj( "unknown_4", 2002735, 0, 4, { 25.750000f, 194.136505f, 0.000000f }, 1.000000f, -1.570451f );
-    instance->registerEObj( "sgvf_w_lvd_b0118_2", 2002722, 4378127, 4, { 24.286779f, 194.000000f, 0.000000f },
-                            1.000000f, 0.000000f );
-    // States -> vf_bextwall_on vf_bextwall_of
-    instance->registerEObj( "Shortcut", 2000700, 0, 4, { 76.644943f, 0.300000f, 66.422493f }, 0.991760f, 0.000048f );
-    instance->registerEObj( "unknown_5", 2002725, 4392603, 4, { -42.923710f, 29.984011f, -56.504211f }, 0.991760f,
-                            0.000048f );
-    instance->registerEObj( "unknown_6", 2002726, 4392604, 4, { -19.028080f, 36.148560f, -22.110350f }, 0.991760f,
-                            0.000048f );
-    instance->registerEObj( "unknown_7", 2002727, 4392605, 4, { 17.898800f, 44.388432f, -22.415590f }, 0.991760f,
-                            0.000048f );
-    instance->registerEObj( "unknown_8", 2002728, 4392606, 4, { 26.840580f, 52.091381f, 10.055660f }, 0.991760f,
-                            0.000048f );
-    instance->registerEObj( "unknown_9", 2002729, 4404469, 4, { -41.947140f, 29.984011f, 55.924320f }, 0.991760f,
-                            0.000048f );
-    instance->registerEObj( "unknown_10", 2002735, 0, 4, { 0.000000f, 140.000000f, 21.000000f }, 1.000000f, 0.000000f );
-    instance->registerEObj( "sgvf_w_lvd_b0118_3", 2002744, 4390583, 4, { 0.213522f, 139.893402f, 22.075270f },
-                            1.000000f, 0.000000f );
-    // States -> vf_bextwall_on vf_bextwall_of
-    instance->registerEObj( "sgvf_w_lvd_b0118_4", 2002743, 4390585, 4, { -0.033084f, 140.000000f, -20.026180f },
-                            1.000000f, 0.000000f );
-    // States -> vf_bextwall_on vf_bextwall_of
-    instance->registerEObj( "unknown_11", 2002742, 4390546, 4, { -11.093380f, 1.388489f, -23.453131f }, 0.991760f,
-                            0.000048f );
-    instance->registerEObj( "Aethervalve", 2002730, 4392611, 4, { -0.015320f, 119.981598f, -32.913761f }, 0.991760f,
-                            0.000048f );
-    instance->registerEObj( "Aethervalve_1", 2002731, 4392612, 4, { -0.076355f, 139.970901f, 42.618408f }, 0.991760f,
-                            0.000048f );
-    instance->registerEObj( "unknown_12", 2002787, 4395239, 4, { -38.345951f, 60.593510f, 21.011600f }, 0.991760f,
-                            0.000048f );
-    instance->registerEObj( "unknown_13", 2003436, 4406574, 4, { 41.813019f, 29.999941f, -29.969271f }, 1.000000f,
-                            0.000000f );
-    instance->registerEObj( "unknown_14", 2003032, 0, 4, { 42.000000f, 30.000771f, -59.314499f }, 1.000000f,
-                            0.000000f );
-    instance->registerEObj( "unknown_15", 2003033, 0, 4, { 42.000000f, 30.000771f, -56.244320f }, 1.000000f,
-                            0.000000f );
-    instance->registerEObj( "unknown_16", 2003034, 0, 4, { 42.000000f, 30.000771f, -51.724258f }, 1.000000f,
-                            0.000000f );
+    instance.registerEObj( "Entrance", 2002718, 4378108, 5, { 88.730026f, 0.300000f, 69.993042f }, 0.991760f, 0.000048f ); 
+      // States -> vf_lock_on (id: 11) vf_lock_of (id: 12) 
+    instance.registerEObj( "unknown_0", 2002719, 0, 4, { 118.749496f, 0.300000f, 70.000000f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "Exit", 2000139, 0, 4, { -18.275600f, 193.987900f, 0.000000f }, 0.991760f, 0.000048f ); 
+    instance.registerEObj( "unknown_1", 2002735, 0, 4, { 42.000000f, 30.001560f, -31.911860f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "sgpl_w_lvd_b0118_f1d2", 2002720, 4378115, 4, { 41.977539f, 30.001610f, -32.837688f }, 0.991760f, 0.000048f ); 
+      // States -> vf_bextwall_on (id: 3) vf_bextwall_of (id: 4) 
+    instance.registerEObj( "unknown_2", 2002723, 4391376, 4, { 23.849791f, 29.984011f, -56.015869f }, 0.991760f, 0.000048f ); 
+    instance.registerEObj( "unknown_3", 2002735, 0, 4, { 21.744020f, 89.982422f, -0.015320f }, 0.991760f, -1.570451f ); 
+    instance.registerEObj( "sgvf_w_lvd_b0118", 2002721, 4378121, 4, { 20.279169f, 89.982422f, -0.015320f }, 0.991760f, 0.000048f ); 
+      // States -> vf_bextwall_on (id: 3) vf_bextwall_of (id: 4) 
+    instance.registerEObj( "sgvf_w_lvd_b0118_1", 2002724, 4378123, 4, { -20.870550f, 90.000008f, 0.000000f }, 1.000000f, 0.000000f ); 
+      // States -> vf_bextwall_on (id: 3) vf_bextwall_of (id: 4) 
+    instance.registerEObj( "unknown_4", 2002735, 0, 4, { 25.750000f, 194.136505f, 0.000000f }, 1.000000f, -1.570451f ); 
+    instance.registerEObj( "sgvf_w_lvd_b0118_2", 2002722, 4378127, 4, { 24.286779f, 194.000000f, 0.000000f }, 1.000000f, 0.000000f ); 
+      // States -> vf_bextwall_on (id: 3) vf_bextwall_of (id: 4) 
+    instance.registerEObj( "Shortcut", 2000700, 0, 4, { 76.644943f, 0.300000f, 66.422493f }, 0.991760f, 0.000048f ); 
+    instance.registerEObj( "unknown_5", 2002725, 4392603, 4, { -42.923710f, 29.984011f, -56.504211f }, 0.991760f, 0.000048f ); 
+    instance.registerEObj( "unknown_6", 2002726, 4392604, 4, { -19.028080f, 36.148560f, -22.110350f }, 0.991760f, 0.000048f ); 
+    instance.registerEObj( "unknown_7", 2002727, 4392605, 4, { 17.898800f, 44.388432f, -22.415590f }, 0.991760f, 0.000048f ); 
+    instance.registerEObj( "unknown_8", 2002728, 4392606, 4, { 26.840580f, 52.091381f, 10.055660f }, 0.991760f, 0.000048f ); 
+    instance.registerEObj( "unknown_9", 2002729, 4404469, 4, { -41.947140f, 29.984011f, 55.924320f }, 0.991760f, 0.000048f ); 
+    instance.registerEObj( "unknown_10", 2002735, 0, 4, { 0.000000f, 140.000000f, 21.000000f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "sgvf_w_lvd_b0118_3", 2002744, 4390583, 4, { 0.213522f, 139.893402f, 22.075270f }, 1.000000f, 0.000000f ); 
+      // States -> vf_bextwall_on (id: 3) vf_bextwall_of (id: 4) 
+    instance.registerEObj( "sgvf_w_lvd_b0118_4", 2002743, 4390585, 4, { -0.033084f, 140.000000f, -20.026180f }, 1.000000f, 0.000000f ); 
+      // States -> vf_bextwall_on (id: 3) vf_bextwall_of (id: 4) 
+    instance.registerEObj( "unknown_11", 2002742, 4390546, 4, { -11.093380f, 1.388489f, -23.453131f }, 0.991760f, 0.000048f ); 
+    instance.registerEObj( "Aethervalve", 2002730, 4392611, 4, { -0.015320f, 119.981598f, -32.913761f }, 0.991760f, 0.000048f ); 
+    instance.registerEObj( "Aethervalve_1", 2002731, 4392612, 4, { -0.076355f, 139.970901f, 42.618408f }, 0.991760f, 0.000048f ); 
+    instance.registerEObj( "unknown_12", 2002787, 4395239, 4, { -38.345951f, 60.593510f, 21.011600f }, 0.991760f, 0.000048f ); 
+    instance.registerEObj( "unknown_13", 2003436, 4406574, 4, { 41.813019f, 29.999941f, -29.969271f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_14", 2003032, 0, 4, { 42.000000f, 30.000771f, -59.314499f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_15", 2003033, 0, 4, { 42.000000f, 30.000771f, -56.244320f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_16", 2003034, 0, 4, { 42.000000f, 30.000771f, -51.724258f }, 1.000000f, 0.000000f ); 
 
   }
 
-  void onUpdate( InstanceContentPtr instance, uint32_t currTime ) override
+  void onUpdate( InstanceContent& instance, uint32_t currTime ) override
   {
 
   }
 
-  void onEnterTerritory( InstanceContentPtr instance, Entity::Player& player, uint32_t eventId, uint16_t param1,
+  void onEnterTerritory( InstanceContent& instance, Entity::Player& player, uint32_t eventId, uint16_t param1,
                          uint16_t param2 ) override
   {
 
diff --git a/src/scripts/instances/dungeons/PharosSiriusHard.cpp b/src/scripts/instances/dungeons/PharosSiriusHard.cpp
index f74d0f88..b9884c97 100644
--- a/src/scripts/instances/dungeons/PharosSiriusHard.cpp
+++ b/src/scripts/instances/dungeons/PharosSiriusHard.cpp
@@ -9,73 +9,51 @@ class PharosSiriusHard :
 public:
   PharosSiriusHard() :
     Sapphire::ScriptAPI::InstanceContentScript( 40 )
-  {
-  }
+  { }
 
-  void onInit( InstanceContentPtr instance ) override
+  void onInit( InstanceContent& instance ) override
   {
-    instance->registerEObj( "sgvf_w_lvd_b0118", 2002872, 5963936, 4, { -1.480164f, 93.003777f, -23.788879f }, 0.991760f,
-                            0.000048f );
-    // States -> vf_bextwall_on vf_bextwall_of
-    instance->registerEObj( "unknown_0", 2002735, 0, 4, { -0.228943f, 93.016541f, -22.052860f }, 0.869751f, 0.000048f );
-    instance->registerEObj( "sgvf_w_lvd_b0118_1", 2002872, 5963943, 4, { 21.051910f, 90.039482f, -0.641622f },
-                            1.000000f, 0.000000f );
-    // States -> vf_bextwall_on vf_bextwall_of
-    instance->registerEObj( "unknown_1", 2006551, 0, 4, { 6.820740f, 90.135010f, -0.717224f }, 0.991760f, 0.000048f );
-    instance->registerEObj( "sgvf_w_lvd_b0118_2", 2002872, 5963945, 4, { 20.515039f, 30.001440f, -55.973820f },
-                            1.000000f, 0.000000f );
-    // States -> vf_bextwall_on vf_bextwall_of
-    instance->registerEObj( "unknown_2", 2002735, 0, 4, { 21.438900f, 30.001369f, -55.832821f }, 0.869751f,
-                            -1.570451f );
-    instance->registerEObj( "sgvf_w_lvd_b0118_3", 2002872, 5963948, 4, { 60.977539f, 30.000811f, -56.096581f },
-                            1.000000f, 0.000000f );
-    // States -> vf_bextwall_on vf_bextwall_of
-    instance->registerEObj( "unknown_3", 2006563, 0, 4, { 42.160641f, 29.984011f, -60.227360f }, 0.991760f, 0.000048f );
-    instance->registerEObj( "sgvf_w_lvd_b0118_4", 2002872, 5963970, 4, { -95.386551f, -5.551003f, -272.570099f },
-                            0.991760f, 0.000048f );
-    // States -> vf_bextwall_on vf_bextwall_of
-    instance->registerEObj( "unknown_4", 2002735, 0, 4, { -95.423126f, -5.551003f, -271.765991f }, 1.000000f,
-                            -0.005750f );
-    instance->registerEObj( "Entrance", 2000182, 5963633, 5, { 39.155338f, 189.990097f, -2.100519f }, 0.991760f,
-                            0.000048f );
-    // States -> vf_lock_on vf_lock_of
-    instance->registerEObj( "Shortcut", 2000700, 0, 4, { 39.255451f, 188.130096f, -17.964260f }, 1.000000f, 0.000000f );
-    instance->registerEObj( "Exit", 2000139, 0, 4, { -95.418854f, -5.446677f, -305.998199f }, 0.991760f, 0.000048f );
-    instance->registerEObj( "unknown_5", 2006461, 5961306, 4, { -42.092682f, 170.000000f, 1.321840f }, 1.000000f,
-                            0.000000f );
-    instance->registerEObj( "unknown_6", 2006462, 5961309, 4, { 0.142279f, 160.000000f, 41.544201f }, 1.000000f,
-                            0.000000f );
-    instance->registerEObj( "unknown_7", 2006463, 5965424, 4, { 1.331733f, 158.160294f, 25.044350f }, 1.000000f,
-                            0.000000f );
-    instance->registerEObj( "unknown_8", 2006464, 5964060, 4, { 0.116699f, 139.949997f, -18.497431f }, 1.000000f,
-                            0.000000f );
-    instance->registerEObj( "Candlekeepkey", 2006467, 0, 4, { 13.504210f, 29.984011f, -54.795170f }, 0.991760f,
-                            0.000048f );
-    instance->registerEObj( "Lockeddoor", 2006470, 5955784, 4, { 15.219990f, 31.371090f, -56.250301f }, 1.000000f,
-                            0.000000f );
-    instance->registerEObj( "unknown_9", 2006465, 5963843, 4, { 32.070061f, 72.230629f, -55.058460f }, 1.000000f,
-                            0.000000f );
-    instance->registerEObj( "unknown_10", 2006466, 5965844, 4, { -0.253021f, 39.999969f, -21.544781f }, 1.000000f,
-                            0.000000f );
-    instance->registerEObj( "Port3526", 2006471, 5960472, 4, { -16.647579f, 7.686357f, -153.002304f }, 0.991760f,
-                            0.000048f );
-    instance->registerEObj( "Port3524", 2006472, 5960468, 4, { -94.266373f, -0.598898f, -227.302200f }, 0.991760f,
-                            0.000048f );
-    instance->registerEObj( "unknown_11", 2006528, 5967682, 4, { 10.338900f, 10.519330f, -124.110298f }, 1.000000f,
-                            0.000000f );
-    instance->registerEObj( "unknown_12", 2006564, 5967692, 4, { -3.081049f, 5.016401f, -212.859802f }, 1.000000f,
-                            0.000000f );
-    instance->registerEObj( "sgpl_w_lvd_collison_only", 2002618, 5993225, 4, { 0.231439f, 90.039482f, -21.072599f },
-                            1.000000f, 0.000000f );
+    instance.registerEObj( "sgvf_w_lvd_b0118", 2002872, 5963936, 4, { -1.480164f, 93.003777f, -23.788879f }, 0.991760f, 0.000048f ); 
+      // States -> vf_bextwall_on (id: 3) vf_bextwall_of (id: 4) 
+    instance.registerEObj( "unknown_0", 2002735, 0, 4, { -0.228943f, 93.016541f, -22.052860f }, 0.869751f, 0.000048f ); 
+    instance.registerEObj( "sgvf_w_lvd_b0118_1", 2002872, 5963943, 4, { 21.051910f, 90.039482f, -0.641622f }, 1.000000f, 0.000000f ); 
+      // States -> vf_bextwall_on (id: 3) vf_bextwall_of (id: 4) 
+    instance.registerEObj( "unknown_1", 2006551, 0, 4, { 6.820740f, 90.135010f, -0.717224f }, 0.991760f, 0.000048f ); 
+    instance.registerEObj( "sgvf_w_lvd_b0118_2", 2002872, 5963945, 4, { 20.515039f, 30.001440f, -55.973820f }, 1.000000f, 0.000000f ); 
+      // States -> vf_bextwall_on (id: 3) vf_bextwall_of (id: 4) 
+    instance.registerEObj( "unknown_2", 2002735, 0, 4, { 21.438900f, 30.001369f, -55.832821f }, 0.869751f, -1.570451f ); 
+    instance.registerEObj( "sgvf_w_lvd_b0118_3", 2002872, 5963948, 4, { 60.977539f, 30.000811f, -56.096581f }, 1.000000f, 0.000000f ); 
+      // States -> vf_bextwall_on (id: 3) vf_bextwall_of (id: 4) 
+    instance.registerEObj( "unknown_3", 2006563, 0, 4, { 42.160641f, 29.984011f, -60.227360f }, 0.991760f, 0.000048f ); 
+    instance.registerEObj( "sgvf_w_lvd_b0118_4", 2002872, 5963970, 4, { -95.386551f, -5.551003f, -272.570099f }, 0.991760f, 0.000048f ); 
+      // States -> vf_bextwall_on (id: 3) vf_bextwall_of (id: 4) 
+    instance.registerEObj( "unknown_4", 2002735, 0, 4, { -95.423126f, -5.551003f, -271.765991f }, 1.000000f, -0.005750f ); 
+    instance.registerEObj( "Entrance", 2000182, 5963633, 5, { 39.155338f, 189.990097f, -2.100519f }, 0.991760f, 0.000048f ); 
+      // States -> vf_lock_on (id: 11) vf_lock_of (id: 12) 
+    instance.registerEObj( "Shortcut", 2000700, 0, 4, { 39.255451f, 188.130096f, -17.964260f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "Exit", 2000139, 0, 4, { -95.418854f, -5.446677f, -305.998199f }, 0.991760f, 0.000048f ); 
+    instance.registerEObj( "unknown_5", 2006461, 5961306, 4, { -42.092682f, 170.000000f, 1.321840f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_6", 2006462, 5961309, 4, { 0.142279f, 160.000000f, 41.544201f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_7", 2006463, 5965424, 4, { 1.331733f, 158.160294f, 25.044350f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_8", 2006464, 5964060, 4, { 0.116699f, 139.949997f, -18.497431f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "Candlekeepkey", 2006467, 0, 4, { 13.504210f, 29.984011f, -54.795170f }, 0.991760f, 0.000048f ); 
+    instance.registerEObj( "Lockeddoor", 2006470, 5955784, 4, { 15.219990f, 31.371090f, -56.250301f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_9", 2006465, 5963843, 4, { 32.070061f, 72.230629f, -55.058460f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_10", 2006466, 5965844, 4, { -0.253021f, 39.999969f, -21.544781f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "Port3526", 2006471, 5960472, 4, { -16.647579f, 7.686357f, -153.002304f }, 0.991760f, 0.000048f ); 
+    instance.registerEObj( "Port3524", 2006472, 5960468, 4, { -94.266373f, -0.598898f, -227.302200f }, 0.991760f, 0.000048f ); 
+    instance.registerEObj( "unknown_11", 2006528, 5967682, 4, { 10.338900f, 10.519330f, -124.110298f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_12", 2006564, 5967692, 4, { -3.081049f, 5.016401f, -212.859802f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "sgpl_w_lvd_collison_only", 2002618, 5993225, 4, { 0.231439f, 90.039482f, -21.072599f }, 1.000000f, 0.000000f ); 
 
   }
 
-  void onUpdate( InstanceContentPtr instance, uint32_t currTime ) override
+  void onUpdate( InstanceContent& instance, uint32_t currTime ) override
   {
 
   }
 
-  void onEnterTerritory( InstanceContentPtr instance, Entity::Player& player, uint32_t eventId, uint16_t param1,
+  void onEnterTerritory( InstanceContent& instance, Entity::Player& player, uint32_t eventId, uint16_t param1,
                          uint16_t param2 ) override
   {
 
diff --git a/src/scripts/instances/dungeons/SaintMociannesArboretum.cpp b/src/scripts/instances/dungeons/SaintMociannesArboretum.cpp
index 58d5c444..97773c79 100644
--- a/src/scripts/instances/dungeons/SaintMociannesArboretum.cpp
+++ b/src/scripts/instances/dungeons/SaintMociannesArboretum.cpp
@@ -9,20 +9,50 @@ class SaintMociannesArboretum :
 public:
   SaintMociannesArboretum() :
     Sapphire::ScriptAPI::InstanceContentScript( 41 )
+  { }
+
+  void onInit( InstanceContent& instance ) override
   {
+    instance.registerEObj( "sgvf_w_lvd_b0118", 2002872, 6038834, 4, { -14.984150f, -350.000000f, -10.860330f }, 1.000000f, 0.622420f ); 
+      // States -> vf_bextwall_on (id: 3) vf_bextwall_of (id: 4) 
+    instance.registerEObj( "Exit", 2000139, 0, 4, { 10.788090f, -350.026703f, 7.522644f }, 0.991760f, 0.609911f ); 
+    instance.registerEObj( "unknown_0", 2002735, 0, 4, { -16.401690f, -350.000000f, -11.633360f }, 1.000000f, -0.981437f ); 
+    instance.registerEObj( "unknown_1", 2006520, 6041801, 4, { 113.481300f, 2.975464f, 19.363649f }, 0.991760f, 0.000048f ); 
+    instance.registerEObj( "unknown_2", 2006521, 6047538, 4, { 67.640343f, 0.000000f, -71.112350f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_3", 2006586, 0, 4, { 85.017906f, -0.020000f, -58.585030f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_4", 2006522, 5966533, 4, { -125.780197f, -12.375120f, -188.891495f }, 0.991760f, 0.000048f ); 
+    instance.registerEObj( "unknown_5", 2006523, 6037786, 4, { -234.627304f, -29.692921f, -182.589401f }, 0.991760f, 0.000048f ); 
+    instance.registerEObj( "unknown_6", 2006594, 6068325, 4, { -244.373505f, -37.105370f, -163.858002f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_7", 2006524, 6046538, 4, { -102.066101f, -349.342285f, 55.198681f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_8", 2006526, 6046053, 4, { -86.535728f, -356.521301f, -4.785355f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_9", 2006527, 6046055, 4, { -104.847900f, -356.059692f, 4.146202f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_10", 2006525, 6046572, 4, { -47.545761f, -359.815613f, -33.600189f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_11", 2006596, 6058396, 4, { -262.334015f, -39.551819f, -111.790802f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_12", 2006597, 6077036, 4, { -248.226898f, -46.000000f, -133.086304f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_13", 2006598, 6077035, 4, { -283.791992f, -46.000000f, -122.796700f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_14", 2006609, 6084794, 4, { -242.938904f, -44.861469f, -84.336670f }, 0.991760f, 0.000048f ); 
+    instance.registerEObj( "sgvf_w_lvd_b0118_1", 2002872, 6037810, 4, { 15.731990f, 3.000000f, -89.860413f }, 0.991760f, 0.000048f ); 
+      // States -> vf_bextwall_on (id: 3) vf_bextwall_of (id: 4) 
+    instance.registerEObj( "unknown_15", 2002735, 0, 4, { 18.234501f, 3.097534f, -90.928528f }, 0.991760f, 1.130897f ); 
+    instance.registerEObj( "sgvf_w_lvd_b0118_2", 2006531, 6037814, 4, { -17.876730f, 3.000000f, -82.649872f }, 1.000000f, 0.000000f ); 
+      // States -> vf_bextwall_on (id: 3) vf_bextwall_of (id: 4) 
+    instance.registerEObj( "sgvf_w_lvd_b0118_3", 2002872, 6041100, 4, { -245.545395f, -36.853828f, -164.052200f }, 1.000000f, 0.000000f ); 
+      // States -> vf_bextwall_on (id: 3) vf_bextwall_of (id: 4) 
+    instance.registerEObj( "unknown_16", 2002735, 0, 4, { -245.869705f, -36.958050f, -162.887695f }, 0.991760f, 0.541627f ); 
+    instance.registerEObj( "unknown_17", 2006532, 6082449, 4, { -260.975098f, -44.815800f, -108.476402f }, 0.991760f, 0.000048f ); 
+    instance.registerEObj( "unknown_18", 2006566, 0, 4, { -263.891296f, -44.889751f, -114.578796f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "Entrance", 2000182, 6034530, 5, { 0.231333f, 0.000002f, 140.623901f }, 1.000000f, 0.000000f ); 
+      // States -> vf_lock_on (id: 11) vf_lock_of (id: 12) 
+    instance.registerEObj( "Shortcut", 2000700, 0, 4, { 4.219861f, 0.000001f, 131.545197f }, 1.000000f, 0.000000f ); 
+
   }
 
-  void onInit( InstanceContentPtr instance ) override
+  void onUpdate( InstanceContent& instance, uint32_t currTime ) override
   {
 
   }
 
-  void onUpdate( InstanceContentPtr instance, uint32_t currTime ) override
-  {
-
-  }
-
-  void onEnterTerritory( InstanceContentPtr instance, Entity::Player& player, uint32_t eventId, uint16_t param1,
+  void onEnterTerritory( InstanceContent& instance, Entity::Player& player, uint32_t eventId, uint16_t param1,
                          uint16_t param2 ) override
   {
 
diff --git a/src/scripts/instances/dungeons/SaintMociannesArboretumHard.cpp b/src/scripts/instances/dungeons/SaintMociannesArboretumHard.cpp
new file mode 100644
index 00000000..a852b70f
--- /dev/null
+++ b/src/scripts/instances/dungeons/SaintMociannesArboretumHard.cpp
@@ -0,0 +1,68 @@
+#include <ScriptObject.h>
+#include <Territory/InstanceContent.h>
+
+using namespace Sapphire;
+
+class SaintMociannesArboretumHard :
+  public Sapphire::ScriptAPI::InstanceContentScript
+{
+public:
+  SaintMociannesArboretumHard() :
+    Sapphire::ScriptAPI::InstanceContentScript( 62 )
+  { }
+
+  void onInit( InstanceContent& instance ) override
+  {
+    instance.registerEObj( "sgvf_w_lvd_b0118", 2002872, 7559255, 4, { 17.974501f, 3.000000f, -90.677597f }, 1.000000f, 1.125737f ); 
+      // States -> vf_bextwall_on (id: 3) vf_bextwall_of (id: 4) 
+    instance.registerEObj( "sgvf_w_lvd_b0118_1", 2002872, 7559254, 4, { -0.052845f, 2.999999f, -62.073700f }, 1.000000f, 0.000000f ); 
+      // States -> vf_bextwall_on (id: 3) vf_bextwall_of (id: 4) 
+    instance.registerEObj( "unknown_0", 2002735, 0, 4, { 17.974501f, 3.000000f, -90.677597f }, 1.000000f, 1.125738f ); 
+    instance.registerEObj( "unknown_1", 2002735, 0, 4, { 70.045998f, -358.660889f, -67.820099f }, 1.688311f, 0.785398f ); 
+    instance.registerEObj( "sgvf_w_lvd_b0118_2", 2002872, 7559344, 4, { 70.045998f, -358.660889f, -67.820099f }, 1.000000f, 0.785398f ); 
+      // States -> vf_bextwall_on (id: 3) vf_bextwall_of (id: 4) 
+    instance.registerEObj( "sgvf_w_lvd_b0118_3", 2002872, 7559345, 4, { 102.958000f, -358.631592f, -100.732101f }, 1.000000f, 0.785398f ); 
+      // States -> vf_bextwall_on (id: 3) vf_bextwall_of (id: 4) 
+    instance.registerEObj( "sgvf_w_lvd_b0118_4", 2002872, 7559351, 4, { 338.763000f, -345.520905f, -336.862915f }, 1.000000f, 0.785398f ); 
+      // States -> vf_bextwall_on (id: 3) vf_bextwall_of (id: 4) 
+    instance.registerEObj( "unknown_2", 2002735, 0, 4, { 338.763000f, -345.520905f, -336.862915f }, 1.400000f, 0.785398f ); 
+    instance.registerEObj( "unknown_3", 2007457, 7515300, 4, { 102.128502f, 2.975464f, 35.873901f }, 0.991760f, 1.004917f ); 
+    instance.registerEObj( "unknown_4", 2007457, 7400978, 4, { 65.087173f, -0.256883f, -77.312302f }, 1.000000f, -0.647398f ); 
+    instance.registerEObj( "unknown_5", 2009584, 0, 4, { 86.116272f, -3.500000f, -58.246311f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_6", 2009584, 0, 4, { 87.258659f, -3.500000f, -55.799931f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_7", 2009584, 0, 4, { 87.003143f, -3.500000f, -64.240150f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_8", 2009584, 0, 4, { 85.276199f, -3.500000f, -62.320759f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_9", 2009584, 0, 4, { 69.948387f, -3.500000f, -54.553860f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_10", 2009584, 0, 4, { 71.547699f, -3.500000f, -53.240009f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_11", 2009584, 0, 4, { 70.050743f, -3.500000f, -57.845982f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_12", 2009584, 0, 4, { 69.676193f, -3.500000f, -61.626770f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_13", 2007457, 7447179, 4, { -44.805130f, -358.181885f, -123.967300f }, 1.000000f, 1.080362f ); 
+    instance.registerEObj( "unknown_14", 2007457, 7447178, 4, { 34.771999f, -359.432800f, -63.961380f }, 1.000000f, 1.325989f ); 
+    instance.registerEObj( "unknown_15", 2007457, 7509045, 4, { 221.466904f, -355.000092f, -183.157898f }, 1.000000f, 1.483875f ); 
+    instance.registerEObj( "unknown_16", 2007457, 7509048, 4, { 290.509186f, -355.000000f, -247.817902f }, 1.000000f, 0.479966f ); 
+    instance.registerEObj( "unknown_17", 2007457, 7515074, 4, { 242.213501f, -355.000000f, -209.642807f }, 1.000000f, -0.523599f ); 
+    instance.registerEObj( "unknown_18", 2007457, 7515073, 4, { 283.367798f, -355.000000f, -227.097702f }, 1.000000f, 0.427606f ); 
+    instance.registerEObj( "Waterconduit", 2009585, 7515078, 4, { 248.199799f, -353.799988f, -211.263702f }, 1.000000f, -0.358281f ); 
+    instance.registerEObj( "Waterconduit_1", 2009586, 7515076, 4, { 287.357208f, -353.810913f, -230.909302f }, 0.991760f, 0.573861f ); 
+    instance.registerEObj( "Entrance", 2000182, 7403516, 5, { -0.091100f, 0.000000f, 140.477798f }, 1.000000f, 0.000000f ); 
+      // States -> vf_lock_on (id: 11) vf_lock_of (id: 12) 
+    instance.registerEObj( "Shortcut", 2000700, 0, 4, { 4.219900f, 0.000000f, 131.545197f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "Exit", 2000139, 0, 4, { 363.235107f, -345.525208f, -361.334991f }, 1.000000f, -0.785398f ); 
+    instance.registerEObj( "unknown_19", 2007457, 7575616, 4, { 352.620697f, -345.510101f, -350.728607f }, 0.991760f, 0.000048f ); 
+
+  }
+
+  void onUpdate( InstanceContent& instance, uint32_t currTime ) override
+  {
+
+  }
+
+  void onEnterTerritory( InstanceContent& instance, Entity::Player& player, uint32_t eventId, uint16_t param1,
+                         uint16_t param2 ) override
+  {
+
+  }
+
+};
+
+EXPOSE_SCRIPT( SaintMociannesArboretumHard );
\ No newline at end of file
diff --git a/src/scripts/instances/dungeons/Sastasha.cpp b/src/scripts/instances/dungeons/Sastasha.cpp
index df74d255..d9a0c89f 100644
--- a/src/scripts/instances/dungeons/Sastasha.cpp
+++ b/src/scripts/instances/dungeons/Sastasha.cpp
@@ -1,6 +1,5 @@
 #include <ScriptObject.h>
 #include <Territory/InstanceContent.h>
-#include <Actor/Player.h>
 
 using namespace Sapphire;
 
@@ -10,110 +9,70 @@ class Sastasha :
 public:
   Sastasha() :
     Sapphire::ScriptAPI::InstanceContentScript( 4 )
-  {
-  }
+  { }
 
-  void onInit( InstanceContentPtr instance ) override
+  void onInit( InstanceContent& instance ) override
   {
-    instance->registerEObj( "unknown_0", 2000211, 0, 4, { 367.827087f, 47.400051f, -226.694305f }, 4.714991f,
-                            0.000432f );
-    instance->registerEObj( "sgvf_w_lvd_b0250", 2001504, 4323996, 4, { 94.597588f, 26.865030f, -68.584061f }, 1.000000f,
-                            0.000000f );
-    // States -> vf_bextwall_on vf_bextwall_of
-    instance->registerEObj( "sgvf_w_lvd_b0249", 2001505, 4323997, 4, { 95.510597f, 26.620729f, -67.853653f }, 1.000000f,
-                            0.000000f );
-    // States -> vf_line_on vf_line_of
-    instance->registerEObj( "unknown_1", 2001506, 3653862, 4, { -9.239832f, 24.789940f, 35.778252f }, 0.991760f,
-                            0.000048f );
-    instance->registerEObj( "sgvf_w_lvd_b0094", 2001507, 4035750, 4, { -2.841087f, 23.114571f, 38.090420f }, 0.991760f,
-                            0.000048f );
-    // States -> vf_line_on vf_line_of
-    instance->registerEObj( "unknown_2", 2001539, 3653864, 4, { -158.560898f, 8.099012f, 214.344803f }, 0.991760f,
-                            0.000048f );
-    instance->registerEObj( "sgvf_w_lvd_b0094_1", 2001540, 4056793, 4, { -163.598602f, 8.026373f, 214.030106f },
-                            0.991760f, 0.000048f );
-    // States -> vf_line_on vf_line_of
-    instance->registerEObj( "sgpl_s1d1_bosswall", 2001508, 4236989, 4, { -303.983612f, 5.576412f, 276.214111f },
-                            1.000000f, 0.000000f );
-    instance->registerEObj( "sgpl_s1d1_bossline", 2001509, 4236990, 4, { -305.302002f, 5.542851f, 275.750885f },
-                            1.000000f, 0.000000f );
-    instance->registerEObj( "Entrance", 2000182, 4096706, 5, { 361.881714f, 46.092751f, -225.181305f }, 1.000000f,
-                            0.000000f );
-    // States -> vf_lock_on vf_lock_of
-    instance->registerEObj( "Shortcut", 2000700, 0, 4, { 344.705688f, 43.781551f, -217.365997f }, 0.991760f,
-                            0.000048f );
-    instance->registerEObj( "Exit", 2000139, 0, 4, { -314.279114f, 5.630589f, 348.735596f }, 0.900235f, 0.000336f );
-    instance->registerEObj( "Bluecoralformation", 2000213, 3668215, 4, { 75.869797f, 35.101421f, -32.537209f },
-                            0.930753f, 0.000240f );
-    instance->registerEObj( "Redcoralformation", 2000214, 3668214, 4, { 88.769371f, 31.135691f, -40.869640f },
-                            0.930753f, 0.000240f );
-    instance->registerEObj( "Greencoralformation", 2000215, 3668216, 4, { 64.988159f, 33.672821f, -56.690559f },
-                            0.991789f, 0.000048f );
-    instance->registerEObj( "Inconspicuousswitch", 2000216, 3653858, 4, { 62.907951f, 33.969521f, -31.172279f },
-                            1.000000f, -1.396264f );
-    instance->registerEObj( "Hiddendoor", 2000217, 3653517, 4, { 59.000000f, 32.000000f, -35.000000f }, 1.000000f,
-                            -2.007129f );
-    instance->registerEObj( "Giantclam", 2000222, 4208408, 4, { 181.170303f, 32.104599f, -128.069000f }, 0.991789f,
-                            -0.862350f );
-    // States -> vf_kai_off vf_kai_on vf_kai_pop close_open open_close
-    instance->registerEObj( "sgbg_s1d1_p1_shel1", 2000260, 4208409, 4, { 166.318695f, 30.735420f, -128.312103f },
-                            0.991789f, 0.481030f );
-    // States -> vf_kai_off vf_kai_on vf_kai_pop close_open open_close
-    instance->registerEObj( "sgbg_s1d1_p1_shel1_1", 2000261, 4208410, 4, { 158.800598f, 28.586321f, -76.340927f },
-                            0.991789f, 1.471638f );
-    // States -> vf_kai_off vf_kai_on vf_kai_pop close_open open_close
-    instance->registerEObj( "sgbg_s1d1_p1_shel1_2", 2000262, 4208411, 4, { 125.463402f, 29.260550f, -51.934608f },
-                            0.991789f, -0.375975f );
-    // States -> vf_kai_off vf_kai_on vf_kai_pop close_open open_close
-    instance->registerEObj( "sgbg_s1d1_p1_shel1_3", 2000263, 4208412, 4, { 126.070198f, 28.913260f, -99.908722f },
-                            1.000000f, 0.020540f );
-    // States -> vf_kai_off vf_kai_on vf_kai_pop close_open open_close
-    instance->registerEObj( "sgbg_s1d1_p1_shel1_4", 2000264, 4208413, 4, { 97.055313f, 27.081551f, -70.264381f },
-                            0.991789f, -0.618915f );
-    // States -> vf_kai_off vf_kai_on vf_kai_pop close_open open_close
-    instance->registerEObj( "Bloodymemo", 2000212, 0, 4, { 320.812988f, 47.862450f, -130.776306f }, 0.600000f,
-                            -0.898762f );
-    instance->registerEObj( "Bloodymemo_1", 2001548, 0, 4, { 320.812988f, 47.862450f, -130.776306f }, 0.600000f,
-                            -0.898762f );
-    instance->registerEObj( "Bloodymemo_2", 2001549, 0, 4, { 320.812988f, 47.862450f, -130.776306f }, 0.600000f,
-                            -0.898762f );
-    instance->registerEObj( "Rambadedoor", 2000225, 3653865, 4, { -35.299999f, 24.000000f, 60.799999f }, 1.000000f,
-                            -2.007129f );
-    instance->registerEObj( "Captainsquarters", 2000227, 3687697, 4, { -95.044670f, 20.513069f, 172.039597f },
-                            0.991789f, 0.000048f );
-    instance->registerEObj( "WaveriderGate", 2000231, 3655909, 4, { -130.600006f, 16.000000f, 156.800003f }, 1.000000f,
-                            -2.007129f );
-    instance->registerEObj( "TheHole", 2000232, 3656260, 4, { -36.000000f, 16.500000f, 163.300003f }, 1.000000f,
-                            1.047198f );
-    instance->registerEObj( "Rambadedoor_1", 2000236, 3655908, 4, { -190.000000f, 7.000000f, 252.000000f }, 1.000000f,
-                            -2.443461f );
-    instance->registerEObj( "unknown_3", 2000235, 3656262, 4, { -156.500000f, 8.600000f, 252.500000f }, 1.000000f,
-                            1.134464f );
-    instance->registerEObj( "WaveriderGatekey", 2000255, 0, 4, { -95.515343f, 20.000000f, 177.197800f }, 1.000000f,
-                            0.000000f );
-    instance->registerEObj( "KeytotheHole", 2000256, 0, 4, { -38.076599f, 17.232731f, 158.839401f }, 0.991760f,
-                            1.561760f );
-    instance->registerEObj( "Captainsquarterskey", 2000250, 0, 4, { -100.625000f, 15.600010f, 137.150696f }, 1.000000f,
-                            0.000000f );
-    instance->registerEObj( "sgpl_s1d1_sghit_ctrl", 2000223, 4200832, 4, { -24.018980f, 18.475060f, 111.404900f },
-                            1.000000f, 0.000000f );
-    instance->registerEObj( "Unnaturalripples", 2000405, 3992454, 4, { -301.973206f, 6.500000f, 300.029388f },
-                            0.991789f, 0.000048f );
-    instance->registerEObj( "Unnaturalripples_1", 2000406, 3992452, 4, { -302.037598f, 6.500000f, 336.047302f },
-                            1.000000f, 0.000000f );
-    instance->registerEObj( "Unnaturalripples_2", 2000407, 3992449, 4, { -338.036499f, 6.500000f, 300.206512f },
-                            0.991789f, 0.000048f );
-    instance->registerEObj( "Unnaturalripples_3", 2000408, 3992453, 4, { -337.929596f, 6.500000f, 335.975311f },
-                            1.000000f, 0.000000f );
+    instance.registerEObj( "unknown_0", 2000211, 0, 4, { 367.827087f, 47.400051f, -226.694305f }, 4.714991f, 0.000432f ); 
+    instance.registerEObj( "sgvf_w_lvd_b0250", 2001504, 4323996, 4, { 94.597588f, 26.865030f, -68.584061f }, 1.000000f, 0.000000f ); 
+      // States -> vf_bextwall_on (id: 3) vf_bextwall_of (id: 4) 
+    instance.registerEObj( "sgvf_w_lvd_b0249", 2001505, 4323997, 4, { 95.510597f, 26.620729f, -67.853653f }, 1.000000f, 0.000000f ); 
+      // States -> vf_line_on (id: 10) vf_line_of (id: 11) 
+    instance.registerEObj( "unknown_1", 2001506, 3653862, 4, { -9.239832f, 24.789940f, 35.778252f }, 0.991760f, 0.000048f ); 
+    instance.registerEObj( "sgvf_w_lvd_b0094", 2001507, 4035750, 4, { -2.841087f, 23.114571f, 38.090420f }, 0.991760f, 0.000048f ); 
+      // States -> vf_line_on (id: 12) vf_line_of (id: 13) 
+    instance.registerEObj( "unknown_2", 2001539, 3653864, 4, { -158.560898f, 8.099012f, 214.344803f }, 0.991760f, 0.000048f ); 
+    instance.registerEObj( "sgvf_w_lvd_b0094_1", 2001540, 4056793, 4, { -163.598602f, 8.026373f, 214.030106f }, 0.991760f, 0.000048f ); 
+      // States -> vf_line_on (id: 12) vf_line_of (id: 13) 
+    instance.registerEObj( "sgpl_s1d1_bosswall", 2001508, 4236989, 4, { -303.983612f, 5.576412f, 276.214111f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "sgpl_s1d1_bossline", 2001509, 4236990, 4, { -305.302002f, 5.542851f, 275.750885f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "Entrance", 2000182, 4096706, 5, { 361.881714f, 46.092751f, -225.181305f }, 1.000000f, 0.000000f ); 
+      // States -> vf_lock_on (id: 11) vf_lock_of (id: 12) 
+    instance.registerEObj( "Shortcut", 2000700, 0, 4, { 344.705688f, 43.781551f, -217.365997f }, 0.991760f, 0.000048f ); 
+    instance.registerEObj( "Exit", 2000139, 0, 4, { -314.279114f, 5.630589f, 348.735596f }, 0.900235f, 0.000336f ); 
+    instance.registerEObj( "Bluecoralformation", 2000213, 3668215, 4, { 75.869797f, 35.101421f, -32.537209f }, 0.930753f, 0.000240f ); 
+    instance.registerEObj( "Redcoralformation", 2000214, 3668214, 4, { 88.769371f, 31.135691f, -40.869640f }, 0.930753f, 0.000240f ); 
+    instance.registerEObj( "Greencoralformation", 2000215, 3668216, 4, { 64.988159f, 33.672821f, -56.690559f }, 0.991789f, 0.000048f ); 
+    instance.registerEObj( "Inconspicuousswitch", 2000216, 3653858, 4, { 62.907951f, 33.969521f, -31.172279f }, 1.000000f, -1.396264f ); 
+    instance.registerEObj( "Hiddendoor", 2000217, 3653517, 4, { 59.000000f, 32.000000f, -35.000000f }, 1.000000f, -2.007129f ); 
+    instance.registerEObj( "Giantclam", 2000222, 4208408, 4, { 181.170303f, 32.104599f, -128.069000f }, 0.991789f, -0.862350f ); 
+      // States -> vf_kai_off (id: 4) vf_kai_on (id: 5) vf_kai_pop (id: 6) close_open (id: 7) open_close (id: 8) 
+    instance.registerEObj( "sgbg_s1d1_p1_shel1", 2000260, 4208409, 4, { 166.318695f, 30.735420f, -128.312103f }, 0.991789f, 0.481030f ); 
+      // States -> vf_kai_off (id: 4) vf_kai_on (id: 5) vf_kai_pop (id: 6) close_open (id: 7) open_close (id: 8) 
+    instance.registerEObj( "sgbg_s1d1_p1_shel1_1", 2000261, 4208410, 4, { 158.800598f, 28.586321f, -76.340927f }, 0.991789f, 1.471638f ); 
+      // States -> vf_kai_off (id: 4) vf_kai_on (id: 5) vf_kai_pop (id: 6) close_open (id: 7) open_close (id: 8) 
+    instance.registerEObj( "sgbg_s1d1_p1_shel1_2", 2000262, 4208411, 4, { 125.463402f, 29.260550f, -51.934608f }, 0.991789f, -0.375975f ); 
+      // States -> vf_kai_off (id: 4) vf_kai_on (id: 5) vf_kai_pop (id: 6) close_open (id: 7) open_close (id: 8) 
+    instance.registerEObj( "sgbg_s1d1_p1_shel1_3", 2000263, 4208412, 4, { 126.070198f, 28.913260f, -99.908722f }, 1.000000f, 0.020540f ); 
+      // States -> vf_kai_off (id: 4) vf_kai_on (id: 5) vf_kai_pop (id: 6) close_open (id: 7) open_close (id: 8) 
+    instance.registerEObj( "sgbg_s1d1_p1_shel1_4", 2000264, 4208413, 4, { 97.055313f, 27.081551f, -70.264381f }, 0.991789f, -0.618915f ); 
+      // States -> vf_kai_off (id: 4) vf_kai_on (id: 5) vf_kai_pop (id: 6) close_open (id: 7) open_close (id: 8) 
+    instance.registerEObj( "Bloodymemo", 2000212, 0, 4, { 320.812988f, 47.862450f, -130.776306f }, 0.600000f, -0.898762f ); 
+    instance.registerEObj( "Bloodymemo_1", 2001548, 0, 4, { 320.812988f, 47.862450f, -130.776306f }, 0.600000f, -0.898762f ); 
+    instance.registerEObj( "Bloodymemo_2", 2001549, 0, 4, { 320.812988f, 47.862450f, -130.776306f }, 0.600000f, -0.898762f ); 
+    instance.registerEObj( "Rambadedoor", 2000225, 3653865, 4, { -35.299999f, 24.000000f, 60.799999f }, 1.000000f, -2.007129f ); 
+    instance.registerEObj( "Captainsquarters", 2000227, 3687697, 4, { -95.044670f, 20.513069f, 172.039597f }, 0.991789f, 0.000048f ); 
+    instance.registerEObj( "WaveriderGate", 2000231, 3655909, 4, { -130.600006f, 16.000000f, 156.800003f }, 1.000000f, -2.007129f ); 
+    instance.registerEObj( "TheHole", 2000232, 3656260, 4, { -36.000000f, 16.500000f, 163.300003f }, 1.000000f, 1.047198f ); 
+    instance.registerEObj( "Rambadedoor_1", 2000236, 3655908, 4, { -190.000000f, 7.000000f, 252.000000f }, 1.000000f, -2.443461f ); 
+    instance.registerEObj( "unknown_3", 2000235, 3656262, 4, { -156.500000f, 8.600000f, 252.500000f }, 1.000000f, 1.134464f ); 
+    instance.registerEObj( "WaveriderGatekey", 2000255, 0, 4, { -95.515343f, 20.000000f, 177.197800f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "KeytotheHole", 2000256, 0, 4, { -38.076599f, 17.232731f, 158.839401f }, 0.991760f, 1.561760f ); 
+    instance.registerEObj( "Captainsquarterskey", 2000250, 0, 4, { -100.625000f, 15.600010f, 137.150696f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "sgpl_s1d1_sghit_ctrl", 2000223, 4200832, 4, { -24.018980f, 18.475060f, 111.404900f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "Unnaturalripples", 2000405, 3992454, 4, { -301.973206f, 6.500000f, 300.029388f }, 0.991789f, 0.000048f ); 
+    instance.registerEObj( "Unnaturalripples_1", 2000406, 3992452, 4, { -302.037598f, 6.500000f, 336.047302f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "Unnaturalripples_2", 2000407, 3992449, 4, { -338.036499f, 6.500000f, 300.206512f }, 0.991789f, 0.000048f ); 
+    instance.registerEObj( "Unnaturalripples_3", 2000408, 3992453, 4, { -337.929596f, 6.500000f, 335.975311f }, 1.000000f, 0.000000f ); 
 
   }
 
-  void onUpdate( InstanceContentPtr instance, uint32_t currTime ) override
+  void onUpdate( InstanceContent& instance, uint32_t currTime ) override
   {
 
   }
 
-  void onEnterTerritory( InstanceContentPtr instance, Entity::Player& player, uint32_t eventId, uint16_t param1,
+  void onEnterTerritory( InstanceContent& instance, Entity::Player& player, uint32_t eventId, uint16_t param1,
                          uint16_t param2 ) override
   {
 
diff --git a/src/scripts/instances/dungeons/SastashaHard.cpp b/src/scripts/instances/dungeons/SastashaHard.cpp
index a8183829..450ca5fa 100644
--- a/src/scripts/instances/dungeons/SastashaHard.cpp
+++ b/src/scripts/instances/dungeons/SastashaHard.cpp
@@ -9,94 +9,59 @@ class SastashaHard :
 public:
   SastashaHard() :
     Sapphire::ScriptAPI::InstanceContentScript( 28 )
-  {
-  }
+  { }
 
-  void onInit( InstanceContentPtr instance ) override
+  void onInit( InstanceContent& instance ) override
   {
-    instance->registerEObj( "unknown_0", 2002735, 0, 4, { 157.165298f, 14.000000f, -65.283813f }, 1.000000f,
-                            0.443513f );
-    instance->registerEObj( "sgvf_w_lvd_b0118", 2002872, 4887881, 4, { 157.156601f, 14.074050f, -62.918228f },
-                            1.000000f, 0.000000f );
-    // States -> vf_bextwall_on vf_bextwall_of
-    instance->registerEObj( "sgvf_w_lvd_b0118_1", 2002872, 4887882, 4, { 143.947693f, 14.031430f, -75.422539f },
-                            1.000000f, 0.000000f );
-    // States -> vf_bextwall_on vf_bextwall_of
-    instance->registerEObj( "unknown_1", 2002735, 0, 4, { -103.378998f, 15.750010f, 113.646400f }, 0.991760f,
-                            0.000048f );
-    instance->registerEObj( "sgvf_w_lvd_b0118_2", 2002872, 4887934, 4, { -102.988998f, 14.900710f, 111.903198f },
-                            1.000000f, 0.000000f );
-    // States -> vf_bextwall_on vf_bextwall_of
-    instance->registerEObj( "unknown_2", 2002872, 4868757, 4, { -120.026100f, 15.610280f, 152.360199f }, 1.000000f,
-                            0.000000f );
-    instance->registerEObj( "unknown_3", 2002735, 0, 4, { -300.099213f, 5.569519f, 278.309296f }, 1.000000f,
-                            -0.000000f );
-    instance->registerEObj( "Exit", 2000139, 0, 4, { -326.124603f, 5.082251f, 320.072388f }, 1.000000f, 0.000000f );
-    instance->registerEObj( "unknown_4", 2004421, 4769863, 4, { 228.091507f, 40.730598f, -164.119293f }, 1.000000f,
-                            0.000000f );
-    instance->registerEObj( "Drainagepump", 2004406, 4768296, 4, { 179.233200f, 33.911160f, -25.225599f }, 1.000000f,
-                            0.000000f );
-    instance->registerEObj( "unknown_5", 2004405, 4768239, 4, { 164.693695f, 26.418791f, -51.467159f }, 1.000000f,
-                            0.000000f );
-    instance->registerEObj( "unknown_6", 2004407, 4877642, 4, { 116.227898f, 13.992490f, -60.624149f }, 0.991760f,
-                            0.000048f );
-    instance->registerEObj( "unknown_7", 2004408, 4867860, 4, { 94.502289f, 14.098320f, -72.764816f }, 1.000000f,
-                            0.000000f );
-    instance->registerEObj( "unknown_8", 2004409, 4867859, 4, { 61.426201f, 16.933029f, -87.107803f }, 1.000000f,
-                            0.000000f );
-    instance->registerEObj( "unknown_9", 2004410, 4878592, 4, { -14.773780f, 12.568780f, -21.590240f }, 1.000000f,
-                            0.000000f );
-    instance->registerEObj( "unknown_10", 2004411, 4878584, 4, { -34.366249f, 12.620500f, -10.794950f }, 1.000000f,
-                            0.000000f );
-    instance->registerEObj( "unknown_11", 2004412, 4878593, 4, { -38.197849f, 12.744050f, -32.694260f }, 1.000000f,
-                            0.000000f );
-    instance->registerEObj( "unknown_12", 2004422, 4770074, 4, { -47.051659f, 12.731530f, -15.329430f }, 1.000000f,
-                            0.000000f );
-    instance->registerEObj( "unknown_13", 2004413, 4878605, 4, { -75.129097f, 7.724828f, -3.396252f }, 1.000000f,
-                            0.000000f );
-    instance->registerEObj( "unknown_14", 2004414, 4878604, 4, { -67.776993f, 7.424381f, 10.125570f }, 1.000000f,
-                            0.000000f );
-    instance->registerEObj( "unknown_15", 2004415, 4878603, 4, { -74.879089f, 7.540010f, 24.726391f }, 1.000000f,
-                            0.000000f );
-    instance->registerEObj( "unknown_16", 2004416, 4878609, 4, { -92.286110f, 7.701883f, 26.123421f }, 1.000000f,
-                            0.000000f );
-    instance->registerEObj( "unknown_17", 2004417, 4878523, 4, { -103.974098f, 8.528216f, 17.928379f }, 1.000000f,
-                            0.000000f );
-    instance->registerEObj( "unknown_18", 2004418, 4878606, 4, { -107.137001f, 7.762873f, 7.250639f }, 1.000000f,
-                            0.000000f );
-    instance->registerEObj( "unknown_19", 2004419, 4878607, 4, { -97.134842f, 7.622185f, -4.976304f }, 1.000000f,
-                            0.000000f );
-    instance->registerEObj( "unknown_20", 2004420, 4878608, 4, { -83.913422f, 7.926591f, -9.813313f }, 1.000000f,
-                            0.000000f );
-    instance->registerEObj( "unknown_21", 2004423, 4770075, 4, { -84.640503f, 7.804197f, 29.907909f }, 1.000000f,
-                            0.000000f );
-    instance->registerEObj( "DoortoDeadMansDrink", 2004424, 4765267, 4, { -96.240341f, 19.268089f, 87.404861f },
-                            1.000000f, 0.000000f );
-    instance->registerEObj( "unknown_22", 2004425, 4761283, 4, { -188.014496f, 7.483281f, 252.162704f }, 1.000000f,
-                            0.000000f );
-    instance->registerEObj( "unknown_23", 2004426, 4762024, 4, { -299.676086f, 5.576687f, 280.853699f }, 1.000000f,
-                            0.000000f );
-    instance->registerEObj( "unknown_24", 2004429, 0, 4, { -302.662689f, 5.569519f, 269.489502f }, 0.991760f,
-                            0.000048f );
-    instance->registerEObj( "unknown_25", 2004441, 4765263, 4, { -130.635300f, 16.327169f, 156.933502f }, 0.991760f,
-                            0.000048f );
-    instance->registerEObj( "sgpl_w_lvd_board_col_on_off", 2004428, 4890021, 4,
-                            { -295.493286f, 5.576687f, 275.610901f }, 1.000000f, 0.000000f );
-    // States -> col_on col_off
-    instance->registerEObj( "Entrance", 2000182, 4878710, 5, { 347.674713f, 44.019909f, -221.552002f }, 1.000000f,
-                            0.000000f );
-    // States -> vf_lock_on vf_lock_of
-    instance->registerEObj( "Shortcut", 2000700, 0, 4, { 328.774994f, 44.119980f, -229.481705f }, 1.000000f,
-                            0.000000f );
+    instance.registerEObj( "unknown_0", 2002735, 0, 4, { 157.165298f, 14.000000f, -65.283813f }, 1.000000f, 0.443513f ); 
+    instance.registerEObj( "sgvf_w_lvd_b0118", 2002872, 4887881, 4, { 157.156601f, 14.074050f, -62.918228f }, 1.000000f, 0.000000f ); 
+      // States -> vf_bextwall_on (id: 3) vf_bextwall_of (id: 4) 
+    instance.registerEObj( "sgvf_w_lvd_b0118_1", 2002872, 4887882, 4, { 143.947693f, 14.031430f, -75.422539f }, 1.000000f, 0.000000f ); 
+      // States -> vf_bextwall_on (id: 3) vf_bextwall_of (id: 4) 
+    instance.registerEObj( "unknown_1", 2002735, 0, 4, { -103.378998f, 15.750010f, 113.646400f }, 0.991760f, 0.000048f ); 
+    instance.registerEObj( "sgvf_w_lvd_b0118_2", 2002872, 4887934, 4, { -102.988998f, 14.900710f, 111.903198f }, 1.000000f, 0.000000f ); 
+      // States -> vf_bextwall_on (id: 3) vf_bextwall_of (id: 4) 
+    instance.registerEObj( "unknown_2", 2002872, 4868757, 4, { -120.026100f, 15.610280f, 152.360199f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_3", 2002735, 0, 4, { -300.099213f, 5.569519f, 278.309296f }, 1.000000f, -0.000000f ); 
+    instance.registerEObj( "Exit", 2000139, 0, 4, { -326.124603f, 5.082251f, 320.072388f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_4", 2004421, 4769863, 4, { 228.091507f, 40.730598f, -164.119293f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "Drainagepump", 2004406, 4768296, 4, { 179.233200f, 33.911160f, -25.225599f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_5", 2004405, 4768239, 4, { 164.693695f, 26.418791f, -51.467159f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_6", 2004407, 4877642, 4, { 116.227898f, 13.992490f, -60.624149f }, 0.991760f, 0.000048f ); 
+    instance.registerEObj( "unknown_7", 2004408, 4867860, 4, { 94.502289f, 14.098320f, -72.764816f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_8", 2004409, 4867859, 4, { 61.426201f, 16.933029f, -87.107803f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_9", 2004410, 4878592, 4, { -14.773780f, 12.568780f, -21.590240f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_10", 2004411, 4878584, 4, { -34.366249f, 12.620500f, -10.794950f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_11", 2004412, 4878593, 4, { -38.197849f, 12.744050f, -32.694260f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_12", 2004422, 4770074, 4, { -47.051659f, 12.731530f, -15.329430f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_13", 2004413, 4878605, 4, { -75.129097f, 7.724828f, -3.396252f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_14", 2004414, 4878604, 4, { -67.776993f, 7.424381f, 10.125570f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_15", 2004415, 4878603, 4, { -74.879089f, 7.540010f, 24.726391f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_16", 2004416, 4878609, 4, { -92.286110f, 7.701883f, 26.123421f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_17", 2004417, 4878523, 4, { -103.974098f, 8.528216f, 17.928379f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_18", 2004418, 4878606, 4, { -107.137001f, 7.762873f, 7.250639f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_19", 2004419, 4878607, 4, { -97.134842f, 7.622185f, -4.976304f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_20", 2004420, 4878608, 4, { -83.913422f, 7.926591f, -9.813313f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_21", 2004423, 4770075, 4, { -84.640503f, 7.804197f, 29.907909f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "DoortoDeadMansDrink", 2004424, 4765267, 4, { -96.240341f, 19.268089f, 87.404861f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_22", 2004425, 4761283, 4, { -188.014496f, 7.483281f, 252.162704f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_23", 2004426, 4762024, 4, { -299.676086f, 5.576687f, 280.853699f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_24", 2004429, 0, 4, { -302.662689f, 5.569519f, 269.489502f }, 0.991760f, 0.000048f ); 
+    instance.registerEObj( "unknown_25", 2004441, 4765263, 4, { -130.635300f, 16.327169f, 156.933502f }, 0.991760f, 0.000048f ); 
+    instance.registerEObj( "sgpl_w_lvd_board_col_on_off", 2004428, 4890021, 4, { -295.493286f, 5.576687f, 275.610901f }, 1.000000f, 0.000000f ); 
+      // States -> col_on (id: 17) col_off (id: 18) 
+    instance.registerEObj( "Entrance", 2000182, 4878710, 5, { 347.674713f, 44.019909f, -221.552002f }, 1.000000f, 0.000000f ); 
+      // States -> vf_lock_on (id: 11) vf_lock_of (id: 12) 
+    instance.registerEObj( "Shortcut", 2000700, 0, 4, { 328.774994f, 44.119980f, -229.481705f }, 1.000000f, 0.000000f ); 
 
   }
 
-  void onUpdate( InstanceContentPtr instance, uint32_t currTime ) override
+  void onUpdate( InstanceContent& instance, uint32_t currTime ) override
   {
 
   }
 
-  void onEnterTerritory( InstanceContentPtr instance, Entity::Player& player, uint32_t eventId, uint16_t param1,
+  void onEnterTerritory( InstanceContent& instance, Entity::Player& player, uint32_t eventId, uint16_t param1,
                          uint16_t param2 ) override
   {
 
diff --git a/src/scripts/instances/dungeons/ShisuioftheVioletTides.cpp b/src/scripts/instances/dungeons/ShisuioftheVioletTides.cpp
index ff64efe8..5a5f9249 100644
--- a/src/scripts/instances/dungeons/ShisuioftheVioletTides.cpp
+++ b/src/scripts/instances/dungeons/ShisuioftheVioletTides.cpp
@@ -9,20 +9,67 @@ class ShisuioftheVioletTides :
 public:
   ShisuioftheVioletTides() :
     Sapphire::ScriptAPI::InstanceContentScript( 50 )
+  { }
+
+  void onInit( InstanceContent& instance ) override
   {
+    instance.registerEObj( "Entrance", 2000182, 6526609, 5, { 8.208527f, 11.171570f, 362.661407f }, 1.000000f, 0.000000f ); 
+      // States -> vf_lock_on (id: 11) vf_lock_of (id: 12) 
+    instance.registerEObj( "Shortcut", 2000700, 0, 4, { 12.390300f, 9.221273f, 350.790100f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "sgvf_w_lvd_b0118", 2002872, 6709633, 4, { 0.322443f, 45.921879f, -411.857788f }, 1.000000f, 0.000000f ); 
+      // States -> vf_bextwall_on (id: 3) vf_bextwall_of (id: 4) 
+    instance.registerEObj( "unknown_0", 2002735, 0, 4, { -0.011370f, 45.921879f, -412.896698f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "Exit", 2000139, 0, 4, { 0.069154f, 45.921871f, -447.611115f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_1", 2008110, 6865017, 4, { -0.060144f, 45.921879f, -430.535889f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_2", 2007457, 6890670, 4, { 5.646293f, 45.921879f, -440.096588f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "sgvf_w_lvd_b0118_1", 2002872, 6709518, 4, { -0.364792f, 18.299490f, 91.107010f }, 1.000000f, 0.000000f ); 
+      // States -> vf_bextwall_on (id: 3) vf_bextwall_of (id: 4) 
+    instance.registerEObj( "unknown_3", 2002735, 0, 4, { 0.033326f, 18.500010f, 89.883667f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "sgvf_w_lvd_b0118_2", 2007771, 6709586, 4, { -0.180471f, 18.500010f, 50.377258f }, 1.000000f, 0.000000f ); 
+      // States -> vf_bextwall_on (id: 3) vf_bextwall_of (id: 4) 
+    instance.registerEObj( "unknown_4", 2008311, 0, 4, { -7.074059f, 18.500019f, 72.067329f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_5", 2008312, 0, 4, { 5.212873f, 18.500019f, 72.435066f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "sgvf_w_lvd_b0118_3", 2002872, 6709598, 4, { 0.399389f, 26.954840f, -187.217804f }, 1.000000f, 0.000000f ); 
+      // States -> vf_bextwall_on (id: 3) vf_bextwall_of (id: 4) 
+    instance.registerEObj( "sgvf_w_lvd_b0118_4", 2007772, 6709615, 4, { -17.157890f, 27.250010f, -208.294098f }, 1.000000f, 0.000000f ); 
+      // States -> vf_bextwall_on (id: 3) vf_bextwall_of (id: 4) 
+    instance.registerEObj( "unknown_6", 2002735, 0, 4, { 0.044392f, 27.249910f, -188.679199f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_7", 2008106, 6869249, 4, { -8.237946f, 27.250010f, -216.909500f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_8", 2008107, 6869206, 4, { -7.564978f, 27.250010f, -199.660095f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_9", 2008108, 6869244, 4, { 8.748951f, 27.249981f, -199.725601f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_10", 2008109, 6869228, 4, { 8.554644f, 27.250010f, -216.964706f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_11", 2007745, 6496157, 4, { 6.118062f, 6.997511f, 335.203186f }, 0.991760f, 0.000048f ); 
+    instance.registerEObj( "unknown_12", 2007746, 6502056, 4, { 29.832279f, -1.756603f, 291.307404f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_13", 2007747, 6502057, 4, { 0.594021f, -3.646973f, 227.895996f }, 0.991760f, 0.000048f ); 
+    instance.registerEObj( "unknown_14", 2007748, 6502133, 4, { 19.059891f, -3.462188f, 230.198303f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_15", 2007749, 6502058, 4, { -3.533240f, -5.778060f, 244.420105f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_16", 2007750, 6502145, 4, { -55.424740f, 7.160790f, 138.440201f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_17", 2007751, 6502143, 4, { -40.800652f, 6.339986f, 152.161407f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_18", 2007752, 6502138, 4, { -42.255699f, 6.735332f, 144.687607f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_19", 2007762, 6502139, 4, { -58.166401f, 3.768957f, 197.653702f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_20", 2007763, 6502141, 4, { -46.675800f, 6.647403f, 136.313400f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_21", 2007764, 0, 4, { -25.192690f, 6.973328f, 142.992203f }, 0.991760f, 0.000048f ); 
+    instance.registerEObj( "unknown_22", 2007753, 6502709, 4, { -9.730975f, -4.657778f, 229.435501f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_23", 2007754, 6502794, 4, { -19.627199f, 7.090509f, 140.629501f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_24", 2007767, 6526733, 4, { -52.219410f, 6.701191f, 142.932297f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_25", 2007770, 6514679, 4, { 0.421847f, 21.000000f, 23.917980f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_26", 2007768, 6708902, 4, { -42.045250f, 6.286057f, 150.394806f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_27", 2007769, 6708901, 4, { -56.005989f, 6.588723f, 144.949600f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_28", 2007755, 6504391, 4, { 0.527385f, 26.000010f, -18.338779f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_29", 2007756, 6504406, 4, { 0.118717f, 26.000010f, -49.912861f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_30", 2007757, 6504429, 4, { 0.465194f, 26.078131f, -80.333969f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_31", 2007758, 6504452, 4, { -0.073714f, 26.078131f, -165.829300f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_32", 2007759, 6517284, 4, { 9.887736f, 30.921881f, -285.783295f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_33", 2007760, 6517285, 4, { 0.046282f, 40.921879f, -372.485901f }, 1.000000f, 0.000000f ); 
+
   }
 
-  void onInit( InstanceContentPtr instance ) override
+  void onUpdate( InstanceContent& instance, uint32_t currTime ) override
   {
 
   }
 
-  void onUpdate( InstanceContentPtr instance, uint32_t currTime ) override
-  {
-
-  }
-
-  void onEnterTerritory( InstanceContentPtr instance, Entity::Player& player, uint32_t eventId, uint16_t param1,
+  void onEnterTerritory( InstanceContent& instance, Entity::Player& player, uint32_t eventId, uint16_t param1,
                          uint16_t param2 ) override
   {
 
diff --git a/src/scripts/instances/dungeons/Snowcloak.cpp b/src/scripts/instances/dungeons/Snowcloak.cpp
index 5b4375c9..5031d0c4 100644
--- a/src/scripts/instances/dungeons/Snowcloak.cpp
+++ b/src/scripts/instances/dungeons/Snowcloak.cpp
@@ -9,98 +9,65 @@ class Snowcloak :
 public:
   Snowcloak() :
     Sapphire::ScriptAPI::InstanceContentScript( 27 )
-  {
-  }
+  { }
 
-  void onInit( InstanceContentPtr instance ) override
+  void onInit( InstanceContent& instance ) override
   {
-    instance->registerEObj( "unknown_0", 2002735, 0, 4, { -25.554501f, 40.000000f, 65.525902f }, 1.000000f,
-                            -1.570451f );
-    instance->registerEObj( "sgvf_w_lvd_b0118", 2002872, 4729361, 4, { -29.985430f, 40.000000f, 65.539711f }, 1.000000f,
-                            0.000000f );
-    // States -> vf_bextwall_on vf_bextwall_of
-    instance->registerEObj( "DoortoSilence", 2004203, 4680394, 4, { 57.114368f, 4.480070f, -45.937630f }, 1.000000f,
-                            0.000000f );
-    instance->registerEObj( "unknown_1", 2004204, 4682554, 4, { 40.009041f, 0.491693f, -60.195160f }, 1.000000f,
-                            0.000000f );
-    instance->registerEObj( "sgbg_r1d3_t2_ball1", 2004206, 4725471, 4, { 32.621071f, -4.715674f, -117.578201f },
-                            1.000000f, 0.000000f );
-    // States -> s_ball_def s_ball_anim
-    instance->registerEObj( "sgbg_r1d3_t2_ball1_1", 2004206, 4731431, 4, { 5.652817f, -1.779197f, -107.755600f },
-                            1.000000f, 0.000000f );
-    // States -> s_ball_def s_ball_anim
-    instance->registerEObj( "sgvf_r1d3_b0435", 2004208, 4895362, 4, { -30.982800f, -10.047770f, -162.841003f },
-                            1.000000f, 0.000000f );
-    // States -> wind_sw_anim wind_def wind_strong wind_ws_anim
-    instance->registerEObj( "unknown_2", 2004209, 4685130, 4, { -39.827599f, -10.619430f, -155.585907f }, 1.000000f,
-                            0.000000f );
-    instance->registerEObj( "sgvf_r1d3_b0435_1", 2004210, 4895363, 4, { -53.244961f, 3.577940f, -135.326797f },
-                            1.000000f, 0.000000f );
-    // States -> wind_sw_anim wind_def wind_strong wind_ws_anim
-    instance->registerEObj( "unknown_3", 2004211, 4685137, 4, { -57.355659f, 4.520907f, -101.443703f }, 1.000000f,
-                            0.000000f );
-    instance->registerEObj( "sgbg_r1d3_t2_ball1_2", 2004212, 4731432, 4, { -50.192619f, 6.129761f, -94.793358f },
-                            1.000000f, 0.000000f );
-    // States -> s_ball_def s_ball_anim
-    instance->registerEObj( "sgvf_r1d3_b0435_2", 2004692, 5018298, 4, { 1.842873f, -9.975479f, -135.724899f },
-                            1.000000f, 0.000000f );
-    // States -> wind_sw_anim wind_def wind_strong wind_ws_anim
-    instance->registerEObj( "unknown_4", 2004214, 4680578, 4, { -76.946297f, 28.400000f, -25.080601f }, 1.000000f,
-                            0.000000f );
-    instance->registerEObj( "unknown_5", 2004215, 4680579, 4, { -76.355118f, 28.400000f, -0.768542f }, 1.000000f,
-                            0.000000f );
-    instance->registerEObj( "unknown_6", 2004216, 4680574, 4, { -71.720413f, 28.400000f, 2.866590f }, 1.000000f,
-                            0.000000f );
-    instance->registerEObj( "unknown_7", 2004217, 4680909, 4, { -59.031670f, 28.399969f, 6.586658f }, 1.000000f,
-                            0.000000f );
-    instance->registerEObj( "unknown_8", 2004218, 4680572, 4, { -46.184601f, 27.650000f, 1.393153f }, 1.000000f,
-                            0.000000f );
-    instance->registerEObj( "unknown_9", 2004219, 4680571, 4, { -41.333439f, 28.400000f, -9.966988f }, 1.000000f,
-                            0.000000f );
-    instance->registerEObj( "unknown_10", 2004220, 4680577, 4, { -81.969833f, 38.540291f, -11.185970f }, 1.000000f,
-                            0.000000f );
-    instance->registerEObj( "unknown_11", 2004221, 4680576, 4, { -82.257988f, 38.540291f, -0.033865f }, 1.000000f,
-                            0.000000f );
-    instance->registerEObj( "unknown_12", 2004222, 4680575, 4, { -73.807869f, 38.540279f, 8.961772f }, 1.000000f,
-                            0.000000f );
-    instance->registerEObj( "unknown_13", 2004223, 4680573, 4, { -44.264439f, 38.540291f, 9.105038f }, 1.000000f,
-                            0.000000f );
-    instance->registerEObj( "DoortoOblivion", 2004224, 4680395, 4, { -52.060501f, 40.000000f, 65.066193f }, 1.000000f,
-                            0.000000f );
-    instance->registerEObj( "unknown_14", 2002735, 0, 4, { 46.358002f, -2.246400f, -72.299896f }, 0.800000f,
-                            0.554992f );
-    instance->registerEObj( "sgvf_w_lvd_b0118_1", 2002872, 4725552, 4, { 48.054039f, -2.500000f, -74.312141f },
-                            1.000000f, 0.000000f );
-    // States -> vf_bextwall_on vf_bextwall_of
-    instance->registerEObj( "sgvf_w_lvd_b0118_2", 2004205, 4725555, 4, { 59.417969f, -1.480164f, -102.836304f },
-                            0.991760f, 0.126302f );
-    // States -> vf_bextwall_on vf_bextwall_of
-    instance->registerEObj( "sgvf_r1d3_b0498", 2004577, 4982369, 4, { 44.252331f, -2.500000f, -89.438400f }, 1.000000f,
-                            0.000000f );
-    // States -> ring_off ring_off_anim ring_pop ring_pop_anim
-    instance->registerEObj( "unknown_15", 2002735, 0, 4, { -79.379898f, 10.614600f, -109.116402f }, 1.000000f,
-                            -1.195699f );
-    instance->registerEObj( "sgvf_w_lvd_b0118_3", 2002872, 4725659, 4, { -83.147453f, 10.501150f, -112.069199f },
-                            1.000000f, 0.000000f );
-    // States -> vf_bextwall_on vf_bextwall_of
-    instance->registerEObj( "sgvf_w_lvd_b0118_4", 2004213, 4725660, 4, { -107.265800f, 10.450760f, -103.052803f },
-                            1.000000f, 0.000000f );
-    // States -> vf_bextwall_on vf_bextwall_of
-    instance->registerEObj( "Entrance", 2000182, 4725473, 5, { 116.416702f, -9.665442f, 114.240799f }, 1.000000f,
-                            0.000000f );
-    // States -> vf_lock_on vf_lock_of
-    instance->registerEObj( "Shortcut", 2000700, 0, 4, { 117.194199f, -11.854060f, 106.498703f }, 1.000000f,
-                            0.000000f );
-    instance->registerEObj( "Exit", 2000139, 0, 4, { 18.403561f, 40.000000f, 67.026413f }, 1.000000f, 0.000000f );
+    instance.registerEObj( "unknown_0", 2002735, 0, 4, { -25.554501f, 40.000000f, 65.525902f }, 1.000000f, -1.570451f ); 
+    instance.registerEObj( "sgvf_w_lvd_b0118", 2002872, 4729361, 4, { -29.985430f, 40.000000f, 65.539711f }, 1.000000f, 0.000000f ); 
+      // States -> vf_bextwall_on (id: 3) vf_bextwall_of (id: 4) 
+    instance.registerEObj( "DoortoSilence", 2004203, 4680394, 4, { 57.114368f, 4.480070f, -45.937630f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_1", 2004204, 4682554, 4, { 40.009041f, 0.491693f, -60.195160f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "sgbg_r1d3_t2_ball1", 2004206, 4725471, 4, { 32.621071f, -4.715674f, -117.578201f }, 1.000000f, 0.000000f ); 
+      // States -> s_ball_def (id: 2) s_ball_anim (id: 3) 
+    instance.registerEObj( "sgbg_r1d3_t2_ball1_1", 2004206, 4731431, 4, { 5.652817f, -1.779197f, -107.755600f }, 1.000000f, 0.000000f ); 
+      // States -> s_ball_def (id: 2) s_ball_anim (id: 3) 
+    instance.registerEObj( "sgvf_r1d3_b0435", 2004208, 4895362, 4, { -30.982800f, -10.047770f, -162.841003f }, 1.000000f, 0.000000f ); 
+      // States -> wind_sw_anim (id: 2) wind_def (id: 3) wind_strong (id: 6) wind_ws_anim (id: 7) 
+    instance.registerEObj( "unknown_2", 2004209, 4685130, 4, { -39.827599f, -10.619430f, -155.585907f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "sgvf_r1d3_b0435_1", 2004210, 4895363, 4, { -53.244961f, 3.577940f, -135.326797f }, 1.000000f, 0.000000f ); 
+      // States -> wind_sw_anim (id: 2) wind_def (id: 3) wind_strong (id: 6) wind_ws_anim (id: 7) 
+    instance.registerEObj( "unknown_3", 2004211, 4685137, 4, { -57.355659f, 4.520907f, -101.443703f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "sgbg_r1d3_t2_ball1_2", 2004212, 4731432, 4, { -50.192619f, 6.129761f, -94.793358f }, 1.000000f, 0.000000f ); 
+      // States -> s_ball_def (id: 2) s_ball_anim (id: 3) 
+    instance.registerEObj( "sgvf_r1d3_b0435_2", 2004692, 5018298, 4, { 1.842873f, -9.975479f, -135.724899f }, 1.000000f, 0.000000f ); 
+      // States -> wind_sw_anim (id: 2) wind_def (id: 3) wind_strong (id: 6) wind_ws_anim (id: 7) 
+    instance.registerEObj( "unknown_4", 2004214, 4680578, 4, { -76.946297f, 28.400000f, -25.080601f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_5", 2004215, 4680579, 4, { -76.355118f, 28.400000f, -0.768542f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_6", 2004216, 4680574, 4, { -71.720413f, 28.400000f, 2.866590f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_7", 2004217, 4680909, 4, { -59.031670f, 28.399969f, 6.586658f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_8", 2004218, 4680572, 4, { -46.184601f, 27.650000f, 1.393153f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_9", 2004219, 4680571, 4, { -41.333439f, 28.400000f, -9.966988f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_10", 2004220, 4680577, 4, { -81.969833f, 38.540291f, -11.185970f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_11", 2004221, 4680576, 4, { -82.257988f, 38.540291f, -0.033865f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_12", 2004222, 4680575, 4, { -73.807869f, 38.540279f, 8.961772f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_13", 2004223, 4680573, 4, { -44.264439f, 38.540291f, 9.105038f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "DoortoOblivion", 2004224, 4680395, 4, { -52.060501f, 40.000000f, 65.066193f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_14", 2002735, 0, 4, { 46.358002f, -2.246400f, -72.299896f }, 0.800000f, 0.554992f ); 
+    instance.registerEObj( "sgvf_w_lvd_b0118_1", 2002872, 4725552, 4, { 48.054039f, -2.500000f, -74.312141f }, 1.000000f, 0.000000f ); 
+      // States -> vf_bextwall_on (id: 3) vf_bextwall_of (id: 4) 
+    instance.registerEObj( "sgvf_w_lvd_b0118_2", 2004205, 4725555, 4, { 59.417969f, -1.480164f, -102.836304f }, 0.991760f, 0.126302f ); 
+      // States -> vf_bextwall_on (id: 3) vf_bextwall_of (id: 4) 
+    instance.registerEObj( "sgvf_r1d3_b0498", 2004577, 4982369, 4, { 44.252331f, -2.500000f, -89.438400f }, 1.000000f, 0.000000f ); 
+      // States -> ring_off (id: 2) ring_off_anim (id: 3) ring_pop (id: 4) ring_pop_anim (id: 5) 
+    instance.registerEObj( "unknown_15", 2002735, 0, 4, { -79.379898f, 10.614600f, -109.116402f }, 1.000000f, -1.195699f ); 
+    instance.registerEObj( "sgvf_w_lvd_b0118_3", 2002872, 4725659, 4, { -83.147453f, 10.501150f, -112.069199f }, 1.000000f, 0.000000f ); 
+      // States -> vf_bextwall_on (id: 3) vf_bextwall_of (id: 4) 
+    instance.registerEObj( "sgvf_w_lvd_b0118_4", 2004213, 4725660, 4, { -107.265800f, 10.450760f, -103.052803f }, 1.000000f, 0.000000f ); 
+      // States -> vf_bextwall_on (id: 3) vf_bextwall_of (id: 4) 
+    instance.registerEObj( "Entrance", 2000182, 4725473, 5, { 116.416702f, -9.665442f, 114.240799f }, 1.000000f, 0.000000f ); 
+      // States -> vf_lock_on (id: 11) vf_lock_of (id: 12) 
+    instance.registerEObj( "Shortcut", 2000700, 0, 4, { 117.194199f, -11.854060f, 106.498703f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "Exit", 2000139, 0, 4, { 18.403561f, 40.000000f, 67.026413f }, 1.000000f, 0.000000f ); 
 
   }
 
-  void onUpdate( InstanceContentPtr instance, uint32_t currTime ) override
+  void onUpdate( InstanceContent& instance, uint32_t currTime ) override
   {
 
   }
 
-  void onEnterTerritory( InstanceContentPtr instance, Entity::Player& player, uint32_t eventId, uint16_t param1,
+  void onEnterTerritory( InstanceContent& instance, Entity::Player& player, uint32_t eventId, uint16_t param1,
                          uint16_t param2 ) override
   {
 
diff --git a/src/scripts/instances/dungeons/SohmAl.cpp b/src/scripts/instances/dungeons/SohmAl.cpp
index 19c3add3..6f0034e4 100644
--- a/src/scripts/instances/dungeons/SohmAl.cpp
+++ b/src/scripts/instances/dungeons/SohmAl.cpp
@@ -9,20 +9,47 @@ class SohmAl :
 public:
   SohmAl() :
     Sapphire::ScriptAPI::InstanceContentScript( 37 )
+  { }
+
+  void onInit( InstanceContent& instance ) override
   {
+    instance.registerEObj( "unknown_0", 2002735, 0, 4, { -142.306107f, 11.741690f, 188.300797f }, 1.000000f, 0.660768f ); 
+    instance.registerEObj( "sgpl_w_lvd_b0118_col_char", 2002872, 5777776, 4, { -146.759598f, 9.382987f, 191.177994f }, 1.000000f, 0.000000f ); 
+      // States -> vf_bextwall_on (id: 3) vf_bextwall_of (id: 4) 
+    instance.registerEObj( "sgpl_w_lvd_b0118_col_char_1", 2002872, 5777778, 4, { -126.024696f, 11.736150f, 144.580200f }, 1.000000f, 0.000000f ); 
+      // States -> vf_bextwall_on (id: 3) vf_bextwall_of (id: 4) 
+    instance.registerEObj( "unknown_1", 2002735, 0, 4, { 165.208603f, 137.478806f, -62.228100f }, 1.000000f, -0.155188f ); 
+    instance.registerEObj( "sgpl_w_lvd_b0118_col_char_2", 2002872, 5777792, 4, { 166.178696f, 137.607697f, -62.706631f }, 1.000000f, 0.000000f ); 
+      // States -> vf_bextwall_on (id: 3) vf_bextwall_of (id: 4) 
+    instance.registerEObj( "sgpl_w_lvd_b0118_wide", 2002872, 5777793, 4, { 180.090302f, 138.237793f, -115.812103f }, 1.000000f, 0.000000f ); 
+      // States -> vf_bextwall_on (id: 3) vf_bextwall_of (id: 4) 
+    instance.registerEObj( "unknown_2", 2002735, 0, 4, { -112.464798f, 348.165985f, -368.176514f }, 1.000000f, 0.335726f ); 
+    instance.registerEObj( "sgpl_w_lvd_b0118_col_char_3", 2002872, 5777990, 4, { -112.426399f, 348.165985f, -371.392487f }, 1.000000f, 0.000000f ); 
+      // States -> vf_bextwall_on (id: 3) vf_bextwall_of (id: 4) 
+    instance.registerEObj( "sgpl_w_lvd_b0118_col_char_4", 2002872, 5777991, 4, { -89.965149f, 348.204498f, -416.112213f }, 1.000000f, 0.000000f ); 
+      // States -> vf_bextwall_on (id: 3) vf_bextwall_of (id: 4) 
+    instance.registerEObj( "Exit", 2000139, 0, 4, { -92.610641f, 348.164886f, -410.511993f }, 0.991760f, 0.000048f ); 
+    instance.registerEObj( "unknown_3", 2005284, 5773453, 4, { -274.538086f, -4.016628f, 191.237701f }, 0.991760f, 0.000048f ); 
+    instance.registerEObj( "unknown_4", 2005278, 5772621, 4, { -253.212296f, -2.894600f, 189.267303f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_5", 2005285, 5773460, 4, { -196.123306f, 3.106796f, 187.990906f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_6", 2005286, 5773461, 4, { -171.931305f, 2.815973f, 206.485794f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_7", 2005279, 5772623, 4, { -165.063995f, 4.074061f, 197.945007f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_8", 2005280, 5852453, 4, { 335.063385f, 114.335999f, -89.093300f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_9", 2005281, 5777403, 4, { 247.495102f, 126.954300f, -30.577419f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_10", 2005282, 5773504, 4, { -173.859894f, 324.834686f, -273.653503f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_11", 2005283, 5773503, 4, { -191.639694f, 329.656799f, -321.158691f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "Entrance", 2000182, 5777084, 5, { -267.602997f, -18.376320f, 282.751190f }, 1.000000f, 0.000000f ); 
+      // States -> vf_lock_on (id: 11) vf_lock_of (id: 12) 
+    instance.registerEObj( "Shortcut", 2000700, 0, 4, { -278.421387f, -17.669189f, 277.700714f }, 1.000000f, 0.000000f ); 
+
   }
 
-  void onInit( InstanceContentPtr instance ) override
+  void onUpdate( InstanceContent& instance, uint32_t currTime ) override
   {
 
   }
 
-  void onUpdate( InstanceContentPtr instance, uint32_t currTime ) override
-  {
-
-  }
-
-  void onEnterTerritory( InstanceContentPtr instance, Entity::Player& player, uint32_t eventId, uint16_t param1,
+  void onEnterTerritory( InstanceContent& instance, Entity::Player& player, uint32_t eventId, uint16_t param1,
                          uint16_t param2 ) override
   {
 
diff --git a/src/scripts/instances/dungeons/SohmAlHard.cpp b/src/scripts/instances/dungeons/SohmAlHard.cpp
index 82815fca..3b8d5d59 100644
--- a/src/scripts/instances/dungeons/SohmAlHard.cpp
+++ b/src/scripts/instances/dungeons/SohmAlHard.cpp
@@ -9,20 +9,67 @@ class SohmAlHard :
 public:
   SohmAlHard() :
     Sapphire::ScriptAPI::InstanceContentScript( 49 )
+  { }
+
+  void onInit( InstanceContent& instance ) override
   {
+    instance.registerEObj( "sgvf_w_lvd_b0118", 2002872, 6610531, 4, { 171.484497f, 137.748795f, 239.483704f }, 1.000000f, 0.000000f ); 
+      // States -> vf_bextwall_on (id: 3) vf_bextwall_of (id: 4) 
+    instance.registerEObj( "unknown_0", 2002735, 0, 4, { 174.120697f, 137.590607f, 236.701706f }, 0.991760f, 0.698132f ); 
+    instance.registerEObj( "sgvf_w_lvd_b0118_1", 2007599, 6610540, 4, { 162.998398f, 137.748596f, 274.239502f }, 1.000000f, 0.000000f ); 
+      // States -> vf_bextwall_on (id: 3) vf_bextwall_of (id: 4) 
+    instance.registerEObj( "sgvf_w_lvd_b0118_2", 2002872, 6613704, 4, { 299.153107f, 111.986000f, 138.189499f }, 0.991760f, 0.000048f ); 
+      // States -> vf_bextwall_on (id: 3) vf_bextwall_of (id: 4) 
+    instance.registerEObj( "unknown_1", 2002735, 0, 4, { 301.151306f, 112.000000f, 141.222107f }, 0.991760f, -0.556715f ); 
+    instance.registerEObj( "sgvf_w_lvd_b0118_3", 2007600, 6613798, 4, { 284.901794f, 112.000000f, 109.136398f }, 1.000000f, 0.000000f ); 
+      // States -> vf_bextwall_on (id: 3) vf_bextwall_of (id: 4) 
+    instance.registerEObj( "unknown_2", 2007648, 6621383, 4, { 128.328293f, 107.293800f, -303.903107f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_3", 2007649, 0, 4, { 169.258698f, 106.695999f, -298.126007f }, 0.991760f, 0.000048f ); 
+    instance.registerEObj( "unknown_4", 2007650, 0, 4, { 168.423599f, 108.900002f, -315.103485f }, 0.991760f, 0.000048f ); 
+    instance.registerEObj( "unknown_5", 2007651, 0, 4, { 167.744797f, 109.165802f, -335.555908f }, 0.991760f, 0.000048f ); 
+    instance.registerEObj( "sgvf_w_lvd_b0118_4", 2002872, 6631462, 4, { 128.893707f, 107.000000f, -274.034393f }, 1.000000f, 0.000000f ); 
+      // States -> vf_bextwall_on (id: 3) vf_bextwall_of (id: 4) 
+    instance.registerEObj( "unknown_6", 2002735, 0, 4, { 127.962402f, 107.223801f, -277.597412f }, 0.991760f, -0.000000f ); 
+    instance.registerEObj( "sgvf_d2d8_b1031", 2007706, 6653690, 4, { -198.779297f, 329.243896f, 33.463009f }, 0.991760f, 0.000048f ); 
+    instance.registerEObj( "sgvf_d2d8_b1031_1", 2007706, 6653700, 4, { -206.605194f, 329.253998f, 59.786411f }, 0.991760f, 0.000048f ); 
+    instance.registerEObj( "sgvf_d2d8_b1031_2", 2007706, 6653718, 4, { -190.572800f, 329.253998f, 54.758789f }, 0.991760f, 0.000048f ); 
+    instance.registerEObj( "sgvf_d2d8_b1031_3", 2007706, 6653721, 4, { -169.511398f, 324.396088f, 88.214813f }, 0.991760f, 0.000048f ); 
+    instance.registerEObj( "sgvf_d2d8_b1031_4", 2007706, 6653723, 4, { -154.978302f, 324.396088f, 84.108612f }, 0.991760f, 0.000048f ); 
+    instance.registerEObj( "sgvf_d2d8_b1031_5", 2007706, 6653726, 4, { -115.709198f, 318.959412f, 108.811996f }, 0.991760f, 0.000048f ); 
+    instance.registerEObj( "unknown_7", 2007735, 6572900, 4, { -188.843201f, 329.253998f, 66.614899f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_8", 2007736, 6572901, 4, { -95.983841f, 318.012787f, 134.955994f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_9", 2007765, 0, 4, { -166.002899f, 324.396088f, 99.648300f }, 0.991760f, 0.000048f ); 
+    instance.registerEObj( "sgvf_d2d8_b1096", 2007785, 6735263, 4, { -113.389900f, 346.242401f, -11.429080f }, 0.991760f, 0.000048f ); 
+    instance.registerEObj( "unknown_10", 2007784, 0, 4, { -185.825699f, 329.150208f, 67.756607f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_11", 2007784, 0, 4, { -95.353699f, 317.812805f, 138.109406f }, 0.991760f, 0.000048f ); 
+    instance.registerEObj( "unknown_12", 2007737, 6572914, 4, { 271.778503f, 120.866699f, 247.657700f }, 0.991760f, 0.000048f ); 
+    instance.registerEObj( "unknown_13", 2007738, 6572915, 4, { 318.409912f, 114.000099f, 174.170197f }, 0.991760f, 0.000048f ); 
+    instance.registerEObj( "unknown_14", 2007784, 0, 4, { 271.381592f, 121.015800f, 246.143295f }, 0.991760f, 0.000048f ); 
+    instance.registerEObj( "unknown_15", 2007784, 0, 4, { 317.092896f, 114.000000f, 172.080200f }, 0.991760f, 0.000048f ); 
+    instance.registerEObj( "unknown_16", 2007739, 6583747, 4, { 170.824707f, 125.108597f, -116.025803f }, 0.991760f, 0.000048f ); 
+    instance.registerEObj( "unknown_17", 2007740, 6583766, 4, { 87.968140f, 114.976700f, -165.190399f }, 0.991760f, 0.000048f ); 
+    instance.registerEObj( "unknown_18", 2007741, 6583828, 4, { 128.564804f, 107.608704f, -252.169403f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_19", 2007761, 0, 4, { 107.591301f, 114.427399f, -119.840599f }, 0.991760f, 0.000048f ); 
+    instance.registerEObj( "unknown_20", 2007773, 6583797, 4, { 137.386398f, 120.578796f, -148.604599f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_21", 2007774, 6583799, 4, { 91.874512f, 115.007202f, -129.728394f }, 0.991760f, 0.000048f ); 
+    instance.registerEObj( "unknown_22", 2007775, 6648314, 4, { 79.667358f, 113.878098f, -201.079605f }, 0.991760f, 0.000048f ); 
+    instance.registerEObj( "unknown_23", 2007776, 6648318, 4, { 104.478500f, 109.971703f, -225.310898f }, 0.991760f, 0.000048f ); 
+    instance.registerEObj( "sgvf_d2d8_b1096_1", 2007785, 6735374, 4, { 202.686295f, 126.422096f, -89.904701f }, 0.991760f, 0.698132f ); 
+    instance.registerEObj( "unknown_24", 2007784, 0, 4, { 87.159088f, 115.000000f, -167.944199f }, 0.991760f, 0.000048f ); 
+    instance.registerEObj( "unknown_25", 2007784, 0, 4, { 128.283905f, 106.994301f, -255.937302f }, 0.991760f, 0.000048f ); 
+    instance.registerEObj( "Entrance", 2000182, 6610262, 5, { -108.575996f, 348.171692f, -39.539310f }, 1.000000f, 0.000000f ); 
+      // States -> vf_lock_on (id: 11) vf_lock_of (id: 12) 
+    instance.registerEObj( "Shortcut", 2000700, 0, 4, { -115.366699f, 348.201599f, -26.746000f }, 0.991760f, 0.000048f ); 
+    instance.registerEObj( "Exit", 2000139, 0, 4, { 127.929398f, 107.364899f, -323.381989f }, 0.991760f, -0.017306f ); 
+
   }
 
-  void onInit( InstanceContentPtr instance ) override
+  void onUpdate( InstanceContent& instance, uint32_t currTime ) override
   {
 
   }
 
-  void onUpdate( InstanceContentPtr instance, uint32_t currTime ) override
-  {
-
-  }
-
-  void onEnterTerritory( InstanceContentPtr instance, Entity::Player& player, uint32_t eventId, uint16_t param1,
+  void onEnterTerritory( InstanceContent& instance, Entity::Player& player, uint32_t eventId, uint16_t param1,
                          uint16_t param2 ) override
   {
 
diff --git a/src/scripts/instances/dungeons/SohrKhai.cpp b/src/scripts/instances/dungeons/SohrKhai.cpp
index 9d00f1f9..b0f76f28 100644
--- a/src/scripts/instances/dungeons/SohrKhai.cpp
+++ b/src/scripts/instances/dungeons/SohrKhai.cpp
@@ -9,20 +9,53 @@ class SohrKhai :
 public:
   SohrKhai() :
     Sapphire::ScriptAPI::InstanceContentScript( 44 )
+  { }
+
+  void onInit( InstanceContent& instance ) override
   {
+    instance.registerEObj( "sgvf_w_lvd_b0118", 2002872, 6258645, 4, { 400.881195f, -19.484011f, -332.214996f }, 1.000000f, 0.000000f ); 
+      // States -> vf_bextwall_on (id: 3) vf_bextwall_of (id: 4) 
+    instance.registerEObj( "unknown_0", 2002735, 0, 4, { 400.118713f, -18.543800f, -338.582886f }, 1.000000f, -0.000000f ); 
+    instance.registerEObj( "unknown_1", 2007078, 6220718, 4, { -400.506195f, 0.390429f, 82.229874f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_2", 2007079, 6220719, 4, { -400.289886f, 0.381470f, -77.470093f }, 0.991760f, -1.567142f ); 
+    instance.registerEObj( "unknown_3", 2007189, 0, 4, { -425.070587f, -0.015320f, 5.569519f }, 0.991760f, 0.000048f ); 
+    instance.registerEObj( "unknown_4", 2007084, 6241486, 4, { 377.864990f, 0.390429f, 352.375702f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_5", 2007087, 6242639, 4, { 399.851196f, -58.700001f, -128.611893f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_6", 2007088, 6242640, 4, { 363.607697f, -38.700001f, -242.258194f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_7", 2007089, 6242641, 4, { 400.331604f, -18.700001f, -336.562897f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_8", 2007090, 6229304, 4, { 423.391998f, -40.024479f, -205.523697f }, 0.991760f, 0.000048f ); 
+    instance.registerEObj( "sgvf_w_lvd_b0118_1", 2002872, 6258669, 4, { -400.654388f, 9.235634f, -135.696106f }, 1.000000f, 0.000000f ); 
+      // States -> vf_bextwall_on (id: 3) vf_bextwall_of (id: 4) 
+    instance.registerEObj( "sgvf_w_lvd_b0118_2", 2007082, 6258670, 4, { -400.434387f, 8.000000f, -177.220200f }, 1.000000f, 0.000000f ); 
+      // States -> vf_bextwall_on (id: 3) vf_bextwall_of (id: 4) 
+    instance.registerEObj( "unknown_9", 2002735, 0, 4, { -400.177612f, 8.431900f, -137.820801f }, 1.000000f, -0.000000f ); 
+    instance.registerEObj( "unknown_10", 2007083, 6238460, 4, { -401.279297f, 9.299995f, -184.260300f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "sgvf_w_lvd_b0118_3", 2002872, 6258680, 4, { 399.753113f, 9.358741f, 161.151505f }, 1.000000f, 0.000000f ); 
+      // States -> vf_bextwall_on (id: 3) vf_bextwall_of (id: 4) 
+    instance.registerEObj( "unknown_11", 2002735, 0, 4, { 400.071198f, 9.620000f, 156.602402f }, 1.000000f, -0.000000f ); 
+    instance.registerEObj( "unknown_12", 2007085, 6242340, 4, { 397.968506f, 9.664823f, 157.574600f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_13", 2007086, 6241485, 4, { 398.938812f, 24.959961f, 85.423576f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_14", 2007158, 6241490, 4, { 407.500000f, 24.959999f, 89.161400f }, 1.000000f, 1.570451f ); 
+    instance.registerEObj( "unknown_15", 2007159, 6241491, 4, { 407.500000f, 24.959999f, 99.161400f }, 1.000000f, 1.570451f ); 
+    instance.registerEObj( "unknown_16", 2007160, 6241492, 4, { 407.500000f, 24.959999f, 109.161400f }, 1.000000f, 1.570451f ); 
+    instance.registerEObj( "unknown_17", 2007161, 6241493, 4, { 407.500000f, 24.959999f, 119.161400f }, 1.000000f, 1.570451f ); 
+    instance.registerEObj( "unknown_18", 2007162, 6241489, 4, { 392.500000f, 24.959999f, 89.161400f }, 1.000000f, -1.570451f ); 
+    instance.registerEObj( "unknown_19", 2007163, 6241488, 4, { 392.500000f, 24.959999f, 99.161400f }, 1.000000f, -1.570451f ); 
+    instance.registerEObj( "unknown_20", 2007164, 6241487, 4, { 392.500000f, 24.959999f, 109.161400f }, 1.000000f, -1.570451f ); 
+    instance.registerEObj( "unknown_21", 2007165, 6241484, 4, { 392.500000f, 24.959999f, 119.161400f }, 1.000000f, -1.570451f ); 
+    instance.registerEObj( "Entrance", 2000182, 6258660, 5, { -406.742615f, -8.000000f, 164.927795f }, 1.000000f, 0.000000f ); 
+      // States -> vf_lock_on (id: 11) vf_lock_of (id: 12) 
+    instance.registerEObj( "Shortcut", 2000700, 0, 4, { -393.089386f, -8.000000f, 150.811401f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "Exit", 2000139, 0, 4, { 399.538910f, -50.000011f, -494.319092f }, 1.000000f, 0.000000f ); 
+
   }
 
-  void onInit( InstanceContentPtr instance ) override
+  void onUpdate( InstanceContent& instance, uint32_t currTime ) override
   {
 
   }
 
-  void onUpdate( InstanceContentPtr instance, uint32_t currTime ) override
-  {
-
-  }
-
-  void onEnterTerritory( InstanceContentPtr instance, Entity::Player& player, uint32_t eventId, uint16_t param1,
+  void onEnterTerritory( InstanceContent& instance, Entity::Player& player, uint32_t eventId, uint16_t param1,
                          uint16_t param2 ) override
   {
 
diff --git a/src/scripts/instances/dungeons/TheAery.cpp b/src/scripts/instances/dungeons/TheAery.cpp
index 948a7586..7ef41b49 100644
--- a/src/scripts/instances/dungeons/TheAery.cpp
+++ b/src/scripts/instances/dungeons/TheAery.cpp
@@ -9,20 +9,45 @@ class TheAery :
 public:
   TheAery() :
     Sapphire::ScriptAPI::InstanceContentScript( 39 )
+  { }
+
+  void onInit( InstanceContent& instance ) override
   {
+    instance.registerEObj( "sgvf_w_lvd_b0118", 2002872, 5754325, 4, { 346.791687f, 93.919189f, -178.606903f }, 0.991760f, 0.000048f ); 
+      // States -> vf_bextwall_on (id: 3) vf_bextwall_of (id: 4) 
+    instance.registerEObj( "sgvf_w_lvd_b0118_1", 2005233, 5754326, 4, { 317.558105f, 93.945251f, -180.372498f }, 1.000000f, 0.000000f ); 
+      // States -> vf_bextwall_on (id: 3) vf_bextwall_of (id: 4) 
+    instance.registerEObj( "unknown_0", 2002735, 0, 4, { 345.215607f, 93.945251f, -178.963303f }, 1.000000f, -0.581172f ); 
+    instance.registerEObj( "sgvf_w_lvd_b0250", 2002872, 5795105, 4, { 40.665161f, 59.433842f, 65.873169f }, 0.991760f, 0.000048f ); 
+      // States -> vf_bextwall_on (id: 3) vf_bextwall_of (id: 4) 
+    instance.registerEObj( "sgvf_w_lvd_b0250_1", 2005234, 5795134, 4, { -14.039410f, 61.140190f, 54.695210f }, 0.991760f, 0.000048f ); 
+      // States -> vf_bextwall_on (id: 3) vf_bextwall_of (id: 4) 
+    instance.registerEObj( "unknown_1", 2002587, 0, 4, { 39.169510f, 59.433949f, 66.247253f }, 1.300000f, -1.500298f ); 
+    instance.registerEObj( "sgvf_w_lvd_b0118_2", 2002872, 5762428, 4, { 37.260880f, 148.068100f, -236.237595f }, 1.000000f, 0.000000f ); 
+      // States -> vf_bextwall_on (id: 3) vf_bextwall_of (id: 4) 
+    instance.registerEObj( "unknown_2", 2002735, 0, 4, { 35.001831f, 148.194504f, -233.032303f }, 1.000000f, -0.002372f ); 
+    instance.registerEObj( "unknown_3", 2005542, 0, 4, { 36.301151f, 148.393906f, -242.999893f }, 0.991760f, 0.000048f ); 
+    instance.registerEObj( "unknown_4", 2006454, 0, 4, { 32.698120f, 148.397095f, -251.838501f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "Entrance", 2000182, 5724494, 5, { 136.459106f, 67.985649f, 171.436401f }, 1.000000f, -1.570451f ); 
+      // States -> vf_lock_on (id: 11) vf_lock_of (id: 12) 
+    instance.registerEObj( "Shortcut", 2000700, 0, 4, { 144.406906f, 67.985611f, 177.100906f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "Exit", 2000139, 0, 4, { 21.307430f, 148.274002f, -283.827087f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_5", 2005222, 5685356, 4, { 267.117188f, 64.682983f, 47.219650f }, 0.991760f, 0.000048f ); 
+    instance.registerEObj( "unknown_6", 2005223, 5685357, 4, { 358.511414f, 81.162720f, -120.381798f }, 0.991760f, 0.000048f ); 
+    instance.registerEObj( "unknown_7", 2005224, 5821951, 4, { 131.793304f, 5.889650f, -103.881500f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_8", 2005225, 5821943, 4, { 50.821239f, 55.531479f, 63.561810f }, 0.991760f, 0.000048f ); 
+    instance.registerEObj( "sgpl_w_lvd_colwithnavi", 2005438, 5851315, 4, { -77.756859f, 91.481842f, -15.425310f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "sgpl_w_lvd_colwithnavi_1", 2005439, 5851342, 4, { 82.891663f, 108.510201f, -49.804409f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "sgpl_w_lvd_colwithnavi_2", 2005540, 5864523, 4, { 33.827099f, 134.430405f, -194.964005f }, 1.000000f, 0.000000f ); 
+
   }
 
-  void onInit( InstanceContentPtr instance ) override
+  void onUpdate( InstanceContent& instance, uint32_t currTime ) override
   {
 
   }
 
-  void onUpdate( InstanceContentPtr instance, uint32_t currTime ) override
-  {
-
-  }
-
-  void onEnterTerritory( InstanceContentPtr instance, Entity::Player& player, uint32_t eventId, uint16_t param1,
+  void onEnterTerritory( InstanceContent& instance, Entity::Player& player, uint32_t eventId, uint16_t param1,
                          uint16_t param2 ) override
   {
 
diff --git a/src/scripts/instances/dungeons/TheAetherochemicalResearchFacility.cpp b/src/scripts/instances/dungeons/TheAetherochemicalResearchFacility.cpp
index 8f7cd325..c35d6317 100644
--- a/src/scripts/instances/dungeons/TheAetherochemicalResearchFacility.cpp
+++ b/src/scripts/instances/dungeons/TheAetherochemicalResearchFacility.cpp
@@ -9,20 +9,57 @@ class TheAetherochemicalResearchFacility :
 public:
   TheAetherochemicalResearchFacility() :
     Sapphire::ScriptAPI::InstanceContentScript( 38 )
+  { }
+
+  void onInit( InstanceContent& instance ) override
   {
+    instance.registerEObj( "unknown_0", 2002735, 0, 4, { -133.497498f, 394.924286f, -295.299713f }, 1.400000f, -1.570451f ); 
+    instance.registerEObj( "sgpl_w_lvd_b0118_col_char", 2002872, 5786705, 4, { -140.602203f, 394.529388f, -295.997314f }, 1.000000f, 0.000000f ); 
+      // States -> vf_bextwall_on (id: 3) vf_bextwall_of (id: 4) 
+    instance.registerEObj( "unknown_1", 2005310, 5698551, 4, { -81.047653f, 394.430786f, -296.243713f }, 0.991760f, 0.000048f ); 
+    instance.registerEObj( "unknown_2", 2006038, 5891863, 4, { -103.765701f, 394.988708f, -312.957214f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_3", 2006039, 5891860, 4, { -102.201103f, 394.988708f, -278.118988f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_4", 2002735, 0, 4, { 228.611694f, 225.066895f, 272.124695f }, 1.400000f, -1.570451f ); 
+    instance.registerEObj( "sgpl_w_lvd_b0118_col_char_1", 2002872, 5786711, 4, { 220.192200f, 224.639603f, 271.691895f }, 1.000000f, 0.000000f ); 
+      // States -> vf_bextwall_on (id: 3) vf_bextwall_of (id: 4) 
+    instance.registerEObj( "sgpl_w_lvd_b0118_col_char_2", 2002872, 5786715, 4, { 265.170685f, 225.066895f, 271.760712f }, 1.000000f, 0.000000f ); 
+      // States -> vf_bextwall_on (id: 3) vf_bextwall_of (id: 4) 
+    instance.registerEObj( "unknown_5", 2002735, 0, 4, { 230.175598f, -96.457947f, -160.689804f }, 1.400000f, 0.000000f ); 
+    instance.registerEObj( "sgpl_w_lvd_b0118_col_char_3", 2002872, 5786724, 4, { 231.302200f, -96.512398f, -143.853394f }, 1.000000f, 0.000000f ); 
+      // States -> vf_bextwall_on (id: 3) vf_bextwall_of (id: 4) 
+    instance.registerEObj( "unknown_6", 2006040, 5855034, 4, { 230.235901f, -96.457947f, -181.102600f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "Exit", 2000139, 0, 4, { 230.936203f, -456.457886f, 65.952606f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_7", 2002735, 0, 4, { 229.505203f, -456.329193f, 99.828033f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "sgpl_w_lvd_b0118_col_char_4", 2002872, 5859273, 4, { 229.632996f, -456.457886f, 93.179420f }, 1.000000f, 0.000000f ); 
+      // States -> vf_bextwall_on (id: 3) vf_bextwall_of (id: 4) 
+    instance.registerEObj( "unknown_8", 2007177, 6268147, 4, { 230.075500f, -456.357605f, 58.431438f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_9", 2007178, 6275911, 4, { 230.467407f, -456.457886f, 79.306190f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_10", 2007168, 0, 4, { 248.035400f, 225.116302f, 271.869995f }, 0.991760f, 0.000048f ); 
+    instance.registerEObj( "unknown_11", 2005295, 5698524, 4, { -232.841797f, 402.044098f, -353.718689f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_12", 2005296, 5698521, 4, { -177.212006f, 398.044098f, -361.393311f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_13", 2005297, 5698523, 4, { -162.152802f, 398.044098f, -369.069885f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_14", 2005298, 5698522, 4, { -176.852295f, 398.044098f, -382.745087f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_15", 2005299, 5886628, 4, { -168.304993f, 394.044098f, -296.534088f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_16", 2005300, 5686456, 4, { 28.763180f, 209.979401f, 211.474701f }, 0.991760f, 0.000048f ); 
+    instance.registerEObj( "unknown_17", 2005301, 5686457, 4, { 100.159401f, 220.000000f, 272.267090f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_18", 2005293, 5889119, 4, { 28.122299f, 209.979401f, 220.050293f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_19", 2005294, 5889137, 4, { 111.924896f, 219.958694f, 271.931000f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "Liftterminal", 2005308, 0, 4, { 203.525803f, -28.163019f, 195.849503f }, 0.991760f, -1.570451f ); 
+    instance.registerEObj( "Liftterminal_1", 2005309, 0, 4, { 229.755005f, -59.269020f, 94.956909f }, 0.991760f, -1.570451f ); 
+    instance.registerEObj( "unknown_20", 2005306, 5815811, 4, { -359.609406f, -299.984009f, -249.805496f }, 0.991760f, 0.000048f ); 
+    instance.registerEObj( "Liftterminal_2", 2005307, 0, 4, { -351.717102f, -299.983887f, -250.003098f }, 0.991760f, -1.570451f ); 
+    instance.registerEObj( "Shortcut", 2000700, 0, 4, { -309.444885f, 400.000000f, -287.942108f }, 0.991760f, 0.000048f ); 
+    instance.registerEObj( "Entrance", 2000182, 5782651, 5, { -332.999207f, 400.000000f, -297.435211f }, 1.000000f, 0.000000f ); 
+      // States -> vf_lock_on (id: 11) vf_lock_of (id: 12) 
+
   }
 
-  void onInit( InstanceContentPtr instance ) override
+  void onUpdate( InstanceContent& instance, uint32_t currTime ) override
   {
 
   }
 
-  void onUpdate( InstanceContentPtr instance, uint32_t currTime ) override
-  {
-
-  }
-
-  void onEnterTerritory( InstanceContentPtr instance, Entity::Player& player, uint32_t eventId, uint16_t param1,
+  void onEnterTerritory( InstanceContent& instance, Entity::Player& player, uint32_t eventId, uint16_t param1,
                          uint16_t param2 ) override
   {
 
diff --git a/src/scripts/instances/dungeons/TheAntitower.cpp b/src/scripts/instances/dungeons/TheAntitower.cpp
index 7c9df1eb..ecfb9bd5 100644
--- a/src/scripts/instances/dungeons/TheAntitower.cpp
+++ b/src/scripts/instances/dungeons/TheAntitower.cpp
@@ -9,20 +9,76 @@ class TheAntitower :
 public:
   TheAntitower() :
     Sapphire::ScriptAPI::InstanceContentScript( 43 )
+  { }
+
+  void onInit( InstanceContent& instance ) override
   {
+    instance.registerEObj( "unknown_0", 2002735, 0, 4, { 252.045807f, -9.475893f, -181.933304f }, 0.991760f, -1.570796f ); 
+    instance.registerEObj( "sgvf_w_lvd_b0118", 2002872, 6169321, 4, { 255.394501f, -8.467778f, -179.715897f }, 1.000000f, 0.000000f ); 
+      // States -> vf_bextwall_on (id: 3) vf_bextwall_of (id: 4) 
+    instance.registerEObj( "sgvf_w_lvd_b0118_1", 2002872, 6169306, 4, { -367.917297f, 325.000000f, -225.755905f }, 1.000000f, 0.000000f ); 
+      // States -> vf_bextwall_on (id: 3) vf_bextwall_of (id: 4) 
+    instance.registerEObj( "unknown_1", 2002735, 0, 4, { -365.057709f, 325.000000f, -230.778107f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "sgvf_w_lvd_b0118_2", 2006816, 6169309, 4, { -367.727386f, 325.000000f, -267.544891f }, 1.000000f, 0.000000f ); 
+      // States -> vf_bextwall_on (id: 3) vf_bextwall_of (id: 4) 
+    instance.registerEObj( "unknown_2", 2006858, 0, 4, { -364.583893f, 324.971405f, -250.263199f }, 0.991760f, 0.000048f ); 
+    instance.registerEObj( "sgvf_w_lvd_b0118_3", 2006817, 6169316, 4, { 207.573303f, -22.000000f, 137.064407f }, 1.000000f, 0.000000f ); 
+      // States -> vf_bextwall_on (id: 3) vf_bextwall_of (id: 4) 
+    instance.registerEObj( "sgvf_w_lvd_b0118_4", 2002872, 6169315, 4, { 163.478195f, -21.493710f, 135.478806f }, 1.000000f, 0.000000f ); 
+      // States -> vf_bextwall_on (id: 3) vf_bextwall_of (id: 4) 
+    instance.registerEObj( "unknown_3", 2002735, 0, 4, { 165.865494f, -22.000000f, 137.572006f }, 1.000000f, 1.570451f ); 
+    instance.registerEObj( "unknown_4", 2006767, 6215870, 4, { -319.905396f, 220.000000f, 144.542892f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_5", 2006771, 6215871, 4, { -351.689087f, 255.000000f, 14.809160f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_6", 2006778, 6215872, 4, { -361.023285f, 290.000000f, -120.754402f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_7", 2006781, 6112286, 4, { 202.549393f, 2.000032f, 188.466202f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_8", 2006782, 6112287, 4, { 190.864197f, 1.999979f, 180.727493f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_9", 2006783, 6112293, 4, { 181.429306f, 1.899876f, 187.239197f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_10", 2006786, 6112290, 4, { 138.231400f, -16.006710f, 145.799896f }, 0.991760f, 0.000048f ); 
+    instance.registerEObj( "unknown_11", 2006787, 6112291, 4, { 125.191902f, -16.000000f, 143.181503f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_12", 2006788, 6112288, 4, { 124.527199f, -16.000000f, 132.912994f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_13", 2006789, 6112289, 4, { 137.132797f, -16.006710f, 128.862396f }, 0.991760f, 0.000048f ); 
+    instance.registerEObj( "sgbg_d2d5_a0_gmc08", 2006790, 6168912, 4, { 143.049393f, -16.000000f, 136.666702f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "sgbg_d2d5_a0_gmc01", 2006994, 6220274, 4, { 156.748901f, -3.960001f, 175.039703f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "sgbg_d2d5_a0_gmc01_1", 2006995, 6220275, 4, { 151.476196f, -3.952148f, 182.940308f }, 0.991760f, 0.000048f ); 
+    instance.registerEObj( "sgbg_d2d5_a0_gmc02", 2006996, 6220281, 4, { 154.570801f, -3.951959f, 179.952393f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "sgbg_d2d5_a0_gmc02_1", 2006997, 6220282, 4, { 132.225601f, -15.960000f, 142.602600f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_14", 2007012, 6107601, 4, { 215.289795f, -22.099991f, 137.138306f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_15", 2006791, 6215456, 4, { 141.712997f, 22.840740f, -75.213570f }, 1.000000f, -0.000000f ); 
+    instance.registerEObj( "unknown_16", 2006792, 6215659, 4, { 143.769394f, 22.262880f, -82.780273f }, 0.991760f, 0.000048f ); 
+    instance.registerEObj( "unknown_17", 2006793, 6215458, 4, { 176.529694f, 12.734810f, -76.608017f }, 0.991760f, 0.000048f ); 
+    instance.registerEObj( "unknown_18", 2006794, 6215660, 4, { 175.971298f, 13.065370f, -83.629440f }, 0.991760f, 0.000048f ); 
+    instance.registerEObj( "unknown_19", 2006795, 6140680, 4, { 262.401794f, -0.700000f, -74.295052f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_20", 2006796, 6140674, 4, { 262.532196f, -0.700000f, -86.662819f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_21", 2006797, 6123756, 4, { 262.633514f, -0.700000f, -79.584007f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_22", 2006798, 0, 4, { 291.762695f, -2.200014f, -76.847649f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_23", 2006799, 0, 4, { 298.066406f, -2.151550f, -76.649200f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_24", 2006800, 0, 4, { 298.579895f, -2.037392f, -84.721710f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_25", 2006801, 6215463, 4, { 298.707794f, -2.062215f, -111.243301f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_26", 2006802, 6215464, 4, { 291.473785f, -2.200000f, -111.318298f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_27", 2006803, 6215465, 4, { 298.705597f, -2.065336f, -116.301102f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_28", 2006804, 6215466, 4, { 291.648193f, -2.200000f, -116.725502f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_29", 2006805, 6215467, 4, { 303.031708f, -0.700000f, -133.974594f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_30", 2006806, 6215468, 4, { 286.195709f, -0.700000f, -132.797195f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_31", 2006807, 6215469, 4, { 303.791687f, -0.717224f, -138.384094f }, 0.991760f, 0.000048f ); 
+    instance.registerEObj( "unknown_32", 2006808, 6215470, 4, { 286.152313f, -0.717224f, -136.736099f }, 0.991760f, 0.000048f ); 
+    instance.registerEObj( "unknown_33", 2006809, 6215471, 4, { 303.913788f, -0.717224f, -142.473495f }, 0.991760f, 0.000048f ); 
+    instance.registerEObj( "unknown_34", 2006810, 6215472, 4, { 286.518585f, -0.717224f, -140.550903f }, 0.991760f, 0.000048f ); 
+    instance.registerEObj( "unknown_35", 2006811, 6140683, 4, { 300.845215f, -0.700000f, -149.810699f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_36", 2006812, 6140685, 4, { 289.275787f, -0.700000f, -149.729401f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_37", 2006813, 6123759, 4, { 294.959503f, -0.700000f, -149.563904f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "Entrance", 2000182, 6168791, 5, { -303.646912f, 230.000000f, 280.401703f }, 1.000000f, -0.000000f ); 
+      // States -> vf_lock_on (id: 11) vf_lock_of (id: 12) 
+    instance.registerEObj( "Shortcut", 2000700, 0, 4, { -293.381012f, 230.000000f, 269.617188f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "Exit", 2000139, 0, 4, { 216.878998f, -9.458686f, -181.220200f }, 0.991760f, 0.000048f ); 
+
   }
 
-  void onInit( InstanceContentPtr instance ) override
+  void onUpdate( InstanceContent& instance, uint32_t currTime ) override
   {
 
   }
 
-  void onUpdate( InstanceContentPtr instance, uint32_t currTime ) override
-  {
-
-  }
-
-  void onEnterTerritory( InstanceContentPtr instance, Entity::Player& player, uint32_t eventId, uint16_t param1,
+  void onEnterTerritory( InstanceContent& instance, Entity::Player& player, uint32_t eventId, uint16_t param1,
                          uint16_t param2 ) override
   {
 
diff --git a/src/scripts/instances/dungeons/TheAurumVale.cpp b/src/scripts/instances/dungeons/TheAurumVale.cpp
index 70a73e54..d7ac5328 100644
--- a/src/scripts/instances/dungeons/TheAurumVale.cpp
+++ b/src/scripts/instances/dungeons/TheAurumVale.cpp
@@ -9,53 +9,41 @@ class TheAurumVale :
 public:
   TheAurumVale() :
     Sapphire::ScriptAPI::InstanceContentScript( 5 )
-  {
-  }
+  { }
 
-  void onInit( InstanceContentPtr instance ) override
+  void onInit( InstanceContent& instance ) override
   {
-    instance->registerEObj( "Entrance", 2000182, 4246303, 5, { 158.558304f, -0.023911f, 81.249123f }, 1.000000f,
-                            1.503130f );
-    // States -> vf_lock_on vf_lock_of
-    instance->registerEObj( "Exit", 2000139, 0, 4, { -410.069702f, -33.063400f, -116.395897f }, 0.991760f, 0.000048f );
-    instance->registerEObj( "Shortcut", 2000700, 0, 4, { 151.384796f, -1.596331f, 86.655884f }, 0.991760f, 0.000048f );
-    instance->registerEObj( "unknown_0", 2000272, 3643401, 4, { -44.571659f, -16.218571f, -112.108101f }, 0.991760f,
-                            0.000048f );
-    instance->registerEObj( "sgvf_w_lvd_b0118", 2000779, 4259184, 4, { 58.213131f, -9.300029f, -0.564636f }, 0.991760f,
-                            0.000048f );
-    // States -> vf_bextwall_on vf_bextwall_of
-    instance->registerEObj( "sgvf_w_lvd_b0094", 2000780, 4259186, 4, { 58.539280f, -8.801913f, 4.282087f }, 1.000000f,
-                            0.000000f );
-    // States -> vf_line_on vf_line_of
-    instance->registerEObj( "sgvf_w_lvd_b0250", 2000785, 4259185, 4, { 34.952770f, -9.096572f, -23.527361f }, 1.000000f,
-                            0.000000f );
-    // States -> vf_bextwall_on vf_bextwall_of
-    instance->registerEObj( "unknown_1", 2000273, 4248891, 4, { -333.089203f, -32.733212f, -161.730392f }, 0.991760f,
-                            0.000048f );
-    instance->registerEObj( "sgvf_w_lvd_b0118_1", 2000781, 4259189, 4, { -127.598099f, -30.310749f, -139.019302f },
-                            1.000000f, 0.000000f );
-    // States -> vf_bextwall_on vf_bextwall_of
-    instance->registerEObj( "sgvf_w_lvd_b0094_1", 2000782, 4259188, 4, { -126.660500f, -30.285540f, -134.096695f },
-                            1.000000f, 0.000000f );
-    // States -> vf_line_on vf_line_of
-    instance->registerEObj( "sgvf_w_lvd_b0118_2", 2000786, 4259190, 4, { -169.906296f, -27.704550f, -169.152496f },
-                            1.000000f, 0.000000f );
-    // States -> vf_bextwall_on vf_bextwall_of
-    instance->registerEObj( "sgvf_w_lvd_b0118_3", 2000783, 4246452, 4, { -374.789612f, -32.153561f, -140.808197f },
-                            1.000000f, 0.000000f );
-    // States -> vf_bextwall_on vf_bextwall_of
-    instance->registerEObj( "sgvf_w_lvd_b0094_2", 2000784, 4246451, 4, { -372.679901f, -32.341091f, -136.354401f },
-                            1.000000f, 0.000000f );
-    // States -> vf_line_on vf_line_of
+    instance.registerEObj( "Entrance", 2000182, 4246303, 5, { 158.558304f, -0.023911f, 81.249123f }, 1.000000f, 1.503130f ); 
+      // States -> vf_lock_on (id: 11) vf_lock_of (id: 12) 
+    instance.registerEObj( "Exit", 2000139, 0, 4, { -410.069702f, -33.063400f, -116.395897f }, 0.991760f, 0.000048f ); 
+    instance.registerEObj( "Shortcut", 2000700, 0, 4, { 151.384796f, -1.596331f, 86.655884f }, 0.991760f, 0.000048f ); 
+    instance.registerEObj( "unknown_0", 2000272, 3643401, 4, { -44.571659f, -16.218571f, -112.108101f }, 0.991760f, 0.000048f ); 
+    instance.registerEObj( "sgvf_w_lvd_b0118", 2000779, 4259184, 4, { 58.213131f, -9.300029f, -0.564636f }, 0.991760f, 0.000048f ); 
+      // States -> vf_bextwall_on (id: 3) vf_bextwall_of (id: 4) 
+    instance.registerEObj( "sgvf_w_lvd_b0094", 2000780, 4259186, 4, { 58.539280f, -8.801913f, 4.282087f }, 1.000000f, 0.000000f ); 
+      // States -> vf_line_on (id: 12) vf_line_of (id: 13) 
+    instance.registerEObj( "sgvf_w_lvd_b0250", 2000785, 4259185, 4, { 34.952770f, -9.096572f, -23.527361f }, 1.000000f, 0.000000f ); 
+      // States -> vf_bextwall_on (id: 3) vf_bextwall_of (id: 4) 
+    instance.registerEObj( "unknown_1", 2000273, 4248891, 4, { -333.089203f, -32.733212f, -161.730392f }, 0.991760f, 0.000048f ); 
+    instance.registerEObj( "sgvf_w_lvd_b0118_1", 2000781, 4259189, 4, { -127.598099f, -30.310749f, -139.019302f }, 1.000000f, 0.000000f ); 
+      // States -> vf_bextwall_on (id: 3) vf_bextwall_of (id: 4) 
+    instance.registerEObj( "sgvf_w_lvd_b0094_1", 2000782, 4259188, 4, { -126.660500f, -30.285540f, -134.096695f }, 1.000000f, 0.000000f ); 
+      // States -> vf_line_on (id: 12) vf_line_of (id: 13) 
+    instance.registerEObj( "sgvf_w_lvd_b0118_2", 2000786, 4259190, 4, { -169.906296f, -27.704550f, -169.152496f }, 1.000000f, 0.000000f ); 
+      // States -> vf_bextwall_on (id: 3) vf_bextwall_of (id: 4) 
+    instance.registerEObj( "sgvf_w_lvd_b0118_3", 2000783, 4246452, 4, { -374.789612f, -32.153561f, -140.808197f }, 1.000000f, 0.000000f ); 
+      // States -> vf_bextwall_on (id: 3) vf_bextwall_of (id: 4) 
+    instance.registerEObj( "sgvf_w_lvd_b0094_2", 2000784, 4246451, 4, { -372.679901f, -32.341091f, -136.354401f }, 1.000000f, 0.000000f ); 
+      // States -> vf_line_on (id: 12) vf_line_of (id: 13) 
 
   }
 
-  void onUpdate( InstanceContentPtr instance, uint32_t currTime ) override
+  void onUpdate( InstanceContent& instance, uint32_t currTime ) override
   {
 
   }
 
-  void onEnterTerritory( InstanceContentPtr instance, Entity::Player& player, uint32_t eventId, uint16_t param1,
+  void onEnterTerritory( InstanceContent& instance, Entity::Player& player, uint32_t eventId, uint16_t param1,
                          uint16_t param2 ) override
   {
 
diff --git a/src/scripts/instances/dungeons/TheBurn.cpp b/src/scripts/instances/dungeons/TheBurn.cpp
new file mode 100644
index 00000000..e743f6c3
--- /dev/null
+++ b/src/scripts/instances/dungeons/TheBurn.cpp
@@ -0,0 +1,64 @@
+#include <ScriptObject.h>
+#include <Territory/InstanceContent.h>
+
+using namespace Sapphire;
+
+class TheBurn :
+  public Sapphire::ScriptAPI::InstanceContentScript
+{
+public:
+  TheBurn() :
+    Sapphire::ScriptAPI::InstanceContentScript( 63 )
+  { }
+
+  void onInit( InstanceContent& instance ) override
+  {
+    instance.registerEObj( "sgvf_w_lvd_b0118", 2007457, 7562183, 4, { -295.336395f, 19.206579f, -349.383911f }, 1.000000f, 0.000000f ); 
+      // States -> vf_bextwall_on (id: 3) vf_bextwall_of (id: 4) 
+    instance.registerEObj( "unknown_0", 2002735, 0, 4, { -299.301788f, 19.167589f, -351.730499f }, 0.991760f, 0.000048f ); 
+    instance.registerEObj( "unknown_1", 2007457, 7359163, 4, { 259.879608f, 82.591408f, 308.727203f }, 0.991760f, 0.000048f ); 
+    instance.registerEObj( "unknown_2", 2007457, 7359164, 4, { 240.794296f, 81.018692f, 315.201813f }, 0.991760f, 0.000048f ); 
+    instance.registerEObj( "unknown_3", 2007457, 7359165, 4, { 213.139801f, 80.655479f, 309.588501f }, 0.991760f, 0.000048f ); 
+    instance.registerEObj( "unknown_4", 2007457, 7371780, 4, { 180.792404f, 65.073128f, 298.607605f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_5", 2007457, 7359160, 4, { 344.319214f, 96.692558f, 375.705902f }, 0.991760f, 0.000048f ); 
+    instance.registerEObj( "unknown_6", 2007457, 7359161, 4, { 326.647186f, 92.636917f, 388.177490f }, 0.991760f, 0.000048f ); 
+    instance.registerEObj( "unknown_7", 2007457, 7359162, 4, { 301.141815f, 90.127007f, 384.239014f }, 0.991760f, 0.000048f ); 
+    instance.registerEObj( "unknown_8", 2007457, 7371782, 4, { 277.238098f, 77.736717f, 361.668091f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_9", 2007457, 7390924, 4, { 43.728119f, 20.060129f, 106.101601f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_10", 2007457, 7390916, 4, { 0.052692f, 36.060131f, -24.711960f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_11", 2007457, 7384891, 4, { -169.030502f, 28.326990f, -242.422897f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_12", 2007457, 7393691, 4, { -171.168304f, 28.175030f, -240.856293f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_13", 2007457, 7384892, 4, { -306.576202f, 20.664431f, -338.984406f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_14", 2007457, 7393692, 4, { -293.959106f, 20.483391f, -340.855804f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "sgvf_w_lvd_b0118_1", 2007457, 7561681, 4, { 177.235596f, 12.985350f, 195.044403f }, 0.991760f, 0.000048f ); 
+      // States -> vf_bextwall_on (id: 3) vf_bextwall_of (id: 4) 
+    instance.registerEObj( "sgvf_w_lvd_b0118_2", 2007457, 7561686, 4, { 176.322296f, 13.041980f, 159.747299f }, 1.000000f, 0.000000f ); 
+      // States -> vf_bextwall_on (id: 3) vf_bextwall_of (id: 4) 
+    instance.registerEObj( "unknown_15", 2002735, 0, 4, { 174.092300f, 12.950240f, 197.852005f }, 0.991760f, 0.000048f ); 
+    instance.registerEObj( "sgvf_w_lvd_b0118_3", 2007457, 7562060, 4, { 2.190432f, 34.066490f, -57.807091f }, 0.991760f, 0.000048f ); 
+      // States -> vf_bextwall_on (id: 3) vf_bextwall_of (id: 4) 
+    instance.registerEObj( "sgvf_w_lvd_b0118_4", 2007457, 7562061, 4, { 1.902058f, 34.159721f, -82.991417f }, 1.000000f, 0.000000f ); 
+      // States -> vf_bextwall_on (id: 3) vf_bextwall_of (id: 4) 
+    instance.registerEObj( "unknown_16", 2002735, 0, 4, { 0.000000f, 34.176800f, -59.299999f }, 0.991760f, 0.000048f ); 
+    instance.registerEObj( "unknown_17", 2007457, 7546643, 4, { 0.000000f, 34.000000f, -70.000000f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "Entrance", 2000182, 7558759, 5, { 428.524994f, 88.401329f, 447.618286f }, 0.991760f, 0.000048f ); 
+      // States -> vf_lock_on (id: 11) vf_lock_of (id: 12) 
+    instance.registerEObj( "Shortcut", 2000700, 0, 4, { 423.779907f, 86.908783f, 424.929901f }, 0.991760f, 0.000048f ); 
+    instance.registerEObj( "Exit", 2000139, 0, 4, { -300.334290f, 10.000000f, -414.183411f }, 1.000000f, 0.000000f ); 
+
+  }
+
+  void onUpdate( InstanceContent& instance, uint32_t currTime ) override
+  {
+
+  }
+
+  void onEnterTerritory( InstanceContent& instance, Entity::Player& player, uint32_t eventId, uint16_t param1,
+                         uint16_t param2 ) override
+  {
+
+  }
+
+};
+
+EXPOSE_SCRIPT( TheBurn );
\ No newline at end of file
diff --git a/src/scripts/instances/dungeons/TheDrownedCityofSkalla.cpp b/src/scripts/instances/dungeons/TheDrownedCityofSkalla.cpp
index 3b541e87..d81e3afc 100644
--- a/src/scripts/instances/dungeons/TheDrownedCityofSkalla.cpp
+++ b/src/scripts/instances/dungeons/TheDrownedCityofSkalla.cpp
@@ -9,20 +9,54 @@ class TheDrownedCityofSkalla :
 public:
   TheDrownedCityofSkalla() :
     Sapphire::ScriptAPI::InstanceContentScript( 58 )
+  { }
+
+  void onInit( InstanceContent& instance ) override
   {
+    instance.registerEObj( "sgvf_w_lvd_b0118", 2002872, 7068116, 4, { 459.000000f, -14.000000f, 4.000000f }, 1.000000f, 0.000000f ); 
+      // States -> vf_bextwall_on (id: 3) vf_bextwall_of (id: 4) 
+    instance.registerEObj( "unknown_0", 2002735, 0, 4, { 459.000000f, -14.000000f, 4.000000f }, 1.000000f, -1.570796f ); 
+    instance.registerEObj( "Exit", 2000139, 0, 4, { 491.000000f, -14.000000f, 4.000000f }, 1.000000f, 1.570796f ); 
+    instance.registerEObj( "sgvf_w_lvd_b0118_1", 2002872, 7068596, 4, { -245.000000f, -2.000000f, 4.000000f }, 1.000000f, -0.000000f ); 
+      // States -> vf_bextwall_on (id: 3) vf_bextwall_of (id: 4) 
+    instance.registerEObj( "sgvf_w_lvd_b0118_2", 2002872, 7068599, 4, { -194.500000f, -2.000000f, 4.000000f }, 1.000000f, 0.000000f ); 
+      // States -> vf_bextwall_on (id: 3) vf_bextwall_of (id: 4) 
+    instance.registerEObj( "unknown_1", 2007457, 7072874, 4, { -220.044601f, -2.000000f, 3.151932f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_2", 2009045, 0, 4, { -224.806396f, -2.000000f, 8.647594f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_3", 2002735, 0, 4, { -245.000000f, -2.000000f, 4.000000f }, 1.400000f, 1.570796f ); 
+    instance.registerEObj( "sgvf_w_lvd_b0118_3", 2002872, 7068491, 4, { 95.000000f, 9.000000f, 4.000000f }, 1.000000f, -0.000000f ); 
+      // States -> vf_bextwall_on (id: 3) vf_bextwall_of (id: 4) 
+    instance.registerEObj( "unknown_4", 2002735, 0, 4, { 95.000000f, 9.000000f, 4.000000f }, 1.400000f, -1.570451f ); 
+    instance.registerEObj( "sgvf_w_lvd_b0118_4", 2002872, 7068496, 4, { 135.000000f, 9.000000f, 4.000000f }, 1.000000f, -0.000000f ); 
+      // States -> vf_bextwall_on (id: 3) vf_bextwall_of (id: 4) 
+    instance.registerEObj( "unknown_5", 2009046, 0, 4, { 111.907600f, 9.000000f, 4.017264f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "sgbg_g3d4_a0_gmc04", 2007457, 7075163, 4, { -335.663391f, 1.815782f, -38.379379f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "sgbg_g3d4_a0_gmc04_1", 2007457, 7075164, 4, { -324.520203f, 1.008244f, -28.697809f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_6", 2007457, 7032771, 4, { -380.099701f, 5.500000f, -16.441790f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "sgbg_g3d4_a0_gmc04_2", 2007457, 7075174, 4, { -298.365204f, 1.706293f, -25.538429f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "sgbg_g3d4_a0_gmc04_3", 2007457, 7075175, 4, { -290.733002f, 1.250000f, -27.983721f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_7", 2007457, 7065309, 4, { -273.437195f, 1.281705f, 3.216716f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "sgbg_g3d4_a0_gmc04_4", 2007457, 7132450, 4, { -322.497589f, 1.008244f, -34.442020f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "sgbg_g3d4_a0_gmc04_5", 2007457, 7132455, 4, { -293.498108f, 1.972912f, -19.170090f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "sgbg_g3d4_a0_gmc04_6", 2007457, 7132456, 4, { -287.911407f, 1.972912f, -26.723471f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_8", 2007457, 7034067, 4, { -67.254761f, 3.500000f, -34.435638f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_9", 2007457, 7065310, 4, { 68.873291f, 7.500000f, 3.740700f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_10", 2007457, 0, 4, { 133.644806f, 9.000000f, 3.453697f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_11", 2007457, 7029084, 4, { 272.652802f, -12.000000f, 48.014309f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_12", 2007457, 7032009, 4, { 276.325592f, -12.008910f, -34.378601f }, 0.991760f, 0.000048f ); 
+    instance.registerEObj( "unknown_13", 2007457, 7034222, 4, { 433.853088f, -15.937500f, 3.644273f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "Entrance", 2000182, 7042417, 5, { -488.282501f, -3.750000f, 2.201033f }, 1.000000f, 0.000000f ); 
+      // States -> vf_lock_on (id: 11) vf_lock_of (id: 12) 
+    instance.registerEObj( "Shortcut", 2000700, 0, 4, { -457.918304f, -3.860892f, 14.784940f }, 1.000000f, 0.000000f ); 
+
   }
 
-  void onInit( InstanceContentPtr instance ) override
+  void onUpdate( InstanceContent& instance, uint32_t currTime ) override
   {
 
   }
 
-  void onUpdate( InstanceContentPtr instance, uint32_t currTime ) override
-  {
-
-  }
-
-  void onEnterTerritory( InstanceContentPtr instance, Entity::Player& player, uint32_t eventId, uint16_t param1,
+  void onEnterTerritory( InstanceContent& instance, Entity::Player& player, uint32_t eventId, uint16_t param1,
                          uint16_t param2 ) override
   {
 
diff --git a/src/scripts/instances/dungeons/TheDuskVigil.cpp b/src/scripts/instances/dungeons/TheDuskVigil.cpp
index bbb60cd8..78ae396e 100644
--- a/src/scripts/instances/dungeons/TheDuskVigil.cpp
+++ b/src/scripts/instances/dungeons/TheDuskVigil.cpp
@@ -9,20 +9,66 @@ class TheDuskVigil :
 public:
   TheDuskVigil() :
     Sapphire::ScriptAPI::InstanceContentScript( 36 )
+  { }
+
+  void onInit( InstanceContent& instance ) override
   {
+    instance.registerEObj( "sgvf_w_lvd_b0118", 2002872, 5658893, 4, { -0.378468f, -0.000006f, 19.173130f }, 1.000000f, 0.000000f ); 
+      // States -> vf_bextwall_on (id: 3) vf_bextwall_of (id: 4) 
+    instance.registerEObj( "unknown_0", 2002735, 0, 4, { -0.473083f, -0.015320f, 21.194759f }, 0.991760f, 0.000048f ); 
+    instance.registerEObj( "sgvf_w_lvd_b0118_1", 2005189, 5658883, 4, { 0.051215f, 0.000000f, -19.347589f }, 1.000000f, 0.000000f ); 
+      // States -> vf_bextwall_on (id: 3) vf_bextwall_of (id: 4) 
+    instance.registerEObj( "unknown_1", 2002735, 0, 4, { 191.935699f, -8.000000f, -97.548279f }, 1.143130f, 0.000000f ); 
+    instance.registerEObj( "sgvf_w_lvd_b0118_2", 2002872, 5670058, 4, { 191.873398f, -8.000000f, -94.706589f }, 1.000000f, 0.000000f ); 
+      // States -> vf_bextwall_on (id: 3) vf_bextwall_of (id: 4) 
+    instance.registerEObj( "sgvf_w_lvd_b0118_3", 2005190, 5670071, 4, { 192.629501f, -8.000000f, -145.825104f }, 1.000000f, 0.000000f ); 
+      // States -> vf_bextwall_on (id: 3) vf_bextwall_of (id: 4) 
+    instance.registerEObj( "unknown_2", 2005319, 0, 4, { 191.294998f, -8.000000f, -126.640503f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_3", 2002735, 0, 4, { -69.815361f, 32.171459f, -368.314209f }, 0.991760f, 0.000048f ); 
+    instance.registerEObj( "sgvf_w_lvd_b0118_4", 2002872, 5670105, 4, { -69.864067f, 32.000050f, -370.484314f }, 1.000000f, 0.000000f ); 
+      // States -> vf_bextwall_on (id: 3) vf_bextwall_of (id: 4) 
+    instance.registerEObj( "unknown_4", 2005395, 0, 4, { -72.186203f, 32.000000f, -389.922302f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "Shortcut", 2000700, 0, 4, { -119.582703f, -47.846481f, 223.251007f }, 0.991760f, 0.000048f ); 
+    instance.registerEObj( "Exit", 2000139, 0, 4, { -69.846916f, 32.000000f, -403.795990f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "Entrance", 2000182, 5653670, 5, { -135.662598f, -48.859058f, 229.988297f }, 0.991760f, 0.000048f ); 
+      // States -> vf_lock_on (id: 11) vf_lock_of (id: 12) 
+    instance.registerEObj( "unknown_5", 2005169, 5674328, 4, { -66.894547f, -5.577260f, 129.660202f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_6", 2005170, 5674333, 4, { -28.173691f, -5.988469f, 165.738907f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_7", 2005171, 5674334, 4, { 32.157242f, -8.242720f, 98.301018f }, 0.991760f, 0.000048f ); 
+    instance.registerEObj( "Coldsteellever", 2005172, 0, 4, { 9.864166f, -0.650611f, 48.260380f }, 0.991760f, 0.000048f ); 
+    instance.registerEObj( "Damagedwinch", 2005173, 5660757, 4, { -3.958177f, 1.907400f, 32.349579f }, 0.991760f, 0.000048f ); 
+    instance.registerEObj( "unknown_8", 2005174, 5584415, 4, { -0.076084f, -0.115606f, 34.058880f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_9", 2006185, 5912762, 4, { -131.761703f, -48.569462f, 225.451996f }, 0.991760f, 0.000048f ); 
+    instance.registerEObj( "Tornjournalpage", 2005180, 0, 4, { 66.788696f, -3.996225f, -52.994629f }, 0.991760f, 1.343069f ); 
+    instance.registerEObj( "Tornjournalpage_1", 2005181, 0, 4, { 96.351990f, -8.050000f, -30.383080f }, 1.000000f, 1.112220f ); 
+    instance.registerEObj( "Tornjournalpage_2", 2005182, 0, 4, { 151.468704f, -7.345456f, -48.435421f }, 1.000000f, -0.025044f ); 
+    instance.registerEObj( "Tornjournalpage_3", 2005183, 0, 4, { 170.853394f, -7.671008f, -20.209290f }, 1.000000f, 0.034435f ); 
+    instance.registerEObj( "Tornjournalpage_4", 2005184, 0, 4, { 208.382401f, -8.050000f, -58.810051f }, 0.991760f, 0.103443f ); 
+    instance.registerEObj( "Barracksdoor", 2005177, 5584421, 4, { 158.730606f, -8.011047f, -24.266649f }, 0.991760f, 0.000048f ); 
+    instance.registerEObj( "Lordcommandersseat", 2005178, 5584424, 4, { 192.164307f, -8.050052f, -70.690117f }, 0.991760f, 0.000048f ); 
+    instance.registerEObj( "unknown_10", 2005179, 5584425, 4, { 191.948196f, -8.000000f, -159.505096f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_11", 2005185, 5584476, 4, { 96.173714f, 24.000000f, -222.821701f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_12", 2005186, 5584485, 4, { 21.875490f, 28.000000f, -217.942505f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_13", 2005187, 5584486, 4, { -35.156700f, 32.000000f, -286.161285f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "sgvf_r2d1_b0622", 2005320, 5800343, 4, { 179.680298f, 16.000111f, -261.236206f }, 1.000000f, 0.000000f ); 
+      // States -> snow_def_01 (id: 3) snow_start_01 (id: 4) snow_start_02 (id: 5) 
+    instance.registerEObj( "sgvf_r2d1_b0622_1", 2005321, 5800818, 4, { 127.707603f, 20.323111f, -262.321411f }, 1.000000f, 0.000000f ); 
+      // States -> snow_def_01 (id: 3) snow_start_01 (id: 4) snow_start_02 (id: 5) 
+    instance.registerEObj( "sgvf_r2d1_b0622_2", 2005322, 5800840, 4, { 5.201134f, 28.557409f, -289.850006f }, 1.000000f, 0.000000f ); 
+      // States -> snow_def_01 (id: 3) snow_start_01 (id: 4) snow_start_02 (id: 5) 
+    instance.registerEObj( "sgvf_r2d1_b0622_3", 2005323, 5800842, 4, { -21.532181f, 32.000061f, -289.092407f }, 1.000000f, 0.000000f ); 
+      // States -> snow_def_01 (id: 3) snow_start_01 (id: 4) snow_start_02 (id: 5) 
+    instance.registerEObj( "unknown_14", 2005353, 5584312, 4, { -73.144119f, 32.000000f, -405.536011f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "Chapeldoor", 2005357, 5584428, 4, { -69.550163f, 31.950060f, -291.505493f }, 1.000000f, 0.000000f ); 
+
   }
 
-  void onInit( InstanceContentPtr instance ) override
+  void onUpdate( InstanceContent& instance, uint32_t currTime ) override
   {
 
   }
 
-  void onUpdate( InstanceContentPtr instance, uint32_t currTime ) override
-  {
-
-  }
-
-  void onEnterTerritory( InstanceContentPtr instance, Entity::Player& player, uint32_t eventId, uint16_t param1,
+  void onEnterTerritory( InstanceContent& instance, Entity::Player& player, uint32_t eventId, uint16_t param1,
                          uint16_t param2 ) override
   {
 
diff --git a/src/scripts/instances/dungeons/TheFractalContinuum.cpp b/src/scripts/instances/dungeons/TheFractalContinuum.cpp
index 28bdb52c..63505ecf 100644
--- a/src/scripts/instances/dungeons/TheFractalContinuum.cpp
+++ b/src/scripts/instances/dungeons/TheFractalContinuum.cpp
@@ -9,20 +9,88 @@ class TheFractalContinuum :
 public:
   TheFractalContinuum() :
     Sapphire::ScriptAPI::InstanceContentScript( 35 )
+  { }
+
+  void onInit( InstanceContent& instance ) override
   {
+    instance.registerEObj( "sgvf_w_lvd_b0118", 2002872, 5777077, 4, { 140.603302f, 2.700000f, 34.720928f }, 1.000000f, 0.000000f ); 
+      // States -> vf_bextwall_on (id: 3) vf_bextwall_of (id: 4) 
+    instance.registerEObj( "sgvf_w_lvd_b0118_1", 2005259, 5777078, 4, { 106.765198f, 2.700000f, 53.335590f }, 1.000000f, 0.000000f ); 
+      // States -> vf_bextwall_on (id: 3) vf_bextwall_of (id: 4) 
+    instance.registerEObj( "unknown_0", 2002735, 0, 4, { 138.876297f, 2.700000f, 35.495899f }, 1.000000f, -1.051032f ); 
+    instance.registerEObj( "sgvf_w_lvd_b0118_2", 2002872, 5777135, 4, { -185.039200f, -0.000010f, 97.665123f }, 1.000000f, 0.000000f ); 
+      // States -> vf_bextwall_on (id: 3) vf_bextwall_of (id: 4) 
+    instance.registerEObj( "sgvf_w_lvd_b0118_3", 2005260, 5777136, 4, { -143.174301f, -0.000001f, 86.487961f }, 1.000000f, 0.000000f ); 
+      // States -> vf_bextwall_on (id: 3) vf_bextwall_of (id: 4) 
+    instance.registerEObj( "unknown_1", 2002735, 0, 4, { -179.727097f, -0.015191f, 96.334610f }, 0.790818f, 1.311814f ); 
+    instance.registerEObj( "Biomassincubator", 2005480, 5627459, 4, { -143.238602f, 2.285363f, 101.305000f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "Biomassincubator_1", 2005481, 5632316, 4, { -150.372604f, 2.650113f, 73.551849f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "Biomassincubator_2", 2005482, 5627460, 4, { -170.712601f, 2.379743f, 108.801201f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "Biomassincubator_3", 2005483, 5632317, 4, { -178.309097f, 2.550030f, 81.099091f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_2", 2005476, 5852048, 4, { -143.988998f, 0.000000f, 100.704399f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_3", 2005477, 5852047, 4, { -150.881500f, 0.000000f, 74.554863f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_4", 2005478, 5852050, 4, { -170.231705f, 0.000000f, 108.158203f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_5", 2005479, 5852049, 4, { -177.203705f, 0.000000f, 81.434868f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_6", 2002735, 0, 4, { -0.027993f, 46.596539f, -329.937805f }, 1.701462f, 0.000000f ); 
+    instance.registerEObj( "sgvf_w_lvd_b0118_4", 2002872, 5777412, 4, { -0.735815f, 46.585819f, -331.464386f }, 0.991760f, 0.000048f ); 
+      // States -> vf_bextwall_on (id: 3) vf_bextwall_of (id: 4) 
+    instance.registerEObj( "Shortcut", 2000700, 0, 4, { 4.587201f, 0.167401f, 228.424301f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "Exit", 2000139, 0, 4, { -0.198364f, 46.585819f, -364.727509f }, 0.991760f, 0.000048f ); 
+    instance.registerEObj( "Entrance", 2000182, 5615534, 5, { 1.419067f, -0.015320f, 234.058105f }, 0.991760f, 0.000048f ); 
+      // States -> vf_lock_on (id: 11) vf_lock_of (id: 12) 
+    instance.registerEObj( "Allaganteleporter", 2005242, 5722042, 4, { 36.979809f, 1.210160f, 215.020599f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_7", 2005251, 5754030, 4, { 0.697166f, -0.000000f, 210.678497f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "Guidepanel", 2005252, 0, 4, { 189.739594f, 2.452829f, 125.865196f }, 0.991760f, 0.993538f ); 
+    instance.registerEObj( "Guidepanel_1", 2005253, 0, 4, { 225.485703f, 3.355857f, 61.434238f }, 1.000000f, -0.867772f ); 
+    instance.registerEObj( "Guidepanel_2", 2005254, 0, 4, { 158.995697f, 4.255857f, 31.260679f }, 1.000000f, -0.732914f ); 
+    instance.registerEObj( "unknown_8", 2005246, 5607049, 4, { 230.547394f, 0.900000f, 95.770508f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_9", 2005247, 5607052, 4, { 228.780106f, 1.800000f, 59.805061f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_10", 2005248, 5607058, 4, { 184.888702f, 1.800000f, 26.321140f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "Allaganteleporter_1", 2005243, 5722173, 4, { 65.541313f, 3.869573f, 77.942459f }, 0.991760f, 0.000048f ); 
+    instance.registerEObj( "Allaganteleporter_2", 2005261, 5722056, 4, { 1.617853f, 1.549526f, 178.122406f }, 0.991760f, 0.000048f ); 
+    instance.registerEObj( "unknown_11", 2005257, 5581056, 4, { 130.087601f, 2.694753f, 39.807980f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_12", 2005425, 5829636, 4, { 124.304901f, 2.666066f, 55.191471f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_13", 2005250, 5810989, 4, { 2.160641f, 0.030060f, 207.184006f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_14", 2005249, 5614162, 4, { -211.984406f, 0.000000f, 104.404701f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "Allaganteleporter_3", 2005244, 5722174, 4, { -103.539803f, 1.217043f, 76.015160f }, 0.991760f, 0.000048f ); 
+    instance.registerEObj( "unknown_15", 2005358, 5763607, 4, { -352.642700f, 1.499993f, 119.149300f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_16", 2005359, 5763630, 4, { -351.399994f, 1.480042f, 110.398903f }, 0.991760f, 0.000048f ); 
+    instance.registerEObj( "unknown_17", 2005360, 5763608, 4, { -349.473907f, 1.499977f, 99.800461f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_18", 2005364, 5650881, 4, { -352.015686f, 1.499995f, 116.202499f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_19", 2005365, 5650883, 4, { -350.711609f, 1.499995f, 107.232002f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_20", 2005366, 5819525, 4, { -348.442902f, 1.499981f, 98.183548f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_21", 2005361, 5814450, 4, { -288.068115f, -2.700021f, 113.654198f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_22", 2005362, 5814433, 4, { -272.828888f, -2.700021f, 111.659203f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_23", 2005363, 5814516, 4, { -268.089691f, -2.700021f, 117.225700f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_24", 2005367, 5819526, 4, { -286.325989f, -2.700022f, 113.195000f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_25", 2005368, 5650635, 4, { -271.312897f, -2.700021f, 112.812401f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_26", 2005369, 5819527, 4, { -266.722595f, -2.700022f, 118.620300f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "Informationpanel", 2005255, 0, 4, { -230.635101f, 1.639121f, 176.464996f }, 1.000000f, 0.397825f ); 
+    instance.registerEObj( "Informationpanel_1", 2005256, 0, 4, { -348.181610f, 1.613136f, 135.909897f }, 0.991760f, -1.475439f ); 
+    instance.registerEObj( "Informationpanel_2", 2005674, 0, 4, { -345.653900f, 1.626497f, 98.636726f }, 0.991760f, -0.932389f ); 
+    instance.registerEObj( "Informationpanel_3", 2005675, 0, 4, { -324.880798f, 1.642515f, 68.081039f }, 1.000000f, -0.418331f ); 
+    instance.registerEObj( "unknown_27", 2005268, 5652510, 4, { -51.865479f, 53.147091f, -208.636703f }, 0.991760f, 0.000048f ); 
+    instance.registerEObj( "unknown_28", 2005269, 5652511, 4, { 54.518261f, 53.147091f, -208.602707f }, 0.991760f, 0.000048f ); 
+    instance.registerEObj( "unknown_29", 2005270, 5643840, 4, { -149.095901f, 53.147091f, -378.377991f }, 0.991760f, 0.000048f ); 
+    instance.registerEObj( "unknown_30", 2005271, 5652506, 4, { -96.421806f, 53.147091f, -467.216003f }, 0.991760f, 0.000048f ); 
+    instance.registerEObj( "unknown_31", 2005272, 5652515, 4, { 149.401093f, 53.147091f, -378.561096f }, 0.991760f, 0.000048f ); 
+    instance.registerEObj( "unknown_32", 2005273, 5652509, 4, { 98.842590f, 53.164989f, -466.923706f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_33", 2005318, 0, 4, { -8.227161f, 53.165001f, -195.021896f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_34", 2005329, 5670473, 4, { 130.894806f, 53.165001f, -422.856415f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_35", 2005330, 5670424, 4, { 3.461859f, 53.165001f, -200.625595f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_36", 2005331, 5670459, 4, { -131.889603f, 53.165001f, -421.513885f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "Emeraldcontrolunit", 2005262, 5819696, 4, { 127.567200f, 55.922291f, -423.497711f }, 0.991760f, 0.000048f ); 
+    instance.registerEObj( "Violetcontrolunit", 2005263, 5819695, 4, { -0.232653f, 56.361301f, -203.010300f }, 0.991760f, 0.000048f ); 
+    instance.registerEObj( "Crimsoncontrolunit", 2005264, 5819698, 4, { -126.342796f, 55.969429f, -423.260895f }, 0.991760f, 0.000048f ); 
+
   }
 
-  void onInit( InstanceContentPtr instance ) override
+  void onUpdate( InstanceContent& instance, uint32_t currTime ) override
   {
 
   }
 
-  void onUpdate( InstanceContentPtr instance, uint32_t currTime ) override
-  {
-
-  }
-
-  void onEnterTerritory( InstanceContentPtr instance, Entity::Player& player, uint32_t eventId, uint16_t param1,
+  void onEnterTerritory( InstanceContent& instance, Entity::Player& player, uint32_t eventId, uint16_t param1,
                          uint16_t param2 ) override
   {
 
diff --git a/src/scripts/instances/dungeons/TheFractalContinuumHard.cpp b/src/scripts/instances/dungeons/TheFractalContinuumHard.cpp
index 3b079b91..4042b18a 100644
--- a/src/scripts/instances/dungeons/TheFractalContinuumHard.cpp
+++ b/src/scripts/instances/dungeons/TheFractalContinuumHard.cpp
@@ -9,20 +9,58 @@ class TheFractalContinuumHard :
 public:
   TheFractalContinuumHard() :
     Sapphire::ScriptAPI::InstanceContentScript( 60 )
+  { }
+
+  void onInit( InstanceContent& instance ) override
   {
+    instance.registerEObj( "unknown_0", 2002735, 0, 4, { -0.015320f, 46.585819f, -330.098389f }, 1.693726f, 0.000048f ); 
+    instance.registerEObj( "sgvf_w_lvd_b0118", 2002872, 7178420, 4, { 0.000000f, 46.597000f, -330.000000f }, 1.000000f, 0.000000f ); 
+      // States -> vf_bextwall_on (id: 3) vf_bextwall_of (id: 4) 
+    instance.registerEObj( "unknown_1", 2007457, 7154681, 4, { -336.809601f, -4.091716f, 270.330200f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_2", 2007457, 7154670, 4, { -356.951599f, -4.091716f, 262.314697f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_3", 2007457, 7154683, 4, { -357.732788f, -4.091716f, 240.942001f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "sgvf_w_lvd_b0118_1", 2002872, 7178527, 4, { -322.993408f, -14.000000f, 237.739197f }, 1.000000f, 0.942478f ); 
+      // States -> vf_bextwall_on (id: 3) vf_bextwall_of (id: 4) 
+    instance.registerEObj( "unknown_4", 2002735, 0, 4, { -323.681213f, -13.915580f, 238.152405f }, 0.520000f, 0.942478f ); 
+    instance.registerEObj( "sgvf_w_lvd_b0118_2", 2002872, 7178530, 4, { -363.058411f, -14.000000f, 250.964600f }, 1.000000f, -0.000000f ); 
+      // States -> vf_bextwall_on (id: 3) vf_bextwall_of (id: 4) 
+    instance.registerEObj( "unknown_5", 2009284, 0, 4, { -334.828705f, -13.901060f, 251.636505f }, 0.991760f, 0.000048f ); 
+    instance.registerEObj( "unknown_6", 2009285, 0, 4, { -348.204712f, -13.892940f, 243.150803f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_7", 2009286, 0, 4, { -341.067108f, -13.892940f, 237.005600f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "sgvf_w_lvd_b0118_3", 2002872, 7178955, 4, { -0.015300f, -0.015300f, 318.593109f }, 0.991760f, 0.000048f ); 
+      // States -> vf_bextwall_on (id: 3) vf_bextwall_of (id: 4) 
+    instance.registerEObj( "unknown_8", 2002735, 0, 4, { -0.015320f, -0.015320f, 318.593109f }, 1.388489f, 0.000048f ); 
+    instance.registerEObj( "Entrance", 2000182, 7170984, 5, { -168.370193f, 53.116581f, -447.149506f }, 0.991760f, 0.000048f ); 
+      // States -> vf_lock_on (id: 11) vf_lock_of (id: 12) 
+    instance.registerEObj( "Shortcut", 2000700, 0, 4, { -165.940704f, 53.142620f, -435.801300f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "Exit", 2000139, 0, 4, { 0.000000f, -0.000000f, 285.000000f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_9", 2007457, 7141324, 4, { -0.193053f, 53.508301f, -157.354904f }, 0.991760f, 0.000048f ); 
+    instance.registerEObj( "unknown_10", 2007457, 7174264, 4, { 57.117458f, 53.142620f, -213.119202f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_11", 2007457, 7170395, 4, { -0.015320f, 46.597000f, -350.082092f }, 0.991760f, 0.000048f ); 
+    instance.registerEObj( "Allaganteleporter", 2009278, 0, 4, { 0.002865f, 46.599701f, -377.001007f }, 0.991760f, 0.000048f ); 
+    instance.registerEObj( "unknown_12", 2007457, 7141398, 4, { -147.123795f, 53.529110f, -369.004913f }, 0.991760f, 0.000048f ); 
+    instance.registerEObj( "unknown_13", 2007457, 7141397, 4, { -82.715157f, 42.516201f, -199.536606f }, 0.991760f, 0.000048f ); 
+    instance.registerEObj( "unknown_14", 2007457, 7141396, 4, { 57.117241f, 53.527908f, -213.116699f }, 0.991760f, 0.000048f ); 
+    instance.registerEObj( "Tornnavigatorslogpage", 2009412, 0, 4, { -132.524704f, 53.177608f, -407.217499f }, 0.991760f, 0.000048f ); 
+    instance.registerEObj( "unknown_15", 2007457, 7141895, 4, { -305.774811f, -0.751164f, 94.720772f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_16", 2007457, 7167075, 4, { -291.432098f, -0.015320f, 191.088593f }, 0.991760f, 0.000048f ); 
+    instance.registerEObj( "Tornnavigatorslogpage_1", 2009413, 0, 4, { -202.481003f, 0.052476f, 171.440704f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_17", 2007457, 7170446, 4, { 78.733200f, 20.000000f, 245.622299f }, 0.991760f, 0.000048f ); 
+    instance.registerEObj( "unknown_18", 2007457, 7170445, 4, { 29.878000f, 12.000000f, 404.197998f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "Securityterminal", 2009276, 7188820, 4, { 67.426903f, 12.000000f, 331.441711f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "Securityterminal_1", 2009277, 7188819, 4, { 0.000000f, 12.000000f, 370.000000f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_19", 2007457, 7336140, 4, { 69.068199f, 12.000000f, 332.207001f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_20", 2007457, 7336141, 4, { 0.000000f, 12.000000f, 371.396515f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "sgpl_w_lvd_collison_only", 2002618, 7548894, 4, { -291.105286f, 0.234064f, 193.068497f }, 1.000000f, 0.000000f ); 
+
   }
 
-  void onInit( InstanceContentPtr instance ) override
+  void onUpdate( InstanceContent& instance, uint32_t currTime ) override
   {
 
   }
 
-  void onUpdate( InstanceContentPtr instance, uint32_t currTime ) override
-  {
-
-  }
-
-  void onEnterTerritory( InstanceContentPtr instance, Entity::Player& player, uint32_t eventId, uint16_t param1,
+  void onEnterTerritory( InstanceContent& instance, Entity::Player& player, uint32_t eventId, uint16_t param1,
                          uint16_t param2 ) override
   {
 
diff --git a/src/scripts/instances/dungeons/TheGhimlytDark.cpp b/src/scripts/instances/dungeons/TheGhimlytDark.cpp
new file mode 100644
index 00000000..d661a1bc
--- /dev/null
+++ b/src/scripts/instances/dungeons/TheGhimlytDark.cpp
@@ -0,0 +1,78 @@
+#include <ScriptObject.h>
+#include <Territory/InstanceContent.h>
+
+using namespace Sapphire;
+
+class TheGhimlytDark :
+  public Sapphire::ScriptAPI::InstanceContentScript
+{
+public:
+  TheGhimlytDark() :
+    Sapphire::ScriptAPI::InstanceContentScript( 64 )
+  { }
+
+  void onInit( InstanceContent& instance ) override
+  {
+    instance.registerEObj( "sgvf_g3d5_b1487", 2007457, 7721506, 4, { -175.569107f, 59.999989f, 59.862808f }, 1.000000f, -0.523599f ); 
+    instance.registerEObj( "sgvf_g3d5_b1487_1", 2007457, 7721519, 4, { -170.569107f, 59.999989f, 68.526520f }, 1.000000f, -1.570796f ); 
+    instance.registerEObj( "sgvf_g3d5_b1487_2", 2007457, 7721520, 4, { -175.569107f, 59.999989f, 77.183289f }, 1.000000f, -0.523599f ); 
+    instance.registerEObj( "sgvf_g3d5_b1487_3", 2007457, 7721521, 4, { -185.569199f, 59.999989f, 77.183327f }, 1.000000f, 0.523599f ); 
+    instance.registerEObj( "sgvf_g3d5_b1487_4", 2007457, 7721522, 4, { -190.569000f, 59.999989f, 68.526497f }, 1.000000f, 1.570796f ); 
+    instance.registerEObj( "sgvf_g3d5_b1487_5", 2007457, 7721523, 4, { -185.569107f, 59.999989f, 59.862801f }, 1.000000f, 0.523599f ); 
+    instance.registerEObj( "sgvf_w_lvd_b0118", 2002872, 7724516, 4, { -163.378296f, 59.999989f, 64.744011f }, 0.991760f, 1.347288f ); 
+      // States -> vf_bextwall_on (id: 3) vf_bextwall_of (id: 4) 
+    instance.registerEObj( "sgvf_w_lvd_b0118_1", 2002872, 7724515, 4, { -180.569107f, 60.037628f, 90.162064f }, 1.000000f, -0.000000f ); 
+      // States -> vf_bextwall_on (id: 3) vf_bextwall_of (id: 4) 
+    instance.registerEObj( "unknown_0", 2002735, 0, 4, { -180.569107f, 59.999989f, 88.463638f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_1", 2007457, 7705901, 4, { 139.729706f, 30.000000f, -48.877701f }, 1.000000f, 0.392699f ); 
+    instance.registerEObj( "unknown_2", 2007457, 7705900, 4, { 147.847595f, 30.000000f, -40.759789f }, 1.000000f, 1.178098f ); 
+    instance.registerEObj( "unknown_3", 2007457, 7705899, 4, { 147.847595f, 30.000000f, -29.279261f }, 1.000000f, 1.178097f ); 
+    instance.registerEObj( "unknown_4", 2007457, 7705898, 4, { 139.729706f, 30.000000f, -21.161320f }, 1.000000f, 0.392699f ); 
+    instance.registerEObj( "unknown_5", 2007457, 7705897, 4, { 128.249207f, 30.000000f, -21.161289f }, 1.000000f, -0.392699f ); 
+    instance.registerEObj( "unknown_6", 2007457, 7705896, 4, { 120.131203f, 30.000000f, -29.279249f }, 1.000000f, -1.178097f ); 
+    instance.registerEObj( "unknown_7", 2007457, 7705895, 4, { 120.131203f, 30.000000f, -40.759762f }, 1.000000f, -1.178097f ); 
+    instance.registerEObj( "unknown_8", 2007457, 7705892, 4, { 128.249100f, 30.000000f, -48.877689f }, 1.000000f, -0.392699f ); 
+    instance.registerEObj( "unknown_9", 2007457, 7706030, 4, { 133.989395f, 29.983999f, -35.019501f }, 1.000000f, 0.000047f ); 
+    instance.registerEObj( "sgvf_w_lvd_b0118_2", 2002872, 7724537, 4, { 159.954803f, 30.000000f, -60.694111f }, 0.991760f, 0.795487f ); 
+      // States -> vf_bextwall_on (id: 3) vf_bextwall_of (id: 4) 
+    instance.registerEObj( "sgvf_w_lvd_b0118_3", 2002872, 7724536, 4, { 134.000000f, 30.475479f, 7.876453f }, 1.000000f, 0.000000f ); 
+      // States -> vf_bextwall_on (id: 3) vf_bextwall_of (id: 4) 
+    instance.registerEObj( "unknown_10", 2002735, 0, 4, { 134.000000f, 29.999981f, 4.287893f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_11", 2007457, 7730799, 4, { 370.999512f, -15.000000f, -265.005005f }, 1.000000f, -1.570451f ); 
+    instance.registerEObj( "sgvf_w_lvd_b0118_4", 2002872, 7724557, 4, { 370.229187f, 13.917020f, -237.466904f }, 1.000000f, 0.000000f ); 
+      // States -> vf_bextwall_on (id: 3) vf_bextwall_of (id: 4) 
+    instance.registerEObj( "unknown_12", 2002735, 0, 4, { 370.229187f, 13.833620f, -238.717896f }, 0.600000f, 0.000000f ); 
+    instance.registerEObj( "unknown_13", 2007457, 7598910, 4, { -291.394592f, 86.251953f, 197.855392f }, 0.991760f, -1.569070f ); 
+    instance.registerEObj( "unknown_14", 2007457, 7691067, 4, { -192.308197f, 66.698097f, 120.723701f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_15", 2007457, 7604094, 4, { 20.660540f, 60.425789f, 43.816551f }, 1.000000f, 0.947097f ); 
+    instance.registerEObj( "unknown_16", 2007457, 7604733, 4, { 131.345901f, 35.000259f, 25.139370f }, 1.000000f, 0.296706f ); 
+    instance.registerEObj( "unknown_17", 2007457, 7603911, 4, { -116.000000f, 53.488338f, 59.999962f }, 1.000000f, -0.523599f ); 
+    instance.registerEObj( "unknown_18", 2007457, 7604084, 4, { -86.049500f, 57.959660f, 64.131699f }, 1.000000f, 0.959931f ); 
+    instance.registerEObj( "unknown_19", 2007457, 7604086, 4, { -86.437569f, 56.909809f, 30.212589f }, 1.000000f, -0.645772f ); 
+    instance.registerEObj( "unknown_20", 2007457, 7638321, 4, { -42.599991f, 55.776421f, 14.799990f }, 1.000000f, -1.361357f ); 
+    instance.registerEObj( "unknown_21", 2007457, 7686957, 4, { -15.355400f, 57.836029f, 16.085300f }, 1.000000f, -0.191754f ); 
+    instance.registerEObj( "unknown_22", 2007457, 7686959, 4, { -19.532499f, 58.489460f, 44.765591f }, 1.000000f, -1.529152f ); 
+    instance.registerEObj( "unknown_23", 2007457, 7820490, 4, { 317.389313f, 14.592110f, -118.072304f }, 1.000000f, 1.235276f ); 
+    instance.registerEObj( "unknown_24", 2007457, 7733551, 4, { 371.195312f, 5.036287f, -161.166000f }, 1.000000f, 1.235276f ); 
+    instance.registerEObj( "sgvf_g3d5_b1617", 2007457, 7842118, 4, { 233.771500f, 20.000000f, -93.090919f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "Entrance", 2000182, 7705976, 5, { -414.021515f, 106.963402f, 158.088501f }, 1.000000f, 0.354109f ); 
+      // States -> vf_lock_on (id: 11) vf_lock_of (id: 12) 
+    instance.registerEObj( "Exit", 2000139, 0, 4, { 371.029907f, -15.000000f, -278.640900f }, 0.991760f, 0.000048f ); 
+    instance.registerEObj( "Shortcut", 2000700, 0, 4, { -410.192993f, 107.021599f, 165.150101f }, 0.991760f, 0.354115f ); 
+
+  }
+
+  void onUpdate( InstanceContent& instance, uint32_t currTime ) override
+  {
+
+  }
+
+  void onEnterTerritory( InstanceContent& instance, Entity::Player& player, uint32_t eventId, uint16_t param1,
+                         uint16_t param2 ) override
+  {
+
+  }
+
+};
+
+EXPOSE_SCRIPT( TheGhimlytDark );
\ No newline at end of file
diff --git a/src/scripts/instances/dungeons/TheGreatGubalLibrary.cpp b/src/scripts/instances/dungeons/TheGreatGubalLibrary.cpp
index e5fd4477..25b5ea84 100644
--- a/src/scripts/instances/dungeons/TheGreatGubalLibrary.cpp
+++ b/src/scripts/instances/dungeons/TheGreatGubalLibrary.cpp
@@ -9,20 +9,59 @@ class TheGreatGubalLibrary :
 public:
   TheGreatGubalLibrary() :
     Sapphire::ScriptAPI::InstanceContentScript( 31 )
+  { }
+
+  void onInit( InstanceContent& instance ) override
   {
+    instance.registerEObj( "unknown_0", 2002735, 0, 4, { 353.541412f, -39.250000f, -59.553089f }, 1.000000f, -1.570451f ); 
+    instance.registerEObj( "sgvf_w_lvd_b0118", 2002872, 5419624, 4, { 350.673187f, -39.000000f, -60.588070f }, 1.000000f, 0.000000f ); 
+      // States -> vf_bextwall_on (id: 3) vf_bextwall_of (id: 4) 
+    instance.registerEObj( "OnGarleanHierarchyVolume1", 2005891, 0, 4, { -199.611694f, 6.900000f, -56.354649f }, 1.000000f, -0.298927f ); 
+    instance.registerEObj( "OnGarleanHierarchyVolume2", 2005892, 0, 4, { -72.116417f, 0.900000f, -9.577726f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "Essences&Permutations", 2005893, 0, 4, { 54.309052f, -8.099999f, 62.262531f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "OvertheHorizon", 2005894, 0, 4, { 113.656601f, -8.153534f, 83.276863f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "Leatherbounddiary", 2005895, 0, 4, { 253.342499f, -24.000000f, -16.578369f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "Leatherbounddiary_1", 2005896, 0, 4, { 252.532898f, -40.000000f, -78.517921f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "sgvf_w_lvd_b0118_1", 2002872, 5419606, 4, { -22.327221f, 0.000000f, -0.318492f }, 1.000000f, 0.000000f ); 
+      // States -> vf_bextwall_on (id: 3) vf_bextwall_of (id: 4) 
+    instance.registerEObj( "sgvf_w_lvd_b0118_2", 2005019, 5419607, 4, { 22.309731f, 0.000000f, -0.124082f }, 1.000000f, 0.000000f ); 
+      // States -> vf_bextwall_on (id: 3) vf_bextwall_of (id: 4) 
+    instance.registerEObj( "unknown_1", 2002735, 0, 4, { -20.486000f, 0.000000f, 0.109200f }, 1.000000f, -1.570451f ); 
+    instance.registerEObj( "unknown_2", 2005316, 5774736, 4, { -11.221270f, 0.000000f, -6.534676f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "sgpl_d2d3_dbook01", 2005328, 5815254, 4, { -10.516900f, 0.000000f, -1.875240f }, 1.000000f, 0.000000f ); 
+      // States -> step_all_off (id: 15) step1_all_on (id: 16) step1_side_off (id: 17) step2_all_on (id: 18) step2_side_off (id: 19) step3_all_on (id: 20) step3_side_off (id: 21) 
+    instance.registerEObj( "sgvf_w_lvd_b0118_3", 2002872, 5419612, 4, { 178.337997f, -8.000000f, 53.739559f }, 1.000000f, 0.000000f ); 
+      // States -> vf_bextwall_on (id: 3) vf_bextwall_of (id: 4) 
+    instance.registerEObj( "sgvf_w_lvd_b0118_4", 2005020, 5419614, 4, { 179.630203f, -8.000000f, 0.354116f }, 1.000000f, 0.000000f ); 
+      // States -> vf_bextwall_on (id: 3) vf_bextwall_of (id: 4) 
+    instance.registerEObj( "unknown_3", 2002735, 0, 4, { 177.873505f, -8.000000f, 52.121300f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "sgbg_d2d3_a0_gmc17", 2005354, 5852274, 4, { 177.539993f, -7.995000f, 32.977421f }, 1.000000f, 0.000000f ); 
+      // States -> bk03_def (id: 5) bk03_on (id: 6) bk03_on_anim (id: 8) bk03_brt (id: 11) bk03_brt_anim (id: 12) bk03_brt_ofanim (id: 14) bk03_dead (id: 15) bk03_dead_anim (id: 16) 
+    instance.registerEObj( "unknown_4", 2004942, 5033535, 4, { -316.612915f, -0.015320f, 0.045776f }, 0.991760f, 0.000048f ); 
+    instance.registerEObj( "unknown_5", 2004949, 5033537, 4, { -173.408096f, 12.000000f, -33.362572f }, 0.991760f, 0.000048f ); 
+    instance.registerEObj( "unknown_6", 2004956, 5033536, 4, { -48.355900f, -0.015320f, 0.747620f }, 0.991760f, 0.000048f ); 
+    instance.registerEObj( "unknown_7", 2004957, 5033538, 4, { 43.900150f, -0.015320f, -1.083435f }, 0.991760f, 0.000048f ); 
+    instance.registerEObj( "unknown_8", 2004958, 5004619, 4, { 82.139282f, -8.011047f, 69.748901f }, 0.991760f, 0.000048f ); 
+    instance.registerEObj( "unknown_9", 2004959, 5004620, 4, { 117.387604f, -9.018127f, 69.291138f }, 0.991760f, 0.000048f ); 
+    instance.registerEObj( "sgbg_d2d3_a0_gmc04", 2004960, 5336977, 4, { 138.888000f, -9.018127f, 87.533859f }, 0.991760f, 0.000048f ); 
+      // States -> book_def (id: 3) book_off (id: 4) book_off_anim (id: 5) 
+    instance.registerEObj( "unknown_10", 2004962, 5033543, 4, { 156.328598f, -9.018127f, 95.628304f }, 0.991760f, 0.000048f ); 
+    instance.registerEObj( "unknown_11", 2004963, 5004621, 4, { 176.257004f, -8.011047f, -9.414856f }, 0.991760f, 0.000048f ); 
+    instance.registerEObj( "unknown_12", 2004964, 5773506, 4, { 297.779785f, -24.002501f, -43.308731f }, 0.991760f, 0.000048f ); 
+    instance.registerEObj( "unknown_13", 2004965, 5004586, 4, { 325.666107f, -39.017399f, -59.098209f }, 0.991760f, 0.000048f ); 
+    instance.registerEObj( "Entrance", 2000182, 5330520, 5, { -387.057098f, -0.015320f, 4.592957f }, 0.991760f, 0.000048f ); 
+      // States -> vf_lock_on (id: 11) vf_lock_of (id: 12) 
+    instance.registerEObj( "Shortcut", 2000700, 0, 4, { -381.085205f, -0.015320f, 6.094601f }, 0.991760f, 0.000048f ); 
+    instance.registerEObj( "Exit", 2000139, 0, 4, { 393.697998f, -39.047909f, -59.586491f }, 0.991760f, 0.000048f ); 
+
   }
 
-  void onInit( InstanceContentPtr instance ) override
+  void onUpdate( InstanceContent& instance, uint32_t currTime ) override
   {
 
   }
 
-  void onUpdate( InstanceContentPtr instance, uint32_t currTime ) override
-  {
-
-  }
-
-  void onEnterTerritory( InstanceContentPtr instance, Entity::Player& player, uint32_t eventId, uint16_t param1,
+  void onEnterTerritory( InstanceContent& instance, Entity::Player& player, uint32_t eventId, uint16_t param1,
                          uint16_t param2 ) override
   {
 
diff --git a/src/scripts/instances/dungeons/TheGreatGubalLibraryHard.cpp b/src/scripts/instances/dungeons/TheGreatGubalLibraryHard.cpp
index 9cb1fdf2..f56c0213 100644
--- a/src/scripts/instances/dungeons/TheGreatGubalLibraryHard.cpp
+++ b/src/scripts/instances/dungeons/TheGreatGubalLibraryHard.cpp
@@ -9,20 +9,69 @@ class TheGreatGubalLibraryHard :
 public:
   TheGreatGubalLibraryHard() :
     Sapphire::ScriptAPI::InstanceContentScript( 47 )
+  { }
+
+  void onInit( InstanceContent& instance ) override
   {
+    instance.registerEObj( "sgvf_w_lvd_b0118", 2002872, 6493754, 4, { 337.666901f, -0.015320f, -154.009293f }, 0.991760f, -1.570451f ); 
+      // States -> vf_bextwall_on (id: 3) vf_bextwall_of (id: 4) 
+    instance.registerEObj( "unknown_0", 2002735, 0, 4, { 337.666901f, -0.015320f, -154.009293f }, 0.991760f, -1.570451f ); 
+    instance.registerEObj( "Exit", 2000139, 0, 4, { 381.624786f, 0.033357f, -154.061295f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_1", 2007511, 6493828, 4, { 387.818298f, 0.057078f, -146.448898f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_2", 2007513, 6401215, 4, { 361.552795f, 0.056058f, -150.124802f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_3", 2007512, 0, 4, { 375.502197f, 0.033357f, -161.256607f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "TheBoyandtheDragonGay", 2007490, 0, 4, { -171.036804f, 11.988180f, -36.461899f }, 0.991760f, -0.298891f ); 
+    instance.registerEObj( "OfLovesUnrequited", 2007491, 0, 4, { -59.891842f, 0.931515f, 7.942907f }, 0.991760f, 0.000048f ); 
+    instance.registerEObj( "OvertheHorizonRedux", 2007492, 0, 4, { 61.203861f, -8.102600f, 81.803589f }, 0.991760f, 0.364949f ); 
+    instance.registerEObj( "OntheCulinaryApplicationsofCoblyns", 2007493, 0, 4, { 148.354507f, -20.004641f, 27.979099f }, 0.991760f, 0.799271f ); 
+    instance.registerEObj( "ProceedingsoftheCouncilofMagi", 2007494, 0, 4, { 91.658020f, -14.648220f, -87.438591f }, 0.991760f, 1.229280f ); 
+    instance.registerEObj( "TheBoyandtheDragonGayALiteraryAnalysis", 2007495, 0, 4, { 261.494995f, -2.524073f, -175.726593f }, 0.991760f, 0.697643f ); 
+    instance.registerEObj( "sgvf_w_lvd_b0118_1", 2002872, 6331565, 4, { -22.327221f, 0.000000f, -0.318492f }, 1.000000f, 0.000000f ); 
+      // States -> vf_bextwall_on (id: 3) vf_bextwall_of (id: 4) 
+    instance.registerEObj( "unknown_4", 2002735, 0, 4, { -20.486000f, 0.000000f, 0.109200f }, 1.000000f, -1.570451f ); 
+    instance.registerEObj( "sgvf_w_lvd_b0118_2", 2007475, 6331566, 4, { 23.113720f, 0.000000f, -0.647191f }, 1.000000f, 0.000000f ); 
+      // States -> vf_bextwall_on (id: 3) vf_bextwall_of (id: 4) 
+    instance.registerEObj( "sgvf_w_lvd_b0118_3", 2002872, 6331601, 4, { 178.337997f, -8.000000f, -0.391663f }, 1.000000f, 0.000000f ); 
+      // States -> vf_bextwall_on (id: 3) vf_bextwall_of (id: 4) 
+    instance.registerEObj( "unknown_5", 2002735, 0, 4, { 177.825394f, -8.000000f, 2.100500f }, 1.000000f, -0.000000f ); 
+    instance.registerEObj( "sgvf_w_lvd_b0118_4", 2007479, 6331602, 4, { 178.545807f, -8.011047f, 54.734009f }, 0.991760f, 0.000048f ); 
+      // States -> vf_bextwall_on (id: 3) vf_bextwall_of (id: 4) 
+    instance.registerEObj( "unknown_6", 2007510, 6402810, 4, { 172.105392f, -7.900000f, 35.499100f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "sgvf_w_btl_b0998", 2007509, 6545426, 4, { 177.732605f, -7.900000f, 35.055210f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_7", 2007546, 0, 4, { 177.791000f, -7.900000f, 27.118000f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_8", 2007473, 6399834, 4, { -172.812195f, 12.000000f, -33.611160f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_9", 2007474, 6399835, 4, { -49.912289f, -0.015320f, 0.167786f }, 0.991760f, 0.000048f ); 
+    instance.registerEObj( "unknown_10", 2007478, 6400099, 4, { 162.976501f, -20.000000f, -2.988169f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_11", 2007477, 6399813, 4, { 76.753242f, -8.000000f, 70.675980f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_12", 2007476, 6399648, 4, { 80.002747f, -4.000000f, -0.293232f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_13", 2007486, 6403597, 4, { 182.834000f, -7.950000f, -154.079605f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_14", 2007480, 6400740, 4, { 167.797897f, -7.950000f, -161.345093f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_15", 2007481, 6400741, 4, { 166.957901f, -7.949998f, -145.330505f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_16", 2007482, 6400744, 4, { 168.266495f, -7.950000f, -153.578705f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_17", 2007483, 6400763, 4, { 171.314407f, -7.950000f, -162.037598f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_18", 2007484, 6400774, 4, { 171.048599f, -7.950000f, -145.992599f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_19", 2007485, 6400779, 4, { 171.229401f, -7.950000f, -153.966995f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_20", 2007487, 6401038, 4, { 249.953903f, -3.950001f, -153.130600f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_21", 2007488, 6400896, 4, { 278.625397f, -3.950001f, -153.498093f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_22", 2007489, 6485974, 4, { 378.746613f, 0.033356f, -154.978699f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_23", 2007552, 6573181, 4, { 365.530090f, 0.056058f, -151.957199f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_24", 2007553, 6573293, 4, { 163.576996f, -7.950000f, -161.503799f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_25", 2007554, 6573290, 4, { 167.881699f, -7.950000f, -147.169601f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_26", 2007555, 6573294, 4, { 163.131195f, -7.950000f, -146.200302f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_27", 2007558, 6573550, 4, { 138.722900f, -7.950000f, -161.914902f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_28", 2007559, 6573551, 4, { 138.516602f, -7.950000f, -145.595200f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "Entrance", 2000182, 6331751, 5, { -387.057098f, -0.015320f, 4.592957f }, 0.991760f, 0.000048f ); 
+      // States -> vf_lock_on (id: 11) vf_lock_of (id: 12) 
+    instance.registerEObj( "Shortcut", 2000700, 0, 4, { -381.085205f, -0.015320f, 6.094601f }, 0.991760f, 0.000048f ); 
+
   }
 
-  void onInit( InstanceContentPtr instance ) override
+  void onUpdate( InstanceContent& instance, uint32_t currTime ) override
   {
 
   }
 
-  void onUpdate( InstanceContentPtr instance, uint32_t currTime ) override
-  {
-
-  }
-
-  void onEnterTerritory( InstanceContentPtr instance, Entity::Player& player, uint32_t eventId, uint16_t param1,
+  void onEnterTerritory( InstanceContent& instance, Entity::Player& player, uint32_t eventId, uint16_t param1,
                          uint16_t param2 ) override
   {
 
diff --git a/src/scripts/instances/dungeons/TheKeeperoftheLake.cpp b/src/scripts/instances/dungeons/TheKeeperoftheLake.cpp
index b3564311..108f83e3 100644
--- a/src/scripts/instances/dungeons/TheKeeperoftheLake.cpp
+++ b/src/scripts/instances/dungeons/TheKeeperoftheLake.cpp
@@ -9,79 +9,54 @@ class TheKeeperoftheLake :
 public:
   TheKeeperoftheLake() :
     Sapphire::ScriptAPI::InstanceContentScript( 32 )
-  {
-  }
+  { }
 
-  void onInit( InstanceContentPtr instance ) override
+  void onInit( InstanceContent& instance ) override
   {
-    instance->registerEObj( "unknown_0", 2002735, 0, 4, { -40.786701f, 641.215271f, -59.415600f }, 1.000000f,
-                            -0.000000f );
-    instance->registerEObj( "sgvf_w_lvd_b0118", 2002872, 5097808, 4, { -40.752449f, 641.160522f, -54.934898f },
-                            1.000000f, 0.000000f );
-    // States -> vf_bextwall_on vf_bextwall_of
-    instance->registerEObj( "unknown_1", 2004825, 5040985, 4, { 194.842896f, -0.000001f, -91.318947f }, 1.000000f,
-                            0.000000f );
-    instance->registerEObj( "sgbg_l1d1_q1_arm04", 2004826, 5097903, 4, { 139.959106f, 4.489269f, -37.319328f },
-                            1.000000f, 0.000000f );
-    // States -> arm04_def arm04_def_anim arm04_down arm04_down_anim
-    instance->registerEObj( "unknown_2", 2004828, 5041736, 4, { -97.215271f, 329.152313f, -129.564407f }, 0.991760f,
-                            0.000048f );
-    instance->registerEObj( "Magitekterminal", 2004829, 5073686, 4, { -104.691200f, 328.877686f, -135.171402f },
-                            0.991760f, 0.000048f );
-    instance->registerEObj( "unknown_3", 2004830, 5054264, 4, { -85.465736f, 329.158203f, -114.917397f }, 0.991760f,
-                            0.000048f );
-    instance->registerEObj( "unknown_4", 2004831, 5054260, 4, { -74.450752f, 350.933899f, -163.969894f }, 1.000000f,
-                            0.000000f );
-    instance->registerEObj( "unknown_5", 2004832, 5054262, 4, { -68.565010f, 338.613892f, -210.672806f }, 1.000000f,
-                            0.000000f );
-    instance->registerEObj( "unknown_6", 2004833, 5041738, 4, { -36.703850f, 338.613892f, -209.867294f }, 1.000000f,
-                            0.000000f );
-    instance->registerEObj( "Magitekterminal_1", 2004834, 5073702, 4, { -33.987030f, 338.612915f, -200.545197f },
-                            0.991760f, 0.000048f );
-    instance->registerEObj( "unknown_7", 2004835, 5041733, 4, { -102.992203f, 338.700012f, -173.230301f }, 1.000000f,
-                            0.000000f );
-    instance->registerEObj( "unknown_8", 2004836, 5041740, 4, { -91.617867f, 338.742096f, -191.340103f }, 1.000000f,
-                            0.000000f );
-    instance->registerEObj( "unknown_9", 2004837, 5041734, 4, { -56.932819f, 338.613800f, -220.085907f }, 1.000000f,
-                            0.000000f );
-    instance->registerEObj( "unknown_10", 2004838, 5041739, 4, { -58.661549f, 338.321289f, -231.786407f }, 0.991760f,
-                            0.000048f );
-    instance->registerEObj( "sgbg_l1d1_q1_arm02", 2004840, 5097049, 4, { 60.261662f, 608.420776f, -64.327179f },
-                            1.000000f, 0.000000f );
-    // States -> arm02_def arm02_def_anim arm02_des arm02_des_anim
-    instance->registerEObj( "sgbg_l1d1_q1_arm03", 2004842, 5097050, 4, { -42.140709f, 637.801575f, -13.313470f },
-                            1.000000f, 0.000000f );
-    // States -> arm03_def arm03_def_anim arm03_des arm03_des_anim
-    instance->registerEObj( "unknown_11", 2002735, 0, 4, { 36.823841f, 26.884010f, -25.290840f }, 1.000000f,
-                            1.175128f );
-    instance->registerEObj( "sgvf_w_lvd_b0118_1", 2002872, 5072855, 4, { 40.635441f, 24.890421f, -26.286221f },
-                            1.000000f, 0.000000f );
-    // States -> vf_bextwall_on vf_bextwall_of
-    instance->registerEObj( "sgvf_w_lvd_b0118_2", 2004827, 5072856, 4, { 5.803720f, 26.994020f, -14.402020f },
-                            1.000000f, 0.000000f );
-    // States -> vf_bextwall_on vf_bextwall_of
-    instance->registerEObj( "unknown_12", 2002735, 0, 4, { 8.333900f, 345.993805f, -169.028107f }, 1.000000f,
-                            -0.000000f );
-    instance->registerEObj( "sgvf_w_lvd_b0118_3", 2002872, 5076365, 4, { 9.495131f, 345.449799f, -172.095505f },
-                            1.000000f, 0.000000f );
-    // States -> vf_bextwall_on vf_bextwall_of
-    instance->registerEObj( "sgvf_w_lvd_b0118_4", 2004839, 5076366, 4, { 7.837297f, 345.993805f, -134.142197f },
-                            1.000000f, 0.000000f );
-    // States -> vf_bextwall_on vf_bextwall_of
-    instance->registerEObj( "Entrance", 2000182, 5072285, 5, { 294.405701f, 3.332572f, -157.864304f }, 1.000000f,
-                            0.079727f );
-    // States -> vf_lock_on vf_lock_of
-    instance->registerEObj( "Exit", 2000139, 0, 4, { -48.338951f, 641.026917f, -87.713493f }, 1.000000f, 0.000000f );
-    instance->registerEObj( "Shortcut", 2000700, 0, 4, { 279.041687f, 2.095404f, -159.624695f }, 0.991760f, 0.000048f );
+    instance.registerEObj( "unknown_0", 2002735, 0, 4, { -40.786701f, 641.215271f, -59.415600f }, 1.000000f, -0.000000f ); 
+    instance.registerEObj( "sgvf_w_lvd_b0118", 2002872, 5097808, 4, { -40.752449f, 641.160522f, -54.934898f }, 1.000000f, 0.000000f ); 
+      // States -> vf_bextwall_on (id: 3) vf_bextwall_of (id: 4) 
+    instance.registerEObj( "unknown_1", 2004825, 5040985, 4, { 194.842896f, -0.000001f, -91.318947f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "sgbg_l1d1_q1_arm04", 2004826, 5097903, 4, { 139.959106f, 4.489269f, -37.319328f }, 1.000000f, 0.000000f ); 
+      // States -> arm04_def (id: 2) arm04_def_anim (id: 3) arm04_down (id: 4) arm04_down_anim (id: 5) 
+    instance.registerEObj( "unknown_2", 2004828, 5041736, 4, { -97.215271f, 329.152313f, -129.564407f }, 0.991760f, 0.000048f ); 
+    instance.registerEObj( "Magitekterminal", 2004829, 5073686, 4, { -104.691200f, 328.877686f, -135.171402f }, 0.991760f, 0.000048f ); 
+    instance.registerEObj( "unknown_3", 2004830, 5054264, 4, { -85.465736f, 329.158203f, -114.917397f }, 0.991760f, 0.000048f ); 
+    instance.registerEObj( "unknown_4", 2004831, 5054260, 4, { -74.450752f, 350.933899f, -163.969894f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_5", 2004832, 5054262, 4, { -68.565010f, 338.613892f, -210.672806f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_6", 2004833, 5041738, 4, { -36.703850f, 338.613892f, -209.867294f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "Magitekterminal_1", 2004834, 5073702, 4, { -33.987030f, 338.612915f, -200.545197f }, 0.991760f, 0.000048f ); 
+    instance.registerEObj( "unknown_7", 2004835, 5041733, 4, { -102.992203f, 338.700012f, -173.230301f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_8", 2004836, 5041740, 4, { -91.617867f, 338.742096f, -191.340103f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_9", 2004837, 5041734, 4, { -56.932819f, 338.613800f, -220.085907f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_10", 2004838, 5041739, 4, { -58.661549f, 338.321289f, -231.786407f }, 0.991760f, 0.000048f ); 
+    instance.registerEObj( "sgbg_l1d1_q1_arm02", 2004840, 5097049, 4, { 60.261662f, 608.420776f, -64.327179f }, 1.000000f, 0.000000f ); 
+      // States -> arm02_def (id: 2) arm02_def_anim (id: 3) arm02_des (id: 4) arm02_des_anim (id: 5) 
+    instance.registerEObj( "sgbg_l1d1_q1_arm03", 2004842, 5097050, 4, { -42.140709f, 637.801575f, -13.313470f }, 1.000000f, 0.000000f ); 
+      // States -> arm03_def (id: 2) arm03_def_anim (id: 3) arm03_des (id: 4) arm03_des_anim (id: 5) 
+    instance.registerEObj( "unknown_11", 2002735, 0, 4, { 36.823841f, 26.884010f, -25.290840f }, 1.000000f, 1.175128f ); 
+    instance.registerEObj( "sgvf_w_lvd_b0118_1", 2002872, 5072855, 4, { 40.635441f, 24.890421f, -26.286221f }, 1.000000f, 0.000000f ); 
+      // States -> vf_bextwall_on (id: 3) vf_bextwall_of (id: 4) 
+    instance.registerEObj( "sgvf_w_lvd_b0118_2", 2004827, 5072856, 4, { 5.803720f, 26.994020f, -14.402020f }, 1.000000f, 0.000000f ); 
+      // States -> vf_bextwall_on (id: 3) vf_bextwall_of (id: 4) 
+    instance.registerEObj( "unknown_12", 2002735, 0, 4, { 8.333900f, 345.993805f, -169.028107f }, 1.000000f, -0.000000f ); 
+    instance.registerEObj( "sgvf_w_lvd_b0118_3", 2002872, 5076365, 4, { 9.495131f, 345.449799f, -172.095505f }, 1.000000f, 0.000000f ); 
+      // States -> vf_bextwall_on (id: 3) vf_bextwall_of (id: 4) 
+    instance.registerEObj( "sgvf_w_lvd_b0118_4", 2004839, 5076366, 4, { 7.837297f, 345.993805f, -134.142197f }, 1.000000f, 0.000000f ); 
+      // States -> vf_bextwall_on (id: 3) vf_bextwall_of (id: 4) 
+    instance.registerEObj( "Entrance", 2000182, 5072285, 5, { 294.405701f, 3.332572f, -157.864304f }, 1.000000f, 0.079727f ); 
+      // States -> vf_lock_on (id: 11) vf_lock_of (id: 12) 
+    instance.registerEObj( "Exit", 2000139, 0, 4, { -48.338951f, 641.026917f, -87.713493f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "Shortcut", 2000700, 0, 4, { 279.041687f, 2.095404f, -159.624695f }, 0.991760f, 0.000048f ); 
 
   }
 
-  void onUpdate( InstanceContentPtr instance, uint32_t currTime ) override
+  void onUpdate( InstanceContent& instance, uint32_t currTime ) override
   {
 
   }
 
-  void onEnterTerritory( InstanceContentPtr instance, Entity::Player& player, uint32_t eventId, uint16_t param1,
+  void onEnterTerritory( InstanceContent& instance, Entity::Player& player, uint32_t eventId, uint16_t param1,
                          uint16_t param2 ) override
   {
 
diff --git a/src/scripts/instances/dungeons/TheLostCityofAmdapor.cpp b/src/scripts/instances/dungeons/TheLostCityofAmdapor.cpp
index eca4b1ac..fc699d13 100644
--- a/src/scripts/instances/dungeons/TheLostCityofAmdapor.cpp
+++ b/src/scripts/instances/dungeons/TheLostCityofAmdapor.cpp
@@ -9,116 +9,74 @@ class TheLostCityofAmdapor :
 public:
   TheLostCityofAmdapor() :
     Sapphire::ScriptAPI::InstanceContentScript( 22 )
-  {
-  }
+  { }
 
-  void onInit( InstanceContentPtr instance ) override
+  void onInit( InstanceContent& instance ) override
   {
-    instance->registerEObj( "sgvf_w_lvd_b0118", 2002872, 4579298, 4, { 9.791200f, -279.967285f, 21.616301f }, 0.700000f,
-                            -0.494801f );
-    // States -> vf_bextwall_on vf_bextwall_of
-    instance->registerEObj( "unknown_0", 2002735, 0, 4, { 8.967742f, -279.844086f, 22.640949f }, 1.000000f,
-                            -0.407391f );
-    instance->registerEObj( "Exit", 2000139, 0, 4, { -6.668615f, -279.989990f, -16.121090f }, 1.000000f, 0.000000f );
-    instance->registerEObj( "Diabolicalgate", 2003262, 0, 4, { -11.735310f, -279.600006f, 1.146639f }, 1.000000f,
-                            -0.357945f );
-    instance->registerEObj( "Diabolicalgate_1", 2003263, 0, 4, { -5.801897f, -279.600006f, -2.180922f }, 1.000000f,
-                            -0.579334f );
-    instance->registerEObj( "Diabolicalgate_2", 2003264, 0, 4, { -9.593593f, -279.600006f, 5.704061f }, 1.000000f,
-                            -0.499409f );
-    instance->registerEObj( "Diabolicalgate_3", 2003265, 0, 4, { -3.149769f, -279.600006f, 2.478353f }, 1.000000f,
-                            -0.520267f );
-    instance->registerEObj( "Dubiouscoffer", 2003266, 0, 4, { 8.612234f, -279.989990f, -20.760429f }, 1.000000f,
-                            0.406471f );
-    instance->registerEObj( "Dubiouscoffer_1", 2003267, 0, 4, { 20.769291f, -279.989990f, -8.610124f }, 1.000000f,
-                            1.180338f );
-    instance->registerEObj( "Dubiouscoffer_2", 2003268, 0, 4, { -20.776131f, -279.989990f, 8.642863f }, 0.991760f,
-                            -1.160291f );
-    instance->registerEObj( "Dubiouscoffer_3", 2003269, 0, 4, { -20.738871f, -279.989990f, -8.552890f }, 1.000000f,
-                            -1.185745f );
-    instance->registerEObj( "Dubiouscoffer_4", 2003270, 0, 4, { 20.683531f, -279.989990f, 8.612939f }, 1.000000f,
-                            1.247274f );
-    instance->registerEObj( "Dubiouscoffer_5", 2003271, 0, 4, { -8.611513f, -279.989990f, 20.715059f }, 1.000000f,
-                            -0.423025f );
-    instance->registerEObj( "unknown_1", 2003361, 4538596, 4, { 146.386597f, 68.131821f, -32.655411f }, 0.991760f,
-                            0.000048f );
-    instance->registerEObj( "unknown_2", 2003431, 4577623, 4, { 141.929794f, 66.690971f, -22.680590f }, 1.000000f,
-                            0.000000f );
-    instance->registerEObj( "unknown_3", 2003362, 4577620, 4, { 124.650101f, 58.000000f, 21.475590f }, 1.000000f,
-                            0.000000f );
-    instance->registerEObj( "Treasurecoffer", 2003800, 0, 4, { 125.169800f, 58.259232f, 24.765381f }, 0.991760f,
-                            -1.568190f );
-    instance->registerEObj( "unknown_4", 2003364, 4538597, 4, { 1.248910f, 34.305920f, -96.145103f }, 0.991760f,
-                            0.000048f );
-    instance->registerEObj( "unknown_5", 2003432, 4577625, 4, { 7.652231f, 33.999989f, -83.909409f }, 1.000000f,
-                            0.000000f );
-    instance->registerEObj( "sgbg_f1d5_a3_kin03", 2003365, 4572307, 4, { 16.420071f, 30.172510f, -53.162449f },
-                            1.000000f, 0.000000f );
-    // States -> plant_def plant_action_anim
-    instance->registerEObj( "sgvf_f1d5_b0360", 2003366, 4629067, 4, { 13.762910f, 27.170670f, -29.499069f }, 1.000000f,
-                            0.000000f );
-    // States -> liq_def liq_on liq_on_anim liq_off_anim
-    instance->registerEObj( "unknown_6", 2003367, 4577622, 4, { -35.077301f, 20.181410f, -5.543382f }, 1.000000f,
-                            0.000000f );
-    instance->registerEObj( "sgbg_f1d5_a3_kin03_1", 2003368, 4572310, 4, { -36.282841f, 10.771230f, 27.777269f },
-                            1.000000f, 0.000000f );
-    // States -> plant_def plant_action_anim
-    instance->registerEObj( "sgvf_f1d5_b0359", 2003369, 4629073, 4, { -38.452469f, 10.771230f, 26.955620f }, 1.000000f,
-                            0.000000f );
-    // States -> liq_def liq_on liq_on_anim liq_off_anim
-    instance->registerEObj( "unknown_7", 2003370, 4538791, 4, { 11.000470f, 7.980469f, 18.231581f }, 0.991760f,
-                            0.000048f );
-    instance->registerEObj( "sgbg_f1d5_a3_kin03_2", 2003371, 4572309, 4, { 15.090590f, 6.133745f, 32.735611f },
-                            1.000000f, 0.000000f );
-    // States -> plant_def plant_action_anim
-    instance->registerEObj( "sgvf_f1d5_b0358", 2003372, 4629074, 4, { 11.812460f, 6.045094f, 32.012810f }, 1.000000f,
-                            0.000000f );
-    // States -> liq_def liq_on liq_on_anim liq_off_anim
-    instance->registerEObj( "unknown_8", 2003433, 4577626, 4, { 25.308140f, 6.141701f, 43.055359f }, 1.000000f,
-                            0.000000f );
-    instance->registerEObj( "Treasurecoffer_1", 2003801, 0, 4, { -39.169922f, 18.680960f, -1.968445f }, 0.991760f,
-                            -0.789868f );
-    instance->registerEObj( "unknown_9", 2003374, 4583478, 4, { 23.827320f, -252.500000f, -65.956993f }, 1.000000f,
-                            0.000000f );
-    instance->registerEObj( "unknown_10", 2003375, 4583476, 4, { 9.536644f, -252.394394f, -55.117130f }, 1.000000f,
-                            0.000000f );
-    instance->registerEObj( "unknown_11", 2003376, 4583473, 4, { 47.898071f, -270.801910f, 54.428829f }, 0.991760f,
-                            0.000048f );
-    instance->registerEObj( "unknown_12", 2003377, 4583472, 4, { 35.751831f, -270.679901f, 43.045650f }, 0.991760f,
-                            0.000048f );
-    instance->registerEObj( "unknown_13", 2003378, 4583471, 4, { 42.832031f, -270.801910f, 35.995972f }, 0.991760f,
-                            0.000048f );
-    instance->registerEObj( "unknown_14", 2003379, 4583474, 4, { 54.564331f, -270.899994f, 47.591949f }, 1.000000f,
-                            0.000000f );
-    instance->registerEObj( "sgvf_w_lvd_b0118_1", 2002872, 4577505, 4, { 100.376602f, 43.960560f, 2.708986f },
-                            1.000000f, 0.000000f );
-    // States -> vf_bextwall_on vf_bextwall_of
-    instance->registerEObj( "unknown_15", 2002735, 0, 4, { 97.980797f, 42.137150f, -0.222000f }, 0.900000f, 0.000000f );
-    instance->registerEObj( "unknown_16", 2003363, 4578411, 4, { 86.630951f, 42.801220f, -47.240730f }, 1.000000f,
-                            0.000000f );
-    instance->registerEObj( "sgvf_w_lvd_b0118_2", 2003373, 4578103, 4, { -38.428570f, 12.100000f, 70.544273f },
-                            1.000000f, 0.000000f );
-    // States -> vf_bextwall_on vf_bextwall_of
-    instance->registerEObj( "sgvf_w_lvd_b0118_3", 2002872, 4578066, 4, { 6.156913f, 11.249960f, 70.316727f }, 1.000000f,
-                            0.000000f );
-    // States -> vf_bextwall_on vf_bextwall_of
-    instance->registerEObj( "unknown_17", 2002735, 0, 4, { 4.235116f, 12.085570f, 69.965263f }, 1.000000f, -1.570451f );
-    instance->registerEObj( "unknown_18", 2003360, 0, 4, { 284.752808f, 100.000000f, -31.765209f }, 1.000000f,
-                            0.000000f );
-    instance->registerEObj( "Entrance", 2000182, 4574610, 5, { 270.581207f, 100.000000f, -17.202379f }, 1.000000f,
-                            0.000000f );
-    // States -> vf_lock_on vf_lock_of
-    instance->registerEObj( "Shortcut", 2000700, 0, 4, { 265.173615f, 100.000000f, -32.604542f }, 1.000000f,
-                            0.000000f );
+    instance.registerEObj( "sgvf_w_lvd_b0118", 2002872, 4579298, 4, { 9.791200f, -279.967285f, 21.616301f }, 0.700000f, -0.494801f ); 
+      // States -> vf_bextwall_on (id: 3) vf_bextwall_of (id: 4) 
+    instance.registerEObj( "unknown_0", 2002735, 0, 4, { 8.967742f, -279.844086f, 22.640949f }, 1.000000f, -0.407391f ); 
+    instance.registerEObj( "Exit", 2000139, 0, 4, { -6.668615f, -279.989990f, -16.121090f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "Diabolicalgate", 2003262, 0, 4, { -11.735310f, -279.600006f, 1.146639f }, 1.000000f, -0.357945f ); 
+    instance.registerEObj( "Diabolicalgate_1", 2003263, 0, 4, { -5.801897f, -279.600006f, -2.180922f }, 1.000000f, -0.579334f ); 
+    instance.registerEObj( "Diabolicalgate_2", 2003264, 0, 4, { -9.593593f, -279.600006f, 5.704061f }, 1.000000f, -0.499409f ); 
+    instance.registerEObj( "Diabolicalgate_3", 2003265, 0, 4, { -3.149769f, -279.600006f, 2.478353f }, 1.000000f, -0.520267f ); 
+    instance.registerEObj( "Dubiouscoffer", 2003266, 0, 4, { 8.612234f, -279.989990f, -20.760429f }, 1.000000f, 0.406471f ); 
+    instance.registerEObj( "Dubiouscoffer_1", 2003267, 0, 4, { 20.769291f, -279.989990f, -8.610124f }, 1.000000f, 1.180338f ); 
+    instance.registerEObj( "Dubiouscoffer_2", 2003268, 0, 4, { -20.776131f, -279.989990f, 8.642863f }, 0.991760f, -1.160291f ); 
+    instance.registerEObj( "Dubiouscoffer_3", 2003269, 0, 4, { -20.738871f, -279.989990f, -8.552890f }, 1.000000f, -1.185745f ); 
+    instance.registerEObj( "Dubiouscoffer_4", 2003270, 0, 4, { 20.683531f, -279.989990f, 8.612939f }, 1.000000f, 1.247274f ); 
+    instance.registerEObj( "Dubiouscoffer_5", 2003271, 0, 4, { -8.611513f, -279.989990f, 20.715059f }, 1.000000f, -0.423025f ); 
+    instance.registerEObj( "unknown_1", 2003361, 4538596, 4, { 146.386597f, 68.131821f, -32.655411f }, 0.991760f, 0.000048f ); 
+    instance.registerEObj( "unknown_2", 2003431, 4577623, 4, { 141.929794f, 66.690971f, -22.680590f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_3", 2003362, 4577620, 4, { 124.650101f, 58.000000f, 21.475590f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "Treasurecoffer", 2003800, 0, 4, { 125.169800f, 58.259232f, 24.765381f }, 0.991760f, -1.568190f ); 
+    instance.registerEObj( "unknown_4", 2003364, 4538597, 4, { 1.248910f, 34.305920f, -96.145103f }, 0.991760f, 0.000048f ); 
+    instance.registerEObj( "unknown_5", 2003432, 4577625, 4, { 7.652231f, 33.999989f, -83.909409f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "sgbg_f1d5_a3_kin03", 2003365, 4572307, 4, { 16.420071f, 30.172510f, -53.162449f }, 1.000000f, 0.000000f ); 
+      // States -> plant_def (id: 2) plant_action_anim (id: 3) 
+    instance.registerEObj( "sgvf_f1d5_b0360", 2003366, 4629067, 4, { 13.762910f, 27.170670f, -29.499069f }, 1.000000f, 0.000000f ); 
+      // States -> liq_def (id: 2) liq_on (id: 3) liq_on_anim (id: 4) liq_off_anim (id: 6) 
+    instance.registerEObj( "unknown_6", 2003367, 4577622, 4, { -35.077301f, 20.181410f, -5.543382f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "sgbg_f1d5_a3_kin03_1", 2003368, 4572310, 4, { -36.282841f, 10.771230f, 27.777269f }, 1.000000f, 0.000000f ); 
+      // States -> plant_def (id: 2) plant_action_anim (id: 3) 
+    instance.registerEObj( "sgvf_f1d5_b0359", 2003369, 4629073, 4, { -38.452469f, 10.771230f, 26.955620f }, 1.000000f, 0.000000f ); 
+      // States -> liq_def (id: 2) liq_on (id: 3) liq_on_anim (id: 4) liq_off_anim (id: 6) 
+    instance.registerEObj( "unknown_7", 2003370, 4538791, 4, { 11.000470f, 7.980469f, 18.231581f }, 0.991760f, 0.000048f ); 
+    instance.registerEObj( "sgbg_f1d5_a3_kin03_2", 2003371, 4572309, 4, { 15.090590f, 6.133745f, 32.735611f }, 1.000000f, 0.000000f ); 
+      // States -> plant_def (id: 2) plant_action_anim (id: 3) 
+    instance.registerEObj( "sgvf_f1d5_b0358", 2003372, 4629074, 4, { 11.812460f, 6.045094f, 32.012810f }, 1.000000f, 0.000000f ); 
+      // States -> liq_def (id: 2) liq_on (id: 3) liq_on_anim (id: 4) liq_off_anim (id: 6) 
+    instance.registerEObj( "unknown_8", 2003433, 4577626, 4, { 25.308140f, 6.141701f, 43.055359f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "Treasurecoffer_1", 2003801, 0, 4, { -39.169922f, 18.680960f, -1.968445f }, 0.991760f, -0.789868f ); 
+    instance.registerEObj( "unknown_9", 2003374, 4583478, 4, { 23.827320f, -252.500000f, -65.956993f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_10", 2003375, 4583476, 4, { 9.536644f, -252.394394f, -55.117130f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_11", 2003376, 4583473, 4, { 47.898071f, -270.801910f, 54.428829f }, 0.991760f, 0.000048f ); 
+    instance.registerEObj( "unknown_12", 2003377, 4583472, 4, { 35.751831f, -270.679901f, 43.045650f }, 0.991760f, 0.000048f ); 
+    instance.registerEObj( "unknown_13", 2003378, 4583471, 4, { 42.832031f, -270.801910f, 35.995972f }, 0.991760f, 0.000048f ); 
+    instance.registerEObj( "unknown_14", 2003379, 4583474, 4, { 54.564331f, -270.899994f, 47.591949f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "sgvf_w_lvd_b0118_1", 2002872, 4577505, 4, { 100.376602f, 43.960560f, 2.708986f }, 1.000000f, 0.000000f ); 
+      // States -> vf_bextwall_on (id: 3) vf_bextwall_of (id: 4) 
+    instance.registerEObj( "unknown_15", 2002735, 0, 4, { 97.980797f, 42.137150f, -0.222000f }, 0.900000f, 0.000000f ); 
+    instance.registerEObj( "unknown_16", 2003363, 4578411, 4, { 86.630951f, 42.801220f, -47.240730f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "sgvf_w_lvd_b0118_2", 2003373, 4578103, 4, { -38.428570f, 12.100000f, 70.544273f }, 1.000000f, 0.000000f ); 
+      // States -> vf_bextwall_on (id: 3) vf_bextwall_of (id: 4) 
+    instance.registerEObj( "sgvf_w_lvd_b0118_3", 2002872, 4578066, 4, { 6.156913f, 11.249960f, 70.316727f }, 1.000000f, 0.000000f ); 
+      // States -> vf_bextwall_on (id: 3) vf_bextwall_of (id: 4) 
+    instance.registerEObj( "unknown_17", 2002735, 0, 4, { 4.235116f, 12.085570f, 69.965263f }, 1.000000f, -1.570451f ); 
+    instance.registerEObj( "unknown_18", 2003360, 0, 4, { 284.752808f, 100.000000f, -31.765209f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "Entrance", 2000182, 4574610, 5, { 270.581207f, 100.000000f, -17.202379f }, 1.000000f, 0.000000f ); 
+      // States -> vf_lock_on (id: 11) vf_lock_of (id: 12) 
+    instance.registerEObj( "Shortcut", 2000700, 0, 4, { 265.173615f, 100.000000f, -32.604542f }, 1.000000f, 0.000000f ); 
 
   }
 
-  void onUpdate( InstanceContentPtr instance, uint32_t currTime ) override
+  void onUpdate( InstanceContent& instance, uint32_t currTime ) override
   {
 
   }
 
-  void onEnterTerritory( InstanceContentPtr instance, Entity::Player& player, uint32_t eventId, uint16_t param1,
+  void onEnterTerritory( InstanceContent& instance, Entity::Player& player, uint32_t eventId, uint16_t param1,
                          uint16_t param2 ) override
   {
 
diff --git a/src/scripts/instances/dungeons/TheLostCityofAmdaporHard.cpp b/src/scripts/instances/dungeons/TheLostCityofAmdaporHard.cpp
index 0ef76664..21958893 100644
--- a/src/scripts/instances/dungeons/TheLostCityofAmdaporHard.cpp
+++ b/src/scripts/instances/dungeons/TheLostCityofAmdaporHard.cpp
@@ -9,105 +9,65 @@ class TheLostCityofAmdaporHard :
 public:
   TheLostCityofAmdaporHard() :
     Sapphire::ScriptAPI::InstanceContentScript( 42 )
-  {
-  }
+  { }
 
-  void onInit( InstanceContentPtr instance ) override
+  void onInit( InstanceContent& instance ) override
   {
-    instance->registerEObj( "sgvf_w_lvd_b0118", 2002872, 6159060, 4, { -199.881607f, 11.999990f, -280.139313f },
-                            0.991760f, 0.000048f );
-    // States -> vf_bextwall_on vf_bextwall_of
-    instance->registerEObj( "unknown_0", 2002735, 0, 4, { -200.009201f, 12.116690f, -280.037506f }, 0.991760f,
-                            -1.570451f );
-    instance->registerEObj( "sgvf_w_lvd_b0118_1", 2003373, 6159063, 4, { -238.928894f, 12.100000f, -279.455688f },
-                            1.000000f, 0.000000f );
-    // States -> vf_bextwall_on vf_bextwall_of
-    instance->registerEObj( "unknown_1", 2006848, 0, 4, { -227.145905f, 11.978270f, -284.676086f }, 0.991760f,
-                            0.000048f );
-    instance->registerEObj( "sgvf_w_lvd_b0118_2", 2002872, 6158913, 4, { -262.326813f, -278.432312f, -241.982407f },
-                            1.000000f, -0.424392f );
-    // States -> vf_bextwall_on vf_bextwall_of
-    instance->registerEObj( "unknown_2", 2002735, 0, 4, { -261.926788f, -278.586792f, -242.680695f }, 0.800000f,
-                            -0.511830f );
-    instance->registerEObj( "sgvf_w_lvd_b0118_3", 2006850, 6161174, 4, { -281.669495f, -278.783203f, -207.507401f },
-                            1.000000f, 0.000000f );
-    // States -> vf_bextwall_on vf_bextwall_of
-    instance->registerEObj( "unknown_3", 2006851, 0, 4, { -287.205292f, -278.675507f, -219.428604f }, 0.991760f,
-                            0.000048f );
-    instance->registerEObj( "unknown_4", 2006852, 0, 4, { -285.709991f, -278.675507f, -222.022598f }, 0.991760f,
-                            0.000048f );
-    instance->registerEObj( "unknown_5", 2006853, 0, 4, { -284.489288f, -278.675507f, -217.719604f }, 0.991760f,
-                            0.000048f );
-    instance->registerEObj( "unknown_6", 2006854, 0, 4, { -282.932892f, -278.675507f, -220.527298f }, 0.991760f,
-                            0.000048f );
-    instance->registerEObj( "sgvf_w_lvd_b0118_4", 2002872, 6177873, 4, { 236.391098f, -854.348206f, 388.999908f },
-                            0.991760f, -0.424392f );
-    // States -> vf_bextwall_on vf_bextwall_of
-    instance->registerEObj( "unknown_7", 2002735, 0, 4, { 236.928299f, -854.301025f, 388.437988f }, 0.991760f,
-                            -0.272621f );
-    instance->registerEObj( "unknown_8", 2006855, 0, 4, { 245.654495f, -854.500000f, 408.186615f }, 0.991760f,
-                            0.000048f );
-    instance->registerEObj( "unknown_9", 2006856, 0, 4, { 245.602402f, -854.500000f, 408.203186f }, 0.991760f,
-                            0.000048f );
-    instance->registerEObj( "unknown_10", 2006857, 0, 4, { 217.570694f, -854.500000f, 414.970306f }, 0.991760f,
-                            0.000048f );
-    instance->registerEObj( "unknown_11", 2006867, 0, 4, { 238.696899f, -854.398376f, 400.472900f }, 0.991760f,
-                            0.000048f );
-    instance->registerEObj( "unknown_12", 2006868, 0, 4, { 225.070404f, -854.520508f, 402.559692f }, 0.991760f,
-                            0.000048f );
-    instance->registerEObj( "unknown_13", 2007000, 6217077, 4, { 230.880493f, -854.459717f, 414.889313f }, 1.000000f,
-                            0.000000f );
-    instance->registerEObj( "Guardianstatue", 2006976, 0, 4, { 231.118698f, -852.800171f, 414.090088f }, 1.000000f,
-                            0.000000f );
-    instance->registerEObj( "Guardianstatue_1", 2006977, 0, 4, { 231.113907f, -852.801514f, 414.085785f }, 1.000000f,
-                            0.000000f );
-    instance->registerEObj( "Guardianstatue_2", 2006978, 0, 4, { 231.101898f, -852.801514f, 414.089111f }, 1.000000f,
-                            0.000000f );
-    instance->registerEObj( "Entrance", 2000182, 6159123, 5, { 73.070312f, 100.000000f, -376.644592f }, 0.991760f,
-                            0.000048f );
-    // States -> vf_lock_on vf_lock_of
-    instance->registerEObj( "Shortcut", 2000700, 0, 4, { 65.173607f, 100.000000f, -382.604614f }, 1.000000f,
-                            0.000000f );
-    instance->registerEObj( "Exit", 2000139, 0, 4, { 228.895599f, -854.546082f, 420.274109f }, 0.991760f, -0.919204f );
-    instance->registerEObj( "unknown_14", 2006825, 6173434, 4, { -45.716091f, 57.999512f, -311.654205f }, 0.991760f,
-                            0.000048f );
-    instance->registerEObj( "unknown_15", 2006826, 6173447, 4, { -174.685303f, 6.271362f, -302.651215f }, 0.991760f,
-                            0.000048f );
-    instance->registerEObj( "unknown_16", 2006827, 6173458, 4, { -174.227493f, 6.973328f, -299.721588f }, 0.991760f,
-                            0.000048f );
-    instance->registerEObj( "unknown_17", 2006828, 6155704, 4, { -74.714241f, 58.247410f, -327.713287f }, 0.991760f,
-                            0.000048f );
-    instance->registerEObj( "unknown_18", 2006829, 6184879, 4, { -170.839996f, -252.613205f, -408.640503f }, 0.991760f,
-                            0.000048f );
-    instance->registerEObj( "unknown_19", 2006830, 6184881, 4, { -163.902496f, -272.319397f, -294.726501f }, 1.000000f,
-                            0.000000f );
-    instance->registerEObj( "unknown_20", 2006831, 6162191, 4, { -243.942093f, -280.660706f, -273.564789f }, 1.000000f,
-                            -0.000000f );
-    instance->registerEObj( "Stoneoftransference", 2006834, 6173379, 4, { -295.032104f, -273.037506f, -185.082397f },
-                            1.000000f, 0.000000f );
-    instance->registerEObj( "unknown_21", 2006832, 6177949, 4, { 166.001007f, -844.999817f, 265.365814f }, 1.000000f,
-                            0.000000f );
-    instance->registerEObj( "unknown_22", 2006833, 6177947, 4, { 226.690002f, -856.247681f, 262.675415f }, 1.000000f,
-                            0.000000f );
-    instance->registerEObj( "unknown_23", 2006835, 6202096, 4, { 255.720200f, -865.873474f, 319.853210f }, 1.000000f,
-                            0.000000f );
-    instance->registerEObj( "sgbg_w_qic_004_03a", 2002872, 6904891, 4, { 236.391205f, -854.348083f, 388.999908f },
-                            0.991760f, -0.424392f );
-    instance->registerEObj( "unknown_24", 2002735, 0, 4, { 236.928299f, -854.301025f, 388.437988f }, 0.991760f,
-                            -0.272621f );
-    instance->registerEObj( "sgbg_w_qic_004_03a_1", 2007457, 6904603, 4, { 249.195099f, -856.351624f, 343.526215f },
-                            0.991760f, 0.000048f );
-    instance->registerEObj( "unknown_25", 2007457, 6217077, 4, { 233.497299f, -854.546021f, 414.179413f }, 1.000000f,
-                            0.000000f );
+    instance.registerEObj( "sgvf_w_lvd_b0118", 2002872, 6159060, 4, { -199.881607f, 11.999990f, -280.139313f }, 0.991760f, 0.000048f ); 
+      // States -> vf_bextwall_on (id: 3) vf_bextwall_of (id: 4) 
+    instance.registerEObj( "unknown_0", 2002735, 0, 4, { -200.009201f, 12.116690f, -280.037506f }, 0.991760f, -1.570451f ); 
+    instance.registerEObj( "sgvf_w_lvd_b0118_1", 2003373, 6159063, 4, { -238.928894f, 12.100000f, -279.455688f }, 1.000000f, 0.000000f ); 
+      // States -> vf_bextwall_on (id: 3) vf_bextwall_of (id: 4) 
+    instance.registerEObj( "unknown_1", 2006848, 0, 4, { -227.145905f, 11.978270f, -284.676086f }, 0.991760f, 0.000048f ); 
+    instance.registerEObj( "sgvf_w_lvd_b0118_2", 2002872, 6158913, 4, { -262.326813f, -278.432312f, -241.982407f }, 1.000000f, -0.424392f ); 
+      // States -> vf_bextwall_on (id: 3) vf_bextwall_of (id: 4) 
+    instance.registerEObj( "unknown_2", 2002735, 0, 4, { -261.926788f, -278.586792f, -242.680695f }, 0.800000f, -0.511830f ); 
+    instance.registerEObj( "sgvf_w_lvd_b0118_3", 2006850, 6161174, 4, { -281.669495f, -278.783203f, -207.507401f }, 1.000000f, 0.000000f ); 
+      // States -> vf_bextwall_on (id: 3) vf_bextwall_of (id: 4) 
+    instance.registerEObj( "unknown_3", 2006851, 0, 4, { -287.205292f, -278.675507f, -219.428604f }, 0.991760f, 0.000048f ); 
+    instance.registerEObj( "unknown_4", 2006852, 0, 4, { -285.709991f, -278.675507f, -222.022598f }, 0.991760f, 0.000048f ); 
+    instance.registerEObj( "unknown_5", 2006853, 0, 4, { -284.489288f, -278.675507f, -217.719604f }, 0.991760f, 0.000048f ); 
+    instance.registerEObj( "unknown_6", 2006854, 0, 4, { -282.932892f, -278.675507f, -220.527298f }, 0.991760f, 0.000048f ); 
+    instance.registerEObj( "sgvf_w_lvd_b0118_4", 2002872, 6177873, 4, { 236.391098f, -854.348206f, 388.999908f }, 0.991760f, -0.424392f ); 
+      // States -> vf_bextwall_on (id: 3) vf_bextwall_of (id: 4) 
+    instance.registerEObj( "unknown_7", 2002735, 0, 4, { 236.928299f, -854.301025f, 388.437988f }, 0.991760f, -0.272621f ); 
+    instance.registerEObj( "unknown_8", 2006855, 0, 4, { 245.654495f, -854.500000f, 408.186615f }, 0.991760f, 0.000048f ); 
+    instance.registerEObj( "unknown_9", 2006856, 0, 4, { 245.602402f, -854.500000f, 408.203186f }, 0.991760f, 0.000048f ); 
+    instance.registerEObj( "unknown_10", 2006857, 0, 4, { 217.570694f, -854.500000f, 414.970306f }, 0.991760f, 0.000048f ); 
+    instance.registerEObj( "unknown_11", 2006867, 0, 4, { 238.696899f, -854.398376f, 400.472900f }, 0.991760f, 0.000048f ); 
+    instance.registerEObj( "unknown_12", 2006868, 0, 4, { 225.070404f, -854.520508f, 402.559692f }, 0.991760f, 0.000048f ); 
+    instance.registerEObj( "unknown_13", 2007000, 6217077, 4, { 230.880493f, -854.459717f, 414.889313f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "Guardianstatue", 2006976, 0, 4, { 231.118698f, -852.800171f, 414.090088f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "Guardianstatue_1", 2006977, 0, 4, { 231.113907f, -852.801514f, 414.085785f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "Guardianstatue_2", 2006978, 0, 4, { 231.101898f, -852.801514f, 414.089111f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "Entrance", 2000182, 6159123, 5, { 73.070312f, 100.000000f, -376.644592f }, 0.991760f, 0.000048f ); 
+      // States -> vf_lock_on (id: 11) vf_lock_of (id: 12) 
+    instance.registerEObj( "Shortcut", 2000700, 0, 4, { 65.173607f, 100.000000f, -382.604614f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "Exit", 2000139, 0, 4, { 228.895599f, -854.546082f, 420.274109f }, 0.991760f, -0.919204f ); 
+    instance.registerEObj( "unknown_14", 2006825, 6173434, 4, { -45.716091f, 57.999512f, -311.654205f }, 0.991760f, 0.000048f ); 
+    instance.registerEObj( "unknown_15", 2006826, 6173447, 4, { -174.685303f, 6.271362f, -302.651215f }, 0.991760f, 0.000048f ); 
+    instance.registerEObj( "unknown_16", 2006827, 6173458, 4, { -174.227493f, 6.973328f, -299.721588f }, 0.991760f, 0.000048f ); 
+    instance.registerEObj( "unknown_17", 2006828, 6155704, 4, { -74.714241f, 58.247410f, -327.713287f }, 0.991760f, 0.000048f ); 
+    instance.registerEObj( "unknown_18", 2006829, 6184879, 4, { -170.839996f, -252.613205f, -408.640503f }, 0.991760f, 0.000048f ); 
+    instance.registerEObj( "unknown_19", 2006830, 6184881, 4, { -163.902496f, -272.319397f, -294.726501f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_20", 2006831, 6162191, 4, { -243.942093f, -280.660706f, -273.564789f }, 1.000000f, -0.000000f ); 
+    instance.registerEObj( "Stoneoftransference", 2006834, 6173379, 4, { -295.032104f, -273.037506f, -185.082397f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_21", 2006832, 6177949, 4, { 166.001007f, -844.999817f, 265.365814f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_22", 2006833, 6177947, 4, { 226.690002f, -856.247681f, 262.675415f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_23", 2006835, 6202096, 4, { 255.720200f, -865.873474f, 319.853210f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "sgbg_w_qic_004_03a", 2002872, 6904891, 4, { 236.391205f, -854.348083f, 388.999908f }, 0.991760f, -0.424392f ); 
+    instance.registerEObj( "unknown_24", 2002735, 0, 4, { 236.928299f, -854.301025f, 388.437988f }, 0.991760f, -0.272621f ); 
+    instance.registerEObj( "sgbg_w_qic_004_03a_1", 2007457, 6904603, 4, { 249.195099f, -856.351624f, 343.526215f }, 0.991760f, 0.000048f ); 
+    instance.registerEObj( "unknown_25", 2007457, 6217077, 4, { 233.497299f, -854.546021f, 414.179413f }, 1.000000f, 0.000000f ); 
 
   }
 
-  void onUpdate( InstanceContentPtr instance, uint32_t currTime ) override
+  void onUpdate( InstanceContent& instance, uint32_t currTime ) override
   {
 
   }
 
-  void onEnterTerritory( InstanceContentPtr instance, Entity::Player& player, uint32_t eventId, uint16_t param1,
+  void onEnterTerritory( InstanceContent& instance, Entity::Player& player, uint32_t eventId, uint16_t param1,
                          uint16_t param2 ) override
   {
 
diff --git a/src/scripts/instances/dungeons/ThePraetorium.cpp b/src/scripts/instances/dungeons/ThePraetorium.cpp
index 0afdf23a..b849e9dd 100644
--- a/src/scripts/instances/dungeons/ThePraetorium.cpp
+++ b/src/scripts/instances/dungeons/ThePraetorium.cpp
@@ -9,238 +9,135 @@ class ThePraetorium :
 public:
   ThePraetorium() :
     Sapphire::ScriptAPI::InstanceContentScript( 16 )
-  {
-  }
+  { }
 
-  void onInit( InstanceContentPtr instance ) override
+  void onInit( InstanceContent& instance ) override
   {
-    instance->registerEObj( "sgvf_w_lvd_b0118", 2000828, 4305694, 4, { -784.536987f, -344.000000f, 0.121873f },
-                            1.000000f, 0.000000f );
-    // States -> vf_bextwall_on vf_bextwall_of
-    instance->registerEObj( "unknown_0", 2000829, 0, 4, { -781.198120f, -344.000000f, 0.127798f }, 0.900000f,
-                            -1.570451f );
-    instance->registerEObj( "Shortcut", 2000848, 0, 4, { -788.420593f, -400.046387f, -601.281189f }, 0.991760f,
-                            0.000048f );
-    instance->registerEObj( "unknown_1", 2000832, 4303065, 4, { -703.485413f, -185.734299f, 461.314697f }, 0.991760f,
-                            0.000048f );
-    instance->registerEObj( "unknown_2", 2000833, 4303324, 4, { -721.744019f, -185.531204f, 478.978302f }, 0.991760f,
-                            0.000048f );
-    instance->registerEObj( "unknown_3", 2000834, 4303325, 4, { -704.359924f, -185.731995f, 498.390015f }, 0.991760f,
-                            0.000048f );
-    instance->registerEObj( "unknown_4", 2000831, 0, 4, { -781.198120f, -344.000000f, 0.127800f }, 0.900000f,
-                            -1.570451f );
-    instance->registerEObj( "unknown_5", 2002538, 0, 4, { -781.198120f, -344.000000f, 0.127800f }, 0.900000f,
-                            -1.570451f );
-    instance->registerEObj( "sgvf_w_lvd_b0118_1", 2000828, 4305491, 4, { 212.974304f, 75.866501f, -0.668073f },
-                            1.000000f, 1.568613f );
-    // States -> vf_bextwall_on vf_bextwall_of
-    instance->registerEObj( "unknown_6", 2000829, 0, 4, { 215.905304f, 76.000000f, -0.131676f }, 0.700000f, 1.568640f );
-    instance->registerEObj( "sgvf_w_lvd_b0118_2", 2000822, 4305462, 4, { -135.017593f, -103.976402f, -1.129792f },
-                            1.000000f, 0.000000f );
-    // States -> vf_bextwall_on vf_bextwall_of
-    instance->registerEObj( "unknown_7", 2000823, 0, 4, { -129.654205f, -104.027000f, -0.290400f }, 1.000000f,
-                            -1.570451f );
-    instance->registerEObj( "sgvf_w_lvd_b0118_3", 2000826, 4305555, 4, { -216.218002f, -103.997398f, -3.836082f },
-                            1.000000f, 0.000000f );
-    // States -> vf_bextwall_on vf_bextwall_of
-    instance->registerEObj( "unknown_8", 2000827, 0, 4, { -208.879593f, -103.997398f, -0.252325f }, 1.000000f,
-                            -1.570451f );
-    instance->registerEObj( "Shortcut_1", 2000848, 0, 4, { -577.757812f, -268.000000f, 218.871399f }, 1.000000f,
-                            0.000000f );
-    instance->registerEObj( "sgvf_w1d5_bossA_lvd_b0118", 2000876, 4317513, 4, { 180.458893f, 76.089233f, -0.360356f },
-                            1.000000f, 0.000000f );
-    // States -> vf_bextwall_on vf_bextwall_of
-    instance->registerEObj( "unknown_9", 2000976, 0, 4, { 180.548401f, 76.089943f, 0.959593f }, 1.000000f, -0.000248f );
-    instance->registerEObj( "sgvf_w_btl_b0216", 2001134, 4326317, 4, { -166.447800f, -104.221901f, 16.976521f },
-                            1.000000f, 0.000000f );
-    instance->registerEObj( "sgvf_w_lvd_b0118_4", 2001135, 4326381, 4, { -196.318497f, -104.078903f, -0.786835f },
-                            1.000000f, 0.000000f );
-    // States -> vf_bextwall_on vf_bextwall_of
-    instance->registerEObj( "unknown_10", 2001766, 4175265, 4, { -570.270081f, -268.000000f, 217.461197f }, 1.000000f,
-                            0.000000f );
-    instance->registerEObj( "仮シド指令", 2000806, 0, 4, { 217.957397f, 46.000000f, -11.597380f }, 1.000000f, 0.000000f );
-    instance->registerEObj( "Magitekterminal", 2000851, 0, 4, { 133.745193f, 22.964720f, -0.015320f }, 0.991760f,
-                            0.000048f );
-    instance->registerEObj( "Magitekterminal_1", 2000852, 0, 4, { 134.477707f, 7.614197f, -0.045776f }, 0.991760f,
-                            0.000048f );
-    instance->registerEObj( "Magitekterminal_2", 2000856, 0, 4, { 145.769394f, 21.988159f, 7.095398f }, 0.991760f,
-                            0.000048f );
-    instance->registerEObj( "unknown_11", 2000813, 0, 4, { 136.430801f, 22.354429f, -0.137390f }, 0.991760f,
-                            0.000048f );
-    instance->registerEObj( "Magitekterminal_3", 2000858, 0, 4, { 121.995796f, -104.020798f, 3.707886f }, 0.991760f,
-                            0.000048f );
-    instance->registerEObj( "Magitekarmor", 2000872, 0, 4, { 12.002250f, -107.811699f, -78.686447f }, 2.578735f,
-                            -1.562172f );
-    instance->registerEObj( "Magitekarmor_1", 2000872, 0, 4, { 108.952103f, -106.029999f, -7.573757f }, 2.578735f,
-                            -0.369535f );
-    instance->registerEObj( "unknown_12", 2000791, 4118536, 4, { 226.850998f, 155.775497f, 3.640267f }, 1.000000f,
-                            0.000000f );
-    instance->registerEObj( "unknown_13", 2000836, 4178897, 4, { 230.933899f, 156.818100f, 25.887810f }, 1.000000f,
-                            0.000000f );
-    instance->registerEObj( "Magitekterminal_4", 2000792, 0, 4, { 240.527893f, 155.626495f, 4.989798f }, 0.991760f,
-                            0.000048f );
-    instance->registerEObj( "unknown_14", 2000793, 4243244, 4, { 187.994705f, 152.227097f, -80.103348f }, 1.000000f,
-                            0.000000f );
-    instance->registerEObj( "unknown_15", 2000794, 4178131, 4, { 157.029907f, 155.725204f, -56.634510f }, 1.000000f,
-                            0.000000f );
-    instance->registerEObj( "unknown_16", 2000795, 4118533, 4, { 171.986206f, 160.259903f, -32.392151f }, 1.000000f,
-                            0.000000f );
-    instance->registerEObj( "sgpl_w_transparent06", 2000796, 4317691, 4, { 177.690002f, 155.500000f, -35.500401f },
-                            1.000000f, 0.000000f );
-    instance->registerEObj( "Imperialidentificationkey", 2000837, 0, 4, { 226.065094f, 155.807800f, 7.053694f },
-                            1.000000f, 0.000000f );
-    instance->registerEObj( "unknown_17", 2000855, 4178132, 4, { 224.098007f, 156.000000f, -26.999870f }, 1.000000f,
-                            0.000000f );
-    instance->registerEObj( "sgpl_w_transparent04", 2000845, 4316977, 4, { 221.255707f, 156.000000f, 6.591867f },
-                            1.000000f, 0.000000f );
-    instance->registerEObj( "Magitekterminal_5", 2001145, 4329956, 4, { 196.345398f, 186.275101f, -3.980006f },
-                            1.000000f, 0.000000f );
-    // States -> ele_off ele_on
-    instance->registerEObj( "Magitekterminal_6", 2001146, 4329960, 4, { 196.312805f, 155.999893f, 4.083439f },
-                            1.000000f, 0.000000f );
-    // States -> ele_off ele_on
-    instance->registerEObj( "Magitektransporter", 2001147, 0, 4, { 204.421494f, 120.000000f, -60.006229f }, 1.000000f,
-                            0.000000f );
-    instance->registerEObj( "Magitektransporter_1", 2001148, 0, 4, { 228.831696f, 71.500000f, -28.156210f }, 1.000000f,
-                            0.827528f );
-    instance->registerEObj( "unknown_18", 2002628, 4305528, 4, { 221.126099f, 153.428696f, -69.269623f }, 1.000000f,
-                            0.000000f );
-    instance->registerEObj( "unknown_19", 2000871, 0, 4, { 174.414993f, 102.515198f, -88.973930f }, 1.000000f,
-                            0.000000f );
-    instance->registerEObj( "unknown_20", 2000797, 4118552, 4, { 227.155396f, 72.000000f, -43.219952f }, 1.000000f,
-                            0.000000f );
-    instance->registerEObj( "unknown_21", 2000798, 4119463, 4, { 190.957703f, 72.355438f, -64.773132f }, 1.000000f,
-                            0.000000f );
-    instance->registerEObj( "Magitekterminal_7", 2000799, 0, 4, { 268.474396f, 67.031410f, -49.967129f }, 0.991760f,
-                            -0.501567f );
-    instance->registerEObj( "Imperialidentificationkey_1", 2000838, 0, 4, { 263.129395f, 66.381569f, -71.274437f },
-                            1.000000f, 0.000000f );
-    instance->registerEObj( "unknown_22", 2000667, 4119461, 4, { 271.022614f, 68.049881f, -45.787529f }, 1.000000f,
-                            0.000000f );
-    instance->registerEObj( "unknown_23", 2000800, 4124814, 4, { 237.461395f, 72.250000f, 33.809959f }, 1.000000f,
-                            0.000000f );
-    instance->registerEObj( "unknown_24", 2000843, 4119464, 4, { 190.731094f, 67.877243f, -85.008949f }, 1.000000f,
-                            0.000000f );
-    instance->registerEObj( "unknown_25", 2000844, 0, 4, { 254.749405f, 72.098747f, -36.545410f }, 0.991760f,
-                            0.000048f );
-    instance->registerEObj( "Magitekterminal_8", 2000841, 0, 4, { 234.100006f, 72.101990f, -5.516209f }, 1.000000f,
-                            0.000000f );
-    instance->registerEObj( "Imperialidentificationkey_2", 2000840, 0, 4, { 242.130798f, 72.250000f, 26.153481f },
-                            1.000000f, 0.000000f );
-    instance->registerEObj( "unknown_26", 2000842, 4186210, 4, { 224.041794f, 75.715820f, -0.347510f }, 1.000000f,
-                            0.000000f );
-    instance->registerEObj( "Magitekterminal_9", 2000802, 4299253, 4, { 177.904907f, 76.066162f, -5.569580f },
-                            0.991760f, -0.010379f );
-    instance->registerEObj( "Magitekterminal_10", 2000803, 0, 4, { 173.805496f, 76.081238f, 4.123073f }, 1.000000f,
-                            0.729448f );
-    instance->registerEObj( "unknown_27", 2000804, 4175899, 4, { 172.537292f, 76.600563f, -0.941921f }, 1.000000f,
-                            0.000000f );
-    instance->registerEObj( "Magitekterminal_11", 2000849, 0, 4, { 173.793900f, 47.632881f, 4.163035f }, 0.991760f,
-                            0.694225f );
-    instance->registerEObj( "unknown_28", 2001020, 4119459, 4, { 236.713104f, 68.589233f, 77.256348f }, 0.991760f,
-                            0.000048f );
-    instance->registerEObj( "unknown_29", 2001021, 4119458, 4, { 214.862198f, 47.531738f, 39.169922f }, 0.991760f,
-                            0.000048f );
-    instance->registerEObj( "sgpl_w_transparent05", 2000877, 4317555, 4, { 178.867599f, 76.089233f, -0.117565f },
-                            1.000000f, 0.000000f );
-    instance->registerEObj( "sgpl_w_transparent05_1", 2000878, 4317536, 4, { 168.665405f, 46.519169f, 1.801311f },
-                            1.000000f, 0.000000f );
-    instance->registerEObj( "unknown_30", 2002629, 4305536, 4, { 241.707993f, 66.877907f, -82.835068f }, 0.991760f,
-                            0.000048f );
-    instance->registerEObj( "unknown_31", 2002630, 4305537, 4, { 112.046898f, 67.002319f, 46.555180f }, 0.991760f,
-                            0.000048f );
-    instance->registerEObj( "Magitekterminal_12", 2000805, 4299251, 4, { 167.034500f, 46.199989f, 8.192681f },
-                            1.000000f, 0.000000f );
-    instance->registerEObj( "unknown_32", 2000811, 4175901, 4, { 149.577499f, 46.799969f, -30.579741f }, 1.000000f,
-                            0.000000f );
-    instance->registerEObj( "unknown_33", 2000807, 4309445, 4, { 146.929092f, 45.975342f, -50.736271f }, 0.991760f,
-                            0.000048f );
-    instance->registerEObj( "Identificationkeyreader", 2000808, 4182427, 4, { 128.409805f, 47.799999f, -49.366180f },
-                            1.000000f, 0.000000f );
-    instance->registerEObj( "Magitekterminal_13", 2000809, 4298905, 4, { 150.029999f, 46.723068f, -39.001339f },
-                            1.000000f, 0.000000f );
-    instance->registerEObj( "Magitekterminal_14", 2000810, 0, 4, { 154.199600f, 46.894550f, -34.215000f }, 1.000000f,
-                            0.000000f );
-    instance->registerEObj( "unknown_34", 2000812, 4119481, 4, { 208.043594f, 43.053101f, 0.003599f }, 1.000000f,
-                            0.000000f );
-    instance->registerEObj( "Imperialidentificationkey_3", 2000839, 0, 4, { 155.484695f, 46.000000f, -57.763378f },
-                            0.991760f, 0.000048f );
-    instance->registerEObj( "Magitekterminal_15", 2000850, 0, 4, { 154.192307f, 101.909103f, -34.226189f }, 0.991760f,
-                            0.000048f );
-    instance->registerEObj( "Magitekterminal_16", 2000857, 0, 4, { 142.995895f, 46.047619f, -53.038639f }, 0.991760f,
-                            -0.743907f );
-    instance->registerEObj( "Magitekarmor_2", 2000872, 0, 4, { 140.619904f, 102.000000f, -50.628609f }, 2.600000f,
-                            -0.817672f );
-    instance->registerEObj( "Magitekterminal_17", 2000904, 4298910, 4, { 150.108398f, 102.204201f, -39.998730f },
-                            1.000000f, 0.000000f );
-    instance->registerEObj( "sgpl_w_transparent05_2", 2000879, 4317581, 4, { 145.143005f, 46.118488f, -33.631050f },
-                            1.000000f, 0.000000f );
-    instance->registerEObj( "sgpl_w_transparent05_3", 2000880, 4317584, 4, { 144.416595f, 102.000000f, -35.715260f },
-                            1.000000f, 0.000000f );
-    instance->registerEObj( "unknown_35", 2002539, 4323543, 4, { 191.892395f, 46.000000f, -42.993431f }, 1.000000f,
-                            0.000000f );
-    instance->registerEObj( "unknown_36", 2001205, 0, 4, { 134.810394f, 21.910000f, -0.001021f }, 1.000000f,
-                            0.000000f );
-    instance->registerEObj( "unknown_37", 2001205, 0, 4, { 133.078400f, -102.979202f, 0.123506f }, 1.000000f,
-                            0.000000f );
-    instance->registerEObj( "Magitekarmor_3", 2000872, 0, 4, { 129.111298f, 68.261063f, -59.929440f }, 2.578735f,
-                            -0.094404f );
-    instance->registerEObj( "unknown_38", 2000815, 4190796, 4, { 81.888397f, -107.400002f, -45.959042f }, 1.000000f,
-                            0.000000f );
-    instance->registerEObj( "sgpl_w_transparent05_4", 2000816, 4323560, 4, { 38.618160f, -107.400002f, -72.955917f },
-                            1.000000f, 0.000000f );
-    instance->registerEObj( "unknown_39", 2000817, 4190794, 4, { 37.580742f, -107.400002f, -70.481018f }, 1.000000f,
-                            0.000000f );
-    instance->registerEObj( "sgpl_w_transparent05_5", 2000819, 4323562, 4, { -38.041451f, -103.786201f, 0.069122f },
-                            1.000000f, 0.000000f );
-    instance->registerEObj( "unknown_40", 2000818, 4200594, 4, { -31.718330f, -103.400002f, 2.561740f }, 1.000000f,
-                            0.000000f );
-    instance->registerEObj( "unknown_41", 2000820, 4190789, 4, { -31.696360f, -103.400002f, -2.409777f }, 1.000000f,
-                            0.000000f );
-    instance->registerEObj( "unknown_42", 2000821, 4189149, 4, { -68.916000f, -102.759399f, -0.015143f }, 0.991760f,
-                            0.000048f );
-    instance->registerEObj( "unknown_43", 2000824, 4119565, 4, { -184.609695f, -104.221901f, -2.135104f }, 1.000000f,
-                            0.000000f );
-    instance->registerEObj( "Magitekterminal_18", 2000825, 0, 4, { -238.152893f, -104.051300f, -19.744539f }, 0.991760f,
-                            0.000048f );
-    instance->registerEObj( "unknown_44", 2000854, 4119564, 4, { -117.637398f, -103.993301f, 0.252331f }, 1.000000f,
-                            0.000000f );
-    instance->registerEObj( "Shortcut_2", 2000853, 0, 4, { -228.197906f, -103.997398f, 0.789458f }, 0.991760f,
-                            0.000048f );
-    instance->registerEObj( "sgpl_w_transparent05_6", 2000814, 4323557, 4, { 84.611214f, -107.408302f, -51.255131f },
-                            0.991760f, 0.000048f );
-    instance->registerEObj( "unknown_45", 2001138, 4125125, 4, { -249.059494f, -104.000000f, -3.238936f }, 1.000000f,
-                            0.000000f );
-    instance->registerEObj( "Shortcut_3", 2000846, 0, 4, { -787.271912f, -344.000000f, 2.392201f }, 1.000000f,
-                            0.000000f );
-    instance->registerEObj( "Shortcut_4", 2000847, 0, 4, { -787.513977f, -344.014587f, -1.791996f }, 1.000000f,
-                            0.000000f );
-    instance->registerEObj( "PortaDecumanaentryway", 2001045, 0, 4, { -792.387329f, -343.440887f, -0.126096f },
-                            1.500000f, -1.570451f );
-    instance->registerEObj( "sgbg_w1d5_q6_lift2", 2001139, 4328790, 4, { -765.431274f, -343.997589f, 1.749690f },
-                            1.000000f, 0.000000f );
-    // States -> down_Ncut arrival_Ncut upstairs gate1_open gate1_close gate2_open gate2_close start stop ele_off ele_on down_Ncut_hide hide
-    instance->registerEObj( "unknown_46", 2000787, 0, 4, { 147.015701f, 186.100006f, -4.199400f }, 1.000000f,
-                            0.000000f );
-    instance->registerEObj( "Exit", 2000788, 0, 4, { -721.074524f, -185.731598f, 478.324890f }, 0.991760f, 0.000048f );
-    instance->registerEObj( "Shortcut_5", 2000789, 0, 4, { 167.870895f, 186.000000f, -0.104399f }, 1.000000f,
-                            0.000000f );
-    instance->registerEObj( "Entrance", 2000790, 4301608, 5, { 152.054794f, 187.039200f, 3.392751f }, 1.000000f,
-                            0.000000f );
-    // States -> vf_lock_on vf_lock_of
-    instance->registerEObj( "Shortcut_6", 2000789, 0, 4, { -237.161896f, -104.020897f, -21.575460f }, 0.991760f,
-                            0.000048f );
-    instance->registerEObj( "Shortcut_7", 2000789, 0, 4, { 115.949501f, 67.588867f, -74.186333f }, 0.991760f,
-                            0.000048f );
+    instance.registerEObj( "sgvf_w_lvd_b0118", 2000828, 4305694, 4, { -784.536987f, -344.000000f, 0.121873f }, 1.000000f, 0.000000f ); 
+      // States -> vf_bextwall_on (id: 3) vf_bextwall_of (id: 4) 
+    instance.registerEObj( "unknown_0", 2000829, 0, 4, { -781.198120f, -344.000000f, 0.127798f }, 0.900000f, -1.570451f ); 
+    instance.registerEObj( "Shortcut", 2000848, 0, 4, { -788.420593f, -400.046387f, -601.281189f }, 0.991760f, 0.000048f ); 
+    instance.registerEObj( "unknown_1", 2000832, 4303065, 4, { -703.485413f, -185.734299f, 461.314697f }, 0.991760f, 0.000048f ); 
+    instance.registerEObj( "unknown_2", 2000833, 4303324, 4, { -721.744019f, -185.531204f, 478.978302f }, 0.991760f, 0.000048f ); 
+    instance.registerEObj( "unknown_3", 2000834, 4303325, 4, { -704.359924f, -185.731995f, 498.390015f }, 0.991760f, 0.000048f ); 
+    instance.registerEObj( "unknown_4", 2000831, 0, 4, { -781.198120f, -344.000000f, 0.127800f }, 0.900000f, -1.570451f ); 
+    instance.registerEObj( "unknown_5", 2002538, 0, 4, { -781.198120f, -344.000000f, 0.127800f }, 0.900000f, -1.570451f ); 
+    instance.registerEObj( "sgvf_w_lvd_b0118_1", 2000828, 4305491, 4, { 212.974304f, 75.866501f, -0.668073f }, 1.000000f, 1.568613f ); 
+      // States -> vf_bextwall_on (id: 3) vf_bextwall_of (id: 4) 
+    instance.registerEObj( "unknown_6", 2000829, 0, 4, { 215.905304f, 76.000000f, -0.131676f }, 0.700000f, 1.568640f ); 
+    instance.registerEObj( "sgvf_w_lvd_b0118_2", 2000822, 4305462, 4, { -135.017593f, -103.976402f, -1.129792f }, 1.000000f, 0.000000f ); 
+      // States -> vf_bextwall_on (id: 3) vf_bextwall_of (id: 4) 
+    instance.registerEObj( "unknown_7", 2000823, 0, 4, { -129.654205f, -104.027000f, -0.290400f }, 1.000000f, -1.570451f ); 
+    instance.registerEObj( "sgvf_w_lvd_b0118_3", 2000826, 4305555, 4, { -216.218002f, -103.997398f, -3.836082f }, 1.000000f, 0.000000f ); 
+      // States -> vf_bextwall_on (id: 3) vf_bextwall_of (id: 4) 
+    instance.registerEObj( "unknown_8", 2000827, 0, 4, { -208.879593f, -103.997398f, -0.252325f }, 1.000000f, -1.570451f ); 
+    instance.registerEObj( "Shortcut_1", 2000848, 0, 4, { -577.757812f, -268.000000f, 218.871399f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "sgvf_w1d5_bossA_lvd_b0118", 2000876, 4317513, 4, { 180.458893f, 76.089233f, -0.360356f }, 1.000000f, 0.000000f ); 
+      // States -> vf_bextwall_on (id: 3) vf_bextwall_of (id: 4) 
+    instance.registerEObj( "unknown_9", 2000976, 0, 4, { 180.548401f, 76.089943f, 0.959593f }, 1.000000f, -0.000248f ); 
+    instance.registerEObj( "sgvf_w_btl_b0216", 2001134, 4326317, 4, { -166.447800f, -104.221901f, 16.976521f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "sgvf_w_lvd_b0118_4", 2001135, 4326381, 4, { -196.318497f, -104.078903f, -0.786835f }, 1.000000f, 0.000000f ); 
+      // States -> vf_bextwall_on (id: 3) vf_bextwall_of (id: 4) 
+    instance.registerEObj( "unknown_10", 2001766, 4175265, 4, { -570.270081f, -268.000000f, 217.461197f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "仮シド指令", 2000806, 0, 4, { 217.957397f, 46.000000f, -11.597380f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "Magitekterminal", 2000851, 0, 4, { 133.745193f, 22.964720f, -0.015320f }, 0.991760f, 0.000048f ); 
+    instance.registerEObj( "Magitekterminal_1", 2000852, 0, 4, { 134.477707f, 7.614197f, -0.045776f }, 0.991760f, 0.000048f ); 
+    instance.registerEObj( "Magitekterminal_2", 2000856, 0, 4, { 145.769394f, 21.988159f, 7.095398f }, 0.991760f, 0.000048f ); 
+    instance.registerEObj( "unknown_11", 2000813, 0, 4, { 136.430801f, 22.354429f, -0.137390f }, 0.991760f, 0.000048f ); 
+    instance.registerEObj( "Magitekterminal_3", 2000858, 0, 4, { 121.995796f, -104.020798f, 3.707886f }, 0.991760f, 0.000048f ); 
+    instance.registerEObj( "Magitekarmor", 2000872, 0, 4, { 12.002250f, -107.811699f, -78.686447f }, 2.578735f, -1.562172f ); 
+    instance.registerEObj( "Magitekarmor_1", 2000872, 0, 4, { 108.952103f, -106.029999f, -7.573757f }, 2.578735f, -0.369535f ); 
+    instance.registerEObj( "unknown_12", 2000791, 4118536, 4, { 226.850998f, 155.775497f, 3.640267f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_13", 2000836, 4178897, 4, { 230.933899f, 156.818100f, 25.887810f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "Magitekterminal_4", 2000792, 0, 4, { 240.527893f, 155.626495f, 4.989798f }, 0.991760f, 0.000048f ); 
+    instance.registerEObj( "unknown_14", 2000793, 4243244, 4, { 187.994705f, 152.227097f, -80.103348f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_15", 2000794, 4178131, 4, { 157.029907f, 155.725204f, -56.634510f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_16", 2000795, 4118533, 4, { 171.986206f, 160.259903f, -32.392151f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "sgpl_w_transparent06", 2000796, 4317691, 4, { 177.690002f, 155.500000f, -35.500401f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "Imperialidentificationkey", 2000837, 0, 4, { 226.065094f, 155.807800f, 7.053694f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_17", 2000855, 4178132, 4, { 224.098007f, 156.000000f, -26.999870f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "sgpl_w_transparent04", 2000845, 4316977, 4, { 221.255707f, 156.000000f, 6.591867f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "Magitekterminal_5", 2001145, 4329956, 4, { 196.345398f, 186.275101f, -3.980006f }, 1.000000f, 0.000000f ); 
+      // States -> ele_off (id: 10) ele_on (id: 11) 
+    instance.registerEObj( "Magitekterminal_6", 2001146, 4329960, 4, { 196.312805f, 155.999893f, 4.083439f }, 1.000000f, 0.000000f ); 
+      // States -> ele_off (id: 10) ele_on (id: 11) 
+    instance.registerEObj( "Magitektransporter", 2001147, 0, 4, { 204.421494f, 120.000000f, -60.006229f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "Magitektransporter_1", 2001148, 0, 4, { 228.831696f, 71.500000f, -28.156210f }, 1.000000f, 0.827528f ); 
+    instance.registerEObj( "unknown_18", 2002628, 4305528, 4, { 221.126099f, 153.428696f, -69.269623f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_19", 2000871, 0, 4, { 174.414993f, 102.515198f, -88.973930f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_20", 2000797, 4118552, 4, { 227.155396f, 72.000000f, -43.219952f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_21", 2000798, 4119463, 4, { 190.957703f, 72.355438f, -64.773132f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "Magitekterminal_7", 2000799, 0, 4, { 268.474396f, 67.031410f, -49.967129f }, 0.991760f, -0.501567f ); 
+    instance.registerEObj( "Imperialidentificationkey_1", 2000838, 0, 4, { 263.129395f, 66.381569f, -71.274437f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_22", 2000667, 4119461, 4, { 271.022614f, 68.049881f, -45.787529f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_23", 2000800, 4124814, 4, { 237.461395f, 72.250000f, 33.809959f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_24", 2000843, 4119464, 4, { 190.731094f, 67.877243f, -85.008949f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_25", 2000844, 0, 4, { 254.749405f, 72.098747f, -36.545410f }, 0.991760f, 0.000048f ); 
+    instance.registerEObj( "Magitekterminal_8", 2000841, 0, 4, { 234.100006f, 72.101990f, -5.516209f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "Imperialidentificationkey_2", 2000840, 0, 4, { 242.130798f, 72.250000f, 26.153481f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_26", 2000842, 4186210, 4, { 224.041794f, 75.715820f, -0.347510f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "Magitekterminal_9", 2000802, 4299253, 4, { 177.904907f, 76.066162f, -5.569580f }, 0.991760f, -0.010379f ); 
+    instance.registerEObj( "Magitekterminal_10", 2000803, 0, 4, { 173.805496f, 76.081238f, 4.123073f }, 1.000000f, 0.729448f ); 
+    instance.registerEObj( "unknown_27", 2000804, 4175899, 4, { 172.537292f, 76.600563f, -0.941921f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "Magitekterminal_11", 2000849, 0, 4, { 173.793900f, 47.632881f, 4.163035f }, 0.991760f, 0.694225f ); 
+    instance.registerEObj( "unknown_28", 2001020, 4119459, 4, { 236.713104f, 68.589233f, 77.256348f }, 0.991760f, 0.000048f ); 
+    instance.registerEObj( "unknown_29", 2001021, 4119458, 4, { 214.862198f, 47.531738f, 39.169922f }, 0.991760f, 0.000048f ); 
+    instance.registerEObj( "sgpl_w_transparent05", 2000877, 4317555, 4, { 178.867599f, 76.089233f, -0.117565f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "sgpl_w_transparent05_1", 2000878, 4317536, 4, { 168.665405f, 46.519169f, 1.801311f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_30", 2002629, 4305536, 4, { 241.707993f, 66.877907f, -82.835068f }, 0.991760f, 0.000048f ); 
+    instance.registerEObj( "unknown_31", 2002630, 4305537, 4, { 112.046898f, 67.002319f, 46.555180f }, 0.991760f, 0.000048f ); 
+    instance.registerEObj( "Magitekterminal_12", 2000805, 4299251, 4, { 167.034500f, 46.199989f, 8.192681f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_32", 2000811, 4175901, 4, { 149.577499f, 46.799969f, -30.579741f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_33", 2000807, 4309445, 4, { 146.929092f, 45.975342f, -50.736271f }, 0.991760f, 0.000048f ); 
+    instance.registerEObj( "Identificationkeyreader", 2000808, 4182427, 4, { 128.409805f, 47.799999f, -49.366180f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "Magitekterminal_13", 2000809, 4298905, 4, { 150.029999f, 46.723068f, -39.001339f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "Magitekterminal_14", 2000810, 0, 4, { 154.199600f, 46.894550f, -34.215000f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_34", 2000812, 4119481, 4, { 208.043594f, 43.053101f, 0.003599f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "Imperialidentificationkey_3", 2000839, 0, 4, { 155.484695f, 46.000000f, -57.763378f }, 0.991760f, 0.000048f ); 
+    instance.registerEObj( "Magitekterminal_15", 2000850, 0, 4, { 154.192307f, 101.909103f, -34.226189f }, 0.991760f, 0.000048f ); 
+    instance.registerEObj( "Magitekterminal_16", 2000857, 0, 4, { 142.995895f, 46.047619f, -53.038639f }, 0.991760f, -0.743907f ); 
+    instance.registerEObj( "Magitekarmor_2", 2000872, 0, 4, { 140.619904f, 102.000000f, -50.628609f }, 2.600000f, -0.817672f ); 
+    instance.registerEObj( "Magitekterminal_17", 2000904, 4298910, 4, { 150.108398f, 102.204201f, -39.998730f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "sgpl_w_transparent05_2", 2000879, 4317581, 4, { 145.143005f, 46.118488f, -33.631050f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "sgpl_w_transparent05_3", 2000880, 4317584, 4, { 144.416595f, 102.000000f, -35.715260f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_35", 2002539, 4323543, 4, { 191.892395f, 46.000000f, -42.993431f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_36", 2001205, 0, 4, { 134.810394f, 21.910000f, -0.001021f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_37", 2001205, 0, 4, { 133.078400f, -102.979202f, 0.123506f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "Magitekarmor_3", 2000872, 0, 4, { 129.111298f, 68.261063f, -59.929440f }, 2.578735f, -0.094404f ); 
+    instance.registerEObj( "unknown_38", 2000815, 4190796, 4, { 81.888397f, -107.400002f, -45.959042f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "sgpl_w_transparent05_4", 2000816, 4323560, 4, { 38.618160f, -107.400002f, -72.955917f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_39", 2000817, 4190794, 4, { 37.580742f, -107.400002f, -70.481018f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "sgpl_w_transparent05_5", 2000819, 4323562, 4, { -38.041451f, -103.786201f, 0.069122f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_40", 2000818, 4200594, 4, { -31.718330f, -103.400002f, 2.561740f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_41", 2000820, 4190789, 4, { -31.696360f, -103.400002f, -2.409777f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_42", 2000821, 4189149, 4, { -68.916000f, -102.759399f, -0.015143f }, 0.991760f, 0.000048f ); 
+    instance.registerEObj( "unknown_43", 2000824, 4119565, 4, { -184.609695f, -104.221901f, -2.135104f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "Magitekterminal_18", 2000825, 0, 4, { -238.152893f, -104.051300f, -19.744539f }, 0.991760f, 0.000048f ); 
+    instance.registerEObj( "unknown_44", 2000854, 4119564, 4, { -117.637398f, -103.993301f, 0.252331f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "Shortcut_2", 2000853, 0, 4, { -228.197906f, -103.997398f, 0.789458f }, 0.991760f, 0.000048f ); 
+    instance.registerEObj( "sgpl_w_transparent05_6", 2000814, 4323557, 4, { 84.611214f, -107.408302f, -51.255131f }, 0.991760f, 0.000048f ); 
+    instance.registerEObj( "unknown_45", 2001138, 4125125, 4, { -249.059494f, -104.000000f, -3.238936f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "Shortcut_3", 2000846, 0, 4, { -788.508728f, -344.000000f, 0.000000f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "Shortcut_4", 2000847, 0, 4, { -788.751892f, -344.014587f, 0.000000f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "PortaDecumanaentryway", 2001045, 0, 4, { -792.387329f, -343.440887f, -0.126096f }, 1.500000f, -1.570451f ); 
+    instance.registerEObj( "sgbg_w1d5_q6_lift2", 2001139, 4328790, 4, { -765.431274f, -343.997589f, 1.749690f }, 1.000000f, 0.000000f ); 
+      // States -> down_Ncut (id: 58) arrival_Ncut (id: 59) upstairs (id: 61) gate1_open (id: 62) gate1_close (id: 63) gate2_open (id: 64) gate2_close (id: 65) start (id: 66) stop (id: 67) ele_off (id: 72) ele_on (id: 73) down_Ncut_hide (id: 74) hide (id: 75) 
+    instance.registerEObj( "unknown_46", 2000787, 0, 4, { 147.015701f, 186.100006f, -4.199400f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "Exit", 2000788, 0, 4, { -721.074524f, -185.731598f, 478.324890f }, 0.991760f, 0.000048f ); 
+    instance.registerEObj( "Shortcut_5", 2000789, 0, 4, { 167.870895f, 186.000000f, -0.104399f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "Entrance", 2000790, 4301608, 5, { 152.054794f, 187.039200f, 3.392751f }, 1.000000f, 0.000000f ); 
+      // States -> vf_lock_on (id: 11) vf_lock_of (id: 12) 
+    instance.registerEObj( "Shortcut_6", 2000789, 0, 4, { -237.161896f, -104.020897f, -21.575460f }, 0.991760f, 0.000048f ); 
+    instance.registerEObj( "Shortcut_7", 2000789, 0, 4, { 115.949501f, 67.588867f, -74.186333f }, 0.991760f, 0.000048f ); 
 
   }
 
-  void onUpdate( InstanceContentPtr instance, uint32_t currTime ) override
+  void onUpdate( InstanceContent& instance, uint32_t currTime ) override
   {
 
   }
 
-  void onEnterTerritory( InstanceContentPtr instance, Entity::Player& player, uint32_t eventId, uint16_t param1,
+  void onEnterTerritory( InstanceContent& instance, Entity::Player& player, uint32_t eventId, uint16_t param1,
                          uint16_t param2 ) override
   {
 
diff --git a/src/scripts/instances/dungeons/TheSirensongSea.cpp b/src/scripts/instances/dungeons/TheSirensongSea.cpp
index 7fcfed47..9c63c818 100644
--- a/src/scripts/instances/dungeons/TheSirensongSea.cpp
+++ b/src/scripts/instances/dungeons/TheSirensongSea.cpp
@@ -9,20 +9,52 @@ class TheSirensongSea :
 public:
   TheSirensongSea() :
     Sapphire::ScriptAPI::InstanceContentScript( 52 )
+  { }
+
+  void onInit( InstanceContent& instance ) override
   {
+    instance.registerEObj( "sgvf_w_lvd_b0118", 2002872, 6819364, 4, { -44.318520f, 7.751197f, 441.540314f }, 1.000000f, 0.000000f ); 
+      // States -> vf_bextwall_on (id: 3) vf_bextwall_of (id: 4) 
+    instance.registerEObj( "unknown_0", 2002735, 0, 4, { -44.500000f, 7.751200f, 442.849213f }, 1.000000f, -0.000000f ); 
+    instance.registerEObj( "Exit", 2000139, 0, 4, { -44.500000f, 7.751197f, 479.639496f }, 1.000000f, -3.141593f ); 
+    instance.registerEObj( "unknown_1", 2007807, 6538465, 4, { -47.414162f, 7.761197f, 460.423798f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_2", 2007808, 0, 4, { -47.907341f, 7.761197f, 468.566406f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "sgvf_w_lvd_b0118_1", 2002872, 6799021, 4, { -0.932950f, 2.896456f, -244.606796f }, 1.000000f, 0.000000f ); 
+      // States -> vf_bextwall_on (id: 3) vf_bextwall_of (id: 4) 
+    instance.registerEObj( "sgvf_w_lvd_b0118_2", 2007805, 6799028, 4, { -3.967087f, 2.901603f, -197.601196f }, 1.000000f, 0.000000f ); 
+      // States -> vf_bextwall_on (id: 3) vf_bextwall_of (id: 4) 
+    instance.registerEObj( "unknown_3", 2002735, 0, 4, { -0.941400f, 2.840884f, -239.721100f }, 1.000000f, 0.087266f ); 
+    instance.registerEObj( "sgvf_w_lvd_b0118_3", 2002872, 6815429, 4, { -2.123292f, 4.050672f, 57.244740f }, 1.000000f, -0.000000f ); 
+      // States -> vf_bextwall_on (id: 3) vf_bextwall_of (id: 4) 
+    instance.registerEObj( "sgvf_w_lvd_b0118_4", 2007805, 6815430, 4, { -8.575331f, 3.826778f, 103.254997f }, 1.000000f, -0.000000f ); 
+      // States -> vf_bextwall_on (id: 3) vf_bextwall_of (id: 4) 
+    instance.registerEObj( "unknown_4", 2002735, 0, 4, { -1.497813f, 4.446609f, 60.548241f }, 1.000000f, 0.349066f ); 
+    instance.registerEObj( "unknown_5", 2007793, 6532641, 4, { 2.243042f, 18.326050f, -408.926514f }, 0.991760f, 0.000048f ); 
+    instance.registerEObj( "unknown_6", 2007794, 6563600, 4, { 41.646648f, 2.171033f, -286.870514f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_7", 2007796, 6532642, 4, { 3.723403f, 2.665442f, -271.541992f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_8", 2007800, 6532643, 4, { -60.279049f, 11.703340f, -43.075298f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_9", 2007792, 6532645, 4, { -22.236191f, 16.347031f, 23.168619f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_10", 2007809, 0, 4, { 22.290779f, 4.298793f, -79.014076f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_11", 2007801, 6531305, 4, { -9.013880f, 2.088060f, 112.314201f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_12", 2007802, 6531303, 4, { -11.146170f, 0.410454f, 129.890305f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_13", 2007803, 6536676, 4, { -27.389811f, -1.621430f, 174.494598f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_14", 2007804, 6536677, 4, { 8.575519f, -2.552741f, 200.835098f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_15", 2007795, 6536431, 4, { 14.781270f, -3.423584f, 241.748199f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_16", 2007797, 6786442, 4, { 11.182830f, 9.875385f, 302.008087f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_17", 2007798, 6786460, 4, { -44.133888f, 5.932619f, 395.955688f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_18", 2007799, 6516590, 4, { -45.003849f, 7.341055f, 413.088501f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "Entrance", 2000182, 6793848, 5, { 0.380240f, 21.347240f, -469.744507f }, 1.000000f, 0.000000f ); 
+      // States -> vf_lock_on (id: 11) vf_lock_of (id: 12) 
+    instance.registerEObj( "Shortcut", 2000700, 0, 4, { 0.000000f, 21.511560f, -462.178009f }, 1.000000f, 0.000000f ); 
+
   }
 
-  void onInit( InstanceContentPtr instance ) override
+  void onUpdate( InstanceContent& instance, uint32_t currTime ) override
   {
 
   }
 
-  void onUpdate( InstanceContentPtr instance, uint32_t currTime ) override
-  {
-
-  }
-
-  void onEnterTerritory( InstanceContentPtr instance, Entity::Player& player, uint32_t eventId, uint16_t param1,
+  void onEnterTerritory( InstanceContent& instance, Entity::Player& player, uint32_t eventId, uint16_t param1,
                          uint16_t param2 ) override
   {
 
diff --git a/src/scripts/instances/dungeons/TheStoneVigil.cpp b/src/scripts/instances/dungeons/TheStoneVigil.cpp
index 97ae0e84..f855ef10 100644
--- a/src/scripts/instances/dungeons/TheStoneVigil.cpp
+++ b/src/scripts/instances/dungeons/TheStoneVigil.cpp
@@ -9,74 +9,56 @@ class TheStoneVigil :
 public:
   TheStoneVigil() :
     Sapphire::ScriptAPI::InstanceContentScript( 11 )
-  {
-  }
+  { }
 
-  void onInit( InstanceContentPtr instance ) override
+  void onInit( InstanceContent& instance ) override
   {
-    instance->registerEObj( "unknown_0", 2000611, 0, 4, { 0.015198f, 0.350891f, -246.784195f }, 0.991760f, 0.000048f );
-    instance->registerEObj( "Entrance", 2001869, 4239670, 5, { -0.000510f, 3.949623f, 307.392395f }, 2.000000f,
-                            0.000000f );
-    // States -> vf_lock_on vf_lock_of
-    instance->registerEObj( "unknown_1", 2001870, 0, 4, { 0.015198f, 3.949618f, 317.179199f }, 0.991760f, 0.000048f );
-    instance->registerEObj( "Exit", 2001871, 4239710, 4, { 0.004404f, 0.076945f, -268.716095f }, 1.000000f, 0.000000f );
-    // States -> vf_htras1_on vf_htras1_of
-    instance->registerEObj( "sgvf_w_lvd_b0094", 2001872, 4239719, 4, { -0.106873f, 3.860474f, 136.491898f }, 0.991760f,
-                            0.000048f );
-    // States -> vf_line_on vf_line_of
-    instance->registerEObj( "sgvf_w_lvd_b0118_r1d1", 2001873, 4239720, 4, { -0.625671f, 3.829956f, 136.461395f },
-                            0.991760f, 0.000048f );
-    // States -> vf_bextwall_on vf_bextwall_of
-    instance->registerEObj( "sgvf_w_lvd_b0094_1", 2001874, 4239769, 4, { 20.620710f, 3.949919f, -80.003052f },
-                            0.991760f, 0.000048f );
-    // States -> vf_line_on vf_line_of
-    instance->registerEObj( "sgvf_w_lvd_b0118", 2001875, 4239782, 4, { 20.559681f, 3.949919f, -80.277771f }, 0.991760f,
-                            0.000048f );
-    // States -> vf_bextwall_on vf_bextwall_of
-    instance->registerEObj( "sgvf_w_lvd_b0094_2", 2001876, 4239833, 4, { -0.197872f, 4.844441f, -223.182404f },
-                            1.000000f, 0.000000f );
-    // States -> vf_line_on vf_line_of
-    instance->registerEObj( "sgvf_w_lvd_b0118_r1d1_1", 2001877, 4239838, 4, { 0.816688f, 4.854907f, -223.199707f },
-                            1.000000f, 0.000000f );
-    // States -> vf_bextwall_on vf_bextwall_of
-    instance->registerEObj( "Shortcut", 2000700, 0, 4, { 3.484173f, 4.000121f, 298.130005f }, 1.000000f, 0.000000f );
-    instance->registerEObj( "sgbg_r1d1_t1_fwal1", 2001878, 4239736, 4, { 0.228821f, 3.982544f, 95.231567f }, 0.991760f,
-                            0.000048f );
-    // States -> fire_on fire_of
-    instance->registerEObj( "sgbg_r1d1_t1_fwal1_1", 2001879, 4239917, 4, { -0.137390f, -0.076355f, -90.104553f },
-                            0.991760f, 0.000048f );
-    // States -> fire_on fire_of
-    instance->registerEObj( "Strongroomgate", 2001880, 4172415, 4, { -0.022534f, 4.052033f, -215.388901f }, 1.000000f,
-                            0.000000f );
-    instance->registerEObj( "sgvf_r1d1_b0172", 2001881, 4240140, 4, { 24.443140f, -0.000003f, -16.325529f }, 1.000000f,
-                            0.000000f );
-    // States -> snow_of snow_on
-    instance->registerEObj( "sgvf_r1d1_b0172_1", 2001882, 4240143, 4, { 24.207170f, -0.386616f, -119.586502f },
-                            1.000000f, 0.000000f );
-    // States -> snow_of snow_on
-    instance->registerEObj( "sgvf_r1d1_b0172_2", 2001883, 4240145, 4, { 24.277100f, -0.015320f, -168.047699f },
-                            0.991760f, 0.000048f );
-    // States -> snow_of snow_on
-    instance->registerEObj( "Bertha", 2001884, 0, 4, { 56.748291f, 4.989685f, -86.472900f }, 0.991760f, 1.040362f );
-    instance->registerEObj( "Bertha_1", 2001885, 0, 4, { 58.899940f, 4.989685f, -79.857857f }, 0.991760f, 1.535637f );
-    instance->registerEObj( "Bertha_2", 2001886, 0, 4, { 56.935600f, 5.003687f, -73.150261f }, 0.991760f, 1.076136f );
-    instance->registerEObj( "sgpl_w_lvd_collison_only", 2002618, 4334349, 4, { -0.221096f, 4.007471f, 137.674500f },
-                            1.000000f, 0.000000f );
-    instance->registerEObj( "sgpl_w_lvd_collison_only_1", 2002618, 4334437, 4, { 0.000000f, 5.259686f, -221.867004f },
-                            1.000000f, 0.000000f );
-    instance->registerEObj( "sgpl_w_lvd_collison_only_2", 2002618, 4334925, 4, { -0.016311f, 0.434590f, -224.636993f },
-                            1.000000f, 0.000000f );
-    instance->registerEObj( "sgpl_w_lvd_collison_only_3", 2002618, 4334973, 4, { 0.117383f, 0.135054f, -224.822800f },
-                            1.000000f, 0.000000f );
+    instance.registerEObj( "unknown_0", 2000611, 0, 4, { 0.015198f, 0.350891f, -246.784195f }, 0.991760f, 0.000048f ); 
+    instance.registerEObj( "Entrance", 2001869, 4239670, 5, { -0.000510f, 3.949623f, 307.392395f }, 2.000000f, 0.000000f ); 
+      // States -> vf_lock_on (id: 11) vf_lock_of (id: 12) 
+    instance.registerEObj( "unknown_1", 2001870, 0, 4, { 0.015198f, 3.949618f, 317.179199f }, 0.991760f, 0.000048f ); 
+    instance.registerEObj( "Exit", 2001871, 4239710, 4, { 0.004404f, 0.076945f, -268.716095f }, 1.000000f, 0.000000f ); 
+      // States -> vf_htras1_on (id: 2) vf_htras1_of (id: 3) 
+    instance.registerEObj( "sgvf_w_lvd_b0094", 2001872, 4239719, 4, { -0.106873f, 3.860474f, 136.491898f }, 0.991760f, 0.000048f ); 
+      // States -> vf_line_on (id: 12) vf_line_of (id: 13) 
+    instance.registerEObj( "sgvf_w_lvd_b0118_r1d1", 2001873, 4239720, 4, { -0.625671f, 3.829956f, 136.461395f }, 0.991760f, 0.000048f ); 
+      // States -> vf_bextwall_on (id: 3) vf_bextwall_of (id: 4) 
+    instance.registerEObj( "sgvf_w_lvd_b0094_1", 2001874, 4239769, 4, { 20.620710f, 3.949919f, -80.003052f }, 0.991760f, 0.000048f ); 
+      // States -> vf_line_on (id: 12) vf_line_of (id: 13) 
+    instance.registerEObj( "sgvf_w_lvd_b0118", 2001875, 4239782, 4, { 20.559681f, 3.949919f, -80.277771f }, 0.991760f, 0.000048f ); 
+      // States -> vf_bextwall_on (id: 3) vf_bextwall_of (id: 4) 
+    instance.registerEObj( "sgvf_w_lvd_b0094_2", 2001876, 4239833, 4, { -0.197872f, 4.844441f, -223.182404f }, 1.000000f, 0.000000f ); 
+      // States -> vf_line_on (id: 12) vf_line_of (id: 13) 
+    instance.registerEObj( "sgvf_w_lvd_b0118_r1d1_1", 2001877, 4239838, 4, { 0.816688f, 4.854907f, -223.199707f }, 1.000000f, 0.000000f ); 
+      // States -> vf_bextwall_on (id: 3) vf_bextwall_of (id: 4) 
+    instance.registerEObj( "Shortcut", 2000700, 0, 4, { 3.484173f, 4.000121f, 298.130005f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "sgbg_r1d1_t1_fwal1", 2001878, 4239736, 4, { 0.228821f, 3.982544f, 95.231567f }, 0.991760f, 0.000048f ); 
+      // States -> fire_on (id: 4) fire_of (id: 5) 
+    instance.registerEObj( "sgbg_r1d1_t1_fwal1_1", 2001879, 4239917, 4, { -0.137390f, -0.076355f, -90.104553f }, 0.991760f, 0.000048f ); 
+      // States -> fire_on (id: 4) fire_of (id: 5) 
+    instance.registerEObj( "Strongroomgate", 2001880, 4172415, 4, { -0.022534f, 4.052033f, -215.388901f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "sgvf_r1d1_b0172", 2001881, 4240140, 4, { 24.443140f, -0.000003f, -16.325529f }, 1.000000f, 0.000000f ); 
+      // States -> snow_of (id: 2) snow_on (id: 3) 
+    instance.registerEObj( "sgvf_r1d1_b0172_1", 2001882, 4240143, 4, { 24.207170f, -0.386616f, -119.586502f }, 1.000000f, 0.000000f ); 
+      // States -> snow_of (id: 2) snow_on (id: 3) 
+    instance.registerEObj( "sgvf_r1d1_b0172_2", 2001883, 4240145, 4, { 24.277100f, -0.015320f, -168.047699f }, 0.991760f, 0.000048f ); 
+      // States -> snow_of (id: 2) snow_on (id: 3) 
+    instance.registerEObj( "Bertha", 2001884, 0, 4, { 56.748291f, 4.989685f, -86.472900f }, 0.991760f, 1.040362f ); 
+    instance.registerEObj( "Bertha_1", 2001885, 0, 4, { 58.899940f, 4.989685f, -79.857857f }, 0.991760f, 1.535637f ); 
+    instance.registerEObj( "Bertha_2", 2001886, 0, 4, { 56.935600f, 5.003687f, -73.150261f }, 0.991760f, 1.076136f ); 
+    instance.registerEObj( "sgpl_w_lvd_collison_only", 2002618, 4334349, 4, { -0.221096f, 4.007471f, 137.674500f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "sgpl_w_lvd_collison_only_1", 2002618, 4334437, 4, { 0.000000f, 5.259686f, -221.867004f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "sgpl_w_lvd_collison_only_2", 2002618, 4334925, 4, { -0.016311f, 0.434590f, -224.636993f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "sgpl_w_lvd_collison_only_3", 2002618, 4334973, 4, { 0.117383f, 0.135054f, -224.822800f }, 1.000000f, 0.000000f ); 
 
   }
 
-  void onUpdate( InstanceContentPtr instance, uint32_t currTime ) override
+  void onUpdate( InstanceContent& instance, uint32_t currTime ) override
   {
 
   }
 
-  void onEnterTerritory( InstanceContentPtr instance, Entity::Player& player, uint32_t eventId, uint16_t param1,
+  void onEnterTerritory( InstanceContent& instance, Entity::Player& player, uint32_t eventId, uint16_t param1,
                          uint16_t param2 ) override
   {
 
diff --git a/src/scripts/instances/dungeons/TheStoneVigilHard.cpp b/src/scripts/instances/dungeons/TheStoneVigilHard.cpp
index f12059e4..7e110aaa 100644
--- a/src/scripts/instances/dungeons/TheStoneVigilHard.cpp
+++ b/src/scripts/instances/dungeons/TheStoneVigilHard.cpp
@@ -9,63 +9,49 @@ class TheStoneVigilHard :
 public:
   TheStoneVigilHard() :
     Sapphire::ScriptAPI::InstanceContentScript( 25 )
-  {
-  }
+  { }
 
-  void onInit( InstanceContentPtr instance ) override
+  void onInit( InstanceContent& instance ) override
   {
-    instance->registerEObj( "Exit", 2000139, 0, 4, { -138.305603f, -7.970538f, -56.005821f }, 1.000000f, 0.000000f );
-    instance->registerEObj( "unknown_0", 2002735, 0, 4, { -103.660202f, -7.970543f, -55.945332f }, 1.000000f,
-                            -1.570451f );
-    instance->registerEObj( "sgvf_w_lvd_b0250", 2002872, 4724293, 4, { -105.613098f, -7.970541f, -56.019131f },
-                            1.000000f, 0.000000f );
-    // States -> vf_bextwall_on vf_bextwall_of
-    instance->registerEObj( "unknown_1", 2002735, 0, 4, { -47.933350f, -3.938287f, 35.426449f }, 0.991760f, 0.000048f );
-    instance->registerEObj( "sgvf_w_lvd_b0118", 2002872, 4725733, 4, { -47.291790f, -3.999902f, 33.349419f }, 1.000000f,
-                            0.000000f );
-    // States -> vf_bextwall_on vf_bextwall_of
-    instance->registerEObj( "sgvf_r1d2_b0442", 2002872, 4725734, 4, { -38.530239f, -3.999901f, 23.897659f }, 1.000000f,
-                            0.000000f );
-    // States -> vf_fire_on vf_fire_of
-    instance->registerEObj( "unknown_2", 2002735, 0, 4, { -0.189037f, 3.895030f, -223.430893f }, 1.000000f, 0.000000f );
-    instance->registerEObj( "sgvf_w_lvd_b0118_1", 2002872, 4724833, 4, { 0.361240f, 3.879290f, -226.177200f },
-                            1.000000f, 0.000000f );
-    // States -> vf_bextwall_on vf_bextwall_of
-    instance->registerEObj( "Entrance", 2001869, 4559005, 5, { 131.881805f, 4.081586f, 116.103600f }, 1.000000f,
-                            0.000048f );
-    // States -> vf_lock_on vf_lock_of
-    instance->registerEObj( "Shortcut", 2000700, 0, 4, { 113.577202f, 8.000000f, 113.037003f }, 0.991760f, 0.000048f );
-    instance->registerEObj( "sgvf_r1d2_b0442_1", 2002872, 4864542, 4, { -24.639549f, -0.050003f, 47.771549f },
-                            1.000000f, 0.000000f );
-    // States -> vf_fire_on vf_fire_of
-    instance->registerEObj( "sgvf_r1d2_b0442_2", 2004182, 4933921, 4, { -0.990592f, 0.027524f, 96.986580f }, 1.000000f,
-                            0.000000f );
-    // States -> vf_fire_on vf_fire_of
-    instance->registerEObj( "Bertha", 2003540, 0, 4, { 31.943810f, 0.326915f, -151.623703f }, 1.000000f, -1.363030f );
-    instance->registerEObj( "Bertha_1", 2003541, 0, 4, { 34.257309f, 0.068675f, -143.886703f }, 1.000000f, -1.570451f );
-    instance->registerEObj( "Bertha_2", 2003542, 0, 4, { 31.738079f, 0.068675f, -136.270004f }, 1.000000f, -1.400810f );
-    instance->registerEObj( "unknown_3", 2003543, 4635871, 4, { 24.398520f, -0.049999f, -178.281799f }, 1.000000f,
-                            0.000000f );
-    instance->registerEObj( "sgvf_r1d2_b0442_3", 2003544, 4724326, 4, { -7.216811f, 0.000001f, -183.345200f },
-                            1.000000f, 0.000000f );
-    // States -> vf_fire_on vf_fire_of
-    instance->registerEObj( "Mainstoragevaultgate", 2003547, 4556427, 4, { -96.021538f, -1.183108f, -56.314732f },
-                            1.000000f, 0.000000f );
-    instance->registerEObj( "sgvf_r1d2_b0442_4", 2004183, 4933927, 4, { -48.010059f, -0.050043f, -85.297096f },
-                            1.000000f, 0.000000f );
-    // States -> vf_fire_on vf_fire_of
-    instance->registerEObj( "sgvf_r1d2_b0442_5", 2004184, 4947920, 4, { -43.944740f, -0.050000f, -96.101196f },
-                            1.000000f, 0.000000f );
-    // States -> vf_fire_on vf_fire_of
+    instance.registerEObj( "Exit", 2000139, 0, 4, { -138.305603f, -7.970538f, -56.005821f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_0", 2002735, 0, 4, { -103.660202f, -7.970543f, -55.945332f }, 1.000000f, -1.570451f ); 
+    instance.registerEObj( "sgvf_w_lvd_b0250", 2002872, 4724293, 4, { -105.613098f, -7.970541f, -56.019131f }, 1.000000f, 0.000000f ); 
+      // States -> vf_bextwall_on (id: 3) vf_bextwall_of (id: 4) 
+    instance.registerEObj( "unknown_1", 2002735, 0, 4, { -47.933350f, -3.938287f, 35.426449f }, 0.991760f, 0.000048f ); 
+    instance.registerEObj( "sgvf_w_lvd_b0118", 2002872, 4725733, 4, { -47.291790f, -3.999902f, 33.349419f }, 1.000000f, 0.000000f ); 
+      // States -> vf_bextwall_on (id: 3) vf_bextwall_of (id: 4) 
+    instance.registerEObj( "sgvf_r1d2_b0442", 2002872, 4725734, 4, { -38.530239f, -3.999901f, 23.897659f }, 1.000000f, 0.000000f ); 
+      // States -> vf_fire_on (id: 2) vf_fire_of (id: 3) 
+    instance.registerEObj( "unknown_2", 2002735, 0, 4, { -0.189037f, 3.895030f, -223.430893f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "sgvf_w_lvd_b0118_1", 2002872, 4724833, 4, { 0.361240f, 3.879290f, -226.177200f }, 1.000000f, 0.000000f ); 
+      // States -> vf_bextwall_on (id: 3) vf_bextwall_of (id: 4) 
+    instance.registerEObj( "Entrance", 2001869, 4559005, 5, { 131.881805f, 4.081586f, 116.103600f }, 1.000000f, 0.000048f ); 
+      // States -> vf_lock_on (id: 11) vf_lock_of (id: 12) 
+    instance.registerEObj( "Shortcut", 2000700, 0, 4, { 113.577202f, 8.000000f, 113.037003f }, 0.991760f, 0.000048f ); 
+    instance.registerEObj( "sgvf_r1d2_b0442_1", 2002872, 4864542, 4, { -24.639549f, -0.050003f, 47.771549f }, 1.000000f, 0.000000f ); 
+      // States -> vf_fire_on (id: 2) vf_fire_of (id: 3) 
+    instance.registerEObj( "sgvf_r1d2_b0442_2", 2004182, 4933921, 4, { -0.990592f, 0.027524f, 96.986580f }, 1.000000f, 0.000000f ); 
+      // States -> vf_fire_on (id: 2) vf_fire_of (id: 3) 
+    instance.registerEObj( "Bertha", 2003540, 0, 4, { 31.943810f, 0.326915f, -151.623703f }, 1.000000f, -1.363030f ); 
+    instance.registerEObj( "Bertha_1", 2003541, 0, 4, { 34.257309f, 0.068675f, -143.886703f }, 1.000000f, -1.570451f ); 
+    instance.registerEObj( "Bertha_2", 2003542, 0, 4, { 31.738079f, 0.068675f, -136.270004f }, 1.000000f, -1.400810f ); 
+    instance.registerEObj( "unknown_3", 2003543, 4635871, 4, { 24.398520f, -0.049999f, -178.281799f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "sgvf_r1d2_b0442_3", 2003544, 4724326, 4, { -7.216811f, 0.000001f, -183.345200f }, 1.000000f, 0.000000f ); 
+      // States -> vf_fire_on (id: 2) vf_fire_of (id: 3) 
+    instance.registerEObj( "Mainstoragevaultgate", 2003547, 4556427, 4, { -96.021538f, -1.183108f, -56.314732f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "sgvf_r1d2_b0442_4", 2004183, 4933927, 4, { -48.010059f, -0.050043f, -85.297096f }, 1.000000f, 0.000000f ); 
+      // States -> vf_fire_on (id: 2) vf_fire_of (id: 3) 
+    instance.registerEObj( "sgvf_r1d2_b0442_5", 2004184, 4947920, 4, { -43.944740f, -0.050000f, -96.101196f }, 1.000000f, 0.000000f ); 
+      // States -> vf_fire_on (id: 2) vf_fire_of (id: 3) 
 
   }
 
-  void onUpdate( InstanceContentPtr instance, uint32_t currTime ) override
+  void onUpdate( InstanceContent& instance, uint32_t currTime ) override
   {
 
   }
 
-  void onEnterTerritory( InstanceContentPtr instance, Entity::Player& player, uint32_t eventId, uint16_t param1,
+  void onEnterTerritory( InstanceContent& instance, Entity::Player& player, uint32_t eventId, uint16_t param1,
                          uint16_t param2 ) override
   {
 
diff --git a/src/scripts/instances/dungeons/TheSunkenTempleofQarn.cpp b/src/scripts/instances/dungeons/TheSunkenTempleofQarn.cpp
index ed0c8e77..077c5211 100644
--- a/src/scripts/instances/dungeons/TheSunkenTempleofQarn.cpp
+++ b/src/scripts/instances/dungeons/TheSunkenTempleofQarn.cpp
@@ -9,130 +9,82 @@ class TheSunkenTempleofQarn :
 public:
   TheSunkenTempleofQarn() :
     Sapphire::ScriptAPI::InstanceContentScript( 9 )
-  {
-  }
+  { }
 
-  void onInit( InstanceContentPtr instance ) override
+  void onInit( InstanceContent& instance ) override
   {
-    instance->registerEObj( "unknown_0", 2000413, 0, 4, { -211.000000f, 0.000002f, 2.000000f }, 1.000000f, 0.000000f );
-    instance->registerEObj( "TheWarden", 2000414, 0, 4, { -111.221802f, 14.346200f, 0.000000f }, 1.000000f, 0.000000f );
-    instance->registerEObj( "TheFlameofMagic", 2000415, 3878710, 4, { 8.987488f, -17.399031f, 53.998150f }, 1.000000f,
-                            -0.000000f );
-    instance->registerEObj( "TheFruitofKnowledge", 2000416, 3878713, 4, { 9.005134f, -17.409531f, -53.991970f },
-                            1.000000f, -0.000000f );
-    instance->registerEObj( "TheGemofAffluence", 2000417, 3878714, 4, { -151.210800f, -10.391200f, -62.004131f },
-                            1.000000f, -0.000000f );
-    instance->registerEObj( "TheHelmofMight", 2000418, 3878715, 4, { -151.162506f, -7.407125f, 61.966801f }, 1.000000f,
-                            -0.000000f );
-    instance->registerEObj( "Stonepedestal", 2000419, 0, 4, { 117.361099f, -3.708839f, -23.835030f }, 1.000000f,
-                            0.000000f );
-    instance->registerEObj( "DoortotheVaultofAether", 2000420, 3692635, 4, { 125.343102f, -0.964693f, -20.363819f },
-                            1.000000f, 0.000000f );
-    instance->registerEObj( "Stonepedestal_1", 2000421, 0, 4, { 117.353203f, -3.713329f, 23.859619f }, 1.000000f,
-                            0.000000f );
-    instance->registerEObj( "DoortotheVaultofSecrets", 2000422, 3692636, 4, { 125.292603f, -1.268839f, 20.414270f },
-                            1.000000f, 0.000000f );
-    instance->registerEObj( "Stonepedestal_2", 2000423, 0, 4, { 61.900841f, -17.710569f, 22.327250f }, 1.000000f,
-                            0.000000f );
-    instance->registerEObj( "DoortotheVaultofWealth", 2000424, 3692634, 4, { 70.569122f, -15.302040f, 21.475040f },
-                            1.000000f, 0.000000f );
-    instance->registerEObj( "Stonepedestal_3", 2000425, 0, 4, { 61.907928f, -17.695210f, -22.335239f }, 1.000000f,
-                            0.000000f );
-    instance->registerEObj( "DoortotheVaultofSteel", 2000426, 3692631, 4, { 70.709091f, -15.224650f, -21.394239f },
-                            1.000000f, 0.000000f );
-    instance->registerEObj( "Leftpan", 2000427, 0, 4, { 190.478394f, -4.200000f, -0.796000f }, 1.000000f, 0.000000f );
-    instance->registerEObj( "ThePathtoRetribution", 2000429, 3692668, 4, { 206.461700f, 0.128704f, 0.089424f },
-                            1.000000f, 0.000000f );
-    instance->registerEObj( "unknown_1", 2000430, 3693498, 4, { 191.008408f, -0.694424f, -14.489020f }, 1.000000f,
-                            0.000000f );
-    instance->registerEObj( "Sealeddoor", 2000431, 3692650, 4, { -9.500046f, -15.008410f, 0.079636f }, 1.000000f,
-                            0.000000f );
-    instance->registerEObj( "Sealeddoor_1", 2000432, 3689141, 4, { 9.008017f, -16.388670f, -27.499990f }, 1.000000f,
-                            0.000000f );
-    instance->registerEObj( "Sealeddoor_2", 2000433, 3692625, 4, { 8.971441f, -16.420650f, 27.488810f }, 1.000000f,
-                            0.000000f );
-    instance->registerEObj( "Sealedentryway", 2000434, 3692683, 4, { 75.484787f, -8.687153f, 0.065771f }, 1.000000f,
-                            0.000000f );
-    instance->registerEObj( "Sealeddoor_3", 2000435, 3692667, 4, { 132.458893f, -1.129695f, 0.000000f }, 1.000000f,
-                            0.000000f );
-    instance->registerEObj( "InnerSanctumgate", 2000436, 3689097, 4, { -62.922180f, -9.678907f, -43.500019f },
-                            1.000000f, 0.000000f );
-    instance->registerEObj( "LowerSanctumgate", 2000437, 3692684, 4, { 48.112701f, -45.229740f, 19.500000f }, 1.000000f,
-                            0.000000f );
-    instance->registerEObj( "Entrance", 2000182, 4208417, 5, { -202.000000f, 0.000002f, 2.000000f }, 1.000000f,
-                            0.000000f );
-    // States -> vf_lock_on vf_lock_of
-    instance->registerEObj( "Shortcut", 2000700, 0, 4, { -173.000000f, 12.000000f, 4.500000f }, 1.000000f, 0.000000f );
-    instance->registerEObj( "Rightpan", 2000428, 0, 4, { 190.478394f, -4.200000f, 0.831205f }, 1.000000f, 0.000000f );
-    instance->registerEObj( "sgvf_w_lvd_b0118", 2000443, 4208428, 4, { -96.278473f, -11.750040f, -58.418720f },
-                            1.000000f, 0.000000f );
-    // States -> vf_bextwall_on vf_bextwall_of
-    instance->registerEObj( "unknown_2", 2000444, 0, 4, { -95.744789f, -11.997100f, -61.865219f }, 1.000000f,
-                            -1.570451f );
-    instance->registerEObj( "sgvf_w_lvd_b0118_1", 2000445, 4208432, 4, { 65.669456f, -45.004108f, -34.907001f },
-                            1.000000f, 0.000000f );
-    // States -> vf_bextwall_on vf_bextwall_of
-    instance->registerEObj( "unknown_3", 2000446, 0, 4, { 68.223022f, -44.998901f, -35.050049f }, 0.991760f,
-                            0.000048f );
-    instance->registerEObj( "sgpl_w_lvd_b0250_w1d3", 2000447, 4208435, 4, { 208.815399f, -4.000029f, 3.424202f },
-                            1.000000f, 0.000000f );
-    // States -> vf_bextwall_on vf_bextwall_of
-    instance->registerEObj( "unknown_4", 2000448, 0, 4, { 208.268402f, -4.000159f, 0.000000f }, 1.000000f, -1.570451f );
-    instance->registerEObj( "Exit", 2000139, 0, 4, { 255.000000f, -3.999998f, 0.000000f }, 1.000000f, 0.000000f );
-    instance->registerEObj( "TheScalesofJudgment", 2000658, 0, 4, { 190.569901f, -2.364499f, 0.034341f }, 1.000000f,
-                            -0.000000f );
-    instance->registerEObj( "unknown_5", 2001156, 4069463, 4, { 190.000000f, -4.000078f, -0.800000f }, 1.000000f,
-                            0.000000f );
-    instance->registerEObj( "unknown_6", 2001157, 4069468, 4, { 190.000000f, -4.000021f, 0.800000f }, 1.000000f,
-                            0.000000f );
-    instance->registerEObj( "Leftpan_1", 2001165, 0, 4, { 190.478394f, -4.170000f, -0.796000f }, 1.000000f, 0.000000f );
-    instance->registerEObj( "Rightpan_1", 2001166, 0, 4, { 190.478394f, -4.170000f, 0.831200f }, 1.000000f,
-                            -0.000000f );
-    instance->registerEObj( "sgbg_w_lvd_w1d3_wall", 2001765, 4334159, 4, { -10.000000f, -18.000000f, 0.000000f },
-                            1.000000f, 0.000000f );
-    instance->registerEObj( "sgvf_w_btl_b0197", 2000281, 4323974, 4, { 228.750000f, -3.999998f, -9.250000f }, 1.000000f,
-                            0.000000f );
-    // States -> floor_on floor_of wall_on wall_of col_0f
-    instance->registerEObj( "sgvf_w_btl_b0197_1", 2000281, 4323976, 4, { 247.250000f, -3.999998f, -9.250000f },
-                            1.000000f, 0.000000f );
-    // States -> floor_on floor_of wall_on wall_of col_0f
-    instance->registerEObj( "sgvf_w_btl_b0197_2", 2000281, 4323978, 4, { 228.750000f, -3.999998f, 9.250000f },
-                            1.000000f, 0.000000f );
-    // States -> floor_on floor_of wall_on wall_of col_0f
-    instance->registerEObj( "sgvf_w_btl_b0197_3", 2000281, 4323979, 4, { 247.250000f, -3.999998f, 9.250000f },
-                            1.000000f, 0.000000f );
-    // States -> floor_on floor_of wall_on wall_of col_0f
-    instance->registerEObj( "unknown_7", 2000655, 3947232, 4, { 225.699997f, -2.000000f, 0.000000f }, 1.000000f,
-                            0.000000f );
-    instance->registerEObj( "unknown_8", 2000656, 3947235, 4, { 238.000000f, -2.000000f, 12.250000f }, 1.000000f,
-                            0.000000f );
-    instance->registerEObj( "unknown_9", 2000657, 3947234, 4, { 238.000000f, -2.000000f, -12.250000f }, 1.000000f,
-                            0.000000f );
-    instance->registerEObj( "unknown_10", 2000866, 4309073, 4, { -82.750000f, -11.000000f, -61.680000f }, 1.000000f,
-                            0.000000f );
-    instance->registerEObj( "unknown_11", 2000867, 4309075, 4, { -69.175003f, -11.000000f, -52.720001f }, 1.000000f,
-                            0.000000f );
-    instance->registerEObj( "unknown_12", 2000868, 4309074, 4, { -55.514999f, -11.000000f, -61.680000f }, 1.000000f,
-                            0.000000f );
-    instance->registerEObj( "unknown_13", 2000650, 3879215, 4, { -20.000000f, -16.500000f, 0.000000f }, 1.000000f,
-                            0.000000f );
-    instance->registerEObj( "unknown_14", 2000651, 3879238, 4, { 9.000000f, -17.000000f, -15.500000f }, 1.000000f,
-                            0.000000f );
-    instance->registerEObj( "unknown_15", 2000652, 3879240, 4, { 9.000000f, -17.000000f, 15.500000f }, 1.000000f,
-                            0.000000f );
-    instance->registerEObj( "unknown_16", 2000653, 3879241, 4, { 50.000000f, -17.000000f, 0.000000f }, 1.000000f,
-                            0.000000f );
-    instance->registerEObj( "unknown_17", 2000654, 3879249, 4, { 124.500000f, -2.000000f, 0.000000f }, 1.000000f,
-                            0.000000f );
+    instance.registerEObj( "unknown_0", 2000413, 0, 4, { -211.000000f, 0.000002f, 2.000000f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "TheWarden", 2000414, 0, 4, { -111.221802f, 14.346200f, 0.000000f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "TheFlameofMagic", 2000415, 3878710, 4, { 8.987488f, -17.399031f, 53.998150f }, 1.000000f, -0.000000f ); 
+    instance.registerEObj( "TheFruitofKnowledge", 2000416, 3878713, 4, { 9.005134f, -17.409531f, -53.991970f }, 1.000000f, -0.000000f ); 
+    instance.registerEObj( "TheGemofAffluence", 2000417, 3878714, 4, { -151.210800f, -10.391200f, -62.004131f }, 1.000000f, -0.000000f ); 
+    instance.registerEObj( "TheHelmofMight", 2000418, 3878715, 4, { -151.162506f, -7.407125f, 61.966801f }, 1.000000f, -0.000000f ); 
+    instance.registerEObj( "Stonepedestal", 2000419, 0, 4, { 117.361099f, -3.708839f, -23.835030f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "DoortotheVaultofAether", 2000420, 3692635, 4, { 125.343102f, -0.964693f, -20.363819f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "Stonepedestal_1", 2000421, 0, 4, { 117.353203f, -3.713329f, 23.859619f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "DoortotheVaultofSecrets", 2000422, 3692636, 4, { 125.292603f, -1.268839f, 20.414270f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "Stonepedestal_2", 2000423, 0, 4, { 61.900841f, -17.710569f, 22.327250f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "DoortotheVaultofWealth", 2000424, 3692634, 4, { 70.569122f, -15.302040f, 21.475040f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "Stonepedestal_3", 2000425, 0, 4, { 61.907928f, -17.695210f, -22.335239f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "DoortotheVaultofSteel", 2000426, 3692631, 4, { 70.709091f, -15.224650f, -21.394239f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "Leftpan", 2000427, 0, 4, { 190.478394f, -4.200000f, -0.796000f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "ThePathtoRetribution", 2000429, 3692668, 4, { 206.461700f, 0.128704f, 0.089424f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_1", 2000430, 3693498, 4, { 191.008408f, -0.694424f, -14.489020f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "Sealeddoor", 2000431, 3692650, 4, { -9.500046f, -15.008410f, 0.079636f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "Sealeddoor_1", 2000432, 3689141, 4, { 9.008017f, -16.388670f, -27.499990f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "Sealeddoor_2", 2000433, 3692625, 4, { 8.971441f, -16.420650f, 27.488810f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "Sealedentryway", 2000434, 3692683, 4, { 75.484787f, -8.687153f, 0.065771f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "Sealeddoor_3", 2000435, 3692667, 4, { 132.458893f, -1.129695f, 0.000000f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "InnerSanctumgate", 2000436, 3689097, 4, { -62.922180f, -9.678907f, -43.500019f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "LowerSanctumgate", 2000437, 3692684, 4, { 48.112701f, -45.229740f, 19.500000f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "Entrance", 2000182, 4208417, 5, { -202.000000f, 0.000002f, 2.000000f }, 1.000000f, 0.000000f ); 
+      // States -> vf_lock_on (id: 11) vf_lock_of (id: 12) 
+    instance.registerEObj( "Shortcut", 2000700, 0, 4, { -173.000000f, 12.000000f, 4.500000f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "Rightpan", 2000428, 0, 4, { 190.478394f, -4.200000f, 0.831205f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "sgvf_w_lvd_b0118", 2000443, 4208428, 4, { -96.278473f, -11.750040f, -58.418720f }, 1.000000f, 0.000000f ); 
+      // States -> vf_bextwall_on (id: 3) vf_bextwall_of (id: 4) 
+    instance.registerEObj( "unknown_2", 2000444, 0, 4, { -95.744789f, -11.997100f, -61.865219f }, 1.000000f, -1.570451f ); 
+    instance.registerEObj( "sgvf_w_lvd_b0118_1", 2000445, 4208432, 4, { 65.669456f, -45.004108f, -34.907001f }, 1.000000f, 0.000000f ); 
+      // States -> vf_bextwall_on (id: 3) vf_bextwall_of (id: 4) 
+    instance.registerEObj( "unknown_3", 2000446, 0, 4, { 68.223022f, -44.998901f, -35.050049f }, 0.991760f, 0.000048f ); 
+    instance.registerEObj( "sgpl_w_lvd_b0250_w1d3", 2000447, 4208435, 4, { 208.815399f, -4.000029f, 3.424202f }, 1.000000f, 0.000000f ); 
+      // States -> vf_bextwall_on (id: 3) vf_bextwall_of (id: 4) 
+    instance.registerEObj( "unknown_4", 2000448, 0, 4, { 208.268402f, -4.000159f, 0.000000f }, 1.000000f, -1.570451f ); 
+    instance.registerEObj( "Exit", 2000139, 0, 4, { 255.000000f, -3.999998f, 0.000000f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "TheScalesofJudgment", 2000658, 0, 4, { 190.569901f, -2.364499f, 0.034341f }, 1.000000f, -0.000000f ); 
+    instance.registerEObj( "unknown_5", 2001156, 4069463, 4, { 190.000000f, -4.000078f, -0.800000f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_6", 2001157, 4069468, 4, { 190.000000f, -4.000021f, 0.800000f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "Leftpan_1", 2001165, 0, 4, { 190.478394f, -4.170000f, -0.796000f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "Rightpan_1", 2001166, 0, 4, { 190.478394f, -4.170000f, 0.831200f }, 1.000000f, -0.000000f ); 
+    instance.registerEObj( "sgbg_w_lvd_w1d3_wall", 2001765, 4334159, 4, { -10.000000f, -18.000000f, 0.000000f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "sgvf_w_btl_b0197", 2000281, 4323974, 4, { 228.750000f, -3.999998f, -9.250000f }, 1.000000f, 0.000000f ); 
+      // States -> floor_on (id: 5) floor_of (id: 6) wall_on (id: 7) wall_of (id: 8) col_0f (id: 28) 
+    instance.registerEObj( "sgvf_w_btl_b0197_1", 2000281, 4323976, 4, { 247.250000f, -3.999998f, -9.250000f }, 1.000000f, 0.000000f ); 
+      // States -> floor_on (id: 5) floor_of (id: 6) wall_on (id: 7) wall_of (id: 8) col_0f (id: 28) 
+    instance.registerEObj( "sgvf_w_btl_b0197_2", 2000281, 4323978, 4, { 228.750000f, -3.999998f, 9.250000f }, 1.000000f, 0.000000f ); 
+      // States -> floor_on (id: 5) floor_of (id: 6) wall_on (id: 7) wall_of (id: 8) col_0f (id: 28) 
+    instance.registerEObj( "sgvf_w_btl_b0197_3", 2000281, 4323979, 4, { 247.250000f, -3.999998f, 9.250000f }, 1.000000f, 0.000000f ); 
+      // States -> floor_on (id: 5) floor_of (id: 6) wall_on (id: 7) wall_of (id: 8) col_0f (id: 28) 
+    instance.registerEObj( "unknown_7", 2000655, 3947232, 4, { 225.699997f, -2.000000f, 0.000000f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_8", 2000656, 3947235, 4, { 238.000000f, -2.000000f, 12.250000f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_9", 2000657, 3947234, 4, { 238.000000f, -2.000000f, -12.250000f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_10", 2000866, 4309073, 4, { -82.750000f, -11.000000f, -61.680000f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_11", 2000867, 4309075, 4, { -69.175003f, -11.000000f, -52.720001f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_12", 2000868, 4309074, 4, { -55.514999f, -11.000000f, -61.680000f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_13", 2000650, 3879215, 4, { -20.000000f, -16.500000f, 0.000000f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_14", 2000651, 3879238, 4, { 9.000000f, -17.000000f, -15.500000f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_15", 2000652, 3879240, 4, { 9.000000f, -17.000000f, 15.500000f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_16", 2000653, 3879241, 4, { 50.000000f, -17.000000f, 0.000000f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_17", 2000654, 3879249, 4, { 124.500000f, -2.000000f, 0.000000f }, 1.000000f, 0.000000f ); 
 
   }
 
-  void onUpdate( InstanceContentPtr instance, uint32_t currTime ) override
+  void onUpdate( InstanceContent& instance, uint32_t currTime ) override
   {
 
   }
 
-  void onEnterTerritory( InstanceContentPtr instance, Entity::Player& player, uint32_t eventId, uint16_t param1,
+  void onEnterTerritory( InstanceContent& instance, Entity::Player& player, uint32_t eventId, uint16_t param1,
                          uint16_t param2 ) override
   {
 
diff --git a/src/scripts/instances/dungeons/TheSunkenTempleofQarnHard.cpp b/src/scripts/instances/dungeons/TheSunkenTempleofQarnHard.cpp
index ee4dd223..822d8b3e 100644
--- a/src/scripts/instances/dungeons/TheSunkenTempleofQarnHard.cpp
+++ b/src/scripts/instances/dungeons/TheSunkenTempleofQarnHard.cpp
@@ -9,117 +9,73 @@ class TheSunkenTempleofQarnHard :
 public:
   TheSunkenTempleofQarnHard() :
     Sapphire::ScriptAPI::InstanceContentScript( 26 )
-  {
-  }
+  { }
 
-  void onInit( InstanceContentPtr instance ) override
+  void onInit( InstanceContent& instance ) override
   {
-    instance->registerEObj( "Entrance", 2000182, 4876828, 5, { -201.196701f, 0.682657f, 0.238411f }, 1.000000f,
-                            0.000000f );
-    // States -> vf_lock_on vf_lock_of
-    instance->registerEObj( "Shortcut", 2000603, 0, 4, { -172.011398f, 12.472960f, 3.615232f }, 1.000000f, 0.000000f );
-    instance->registerEObj( "Exit", 2000139, 0, 4, { 128.831894f, -3.999020f, -0.076355f }, 0.991760f, 0.000048f );
-    instance->registerEObj( "unknown_0", 2004381, 4688136, 4, { -62.950489f, -9.042180f, -43.471519f }, 1.000000f,
-                            0.000000f );
-    instance->registerEObj( "Lockeddoor", 2004382, 4686911, 4, { -52.102619f, -15.747660f, 0.003015f }, 1.000000f,
-                            0.000000f );
-    instance->registerEObj( "unknown_1", 2004383, 4880940, 4, { -32.646118f, -15.322760f, -0.535999f }, 1.000000f,
-                            0.000000f );
-    instance->registerEObj( "unknown_2", 2004384, 4688144, 4, { -9.445859f, -15.431120f, 0.091173f }, 0.991760f,
-                            0.000048f );
-    instance->registerEObj( "unknown_3", 2002735, 0, 4, { -24.503120f, -51.014042f, -2.151611f }, 0.991760f,
-                            1.469946f );
-    instance->registerEObj( "sgvf_w_lvd_b0118", 2002872, 4877209, 4, { -24.127260f, -49.149910f, -1.216785f },
-                            0.991760f, 0.000048f );
-    // States -> vf_bextwall_on vf_bextwall_of
-    instance->registerEObj( "sgvf_w_lvd_b0118_1", 2004385, 4877211, 4, { -33.270012f, -49.495350f, -17.436060f },
-                            0.991760f, 0.000048f );
-    // States -> vf_bextwall_on vf_bextwall_of
-    instance->registerEObj( "unknown_4", 2004576, 4880984, 4, { -32.350761f, -15.369120f, 1.208490f }, 1.000000f,
-                            0.000000f );
-    instance->registerEObj( "sgvf_w1d8_b0492", 2004386, 4877345, 4, { 47.455811f, -46.541481f, 18.191370f }, 1.000000f,
-                            0.000000f );
-    // States -> vf_wall_off vf_wall_fade vf_wall_on
-    instance->registerEObj( "Lockeddoor_1", 2004388, 4688151, 4, { 166.535797f, -43.147060f, 0.015993f }, 0.991760f,
-                            0.000048f );
-    instance->registerEObj( "sgvf_w1d8_b0492_1", 2004402, 4877619, 4, { 213.946701f, -42.801571f, -0.015320f },
-                            0.991760f, 0.000048f );
-    // States -> vf_wall_off vf_wall_fade vf_wall_on
-    instance->registerEObj( "unknown_5", 2004389, 4688148, 4, { 207.414703f, -1.759183f, 0.009065f }, 1.000000f,
-                            0.000000f );
-    instance->registerEObj( "unknown_6", 2002735, 0, 4, { 256.782104f, -3.999999f, 0.025025f }, 1.000000f, 1.556998f );
-    instance->registerEObj( "sgvf_w_lvd_b0118_2", 2002872, 4877953, 4, { 257.319305f, -2.265031f, 0.350891f },
-                            0.991760f, 0.000048f );
-    // States -> vf_bextwall_on vf_bextwall_of
-    instance->registerEObj( "sgvf_w_lvd_b0118_3", 2004431, 4879695, 4, { 218.928802f, -2.699499f, 0.015198f },
-                            0.991760f, 0.000048f );
-    // States -> vf_bextwall_on vf_bextwall_of
-    instance->registerEObj( "unknown_7", 2004391, 4742442, 4, { -44.851521f, -16.474951f, -61.569599f }, 0.991760f,
-                            0.000048f );
-    instance->registerEObj( "unknown_8", 2004392, 4742441, 4, { -34.082909f, -16.222090f, -39.745499f }, 0.991760f,
-                            0.000048f );
-    instance->registerEObj( "unknown_9", 2004403, 4688145, 4, { -9.412401f, -14.700150f, -48.979301f }, 0.991760f,
-                            0.000048f );
-    instance->registerEObj( "unknown_10", 2004393, 4685534, 4, { 13.954340f, -16.478741f, -36.432899f }, 0.991760f,
-                            0.000048f );
-    instance->registerEObj( "unknown_11", 2004394, 4688137, 4, { 8.975560f, -14.432130f, -28.492041f }, 0.991760f,
-                            0.000048f );
-    instance->registerEObj( "Magickedpedestal", 2004396, 4688166, 4, { 53.655460f, -15.371500f, 0.015198f }, 0.991760f,
-                            0.000048f );
-    instance->registerEObj( "unknown_12", 2004397, 4688139, 4, { 70.286049f, -14.700250f, -20.531210f }, 0.991760f,
-                            0.000048f );
-    instance->registerEObj( "Magickedpedestal_1", 2004398, 4685848, 4, { 79.511627f, -15.096250f, -36.674881f },
-                            0.991760f, 0.000048f );
-    instance->registerEObj( "unknown_13", 2004399, 4688140, 4, { 70.381950f, -14.689050f, 20.486361f }, 0.991760f,
-                            0.000048f );
-    instance->registerEObj( "Magickedpedestal_2", 2004400, 4685849, 4, { 79.392357f, -14.749610f, 36.721691f },
-                            0.991760f, 0.000048f );
-    instance->registerEObj( "sgpl_w1d8_b0118_boss_wall", 2002872, 4981816, 4, { 97.856079f, -4.013123f, -1.052917f },
-                            0.991760f, 0.000048f );
-    // States -> on off
-    instance->registerEObj( "sgpl_w1d8_b0094_boss_line", 2004772, 4878447, 4, { 98.950607f, -4.000012f, -2.245166f },
-                            1.000000f, 0.000000f );
-    instance->registerEObj( "unknown_14", 2004602, 0, 4, { 133.195908f, -4.013123f, -0.015320f }, 0.991760f,
-                            1.570451f );
-    instance->registerEObj( "unknown_15", 2004603, 0, 4, { 133.195908f, -4.013123f, 12.924380f }, 0.991760f,
-                            1.570451f );
-    instance->registerEObj( "unknown_16", 2004709, 0, 4, { 128.074203f, -4.000000f, 18.223900f }, 1.000000f,
-                            0.000488f );
-    instance->registerEObj( "unknown_17", 2004710, 0, 4, { 115.087196f, -4.000000f, 18.223900f }, 1.000000f,
-                            0.000000f );
-    instance->registerEObj( "unknown_18", 2004711, 0, 4, { 102.068398f, -4.000000f, 18.223900f }, 1.000000f,
-                            0.000000f );
-    instance->registerEObj( "unknown_19", 2004712, 0, 4, { 97.276253f, -4.013123f, 12.893800f }, 0.991760f,
-                            -1.570451f );
-    instance->registerEObj( "unknown_20", 2004713, 0, 4, { 97.276253f, -4.013123f, -0.045776f }, 0.991760f,
-                            -1.570451f );
-    instance->registerEObj( "unknown_21", 2004714, 0, 4, { 97.293999f, -4.000000f, -12.961500f }, 1.000000f,
-                            -1.570451f );
-    instance->registerEObj( "unknown_22", 2004715, 0, 4, { 102.037003f, -4.013123f, -17.868410f }, 0.991760f,
-                            0.000048f );
-    instance->registerEObj( "unknown_23", 2004716, 0, 4, { 115.069099f, -4.000000f, -17.860500f }, 1.000000f,
-                            0.000000f );
-    instance->registerEObj( "unknown_24", 2004717, 0, 4, { 128.038498f, -4.013123f, -17.898861f }, 0.991760f,
-                            0.000048f );
-    instance->registerEObj( "unknown_25", 2004718, 0, 4, { 133.195908f, -4.013123f, -12.954960f }, 0.991760f,
-                            1.570451f );
-    instance->registerEObj( "unknown_26", 2004604, 0, 4, { 130.266205f, -4.013123f, 15.518430f }, 0.991760f,
-                            0.785937f );
-    instance->registerEObj( "unknown_27", 2004719, 0, 4, { 99.982773f, -4.000000f, 15.879740f }, 1.000000f,
-                            -0.785398f );
-    instance->registerEObj( "unknown_28", 2004720, 0, 4, { 100.288803f, -4.000000f, -15.013530f }, 1.000000f,
-                            -0.785398f );
-    instance->registerEObj( "unknown_29", 2004721, 0, 4, { 130.501694f, -4.000000f, -14.939790f }, 1.000000f,
-                            0.785398f );
+    instance.registerEObj( "Entrance", 2000182, 4876828, 5, { -201.196701f, 0.682657f, 0.238411f }, 1.000000f, 0.000000f ); 
+      // States -> vf_lock_on (id: 11) vf_lock_of (id: 12) 
+    instance.registerEObj( "Shortcut", 2000603, 0, 4, { -172.011398f, 12.472960f, 3.615232f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "Exit", 2000139, 0, 4, { 128.831894f, -3.999020f, -0.076355f }, 0.991760f, 0.000048f ); 
+    instance.registerEObj( "unknown_0", 2004381, 4688136, 4, { -62.950489f, -9.042180f, -43.471519f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "Lockeddoor", 2004382, 4686911, 4, { -52.102619f, -15.747660f, 0.003015f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_1", 2004383, 4880940, 4, { -32.646118f, -15.322760f, -0.535999f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_2", 2004384, 4688144, 4, { -9.445859f, -15.431120f, 0.091173f }, 0.991760f, 0.000048f ); 
+    instance.registerEObj( "unknown_3", 2002735, 0, 4, { -24.503120f, -51.014042f, -2.151611f }, 0.991760f, 1.469946f ); 
+    instance.registerEObj( "sgvf_w_lvd_b0118", 2002872, 4877209, 4, { -24.127260f, -49.149910f, -1.216785f }, 0.991760f, 0.000048f ); 
+      // States -> vf_bextwall_on (id: 3) vf_bextwall_of (id: 4) 
+    instance.registerEObj( "sgvf_w_lvd_b0118_1", 2004385, 4877211, 4, { -33.270012f, -49.495350f, -17.436060f }, 0.991760f, 0.000048f ); 
+      // States -> vf_bextwall_on (id: 3) vf_bextwall_of (id: 4) 
+    instance.registerEObj( "unknown_4", 2004576, 4880984, 4, { -32.350761f, -15.369120f, 1.208490f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "sgvf_w1d8_b0492", 2004386, 4877345, 4, { 47.455811f, -46.541481f, 18.191370f }, 1.000000f, 0.000000f ); 
+      // States -> vf_wall_off (id: 2) vf_wall_fade (id: 3) vf_wall_on (id: 4) 
+    instance.registerEObj( "Lockeddoor_1", 2004388, 4688151, 4, { 166.535797f, -43.147060f, 0.015993f }, 0.991760f, 0.000048f ); 
+    instance.registerEObj( "sgvf_w1d8_b0492_1", 2004402, 4877619, 4, { 213.946701f, -42.801571f, -0.015320f }, 0.991760f, 0.000048f ); 
+      // States -> vf_wall_off (id: 2) vf_wall_fade (id: 3) vf_wall_on (id: 4) 
+    instance.registerEObj( "unknown_5", 2004389, 4688148, 4, { 207.414703f, -1.759183f, 0.009065f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_6", 2002735, 0, 4, { 256.782104f, -3.999999f, 0.025025f }, 1.000000f, 1.556998f ); 
+    instance.registerEObj( "sgvf_w_lvd_b0118_2", 2002872, 4877953, 4, { 257.319305f, -2.265031f, 0.350891f }, 0.991760f, 0.000048f ); 
+      // States -> vf_bextwall_on (id: 3) vf_bextwall_of (id: 4) 
+    instance.registerEObj( "sgvf_w_lvd_b0118_3", 2004431, 4879695, 4, { 218.928802f, -2.699499f, 0.015198f }, 0.991760f, 0.000048f ); 
+      // States -> vf_bextwall_on (id: 3) vf_bextwall_of (id: 4) 
+    instance.registerEObj( "unknown_7", 2004391, 4742442, 4, { -44.851521f, -16.474951f, -61.569599f }, 0.991760f, 0.000048f ); 
+    instance.registerEObj( "unknown_8", 2004392, 4742441, 4, { -34.082909f, -16.222090f, -39.745499f }, 0.991760f, 0.000048f ); 
+    instance.registerEObj( "unknown_9", 2004403, 4688145, 4, { -9.412401f, -14.700150f, -48.979301f }, 0.991760f, 0.000048f ); 
+    instance.registerEObj( "unknown_10", 2004393, 4685534, 4, { 13.954340f, -16.478741f, -36.432899f }, 0.991760f, 0.000048f ); 
+    instance.registerEObj( "unknown_11", 2004394, 4688137, 4, { 8.975560f, -14.432130f, -28.492041f }, 0.991760f, 0.000048f ); 
+    instance.registerEObj( "Magickedpedestal", 2004396, 4688166, 4, { 53.655460f, -15.371500f, 0.015198f }, 0.991760f, 0.000048f ); 
+    instance.registerEObj( "unknown_12", 2004397, 4688139, 4, { 70.286049f, -14.700250f, -20.531210f }, 0.991760f, 0.000048f ); 
+    instance.registerEObj( "Magickedpedestal_1", 2004398, 4685848, 4, { 79.511627f, -15.096250f, -36.674881f }, 0.991760f, 0.000048f ); 
+    instance.registerEObj( "unknown_13", 2004399, 4688140, 4, { 70.381950f, -14.689050f, 20.486361f }, 0.991760f, 0.000048f ); 
+    instance.registerEObj( "Magickedpedestal_2", 2004400, 4685849, 4, { 79.392357f, -14.749610f, 36.721691f }, 0.991760f, 0.000048f ); 
+    instance.registerEObj( "sgpl_w1d8_b0118_boss_wall", 2002872, 4981816, 4, { 97.856079f, -4.013123f, -1.052917f }, 0.991760f, 0.000048f ); 
+      // States -> on (id: 6) off (id: 7) 
+    instance.registerEObj( "sgpl_w1d8_b0094_boss_line", 2004772, 4878447, 4, { 98.950607f, -4.000012f, -2.245166f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_14", 2004602, 0, 4, { 133.195908f, -4.013123f, -0.015320f }, 0.991760f, 1.570451f ); 
+    instance.registerEObj( "unknown_15", 2004603, 0, 4, { 133.195908f, -4.013123f, 12.924380f }, 0.991760f, 1.570451f ); 
+    instance.registerEObj( "unknown_16", 2004709, 0, 4, { 128.074203f, -4.000000f, 18.223900f }, 1.000000f, 0.000488f ); 
+    instance.registerEObj( "unknown_17", 2004710, 0, 4, { 115.087196f, -4.000000f, 18.223900f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_18", 2004711, 0, 4, { 102.068398f, -4.000000f, 18.223900f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_19", 2004712, 0, 4, { 97.276253f, -4.013123f, 12.893800f }, 0.991760f, -1.570451f ); 
+    instance.registerEObj( "unknown_20", 2004713, 0, 4, { 97.276253f, -4.013123f, -0.045776f }, 0.991760f, -1.570451f ); 
+    instance.registerEObj( "unknown_21", 2004714, 0, 4, { 97.293999f, -4.000000f, -12.961500f }, 1.000000f, -1.570451f ); 
+    instance.registerEObj( "unknown_22", 2004715, 0, 4, { 102.037003f, -4.013123f, -17.868410f }, 0.991760f, 0.000048f ); 
+    instance.registerEObj( "unknown_23", 2004716, 0, 4, { 115.069099f, -4.000000f, -17.860500f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_24", 2004717, 0, 4, { 128.038498f, -4.013123f, -17.898861f }, 0.991760f, 0.000048f ); 
+    instance.registerEObj( "unknown_25", 2004718, 0, 4, { 133.195908f, -4.013123f, -12.954960f }, 0.991760f, 1.570451f ); 
+    instance.registerEObj( "unknown_26", 2004604, 0, 4, { 130.266205f, -4.013123f, 15.518430f }, 0.991760f, 0.785937f ); 
+    instance.registerEObj( "unknown_27", 2004719, 0, 4, { 99.982773f, -4.000000f, 15.879740f }, 1.000000f, -0.785398f ); 
+    instance.registerEObj( "unknown_28", 2004720, 0, 4, { 100.288803f, -4.000000f, -15.013530f }, 1.000000f, -0.785398f ); 
+    instance.registerEObj( "unknown_29", 2004721, 0, 4, { 130.501694f, -4.000000f, -14.939790f }, 1.000000f, 0.785398f ); 
 
   }
 
-  void onUpdate( InstanceContentPtr instance, uint32_t currTime ) override
+  void onUpdate( InstanceContent& instance, uint32_t currTime ) override
   {
 
   }
 
-  void onEnterTerritory( InstanceContentPtr instance, Entity::Player& player, uint32_t eventId, uint16_t param1,
+  void onEnterTerritory( InstanceContent& instance, Entity::Player& player, uint32_t eventId, uint16_t param1,
                          uint16_t param2 ) override
   {
 
diff --git a/src/scripts/instances/dungeons/TheSwallowsCompass.cpp b/src/scripts/instances/dungeons/TheSwallowsCompass.cpp
new file mode 100644
index 00000000..550c970f
--- /dev/null
+++ b/src/scripts/instances/dungeons/TheSwallowsCompass.cpp
@@ -0,0 +1,74 @@
+#include <ScriptObject.h>
+#include <Territory/InstanceContent.h>
+
+using namespace Sapphire;
+
+class TheSwallowsCompass :
+  public Sapphire::ScriptAPI::InstanceContentScript
+{
+public:
+  TheSwallowsCompass() :
+    Sapphire::ScriptAPI::InstanceContentScript( 61 )
+  { }
+
+  void onInit( InstanceContent& instance ) override
+  {
+    instance.registerEObj( "unknown_0", 2002735, 0, 4, { -240.000000f, -480.000000f, 20.149229f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "sgvf_w_lvd_b0118", 2002872, 7335368, 4, { -240.000000f, -480.000000f, 20.500000f }, 1.000000f, 0.000000f ); 
+      // States -> vf_bextwall_on (id: 3) vf_bextwall_of (id: 4) 
+    instance.registerEObj( "sgvf_w_lvd_b0118_1", 2002872, 7335378, 4, { -240.000107f, -479.829407f, -20.937090f }, 0.991760f, 0.000048f ); 
+      // States -> vf_bextwall_on (id: 3) vf_bextwall_of (id: 4) 
+    instance.registerEObj( "unknown_1", 2002735, 0, 4, { 25.824850f, 0.000000f, 335.000000f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "sgvf_w_lvd_b0118_2", 2002872, 7335369, 4, { 25.824900f, 0.000000f, 335.000000f }, 1.000000f, -0.000000f ); 
+      // States -> vf_bextwall_on (id: 3) vf_bextwall_of (id: 4) 
+    instance.registerEObj( "sgvf_w_lvd_b0118_3", 2002872, 7335384, 4, { 5.530100f, 0.066046f, 313.914093f }, 1.000000f, -1.570451f ); 
+      // States -> vf_bextwall_on (id: 3) vf_bextwall_of (id: 4) 
+    instance.registerEObj( "unknown_2", 2009482, 0, 4, { 25.617769f, -0.000000f, 313.533386f }, 0.991760f, -0.000000f ); 
+    instance.registerEObj( "unknown_3", 2009483, 0, 4, { 25.639690f, 0.000000f, 313.537415f }, 1.000000f, -0.000000f ); 
+    instance.registerEObj( "unknown_4", 2009484, 0, 4, { 25.639690f, -0.000000f, 313.537415f }, 1.000000f, -0.000000f ); 
+    instance.registerEObj( "unknown_5", 2002735, 0, 4, { 14.984640f, 73.000053f, -214.000000f }, 1.000000f, 0.000048f ); 
+    instance.registerEObj( "sgvf_w_lvd_b0118_4", 2002872, 7335370, 4, { 14.984600f, 73.000099f, -214.000000f }, 1.000000f, 0.000000f ); 
+      // States -> vf_bextwall_on (id: 3) vf_bextwall_of (id: 4) 
+    instance.registerEObj( "unknown_6", 2007457, 7340414, 4, { 15.080000f, 73.000000f, -240.613205f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_7", 2007457, 7258934, 4, { -180.800003f, -478.399994f, -18.299999f }, 1.000000f, -0.000000f ); 
+    instance.registerEObj( "unknown_8", 2007457, 7258961, 4, { -258.299988f, -478.399994f, -59.200001f }, 1.000000f, -1.570451f ); 
+    instance.registerEObj( "unknown_9", 2007457, 7258964, 4, { -299.200012f, -478.399994f, 18.299999f }, 1.000000f, -0.000000f ); 
+    instance.registerEObj( "Geomanticaetheryte", 2009459, 7258990, 4, { -240.000000f, -478.149994f, -28.000000f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_10", 2007457, 7257379, 4, { -180.800003f, -478.399994f, -0.025493f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_11", 2007457, 7257373, 4, { -240.000504f, -478.399994f, -59.200001f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_12", 2007457, 7257377, 4, { -299.206207f, -478.399994f, -0.030577f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "Dragonsseal", 2009461, 7281048, 4, { -240.000000f, -478.399994f, 47.000000f }, 1.000000f, -0.000000f ); 
+    instance.registerEObj( "sgvf_e3d6_b1392", 2007457, 7446402, 4, { -180.773697f, -478.399994f, 1.327454f }, 0.991760f, 0.000048f ); 
+    instance.registerEObj( "sgvf_e3d6_b1393", 2007457, 7446403, 4, { -238.718002f, -478.399994f, -59.199989f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "sgvf_e3d6_b1394", 2007457, 7446404, 4, { -299.206207f, -478.399994f, -0.030600f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_13", 2007457, 7352890, 4, { 289.021088f, -472.527893f, -139.615799f }, 0.991760f, 0.000048f ); 
+    instance.registerEObj( "Geomanticaetheryte_1", 2009460, 7258993, 4, { 288.165710f, -470.629913f, -186.000000f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "sgvf_e3d6_b1392_1", 2007457, 7446406, 4, { 219.684097f, -450.394989f, 143.129196f }, 0.991760f, 0.000048f ); 
+    instance.registerEObj( "unknown_14", 2007457, 7537737, 4, { 220.000000f, -454.000000f, 34.954559f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_15", 2007457, 7309347, 4, { 15.015300f, 65.000000f, -194.017807f }, 0.991760f, 0.000048f ); 
+    instance.registerEObj( "sgvf_e3d6_b1389", 2007457, 7446408, 4, { -48.630550f, -0.495845f, 145.921997f }, 0.991760f, 0.000048f ); 
+    instance.registerEObj( "sgvf_e3d6_b1389_1", 2007457, 7446409, 4, { 14.968400f, 0.846474f, -57.815701f }, 0.991760f, 0.000048f ); 
+    instance.registerEObj( "sgvf_e3d6_b1394_1", 2007457, 7446407, 4, { -27.118010f, 9.246044f, 277.059692f }, 0.991760f, 0.000048f ); 
+    instance.registerEObj( "unknown_16", 2007457, 7344616, 4, { -1.968445f, 0.846474f, -87.815727f }, 0.991760f, 0.000048f ); 
+    instance.registerEObj( "unknown_17", 2007457, 7344614, 4, { -48.630550f, -0.495845f, 145.921997f }, 0.991760f, 0.000048f ); 
+    instance.registerEObj( "Entrance", 2000182, 7335292, 5, { -240.000000f, -478.399994f, 120.000000f }, 1.000000f, 0.000000f ); 
+      // States -> vf_lock_on (id: 11) vf_lock_of (id: 12) 
+    instance.registerEObj( "Shortcut", 2000700, 0, 4, { -243.776001f, -478.399994f, 110.345001f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "Exit", 2000139, 0, 4, { 14.983240f, 73.000000f, -266.619385f }, 0.991760f, 0.000048f ); 
+
+  }
+
+  void onUpdate( InstanceContent& instance, uint32_t currTime ) override
+  {
+
+  }
+
+  void onEnterTerritory( InstanceContent& instance, Entity::Player& player, uint32_t eventId, uint16_t param1,
+                         uint16_t param2 ) override
+  {
+
+  }
+
+};
+
+EXPOSE_SCRIPT( TheSwallowsCompass );
\ No newline at end of file
diff --git a/src/scripts/instances/dungeons/TheTamTaraDeepcroft.cpp b/src/scripts/instances/dungeons/TheTamTaraDeepcroft.cpp
index c160e899..4f82cc2f 100644
--- a/src/scripts/instances/dungeons/TheTamTaraDeepcroft.cpp
+++ b/src/scripts/instances/dungeons/TheTamTaraDeepcroft.cpp
@@ -9,66 +9,50 @@ class TheTamTaraDeepcroft :
 public:
   TheTamTaraDeepcroft() :
     Sapphire::ScriptAPI::InstanceContentScript( 2 )
-  {
-  }
+  { }
 
-  void onInit( InstanceContentPtr instance ) override
+  void onInit( InstanceContent& instance ) override
   {
-    instance->registerEObj( "Cultistorb", 2000061, 3816929, 4, { -8.115554f, 31.427530f, -15.950320f }, 1.000000f,
-                            -1.570451f );
-    // States -> vf_beam1_on vf_beam1_off all_off
-    instance->registerEObj( "Cultistorb_1", 2000062, 3817025, 4, { -22.784361f, 25.526300f, 20.482220f }, 1.000000f,
-                            -0.625840f );
-    // States -> vf_beam2_off vf_beam2_on all_off
-    instance->registerEObj( "Sealedbarrier", 2000060, 2065984, 4, { -103.196800f, 16.825590f, 15.152160f }, 0.950000f,
-                            -1.044062f );
-    instance->registerEObj( "Cultistrosary", 2000057, 0, 4, { -179.952606f, 14.711600f, -4.996500f }, 0.750000f,
-                            -1.570796f );
-    instance->registerEObj( "Cultistorb_2", 2000063, 3817039, 4, { -89.733833f, 15.701490f, 13.923830f }, 0.991789f,
-                            0.925052f );
-    // States -> vf_beam3_off vf_beam3_on all_off
-    instance->registerEObj( "Cultistorb_3", 2000067, 3817052, 4, { -94.766899f, 15.709600f, 3.820237f }, 1.000000f,
-                            1.227256f );
-    // States -> vf_beam3_off vf_beam3_on all_off
-    instance->registerEObj( "unknown_0", 2000054, 0, 4, { -53.345570f, 49.647820f, -146.799103f }, 0.991760f,
-                            0.000048f );
-    instance->registerEObj( "unknown_1", 2001085, 0, 4, { -68.771881f, 15.144450f, -3.840616f }, 0.539465f, 1.095248f );
-    instance->registerEObj( "sgvf_w_lvd_b0118", 2001697, 4108043, 4, { 13.157160f, 29.280100f, -7.370761f }, 1.000000f,
-                            0.000000f );
-    // States -> vf_bextwall_on vf_bextwall_of
-    instance->registerEObj( "sgvf_w_lvd_b0118_1", 2001698, 4108046, 4, { -18.524361f, 23.342850f, 42.375740f },
-                            1.000000f, 0.000000f );
-    // States -> vf_bextwall_on vf_bextwall_of
-    instance->registerEObj( "sgvf_w_lvd_b0118_2", 2001699, 4108055, 4, { 19.811380f, 30.119770f, -20.717630f },
-                            1.000000f, 0.000000f );
-    // States -> vf_bextwall_on vf_bextwall_of
-    instance->registerEObj( "unknown_2", 2001700, 0, 4, { 19.739401f, 30.119801f, -19.838511f }, 1.000000f, 1.409320f );
-    instance->registerEObj( "sgvf_w_lvd_b0118_3", 2001701, 4108071, 4, { -3.087158f, 23.754129f, 40.895020f },
-                            1.000000f, 0.000000f );
-    // States -> vf_bextwall_on vf_bextwall_of
-    instance->registerEObj( "unknown_3", 2001702, 0, 4, { -3.984208f, 23.754129f, 41.874859f }, 1.000000f, -0.675014f );
-    instance->registerEObj( "sgvf_w_lvd_b0118_4", 2001703, 4108078, 4, { -95.779678f, 14.524550f, 45.017761f },
-                            1.000000f, 0.000000f );
-    // States -> vf_bextwall_on vf_bextwall_of
-    instance->registerEObj( "unknown_4", 2001704, 0, 4, { -97.035683f, 14.524550f, 44.317101f }, 1.000000f, 0.656244f );
-    instance->registerEObj( "Shortcut", 2000700, 0, 4, { -57.755428f, 47.653931f, -120.622597f }, 0.991760f,
-                            0.000048f );
-    instance->registerEObj( "sgvf_w_lvd_b0118_5", 2001741, 3860684, 4, { -64.365189f, 15.049010f, -4.720837f },
-                            1.000000f, 0.000000f );
-    // States -> vf_bextwall_on vf_bextwall_of
-    instance->registerEObj( "Exit", 2000139, 0, 4, { -42.771080f, 14.067750f, -17.288521f }, 0.991789f, 0.000144f );
-    instance->registerEObj( "Entrance", 2000182, 4108136, 5, { -57.606178f, 49.507038f, -142.170105f }, 1.000000f,
-                            0.000000f );
-    // States -> vf_lock_on vf_lock_of
+    instance.registerEObj( "Cultistorb", 2000061, 3816929, 4, { -8.115554f, 31.427530f, -15.950320f }, 1.000000f, -1.570451f ); 
+      // States -> vf_beam1_on (id: 10) vf_beam1_off (id: 11) all_off (id: 22) 
+    instance.registerEObj( "Cultistorb_1", 2000062, 3817025, 4, { -22.784361f, 25.526300f, 20.482220f }, 1.000000f, -0.625840f ); 
+      // States -> vf_beam2_off (id: 5) vf_beam2_on (id: 6) all_off (id: 16) 
+    instance.registerEObj( "Sealedbarrier", 2000060, 2065984, 4, { -103.196800f, 16.825590f, 15.152160f }, 0.950000f, -1.044062f ); 
+    instance.registerEObj( "Cultistrosary", 2000057, 0, 4, { -179.952606f, 14.711600f, -4.996500f }, 0.750000f, -1.570796f ); 
+    instance.registerEObj( "Cultistorb_2", 2000063, 3817039, 4, { -89.733833f, 15.701490f, 13.923830f }, 0.991789f, 0.925052f ); 
+      // States -> vf_beam3_off (id: 6) vf_beam3_on (id: 7) all_off (id: 17) 
+    instance.registerEObj( "Cultistorb_3", 2000067, 3817052, 4, { -94.766899f, 15.709600f, 3.820237f }, 1.000000f, 1.227256f ); 
+      // States -> vf_beam3_off (id: 6) vf_beam3_on (id: 7) all_off (id: 17) 
+    instance.registerEObj( "unknown_0", 2000054, 0, 4, { -53.345570f, 49.647820f, -146.799103f }, 0.991760f, 0.000048f ); 
+    instance.registerEObj( "unknown_1", 2001085, 0, 4, { -68.772461f, 15.121640f, -3.860596f }, 0.534058f, 1.095327f ); 
+    instance.registerEObj( "sgvf_w_lvd_b0118", 2001697, 4108043, 4, { 13.157160f, 29.280100f, -7.370761f }, 1.000000f, 0.000000f ); 
+      // States -> vf_bextwall_on (id: 3) vf_bextwall_of (id: 4) 
+    instance.registerEObj( "sgvf_w_lvd_b0118_1", 2001698, 4108046, 4, { -18.524361f, 23.342850f, 42.375740f }, 1.000000f, 0.000000f ); 
+      // States -> vf_bextwall_on (id: 3) vf_bextwall_of (id: 4) 
+    instance.registerEObj( "sgvf_w_lvd_b0118_2", 2001699, 4108055, 4, { 19.811380f, 30.119770f, -20.717630f }, 1.000000f, 0.000000f ); 
+      // States -> vf_bextwall_on (id: 3) vf_bextwall_of (id: 4) 
+    instance.registerEObj( "unknown_2", 2001700, 0, 4, { 19.739401f, 30.119801f, -19.838511f }, 1.000000f, 1.409320f ); 
+    instance.registerEObj( "sgvf_w_lvd_b0118_3", 2001701, 4108071, 4, { -3.087158f, 23.754129f, 40.895020f }, 1.000000f, 0.000000f ); 
+      // States -> vf_bextwall_on (id: 3) vf_bextwall_of (id: 4) 
+    instance.registerEObj( "unknown_3", 2001702, 0, 4, { -3.984208f, 23.754129f, 41.874859f }, 1.000000f, -0.675014f ); 
+    instance.registerEObj( "sgvf_w_lvd_b0118_4", 2001703, 4108078, 4, { -95.779678f, 14.524550f, 45.017761f }, 1.000000f, 0.000000f ); 
+      // States -> vf_bextwall_on (id: 3) vf_bextwall_of (id: 4) 
+    instance.registerEObj( "unknown_4", 2001704, 0, 4, { -97.035683f, 14.524550f, 44.317101f }, 1.000000f, 0.656244f ); 
+    instance.registerEObj( "Shortcut", 2000700, 0, 4, { -57.755428f, 47.653931f, -120.622597f }, 0.991760f, 0.000048f ); 
+    instance.registerEObj( "sgvf_w_lvd_b0118_5", 2001741, 3860684, 4, { -64.377808f, 15.030030f, -4.745544f }, 0.991760f, 0.000048f ); 
+      // States -> vf_bextwall_on (id: 3) vf_bextwall_of (id: 4) 
+    instance.registerEObj( "Exit", 2000139, 0, 4, { -42.771080f, 14.067750f, -17.288521f }, 0.991789f, 0.000144f ); 
+    instance.registerEObj( "Entrance", 2000182, 4108136, 5, { -57.606178f, 49.507038f, -142.170105f }, 1.000000f, 0.000000f ); 
+      // States -> vf_lock_on (id: 11) vf_lock_of (id: 12) 
 
   }
 
-  void onUpdate( InstanceContentPtr instance, uint32_t currTime ) override
+  void onUpdate( InstanceContent& instance, uint32_t currTime ) override
   {
 
   }
 
-  void onEnterTerritory( InstanceContentPtr instance, Entity::Player& player, uint32_t eventId, uint16_t param1,
+  void onEnterTerritory( InstanceContent& instance, Entity::Player& player, uint32_t eventId, uint16_t param1,
                          uint16_t param2 ) override
   {
 
diff --git a/src/scripts/instances/dungeons/TheTamTaraDeepcroftHard.cpp b/src/scripts/instances/dungeons/TheTamTaraDeepcroftHard.cpp
index 8ef64bc5..970ea2e4 100644
--- a/src/scripts/instances/dungeons/TheTamTaraDeepcroftHard.cpp
+++ b/src/scripts/instances/dungeons/TheTamTaraDeepcroftHard.cpp
@@ -9,145 +9,97 @@ class TheTamTaraDeepcroftHard :
 public:
   TheTamTaraDeepcroftHard() :
     Sapphire::ScriptAPI::InstanceContentScript( 24 )
-  {
-  }
+  { }
 
-  void onInit( InstanceContentPtr instance ) override
+  void onInit( InstanceContent& instance ) override
   {
-    instance->registerEObj( "unknown_0", 2001085, 0, 4, { -68.771881f, 15.144450f, -3.840616f }, 0.539465f, 1.095248f );
-    instance->registerEObj( "sgvf_w_lvd_b0118", 2002872, 4660133, 4, { -67.088028f, 14.657070f, -5.210713f }, 1.000000f,
-                            0.000000f );
-    // States -> vf_bextwall_on vf_bextwall_of
-    instance->registerEObj( "unknown_1", 2004286, 4745117, 4, { -60.778740f, 14.055000f, -22.019831f }, 1.000000f,
-                            0.000000f );
-    instance->registerEObj( "unknown_2", 2004287, 4745111, 4, { -42.778549f, 14.055000f, -12.943500f }, 1.000000f,
-                            0.000000f );
-    instance->registerEObj( "unknown_3", 2004288, 4745124, 4, { -48.035992f, 14.055000f, -5.265638f }, 1.000000f,
-                            0.000000f );
-    instance->registerEObj( "unknown_4", 2004289, 4745125, 4, { -57.996319f, 14.055000f, -5.661358f }, 1.000000f,
-                            0.000000f );
-    instance->registerEObj( "unknown_5", 2004290, 4745126, 4, { -59.234348f, 14.055000f, -15.781390f }, 1.000000f,
-                            0.000000f );
-    instance->registerEObj( "unknown_6", 2004291, 4745127, 4, { -50.008671f, 14.055000f, -22.601339f }, 1.000000f,
-                            0.000000f );
-    instance->registerEObj( "sgpl_w_lvd_void01_large", 2004285, 4867481, 4, { -55.031620f, 14.055000f, 5.443754f },
-                            1.000000f, 0.000000f );
-    // States -> vfx_on vfx_off
-    instance->registerEObj( "sgpl_w_lvd_void01_large_1", 2004285, 4867482, 4, { -41.704861f, 14.055000f, 2.969403f },
-                            1.000000f, 0.000000f );
-    // States -> vfx_on vfx_off
-    instance->registerEObj( "sgpl_w_lvd_void01_large_2", 2004285, 4867483, 4, { -33.780270f, 14.055000f, -9.729918f },
-                            1.000000f, 0.000000f );
-    // States -> vfx_on vfx_off
-    instance->registerEObj( "sgpl_w_lvd_void01_large_3", 2004285, 4867484, 4, { -39.301521f, 14.055000f, -26.615370f },
-                            1.000000f, 0.000000f );
-    // States -> vfx_on vfx_off
-    instance->registerEObj( "sgpl_w_lvd_void01_large_4", 2004285, 4867485, 4, { -55.347961f, 14.055000f, -30.450310f },
-                            1.000000f, 0.000000f );
-    // States -> vfx_on vfx_off
-    instance->registerEObj( "sgpl_w_lvd_void01_large_5", 2004285, 4867486, 4, { -65.834686f, 14.055000f, -19.944820f },
-                            1.000000f, 0.000000f );
-    // States -> vfx_on vfx_off
-    instance->registerEObj( "sgvf_w_lvd_b0118_1", 2002872, 4660142, 4, { 19.425310f, 16.400459f, 72.640419f },
-                            1.000000f, 0.000000f );
-    // States -> vf_bextwall_on vf_bextwall_of
-    instance->registerEObj( "sgvf_w_lvd_b0118_2", 2004084, 4660138, 4, { 47.314381f, 16.403030f, 108.679100f },
-                            1.000000f, 0.000000f );
-    // States -> vf_bextwall_on vf_bextwall_of
-    instance->registerEObj( "unknown_7", 2002735, 0, 4, { 20.629601f, 16.280300f, 75.420700f }, 1.000000f, 0.688908f );
-    instance->registerEObj( "unknown_8", 2002735, 0, 4, { 88.048500f, 22.493870f, -21.533701f }, 1.000000f,
-                            -0.001870f );
-    instance->registerEObj( "sgvf_w_lvd_b0118_3", 2002872, 4660145, 4, { 88.376717f, 21.338551f, -19.283840f },
-                            1.000000f, 0.000000f );
-    // States -> vf_bextwall_on vf_bextwall_of
-    instance->registerEObj( "sgpl_w_lvd_void01_large_6", 2004285, 4771300, 4, { 84.103310f, 22.101000f, -58.390091f },
-                            1.000000f, 0.000000f );
-    // States -> vfx_on vfx_off
-    instance->registerEObj( "sgpl_w_lvd_void01_large_7", 2004285, 4771301, 4, { 96.234253f, 22.101000f, -56.482040f },
-                            1.000000f, 0.723667f );
-    // States -> vfx_on vfx_off
-    instance->registerEObj( "sgpl_w_lvd_void01_large_8", 2004285, 4771302, 4, { 105.255798f, 22.101000f, -44.764778f },
-                            1.000000f, 1.518654f );
-    // States -> vfx_on vfx_off
-    instance->registerEObj( "sgpl_w_lvd_void01_large_9", 2004285, 4771303, 4, { 102.038200f, 22.101000f, -32.837021f },
-                            1.000000f, 0.857277f );
-    // States -> vfx_on vfx_off
-    instance->registerEObj( "sgpl_w_lvd_void01_large_10", 2004285, 4771304, 4, { 91.888603f, 22.101000f, -25.882389f },
-                            1.000000f, -0.007381f );
-    // States -> vfx_on vfx_off
-    instance->registerEObj( "sgpl_w_lvd_void01_large_11", 2004285, 4771305, 4, { 80.039169f, 22.101000f, -26.985500f },
-                            1.000000f, -0.690998f );
-    // States -> vfx_on vfx_off
-    instance->registerEObj( "sgpl_w_lvd_void01_large_12", 2004285, 4771306, 4, { 71.290688f, 22.101000f, -37.049461f },
-                            1.000000f, -1.482906f );
-    // States -> vfx_on vfx_off
-    instance->registerEObj( "sgpl_w_lvd_void01_large_13", 2004285, 4771307, 4, { 71.819580f, 22.079769f, -49.945210f },
-                            0.991760f, -0.798114f );
-    // States -> vfx_on vfx_off
-    instance->registerEObj( "Tornfolio", 2004297, 0, 4, { -47.454521f, 44.378349f, -68.195801f }, 0.991760f,
-                            -1.194174f );
-    instance->registerEObj( "Tornfolio_1", 2004298, 0, 4, { -11.833840f, 29.549919f, -15.995260f }, 1.000000f,
-                            1.058869f );
-    instance->registerEObj( "Tornfolio_2", 2004299, 0, 4, { -28.185230f, 24.286421f, 20.665119f }, 0.991760f,
-                            -0.909425f );
-    instance->registerEObj( "Tornfolio_3", 2004300, 0, 4, { 72.129387f, 16.396311f, 132.066803f }, 0.991760f,
-                            0.000048f );
-    instance->registerEObj( "Tornfolio_4", 2004301, 0, 4, { 80.744392f, 16.907101f, 57.719940f }, 1.000000f,
-                            0.000000f );
-    instance->registerEObj( "Tornfolio_5", 2004302, 0, 4, { 147.103104f, 18.005850f, 69.150192f }, 1.000000f,
-                            0.000000f );
-    instance->registerEObj( "Tornfolio_6", 2004303, 0, 4, { -147.644699f, 15.900680f, 113.328697f }, 0.991760f,
-                            0.000048f );
-    instance->registerEObj( "unknown_9", 2004086, 4656964, 4, { -7.602334f, 30.454849f, -18.853220f }, 1.000000f,
-                            0.000000f );
-    instance->registerEObj( "unknown_10", 2004088, 4656965, 4, { -20.840630f, 24.342739f, 19.409069f }, 1.000000f,
-                            0.000000f );
-    instance->registerEObj( "sgbg_f1d6_lvd_barr1", 2004087, 4671678, 4, { 11.105700f, 29.275560f, -8.141251f },
-                            1.000000f, 0.000000f );
-    // States -> vfx_on vfx_off
-    instance->registerEObj( "sgbg_f1d6_barr2", 2004089, 4671683, 4, { -6.673915f, 23.630680f, 39.042259f }, 1.000000f,
-                            0.000000f );
-    // States -> vfx_on vfx_off
-    instance->registerEObj( "sgbg_f1d6_barr1", 2004093, 4671679, 4, { 74.836761f, 16.445829f, 108.252800f }, 1.000000f,
-                            0.000000f );
-    // States -> vfx_on vfx_off
-    instance->registerEObj( "sgbg_f1d6_barr1_1", 2004094, 4671680, 4, { 100.083900f, 17.257870f, 47.440189f },
-                            0.991760f, 0.000048f );
-    // States -> vfx_on vfx_off
-    instance->registerEObj( "Defiledcoffin", 2004090, 4695648, 4, { 78.676689f, 17.793221f, 150.248901f }, 1.000000f,
-                            0.000000f );
-    // States -> vf_moya_on vf_moya_off vf_moya_off2
-    instance->registerEObj( "Defiledcoffin_1", 2004091, 4671204, 4, { 72.424454f, 18.387079f, 48.386349f }, 0.991760f,
-                            0.000048f );
-    // States -> vf_moya_on vf_moya_off vf_moya_off2
-    instance->registerEObj( "Defiledcoffin_2", 2004092, 4668899, 4, { 146.684906f, 17.990360f, 69.562866f }, 0.991760f,
-                            0.000048f );
-    // States -> vf_moya_on vf_moya_off vf_moya_off2
-    instance->registerEObj( "Aetherialflow", 2004095, 4696055, 4, { 96.409500f, 22.100000f, -49.506569f }, 1.000000f,
-                            0.000000f );
-    instance->registerEObj( "unknown_11", 2004099, 0, 4, { -85.344437f, 15.048210f, 7.188452f }, 1.000000f, 0.000000f );
-    instance->registerEObj( "unknown_12", 2004096, 4656966, 4, { -89.972237f, 14.236630f, 16.250851f }, 0.991760f,
-                            0.000048f );
-    instance->registerEObj( "unknown_13", 2004097, 4656967, 4, { -97.824608f, 14.083040f, 2.446555f }, 1.000000f,
-                            0.000000f );
-    instance->registerEObj( "sgvf_f1b6_b0446", 2004098, 4660132, 4, { -89.234444f, 13.859010f, 8.573526f }, 1.000000f,
-                            0.000000f );
-    // States -> mayu_on mayu_off mayu_off_anim
-    instance->registerEObj( "Exit", 2000139, 0, 4, { -42.771080f, 14.067750f, -17.288521f }, 0.991789f, 0.000144f );
-    instance->registerEObj( "Entrance", 2000182, 4660224, 5, { -57.606178f, 49.507038f, -142.170105f }, 1.000000f,
-                            0.000000f );
-    // States -> vf_lock_on vf_lock_of
-    instance->registerEObj( "Shortcut", 2000700, 0, 4, { -57.755428f, 47.653931f, -120.622597f }, 0.991760f,
-                            0.000048f );
+    instance.registerEObj( "unknown_0", 2001085, 0, 4, { -68.771881f, 15.144450f, -3.840616f }, 0.539465f, 1.095248f ); 
+    instance.registerEObj( "sgvf_w_lvd_b0118", 2002872, 4660133, 4, { -67.088028f, 14.657070f, -5.210713f }, 1.000000f, 0.000000f ); 
+      // States -> vf_bextwall_on (id: 3) vf_bextwall_of (id: 4) 
+    instance.registerEObj( "unknown_1", 2004286, 4745117, 4, { -60.778740f, 14.055000f, -22.019831f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_2", 2004287, 4745111, 4, { -42.778549f, 14.055000f, -12.943500f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_3", 2004288, 4745124, 4, { -48.035992f, 14.055000f, -5.265638f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_4", 2004289, 4745125, 4, { -57.996319f, 14.055000f, -5.661358f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_5", 2004290, 4745126, 4, { -59.234348f, 14.055000f, -15.781390f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_6", 2004291, 4745127, 4, { -50.008671f, 14.055000f, -22.601339f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "sgpl_w_lvd_void01_large", 2004285, 4867481, 4, { -55.031620f, 14.055000f, 5.443754f }, 1.000000f, 0.000000f ); 
+      // States -> vfx_on (id: 47) vfx_off (id: 48) 
+    instance.registerEObj( "sgpl_w_lvd_void01_large_1", 2004285, 4867482, 4, { -41.704861f, 14.055000f, 2.969403f }, 1.000000f, 0.000000f ); 
+      // States -> vfx_on (id: 47) vfx_off (id: 48) 
+    instance.registerEObj( "sgpl_w_lvd_void01_large_2", 2004285, 4867483, 4, { -33.780270f, 14.055000f, -9.729918f }, 1.000000f, 0.000000f ); 
+      // States -> vfx_on (id: 47) vfx_off (id: 48) 
+    instance.registerEObj( "sgpl_w_lvd_void01_large_3", 2004285, 4867484, 4, { -39.301521f, 14.055000f, -26.615370f }, 1.000000f, 0.000000f ); 
+      // States -> vfx_on (id: 47) vfx_off (id: 48) 
+    instance.registerEObj( "sgpl_w_lvd_void01_large_4", 2004285, 4867485, 4, { -55.347961f, 14.055000f, -30.450310f }, 1.000000f, 0.000000f ); 
+      // States -> vfx_on (id: 47) vfx_off (id: 48) 
+    instance.registerEObj( "sgpl_w_lvd_void01_large_5", 2004285, 4867486, 4, { -65.834686f, 14.055000f, -19.944820f }, 1.000000f, 0.000000f ); 
+      // States -> vfx_on (id: 47) vfx_off (id: 48) 
+    instance.registerEObj( "sgvf_w_lvd_b0118_1", 2002872, 4660142, 4, { 19.425310f, 16.400459f, 72.640419f }, 1.000000f, 0.000000f ); 
+      // States -> vf_bextwall_on (id: 3) vf_bextwall_of (id: 4) 
+    instance.registerEObj( "sgvf_w_lvd_b0118_2", 2004084, 4660138, 4, { 47.314381f, 16.403030f, 108.679100f }, 1.000000f, 0.000000f ); 
+      // States -> vf_bextwall_on (id: 3) vf_bextwall_of (id: 4) 
+    instance.registerEObj( "unknown_7", 2002735, 0, 4, { 20.629601f, 16.280300f, 75.420700f }, 1.000000f, 0.688908f ); 
+    instance.registerEObj( "unknown_8", 2002735, 0, 4, { 88.048500f, 22.493870f, -21.533701f }, 1.000000f, -0.001870f ); 
+    instance.registerEObj( "sgvf_w_lvd_b0118_3", 2002872, 4660145, 4, { 88.376717f, 21.338551f, -19.283840f }, 1.000000f, 0.000000f ); 
+      // States -> vf_bextwall_on (id: 3) vf_bextwall_of (id: 4) 
+    instance.registerEObj( "sgpl_w_lvd_void01_large_6", 2004285, 4771300, 4, { 84.103310f, 22.101000f, -58.390091f }, 1.000000f, 0.000000f ); 
+      // States -> vfx_on (id: 47) vfx_off (id: 48) 
+    instance.registerEObj( "sgpl_w_lvd_void01_large_7", 2004285, 4771301, 4, { 96.234253f, 22.101000f, -56.482040f }, 1.000000f, 0.723667f ); 
+      // States -> vfx_on (id: 47) vfx_off (id: 48) 
+    instance.registerEObj( "sgpl_w_lvd_void01_large_8", 2004285, 4771302, 4, { 105.255798f, 22.101000f, -44.764778f }, 1.000000f, 1.518654f ); 
+      // States -> vfx_on (id: 47) vfx_off (id: 48) 
+    instance.registerEObj( "sgpl_w_lvd_void01_large_9", 2004285, 4771303, 4, { 102.038200f, 22.101000f, -32.837021f }, 1.000000f, 0.857277f ); 
+      // States -> vfx_on (id: 47) vfx_off (id: 48) 
+    instance.registerEObj( "sgpl_w_lvd_void01_large_10", 2004285, 4771304, 4, { 91.888603f, 22.101000f, -25.882389f }, 1.000000f, -0.007381f ); 
+      // States -> vfx_on (id: 47) vfx_off (id: 48) 
+    instance.registerEObj( "sgpl_w_lvd_void01_large_11", 2004285, 4771305, 4, { 80.039169f, 22.101000f, -26.985500f }, 1.000000f, -0.690998f ); 
+      // States -> vfx_on (id: 47) vfx_off (id: 48) 
+    instance.registerEObj( "sgpl_w_lvd_void01_large_12", 2004285, 4771306, 4, { 71.290688f, 22.101000f, -37.049461f }, 1.000000f, -1.482906f ); 
+      // States -> vfx_on (id: 47) vfx_off (id: 48) 
+    instance.registerEObj( "sgpl_w_lvd_void01_large_13", 2004285, 4771307, 4, { 71.819580f, 22.079769f, -49.945210f }, 0.991760f, -0.798114f ); 
+      // States -> vfx_on (id: 47) vfx_off (id: 48) 
+    instance.registerEObj( "Tornfolio", 2004297, 0, 4, { -47.454521f, 44.378349f, -68.195801f }, 0.991760f, -1.194174f ); 
+    instance.registerEObj( "Tornfolio_1", 2004298, 0, 4, { -11.833840f, 29.549919f, -15.995260f }, 1.000000f, 1.058869f ); 
+    instance.registerEObj( "Tornfolio_2", 2004299, 0, 4, { -28.185230f, 24.286421f, 20.665119f }, 0.991760f, -0.909425f ); 
+    instance.registerEObj( "Tornfolio_3", 2004300, 0, 4, { 72.129387f, 16.396311f, 132.066803f }, 0.991760f, 0.000048f ); 
+    instance.registerEObj( "Tornfolio_4", 2004301, 0, 4, { 80.744392f, 16.907101f, 57.719940f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "Tornfolio_5", 2004302, 0, 4, { 147.103104f, 18.005850f, 69.150192f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "Tornfolio_6", 2004303, 0, 4, { -147.644699f, 15.900680f, 113.328697f }, 0.991760f, 0.000048f ); 
+    instance.registerEObj( "unknown_9", 2004086, 4656964, 4, { -7.602334f, 30.454849f, -18.853220f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_10", 2004088, 4656965, 4, { -20.840630f, 24.342739f, 19.409069f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "sgbg_f1d6_lvd_barr1", 2004087, 4671678, 4, { 11.105700f, 29.275560f, -8.141251f }, 1.000000f, 0.000000f ); 
+      // States -> vfx_on (id: 4) vfx_off (id: 5) 
+    instance.registerEObj( "sgbg_f1d6_barr2", 2004089, 4671683, 4, { -6.673915f, 23.630680f, 39.042259f }, 1.000000f, 0.000000f ); 
+      // States -> vfx_on (id: 5) vfx_off (id: 6) 
+    instance.registerEObj( "sgbg_f1d6_barr1", 2004093, 4671679, 4, { 74.836761f, 16.445829f, 108.252800f }, 1.000000f, 0.000000f ); 
+      // States -> vfx_on (id: 4) vfx_off (id: 5) 
+    instance.registerEObj( "sgbg_f1d6_barr1_1", 2004094, 4671680, 4, { 100.083900f, 17.257870f, 47.440189f }, 0.991760f, 0.000048f ); 
+      // States -> vfx_on (id: 4) vfx_off (id: 5) 
+    instance.registerEObj( "Defiledcoffin", 2004090, 4695648, 4, { 78.676689f, 17.793221f, 150.248901f }, 1.000000f, 0.000000f ); 
+      // States -> vf_moya_on (id: 3) vf_moya_off (id: 5) vf_moya_off2 (id: 6) 
+    instance.registerEObj( "Defiledcoffin_1", 2004091, 4671204, 4, { 72.424454f, 18.387079f, 48.386349f }, 0.991760f, 0.000048f ); 
+      // States -> vf_moya_on (id: 3) vf_moya_off (id: 5) vf_moya_off2 (id: 6) 
+    instance.registerEObj( "Defiledcoffin_2", 2004092, 4668899, 4, { 146.684906f, 17.990360f, 69.562866f }, 0.991760f, 0.000048f ); 
+      // States -> vf_moya_on (id: 3) vf_moya_off (id: 5) vf_moya_off2 (id: 6) 
+    instance.registerEObj( "Aetherialflow", 2004095, 4696055, 4, { 96.409500f, 22.100000f, -49.506569f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_11", 2004099, 0, 4, { -85.344437f, 15.048210f, 7.188452f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_12", 2004096, 4656966, 4, { -89.972237f, 14.236630f, 16.250851f }, 0.991760f, 0.000048f ); 
+    instance.registerEObj( "unknown_13", 2004097, 4656967, 4, { -97.824608f, 14.083040f, 2.446555f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "sgvf_f1b6_b0446", 2004098, 4660132, 4, { -89.234444f, 13.859010f, 8.573526f }, 1.000000f, 0.000000f ); 
+      // States -> mayu_on (id: 2) mayu_off (id: 3) mayu_off_anim (id: 4) 
+    instance.registerEObj( "Exit", 2000139, 0, 4, { -42.771080f, 14.067750f, -17.288521f }, 0.991789f, 0.000144f ); 
+    instance.registerEObj( "Entrance", 2000182, 4660224, 5, { -57.606178f, 49.507038f, -142.170105f }, 1.000000f, 0.000000f ); 
+      // States -> vf_lock_on (id: 11) vf_lock_of (id: 12) 
+    instance.registerEObj( "Shortcut", 2000700, 0, 4, { -57.755428f, 47.653931f, -120.622597f }, 0.991760f, 0.000048f ); 
 
   }
 
-  void onUpdate( InstanceContentPtr instance, uint32_t currTime ) override
+  void onUpdate( InstanceContent& instance, uint32_t currTime ) override
   {
 
   }
 
-  void onEnterTerritory( InstanceContentPtr instance, Entity::Player& player, uint32_t eventId, uint16_t param1,
+  void onEnterTerritory( InstanceContent& instance, Entity::Player& player, uint32_t eventId, uint16_t param1,
                          uint16_t param2 ) override
   {
 
diff --git a/src/scripts/instances/dungeons/TheTempleoftheFist.cpp b/src/scripts/instances/dungeons/TheTempleoftheFist.cpp
index 4702fa01..8e06a2f3 100644
--- a/src/scripts/instances/dungeons/TheTempleoftheFist.cpp
+++ b/src/scripts/instances/dungeons/TheTempleoftheFist.cpp
@@ -9,20 +9,62 @@ class TheTempleoftheFist :
 public:
   TheTempleoftheFist() :
     Sapphire::ScriptAPI::InstanceContentScript( 51 )
+  { }
+
+  void onInit( InstanceContent& instance ) override
   {
+    instance.registerEObj( "unknown_0", 2002735, 0, 4, { 423.422485f, 65.445923f, 441.737213f }, 0.991760f, 0.000048f ); 
+    instance.registerEObj( "sgvf_w_lvd_b0118", 2002872, 6797376, 4, { 423.331299f, 65.474983f, 444.327301f }, 1.000000f, 0.000000f ); 
+      // States -> vf_bextwall_on (id: 3) vf_bextwall_of (id: 4) 
+    instance.registerEObj( "sgvf_w_lvd_b0118_1", 2002872, 6797378, 4, { 442.370697f, 65.474983f, 460.851013f }, 1.000000f, 0.000000f ); 
+      // States -> vf_bextwall_on (id: 3) vf_bextwall_of (id: 4) 
+    instance.registerEObj( "unknown_1", 2002735, 0, 4, { -249.873398f, 296.000000f, -77.899078f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "sgvf_w_lvd_b0118_2", 2002872, 6797503, 4, { -249.992004f, 296.000000f, -75.599426f }, 1.000000f, 0.000000f ); 
+      // States -> vf_bextwall_on (id: 3) vf_bextwall_of (id: 4) 
+    instance.registerEObj( "sgvf_w_lvd_b0118_3", 2002872, 6797504, 4, { -250.001602f, 296.000000f, -116.498398f }, 1.000000f, 0.000000f ); 
+      // States -> vf_bextwall_on (id: 3) vf_bextwall_of (id: 4) 
+    instance.registerEObj( "unknown_2", 2008209, 6769836, 4, { -249.829300f, 296.000000f, -95.249687f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_3", 2002735, 0, 4, { -249.652893f, 275.999908f, -441.789886f }, 0.991760f, 0.000048f ); 
+    instance.registerEObj( "sgvf_w_lvd_b0118_4", 2002872, 6797511, 4, { -249.766495f, 275.999603f, -438.543091f }, 1.000000f, 0.000000f ); 
+      // States -> vf_bextwall_on (id: 3) vf_bextwall_of (id: 4) 
+    instance.registerEObj( "Shortcut", 2000700, 0, 4, { 380.357208f, 48.477909f, 199.450607f }, 0.991760f, 0.000048f ); 
+    instance.registerEObj( "Entrance", 2000182, 6797015, 5, { 384.232910f, 48.477909f, 190.203598f }, 0.991760f, 0.000048f ); 
+      // States -> vf_lock_on (id: 11) vf_lock_of (id: 12) 
+    instance.registerEObj( "Exit", 2000139, 0, 4, { -250.049606f, 275.999908f, -476.951202f }, 0.991760f, 0.000048f ); 
+    instance.registerEObj( "unknown_4", 2007880, 6741864, 4, { 336.278503f, 53.817650f, 313.365601f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_5", 2007881, 6653501, 4, { 424.189697f, 65.474983f, 415.504608f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_6", 2007882, 6797118, 4, { 339.809296f, 54.757198f, 321.431305f }, 0.991760f, 0.000048f ); 
+    instance.registerEObj( "unknown_7", 2007883, 6742023, 4, { 363.048401f, 59.017422f, 336.516998f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_8", 2007884, 6742029, 4, { 377.123596f, 62.271931f, 343.185791f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_9", 2007885, 6797120, 4, { 384.602997f, 66.764778f, 371.233795f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_10", 2007886, 6797121, 4, { 410.327301f, 66.278519f, 376.253693f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_11", 2007887, 6797122, 4, { 424.830414f, 66.366417f, 401.730988f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_12", 2007888, 6765334, 4, { -344.965302f, 288.858490f, 3.678721f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_13", 2007889, 6779339, 4, { -250.141205f, 295.979187f, -44.449520f }, 0.991760f, 0.000048f ); 
+    instance.registerEObj( "unknown_14", 2008288, 6852038, 4, { -371.378693f, 270.328491f, 112.430801f }, 0.991760f, 0.000048f ); 
+    instance.registerEObj( "unknown_15", 2008288, 6852040, 4, { -371.275787f, 270.243988f, 109.578796f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_16", 2008288, 6852041, 4, { -370.932190f, 270.135010f, 106.583000f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_17", 2008288, 6852045, 4, { -371.375702f, 270.360413f, 99.153847f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_18", 2008288, 6852043, 4, { -370.707001f, 270.230713f, 95.389702f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_19", 2008288, 6852044, 4, { -370.509613f, 270.239685f, 92.297852f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_20", 2008288, 6773554, 4, { -365.927399f, 288.163910f, 5.884438f }, 0.991760f, 0.000048f ); 
+    instance.registerEObj( "unknown_21", 2008288, 6852047, 4, { -362.804993f, 288.071808f, 5.945870f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_22", 2008288, 6852048, 4, { -359.589600f, 287.859314f, 5.824460f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_23", 2008288, 6852051, 4, { -352.795807f, 287.719910f, 5.701195f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_24", 2008288, 6852050, 4, { -349.930786f, 287.818604f, 5.373718f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_25", 2008288, 6852052, 4, { -346.784210f, 287.961914f, 5.057184f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_26", 2007890, 6796543, 4, { -226.703293f, 299.977112f, -260.456207f }, 0.991760f, 0.000048f ); 
+    instance.registerEObj( "unknown_27", 2007891, 6796598, 4, { -250.507401f, 292.000000f, -384.725800f }, 0.991760f, 0.000048f ); 
+    instance.registerEObj( "unknown_28", 2007892, 6771621, 4, { -250.875107f, 292.000000f, -436.964691f }, 1.000000f, 0.000000f ); 
+
   }
 
-  void onInit( InstanceContentPtr instance ) override
+  void onUpdate( InstanceContent& instance, uint32_t currTime ) override
   {
 
   }
 
-  void onUpdate( InstanceContentPtr instance, uint32_t currTime ) override
-  {
-
-  }
-
-  void onEnterTerritory( InstanceContentPtr instance, Entity::Player& player, uint32_t eventId, uint16_t param1,
+  void onEnterTerritory( InstanceContent& instance, Entity::Player& player, uint32_t eventId, uint16_t param1,
                          uint16_t param2 ) override
   {
 
diff --git a/src/scripts/instances/dungeons/TheThousandMawsofTotoRak.cpp b/src/scripts/instances/dungeons/TheThousandMawsofTotoRak.cpp
index eeb6c6e3..25d257ef 100644
--- a/src/scripts/instances/dungeons/TheThousandMawsofTotoRak.cpp
+++ b/src/scripts/instances/dungeons/TheThousandMawsofTotoRak.cpp
@@ -9,121 +9,72 @@ class TheThousandMawsofTotoRak :
 public:
   TheThousandMawsofTotoRak() :
     Sapphire::ScriptAPI::InstanceContentScript( 1 )
-  {
-  }
+  { }
 
-  void onInit( InstanceContentPtr instance ) override
+  void onInit( InstanceContent& instance ) override
   {
-    instance->registerEObj( "unknown_0", 2000404, 0, 4, { 216.937500f, -35.568851f, -142.076797f }, 0.961304f,
-                            0.000144f );
-    instance->registerEObj( "unknown_1", 2000133, 0, 4, { 185.564896f, -34.195511f, -144.640305f }, 0.900235f,
-                            0.000336f );
-    instance->registerEObj( "Exit", 2000683, 0, 4, { 237.565506f, -38.900299f, -144.195099f }, 1.000000f, 0.000048f );
-    instance->registerEObj( "sgvf_w_lvd_b0118", 2000041, 3879345, 4, { 191.261795f, -36.122822f, -143.910904f },
-                            1.267374f, -1.570451f );
-    // States -> vf_bextwall_on vf_bextwall_of
-    instance->registerEObj( "unknown_2", 2000040, 0, 4, { 191.150696f, -36.117340f, -144.592300f }, 1.000000f,
-                            -1.570451f );
-    instance->registerEObj( "unknown_3", 2001005, 0, 4, { 188.864594f, -35.987011f, -144.216095f }, 1.000000f,
-                            0.000000f );
-    instance->registerEObj( "sgpl_f1r1_subboss1line", 2000131, 4126014, 4, { -117.593002f, -4.171226f, 107.608299f },
-                            0.991760f, 0.000048f );
-    instance->registerEObj( "sgpl_f1r1_subboss2line", 2000132, 4127292, 4, { -76.504066f, -8.171217f, -41.161350f },
-                            1.000000f, 0.000000f );
-    instance->registerEObj( "sgpl_f1r1_subboss1wall", 2000137, 4127387, 4, { -119.798599f, -4.165526f, 104.508904f },
-                            0.991760f, 0.000048f );
-    // States -> vf_bextwall_on vf_bextwall_of
-    instance->registerEObj( "sgpl_f1r1_subboss2wall", 2000138, 4127414, 4, { -78.310173f, -8.133030f, -44.002850f },
-                            1.000000f, 0.000000f );
-    instance->registerEObj( "sgpl_f1r1_bossplusfloor", 2001152, 4374098, 4, { 197.405899f, -39.475101f, -147.966705f },
-                            0.991760f, 0.000048f );
-    instance->registerEObj( "Waterstainednote", 2000093, 0, 4, { -241.596100f, 4.936373f, -72.770317f }, 0.930753f,
-                            0.000240f );
-    instance->registerEObj( "Waterstainednote_1", 2000094, 0, 4, { -211.121002f, 2.082635f, -67.117737f }, 0.991789f,
-                            0.000048f );
-    instance->registerEObj( "Waterstainednote_2", 2000095, 0, 4, { -204.427002f, -1.617569f, 21.831829f }, 1.000000f,
-                            0.000000f );
-    instance->registerEObj( "Waterstainednote_3", 2000096, 0, 4, { -149.074097f, -2.569309f, 101.795403f }, 0.930753f,
-                            0.000240f );
-    instance->registerEObj( "Magitekphotocell", 2000100, 0, 4, { -202.105804f, 0.318934f, -79.179108f }, 0.991789f,
-                            0.000048f );
-    instance->registerEObj( "Magitekphotocell_1", 2000101, 0, 4, { -221.659195f, -4.425579f, 54.985451f }, 0.869717f,
-                            0.000432f );
-    instance->registerEObj( "Magitekphotocell_2", 2000102, 0, 4, { -204.699799f, -4.926546f, 88.822723f }, 0.900235f,
-                            0.000336f );
-    instance->registerEObj( "Magitekphotocell_3", 2000103, 0, 4, { -104.023300f, -3.463795f, 104.075897f }, 0.839199f,
-                            0.000527f );
-    instance->registerEObj( "Magitekterminal", 2000116, 0, 4, { -112.013199f, -4.132327f, 112.031403f }, 0.991789f,
-                            0.000048f );
-    instance->registerEObj( "unknown_4", 2000117, 1699196, 4, { -95.990372f, -4.125101f, 111.985901f }, 0.991789f,
-                            0.000048f );
-    instance->registerEObj( "Magitekterminal_1", 2000118, 0, 4, { -80.026077f, -8.132326f, -47.971760f }, 0.961271f,
-                            0.000144f );
-    instance->registerEObj( "unknown_5", 2000121, 1699201, 4, { -95.538803f, -8.133920f, -48.020191f }, 0.991789f,
-                            0.000048f );
-    instance->registerEObj( "Accusationchamberdoor", 2000384, 3302267, 4, { -207.996994f, 0.110343f, -95.749359f },
-                            0.961271f, 0.000144f );
-    instance->registerEObj( "Abacinationchamberdoor", 2000385, 3302270, 4, { 96.210892f, -19.927860f, -112.002098f },
-                            0.961271f, 0.000144f );
-    instance->registerEObj( "unknown_6", 2000389, 3302276, 4, { -223.993698f, 2.170142f, -111.314598f }, 0.900235f,
-                            0.000336f );
-    instance->registerEObj( "unknown_7", 2000390, 3302281, 4, { 15.396310f, -12.161490f, -31.967699f }, 0.961271f,
-                            0.000144f );
-    instance->registerEObj( "unknown_8", 2000391, 3302277, 4, { -111.986000f, -11.694670f, -63.677799f }, 0.961271f,
-                            0.000144f );
-    instance->registerEObj( "unknown_9", 2000392, 3302279, 4, { -54.326931f, -12.619540f, -135.517899f }, 1.000000f,
-                            0.000000f );
-    instance->registerEObj( "unknown_10", 2000393, 3302283, 4, { 127.918297f, -24.124969f, -112.616798f }, 1.000000f,
-                            0.000000f );
-    instance->registerEObj( "unknown_11", 2000397, 3302282, 4, { -66.330208f, -8.057444f, -48.020191f }, 0.961271f,
-                            0.000144f );
-    instance->registerEObj( "unknown_12", 2000398, 3302278, 4, { -103.188698f, -12.587360f, -137.701004f }, 0.991789f,
-                            0.000048f );
-    instance->registerEObj( "unknown_13", 2000399, 3302280, 4, { -7.119315f, -12.783910f, -137.865402f }, 1.000000f,
-                            0.000000f );
-    instance->registerEObj( "unknown_14", 2000400, 3302275, 4, { 175.723206f, -34.137970f, -140.074005f }, 0.930753f,
-                            0.000240f );
-    instance->registerEObj( "Magitekphotocell_4", 2000104, 0, 4, { -130.358597f, -8.977930f, -71.240982f }, 0.991760f,
-                            0.000048f );
-    instance->registerEObj( "unknown_15", 2000111, 0, 4, { -221.057495f, -0.076355f, -113.847603f }, 0.991760f,
-                            0.000048f );
-    instance->registerEObj( "unknown_16", 2000112, 0, 4, { 18.393040f, -12.250300f, -28.183680f }, 1.000000f,
-                            0.000000f );
-    instance->registerEObj( "unknown_17", 2000113, 0, 4, { -109.852501f, -11.441870f, -58.962391f }, 1.000000f,
-                            0.000000f );
-    instance->registerEObj( "unknown_18", 2000114, 0, 4, { -55.111301f, -12.534730f, -140.141006f }, 1.000000f,
-                            0.000000f );
-    instance->registerEObj( "unknown_19", 2000115, 0, 4, { 121.910698f, -23.325809f, -110.515297f }, 1.000000f,
-                            0.000000f );
-    instance->registerEObj( "Magitekphotocell_5", 2000105, 0, 4, { -130.724106f, -9.414856f, -68.131592f }, 0.991760f,
-                            0.000048f );
-    instance->registerEObj( "Magitekphotocell_6", 2000106, 0, 4, { -130.418900f, -9.567444f, -67.856873f }, 0.991760f,
-                            0.000048f );
-    instance->registerEObj( "Magitekphotocell_7", 2000107, 0, 4, { -130.101807f, -9.739193f, -67.526657f }, 0.991789f,
-                            0.000048f );
-    instance->registerEObj( "Magitekphotocell_8", 2000107, 0, 4, { -129.796707f, -9.914070f, -67.221481f }, 0.991789f,
-                            0.000048f );
-    instance->registerEObj( "Magitekphotocell_9", 2000039, 0, 4, { -73.754570f, -6.333896f, 21.536640f }, 0.991789f,
-                            0.000048f );
-    instance->registerEObj( "Magitekphotocell_10", 2000108, 0, 4, { -186.655807f, -0.160111f, -10.531350f }, 1.000000f,
-                            0.000000f );
-    instance->registerEObj( "Magitekphotocell_11", 2000109, 0, 4, { -143.922195f, 0.079653f, 1.801933f }, 0.961271f,
-                            0.000144f );
-    instance->registerEObj( "Magitekphotocell_12", 2000110, 0, 4, { -233.539398f, -0.167908f, -103.013702f }, 0.991760f,
-                            0.000048f );
-    instance->registerEObj( "Shortcut", 2000700, 0, 4, { -311.485504f, 9.496978f, -76.989082f }, 0.991760f, 0.000048f );
-    instance->registerEObj( "Entrance", 2000182, 4127435, 5, { -322.238495f, 11.991770f, -78.470192f }, 0.991760f,
-                            0.000048f );
-    // States -> vf_lock_on vf_lock_of
+    instance.registerEObj( "unknown_0", 2000404, 0, 4, { 216.937500f, -35.568851f, -142.076797f }, 0.961304f, 0.000144f ); 
+    instance.registerEObj( "unknown_1", 2000133, 0, 4, { 185.564896f, -34.195511f, -144.640305f }, 0.900235f, 0.000336f ); 
+    instance.registerEObj( "Exit", 2000683, 0, 4, { 237.565506f, -38.900299f, -144.195099f }, 1.000000f, 0.000048f ); 
+    instance.registerEObj( "sgvf_w_lvd_b0118", 2000041, 3879345, 4, { 191.261795f, -36.122822f, -143.910904f }, 1.267374f, -1.570451f ); 
+      // States -> vf_bextwall_on (id: 3) vf_bextwall_of (id: 4) 
+    instance.registerEObj( "unknown_2", 2000040, 0, 4, { 191.150696f, -36.117340f, -144.592300f }, 1.000000f, -1.570451f ); 
+    instance.registerEObj( "unknown_3", 2001005, 0, 4, { 188.864594f, -35.987011f, -144.216095f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "sgpl_f1r1_subboss1line", 2000131, 4126014, 4, { -117.593002f, -4.171226f, 107.608299f }, 0.991760f, 0.000048f ); 
+    instance.registerEObj( "sgpl_f1r1_subboss2line", 2000132, 4127292, 4, { -76.504066f, -8.171217f, -41.161350f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "sgpl_f1r1_subboss1wall", 2000137, 4127387, 4, { -119.798599f, -4.165526f, 104.508904f }, 0.991760f, 0.000048f ); 
+      // States -> vf_bextwall_on (id: 3) vf_bextwall_of (id: 4) 
+    instance.registerEObj( "sgpl_f1r1_subboss2wall", 2000138, 4127414, 4, { -78.310173f, -8.133030f, -44.002850f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "sgpl_f1r1_bossplusfloor", 2001152, 4374098, 4, { 197.405899f, -39.475101f, -147.966705f }, 0.991760f, 0.000048f ); 
+    instance.registerEObj( "Waterstainednote", 2000093, 0, 4, { -241.596100f, 4.936373f, -72.770317f }, 0.930753f, 0.000240f ); 
+    instance.registerEObj( "Waterstainednote_1", 2000094, 0, 4, { -211.121002f, 2.082635f, -67.117737f }, 0.991789f, 0.000048f ); 
+    instance.registerEObj( "Waterstainednote_2", 2000095, 0, 4, { -204.427002f, -1.617569f, 21.831829f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "Waterstainednote_3", 2000096, 0, 4, { -149.074097f, -2.569309f, 101.795403f }, 0.930753f, 0.000240f ); 
+    instance.registerEObj( "Magitekphotocell", 2000100, 0, 4, { -202.105804f, 0.318934f, -79.179108f }, 0.991789f, 0.000048f ); 
+    instance.registerEObj( "Magitekphotocell_1", 2000101, 0, 4, { -221.659195f, -4.425579f, 54.985451f }, 0.869717f, 0.000432f ); 
+    instance.registerEObj( "Magitekphotocell_2", 2000102, 0, 4, { -204.699799f, -4.926546f, 88.822723f }, 0.900235f, 0.000336f ); 
+    instance.registerEObj( "Magitekphotocell_3", 2000103, 0, 4, { -104.023300f, -3.463795f, 104.075897f }, 0.839199f, 0.000527f ); 
+    instance.registerEObj( "Magitekterminal", 2000116, 0, 4, { -112.013199f, -4.132327f, 112.031403f }, 0.991789f, 0.000048f ); 
+    instance.registerEObj( "unknown_4", 2000117, 1699196, 4, { -95.990372f, -4.125101f, 111.985901f }, 0.991789f, 0.000048f ); 
+    instance.registerEObj( "Magitekterminal_1", 2000118, 0, 4, { -80.026077f, -8.132326f, -47.971760f }, 0.961271f, 0.000144f ); 
+    instance.registerEObj( "unknown_5", 2000121, 1699201, 4, { -95.538803f, -8.133920f, -48.020191f }, 0.991789f, 0.000048f ); 
+    instance.registerEObj( "Accusationchamberdoor", 2000384, 3302267, 4, { -207.996994f, 0.110343f, -95.749359f }, 0.961271f, 0.000144f ); 
+    instance.registerEObj( "Abacinationchamberdoor", 2000385, 3302270, 4, { 96.210892f, -19.927860f, -112.002098f }, 0.961271f, 0.000144f ); 
+    instance.registerEObj( "unknown_6", 2000389, 3302276, 4, { -223.993698f, 2.170142f, -111.314598f }, 0.900235f, 0.000336f ); 
+    instance.registerEObj( "unknown_7", 2000390, 3302281, 4, { 15.396310f, -12.161490f, -31.967699f }, 0.961271f, 0.000144f ); 
+    instance.registerEObj( "unknown_8", 2000391, 3302277, 4, { -111.986000f, -11.694670f, -63.677799f }, 0.961271f, 0.000144f ); 
+    instance.registerEObj( "unknown_9", 2000392, 3302279, 4, { -54.326931f, -12.619540f, -135.517899f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_10", 2000393, 3302283, 4, { 127.918297f, -24.124969f, -112.616798f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_11", 2000397, 3302282, 4, { -66.330208f, -8.057444f, -48.020191f }, 0.961271f, 0.000144f ); 
+    instance.registerEObj( "unknown_12", 2000398, 3302278, 4, { -103.188698f, -12.587360f, -137.701004f }, 0.991789f, 0.000048f ); 
+    instance.registerEObj( "unknown_13", 2000399, 3302280, 4, { -7.119315f, -12.783910f, -137.865402f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_14", 2000400, 3302275, 4, { 175.723206f, -34.137970f, -140.074005f }, 0.930753f, 0.000240f ); 
+    instance.registerEObj( "Magitekphotocell_4", 2000104, 0, 4, { -130.358597f, -8.977930f, -71.240982f }, 0.991760f, 0.000048f ); 
+    instance.registerEObj( "unknown_15", 2000111, 0, 4, { -221.057495f, -0.076355f, -113.847603f }, 0.991760f, 0.000048f ); 
+    instance.registerEObj( "unknown_16", 2000112, 0, 4, { 18.393040f, -12.250300f, -28.183680f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_17", 2000113, 0, 4, { -109.852501f, -11.441870f, -58.962391f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_18", 2000114, 0, 4, { -55.111301f, -12.534730f, -140.141006f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_19", 2000115, 0, 4, { 121.910698f, -23.325809f, -110.515297f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "Magitekphotocell_5", 2000105, 0, 4, { -130.724106f, -9.414856f, -68.131592f }, 0.991760f, 0.000048f ); 
+    instance.registerEObj( "Magitekphotocell_6", 2000106, 0, 4, { -130.418900f, -9.567444f, -67.856873f }, 0.991760f, 0.000048f ); 
+    instance.registerEObj( "Magitekphotocell_7", 2000107, 0, 4, { -130.101807f, -9.739193f, -67.526657f }, 0.991789f, 0.000048f ); 
+    instance.registerEObj( "Magitekphotocell_8", 2000107, 0, 4, { -129.796707f, -9.914070f, -67.221481f }, 0.991789f, 0.000048f ); 
+    instance.registerEObj( "Magitekphotocell_9", 2000039, 0, 4, { -73.754570f, -6.333896f, 21.536640f }, 0.991789f, 0.000048f ); 
+    instance.registerEObj( "Magitekphotocell_10", 2000108, 0, 4, { -186.655807f, -0.160111f, -10.531350f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "Magitekphotocell_11", 2000109, 0, 4, { -143.922195f, 0.079653f, 1.801933f }, 0.961271f, 0.000144f ); 
+    instance.registerEObj( "Magitekphotocell_12", 2000110, 0, 4, { -233.539398f, -0.167908f, -103.013702f }, 0.991760f, 0.000048f ); 
+    instance.registerEObj( "Shortcut", 2000700, 0, 4, { -311.485504f, 9.496978f, -76.989082f }, 0.991760f, 0.000048f ); 
+    instance.registerEObj( "Entrance", 2000182, 4127435, 5, { -322.238495f, 11.991770f, -78.470192f }, 0.991760f, 0.000048f ); 
+      // States -> vf_lock_on (id: 11) vf_lock_of (id: 12) 
 
   }
 
-  void onUpdate( InstanceContentPtr instance, uint32_t currTime ) override
+  void onUpdate( InstanceContent& instance, uint32_t currTime ) override
   {
 
   }
 
-  void onEnterTerritory( InstanceContentPtr instance, Entity::Player& player, uint32_t eventId, uint16_t param1,
+  void onEnterTerritory( InstanceContent& instance, Entity::Player& player, uint32_t eventId, uint16_t param1,
                          uint16_t param2 ) override
   {
 
diff --git a/src/scripts/instances/dungeons/TheVault.cpp b/src/scripts/instances/dungeons/TheVault.cpp
index 74bbcf10..8078629c 100644
--- a/src/scripts/instances/dungeons/TheVault.cpp
+++ b/src/scripts/instances/dungeons/TheVault.cpp
@@ -9,20 +9,64 @@ class TheVault :
 public:
   TheVault() :
     Sapphire::ScriptAPI::InstanceContentScript( 34 )
+  { }
+
+  void onInit( InstanceContent& instance ) override
   {
+    instance.registerEObj( "sgvf_w_lvd_b0118", 2002872, 5588600, 4, { 0.359463f, 300.000000f, 26.171600f }, 1.000000f, 0.000000f ); 
+      // States -> vf_bextwall_on (id: 3) vf_bextwall_of (id: 4) 
+    instance.registerEObj( "unknown_0", 2002735, 0, 4, { 0.428600f, 300.000000f, 24.562250f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "sgvf_w_lvd_b0118_1", 2005580, 5873754, 4, { 0.360928f, 300.000000f, -15.306860f }, 1.000000f, 0.000000f ); 
+      // States -> vf_bextwall_on (id: 3) vf_bextwall_of (id: 4) 
+    instance.registerEObj( "unknown_1", 2006743, 5474300, 4, { 39.139400f, -300.007690f, 29.587160f }, 0.991760f, 0.000048f ); 
+    instance.registerEObj( "unknown_2", 2006744, 5474303, 4, { 43.961182f, -299.855103f, -30.197689f }, 0.991760f, 0.000048f ); 
+    instance.registerEObj( "unknown_3", 2006745, 6143050, 4, { -34.927921f, -300.007690f, -80.460876f }, 0.991760f, 0.000048f ); 
+    instance.registerEObj( "unknown_4", 2006746, 6147782, 4, { -38.559631f, -300.007690f, -72.068359f }, 0.991760f, 0.000048f ); 
+    instance.registerEObj( "unknown_5", 2006747, 6147781, 4, { -38.986820f, -300.007690f, -30.014530f }, 0.991760f, 0.000048f ); 
+    instance.registerEObj( "unknown_6", 2006748, 6143048, 4, { 52.795311f, -299.984589f, -36.063671f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "sgvf_w_lvd_b0250", 2006749, 6147791, 4, { 0.604760f, -291.999908f, -117.413803f }, 1.000000f, 0.000000f ); 
+      // States -> vf_bextwall_on (id: 3) vf_bextwall_of (id: 4) 
+    instance.registerEObj( "Bonds", 2006752, 0, 4, { -52.262211f, -300.000793f, -27.878300f }, 0.991760f, 0.000144f ); 
+    instance.registerEObj( "Bonds_1", 2006752, 0, 4, { 56.960300f, -299.984589f, -73.657806f }, 0.991760f, 0.000048f ); 
+    instance.registerEObj( "sgvf_w_lvd_b0118_2", 2002872, 5581166, 4, { -18.416611f, -292.000000f, -99.614120f }, 1.000000f, 0.000000f ); 
+      // States -> vf_bextwall_on (id: 3) vf_bextwall_of (id: 4) 
+    instance.registerEObj( "unknown_7", 2002735, 0, 4, { -20.099001f, -292.000000f, -98.859291f }, 0.700000f, -1.570796f ); 
+    instance.registerEObj( "sgvf_w_lvd_b0250_1", 2005106, 5581173, 4, { -0.494135f, -292.000000f, -117.713799f }, 1.000000f, 0.000000f ); 
+      // States -> vf_bextwall_on (id: 3) vf_bextwall_of (id: 4) 
+    instance.registerEObj( "unknown_8", 2002735, 0, 4, { 18.757099f, 0.000000f, 72.079903f }, 1.000000f, -1.570451f ); 
+    instance.registerEObj( "sgvf_w_lvd_b0118_3", 2002872, 5583050, 4, { 17.161560f, 0.000000f, 73.880867f }, 1.000000f, 0.000000f ); 
+      // States -> vf_bextwall_on (id: 3) vf_bextwall_of (id: 4) 
+    instance.registerEObj( "unknown_9", 2005087, 5474300, 4, { 37.735470f, -300.007690f, 30.228149f }, 0.991760f, 0.000048f ); 
+    instance.registerEObj( "unknown_10", 2005088, 5499954, 4, { 51.884090f, -300.000000f, -35.577080f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_11", 2005089, 5474303, 4, { 44.255379f, -300.000000f, -31.015051f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_12", 2005090, 5474308, 4, { -36.242680f, -300.000000f, -29.871010f }, 1.000000f, -0.000345f ); 
+    instance.registerEObj( "unknown_13", 2005091, 5474306, 4, { -37.591751f, -300.000000f, -69.819733f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_14", 2005092, 5499959, 4, { -33.701191f, -300.000000f, -79.843872f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_15", 2005093, 5499966, 4, { 6.953651f, -281.975708f, -150.744995f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_16", 2005094, 5476161, 4, { 101.518402f, -263.140503f, -12.115350f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_17", 2005095, 5476162, 4, { 101.390800f, -263.204315f, 11.842000f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_18", 2005096, 5474532, 4, { 99.222763f, -264.000000f, -0.362554f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_19", 2005097, 5499987, 4, { 22.634041f, 0.000000f, 71.960167f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_20", 2005098, 5499980, 4, { -17.585621f, 0.000000f, 72.136276f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_21", 2005099, 5444302, 4, { -92.607063f, -0.015320f, 0.076233f }, 0.991760f, 0.000048f ); 
+    instance.registerEObj( "unknown_22", 2005100, 5499663, 4, { -52.663239f, 291.000000f, 42.623951f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_23", 2005101, 5499660, 4, { -67.359016f, 291.000000f, 42.656231f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_24", 2005102, 5499645, 4, { -66.869476f, 291.000000f, 55.587841f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_25", 2005103, 5499653, 4, { -53.398609f, 291.000000f, 55.570320f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_26", 2005104, 5499600, 4, { -46.140011f, 291.000000f, 48.667049f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "Entrance", 2000182, 5578486, 5, { -5.010592f, -300.000000f, 86.198753f }, 1.000000f, 0.000000f ); 
+      // States -> vf_lock_on (id: 11) vf_lock_of (id: 12) 
+    instance.registerEObj( "Shortcut", 2000700, 0, 4, { 11.135890f, -300.000000f, 78.862717f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "Exit", 2000139, 0, 4, { 0.136796f, 299.977112f, -9.654591f }, 0.991760f, 0.000048f ); 
+
   }
 
-  void onInit( InstanceContentPtr instance ) override
+  void onUpdate( InstanceContent& instance, uint32_t currTime ) override
   {
 
   }
 
-  void onUpdate( InstanceContentPtr instance, uint32_t currTime ) override
-  {
-
-  }
-
-  void onEnterTerritory( InstanceContentPtr instance, Entity::Player& player, uint32_t eventId, uint16_t param1,
+  void onEnterTerritory( InstanceContent& instance, Entity::Player& player, uint32_t eventId, uint16_t param1,
                          uint16_t param2 ) override
   {
 
diff --git a/src/scripts/instances/dungeons/TheWanderersPalace.cpp b/src/scripts/instances/dungeons/TheWanderersPalace.cpp
index 05d22b30..b1da9aa2 100644
--- a/src/scripts/instances/dungeons/TheWanderersPalace.cpp
+++ b/src/scripts/instances/dungeons/TheWanderersPalace.cpp
@@ -9,119 +9,73 @@ class TheWanderersPalace :
 public:
   TheWanderersPalace() :
     Sapphire::ScriptAPI::InstanceContentScript( 10 )
-  {
-  }
+  { }
 
-  void onInit( InstanceContentPtr instance ) override
+  void onInit( InstanceContent& instance ) override
   {
-    instance->registerEObj( "unknown_0", 2001809, 0, 4, { 134.115601f, -17.997431f, 473.641693f }, 1.000000f,
-                            0.000000f );
-    instance->registerEObj( "Shortcut", 2000700, 0, 4, { 137.299393f, -17.990360f, 454.401398f }, 0.991760f,
-                            0.000048f );
-    instance->registerEObj( "Exit", 2000139, 0, 4, { 73.105957f, 9.994568f, -475.590790f }, 0.991760f, 0.000048f );
-    instance->registerEObj( "Entrance", 2000182, 4177700, 5, { 130.745697f, -17.983120f, 461.438293f }, 1.000000f,
-                            0.000000f );
-    // States -> vf_lock_on vf_lock_of
-    instance->registerEObj( "unknown_1", 2001822, 4086687, 4, { 125.014000f, -9.459579f, 64.149277f }, 1.000000f,
-                            0.000000f );
-    instance->registerEObj( "sgvf_w_lvd_b0118", 2001811, 4259124, 4, { 127.094200f, -12.000000f, 125.826500f },
-                            1.000000f, 0.000000f );
-    // States -> vf_bextwall_on vf_bextwall_of
-    instance->registerEObj( "sgvf_w_lvd_b0094", 2001810, 4259126, 4, { 124.986603f, -12.039370f, 125.401100f },
-                            0.991760f, 0.000048f );
-    // States -> vf_line_on vf_line_of
-    instance->registerEObj( "sgvf_w_lvd_b0250", 2000277, 4259125, 4, { 125.461502f, -12.000000f, 89.079697f },
-                            1.000000f, 0.000000f );
-    // States -> vf_bextwall_on vf_bextwall_of
-    instance->registerEObj( "unknown_2", 2001114, 4323503, 4, { 118.000000f, -8.700125f, 65.370102f }, 1.000000f,
-                            0.000000f );
-    instance->registerEObj( "unknown_3", 2001823, 4323504, 4, { 117.995003f, -7.766907f, 65.232300f }, 0.991760f,
-                            0.000048f );
-    instance->registerEObj( "Nymiandevice", 2001123, 4126926, 4, { 117.995003f, -9.001419f, 65.378754f }, 0.991760f,
-                            0.000048f );
-    instance->registerEObj( "unknown_4", 2002790, 4405761, 4, { 125.029999f, -13.277490f, 181.098602f }, 1.000000f,
-                            0.000000f );
-    instance->registerEObj( "sgvf_w_lvd_b0118_1", 2001813, 4259128, 4, { 45.925018f, 0.000000f, -212.411499f },
-                            1.000000f, 0.000000f );
-    // States -> vf_bextwall_on vf_bextwall_of
-    instance->registerEObj( "sgvf_w_lvd_b0094_1", 2001812, 4259127, 4, { 43.121960f, -0.015320f, -212.616592f },
-                            0.991760f, 0.000048f );
-    // States -> vf_line_on vf_line_of
-    instance->registerEObj( "unknown_5", 2001824, 4086767, 4, { 43.140591f, 0.499020f, -29.383511f }, 1.000000f,
-                            0.000000f );
-    instance->registerEObj( "unknown_6", 2001827, 4086770, 4, { 43.011742f, 0.540422f, -152.602997f }, 1.000000f,
-                            0.000000f );
-    instance->registerEObj( "sgvf_w_lvd_b0118_2", 2000278, 4259129, 4, { 43.493420f, -0.100058f, -248.056198f },
-                            1.000000f, 0.000000f );
-    // States -> vf_bextwall_on vf_bextwall_of
-    instance->registerEObj( "unknown_7", 2001115, 4323510, 4, { 35.000000f, 1.250271f, -5.876968f }, 1.000000f,
-                            0.000000f );
-    instance->registerEObj( "unknown_8", 2001116, 4323508, 4, { 35.000000f, 1.249865f, -28.099899f }, 1.000000f,
-                            0.000000f );
-    instance->registerEObj( "unknown_9", 2001117, 4323512, 4, { 43.000000f, 1.300663f, -58.799179f }, 1.000000f,
-                            0.000000f );
-    instance->registerEObj( "unknown_10", 2001118, 4323515, 4, { 54.099178f, 9.249764f, -95.999512f }, 1.000000f,
-                            1.570451f );
-    instance->registerEObj( "unknown_11", 2001119, 4323518, 4, { 122.099899f, 1.250139f, -145.999405f }, 1.000000f,
-                            1.570451f );
-    instance->registerEObj( "unknown_12", 2001120, 4323522, 4, { 36.000000f, 1.299810f, -151.049896f }, 1.000000f,
-                            0.000000f );
-    instance->registerEObj( "unknown_13", 2001825, 4323511, 4, { 35.027500f, 2.231338f, -5.969540f }, 0.991760f,
-                            0.000048f );
-    instance->registerEObj( "unknown_14", 2001826, 4323509, 4, { 34.988789f, 2.301583f, -28.158291f }, 1.000000f,
-                            0.000000f );
-    instance->registerEObj( "unknown_15", 2001828, 4323513, 4, { 43.003689f, 2.351689f, -58.849869f }, 1.000000f,
-                            0.000000f );
-    instance->registerEObj( "unknown_16", 2001829, 4323516, 4, { 54.100830f, 10.258660f, -95.915703f }, 0.991760f,
-                            0.000048f );
-    instance->registerEObj( "unknown_17", 2001830, 4323519, 4, { 121.982201f, 2.305465f, -145.991302f }, 0.991760f,
-                            0.000048f );
-    instance->registerEObj( "unknown_18", 2001831, 4323523, 4, { 35.995869f, 2.276821f, -151.081100f }, 0.991760f,
-                            0.000048f );
-    instance->registerEObj( "RustedNymiandevice", 2001124, 4126931, 4, { 34.988892f, 0.930786f, -6.393555f }, 0.991760f,
-                            0.000048f );
-    instance->registerEObj( "RustedNymiandevice_1", 2001125, 4126938, 4, { 34.988892f, 0.930786f, -27.634159f },
-                            0.991760f, 0.000048f );
-    instance->registerEObj( "RustedNymiandevice_2", 2001126, 4126941, 4, { 42.984619f, 0.991760f, -58.335270f },
-                            0.991760f, 0.000048f );
-    instance->registerEObj( "Nymiandevice_1", 2001127, 4126947, 4, { 53.613361f, 8.952527f, -95.999352f }, 1.000000f,
-                            1.570451f );
-    instance->registerEObj( "RustedNymiandevice_3", 2001128, 4126952, 4, { 121.629601f, 0.930786f, -146.013596f },
-                            0.991760f, 1.570451f );
-    instance->registerEObj( "RustedNymiandevice_4", 2001129, 4126956, 4, { 35.995972f, 0.991760f, -150.591400f },
-                            0.991760f, 0.000048f );
-    instance->registerEObj( "Lanternoil", 2002789, 0, 4, { 35.621380f, -0.164260f, -23.125179f }, 1.000000f,
-                            0.000000f );
-    instance->registerEObj( "unknown_19", 2001832, 4086777, 4, { 73.005737f, 10.540420f, -380.487610f }, 1.000000f,
-                            0.000000f );
-    instance->registerEObj( "sgpl_s1d3_bossline", 2001814, 4239448, 4, { 72.890900f, 9.976854f, -400.332489f },
-                            1.000000f, 0.000000f );
-    instance->registerEObj( "sgpl_s1d3_bosswall", 2001815, 4239449, 4, { 74.758614f, 9.976894f, -400.332489f },
-                            1.000000f, 0.000000f );
-    instance->registerEObj( "unknown_20", 2001121, 4323530, 4, { 80.979607f, 11.245850f, -380.117493f }, 0.991760f,
-                            0.000048f );
-    instance->registerEObj( "unknown_21", 2001122, 4323528, 4, { 65.000000f, 11.249720f, -380.099792f }, 1.000000f,
-                            0.000000f );
-    instance->registerEObj( "unknown_22", 2001833, 4323531, 4, { 81.010132f, 12.313960f, -380.117493f }, 0.991760f,
-                            0.000048f );
-    instance->registerEObj( "unknown_23", 2001834, 4323529, 4, { 65.001831f, 12.381110f, -380.103790f }, 1.000000f,
-                            0.000000f );
-    instance->registerEObj( "RustedNymiandevice_5", 2001130, 4126964, 4, { 80.979607f, 10.940670f, -379.629211f },
-                            0.991760f, 0.000048f );
-    instance->registerEObj( "RustedNymiandevice_6", 2001131, 4126966, 4, { 64.988159f, 10.940670f, -379.629211f },
-                            0.991760f, 0.000048f );
-    instance->registerEObj( "sgvf_w_lvd_b0118_3", 2005197, 5674883, 4, { 73.492577f, 6.000000f, -464.485596f },
-                            1.000000f, 0.000000f );
-    // States -> vf_bextwall_on vf_bextwall_of
+    instance.registerEObj( "unknown_0", 2001809, 0, 4, { 134.115601f, -17.997431f, 473.641693f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "Shortcut", 2000700, 0, 4, { 137.299393f, -17.990360f, 454.401398f }, 0.991760f, 0.000048f ); 
+    instance.registerEObj( "Exit", 2000139, 0, 4, { 73.105957f, 9.994568f, -475.590790f }, 0.991760f, 0.000048f ); 
+    instance.registerEObj( "Entrance", 2000182, 4177700, 5, { 130.745697f, -17.983120f, 461.438293f }, 1.000000f, 0.000000f ); 
+      // States -> vf_lock_on (id: 11) vf_lock_of (id: 12) 
+    instance.registerEObj( "unknown_1", 2001822, 4086687, 4, { 125.014000f, -9.459579f, 64.149277f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "sgvf_w_lvd_b0118", 2001811, 4259124, 4, { 127.094200f, -12.000000f, 125.826500f }, 1.000000f, 0.000000f ); 
+      // States -> vf_bextwall_on (id: 3) vf_bextwall_of (id: 4) 
+    instance.registerEObj( "sgvf_w_lvd_b0094", 2001810, 4259126, 4, { 124.986603f, -12.039370f, 125.401100f }, 0.991760f, 0.000048f ); 
+      // States -> vf_line_on (id: 12) vf_line_of (id: 13) 
+    instance.registerEObj( "sgvf_w_lvd_b0250", 2000277, 4259125, 4, { 125.461502f, -12.000000f, 89.079697f }, 1.000000f, 0.000000f ); 
+      // States -> vf_bextwall_on (id: 3) vf_bextwall_of (id: 4) 
+    instance.registerEObj( "unknown_2", 2001114, 4323503, 4, { 118.000000f, -8.700125f, 65.370102f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_3", 2001823, 4323504, 4, { 117.995003f, -7.766907f, 65.232300f }, 0.991760f, 0.000048f ); 
+    instance.registerEObj( "Nymiandevice", 2001123, 4126926, 4, { 117.995003f, -9.001419f, 65.378754f }, 0.991760f, 0.000048f ); 
+    instance.registerEObj( "unknown_4", 2002790, 4405761, 4, { 125.029999f, -13.277490f, 181.098602f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "sgvf_w_lvd_b0118_1", 2001813, 4259128, 4, { 45.925018f, 0.000000f, -212.411499f }, 1.000000f, 0.000000f ); 
+      // States -> vf_bextwall_on (id: 3) vf_bextwall_of (id: 4) 
+    instance.registerEObj( "sgvf_w_lvd_b0094_1", 2001812, 4259127, 4, { 43.121960f, -0.015320f, -212.616592f }, 0.991760f, 0.000048f ); 
+      // States -> vf_line_on (id: 12) vf_line_of (id: 13) 
+    instance.registerEObj( "unknown_5", 2001824, 4086767, 4, { 43.140591f, 0.499020f, -29.383511f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_6", 2001827, 4086770, 4, { 43.011742f, 0.540422f, -152.602997f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "sgvf_w_lvd_b0118_2", 2000278, 4259129, 4, { 43.493420f, -0.100058f, -248.056198f }, 1.000000f, 0.000000f ); 
+      // States -> vf_bextwall_on (id: 3) vf_bextwall_of (id: 4) 
+    instance.registerEObj( "unknown_7", 2001115, 4323510, 4, { 35.000000f, 1.250271f, -5.876968f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_8", 2001116, 4323508, 4, { 35.000000f, 1.249865f, -28.099899f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_9", 2001117, 4323512, 4, { 43.000000f, 1.300663f, -58.799179f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_10", 2001118, 4323515, 4, { 54.099178f, 9.249764f, -95.999512f }, 1.000000f, 1.570451f ); 
+    instance.registerEObj( "unknown_11", 2001119, 4323518, 4, { 122.099899f, 1.250139f, -145.999405f }, 1.000000f, 1.570451f ); 
+    instance.registerEObj( "unknown_12", 2001120, 4323522, 4, { 36.000000f, 1.299810f, -151.049896f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_13", 2001825, 4323511, 4, { 35.027500f, 2.231338f, -5.969540f }, 0.991760f, 0.000048f ); 
+    instance.registerEObj( "unknown_14", 2001826, 4323509, 4, { 34.988789f, 2.301583f, -28.158291f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_15", 2001828, 4323513, 4, { 43.003689f, 2.351689f, -58.849869f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_16", 2001829, 4323516, 4, { 54.100830f, 10.258660f, -95.915703f }, 0.991760f, 0.000048f ); 
+    instance.registerEObj( "unknown_17", 2001830, 4323519, 4, { 121.982201f, 2.305465f, -145.991302f }, 0.991760f, 0.000048f ); 
+    instance.registerEObj( "unknown_18", 2001831, 4323523, 4, { 35.995869f, 2.276821f, -151.081100f }, 0.991760f, 0.000048f ); 
+    instance.registerEObj( "RustedNymiandevice", 2001124, 4126931, 4, { 34.988892f, 0.930786f, -6.393555f }, 0.991760f, 0.000048f ); 
+    instance.registerEObj( "RustedNymiandevice_1", 2001125, 4126938, 4, { 34.988892f, 0.930786f, -27.634159f }, 0.991760f, 0.000048f ); 
+    instance.registerEObj( "RustedNymiandevice_2", 2001126, 4126941, 4, { 42.984619f, 0.991760f, -58.335270f }, 0.991760f, 0.000048f ); 
+    instance.registerEObj( "Nymiandevice_1", 2001127, 4126947, 4, { 53.613361f, 8.952527f, -95.999352f }, 1.000000f, 1.570451f ); 
+    instance.registerEObj( "RustedNymiandevice_3", 2001128, 4126952, 4, { 121.629601f, 0.930786f, -146.013596f }, 0.991760f, 1.570451f ); 
+    instance.registerEObj( "RustedNymiandevice_4", 2001129, 4126956, 4, { 35.995972f, 0.991760f, -150.591400f }, 0.991760f, 0.000048f ); 
+    instance.registerEObj( "Lanternoil", 2002789, 0, 4, { 35.621380f, -0.164260f, -23.125179f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_19", 2001832, 4086777, 4, { 73.005737f, 10.540420f, -380.487610f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "sgpl_s1d3_bossline", 2001814, 4239448, 4, { 72.890900f, 9.976854f, -400.332489f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "sgpl_s1d3_bosswall", 2001815, 4239449, 4, { 74.758614f, 9.976894f, -400.332489f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_20", 2001121, 4323530, 4, { 80.979607f, 11.245850f, -380.117493f }, 0.991760f, 0.000048f ); 
+    instance.registerEObj( "unknown_21", 2001122, 4323528, 4, { 65.000000f, 11.249720f, -380.099792f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_22", 2001833, 4323531, 4, { 81.010132f, 12.313960f, -380.117493f }, 0.991760f, 0.000048f ); 
+    instance.registerEObj( "unknown_23", 2001834, 4323529, 4, { 65.001831f, 12.381110f, -380.103790f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "RustedNymiandevice_5", 2001130, 4126964, 4, { 80.979607f, 10.940670f, -379.629211f }, 0.991760f, 0.000048f ); 
+    instance.registerEObj( "RustedNymiandevice_6", 2001131, 4126966, 4, { 64.988159f, 10.940670f, -379.629211f }, 0.991760f, 0.000048f ); 
+    instance.registerEObj( "sgvf_w_lvd_b0118_3", 2005197, 5674883, 4, { 73.492577f, 6.000000f, -464.485596f }, 1.000000f, 0.000000f ); 
+      // States -> vf_bextwall_on (id: 3) vf_bextwall_of (id: 4) 
 
   }
 
-  void onUpdate( InstanceContentPtr instance, uint32_t currTime ) override
+  void onUpdate( InstanceContent& instance, uint32_t currTime ) override
   {
 
   }
 
-  void onEnterTerritory( InstanceContentPtr instance, Entity::Player& player, uint32_t eventId, uint16_t param1,
+  void onEnterTerritory( InstanceContent& instance, Entity::Player& player, uint32_t eventId, uint16_t param1,
                          uint16_t param2 ) override
   {
 
diff --git a/src/scripts/instances/dungeons/TheWanderersPalaceHard.cpp b/src/scripts/instances/dungeons/TheWanderersPalaceHard.cpp
index e60c7782..ec80508e 100644
--- a/src/scripts/instances/dungeons/TheWanderersPalaceHard.cpp
+++ b/src/scripts/instances/dungeons/TheWanderersPalaceHard.cpp
@@ -9,80 +9,54 @@ class TheWanderersPalaceHard :
 public:
   TheWanderersPalaceHard() :
     Sapphire::ScriptAPI::InstanceContentScript( 30 )
-  {
-  }
+  { }
 
-  void onInit( InstanceContentPtr instance ) override
+  void onInit( InstanceContent& instance ) override
   {
-    instance->registerEObj( "sgvf_w_lvd_b0250", 2000277, 4898030, 4, { 125.461502f, -12.000000f, 89.079697f },
-                            1.000000f, 0.000000f );
-    // States -> vf_bextwall_on vf_bextwall_of
-    instance->registerEObj( "sgvf_w_lvd_b0094", 2001810, 4898029, 4, { 124.986603f, -12.039370f, 125.401100f },
-                            0.991760f, 0.000048f );
-    // States -> vf_line_on vf_line_of
-    instance->registerEObj( "sgvf_w_lvd_b0118", 2001811, 4898028, 4, { 127.094200f, -12.000000f, 125.826500f },
-                            1.000000f, 0.000000f );
-    // States -> vf_bextwall_on vf_bextwall_of
-    instance->registerEObj( "sgvf_w_lvd_b0094_1", 2001812, 4898056, 4, { 43.121960f, -0.015320f, -212.616592f },
-                            0.991760f, 0.000048f );
-    // States -> vf_line_on vf_line_of
-    instance->registerEObj( "sgvf_w_lvd_b0118_1", 2001813, 4898057, 4, { 45.925018f, 0.000000f, -212.411499f },
-                            1.000000f, 0.000000f );
-    // States -> vf_bextwall_on vf_bextwall_of
-    instance->registerEObj( "sgvf_w_lvd_b0118_2", 2000278, 4898058, 4, { 43.472900f, -0.106873f, -248.065994f },
-                            0.991760f, 0.000048f );
-    // States -> vf_bextwall_on vf_bextwall_of
-    instance->registerEObj( "sgpl_s1d3_bosswall", 2001815, 4898090, 4, { 74.753906f, 9.964111f, -400.351013f },
-                            0.991760f, 0.000048f );
-    instance->registerEObj( "sgpl_s1d3_bossline", 2001814, 4898089, 4, { 72.890900f, 9.976854f, -400.332489f },
-                            1.000000f, 0.000000f );
-    instance->registerEObj( "unknown_0", 2005119, 0, 4, { 68.684860f, 6.000000f, -449.635315f }, 1.000000f, 0.000000f );
-    instance->registerEObj( "sgvf_w_lvd_b0118_3", 2005196, 5674432, 4, { 72.966209f, 6.000000f, -464.577209f },
-                            1.000000f, 0.000000f );
-    // States -> vf_bextwall_on vf_bextwall_of
-    instance->registerEObj( "Shortcut", 2000700, 0, 4, { 137.285400f, -17.990419f, 454.398407f }, 0.991760f,
-                            0.000048f );
-    instance->registerEObj( "Exit", 2000139, 0, 4, { 73.105957f, 9.994568f, -475.590790f }, 0.991760f, 0.000048f );
-    instance->registerEObj( "Entrance", 2000182, 4898005, 5, { 130.745697f, -17.983120f, 461.438293f }, 1.000000f,
-                            0.000000f );
-    // States -> vf_lock_on vf_lock_of
-    instance->registerEObj( "unknown_1", 2004551, 5018234, 4, { 184.679901f, -14.023070f, 304.066406f }, 0.991760f,
-                            0.000048f );
-    instance->registerEObj( "unknown_2", 2004552, 5018233, 4, { 125.230698f, -14.053590f, 244.800400f }, 0.991760f,
-                            0.000048f );
-    instance->registerEObj( "unknown_3", 2004553, 5018223, 4, { 124.956100f, -14.023070f, 183.581207f }, 0.991760f,
-                            0.000048f );
-    instance->registerEObj( "unknown_4", 2004554, 5018182, 4, { 42.770088f, -0.167908f, -26.822309f }, 0.991760f,
-                            0.000048f );
-    instance->registerEObj( "unknown_5", 2004555, 5018205, 4, { 42.862549f, 0.442505f, -150.225098f }, 0.991760f,
-                            0.000048f );
-    instance->registerEObj( "Asylumcell", 2004556, 5019054, 4, { 71.785713f, -11.783800f, -311.787598f }, 0.991760f,
-                            0.000048f );
-    instance->registerEObj( "Asylumcell_1", 2004557, 5019055, 4, { 71.870552f, -11.659170f, -324.391602f }, 0.991760f,
-                            0.000048f );
-    instance->registerEObj( "unknown_6", 2004558, 5019051, 4, { 94.316040f, -12.008810f, -312.062286f }, 0.991760f,
-                            0.000048f );
-    instance->registerEObj( "unknown_7", 2004559, 5019004, 4, { 161.119995f, -8.011047f, -353.322693f }, 0.991760f,
-                            0.000048f );
-    instance->registerEObj( "unknown_8", 2004560, 5018224, 4, { 73.226128f, 10.390440f, -379.721588f }, 0.991760f,
-                            0.000048f );
-    instance->registerEObj( "unknown_9", 2004561, 5034792, 4, { 120.347900f, -12.000000f, -338.826599f }, 0.991760f,
-                            0.000048f );
-    instance->registerEObj( "Drainagevalve", 2004562, 5022359, 4, { 124.002098f, -10.704290f, -341.825287f }, 0.991760f,
-                            0.000048f );
-    instance->registerEObj( "unknown_10", 2004564, 5018828, 4, { 141.315598f, -11.750000f, -326.359711f }, 1.000000f,
-                            0.000000f );
-    instance->registerEObj( "Nymiandevice", 2004565, 4896865, 4, { 156.023407f, -6.851379f, -351.735809f }, 0.991760f,
-                            0.000048f );
+    instance.registerEObj( "sgvf_w_lvd_b0250", 2000277, 4898030, 4, { 125.461502f, -12.000000f, 89.079697f }, 1.000000f, 0.000000f ); 
+      // States -> vf_bextwall_on (id: 3) vf_bextwall_of (id: 4) 
+    instance.registerEObj( "sgvf_w_lvd_b0094", 2001810, 4898029, 4, { 124.986603f, -12.039370f, 125.401100f }, 0.991760f, 0.000048f ); 
+      // States -> vf_line_on (id: 12) vf_line_of (id: 13) 
+    instance.registerEObj( "sgvf_w_lvd_b0118", 2001811, 4898028, 4, { 127.094200f, -12.000000f, 125.826500f }, 1.000000f, 0.000000f ); 
+      // States -> vf_bextwall_on (id: 3) vf_bextwall_of (id: 4) 
+    instance.registerEObj( "sgvf_w_lvd_b0094_1", 2001812, 4898056, 4, { 43.121960f, -0.015320f, -212.616592f }, 0.991760f, 0.000048f ); 
+      // States -> vf_line_on (id: 12) vf_line_of (id: 13) 
+    instance.registerEObj( "sgvf_w_lvd_b0118_1", 2001813, 4898057, 4, { 45.925018f, 0.000000f, -212.411499f }, 1.000000f, 0.000000f ); 
+      // States -> vf_bextwall_on (id: 3) vf_bextwall_of (id: 4) 
+    instance.registerEObj( "sgvf_w_lvd_b0118_2", 2000278, 4898058, 4, { 43.472900f, -0.106873f, -248.065994f }, 0.991760f, 0.000048f ); 
+      // States -> vf_bextwall_on (id: 3) vf_bextwall_of (id: 4) 
+    instance.registerEObj( "sgpl_s1d3_bosswall", 2001815, 4898090, 4, { 74.753906f, 9.964111f, -400.351013f }, 0.991760f, 0.000048f ); 
+    instance.registerEObj( "sgpl_s1d3_bossline", 2001814, 4898089, 4, { 72.890900f, 9.976854f, -400.332489f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_0", 2005119, 0, 4, { 68.684860f, 6.000000f, -449.635315f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "sgvf_w_lvd_b0118_3", 2005196, 5674432, 4, { 72.966209f, 6.000000f, -464.577209f }, 1.000000f, 0.000000f ); 
+      // States -> vf_bextwall_on (id: 3) vf_bextwall_of (id: 4) 
+    instance.registerEObj( "Shortcut", 2000700, 0, 4, { 137.285400f, -17.990419f, 454.398407f }, 0.991760f, 0.000048f ); 
+    instance.registerEObj( "Exit", 2000139, 0, 4, { 73.105957f, 9.994568f, -475.590790f }, 0.991760f, 0.000048f ); 
+    instance.registerEObj( "Entrance", 2000182, 4898005, 5, { 130.745697f, -17.983120f, 461.438293f }, 1.000000f, 0.000000f ); 
+      // States -> vf_lock_on (id: 11) vf_lock_of (id: 12) 
+    instance.registerEObj( "unknown_1", 2004551, 5018234, 4, { 184.679901f, -14.023070f, 304.066406f }, 0.991760f, 0.000048f ); 
+    instance.registerEObj( "unknown_2", 2004552, 5018233, 4, { 125.230698f, -14.053590f, 244.800400f }, 0.991760f, 0.000048f ); 
+    instance.registerEObj( "unknown_3", 2004553, 5018223, 4, { 124.956100f, -14.023070f, 183.581207f }, 0.991760f, 0.000048f ); 
+    instance.registerEObj( "unknown_4", 2004554, 5018182, 4, { 42.770088f, -0.167908f, -26.822309f }, 0.991760f, 0.000048f ); 
+    instance.registerEObj( "unknown_5", 2004555, 5018205, 4, { 42.862549f, 0.442505f, -150.225098f }, 0.991760f, 0.000048f ); 
+    instance.registerEObj( "Asylumcell", 2004556, 5019054, 4, { 71.785713f, -11.783800f, -311.787598f }, 0.991760f, 0.000048f ); 
+    instance.registerEObj( "Asylumcell_1", 2004557, 5019055, 4, { 71.870552f, -11.659170f, -324.391602f }, 0.991760f, 0.000048f ); 
+    instance.registerEObj( "unknown_6", 2004558, 5019051, 4, { 94.316040f, -12.008810f, -312.062286f }, 0.991760f, 0.000048f ); 
+    instance.registerEObj( "unknown_7", 2004559, 5019004, 4, { 161.119995f, -8.011047f, -353.322693f }, 0.991760f, 0.000048f ); 
+    instance.registerEObj( "unknown_8", 2004560, 5018224, 4, { 73.226128f, 10.390440f, -379.721588f }, 0.991760f, 0.000048f ); 
+    instance.registerEObj( "unknown_9", 2004561, 5034792, 4, { 120.347900f, -12.000000f, -338.826599f }, 0.991760f, 0.000048f ); 
+    instance.registerEObj( "Drainagevalve", 2004562, 5022359, 4, { 124.002098f, -10.704290f, -341.825287f }, 0.991760f, 0.000048f ); 
+    instance.registerEObj( "unknown_10", 2004564, 5018828, 4, { 141.315598f, -11.750000f, -326.359711f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "Nymiandevice", 2004565, 4896865, 4, { 156.023407f, -6.851379f, -351.735809f }, 0.991760f, 0.000048f ); 
 
   }
 
-  void onUpdate( InstanceContentPtr instance, uint32_t currTime ) override
+  void onUpdate( InstanceContent& instance, uint32_t currTime ) override
   {
 
   }
 
-  void onEnterTerritory( InstanceContentPtr instance, Entity::Player& player, uint32_t eventId, uint16_t param1,
+  void onEnterTerritory( InstanceContent& instance, Entity::Player& player, uint32_t eventId, uint16_t param1,
                          uint16_t param2 ) override
   {
 
diff --git a/src/scripts/instances/dungeons/Xelphatol.cpp b/src/scripts/instances/dungeons/Xelphatol.cpp
index 8b1d1ca2..bf5af107 100644
--- a/src/scripts/instances/dungeons/Xelphatol.cpp
+++ b/src/scripts/instances/dungeons/Xelphatol.cpp
@@ -9,20 +9,60 @@ class Xelphatol :
 public:
   Xelphatol() :
     Sapphire::ScriptAPI::InstanceContentScript( 46 )
+  { }
+
+  void onInit( InstanceContent& instance ) override
   {
+    instance.registerEObj( "unknown_0", 2002735, 0, 4, { -84.755379f, 28.000000f, -51.118382f }, 1.000000f, 0.523599f ); 
+    instance.registerEObj( "sgvf_w_lvd_b0118", 2002872, 6403264, 4, { -82.540977f, 28.000000f, -53.644989f }, 1.000000f, 0.000000f ); 
+      // States -> vf_bextwall_on (id: 3) vf_bextwall_of (id: 4) 
+    instance.registerEObj( "sgvf_w_lvd_b0118_1", 2007376, 6403259, 4, { -59.964069f, 28.000000f, -78.522522f }, 1.000000f, 0.000000f ); 
+      // States -> vf_bextwall_on (id: 3) vf_bextwall_of (id: 4) 
+    instance.registerEObj( "unknown_1", 2002735, 0, 4, { 223.705399f, 113.500000f, 35.108238f }, 0.500000f, 0.785398f ); 
+    instance.registerEObj( "sgvf_w_lvd_b0118_2", 2002872, 6403502, 4, { 224.909500f, 113.199997f, 33.535221f }, 1.000000f, 0.000000f ); 
+      // States -> vf_bextwall_on (id: 3) vf_bextwall_of (id: 4) 
+    instance.registerEObj( "sgvf_w_lvd_b0118_3", 2007377, 6403509, 4, { 264.503998f, 113.199997f, -5.542618f }, 1.000000f, 0.000000f ); 
+      // States -> vf_bextwall_on (id: 3) vf_bextwall_of (id: 4) 
+    instance.registerEObj( "unknown_2", 2007431, 6384823, 4, { 245.262695f, 113.500000f, 13.527060f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_3", 2002735, 0, 4, { 336.690308f, 166.643707f, -409.414886f }, 0.472961f, -1.221690f ); 
+    instance.registerEObj( "sgvf_w_lvd_b0118_4", 2002872, 6403539, 4, { 335.712402f, 166.653793f, -410.036194f }, 1.000000f, 0.000000f ); 
+      // States -> vf_bextwall_on (id: 3) vf_bextwall_of (id: 4) 
+    instance.registerEObj( "unknown_4", 2007441, 6425251, 4, { 321.753204f, 166.653793f, -415.372711f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "Shortcut", 2000700, 0, 4, { -204.533798f, -33.742210f, 271.416107f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "Exit", 2000139, 0, 4, { 306.067810f, 166.653793f, -420.100494f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "Entrance", 2000182, 6399475, 5, { -219.983398f, -34.117180f, 275.020111f }, 0.991760f, 0.000048f ); 
+      // States -> vf_lock_on (id: 11) vf_lock_of (id: 12) 
+    instance.registerEObj( "unknown_5", 2007371, 6572085, 4, { -124.008698f, -10.048470f, 151.735703f }, 0.991760f, 0.000048f ); 
+    instance.registerEObj( "unknown_6", 2007372, 6572086, 4, { -88.521538f, 27.655760f, -44.885460f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_7", 2007366, 6384146, 4, { 70.443916f, 25.187500f, -55.889919f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_8", 2007367, 6384285, 4, { 178.158096f, 99.562508f, -3.919224f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_9", 2007364, 6384308, 4, { 78.279350f, 25.190849f, -47.949661f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_10", 2007365, 6384356, 4, { 178.228394f, 99.500000f, 8.238135f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "Liftlever", 2007388, 0, 4, { 180.229706f, 56.749981f, -76.583313f }, 1.000000f, -2.356194f ); 
+    instance.registerEObj( "Liftlever_1", 2007389, 0, 4, { 180.245193f, 86.749977f, -76.529610f }, 1.000000f, -0.785398f ); 
+    instance.registerEObj( "Liftlever_2", 2007390, 0, 4, { 188.720001f, 56.749981f, -68.098488f }, 1.000000f, -0.785398f ); 
+    instance.registerEObj( "Liftlever_3", 2007391, 0, 4, { 188.709198f, 86.749977f, -68.041428f }, 1.000000f, -0.785398f ); 
+    instance.registerEObj( "Imposinggate", 2007373, 6382783, 4, { 168.614197f, 55.750000f, -60.833012f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "Bonekey", 2007397, 0, 4, { 143.135406f, 52.677929f, -35.654629f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_11", 2007370, 6383173, 4, { 97.740517f, 26.124990f, -40.661610f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_12", 2007405, 6527474, 4, { 351.622009f, 163.753799f, -404.382599f }, 0.991760f, 0.000048f ); 
+    instance.registerEObj( "Airstone", 2007398, 0, 4, { 316.850586f, 142.878403f, -142.151505f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "Airstone_1", 2007399, 0, 4, { 420.029205f, 149.955597f, -271.014801f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "Tailwindrelic", 2007400, 6422938, 4, { 342.708191f, 145.153397f, -162.585800f }, 1.000000f, 0.000000f ); 
+      // States -> start (id: 3) stop (id: 4) 
+    instance.registerEObj( "Tailwindrelic_1", 2007401, 6422940, 4, { 414.549988f, 152.457504f, -298.508392f }, 0.991760f, 0.000048f ); 
+      // States -> start (id: 3) stop (id: 4) 
+    instance.registerEObj( "unknown_13", 2007524, 6493432, 4, { 341.786896f, 144.853806f, -164.354904f }, 0.991760f, 0.000048f ); 
+    instance.registerEObj( "unknown_14", 2007525, 6493431, 4, { 412.853699f, 152.110397f, -297.974396f }, 1.000000f, 0.000000f ); 
+
   }
 
-  void onInit( InstanceContentPtr instance ) override
+  void onUpdate( InstanceContent& instance, uint32_t currTime ) override
   {
 
   }
 
-  void onUpdate( InstanceContentPtr instance, uint32_t currTime ) override
-  {
-
-  }
-
-  void onEnterTerritory( InstanceContentPtr instance, Entity::Player& player, uint32_t eventId, uint16_t param1,
+  void onEnterTerritory( InstanceContent& instance, Entity::Player& player, uint32_t eventId, uint16_t param1,
                          uint16_t param2 ) override
   {
 
diff --git a/src/scripts/instances/events/TheHauntedManor.cpp b/src/scripts/instances/events/TheHauntedManor.cpp
index 690f8347..e5e1703a 100644
--- a/src/scripts/instances/events/TheHauntedManor.cpp
+++ b/src/scripts/instances/events/TheHauntedManor.cpp
@@ -9,48 +9,36 @@ class TheHauntedManor :
 public:
   TheHauntedManor() :
     Sapphire::ScriptAPI::InstanceContentScript( 25001 )
-  {
-  }
+  { }
 
-  void onInit( InstanceContentPtr instance ) override
+  void onInit( InstanceContent& instance ) override
   {
-    instance->registerEObj( "Pumpkinchest", 2007385, 0, 4, { 72.176666f, -0.000001f, 8.325592f }, 1.000000f,
-                            0.000000f );
-    instance->registerEObj( "Crypticnote", 2007394, 0, 4, { 77.017143f, 0.000000f, 7.811212f }, 1.000000f, 0.000000f );
-    instance->registerEObj( "Curiousswitch", 2007406, 0, 4, { 75.432663f, 0.000000f, 9.083635f }, 1.000000f,
-                            0.000000f );
-    instance->registerEObj( "Goldbasket", 2007407, 0, 4, { 67.265839f, -0.000000f, 8.740001f }, 1.000000f, 0.000000f );
-    instance->registerEObj( "Silverbasket", 2007408, 0, 4, { 69.001480f, 0.000000f, 7.453632f }, 1.000000f, 0.000000f );
-    instance->registerEObj( "Bronzebasket", 2007409, 0, 4, { 65.439072f, 0.000000f, 7.248850f }, 1.000000f, 0.000000f );
-    instance->registerEObj( "Jackolantern", 2007410, 0, 4, { 61.411270f, 0.000000f, 12.014820f }, 1.000000f,
-                            0.000000f );
-    instance->registerEObj( "Smolderingcoal", 2007411, 0, 4, { 58.469200f, -0.000000f, 11.999350f }, 1.000000f,
-                            0.000000f );
-    instance->registerEObj( "Truesightsmokebomb", 2007412, 0, 4, { 55.969971f, 0.000000f, 12.118080f }, 1.000000f,
-                            0.000000f );
-    instance->registerEObj( "Pumpkincoffer", 2007413, 0, 4, { 53.116581f, -0.015320f, 12.344480f }, 0.991760f,
-                            0.000048f );
-    instance->registerEObj( "Exit", 2000139, 0, 4, { 15.229340f, -18.678320f, -0.619758f }, 1.000000f, 0.000000f );
-    instance->registerEObj( "Obfuscationcharm", 2007414, 0, 4, { 54.995380f, 0.000000f, 9.411625f }, 1.000000f,
-                            0.000000f );
-    instance->registerEObj( "Jackinthebox", 2007547, 0, 4, { 69.704788f, 0.000000f, 10.012170f }, 1.000000f,
-                            0.000000f );
-    instance->registerEObj( "Suspiciouspumpkin", 2007548, 0, 4, { 67.828171f, 0.000000f, 10.094330f }, 1.000000f,
-                            0.000000f );
-    instance->registerEObj( "Suspiciouschest", 2007562, 0, 4, { 3.501173f, -18.779980f, -0.195926f }, 1.000000f,
-                            1.568754f );
-    instance->registerEObj( "Entrance", 2000182, 6381325, 5, { 73.499107f, -0.000000f, 4.652901f }, 1.000000f,
-                            0.000000f );
-    // States -> vf_lock_on vf_lock_of
+    instance.registerEObj( "Pumpkinchest", 2007385, 0, 4, { 72.176666f, -0.000001f, 8.325592f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "Crypticnote", 2007394, 0, 4, { 77.017143f, 0.000000f, 7.811212f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "Curiousswitch", 2007406, 0, 4, { 75.432663f, 0.000000f, 9.083635f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "Goldbasket", 2007407, 0, 4, { 67.265839f, -0.000000f, 8.740001f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "Silverbasket", 2007408, 0, 4, { 69.001480f, 0.000000f, 7.453632f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "Bronzebasket", 2007409, 0, 4, { 65.439072f, 0.000000f, 7.248850f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "Jackolantern", 2007410, 0, 4, { 61.411270f, 0.000000f, 12.014820f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "Smolderingcoal", 2007411, 0, 4, { 58.469200f, -0.000000f, 11.999350f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "Truesightsmokebomb", 2007412, 0, 4, { 55.969971f, 0.000000f, 12.118080f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "Pumpkincoffer", 2007413, 0, 4, { 53.116581f, -0.015320f, 12.344480f }, 0.991760f, 0.000048f ); 
+    instance.registerEObj( "Exit", 2000139, 0, 4, { 15.229340f, -18.678320f, -0.619758f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "Obfuscationcharm", 2007414, 0, 4, { 54.995380f, 0.000000f, 9.411625f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "Jackinthebox", 2007547, 0, 4, { 69.704788f, 0.000000f, 10.012170f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "Suspiciouspumpkin", 2007548, 0, 4, { 67.828171f, 0.000000f, 10.094330f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "Suspiciouschest", 2007562, 0, 4, { 3.501173f, -18.779980f, -0.195926f }, 1.000000f, 1.568754f ); 
+    instance.registerEObj( "Entrance", 2000182, 6381325, 5, { 73.499107f, -0.000000f, 4.652901f }, 1.000000f, 0.000000f ); 
+      // States -> vf_lock_on (id: 11) vf_lock_of (id: 12) 
 
   }
 
-  void onUpdate( InstanceContentPtr instance, uint32_t currTime ) override
+  void onUpdate( InstanceContent& instance, uint32_t currTime ) override
   {
 
   }
 
-  void onEnterTerritory( InstanceContentPtr instance, Entity::Player& player, uint32_t eventId, uint16_t param1,
+  void onEnterTerritory( InstanceContent& instance, Entity::Player& player, uint32_t eventId, uint16_t param1,
                          uint16_t param2 ) override
   {
 
diff --git a/src/scripts/instances/events/TheValentionesCeremony.cpp b/src/scripts/instances/events/TheValentionesCeremony.cpp
index 06796ba4..994b312d 100644
--- a/src/scripts/instances/events/TheValentionesCeremony.cpp
+++ b/src/scripts/instances/events/TheValentionesCeremony.cpp
@@ -9,108 +9,64 @@ class TheValentionesCeremony :
 public:
   TheValentionesCeremony() :
     Sapphire::ScriptAPI::InstanceContentScript( 25002 )
-  {
-  }
+  { }
 
-  void onInit( InstanceContentPtr instance ) override
+  void onInit( InstanceContent& instance ) override
   {
-    instance->registerEObj( "sgbg_f1e9_g1_swt01", 2007457, 7231658, 4, { -3.500000f, -6.000000f, -42.000000f },
-                            0.991760f, 0.000048f );
-    instance->registerEObj( "sgbg_f1e9_g1_gat03", 2007457, 7231654, 4, { 17.466560f, -6.000000f, -45.513531f },
-                            0.991760f, 0.000048f );
-    instance->registerEObj( "sgbg_f1e9_g1_swt01_1", 2007457, 7231667, 4, { 18.500000f, -6.000000f, -59.500000f },
-                            0.991760f, 0.000048f );
-    instance->registerEObj( "sgbg_f1e9_g1_gat03_1", 2007457, 7231666, 4, { -9.500000f, -6.000000f, -68.500000f },
-                            0.991760f, 0.000048f );
-    instance->registerEObj( "sgbg_f1e9_g1_swt01_2", 2007457, 7231668, 4, { -18.500000f, -6.000000f, -59.500000f },
-                            0.991760f, 0.000048f );
-    instance->registerEObj( "sgbg_f1e9_g1_gat03_2", 2007457, 7231669, 4, { 11.489990f, -6.027344f, -68.528320f },
-                            0.991760f, 0.000048f );
-    instance->registerEObj( "sgbg_f1e9_g1_swt01_3", 2007457, 7231672, 4, { 15.495000f, -6.027344f, -77.500671f },
-                            0.991760f, 0.000048f );
-    instance->registerEObj( "sgbg_f1e9_g1_gat03_3", 2007457, 7231671, 4, { -16.500000f, -6.000000f, -71.500000f },
-                            1.000000f, -0.000000f );
-    instance->registerEObj( "sgbg_f1e9_g1_swt01_4", 2007457, 7231673, 4, { 8.500000f, -8.000000f, -95.199997f },
-                            1.000000f, -0.000000f );
-    instance->registerEObj( "sgbg_f1e9_g1_gat03_4", 2007457, 7231674, 4, { -6.515625f, -8.011047f, -92.729057f },
-                            0.991760f, 0.000048f );
-    instance->registerEObj( "sgbg_f1e9_g1_swt01_5", 2007457, 7231677, 4, { -6.500000f, -8.000000f, -89.699997f },
-                            1.000000f, -0.000000f );
-    instance->registerEObj( "sgbg_f1e9_g1_gat03_5", 2007457, 7231676, 4, { 8.475829f, -8.011047f, -101.701401f },
-                            0.991760f, 0.000048f );
-    instance->registerEObj( "sgbg_f1e9_g1_swt01_6", 2007457, 7231678, 4, { -18.500000f, -8.000000f, -112.699997f },
-                            1.000000f, -0.000000f );
-    instance->registerEObj( "sgbg_f1e9_g1_gat03_6", 2007457, 7231679, 4, { 14.500000f, -8.000000f, -111.699997f },
-                            1.000000f, -0.000000f );
-    instance->registerEObj( "sgbg_f1e9_g1_swt01_7", 2007457, 7231681, 4, { 10.000000f, -8.000000f, -134.699997f },
-                            0.991760f, 0.000048f );
-    instance->registerEObj( "sgbg_f1e9_g1_gat03_7", 2007457, 7231680, 4, { -15.500000f, -8.000000f, -127.699997f },
-                            1.000000f, -0.000000f );
-    instance->registerEObj( "sgbg_f1e9_g1_swt01_8", 2007457, 7231683, 4, { -16.500000f, -10.000000f, -160.699997f },
-                            1.000000f, -0.000000f );
-    instance->registerEObj( "sgbg_f1e9_g1_gat03_8", 2007457, 7231684, 4, { 3.558000f, -10.000000f, -150.699997f },
-                            1.000000f, 0.000000f );
-    instance->registerEObj( "sgbg_f1e9_g1_swt01_9", 2007457, 7231686, 4, { 6.499207f, -10.025270f, -172.723999f },
-                            0.991760f, 0.000048f );
-    instance->registerEObj( "sgbg_f1e9_g1_gat03_9", 2007457, 7231687, 4, { -17.471680f, -10.025270f, -170.716904f },
-                            0.991760f, 0.000048f );
-    instance->registerEObj( "sgbg_f1e9_g1_swt01_10", 2007457, 7231689, 4, { 18.500000f, -10.000000f, -190.199997f },
-                            1.000000f, -0.000000f );
-    instance->registerEObj( "sgbg_f1e9_g1_gat03_10", 2007457, 7231688, 4, { -3.550100f, -10.000000f, -186.699997f },
-                            1.000000f, 0.000000f );
-    instance->registerEObj( "sgbg_f1e9_g1_swt01_11", 2007457, 7231690, 4, { -18.500000f, -10.000000f, -190.199997f },
-                            1.000000f, -0.000000f );
-    instance->registerEObj( "sgbg_f1e9_g1_gat03_11", 2007457, 7231691, 4, { 3.550100f, -10.000000f, -186.699997f },
-                            1.000000f, -0.000000f );
-    instance->registerEObj( "unknown_0", 2007457, 7171421, 4, { -0.007954f, -11.881100f, -230.514008f }, 1.000000f,
-                            0.000000f );
-    instance->registerEObj( "sgvf_f1e9_b1321", 2007457, 7231843, 4, { 0.006785f, -11.881100f, -253.447296f }, 1.000000f,
-                            0.000000f );
-    instance->registerEObj( "ValentionesDaycard", 2009385, 7231795, 4, { -5.426984f, -11.917360f, -260.462494f },
-                            0.991760f, 0.000048f );
-    instance->registerEObj( "ValentionesDaycard_1", 2009387, 7231796, 4, { -9.668927f, -11.917360f, -260.401611f },
-                            0.991760f, 0.000048f );
-    instance->registerEObj( "ValentionesDaycard_2", 2009388, 7231797, 4, { -6.021372f, -11.917360f, -253.618393f },
-                            0.991760f, 0.000048f );
-    instance->registerEObj( "ValentionesDaycard_3", 2009389, 7231798, 4, { -10.334230f, -11.917360f, -253.545105f },
-                            0.991760f, 0.000048f );
-    instance->registerEObj( "ValentionesDaycard_4", 2009390, 7231799, 4, { -4.210987f, -11.917360f, -246.692703f },
-                            0.991760f, 0.000048f );
-    instance->registerEObj( "ValentionesDaycard_5", 2009391, 7231800, 4, { -8.330921f, -11.917360f, -246.662094f },
-                            0.991760f, 0.000048f );
-    instance->registerEObj( "ValentionesDaycard_6", 2009392, 7231801, 4, { 5.258507f, -11.917360f, -260.425812f },
-                            0.991760f, 0.000048f );
-    instance->registerEObj( "ValentionesDaycard_7", 2009393, 7231802, 4, { 9.500511f, -11.917360f, -260.425812f },
-                            0.991760f, 0.000048f );
-    instance->registerEObj( "ValentionesDaycard_8", 2009394, 7231803, 4, { 6.041663f, -11.881100f, -253.545105f },
-                            0.991760f, 0.000048f );
-    instance->registerEObj( "ValentionesDaycard_9", 2009395, 7231804, 4, { 10.315010f, -11.881100f, -253.545105f },
-                            0.991760f, 0.000048f );
-    instance->registerEObj( "ValentionesDaycard_10", 2009396, 7231805, 4, { 3.961101f, -11.917360f, -246.662094f },
-                            0.991760f, 0.000048f );
-    instance->registerEObj( "ValentionesDaycard_11", 2009397, 7231806, 4, { 8.203044f, -11.917360f, -246.662094f },
-                            0.991760f, 0.000048f );
-    instance->registerEObj( "Entrance", 2000182, 7186874, 5, { -0.017344f, 0.700000f, 15.850460f }, 1.000000f,
-                            0.000000f );
-    // States -> vf_lock_on vf_lock_of
-    instance->registerEObj( "Exit", 2000139, 0, 4, { 0.151178f, -11.881100f, -262.439209f }, 1.000000f, 0.000000f );
-    instance->registerEObj( "unknown_1", 2007457, 7167001, 4, { -0.198283f, 0.437501f, 3.359166f }, 1.000000f,
-                            0.000000f );
-    instance->registerEObj( "unknown_2", 2007457, 7167005, 4, { -10.222270f, -6.000000f, -25.717331f }, 1.000000f,
-                            0.000000f );
-    instance->registerEObj( "unknown_3", 2007457, 7167002, 4, { 10.259260f, -6.000000f, -25.717331f }, 1.000000f,
-                            0.000000f );
-    instance->registerEObj( "unknown_4", 2007457, 7154005, 4, { -0.045776f, -11.734250f, -210.009903f }, 0.991760f,
-                            0.000048f );
+    instance.registerEObj( "sgbg_f1e9_g1_swt01", 2007457, 7231658, 4, { -3.500000f, -6.000000f, -42.000000f }, 0.991760f, 0.000048f ); 
+    instance.registerEObj( "sgbg_f1e9_g1_gat03", 2007457, 7231654, 4, { 17.466560f, -6.000000f, -45.513531f }, 0.991760f, 0.000048f ); 
+    instance.registerEObj( "sgbg_f1e9_g1_swt01_1", 2007457, 7231667, 4, { 18.500000f, -6.000000f, -59.500000f }, 0.991760f, 0.000048f ); 
+    instance.registerEObj( "sgbg_f1e9_g1_gat03_1", 2007457, 7231666, 4, { -9.500000f, -6.000000f, -68.500000f }, 0.991760f, 0.000048f ); 
+    instance.registerEObj( "sgbg_f1e9_g1_swt01_2", 2007457, 7231668, 4, { -18.500000f, -6.000000f, -59.500000f }, 0.991760f, 0.000048f ); 
+    instance.registerEObj( "sgbg_f1e9_g1_gat03_2", 2007457, 7231669, 4, { 11.489990f, -6.027344f, -68.528320f }, 0.991760f, 0.000048f ); 
+    instance.registerEObj( "sgbg_f1e9_g1_swt01_3", 2007457, 7231672, 4, { 15.495000f, -6.027344f, -77.500671f }, 0.991760f, 0.000048f ); 
+    instance.registerEObj( "sgbg_f1e9_g1_gat03_3", 2007457, 7231671, 4, { -16.500000f, -6.000000f, -71.500000f }, 1.000000f, -0.000000f ); 
+    instance.registerEObj( "sgbg_f1e9_g1_swt01_4", 2007457, 7231673, 4, { 8.500000f, -8.000000f, -95.199997f }, 1.000000f, -0.000000f ); 
+    instance.registerEObj( "sgbg_f1e9_g1_gat03_4", 2007457, 7231674, 4, { -6.515625f, -8.011047f, -92.729057f }, 0.991760f, 0.000048f ); 
+    instance.registerEObj( "sgbg_f1e9_g1_swt01_5", 2007457, 7231677, 4, { -6.500000f, -8.000000f, -89.699997f }, 1.000000f, -0.000000f ); 
+    instance.registerEObj( "sgbg_f1e9_g1_gat03_5", 2007457, 7231676, 4, { 8.475829f, -8.011047f, -101.701401f }, 0.991760f, 0.000048f ); 
+    instance.registerEObj( "sgbg_f1e9_g1_swt01_6", 2007457, 7231678, 4, { -18.500000f, -8.000000f, -112.699997f }, 1.000000f, -0.000000f ); 
+    instance.registerEObj( "sgbg_f1e9_g1_gat03_6", 2007457, 7231679, 4, { 14.500000f, -8.000000f, -111.699997f }, 1.000000f, -0.000000f ); 
+    instance.registerEObj( "sgbg_f1e9_g1_swt01_7", 2007457, 7231681, 4, { 10.000000f, -8.000000f, -134.699997f }, 0.991760f, 0.000048f ); 
+    instance.registerEObj( "sgbg_f1e9_g1_gat03_7", 2007457, 7231680, 4, { -15.500000f, -8.000000f, -127.699997f }, 1.000000f, -0.000000f ); 
+    instance.registerEObj( "sgbg_f1e9_g1_swt01_8", 2007457, 7231683, 4, { -16.500000f, -10.000000f, -160.699997f }, 1.000000f, -0.000000f ); 
+    instance.registerEObj( "sgbg_f1e9_g1_gat03_8", 2007457, 7231684, 4, { 3.558000f, -10.000000f, -150.699997f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "sgbg_f1e9_g1_swt01_9", 2007457, 7231686, 4, { 6.499207f, -10.025270f, -172.723999f }, 0.991760f, 0.000048f ); 
+    instance.registerEObj( "sgbg_f1e9_g1_gat03_9", 2007457, 7231687, 4, { -17.471680f, -10.025270f, -170.716904f }, 0.991760f, 0.000048f ); 
+    instance.registerEObj( "sgbg_f1e9_g1_swt01_10", 2007457, 7231689, 4, { 18.500000f, -10.000000f, -190.199997f }, 1.000000f, -0.000000f ); 
+    instance.registerEObj( "sgbg_f1e9_g1_gat03_10", 2007457, 7231688, 4, { -3.550100f, -10.000000f, -186.699997f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "sgbg_f1e9_g1_swt01_11", 2007457, 7231690, 4, { -18.500000f, -10.000000f, -190.199997f }, 1.000000f, -0.000000f ); 
+    instance.registerEObj( "sgbg_f1e9_g1_gat03_11", 2007457, 7231691, 4, { 3.550100f, -10.000000f, -186.699997f }, 1.000000f, -0.000000f ); 
+    instance.registerEObj( "unknown_0", 2007457, 7171421, 4, { -0.007954f, -11.881100f, -230.514008f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "sgvf_f1e9_b1321", 2007457, 7231843, 4, { 0.006785f, -11.881100f, -253.447296f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "ValentionesDaycard", 2009385, 7231795, 4, { -5.426984f, -11.917360f, -260.462494f }, 0.991760f, 0.000048f ); 
+    instance.registerEObj( "ValentionesDaycard_1", 2009387, 7231796, 4, { -9.668927f, -11.917360f, -260.401611f }, 0.991760f, 0.000048f ); 
+    instance.registerEObj( "ValentionesDaycard_2", 2009388, 7231797, 4, { -6.021372f, -11.917360f, -253.618393f }, 0.991760f, 0.000048f ); 
+    instance.registerEObj( "ValentionesDaycard_3", 2009389, 7231798, 4, { -10.334230f, -11.917360f, -253.545105f }, 0.991760f, 0.000048f ); 
+    instance.registerEObj( "ValentionesDaycard_4", 2009390, 7231799, 4, { -4.210987f, -11.917360f, -246.692703f }, 0.991760f, 0.000048f ); 
+    instance.registerEObj( "ValentionesDaycard_5", 2009391, 7231800, 4, { -8.330921f, -11.917360f, -246.662094f }, 0.991760f, 0.000048f ); 
+    instance.registerEObj( "ValentionesDaycard_6", 2009392, 7231801, 4, { 5.258507f, -11.917360f, -260.425812f }, 0.991760f, 0.000048f ); 
+    instance.registerEObj( "ValentionesDaycard_7", 2009393, 7231802, 4, { 9.500511f, -11.917360f, -260.425812f }, 0.991760f, 0.000048f ); 
+    instance.registerEObj( "ValentionesDaycard_8", 2009394, 7231803, 4, { 6.041663f, -11.881100f, -253.545105f }, 0.991760f, 0.000048f ); 
+    instance.registerEObj( "ValentionesDaycard_9", 2009395, 7231804, 4, { 10.315010f, -11.881100f, -253.545105f }, 0.991760f, 0.000048f ); 
+    instance.registerEObj( "ValentionesDaycard_10", 2009396, 7231805, 4, { 3.961101f, -11.917360f, -246.662094f }, 0.991760f, 0.000048f ); 
+    instance.registerEObj( "ValentionesDaycard_11", 2009397, 7231806, 4, { 8.203044f, -11.917360f, -246.662094f }, 0.991760f, 0.000048f ); 
+    instance.registerEObj( "Entrance", 2000182, 7186874, 5, { -0.017344f, 0.700000f, 15.850460f }, 1.000000f, 0.000000f ); 
+      // States -> vf_lock_on (id: 11) vf_lock_of (id: 12) 
+    instance.registerEObj( "Exit", 2000139, 0, 4, { 0.151178f, -11.881100f, -262.439209f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_1", 2007457, 7167001, 4, { -0.198283f, 0.437501f, 3.359166f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_2", 2007457, 7167005, 4, { -10.222270f, -6.000000f, -25.717331f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_3", 2007457, 7167002, 4, { 10.259260f, -6.000000f, -25.717331f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_4", 2007457, 7154005, 4, { -0.045776f, -11.734250f, -210.009903f }, 0.991760f, 0.000048f ); 
 
   }
 
-  void onUpdate( InstanceContentPtr instance, uint32_t currTime ) override
+  void onUpdate( InstanceContent& instance, uint32_t currTime ) override
   {
 
   }
 
-  void onEnterTerritory( InstanceContentPtr instance, Entity::Player& player, uint32_t eventId, uint16_t param1,
+  void onEnterTerritory( InstanceContent& instance, Entity::Player& player, uint32_t eventId, uint16_t param1,
                          uint16_t param2 ) override
   {
 
diff --git a/src/scripts/instances/goldsaucer/AirForceOne.cpp b/src/scripts/instances/goldsaucer/AirForceOne.cpp
new file mode 100644
index 00000000..f864f8a4
--- /dev/null
+++ b/src/scripts/instances/goldsaucer/AirForceOne.cpp
@@ -0,0 +1,37 @@
+#include <ScriptObject.h>
+#include <Territory/InstanceContent.h>
+
+using namespace Sapphire;
+
+class AirForceOne :
+  public Sapphire::ScriptAPI::InstanceContentScript
+{
+public:
+  AirForceOne() :
+    Sapphire::ScriptAPI::InstanceContentScript( 62002 )
+  { }
+
+  void onInit( InstanceContent& instance ) override
+  {
+    instance.registerEObj( "unknown_0", 2009676, 0, 4, { -4.593018f, -8.655450f, 3.738403f }, 0.991760f, 0.000048f ); 
+    instance.registerEObj( "unknown_1", 2009677, 0, 4, { -4.318359f, -8.655450f, 5.050659f }, 0.991760f, 0.000048f ); 
+    instance.registerEObj( "unknown_2", 2009678, 0, 4, { -3.891113f, -8.655450f, 6.485046f }, 0.991760f, 0.000048f ); 
+    instance.registerEObj( "unknown_3", 2009679, 0, 4, { -4.837158f, -8.655450f, 2.639771f }, 0.991760f, 0.000048f ); 
+    instance.registerEObj( "unknown_4", 2009695, 0, 4, { -6.729248f, -8.655450f, -1.693787f }, 0.991760f, 0.000048f ); 
+
+  }
+
+  void onUpdate( InstanceContent& instance, uint32_t currTime ) override
+  {
+
+  }
+
+  void onEnterTerritory( InstanceContent& instance, Entity::Player& player, uint32_t eventId, uint16_t param1,
+                         uint16_t param2 ) override
+  {
+
+  }
+
+};
+
+EXPOSE_SCRIPT( AirForceOne );
\ No newline at end of file
diff --git a/src/scripts/instances/goldsaucer/mahjong/AdvancedMahjongRanked.cpp b/src/scripts/instances/goldsaucer/mahjong/AdvancedMahjongRanked.cpp
new file mode 100644
index 00000000..df6f588a
--- /dev/null
+++ b/src/scripts/instances/goldsaucer/mahjong/AdvancedMahjongRanked.cpp
@@ -0,0 +1,33 @@
+#include <ScriptObject.h>
+#include <Territory/InstanceContent.h>
+
+using namespace Sapphire;
+
+class AdvancedMahjongRanked :
+  public Sapphire::ScriptAPI::InstanceContentScript
+{
+public:
+  AdvancedMahjongRanked() :
+    Sapphire::ScriptAPI::InstanceContentScript( 61002 )
+  { }
+
+  void onInit( InstanceContent& instance ) override
+  {
+    instance.registerEObj( "unknown_0", 2007457, 7842765, 4, { 100.083900f, 0.472961f, 99.900757f }, 0.991760f, 0.000048f ); 
+
+  }
+
+  void onUpdate( InstanceContent& instance, uint32_t currTime ) override
+  {
+
+  }
+
+  void onEnterTerritory( InstanceContent& instance, Entity::Player& player, uint32_t eventId, uint16_t param1,
+                         uint16_t param2 ) override
+  {
+
+  }
+
+};
+
+EXPOSE_SCRIPT( AdvancedMahjongRanked );
\ No newline at end of file
diff --git a/src/scripts/instances/goldsaucer/mahjong/FourplayerMahjongKuitanDisabled.cpp b/src/scripts/instances/goldsaucer/mahjong/FourplayerMahjongKuitanDisabled.cpp
new file mode 100644
index 00000000..4eb0d210
--- /dev/null
+++ b/src/scripts/instances/goldsaucer/mahjong/FourplayerMahjongKuitanDisabled.cpp
@@ -0,0 +1,33 @@
+#include <ScriptObject.h>
+#include <Territory/InstanceContent.h>
+
+using namespace Sapphire;
+
+class FourplayerMahjongKuitanDisabled :
+  public Sapphire::ScriptAPI::InstanceContentScript
+{
+public:
+  FourplayerMahjongKuitanDisabled() :
+    Sapphire::ScriptAPI::InstanceContentScript( 61004 )
+  { }
+
+  void onInit( InstanceContent& instance ) override
+  {
+    instance.registerEObj( "unknown_0", 2007457, 7842765, 4, { 100.083900f, 0.472961f, 99.900757f }, 0.991760f, 0.000048f ); 
+
+  }
+
+  void onUpdate( InstanceContent& instance, uint32_t currTime ) override
+  {
+
+  }
+
+  void onEnterTerritory( InstanceContent& instance, Entity::Player& player, uint32_t eventId, uint16_t param1,
+                         uint16_t param2 ) override
+  {
+
+  }
+
+};
+
+EXPOSE_SCRIPT( FourplayerMahjongKuitanDisabled );
\ No newline at end of file
diff --git a/src/scripts/instances/goldsaucer/mahjong/FourplayerMahjongKuitanEnabled.cpp b/src/scripts/instances/goldsaucer/mahjong/FourplayerMahjongKuitanEnabled.cpp
new file mode 100644
index 00000000..727283f8
--- /dev/null
+++ b/src/scripts/instances/goldsaucer/mahjong/FourplayerMahjongKuitanEnabled.cpp
@@ -0,0 +1,33 @@
+#include <ScriptObject.h>
+#include <Territory/InstanceContent.h>
+
+using namespace Sapphire;
+
+class FourplayerMahjongKuitanEnabled :
+  public Sapphire::ScriptAPI::InstanceContentScript
+{
+public:
+  FourplayerMahjongKuitanEnabled() :
+    Sapphire::ScriptAPI::InstanceContentScript( 61003 )
+  { }
+
+  void onInit( InstanceContent& instance ) override
+  {
+    instance.registerEObj( "unknown_0", 2007457, 7842765, 4, { 100.083900f, 0.472961f, 99.900757f }, 0.991760f, 0.000048f ); 
+
+  }
+
+  void onUpdate( InstanceContent& instance, uint32_t currTime ) override
+  {
+
+  }
+
+  void onEnterTerritory( InstanceContent& instance, Entity::Player& player, uint32_t eventId, uint16_t param1,
+                         uint16_t param2 ) override
+  {
+
+  }
+
+};
+
+EXPOSE_SCRIPT( FourplayerMahjongKuitanEnabled );
\ No newline at end of file
diff --git a/src/scripts/instances/goldsaucer/mahjong/NoviceMahjongRanked.cpp b/src/scripts/instances/goldsaucer/mahjong/NoviceMahjongRanked.cpp
new file mode 100644
index 00000000..5da77f34
--- /dev/null
+++ b/src/scripts/instances/goldsaucer/mahjong/NoviceMahjongRanked.cpp
@@ -0,0 +1,33 @@
+#include <ScriptObject.h>
+#include <Territory/InstanceContent.h>
+
+using namespace Sapphire;
+
+class NoviceMahjongRanked :
+  public Sapphire::ScriptAPI::InstanceContentScript
+{
+public:
+  NoviceMahjongRanked() :
+    Sapphire::ScriptAPI::InstanceContentScript( 61001 )
+  { }
+
+  void onInit( InstanceContent& instance ) override
+  {
+    instance.registerEObj( "unknown_0", 2007457, 7842765, 4, { 100.083900f, 0.472961f, 99.900757f }, 0.991760f, 0.000048f ); 
+
+  }
+
+  void onUpdate( InstanceContent& instance, uint32_t currTime ) override
+  {
+
+  }
+
+  void onEnterTerritory( InstanceContent& instance, Entity::Player& player, uint32_t eventId, uint16_t param1,
+                         uint16_t param2 ) override
+  {
+
+  }
+
+};
+
+EXPOSE_SCRIPT( NoviceMahjongRanked );
\ No newline at end of file
diff --git a/src/scripts/instances/guildhests/AllsWellthatEndsintheWell.cpp b/src/scripts/instances/guildhests/AllsWellthatEndsintheWell.cpp
index 88fee5c6..a6f2a60a 100644
--- a/src/scripts/instances/guildhests/AllsWellthatEndsintheWell.cpp
+++ b/src/scripts/instances/guildhests/AllsWellthatEndsintheWell.cpp
@@ -9,24 +9,22 @@ class AllsWellthatEndsintheWell :
 public:
   AllsWellthatEndsintheWell() :
     Sapphire::ScriptAPI::InstanceContentScript( 10007 )
-  {
-  }
+  { }
 
-  void onInit( InstanceContentPtr instance ) override
+  void onInit( InstanceContent& instance ) override
   {
-    instance->registerEObj( "Entrance", 2000182, 5021407, 5, { 623.000000f, 23.872311f, 94.505638f }, 1.000000f,
-                            0.000000f );
-    // States -> vf_lock_on vf_lock_of
-    instance->registerEObj( "Exit", 2000139, 0, 4, { 623.000000f, 23.656260f, 61.956181f }, 1.000000f, 0.000000f );
+    instance.registerEObj( "Entrance", 2000182, 5021407, 5, { 623.000000f, 23.872311f, 94.505638f }, 1.000000f, 0.000000f ); 
+      // States -> vf_lock_on (id: 11) vf_lock_of (id: 12) 
+    instance.registerEObj( "Exit", 2000139, 0, 4, { 623.000000f, 23.656260f, 61.956181f }, 1.000000f, 0.000000f ); 
 
   }
 
-  void onUpdate( InstanceContentPtr instance, uint32_t currTime ) override
+  void onUpdate( InstanceContent& instance, uint32_t currTime ) override
   {
 
   }
 
-  void onEnterTerritory( InstanceContentPtr instance, Entity::Player& player, uint32_t eventId, uint16_t param1,
+  void onEnterTerritory( InstanceContent& instance, Entity::Player& player, uint32_t eventId, uint16_t param1,
                          uint16_t param2 ) override
   {
 
diff --git a/src/scripts/instances/guildhests/AnnoytheVoid.cpp b/src/scripts/instances/guildhests/AnnoytheVoid.cpp
index b4e0ad7b..82c0ce83 100644
--- a/src/scripts/instances/guildhests/AnnoytheVoid.cpp
+++ b/src/scripts/instances/guildhests/AnnoytheVoid.cpp
@@ -9,20 +9,19 @@ class AnnoytheVoid :
 public:
   AnnoytheVoid() :
     Sapphire::ScriptAPI::InstanceContentScript( 10010 )
-  {
-  }
+  { }
 
-  void onInit( InstanceContentPtr instance ) override
+  void onInit( InstanceContent& instance ) override
   {
 
   }
 
-  void onUpdate( InstanceContentPtr instance, uint32_t currTime ) override
+  void onUpdate( InstanceContent& instance, uint32_t currTime ) override
   {
 
   }
 
-  void onEnterTerritory( InstanceContentPtr instance, Entity::Player& player, uint32_t eventId, uint16_t param1,
+  void onEnterTerritory( InstanceContent& instance, Entity::Player& player, uint32_t eventId, uint16_t param1,
                          uint16_t param2 ) override
   {
 
diff --git a/src/scripts/instances/guildhests/BasicTrainingEnemyParties.cpp b/src/scripts/instances/guildhests/BasicTrainingEnemyParties.cpp
index 33d52434..eb485ce3 100644
--- a/src/scripts/instances/guildhests/BasicTrainingEnemyParties.cpp
+++ b/src/scripts/instances/guildhests/BasicTrainingEnemyParties.cpp
@@ -9,20 +9,19 @@ class BasicTrainingEnemyParties :
 public:
   BasicTrainingEnemyParties() :
     Sapphire::ScriptAPI::InstanceContentScript( 10001 )
-  {
-  }
+  { }
 
-  void onInit( InstanceContentPtr instance ) override
+  void onInit( InstanceContent& instance ) override
   {
 
   }
 
-  void onUpdate( InstanceContentPtr instance, uint32_t currTime ) override
+  void onUpdate( InstanceContent& instance, uint32_t currTime ) override
   {
 
   }
 
-  void onEnterTerritory( InstanceContentPtr instance, Entity::Player& player, uint32_t eventId, uint16_t param1,
+  void onEnterTerritory( InstanceContent& instance, Entity::Player& player, uint32_t eventId, uint16_t param1,
                          uint16_t param2 ) override
   {
 
diff --git a/src/scripts/instances/guildhests/BasicTrainingEnemyStrongholds.cpp b/src/scripts/instances/guildhests/BasicTrainingEnemyStrongholds.cpp
index ff222abe..bea673fc 100644
--- a/src/scripts/instances/guildhests/BasicTrainingEnemyStrongholds.cpp
+++ b/src/scripts/instances/guildhests/BasicTrainingEnemyStrongholds.cpp
@@ -9,26 +9,23 @@ class BasicTrainingEnemyStrongholds :
 public:
   BasicTrainingEnemyStrongholds() :
     Sapphire::ScriptAPI::InstanceContentScript( 10003 )
-  {
-  }
+  { }
 
-  void onInit( InstanceContentPtr instance ) override
+  void onInit( InstanceContent& instance ) override
   {
-    instance->registerEObj( "Exit", 2000605, 0, 4, { -715.942383f, 69.420113f, -830.370300f }, 1.000000f, 0.000000f );
-    instance->registerEObj( "unknown_0", 2000606, 3861081, 4, { -670.462280f, 63.293751f, -801.510986f }, 1.000000f,
-                            0.000000f );
-    instance->registerEObj( "Entrance", 2000604, 4262798, 5, { -677.634888f, 64.116386f, -803.174927f }, 1.000000f,
-                            0.000000f );
-    // States -> vf_lock_on vf_lock_of
+    instance.registerEObj( "Exit", 2000605, 0, 4, { -715.942383f, 69.420113f, -830.370300f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_0", 2000606, 3861081, 4, { -670.462280f, 63.293751f, -801.510986f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "Entrance", 2000604, 4262798, 5, { -677.634888f, 64.116386f, -803.174927f }, 1.000000f, 0.000000f ); 
+      // States -> vf_lock_on (id: 11) vf_lock_of (id: 12) 
 
   }
 
-  void onUpdate( InstanceContentPtr instance, uint32_t currTime ) override
+  void onUpdate( InstanceContent& instance, uint32_t currTime ) override
   {
 
   }
 
-  void onEnterTerritory( InstanceContentPtr instance, Entity::Player& player, uint32_t eventId, uint16_t param1,
+  void onEnterTerritory( InstanceContent& instance, Entity::Player& player, uint32_t eventId, uint16_t param1,
                          uint16_t param2 ) override
   {
 
diff --git a/src/scripts/instances/guildhests/FlickingSticksandTakingNames.cpp b/src/scripts/instances/guildhests/FlickingSticksandTakingNames.cpp
index c850d1a4..cc1a9e4e 100644
--- a/src/scripts/instances/guildhests/FlickingSticksandTakingNames.cpp
+++ b/src/scripts/instances/guildhests/FlickingSticksandTakingNames.cpp
@@ -9,22 +9,20 @@ class FlickingSticksandTakingNames :
 public:
   FlickingSticksandTakingNames() :
     Sapphire::ScriptAPI::InstanceContentScript( 10008 )
-  {
-  }
+  { }
 
-  void onInit( InstanceContentPtr instance ) override
+  void onInit( InstanceContent& instance ) override
   {
-    instance->registerEObj( "unknown_0", 2005192, 5760474, 4, { -51.493111f, 0.309087f, 71.436897f }, 1.000000f,
-                            -0.000006f );
+    instance.registerEObj( "unknown_0", 2005192, 5760474, 4, { -51.493111f, 0.309087f, 71.436897f }, 1.000000f, -0.000006f ); 
 
   }
 
-  void onUpdate( InstanceContentPtr instance, uint32_t currTime ) override
+  void onUpdate( InstanceContent& instance, uint32_t currTime ) override
   {
 
   }
 
-  void onEnterTerritory( InstanceContentPtr instance, Entity::Player& player, uint32_t eventId, uint16_t param1,
+  void onEnterTerritory( InstanceContent& instance, Entity::Player& player, uint32_t eventId, uint16_t param1,
                          uint16_t param2 ) override
   {
 
diff --git a/src/scripts/instances/guildhests/HeroontheHalfShell.cpp b/src/scripts/instances/guildhests/HeroontheHalfShell.cpp
index f15c288b..eca2fabe 100644
--- a/src/scripts/instances/guildhests/HeroontheHalfShell.cpp
+++ b/src/scripts/instances/guildhests/HeroontheHalfShell.cpp
@@ -9,20 +9,19 @@ class HeroontheHalfShell :
 public:
   HeroontheHalfShell() :
     Sapphire::ScriptAPI::InstanceContentScript( 10004 )
-  {
-  }
+  { }
 
-  void onInit( InstanceContentPtr instance ) override
+  void onInit( InstanceContent& instance ) override
   {
 
   }
 
-  void onUpdate( InstanceContentPtr instance, uint32_t currTime ) override
+  void onUpdate( InstanceContent& instance, uint32_t currTime ) override
   {
 
   }
 
-  void onEnterTerritory( InstanceContentPtr instance, Entity::Player& player, uint32_t eventId, uint16_t param1,
+  void onEnterTerritory( InstanceContent& instance, Entity::Player& player, uint32_t eventId, uint16_t param1,
                          uint16_t param2 ) override
   {
 
diff --git a/src/scripts/instances/guildhests/LongLivetheQueen.cpp b/src/scripts/instances/guildhests/LongLivetheQueen.cpp
index c4db2ebd..c6c9707e 100644
--- a/src/scripts/instances/guildhests/LongLivetheQueen.cpp
+++ b/src/scripts/instances/guildhests/LongLivetheQueen.cpp
@@ -9,52 +9,36 @@ class LongLivetheQueen :
 public:
   LongLivetheQueen() :
     Sapphire::ScriptAPI::InstanceContentScript( 10012 )
-  {
-  }
+  { }
 
-  void onInit( InstanceContentPtr instance ) override
+  void onInit( InstanceContent& instance ) override
   {
-    instance->registerEObj( "sgbg_w_qic_001_04a", 2006993, 6235274, 4, { -35.822102f, 298.899994f, -205.263199f },
-                            1.000000f, 0.000000f );
-    instance->registerEObj( "unknown_0", 2006952, 0, 4, { -35.712589f, 298.899994f, -204.878006f }, 1.000000f,
-                            0.000000f );
-    instance->registerEObj( "Exit", 2000139, 0, 4, { 556.049377f, 348.102509f, -752.435730f }, 1.000000f, 0.000000f );
-    instance->registerEObj( "Entrance", 2000182, 4600289, 5, { 523.532471f, 348.223389f, -736.685730f }, 1.000000f,
-                            0.000000f );
-    // States -> vf_lock_on vf_lock_of
-    instance->registerEObj( "unknown_1", 2002332, 0, 4, { 533.090881f, 348.691895f, -742.750916f }, 1.000000f,
-                            0.000000f );
-    instance->registerEObj( "unknown_2", 2002333, 0, 4, { 539.940430f, 348.836395f, -734.401489f }, 0.991760f,
-                            0.000048f );
-    instance->registerEObj( "unknown_3", 2000608, 3967803, 4, { 202.369598f, 257.761108f, 80.435272f }, 1.000000f,
-                            0.000000f );
-    instance->registerEObj( "unknown_4", 2000608, 3976993, 4, { 273.634705f, 254.600204f, 106.048500f }, 1.000000f,
-                            0.000000f );
-    instance->registerEObj( "unknown_5", 2000608, 3986797, 4, { 205.504898f, 246.188995f, 194.875702f }, 1.000000f,
-                            0.000000f );
-    instance->registerEObj( "unknown_6", 2000608, 3986798, 4, { 326.313385f, 239.193497f, 221.138901f }, 1.000000f,
-                            0.000000f );
-    instance->registerEObj( "unknown_7", 2000608, 2718481, 4, { 240.552307f, 302.769714f, -199.979996f }, 1.000000f,
-                            0.000000f );
-    instance->registerEObj( "unknown_8", 2000608, 4065433, 4, { 204.970001f, 302.119995f, -216.311600f }, 1.000000f,
-                            0.000000f );
-    instance->registerEObj( "unknown_9", 2000608, 2814617, 4, { 205.869995f, 302.219086f, -276.681396f }, 1.000000f,
-                            0.000000f );
-    instance->registerEObj( "unknown_10", 2000608, 2763112, 4, { -433.000000f, 211.007706f, -216.148605f }, 1.000000f,
-                            0.000000f );
-    instance->registerEObj( "unknown_11", 2000608, 4187649, 4, { -453.000000f, 211.000000f, -281.046600f }, 1.000000f,
-                            0.000000f );
-    instance->registerEObj( "unknown_12", 2000608, 4187961, 4, { -416.000000f, 210.788193f, -279.813812f }, 1.000000f,
-                            0.000000f );
+    instance.registerEObj( "sgbg_w_qic_001_04a", 2006993, 6235274, 4, { -35.822102f, 298.899994f, -205.263199f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_0", 2006952, 0, 4, { -35.712589f, 298.899994f, -204.878006f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "Exit", 2000139, 0, 4, { 556.049377f, 348.102509f, -752.435730f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "Entrance", 2000182, 4600289, 5, { 523.532471f, 348.223389f, -736.685730f }, 1.000000f, 0.000000f ); 
+      // States -> vf_lock_on (id: 11) vf_lock_of (id: 12) 
+    instance.registerEObj( "unknown_1", 2002332, 0, 4, { 533.090881f, 348.691895f, -742.750916f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_2", 2002333, 0, 4, { 539.940430f, 348.836395f, -734.401489f }, 0.991760f, 0.000048f ); 
+    instance.registerEObj( "unknown_3", 2000608, 3967803, 4, { 202.369598f, 257.761108f, 80.435272f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_4", 2000608, 3976993, 4, { 273.634705f, 254.600204f, 106.048500f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_5", 2000608, 3986797, 4, { 205.504898f, 246.188995f, 194.875702f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_6", 2000608, 3986798, 4, { 326.313385f, 239.193497f, 221.138901f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_7", 2000608, 2718481, 4, { 240.552307f, 302.769714f, -199.979996f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_8", 2000608, 4065433, 4, { 204.970001f, 302.119995f, -216.311600f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_9", 2000608, 2814617, 4, { 205.869995f, 302.219086f, -276.681396f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_10", 2000608, 2763112, 4, { -433.000000f, 211.007706f, -216.148605f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_11", 2000608, 4187649, 4, { -453.000000f, 211.000000f, -281.046600f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_12", 2000608, 4187961, 4, { -416.000000f, 210.788193f, -279.813812f }, 1.000000f, 0.000000f ); 
 
   }
 
-  void onUpdate( InstanceContentPtr instance, uint32_t currTime ) override
+  void onUpdate( InstanceContent& instance, uint32_t currTime ) override
   {
 
   }
 
-  void onEnterTerritory( InstanceContentPtr instance, Entity::Player& player, uint32_t eventId, uint16_t param1,
+  void onEnterTerritory( InstanceContent& instance, Entity::Player& player, uint32_t eventId, uint16_t param1,
                          uint16_t param2 ) override
   {
 
diff --git a/src/scripts/instances/guildhests/MorethanaFeeler.cpp b/src/scripts/instances/guildhests/MorethanaFeeler.cpp
index 09c189c1..a4c75d4f 100644
--- a/src/scripts/instances/guildhests/MorethanaFeeler.cpp
+++ b/src/scripts/instances/guildhests/MorethanaFeeler.cpp
@@ -9,20 +9,19 @@ class MorethanaFeeler :
 public:
   MorethanaFeeler() :
     Sapphire::ScriptAPI::InstanceContentScript( 10009 )
-  {
-  }
+  { }
 
-  void onInit( InstanceContentPtr instance ) override
+  void onInit( InstanceContent& instance ) override
   {
 
   }
 
-  void onUpdate( InstanceContentPtr instance, uint32_t currTime ) override
+  void onUpdate( InstanceContent& instance, uint32_t currTime ) override
   {
 
   }
 
-  void onEnterTerritory( InstanceContentPtr instance, Entity::Player& player, uint32_t eventId, uint16_t param1,
+  void onEnterTerritory( InstanceContent& instance, Entity::Player& player, uint32_t eventId, uint16_t param1,
                          uint16_t param2 ) override
   {
 
diff --git a/src/scripts/instances/guildhests/PullingPoisonPosies.cpp b/src/scripts/instances/guildhests/PullingPoisonPosies.cpp
index 16b4cad4..0746a0b5 100644
--- a/src/scripts/instances/guildhests/PullingPoisonPosies.cpp
+++ b/src/scripts/instances/guildhests/PullingPoisonPosies.cpp
@@ -9,20 +9,19 @@ class PullingPoisonPosies :
 public:
   PullingPoisonPosies() :
     Sapphire::ScriptAPI::InstanceContentScript( 10005 )
-  {
-  }
+  { }
 
-  void onInit( InstanceContentPtr instance ) override
+  void onInit( InstanceContent& instance ) override
   {
 
   }
 
-  void onUpdate( InstanceContentPtr instance, uint32_t currTime ) override
+  void onUpdate( InstanceContent& instance, uint32_t currTime ) override
   {
 
   }
 
-  void onEnterTerritory( InstanceContentPtr instance, Entity::Player& player, uint32_t eventId, uint16_t param1,
+  void onEnterTerritory( InstanceContent& instance, Entity::Player& player, uint32_t eventId, uint16_t param1,
                          uint16_t param2 ) override
   {
 
diff --git a/src/scripts/instances/guildhests/ShadowandClaw.cpp b/src/scripts/instances/guildhests/ShadowandClaw.cpp
index 21597b13..ce4213cc 100644
--- a/src/scripts/instances/guildhests/ShadowandClaw.cpp
+++ b/src/scripts/instances/guildhests/ShadowandClaw.cpp
@@ -9,52 +9,36 @@ class ShadowandClaw :
 public:
   ShadowandClaw() :
     Sapphire::ScriptAPI::InstanceContentScript( 10011 )
-  {
-  }
+  { }
 
-  void onInit( InstanceContentPtr instance ) override
+  void onInit( InstanceContent& instance ) override
   {
-    instance->registerEObj( "sgbg_w_qic_001_04a", 2006993, 6235274, 4, { -35.822102f, 298.899994f, -205.263199f },
-                            1.000000f, 0.000000f );
-    instance->registerEObj( "unknown_0", 2006952, 0, 4, { -35.712589f, 298.899994f, -204.878006f }, 1.000000f,
-                            0.000000f );
-    instance->registerEObj( "Exit", 2000139, 0, 4, { 556.049377f, 348.102509f, -752.435730f }, 1.000000f, 0.000000f );
-    instance->registerEObj( "Entrance", 2000182, 4600289, 5, { 523.532471f, 348.223389f, -736.685730f }, 1.000000f,
-                            0.000000f );
-    // States -> vf_lock_on vf_lock_of
-    instance->registerEObj( "unknown_1", 2002332, 0, 4, { 533.090881f, 348.691895f, -742.750916f }, 1.000000f,
-                            0.000000f );
-    instance->registerEObj( "unknown_2", 2002333, 0, 4, { 539.940430f, 348.836395f, -734.401489f }, 0.991760f,
-                            0.000048f );
-    instance->registerEObj( "unknown_3", 2000608, 3967803, 4, { 202.369598f, 257.761108f, 80.435272f }, 1.000000f,
-                            0.000000f );
-    instance->registerEObj( "unknown_4", 2000608, 3976993, 4, { 273.634705f, 254.600204f, 106.048500f }, 1.000000f,
-                            0.000000f );
-    instance->registerEObj( "unknown_5", 2000608, 3986797, 4, { 205.504898f, 246.188995f, 194.875702f }, 1.000000f,
-                            0.000000f );
-    instance->registerEObj( "unknown_6", 2000608, 3986798, 4, { 326.313385f, 239.193497f, 221.138901f }, 1.000000f,
-                            0.000000f );
-    instance->registerEObj( "unknown_7", 2000608, 2718481, 4, { 240.552307f, 302.769714f, -199.979996f }, 1.000000f,
-                            0.000000f );
-    instance->registerEObj( "unknown_8", 2000608, 4065433, 4, { 204.970001f, 302.119995f, -216.311600f }, 1.000000f,
-                            0.000000f );
-    instance->registerEObj( "unknown_9", 2000608, 2814617, 4, { 205.869995f, 302.219086f, -276.681396f }, 1.000000f,
-                            0.000000f );
-    instance->registerEObj( "unknown_10", 2000608, 2763112, 4, { -433.000000f, 211.007706f, -216.148605f }, 1.000000f,
-                            0.000000f );
-    instance->registerEObj( "unknown_11", 2000608, 4187649, 4, { -453.000000f, 211.000000f, -281.046600f }, 1.000000f,
-                            0.000000f );
-    instance->registerEObj( "unknown_12", 2000608, 4187961, 4, { -416.000000f, 210.788193f, -279.813812f }, 1.000000f,
-                            0.000000f );
+    instance.registerEObj( "sgbg_w_qic_001_04a", 2006993, 6235274, 4, { -35.822102f, 298.899994f, -205.263199f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_0", 2006952, 0, 4, { -35.712589f, 298.899994f, -204.878006f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "Exit", 2000139, 0, 4, { 556.049377f, 348.102509f, -752.435730f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "Entrance", 2000182, 4600289, 5, { 523.532471f, 348.223389f, -736.685730f }, 1.000000f, 0.000000f ); 
+      // States -> vf_lock_on (id: 11) vf_lock_of (id: 12) 
+    instance.registerEObj( "unknown_1", 2002332, 0, 4, { 533.090881f, 348.691895f, -742.750916f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_2", 2002333, 0, 4, { 539.940430f, 348.836395f, -734.401489f }, 0.991760f, 0.000048f ); 
+    instance.registerEObj( "unknown_3", 2000608, 3967803, 4, { 202.369598f, 257.761108f, 80.435272f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_4", 2000608, 3976993, 4, { 273.634705f, 254.600204f, 106.048500f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_5", 2000608, 3986797, 4, { 205.504898f, 246.188995f, 194.875702f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_6", 2000608, 3986798, 4, { 326.313385f, 239.193497f, 221.138901f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_7", 2000608, 2718481, 4, { 240.552307f, 302.769714f, -199.979996f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_8", 2000608, 4065433, 4, { 204.970001f, 302.119995f, -216.311600f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_9", 2000608, 2814617, 4, { 205.869995f, 302.219086f, -276.681396f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_10", 2000608, 2763112, 4, { -433.000000f, 211.007706f, -216.148605f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_11", 2000608, 4187649, 4, { -453.000000f, 211.000000f, -281.046600f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_12", 2000608, 4187961, 4, { -416.000000f, 210.788193f, -279.813812f }, 1.000000f, 0.000000f ); 
 
   }
 
-  void onUpdate( InstanceContentPtr instance, uint32_t currTime ) override
+  void onUpdate( InstanceContent& instance, uint32_t currTime ) override
   {
 
   }
 
-  void onEnterTerritory( InstanceContentPtr instance, Entity::Player& player, uint32_t eventId, uint16_t param1,
+  void onEnterTerritory( InstanceContent& instance, Entity::Player& player, uint32_t eventId, uint16_t param1,
                          uint16_t param2 ) override
   {
 
diff --git a/src/scripts/instances/guildhests/SolemnTrinity.cpp b/src/scripts/instances/guildhests/SolemnTrinity.cpp
index 9c9bf408..3afed870 100644
--- a/src/scripts/instances/guildhests/SolemnTrinity.cpp
+++ b/src/scripts/instances/guildhests/SolemnTrinity.cpp
@@ -9,20 +9,19 @@ class SolemnTrinity :
 public:
   SolemnTrinity() :
     Sapphire::ScriptAPI::InstanceContentScript( 10014 )
-  {
-  }
+  { }
 
-  void onInit( InstanceContentPtr instance ) override
+  void onInit( InstanceContent& instance ) override
   {
 
   }
 
-  void onUpdate( InstanceContentPtr instance, uint32_t currTime ) override
+  void onUpdate( InstanceContent& instance, uint32_t currTime ) override
   {
 
   }
 
-  void onEnterTerritory( InstanceContentPtr instance, Entity::Player& player, uint32_t eventId, uint16_t param1,
+  void onEnterTerritory( InstanceContent& instance, Entity::Player& player, uint32_t eventId, uint16_t param1,
                          uint16_t param2 ) override
   {
 
diff --git a/src/scripts/instances/guildhests/StingingBack.cpp b/src/scripts/instances/guildhests/StingingBack.cpp
index a753d1e0..09b94292 100644
--- a/src/scripts/instances/guildhests/StingingBack.cpp
+++ b/src/scripts/instances/guildhests/StingingBack.cpp
@@ -9,24 +9,22 @@ class StingingBack :
 public:
   StingingBack() :
     Sapphire::ScriptAPI::InstanceContentScript( 10006 )
-  {
-  }
+  { }
 
-  void onInit( InstanceContentPtr instance ) override
+  void onInit( InstanceContent& instance ) override
   {
-    instance->registerEObj( "Entrance", 2000182, 5021407, 5, { 623.000000f, 23.872311f, 94.505638f }, 1.000000f,
-                            0.000000f );
-    // States -> vf_lock_on vf_lock_of
-    instance->registerEObj( "Exit", 2000139, 0, 4, { 623.000000f, 23.656260f, 61.956181f }, 1.000000f, 0.000000f );
+    instance.registerEObj( "Entrance", 2000182, 5021407, 5, { 623.000000f, 23.872311f, 94.505638f }, 1.000000f, 0.000000f ); 
+      // States -> vf_lock_on (id: 11) vf_lock_of (id: 12) 
+    instance.registerEObj( "Exit", 2000139, 0, 4, { 623.000000f, 23.656260f, 61.956181f }, 1.000000f, 0.000000f ); 
 
   }
 
-  void onUpdate( InstanceContentPtr instance, uint32_t currTime ) override
+  void onUpdate( InstanceContent& instance, uint32_t currTime ) override
   {
 
   }
 
-  void onEnterTerritory( InstanceContentPtr instance, Entity::Player& player, uint32_t eventId, uint16_t param1,
+  void onEnterTerritory( InstanceContent& instance, Entity::Player& player, uint32_t eventId, uint16_t param1,
                          uint16_t param2 ) override
   {
 
diff --git a/src/scripts/instances/guildhests/UndertheArmor.cpp b/src/scripts/instances/guildhests/UndertheArmor.cpp
index 23924db2..ee63c735 100644
--- a/src/scripts/instances/guildhests/UndertheArmor.cpp
+++ b/src/scripts/instances/guildhests/UndertheArmor.cpp
@@ -9,22 +9,20 @@ class UndertheArmor :
 public:
   UndertheArmor() :
     Sapphire::ScriptAPI::InstanceContentScript( 10002 )
-  {
-  }
+  { }
 
-  void onInit( InstanceContentPtr instance ) override
+  void onInit( InstanceContent& instance ) override
   {
-    instance->registerEObj( "unknown_0", 2005192, 5760474, 4, { -51.493111f, 0.309087f, 71.436897f }, 1.000000f,
-                            -0.000006f );
+    instance.registerEObj( "unknown_0", 2005192, 5760474, 4, { -51.493111f, 0.309087f, 71.436897f }, 1.000000f, -0.000006f ); 
 
   }
 
-  void onUpdate( InstanceContentPtr instance, uint32_t currTime ) override
+  void onUpdate( InstanceContent& instance, uint32_t currTime ) override
   {
 
   }
 
-  void onEnterTerritory( InstanceContentPtr instance, Entity::Player& player, uint32_t eventId, uint16_t param1,
+  void onEnterTerritory( InstanceContent& instance, Entity::Player& player, uint32_t eventId, uint16_t param1,
                          uint16_t param2 ) override
   {
 
diff --git a/src/scripts/instances/guildhests/WardUp.cpp b/src/scripts/instances/guildhests/WardUp.cpp
index f3731d3d..f15eaf50 100644
--- a/src/scripts/instances/guildhests/WardUp.cpp
+++ b/src/scripts/instances/guildhests/WardUp.cpp
@@ -9,20 +9,19 @@ class WardUp :
 public:
   WardUp() :
     Sapphire::ScriptAPI::InstanceContentScript( 10013 )
-  {
-  }
+  { }
 
-  void onInit( InstanceContentPtr instance ) override
+  void onInit( InstanceContent& instance ) override
   {
 
   }
 
-  void onUpdate( InstanceContentPtr instance, uint32_t currTime ) override
+  void onUpdate( InstanceContent& instance, uint32_t currTime ) override
   {
 
   }
 
-  void onEnterTerritory( InstanceContentPtr instance, Entity::Player& player, uint32_t eventId, uint16_t param1,
+  void onEnterTerritory( InstanceContent& instance, Entity::Player& player, uint32_t eventId, uint16_t param1,
                          uint16_t param2 ) override
   {
 
diff --git a/src/scripts/instances/hallofthenovice/AccrueEnmityfromMultipleTargets.cpp b/src/scripts/instances/hallofthenovice/AccrueEnmityfromMultipleTargets.cpp
index 31d00829..243ab08c 100644
--- a/src/scripts/instances/hallofthenovice/AccrueEnmityfromMultipleTargets.cpp
+++ b/src/scripts/instances/hallofthenovice/AccrueEnmityfromMultipleTargets.cpp
@@ -9,34 +9,29 @@ class AccrueEnmityfromMultipleTargets :
 public:
   AccrueEnmityfromMultipleTargets() :
     Sapphire::ScriptAPI::InstanceContentScript( 15004 )
-  {
-  }
+  { }
 
-  void onInit( InstanceContentPtr instance ) override
+  void onInit( InstanceContent& instance ) override
   {
-    instance->registerEObj( "unknown_0", 2007001, 0, 4, { -5.135936f, -0.986339f, -0.059807f }, 1.000000f, 0.000000f );
-    instance->registerEObj( "unknown_1", 2007004, 0, 4, { -6.501123f, -0.986346f, 2.121102f }, 1.000000f, 0.000000f );
-    instance->registerEObj( "unknown_2", 2007005, 0, 4, { -5.178086f, -0.986341f, -0.227772f }, 1.000000f, 0.000000f );
-    instance->registerEObj( "unknown_3", 2007006, 0, 4, { -7.272448f, -0.986346f, -2.204096f }, 1.000000f, 0.000000f );
-    instance->registerEObj( "unknown_4", 2007007, 6216275, 4, { -30.849630f, 0.697522f, -1.415699f }, 1.000000f,
-                            0.000000f );
-    instance->registerEObj( "Gatelever", 2007008, 0, 4, { -31.199289f, 1.850766f, -7.087492f }, 1.000000f, 0.000000f );
-    instance->registerEObj( "Entrance", 2000182, 6215534, 5, { 44.100491f, 1.056062f, 1.068363f }, 1.000000f,
-                            0.000000f );
-    // States -> vf_lock_on vf_lock_of
-    instance->registerEObj( "unknown_5", 2001403, 3968682, 4, { 30.986059f, 0.993235f, 1.480142f }, 1.000000f,
-                            0.000000f );
-    instance->registerEObj( "unknown_6", 2001404, 3968585, 4, { -31.243280f, 1.043213f, 1.580577f }, 1.000000f,
-                            0.000000f );
+    instance.registerEObj( "unknown_0", 2007001, 0, 4, { -5.135936f, -0.986339f, -0.059807f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_1", 2007004, 0, 4, { -6.501123f, -0.986346f, 2.121102f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_2", 2007005, 0, 4, { -5.178086f, -0.986341f, -0.227772f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_3", 2007006, 0, 4, { -7.272448f, -0.986346f, -2.204096f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_4", 2007007, 6216275, 4, { -30.849630f, 0.697522f, -1.415699f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "Gatelever", 2007008, 0, 4, { -31.199289f, 1.850766f, -7.087492f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "Entrance", 2000182, 6215534, 5, { 44.100491f, 1.056062f, 1.068363f }, 1.000000f, 0.000000f ); 
+      // States -> vf_lock_on (id: 11) vf_lock_of (id: 12) 
+    instance.registerEObj( "unknown_5", 2001403, 3968682, 4, { 30.986059f, 0.993235f, 1.480142f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_6", 2001404, 3968585, 4, { -31.243280f, 1.043213f, 1.580577f }, 1.000000f, 0.000000f ); 
 
   }
 
-  void onUpdate( InstanceContentPtr instance, uint32_t currTime ) override
+  void onUpdate( InstanceContent& instance, uint32_t currTime ) override
   {
 
   }
 
-  void onEnterTerritory( InstanceContentPtr instance, Entity::Player& player, uint32_t eventId, uint16_t param1,
+  void onEnterTerritory( InstanceContent& instance, Entity::Player& player, uint32_t eventId, uint16_t param1,
                          uint16_t param2 ) override
   {
 
diff --git a/src/scripts/instances/hallofthenovice/AssistAlliesinDefeatingaTarget.cpp b/src/scripts/instances/hallofthenovice/AssistAlliesinDefeatingaTarget.cpp
index efd0f6f6..bd08e277 100644
--- a/src/scripts/instances/hallofthenovice/AssistAlliesinDefeatingaTarget.cpp
+++ b/src/scripts/instances/hallofthenovice/AssistAlliesinDefeatingaTarget.cpp
@@ -9,34 +9,29 @@ class AssistAlliesinDefeatingaTarget :
 public:
   AssistAlliesinDefeatingaTarget() :
     Sapphire::ScriptAPI::InstanceContentScript( 15008 )
-  {
-  }
+  { }
 
-  void onInit( InstanceContentPtr instance ) override
+  void onInit( InstanceContent& instance ) override
   {
-    instance->registerEObj( "unknown_0", 2007001, 0, 4, { -5.135936f, -0.986339f, -0.059807f }, 1.000000f, 0.000000f );
-    instance->registerEObj( "unknown_1", 2007004, 0, 4, { -6.501123f, -0.986346f, 2.121102f }, 1.000000f, 0.000000f );
-    instance->registerEObj( "unknown_2", 2007005, 0, 4, { -5.178086f, -0.986341f, -0.227772f }, 1.000000f, 0.000000f );
-    instance->registerEObj( "unknown_3", 2007006, 0, 4, { -7.272448f, -0.986346f, -2.204096f }, 1.000000f, 0.000000f );
-    instance->registerEObj( "unknown_4", 2007007, 6216275, 4, { -30.849630f, 0.697522f, -1.415699f }, 1.000000f,
-                            0.000000f );
-    instance->registerEObj( "Gatelever", 2007008, 0, 4, { -31.199289f, 1.850766f, -7.087492f }, 1.000000f, 0.000000f );
-    instance->registerEObj( "Entrance", 2000182, 6215534, 5, { 44.100491f, 1.056062f, 1.068363f }, 1.000000f,
-                            0.000000f );
-    // States -> vf_lock_on vf_lock_of
-    instance->registerEObj( "unknown_5", 2001403, 3968682, 4, { 30.986059f, 0.993235f, 1.480142f }, 1.000000f,
-                            0.000000f );
-    instance->registerEObj( "unknown_6", 2001404, 3968585, 4, { -31.243280f, 1.043213f, 1.580577f }, 1.000000f,
-                            0.000000f );
+    instance.registerEObj( "unknown_0", 2007001, 0, 4, { -5.135936f, -0.986339f, -0.059807f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_1", 2007004, 0, 4, { -6.501123f, -0.986346f, 2.121102f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_2", 2007005, 0, 4, { -5.178086f, -0.986341f, -0.227772f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_3", 2007006, 0, 4, { -7.272448f, -0.986346f, -2.204096f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_4", 2007007, 6216275, 4, { -30.849630f, 0.697522f, -1.415699f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "Gatelever", 2007008, 0, 4, { -31.199289f, 1.850766f, -7.087492f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "Entrance", 2000182, 6215534, 5, { 44.100491f, 1.056062f, 1.068363f }, 1.000000f, 0.000000f ); 
+      // States -> vf_lock_on (id: 11) vf_lock_of (id: 12) 
+    instance.registerEObj( "unknown_5", 2001403, 3968682, 4, { 30.986059f, 0.993235f, 1.480142f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_6", 2001404, 3968585, 4, { -31.243280f, 1.043213f, 1.580577f }, 1.000000f, 0.000000f ); 
 
   }
 
-  void onUpdate( InstanceContentPtr instance, uint32_t currTime ) override
+  void onUpdate( InstanceContent& instance, uint32_t currTime ) override
   {
 
   }
 
-  void onEnterTerritory( InstanceContentPtr instance, Entity::Player& player, uint32_t eventId, uint16_t param1,
+  void onEnterTerritory( InstanceContent& instance, Entity::Player& player, uint32_t eventId, uint16_t param1,
                          uint16_t param2 ) override
   {
 
diff --git a/src/scripts/instances/hallofthenovice/AvoidAreaofEffectAttacks.cpp b/src/scripts/instances/hallofthenovice/AvoidAreaofEffectAttacks.cpp
index 49905dc2..9e645fdf 100644
--- a/src/scripts/instances/hallofthenovice/AvoidAreaofEffectAttacks.cpp
+++ b/src/scripts/instances/hallofthenovice/AvoidAreaofEffectAttacks.cpp
@@ -9,34 +9,29 @@ class AvoidAreaofEffectAttacks :
 public:
   AvoidAreaofEffectAttacks() :
     Sapphire::ScriptAPI::InstanceContentScript( 15001 )
-  {
-  }
+  { }
 
-  void onInit( InstanceContentPtr instance ) override
+  void onInit( InstanceContent& instance ) override
   {
-    instance->registerEObj( "unknown_0", 2007001, 0, 4, { -5.135936f, -0.986339f, -0.059807f }, 1.000000f, 0.000000f );
-    instance->registerEObj( "unknown_1", 2007004, 0, 4, { -6.501123f, -0.986346f, 2.121102f }, 1.000000f, 0.000000f );
-    instance->registerEObj( "unknown_2", 2007005, 0, 4, { -5.178086f, -0.986341f, -0.227772f }, 1.000000f, 0.000000f );
-    instance->registerEObj( "unknown_3", 2007006, 0, 4, { -7.272448f, -0.986346f, -2.204096f }, 1.000000f, 0.000000f );
-    instance->registerEObj( "unknown_4", 2007007, 6216275, 4, { -30.849630f, 0.697522f, -1.415699f }, 1.000000f,
-                            0.000000f );
-    instance->registerEObj( "Gatelever", 2007008, 0, 4, { -31.199289f, 1.850766f, -7.087492f }, 1.000000f, 0.000000f );
-    instance->registerEObj( "Entrance", 2000182, 6215534, 5, { 44.100491f, 1.056062f, 1.068363f }, 1.000000f,
-                            0.000000f );
-    // States -> vf_lock_on vf_lock_of
-    instance->registerEObj( "unknown_5", 2001403, 3968682, 4, { 30.986059f, 0.993235f, 1.480142f }, 1.000000f,
-                            0.000000f );
-    instance->registerEObj( "unknown_6", 2001404, 3968585, 4, { -31.243280f, 1.043213f, 1.580577f }, 1.000000f,
-                            0.000000f );
+    instance.registerEObj( "unknown_0", 2007001, 0, 4, { -5.135936f, -0.986339f, -0.059807f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_1", 2007004, 0, 4, { -6.501123f, -0.986346f, 2.121102f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_2", 2007005, 0, 4, { -5.178086f, -0.986341f, -0.227772f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_3", 2007006, 0, 4, { -7.272448f, -0.986346f, -2.204096f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_4", 2007007, 6216275, 4, { -30.849630f, 0.697522f, -1.415699f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "Gatelever", 2007008, 0, 4, { -31.199289f, 1.850766f, -7.087492f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "Entrance", 2000182, 6215534, 5, { 44.100491f, 1.056062f, 1.068363f }, 1.000000f, 0.000000f ); 
+      // States -> vf_lock_on (id: 11) vf_lock_of (id: 12) 
+    instance.registerEObj( "unknown_5", 2001403, 3968682, 4, { 30.986059f, 0.993235f, 1.480142f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_6", 2001404, 3968585, 4, { -31.243280f, 1.043213f, 1.580577f }, 1.000000f, 0.000000f ); 
 
   }
 
-  void onUpdate( InstanceContentPtr instance, uint32_t currTime ) override
+  void onUpdate( InstanceContent& instance, uint32_t currTime ) override
   {
 
   }
 
-  void onEnterTerritory( InstanceContentPtr instance, Entity::Player& player, uint32_t eventId, uint16_t param1,
+  void onEnterTerritory( InstanceContent& instance, Entity::Player& player, uint32_t eventId, uint16_t param1,
                          uint16_t param2 ) override
   {
 
diff --git a/src/scripts/instances/hallofthenovice/AvoidEngagedTargets.cpp b/src/scripts/instances/hallofthenovice/AvoidEngagedTargets.cpp
index 1abd256c..0e1bbba6 100644
--- a/src/scripts/instances/hallofthenovice/AvoidEngagedTargets.cpp
+++ b/src/scripts/instances/hallofthenovice/AvoidEngagedTargets.cpp
@@ -9,34 +9,29 @@ class AvoidEngagedTargets :
 public:
   AvoidEngagedTargets() :
     Sapphire::ScriptAPI::InstanceContentScript( 15015 )
-  {
-  }
+  { }
 
-  void onInit( InstanceContentPtr instance ) override
+  void onInit( InstanceContent& instance ) override
   {
-    instance->registerEObj( "unknown_0", 2007001, 0, 4, { -5.135936f, -0.986339f, -0.059807f }, 1.000000f, 0.000000f );
-    instance->registerEObj( "unknown_1", 2007004, 0, 4, { -6.501123f, -0.986346f, 2.121102f }, 1.000000f, 0.000000f );
-    instance->registerEObj( "unknown_2", 2007005, 0, 4, { -5.178086f, -0.986341f, -0.227772f }, 1.000000f, 0.000000f );
-    instance->registerEObj( "unknown_3", 2007006, 0, 4, { -7.272448f, -0.986346f, -2.204096f }, 1.000000f, 0.000000f );
-    instance->registerEObj( "unknown_4", 2007007, 6216275, 4, { -30.849630f, 0.697522f, -1.415699f }, 1.000000f,
-                            0.000000f );
-    instance->registerEObj( "Gatelever", 2007008, 0, 4, { -31.199289f, 1.850766f, -7.087492f }, 1.000000f, 0.000000f );
-    instance->registerEObj( "Entrance", 2000182, 6215534, 5, { 44.100491f, 1.056062f, 1.068363f }, 1.000000f,
-                            0.000000f );
-    // States -> vf_lock_on vf_lock_of
-    instance->registerEObj( "unknown_5", 2001403, 3968682, 4, { 30.986059f, 0.993235f, 1.480142f }, 1.000000f,
-                            0.000000f );
-    instance->registerEObj( "unknown_6", 2001404, 3968585, 4, { -31.243280f, 1.043213f, 1.580577f }, 1.000000f,
-                            0.000000f );
+    instance.registerEObj( "unknown_0", 2007001, 0, 4, { -5.135936f, -0.986339f, -0.059807f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_1", 2007004, 0, 4, { -6.501123f, -0.986346f, 2.121102f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_2", 2007005, 0, 4, { -5.178086f, -0.986341f, -0.227772f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_3", 2007006, 0, 4, { -7.272448f, -0.986346f, -2.204096f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_4", 2007007, 6216275, 4, { -30.849630f, 0.697522f, -1.415699f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "Gatelever", 2007008, 0, 4, { -31.199289f, 1.850766f, -7.087492f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "Entrance", 2000182, 6215534, 5, { 44.100491f, 1.056062f, 1.068363f }, 1.000000f, 0.000000f ); 
+      // States -> vf_lock_on (id: 11) vf_lock_of (id: 12) 
+    instance.registerEObj( "unknown_5", 2001403, 3968682, 4, { 30.986059f, 0.993235f, 1.480142f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_6", 2001404, 3968585, 4, { -31.243280f, 1.043213f, 1.580577f }, 1.000000f, 0.000000f ); 
 
   }
 
-  void onUpdate( InstanceContentPtr instance, uint32_t currTime ) override
+  void onUpdate( InstanceContent& instance, uint32_t currTime ) override
   {
 
   }
 
-  void onEnterTerritory( InstanceContentPtr instance, Entity::Player& player, uint32_t eventId, uint16_t param1,
+  void onEnterTerritory( InstanceContent& instance, Entity::Player& player, uint32_t eventId, uint16_t param1,
                          uint16_t param2 ) override
   {
 
diff --git a/src/scripts/instances/hallofthenovice/DefeatanOccupiedTarget.cpp b/src/scripts/instances/hallofthenovice/DefeatanOccupiedTarget.cpp
index 9e54bfa0..48a4c353 100644
--- a/src/scripts/instances/hallofthenovice/DefeatanOccupiedTarget.cpp
+++ b/src/scripts/instances/hallofthenovice/DefeatanOccupiedTarget.cpp
@@ -9,34 +9,29 @@ class DefeatanOccupiedTarget :
 public:
   DefeatanOccupiedTarget() :
     Sapphire::ScriptAPI::InstanceContentScript( 15009 )
-  {
-  }
+  { }
 
-  void onInit( InstanceContentPtr instance ) override
+  void onInit( InstanceContent& instance ) override
   {
-    instance->registerEObj( "unknown_0", 2007001, 0, 4, { -5.135936f, -0.986339f, -0.059807f }, 1.000000f, 0.000000f );
-    instance->registerEObj( "unknown_1", 2007004, 0, 4, { -6.501123f, -0.986346f, 2.121102f }, 1.000000f, 0.000000f );
-    instance->registerEObj( "unknown_2", 2007005, 0, 4, { -5.178086f, -0.986341f, -0.227772f }, 1.000000f, 0.000000f );
-    instance->registerEObj( "unknown_3", 2007006, 0, 4, { -7.272448f, -0.986346f, -2.204096f }, 1.000000f, 0.000000f );
-    instance->registerEObj( "unknown_4", 2007007, 6216275, 4, { -30.849630f, 0.697522f, -1.415699f }, 1.000000f,
-                            0.000000f );
-    instance->registerEObj( "Gatelever", 2007008, 0, 4, { -31.199289f, 1.850766f, -7.087492f }, 1.000000f, 0.000000f );
-    instance->registerEObj( "Entrance", 2000182, 6215534, 5, { 44.100491f, 1.056062f, 1.068363f }, 1.000000f,
-                            0.000000f );
-    // States -> vf_lock_on vf_lock_of
-    instance->registerEObj( "unknown_5", 2001403, 3968682, 4, { 30.986059f, 0.993235f, 1.480142f }, 1.000000f,
-                            0.000000f );
-    instance->registerEObj( "unknown_6", 2001404, 3968585, 4, { -31.243280f, 1.043213f, 1.580577f }, 1.000000f,
-                            0.000000f );
+    instance.registerEObj( "unknown_0", 2007001, 0, 4, { -5.135936f, -0.986339f, -0.059807f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_1", 2007004, 0, 4, { -6.501123f, -0.986346f, 2.121102f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_2", 2007005, 0, 4, { -5.178086f, -0.986341f, -0.227772f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_3", 2007006, 0, 4, { -7.272448f, -0.986346f, -2.204096f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_4", 2007007, 6216275, 4, { -30.849630f, 0.697522f, -1.415699f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "Gatelever", 2007008, 0, 4, { -31.199289f, 1.850766f, -7.087492f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "Entrance", 2000182, 6215534, 5, { 44.100491f, 1.056062f, 1.068363f }, 1.000000f, 0.000000f ); 
+      // States -> vf_lock_on (id: 11) vf_lock_of (id: 12) 
+    instance.registerEObj( "unknown_5", 2001403, 3968682, 4, { 30.986059f, 0.993235f, 1.480142f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_6", 2001404, 3968585, 4, { -31.243280f, 1.043213f, 1.580577f }, 1.000000f, 0.000000f ); 
 
   }
 
-  void onUpdate( InstanceContentPtr instance, uint32_t currTime ) override
+  void onUpdate( InstanceContent& instance, uint32_t currTime ) override
   {
 
   }
 
-  void onEnterTerritory( InstanceContentPtr instance, Entity::Player& player, uint32_t eventId, uint16_t param1,
+  void onEnterTerritory( InstanceContent& instance, Entity::Player& player, uint32_t eventId, uint16_t param1,
                          uint16_t param2 ) override
   {
 
diff --git a/src/scripts/instances/hallofthenovice/EngageEnemyReinforcements.cpp b/src/scripts/instances/hallofthenovice/EngageEnemyReinforcements.cpp
index d3e8acaa..1091cf72 100644
--- a/src/scripts/instances/hallofthenovice/EngageEnemyReinforcements.cpp
+++ b/src/scripts/instances/hallofthenovice/EngageEnemyReinforcements.cpp
@@ -9,34 +9,29 @@ class EngageEnemyReinforcements :
 public:
   EngageEnemyReinforcements() :
     Sapphire::ScriptAPI::InstanceContentScript( 15011 )
-  {
-  }
+  { }
 
-  void onInit( InstanceContentPtr instance ) override
+  void onInit( InstanceContent& instance ) override
   {
-    instance->registerEObj( "unknown_0", 2007001, 0, 4, { -5.135936f, -0.986339f, -0.059807f }, 1.000000f, 0.000000f );
-    instance->registerEObj( "unknown_1", 2007004, 0, 4, { -6.501123f, -0.986346f, 2.121102f }, 1.000000f, 0.000000f );
-    instance->registerEObj( "unknown_2", 2007005, 0, 4, { -5.178086f, -0.986341f, -0.227772f }, 1.000000f, 0.000000f );
-    instance->registerEObj( "unknown_3", 2007006, 0, 4, { -7.272448f, -0.986346f, -2.204096f }, 1.000000f, 0.000000f );
-    instance->registerEObj( "unknown_4", 2007007, 6216275, 4, { -30.849630f, 0.697522f, -1.415699f }, 1.000000f,
-                            0.000000f );
-    instance->registerEObj( "Gatelever", 2007008, 0, 4, { -31.199289f, 1.850766f, -7.087492f }, 1.000000f, 0.000000f );
-    instance->registerEObj( "Entrance", 2000182, 6215534, 5, { 44.100491f, 1.056062f, 1.068363f }, 1.000000f,
-                            0.000000f );
-    // States -> vf_lock_on vf_lock_of
-    instance->registerEObj( "unknown_5", 2001403, 3968682, 4, { 30.986059f, 0.993235f, 1.480142f }, 1.000000f,
-                            0.000000f );
-    instance->registerEObj( "unknown_6", 2001404, 3968585, 4, { -31.243280f, 1.043213f, 1.580577f }, 1.000000f,
-                            0.000000f );
+    instance.registerEObj( "unknown_0", 2007001, 0, 4, { -5.135936f, -0.986339f, -0.059807f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_1", 2007004, 0, 4, { -6.501123f, -0.986346f, 2.121102f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_2", 2007005, 0, 4, { -5.178086f, -0.986341f, -0.227772f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_3", 2007006, 0, 4, { -7.272448f, -0.986346f, -2.204096f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_4", 2007007, 6216275, 4, { -30.849630f, 0.697522f, -1.415699f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "Gatelever", 2007008, 0, 4, { -31.199289f, 1.850766f, -7.087492f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "Entrance", 2000182, 6215534, 5, { 44.100491f, 1.056062f, 1.068363f }, 1.000000f, 0.000000f ); 
+      // States -> vf_lock_on (id: 11) vf_lock_of (id: 12) 
+    instance.registerEObj( "unknown_5", 2001403, 3968682, 4, { 30.986059f, 0.993235f, 1.480142f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_6", 2001404, 3968585, 4, { -31.243280f, 1.043213f, 1.580577f }, 1.000000f, 0.000000f ); 
 
   }
 
-  void onUpdate( InstanceContentPtr instance, uint32_t currTime ) override
+  void onUpdate( InstanceContent& instance, uint32_t currTime ) override
   {
 
   }
 
-  void onEnterTerritory( InstanceContentPtr instance, Entity::Player& player, uint32_t eventId, uint16_t param1,
+  void onEnterTerritory( InstanceContent& instance, Entity::Player& player, uint32_t eventId, uint16_t param1,
                          uint16_t param2 ) override
   {
 
diff --git a/src/scripts/instances/hallofthenovice/EngageMultipleTargets.cpp b/src/scripts/instances/hallofthenovice/EngageMultipleTargets.cpp
index 4c2fc58c..1d51009d 100644
--- a/src/scripts/instances/hallofthenovice/EngageMultipleTargets.cpp
+++ b/src/scripts/instances/hallofthenovice/EngageMultipleTargets.cpp
@@ -9,34 +9,29 @@ class EngageMultipleTargets :
 public:
   EngageMultipleTargets() :
     Sapphire::ScriptAPI::InstanceContentScript( 15005 )
-  {
-  }
+  { }
 
-  void onInit( InstanceContentPtr instance ) override
+  void onInit( InstanceContent& instance ) override
   {
-    instance->registerEObj( "unknown_0", 2007001, 0, 4, { -5.135936f, -0.986339f, -0.059807f }, 1.000000f, 0.000000f );
-    instance->registerEObj( "unknown_1", 2007004, 0, 4, { -6.501123f, -0.986346f, 2.121102f }, 1.000000f, 0.000000f );
-    instance->registerEObj( "unknown_2", 2007005, 0, 4, { -5.178086f, -0.986341f, -0.227772f }, 1.000000f, 0.000000f );
-    instance->registerEObj( "unknown_3", 2007006, 0, 4, { -7.272448f, -0.986346f, -2.204096f }, 1.000000f, 0.000000f );
-    instance->registerEObj( "unknown_4", 2007007, 6216275, 4, { -30.849630f, 0.697522f, -1.415699f }, 1.000000f,
-                            0.000000f );
-    instance->registerEObj( "Gatelever", 2007008, 0, 4, { -31.199289f, 1.850766f, -7.087492f }, 1.000000f, 0.000000f );
-    instance->registerEObj( "Entrance", 2000182, 6215534, 5, { 44.100491f, 1.056062f, 1.068363f }, 1.000000f,
-                            0.000000f );
-    // States -> vf_lock_on vf_lock_of
-    instance->registerEObj( "unknown_5", 2001403, 3968682, 4, { 30.986059f, 0.993235f, 1.480142f }, 1.000000f,
-                            0.000000f );
-    instance->registerEObj( "unknown_6", 2001404, 3968585, 4, { -31.243280f, 1.043213f, 1.580577f }, 1.000000f,
-                            0.000000f );
+    instance.registerEObj( "unknown_0", 2007001, 0, 4, { -5.135936f, -0.986339f, -0.059807f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_1", 2007004, 0, 4, { -6.501123f, -0.986346f, 2.121102f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_2", 2007005, 0, 4, { -5.178086f, -0.986341f, -0.227772f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_3", 2007006, 0, 4, { -7.272448f, -0.986346f, -2.204096f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_4", 2007007, 6216275, 4, { -30.849630f, 0.697522f, -1.415699f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "Gatelever", 2007008, 0, 4, { -31.199289f, 1.850766f, -7.087492f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "Entrance", 2000182, 6215534, 5, { 44.100491f, 1.056062f, 1.068363f }, 1.000000f, 0.000000f ); 
+      // States -> vf_lock_on (id: 11) vf_lock_of (id: 12) 
+    instance.registerEObj( "unknown_5", 2001403, 3968682, 4, { 30.986059f, 0.993235f, 1.480142f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_6", 2001404, 3968585, 4, { -31.243280f, 1.043213f, 1.580577f }, 1.000000f, 0.000000f ); 
 
   }
 
-  void onUpdate( InstanceContentPtr instance, uint32_t currTime ) override
+  void onUpdate( InstanceContent& instance, uint32_t currTime ) override
   {
 
   }
 
-  void onEnterTerritory( InstanceContentPtr instance, Entity::Player& player, uint32_t eventId, uint16_t param1,
+  void onEnterTerritory( InstanceContent& instance, Entity::Player& player, uint32_t eventId, uint16_t param1,
                          uint16_t param2 ) override
   {
 
diff --git a/src/scripts/instances/hallofthenovice/ExecuteaComboinBattle.cpp b/src/scripts/instances/hallofthenovice/ExecuteaComboinBattle.cpp
index f49a98fe..73443ff8 100644
--- a/src/scripts/instances/hallofthenovice/ExecuteaComboinBattle.cpp
+++ b/src/scripts/instances/hallofthenovice/ExecuteaComboinBattle.cpp
@@ -9,34 +9,29 @@ class ExecuteaComboinBattle :
 public:
   ExecuteaComboinBattle() :
     Sapphire::ScriptAPI::InstanceContentScript( 15003 )
-  {
-  }
+  { }
 
-  void onInit( InstanceContentPtr instance ) override
+  void onInit( InstanceContent& instance ) override
   {
-    instance->registerEObj( "unknown_0", 2007001, 0, 4, { -5.135936f, -0.986339f, -0.059807f }, 1.000000f, 0.000000f );
-    instance->registerEObj( "unknown_1", 2007004, 0, 4, { -6.501123f, -0.986346f, 2.121102f }, 1.000000f, 0.000000f );
-    instance->registerEObj( "unknown_2", 2007005, 0, 4, { -5.178086f, -0.986341f, -0.227772f }, 1.000000f, 0.000000f );
-    instance->registerEObj( "unknown_3", 2007006, 0, 4, { -7.272448f, -0.986346f, -2.204096f }, 1.000000f, 0.000000f );
-    instance->registerEObj( "unknown_4", 2007007, 6216275, 4, { -30.849630f, 0.697522f, -1.415699f }, 1.000000f,
-                            0.000000f );
-    instance->registerEObj( "Gatelever", 2007008, 0, 4, { -31.199289f, 1.850766f, -7.087492f }, 1.000000f, 0.000000f );
-    instance->registerEObj( "Entrance", 2000182, 6215534, 5, { 44.100491f, 1.056062f, 1.068363f }, 1.000000f,
-                            0.000000f );
-    // States -> vf_lock_on vf_lock_of
-    instance->registerEObj( "unknown_5", 2001403, 3968682, 4, { 30.986059f, 0.993235f, 1.480142f }, 1.000000f,
-                            0.000000f );
-    instance->registerEObj( "unknown_6", 2001404, 3968585, 4, { -31.243280f, 1.043213f, 1.580577f }, 1.000000f,
-                            0.000000f );
+    instance.registerEObj( "unknown_0", 2007001, 0, 4, { -5.135936f, -0.986339f, -0.059807f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_1", 2007004, 0, 4, { -6.501123f, -0.986346f, 2.121102f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_2", 2007005, 0, 4, { -5.178086f, -0.986341f, -0.227772f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_3", 2007006, 0, 4, { -7.272448f, -0.986346f, -2.204096f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_4", 2007007, 6216275, 4, { -30.849630f, 0.697522f, -1.415699f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "Gatelever", 2007008, 0, 4, { -31.199289f, 1.850766f, -7.087492f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "Entrance", 2000182, 6215534, 5, { 44.100491f, 1.056062f, 1.068363f }, 1.000000f, 0.000000f ); 
+      // States -> vf_lock_on (id: 11) vf_lock_of (id: 12) 
+    instance.registerEObj( "unknown_5", 2001403, 3968682, 4, { 30.986059f, 0.993235f, 1.480142f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_6", 2001404, 3968585, 4, { -31.243280f, 1.043213f, 1.580577f }, 1.000000f, 0.000000f ); 
 
   }
 
-  void onUpdate( InstanceContentPtr instance, uint32_t currTime ) override
+  void onUpdate( InstanceContent& instance, uint32_t currTime ) override
   {
 
   }
 
-  void onEnterTerritory( InstanceContentPtr instance, Entity::Player& player, uint32_t eventId, uint16_t param1,
+  void onEnterTerritory( InstanceContent& instance, Entity::Player& player, uint32_t eventId, uint16_t param1,
                          uint16_t param2 ) override
   {
 
diff --git a/src/scripts/instances/hallofthenovice/ExecuteaCombotoIncreaseEnmity.cpp b/src/scripts/instances/hallofthenovice/ExecuteaCombotoIncreaseEnmity.cpp
index c7fd0c67..ba9d7d98 100644
--- a/src/scripts/instances/hallofthenovice/ExecuteaCombotoIncreaseEnmity.cpp
+++ b/src/scripts/instances/hallofthenovice/ExecuteaCombotoIncreaseEnmity.cpp
@@ -9,34 +9,29 @@ class ExecuteaCombotoIncreaseEnmity :
 public:
   ExecuteaCombotoIncreaseEnmity() :
     Sapphire::ScriptAPI::InstanceContentScript( 15002 )
-  {
-  }
+  { }
 
-  void onInit( InstanceContentPtr instance ) override
+  void onInit( InstanceContent& instance ) override
   {
-    instance->registerEObj( "unknown_0", 2007001, 0, 4, { -5.135936f, -0.986339f, -0.059807f }, 1.000000f, 0.000000f );
-    instance->registerEObj( "unknown_1", 2007004, 0, 4, { -6.501123f, -0.986346f, 2.121102f }, 1.000000f, 0.000000f );
-    instance->registerEObj( "unknown_2", 2007005, 0, 4, { -5.178086f, -0.986341f, -0.227772f }, 1.000000f, 0.000000f );
-    instance->registerEObj( "unknown_3", 2007006, 0, 4, { -7.272448f, -0.986346f, -2.204096f }, 1.000000f, 0.000000f );
-    instance->registerEObj( "unknown_4", 2007007, 6216275, 4, { -30.849630f, 0.697522f, -1.415699f }, 1.000000f,
-                            0.000000f );
-    instance->registerEObj( "Gatelever", 2007008, 0, 4, { -31.199289f, 1.850766f, -7.087492f }, 1.000000f, 0.000000f );
-    instance->registerEObj( "Entrance", 2000182, 6215534, 5, { 44.100491f, 1.056062f, 1.068363f }, 1.000000f,
-                            0.000000f );
-    // States -> vf_lock_on vf_lock_of
-    instance->registerEObj( "unknown_5", 2001403, 3968682, 4, { 30.986059f, 0.993235f, 1.480142f }, 1.000000f,
-                            0.000000f );
-    instance->registerEObj( "unknown_6", 2001404, 3968585, 4, { -31.243280f, 1.043213f, 1.580577f }, 1.000000f,
-                            0.000000f );
+    instance.registerEObj( "unknown_0", 2007001, 0, 4, { -5.135936f, -0.986339f, -0.059807f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_1", 2007004, 0, 4, { -6.501123f, -0.986346f, 2.121102f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_2", 2007005, 0, 4, { -5.178086f, -0.986341f, -0.227772f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_3", 2007006, 0, 4, { -7.272448f, -0.986346f, -2.204096f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_4", 2007007, 6216275, 4, { -30.849630f, 0.697522f, -1.415699f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "Gatelever", 2007008, 0, 4, { -31.199289f, 1.850766f, -7.087492f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "Entrance", 2000182, 6215534, 5, { 44.100491f, 1.056062f, 1.068363f }, 1.000000f, 0.000000f ); 
+      // States -> vf_lock_on (id: 11) vf_lock_of (id: 12) 
+    instance.registerEObj( "unknown_5", 2001403, 3968682, 4, { 30.986059f, 0.993235f, 1.480142f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_6", 2001404, 3968585, 4, { -31.243280f, 1.043213f, 1.580577f }, 1.000000f, 0.000000f ); 
 
   }
 
-  void onUpdate( InstanceContentPtr instance, uint32_t currTime ) override
+  void onUpdate( InstanceContent& instance, uint32_t currTime ) override
   {
 
   }
 
-  void onEnterTerritory( InstanceContentPtr instance, Entity::Player& player, uint32_t eventId, uint16_t param1,
+  void onEnterTerritory( InstanceContent& instance, Entity::Player& player, uint32_t eventId, uint16_t param1,
                          uint16_t param2 ) override
   {
 
diff --git a/src/scripts/instances/hallofthenovice/ExecuteaRangedAttacktoIncreaseEnmity.cpp b/src/scripts/instances/hallofthenovice/ExecuteaRangedAttacktoIncreaseEnmity.cpp
index aef375b9..fb284376 100644
--- a/src/scripts/instances/hallofthenovice/ExecuteaRangedAttacktoIncreaseEnmity.cpp
+++ b/src/scripts/instances/hallofthenovice/ExecuteaRangedAttacktoIncreaseEnmity.cpp
@@ -9,34 +9,29 @@ class ExecuteaRangedAttacktoIncreaseEnmity :
 public:
   ExecuteaRangedAttacktoIncreaseEnmity() :
     Sapphire::ScriptAPI::InstanceContentScript( 15006 )
-  {
-  }
+  { }
 
-  void onInit( InstanceContentPtr instance ) override
+  void onInit( InstanceContent& instance ) override
   {
-    instance->registerEObj( "unknown_0", 2007001, 0, 4, { -5.135936f, -0.986339f, -0.059807f }, 1.000000f, 0.000000f );
-    instance->registerEObj( "unknown_1", 2007004, 0, 4, { -6.501123f, -0.986346f, 2.121102f }, 1.000000f, 0.000000f );
-    instance->registerEObj( "unknown_2", 2007005, 0, 4, { -5.178086f, -0.986341f, -0.227772f }, 1.000000f, 0.000000f );
-    instance->registerEObj( "unknown_3", 2007006, 0, 4, { -7.272448f, -0.986346f, -2.204096f }, 1.000000f, 0.000000f );
-    instance->registerEObj( "unknown_4", 2007007, 6216275, 4, { -30.849630f, 0.697522f, -1.415699f }, 1.000000f,
-                            0.000000f );
-    instance->registerEObj( "Gatelever", 2007008, 0, 4, { -31.199289f, 1.850766f, -7.087492f }, 1.000000f, 0.000000f );
-    instance->registerEObj( "Entrance", 2000182, 6215534, 5, { 44.100491f, 1.056062f, 1.068363f }, 1.000000f,
-                            0.000000f );
-    // States -> vf_lock_on vf_lock_of
-    instance->registerEObj( "unknown_5", 2001403, 3968682, 4, { 30.986059f, 0.993235f, 1.480142f }, 1.000000f,
-                            0.000000f );
-    instance->registerEObj( "unknown_6", 2001404, 3968585, 4, { -31.243280f, 1.043213f, 1.580577f }, 1.000000f,
-                            0.000000f );
+    instance.registerEObj( "unknown_0", 2007001, 0, 4, { -5.135936f, -0.986339f, -0.059807f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_1", 2007004, 0, 4, { -6.501123f, -0.986346f, 2.121102f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_2", 2007005, 0, 4, { -5.178086f, -0.986341f, -0.227772f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_3", 2007006, 0, 4, { -7.272448f, -0.986346f, -2.204096f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_4", 2007007, 6216275, 4, { -30.849630f, 0.697522f, -1.415699f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "Gatelever", 2007008, 0, 4, { -31.199289f, 1.850766f, -7.087492f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "Entrance", 2000182, 6215534, 5, { 44.100491f, 1.056062f, 1.068363f }, 1.000000f, 0.000000f ); 
+      // States -> vf_lock_on (id: 11) vf_lock_of (id: 12) 
+    instance.registerEObj( "unknown_5", 2001403, 3968682, 4, { 30.986059f, 0.993235f, 1.480142f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_6", 2001404, 3968585, 4, { -31.243280f, 1.043213f, 1.580577f }, 1.000000f, 0.000000f ); 
 
   }
 
-  void onUpdate( InstanceContentPtr instance, uint32_t currTime ) override
+  void onUpdate( InstanceContent& instance, uint32_t currTime ) override
   {
 
   }
 
-  void onEnterTerritory( InstanceContentPtr instance, Entity::Player& player, uint32_t eventId, uint16_t param1,
+  void onEnterTerritory( InstanceContent& instance, Entity::Player& player, uint32_t eventId, uint16_t param1,
                          uint16_t param2 ) override
   {
 
@@ -44,4 +39,4 @@ public:
 
 };
 
-EXPOSE_SCRIPT( ExecuteaRangedAttacktoIncreaseEnmity );;
\ No newline at end of file
+EXPOSE_SCRIPT( ExecuteaRangedAttacktoIncreaseEnmity );
\ No newline at end of file
diff --git a/src/scripts/instances/hallofthenovice/FinalExercise.cpp b/src/scripts/instances/hallofthenovice/FinalExercise.cpp
index fb20c40a..8ca72014 100644
--- a/src/scripts/instances/hallofthenovice/FinalExercise.cpp
+++ b/src/scripts/instances/hallofthenovice/FinalExercise.cpp
@@ -9,25 +9,22 @@ class FinalExercise :
 public:
   FinalExercise() :
     Sapphire::ScriptAPI::InstanceContentScript( 15016 )
-  {
-  }
+  { }
 
-  void onInit( InstanceContentPtr instance ) override
+  void onInit( InstanceContent& instance ) override
   {
-    instance->registerEObj( "Entrance", 2000182, 6228959, 5, { 457.583801f, 5.680784f, 280.512787f }, 1.000000f,
-                            0.000000f );
-    // States -> vf_lock_on vf_lock_of
-    instance->registerEObj( "unknown_0", 2000608, 2807920, 4, { -95.322441f, -25.054260f, 61.518002f }, 1.000000f,
-                            0.000000f );
+    instance.registerEObj( "Entrance", 2000182, 6228959, 5, { 457.583801f, 5.680784f, 280.512787f }, 1.000000f, 0.000000f ); 
+      // States -> vf_lock_on (id: 11) vf_lock_of (id: 12) 
+    instance.registerEObj( "unknown_0", 2000608, 2807920, 4, { -95.322441f, -25.054260f, 61.518002f }, 1.000000f, 0.000000f ); 
 
   }
 
-  void onUpdate( InstanceContentPtr instance, uint32_t currTime ) override
+  void onUpdate( InstanceContent& instance, uint32_t currTime ) override
   {
 
   }
 
-  void onEnterTerritory( InstanceContentPtr instance, Entity::Player& player, uint32_t eventId, uint16_t param1,
+  void onEnterTerritory( InstanceContent& instance, Entity::Player& player, uint32_t eventId, uint16_t param1,
                          uint16_t param2 ) override
   {
 
diff --git a/src/scripts/instances/hallofthenovice/HealMultipleAllies.cpp b/src/scripts/instances/hallofthenovice/HealMultipleAllies.cpp
index 3e5ea58c..5d91b317 100644
--- a/src/scripts/instances/hallofthenovice/HealMultipleAllies.cpp
+++ b/src/scripts/instances/hallofthenovice/HealMultipleAllies.cpp
@@ -9,34 +9,29 @@ class HealMultipleAllies :
 public:
   HealMultipleAllies() :
     Sapphire::ScriptAPI::InstanceContentScript( 15014 )
-  {
-  }
+  { }
 
-  void onInit( InstanceContentPtr instance ) override
+  void onInit( InstanceContent& instance ) override
   {
-    instance->registerEObj( "unknown_0", 2007001, 0, 4, { -5.135936f, -0.986339f, -0.059807f }, 1.000000f, 0.000000f );
-    instance->registerEObj( "unknown_1", 2007004, 0, 4, { -6.501123f, -0.986346f, 2.121102f }, 1.000000f, 0.000000f );
-    instance->registerEObj( "unknown_2", 2007005, 0, 4, { -5.178086f, -0.986341f, -0.227772f }, 1.000000f, 0.000000f );
-    instance->registerEObj( "unknown_3", 2007006, 0, 4, { -7.272448f, -0.986346f, -2.204096f }, 1.000000f, 0.000000f );
-    instance->registerEObj( "unknown_4", 2007007, 6216275, 4, { -30.849630f, 0.697522f, -1.415699f }, 1.000000f,
-                            0.000000f );
-    instance->registerEObj( "Gatelever", 2007008, 0, 4, { -31.199289f, 1.850766f, -7.087492f }, 1.000000f, 0.000000f );
-    instance->registerEObj( "Entrance", 2000182, 6215534, 5, { 44.100491f, 1.056062f, 1.068363f }, 1.000000f,
-                            0.000000f );
-    // States -> vf_lock_on vf_lock_of
-    instance->registerEObj( "unknown_5", 2001403, 3968682, 4, { 30.986059f, 0.993235f, 1.480142f }, 1.000000f,
-                            0.000000f );
-    instance->registerEObj( "unknown_6", 2001404, 3968585, 4, { -31.243280f, 1.043213f, 1.580577f }, 1.000000f,
-                            0.000000f );
+    instance.registerEObj( "unknown_0", 2007001, 0, 4, { -5.135936f, -0.986339f, -0.059807f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_1", 2007004, 0, 4, { -6.501123f, -0.986346f, 2.121102f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_2", 2007005, 0, 4, { -5.178086f, -0.986341f, -0.227772f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_3", 2007006, 0, 4, { -7.272448f, -0.986346f, -2.204096f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_4", 2007007, 6216275, 4, { -30.849630f, 0.697522f, -1.415699f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "Gatelever", 2007008, 0, 4, { -31.199289f, 1.850766f, -7.087492f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "Entrance", 2000182, 6215534, 5, { 44.100491f, 1.056062f, 1.068363f }, 1.000000f, 0.000000f ); 
+      // States -> vf_lock_on (id: 11) vf_lock_of (id: 12) 
+    instance.registerEObj( "unknown_5", 2001403, 3968682, 4, { 30.986059f, 0.993235f, 1.480142f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_6", 2001404, 3968585, 4, { -31.243280f, 1.043213f, 1.580577f }, 1.000000f, 0.000000f ); 
 
   }
 
-  void onUpdate( InstanceContentPtr instance, uint32_t currTime ) override
+  void onUpdate( InstanceContent& instance, uint32_t currTime ) override
   {
 
   }
 
-  void onEnterTerritory( InstanceContentPtr instance, Entity::Player& player, uint32_t eventId, uint16_t param1,
+  void onEnterTerritory( InstanceContent& instance, Entity::Player& player, uint32_t eventId, uint16_t param1,
                          uint16_t param2 ) override
   {
 
diff --git a/src/scripts/instances/hallofthenovice/HealanAlly.cpp b/src/scripts/instances/hallofthenovice/HealanAlly.cpp
index 50ffa46b..0f850dbd 100644
--- a/src/scripts/instances/hallofthenovice/HealanAlly.cpp
+++ b/src/scripts/instances/hallofthenovice/HealanAlly.cpp
@@ -9,34 +9,29 @@ class HealanAlly :
 public:
   HealanAlly() :
     Sapphire::ScriptAPI::InstanceContentScript( 15013 )
-  {
-  }
+  { }
 
-  void onInit( InstanceContentPtr instance ) override
+  void onInit( InstanceContent& instance ) override
   {
-    instance->registerEObj( "unknown_0", 2007001, 0, 4, { -5.135936f, -0.986339f, -0.059807f }, 1.000000f, 0.000000f );
-    instance->registerEObj( "unknown_1", 2007004, 0, 4, { -6.501123f, -0.986346f, 2.121102f }, 1.000000f, 0.000000f );
-    instance->registerEObj( "unknown_2", 2007005, 0, 4, { -5.178086f, -0.986341f, -0.227772f }, 1.000000f, 0.000000f );
-    instance->registerEObj( "unknown_3", 2007006, 0, 4, { -7.272448f, -0.986346f, -2.204096f }, 1.000000f, 0.000000f );
-    instance->registerEObj( "unknown_4", 2007007, 6216275, 4, { -30.849630f, 0.697522f, -1.415699f }, 1.000000f,
-                            0.000000f );
-    instance->registerEObj( "Gatelever", 2007008, 0, 4, { -31.199289f, 1.850766f, -7.087492f }, 1.000000f, 0.000000f );
-    instance->registerEObj( "Entrance", 2000182, 6215534, 5, { 44.100491f, 1.056062f, 1.068363f }, 1.000000f,
-                            0.000000f );
-    // States -> vf_lock_on vf_lock_of
-    instance->registerEObj( "unknown_5", 2001403, 3968682, 4, { 30.986059f, 0.993235f, 1.480142f }, 1.000000f,
-                            0.000000f );
-    instance->registerEObj( "unknown_6", 2001404, 3968585, 4, { -31.243280f, 1.043213f, 1.580577f }, 1.000000f,
-                            0.000000f );
+    instance.registerEObj( "unknown_0", 2007001, 0, 4, { -5.135936f, -0.986339f, -0.059807f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_1", 2007004, 0, 4, { -6.501123f, -0.986346f, 2.121102f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_2", 2007005, 0, 4, { -5.178086f, -0.986341f, -0.227772f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_3", 2007006, 0, 4, { -7.272448f, -0.986346f, -2.204096f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_4", 2007007, 6216275, 4, { -30.849630f, 0.697522f, -1.415699f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "Gatelever", 2007008, 0, 4, { -31.199289f, 1.850766f, -7.087492f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "Entrance", 2000182, 6215534, 5, { 44.100491f, 1.056062f, 1.068363f }, 1.000000f, 0.000000f ); 
+      // States -> vf_lock_on (id: 11) vf_lock_of (id: 12) 
+    instance.registerEObj( "unknown_5", 2001403, 3968682, 4, { 30.986059f, 0.993235f, 1.480142f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_6", 2001404, 3968585, 4, { -31.243280f, 1.043213f, 1.580577f }, 1.000000f, 0.000000f ); 
 
   }
 
-  void onUpdate( InstanceContentPtr instance, uint32_t currTime ) override
+  void onUpdate( InstanceContent& instance, uint32_t currTime ) override
   {
 
   }
 
-  void onEnterTerritory( InstanceContentPtr instance, Entity::Player& player, uint32_t eventId, uint16_t param1,
+  void onEnterTerritory( InstanceContent& instance, Entity::Player& player, uint32_t eventId, uint16_t param1,
                          uint16_t param2 ) override
   {
 
diff --git a/src/scripts/instances/hallofthenovice/InteractwiththeBattlefield.cpp b/src/scripts/instances/hallofthenovice/InteractwiththeBattlefield.cpp
index afef8533..402e2fab 100644
--- a/src/scripts/instances/hallofthenovice/InteractwiththeBattlefield.cpp
+++ b/src/scripts/instances/hallofthenovice/InteractwiththeBattlefield.cpp
@@ -9,34 +9,29 @@ class InteractwiththeBattlefield :
 public:
   InteractwiththeBattlefield() :
     Sapphire::ScriptAPI::InstanceContentScript( 15012 )
-  {
-  }
+  { }
 
-  void onInit( InstanceContentPtr instance ) override
+  void onInit( InstanceContent& instance ) override
   {
-    instance->registerEObj( "unknown_0", 2007001, 0, 4, { -5.135936f, -0.986339f, -0.059807f }, 1.000000f, 0.000000f );
-    instance->registerEObj( "unknown_1", 2007004, 0, 4, { -6.501123f, -0.986346f, 2.121102f }, 1.000000f, 0.000000f );
-    instance->registerEObj( "unknown_2", 2007005, 0, 4, { -5.178086f, -0.986341f, -0.227772f }, 1.000000f, 0.000000f );
-    instance->registerEObj( "unknown_3", 2007006, 0, 4, { -7.272448f, -0.986346f, -2.204096f }, 1.000000f, 0.000000f );
-    instance->registerEObj( "unknown_4", 2007007, 6216275, 4, { -30.849630f, 0.697522f, -1.415699f }, 1.000000f,
-                            0.000000f );
-    instance->registerEObj( "Gatelever", 2007008, 0, 4, { -31.199289f, 1.850766f, -7.087492f }, 1.000000f, 0.000000f );
-    instance->registerEObj( "Entrance", 2000182, 6215534, 5, { 44.100491f, 1.056062f, 1.068363f }, 1.000000f,
-                            0.000000f );
-    // States -> vf_lock_on vf_lock_of
-    instance->registerEObj( "unknown_5", 2001403, 3968682, 4, { 30.986059f, 0.993235f, 1.480142f }, 1.000000f,
-                            0.000000f );
-    instance->registerEObj( "unknown_6", 2001404, 3968585, 4, { -31.243280f, 1.043213f, 1.580577f }, 1.000000f,
-                            0.000000f );
+    instance.registerEObj( "unknown_0", 2007001, 0, 4, { -5.135936f, -0.986339f, -0.059807f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_1", 2007004, 0, 4, { -6.501123f, -0.986346f, 2.121102f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_2", 2007005, 0, 4, { -5.178086f, -0.986341f, -0.227772f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_3", 2007006, 0, 4, { -7.272448f, -0.986346f, -2.204096f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_4", 2007007, 6216275, 4, { -30.849630f, 0.697522f, -1.415699f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "Gatelever", 2007008, 0, 4, { -31.199289f, 1.850766f, -7.087492f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "Entrance", 2000182, 6215534, 5, { 44.100491f, 1.056062f, 1.068363f }, 1.000000f, 0.000000f ); 
+      // States -> vf_lock_on (id: 11) vf_lock_of (id: 12) 
+    instance.registerEObj( "unknown_5", 2001403, 3968682, 4, { 30.986059f, 0.993235f, 1.480142f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_6", 2001404, 3968585, 4, { -31.243280f, 1.043213f, 1.580577f }, 1.000000f, 0.000000f ); 
 
   }
 
-  void onUpdate( InstanceContentPtr instance, uint32_t currTime ) override
+  void onUpdate( InstanceContent& instance, uint32_t currTime ) override
   {
 
   }
 
-  void onEnterTerritory( InstanceContentPtr instance, Entity::Player& player, uint32_t eventId, uint16_t param1,
+  void onEnterTerritory( InstanceContent& instance, Entity::Player& player, uint32_t eventId, uint16_t param1,
                          uint16_t param2 ) override
   {
 
diff --git a/src/scripts/instances/maskedcarnivale/AChorusSlime.cpp b/src/scripts/instances/maskedcarnivale/AChorusSlime.cpp
new file mode 100644
index 00000000..e808f367
--- /dev/null
+++ b/src/scripts/instances/maskedcarnivale/AChorusSlime.cpp
@@ -0,0 +1,38 @@
+#include <ScriptObject.h>
+#include <Territory/InstanceContent.h>
+
+using namespace Sapphire;
+
+class AChorusSlime :
+  public Sapphire::ScriptAPI::InstanceContentScript
+{
+public:
+  AChorusSlime() :
+    Sapphire::ScriptAPI::InstanceContentScript( 35007 )
+  { }
+
+  void onInit( InstanceContent& instance ) override
+  {
+    instance.registerEObj( "Entrance", 2000182, 7676036, 5, { 100.000000f, 2.000000f, 113.000000f }, 1.000000f, 0.000000f ); 
+      // States -> vf_lock_on (id: 11) vf_lock_of (id: 12) 
+    instance.registerEObj( "unknown_0", 2002618, 7738683, 4, { 96.000000f, 2.000000f, 104.000000f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_1", 2009702, 7767980, 4, { 103.000000f, 2.000000f, 105.000000f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_2", 2009703, 7767985, 4, { 101.000000f, 2.000000f, 88.000000f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_3", 2009704, 7767987, 4, { 100.053703f, 5.599999f, 100.556702f }, 1.000000f, 0.000000f ); 
+
+  }
+
+  void onUpdate( InstanceContent& instance, uint32_t currTime ) override
+  {
+
+  }
+
+  void onEnterTerritory( InstanceContent& instance, Entity::Player& player, uint32_t eventId, uint16_t param1,
+                         uint16_t param2 ) override
+  {
+
+  }
+
+};
+
+EXPOSE_SCRIPT( AChorusSlime );
\ No newline at end of file
diff --git a/src/scripts/instances/maskedcarnivale/ALittleKnightMusic.cpp b/src/scripts/instances/maskedcarnivale/ALittleKnightMusic.cpp
new file mode 100644
index 00000000..b2a88037
--- /dev/null
+++ b/src/scripts/instances/maskedcarnivale/ALittleKnightMusic.cpp
@@ -0,0 +1,38 @@
+#include <ScriptObject.h>
+#include <Territory/InstanceContent.h>
+
+using namespace Sapphire;
+
+class ALittleKnightMusic :
+  public Sapphire::ScriptAPI::InstanceContentScript
+{
+public:
+  ALittleKnightMusic() :
+    Sapphire::ScriptAPI::InstanceContentScript( 35010 )
+  { }
+
+  void onInit( InstanceContent& instance ) override
+  {
+    instance.registerEObj( "Entrance", 2000182, 7676036, 5, { 100.000000f, 2.000000f, 113.000000f }, 1.000000f, 0.000000f ); 
+      // States -> vf_lock_on (id: 11) vf_lock_of (id: 12) 
+    instance.registerEObj( "unknown_0", 2002618, 7738683, 4, { 96.000000f, 2.000000f, 104.000000f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_1", 2009702, 7767980, 4, { 103.000000f, 2.000000f, 105.000000f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_2", 2009703, 7767985, 4, { 101.000000f, 2.000000f, 88.000000f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_3", 2009704, 7767987, 4, { 100.053703f, 5.599999f, 100.556702f }, 1.000000f, 0.000000f ); 
+
+  }
+
+  void onUpdate( InstanceContent& instance, uint32_t currTime ) override
+  {
+
+  }
+
+  void onEnterTerritory( InstanceContent& instance, Entity::Player& player, uint32_t eventId, uint16_t param1,
+                         uint16_t param2 ) override
+  {
+
+  }
+
+};
+
+EXPOSE_SCRIPT( ALittleKnightMusic );
\ No newline at end of file
diff --git a/src/scripts/instances/maskedcarnivale/AllsWellThatStartsWell.cpp b/src/scripts/instances/maskedcarnivale/AllsWellThatStartsWell.cpp
new file mode 100644
index 00000000..dd04acf3
--- /dev/null
+++ b/src/scripts/instances/maskedcarnivale/AllsWellThatStartsWell.cpp
@@ -0,0 +1,38 @@
+#include <ScriptObject.h>
+#include <Territory/InstanceContent.h>
+
+using namespace Sapphire;
+
+class AllsWellThatStartsWell :
+  public Sapphire::ScriptAPI::InstanceContentScript
+{
+public:
+  AllsWellThatStartsWell() :
+    Sapphire::ScriptAPI::InstanceContentScript( 35001 )
+  { }
+
+  void onInit( InstanceContent& instance ) override
+  {
+    instance.registerEObj( "Entrance", 2000182, 7676036, 5, { 100.000000f, 2.000000f, 113.000000f }, 1.000000f, 0.000000f ); 
+      // States -> vf_lock_on (id: 11) vf_lock_of (id: 12) 
+    instance.registerEObj( "unknown_0", 2002618, 7738683, 4, { 96.000000f, 2.000000f, 104.000000f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_1", 2009702, 7767980, 4, { 103.000000f, 2.000000f, 105.000000f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_2", 2009703, 7767985, 4, { 101.000000f, 2.000000f, 88.000000f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_3", 2009704, 7767987, 4, { 100.053703f, 5.599999f, 100.556702f }, 1.000000f, 0.000000f ); 
+
+  }
+
+  void onUpdate( InstanceContent& instance, uint32_t currTime ) override
+  {
+
+  }
+
+  void onEnterTerritory( InstanceContent& instance, Entity::Player& player, uint32_t eventId, uint16_t param1,
+                         uint16_t param2 ) override
+  {
+
+  }
+
+};
+
+EXPOSE_SCRIPT( AllsWellThatStartsWell );
\ No newline at end of file
diff --git a/src/scripts/instances/maskedcarnivale/AmazingTechnicolorPitFiends.cpp b/src/scripts/instances/maskedcarnivale/AmazingTechnicolorPitFiends.cpp
new file mode 100644
index 00000000..a68f2495
--- /dev/null
+++ b/src/scripts/instances/maskedcarnivale/AmazingTechnicolorPitFiends.cpp
@@ -0,0 +1,38 @@
+#include <ScriptObject.h>
+#include <Territory/InstanceContent.h>
+
+using namespace Sapphire;
+
+class AmazingTechnicolorPitFiends :
+  public Sapphire::ScriptAPI::InstanceContentScript
+{
+public:
+  AmazingTechnicolorPitFiends() :
+    Sapphire::ScriptAPI::InstanceContentScript( 35024 )
+  { }
+
+  void onInit( InstanceContent& instance ) override
+  {
+    instance.registerEObj( "Entrance", 2000182, 7676036, 5, { 100.000000f, 2.000000f, 113.000000f }, 1.000000f, 0.000000f ); 
+      // States -> vf_lock_on (id: 11) vf_lock_of (id: 12) 
+    instance.registerEObj( "unknown_0", 2002618, 7738683, 4, { 96.000000f, 2.000000f, 104.000000f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_1", 2009702, 7767980, 4, { 103.000000f, 2.000000f, 105.000000f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_2", 2009703, 7767985, 4, { 101.000000f, 2.000000f, 88.000000f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_3", 2009704, 7767987, 4, { 100.053703f, 5.599999f, 100.556702f }, 1.000000f, 0.000000f ); 
+
+  }
+
+  void onUpdate( InstanceContent& instance, uint32_t currTime ) override
+  {
+
+  }
+
+  void onEnterTerritory( InstanceContent& instance, Entity::Player& player, uint32_t eventId, uint16_t param1,
+                         uint16_t param2 ) override
+  {
+
+  }
+
+};
+
+EXPOSE_SCRIPT( AmazingTechnicolorPitFiends );
\ No newline at end of file
diff --git a/src/scripts/instances/maskedcarnivale/BeautyandaBeast.cpp b/src/scripts/instances/maskedcarnivale/BeautyandaBeast.cpp
new file mode 100644
index 00000000..9950a78a
--- /dev/null
+++ b/src/scripts/instances/maskedcarnivale/BeautyandaBeast.cpp
@@ -0,0 +1,38 @@
+#include <ScriptObject.h>
+#include <Territory/InstanceContent.h>
+
+using namespace Sapphire;
+
+class BeautyandaBeast :
+  public Sapphire::ScriptAPI::InstanceContentScript
+{
+public:
+  BeautyandaBeast() :
+    Sapphire::ScriptAPI::InstanceContentScript( 35013 )
+  { }
+
+  void onInit( InstanceContent& instance ) override
+  {
+    instance.registerEObj( "Entrance", 2000182, 7676036, 5, { 100.000000f, 2.000000f, 113.000000f }, 1.000000f, 0.000000f ); 
+      // States -> vf_lock_on (id: 11) vf_lock_of (id: 12) 
+    instance.registerEObj( "unknown_0", 2002618, 7738683, 4, { 96.000000f, 2.000000f, 104.000000f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_1", 2009702, 7767980, 4, { 103.000000f, 2.000000f, 105.000000f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_2", 2009703, 7767985, 4, { 101.000000f, 2.000000f, 88.000000f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_3", 2009704, 7767987, 4, { 100.053703f, 5.599999f, 100.556702f }, 1.000000f, 0.000000f ); 
+
+  }
+
+  void onUpdate( InstanceContent& instance, uint32_t currTime ) override
+  {
+
+  }
+
+  void onEnterTerritory( InstanceContent& instance, Entity::Player& player, uint32_t eventId, uint16_t param1,
+                         uint16_t param2 ) override
+  {
+
+  }
+
+};
+
+EXPOSE_SCRIPT( BeautyandaBeast );
\ No newline at end of file
diff --git a/src/scripts/instances/maskedcarnivale/BehemothsandBroomsticks.cpp b/src/scripts/instances/maskedcarnivale/BehemothsandBroomsticks.cpp
new file mode 100644
index 00000000..f4795725
--- /dev/null
+++ b/src/scripts/instances/maskedcarnivale/BehemothsandBroomsticks.cpp
@@ -0,0 +1,38 @@
+#include <ScriptObject.h>
+#include <Territory/InstanceContent.h>
+
+using namespace Sapphire;
+
+class BehemothsandBroomsticks :
+  public Sapphire::ScriptAPI::InstanceContentScript
+{
+public:
+  BehemothsandBroomsticks() :
+    Sapphire::ScriptAPI::InstanceContentScript( 35023 )
+  { }
+
+  void onInit( InstanceContent& instance ) override
+  {
+    instance.registerEObj( "Entrance", 2000182, 7676036, 5, { 100.000000f, 2.000000f, 113.000000f }, 1.000000f, 0.000000f ); 
+      // States -> vf_lock_on (id: 11) vf_lock_of (id: 12) 
+    instance.registerEObj( "unknown_0", 2002618, 7738683, 4, { 96.000000f, 2.000000f, 104.000000f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_1", 2009702, 7767980, 4, { 103.000000f, 2.000000f, 105.000000f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_2", 2009703, 7767985, 4, { 101.000000f, 2.000000f, 88.000000f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_3", 2009704, 7767987, 4, { 100.053703f, 5.599999f, 100.556702f }, 1.000000f, 0.000000f ); 
+
+  }
+
+  void onUpdate( InstanceContent& instance, uint32_t currTime ) override
+  {
+
+  }
+
+  void onEnterTerritory( InstanceContent& instance, Entity::Player& player, uint32_t eventId, uint16_t param1,
+                         uint16_t param2 ) override
+  {
+
+  }
+
+};
+
+EXPOSE_SCRIPT( BehemothsandBroomsticks );
\ No newline at end of file
diff --git a/src/scripts/instances/maskedcarnivale/BlobsintheWoods.cpp b/src/scripts/instances/maskedcarnivale/BlobsintheWoods.cpp
new file mode 100644
index 00000000..b2caeaf2
--- /dev/null
+++ b/src/scripts/instances/maskedcarnivale/BlobsintheWoods.cpp
@@ -0,0 +1,38 @@
+#include <ScriptObject.h>
+#include <Territory/InstanceContent.h>
+
+using namespace Sapphire;
+
+class BlobsintheWoods :
+  public Sapphire::ScriptAPI::InstanceContentScript
+{
+public:
+  BlobsintheWoods() :
+    Sapphire::ScriptAPI::InstanceContentScript( 35014 )
+  { }
+
+  void onInit( InstanceContent& instance ) override
+  {
+    instance.registerEObj( "Entrance", 2000182, 7676036, 5, { 100.000000f, 2.000000f, 113.000000f }, 1.000000f, 0.000000f ); 
+      // States -> vf_lock_on (id: 11) vf_lock_of (id: 12) 
+    instance.registerEObj( "unknown_0", 2002618, 7738683, 4, { 96.000000f, 2.000000f, 104.000000f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_1", 2009702, 7767980, 4, { 103.000000f, 2.000000f, 105.000000f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_2", 2009703, 7767985, 4, { 101.000000f, 2.000000f, 88.000000f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_3", 2009704, 7767987, 4, { 100.053703f, 5.599999f, 100.556702f }, 1.000000f, 0.000000f ); 
+
+  }
+
+  void onUpdate( InstanceContent& instance, uint32_t currTime ) override
+  {
+
+  }
+
+  void onEnterTerritory( InstanceContent& instance, Entity::Player& player, uint32_t eventId, uint16_t param1,
+                         uint16_t param2 ) override
+  {
+
+  }
+
+};
+
+EXPOSE_SCRIPT( BlobsintheWoods );
\ No newline at end of file
diff --git a/src/scripts/instances/maskedcarnivale/BombedyofErrors.cpp b/src/scripts/instances/maskedcarnivale/BombedyofErrors.cpp
new file mode 100644
index 00000000..e847301b
--- /dev/null
+++ b/src/scripts/instances/maskedcarnivale/BombedyofErrors.cpp
@@ -0,0 +1,38 @@
+#include <ScriptObject.h>
+#include <Territory/InstanceContent.h>
+
+using namespace Sapphire;
+
+class BombedyofErrors :
+  public Sapphire::ScriptAPI::InstanceContentScript
+{
+public:
+  BombedyofErrors() :
+    Sapphire::ScriptAPI::InstanceContentScript( 35008 )
+  { }
+
+  void onInit( InstanceContent& instance ) override
+  {
+    instance.registerEObj( "Entrance", 2000182, 7676036, 5, { 100.000000f, 2.000000f, 113.000000f }, 1.000000f, 0.000000f ); 
+      // States -> vf_lock_on (id: 11) vf_lock_of (id: 12) 
+    instance.registerEObj( "unknown_0", 2002618, 7738683, 4, { 96.000000f, 2.000000f, 104.000000f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_1", 2009702, 7767980, 4, { 103.000000f, 2.000000f, 105.000000f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_2", 2009703, 7767985, 4, { 101.000000f, 2.000000f, 88.000000f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_3", 2009704, 7767987, 4, { 100.053703f, 5.599999f, 100.556702f }, 1.000000f, 0.000000f ); 
+
+  }
+
+  void onUpdate( InstanceContent& instance, uint32_t currTime ) override
+  {
+
+  }
+
+  void onEnterTerritory( InstanceContent& instance, Entity::Player& player, uint32_t eventId, uint16_t param1,
+                         uint16_t param2 ) override
+  {
+
+  }
+
+};
+
+EXPOSE_SCRIPT( BombedyofErrors );
\ No newline at end of file
diff --git a/src/scripts/instances/maskedcarnivale/ChimeraonaHotTinRoof.cpp b/src/scripts/instances/maskedcarnivale/ChimeraonaHotTinRoof.cpp
new file mode 100644
index 00000000..0ca9cd21
--- /dev/null
+++ b/src/scripts/instances/maskedcarnivale/ChimeraonaHotTinRoof.cpp
@@ -0,0 +1,38 @@
+#include <ScriptObject.h>
+#include <Territory/InstanceContent.h>
+
+using namespace Sapphire;
+
+class ChimeraonaHotTinRoof :
+  public Sapphire::ScriptAPI::InstanceContentScript
+{
+public:
+  ChimeraonaHotTinRoof() :
+    Sapphire::ScriptAPI::InstanceContentScript( 35021 )
+  { }
+
+  void onInit( InstanceContent& instance ) override
+  {
+    instance.registerEObj( "Entrance", 2000182, 7676036, 5, { 100.000000f, 2.000000f, 113.000000f }, 1.000000f, 0.000000f ); 
+      // States -> vf_lock_on (id: 11) vf_lock_of (id: 12) 
+    instance.registerEObj( "unknown_0", 2002618, 7738683, 4, { 96.000000f, 2.000000f, 104.000000f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_1", 2009702, 7767980, 4, { 103.000000f, 2.000000f, 105.000000f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_2", 2009703, 7767985, 4, { 101.000000f, 2.000000f, 88.000000f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_3", 2009704, 7767987, 4, { 100.053703f, 5.599999f, 100.556702f }, 1.000000f, 0.000000f ); 
+
+  }
+
+  void onUpdate( InstanceContent& instance, uint32_t currTime ) override
+  {
+
+  }
+
+  void onEnterTerritory( InstanceContent& instance, Entity::Player& player, uint32_t eventId, uint16_t param1,
+                         uint16_t param2 ) override
+  {
+
+  }
+
+};
+
+EXPOSE_SCRIPT( ChimeraonaHotTinRoof );
\ No newline at end of file
diff --git a/src/scripts/instances/maskedcarnivale/DirtyRottenAzulmagia.cpp b/src/scripts/instances/maskedcarnivale/DirtyRottenAzulmagia.cpp
new file mode 100644
index 00000000..67e610fb
--- /dev/null
+++ b/src/scripts/instances/maskedcarnivale/DirtyRottenAzulmagia.cpp
@@ -0,0 +1,38 @@
+#include <ScriptObject.h>
+#include <Territory/InstanceContent.h>
+
+using namespace Sapphire;
+
+class DirtyRottenAzulmagia :
+  public Sapphire::ScriptAPI::InstanceContentScript
+{
+public:
+  DirtyRottenAzulmagia() :
+    Sapphire::ScriptAPI::InstanceContentScript( 35025 )
+  { }
+
+  void onInit( InstanceContent& instance ) override
+  {
+    instance.registerEObj( "Entrance", 2000182, 7676036, 5, { 100.000000f, 2.000000f, 113.000000f }, 1.000000f, 0.000000f ); 
+      // States -> vf_lock_on (id: 11) vf_lock_of (id: 12) 
+    instance.registerEObj( "unknown_0", 2002618, 7738683, 4, { 96.000000f, 2.000000f, 104.000000f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_1", 2009702, 7767980, 4, { 103.000000f, 2.000000f, 105.000000f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_2", 2009703, 7767985, 4, { 101.000000f, 2.000000f, 88.000000f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_3", 2009704, 7767987, 4, { 100.053703f, 5.599999f, 100.556702f }, 1.000000f, 0.000000f ); 
+
+  }
+
+  void onUpdate( InstanceContent& instance, uint32_t currTime ) override
+  {
+
+  }
+
+  void onEnterTerritory( InstanceContent& instance, Entity::Player& player, uint32_t eventId, uint16_t param1,
+                         uint16_t param2 ) override
+  {
+
+  }
+
+};
+
+EXPOSE_SCRIPT( DirtyRottenAzulmagia );
\ No newline at end of file
diff --git a/src/scripts/instances/maskedcarnivale/EyeSociety.cpp b/src/scripts/instances/maskedcarnivale/EyeSociety.cpp
new file mode 100644
index 00000000..fb3c54e0
--- /dev/null
+++ b/src/scripts/instances/maskedcarnivale/EyeSociety.cpp
@@ -0,0 +1,38 @@
+#include <ScriptObject.h>
+#include <Territory/InstanceContent.h>
+
+using namespace Sapphire;
+
+class EyeSociety :
+  public Sapphire::ScriptAPI::InstanceContentScript
+{
+public:
+  EyeSociety() :
+    Sapphire::ScriptAPI::InstanceContentScript( 35006 )
+  { }
+
+  void onInit( InstanceContent& instance ) override
+  {
+    instance.registerEObj( "Entrance", 2000182, 7676036, 5, { 100.000000f, 2.000000f, 113.000000f }, 1.000000f, 0.000000f ); 
+      // States -> vf_lock_on (id: 11) vf_lock_of (id: 12) 
+    instance.registerEObj( "unknown_0", 2002618, 7738683, 4, { 96.000000f, 2.000000f, 104.000000f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_1", 2009702, 7767980, 4, { 103.000000f, 2.000000f, 105.000000f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_2", 2009703, 7767985, 4, { 101.000000f, 2.000000f, 88.000000f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_3", 2009704, 7767987, 4, { 100.053703f, 5.599999f, 100.556702f }, 1.000000f, 0.000000f ); 
+
+  }
+
+  void onUpdate( InstanceContent& instance, uint32_t currTime ) override
+  {
+
+  }
+
+  void onEnterTerritory( InstanceContent& instance, Entity::Player& player, uint32_t eventId, uint16_t param1,
+                         uint16_t param2 ) override
+  {
+
+  }
+
+};
+
+EXPOSE_SCRIPT( EyeSociety );
\ No newline at end of file
diff --git a/src/scripts/instances/maskedcarnivale/GentlemenPreferSwords.cpp b/src/scripts/instances/maskedcarnivale/GentlemenPreferSwords.cpp
new file mode 100644
index 00000000..0c6eaa4c
--- /dev/null
+++ b/src/scripts/instances/maskedcarnivale/GentlemenPreferSwords.cpp
@@ -0,0 +1,38 @@
+#include <ScriptObject.h>
+#include <Territory/InstanceContent.h>
+
+using namespace Sapphire;
+
+class GentlemenPreferSwords :
+  public Sapphire::ScriptAPI::InstanceContentScript
+{
+public:
+  GentlemenPreferSwords() :
+    Sapphire::ScriptAPI::InstanceContentScript( 35004 )
+  { }
+
+  void onInit( InstanceContent& instance ) override
+  {
+    instance.registerEObj( "Entrance", 2000182, 7676036, 5, { 100.000000f, 2.000000f, 113.000000f }, 1.000000f, 0.000000f ); 
+      // States -> vf_lock_on (id: 11) vf_lock_of (id: 12) 
+    instance.registerEObj( "unknown_0", 2002618, 7738683, 4, { 96.000000f, 2.000000f, 104.000000f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_1", 2009702, 7767980, 4, { 103.000000f, 2.000000f, 105.000000f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_2", 2009703, 7767985, 4, { 101.000000f, 2.000000f, 88.000000f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_3", 2009704, 7767987, 4, { 100.053703f, 5.599999f, 100.556702f }, 1.000000f, 0.000000f ); 
+
+  }
+
+  void onUpdate( InstanceContent& instance, uint32_t currTime ) override
+  {
+
+  }
+
+  void onEnterTerritory( InstanceContent& instance, Entity::Player& player, uint32_t eventId, uint16_t param1,
+                         uint16_t param2 ) override
+  {
+
+  }
+
+};
+
+EXPOSE_SCRIPT( GentlemenPreferSwords );
\ No newline at end of file
diff --git a/src/scripts/instances/maskedcarnivale/HereComestheBoom.cpp b/src/scripts/instances/maskedcarnivale/HereComestheBoom.cpp
new file mode 100644
index 00000000..e71e3684
--- /dev/null
+++ b/src/scripts/instances/maskedcarnivale/HereComestheBoom.cpp
@@ -0,0 +1,38 @@
+#include <ScriptObject.h>
+#include <Territory/InstanceContent.h>
+
+using namespace Sapphire;
+
+class HereComestheBoom :
+  public Sapphire::ScriptAPI::InstanceContentScript
+{
+public:
+  HereComestheBoom() :
+    Sapphire::ScriptAPI::InstanceContentScript( 35022 )
+  { }
+
+  void onInit( InstanceContent& instance ) override
+  {
+    instance.registerEObj( "Entrance", 2000182, 7676036, 5, { 100.000000f, 2.000000f, 113.000000f }, 1.000000f, 0.000000f ); 
+      // States -> vf_lock_on (id: 11) vf_lock_of (id: 12) 
+    instance.registerEObj( "unknown_0", 2002618, 7738683, 4, { 96.000000f, 2.000000f, 104.000000f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_1", 2009702, 7767980, 4, { 103.000000f, 2.000000f, 105.000000f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_2", 2009703, 7767985, 4, { 101.000000f, 2.000000f, 88.000000f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_3", 2009704, 7767987, 4, { 100.053703f, 5.599999f, 100.556702f }, 1.000000f, 0.000000f ); 
+
+  }
+
+  void onUpdate( InstanceContent& instance, uint32_t currTime ) override
+  {
+
+  }
+
+  void onEnterTerritory( InstanceContent& instance, Entity::Player& player, uint32_t eventId, uint16_t param1,
+                         uint16_t param2 ) override
+  {
+
+  }
+
+};
+
+EXPOSE_SCRIPT( HereComestheBoom );
\ No newline at end of file
diff --git a/src/scripts/instances/maskedcarnivale/MidsummerNightsExplosion.cpp b/src/scripts/instances/maskedcarnivale/MidsummerNightsExplosion.cpp
new file mode 100644
index 00000000..c218cfed
--- /dev/null
+++ b/src/scripts/instances/maskedcarnivale/MidsummerNightsExplosion.cpp
@@ -0,0 +1,38 @@
+#include <ScriptObject.h>
+#include <Territory/InstanceContent.h>
+
+using namespace Sapphire;
+
+class MidsummerNightsExplosion :
+  public Sapphire::ScriptAPI::InstanceContentScript
+{
+public:
+  MidsummerNightsExplosion() :
+    Sapphire::ScriptAPI::InstanceContentScript( 35018 )
+  { }
+
+  void onInit( InstanceContent& instance ) override
+  {
+    instance.registerEObj( "Entrance", 2000182, 7676036, 5, { 100.000000f, 2.000000f, 113.000000f }, 1.000000f, 0.000000f ); 
+      // States -> vf_lock_on (id: 11) vf_lock_of (id: 12) 
+    instance.registerEObj( "unknown_0", 2002618, 7738683, 4, { 96.000000f, 2.000000f, 104.000000f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_1", 2009702, 7767980, 4, { 103.000000f, 2.000000f, 105.000000f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_2", 2009703, 7767985, 4, { 101.000000f, 2.000000f, 88.000000f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_3", 2009704, 7767987, 4, { 100.053703f, 5.599999f, 100.556702f }, 1.000000f, 0.000000f ); 
+
+  }
+
+  void onUpdate( InstanceContent& instance, uint32_t currTime ) override
+  {
+
+  }
+
+  void onEnterTerritory( InstanceContent& instance, Entity::Player& player, uint32_t eventId, uint16_t param1,
+                         uint16_t param2 ) override
+  {
+
+  }
+
+};
+
+EXPOSE_SCRIPT( MidsummerNightsExplosion );
\ No newline at end of file
diff --git a/src/scripts/instances/maskedcarnivale/MissTyphon.cpp b/src/scripts/instances/maskedcarnivale/MissTyphon.cpp
new file mode 100644
index 00000000..b889bcb2
--- /dev/null
+++ b/src/scripts/instances/maskedcarnivale/MissTyphon.cpp
@@ -0,0 +1,38 @@
+#include <ScriptObject.h>
+#include <Territory/InstanceContent.h>
+
+using namespace Sapphire;
+
+class MissTyphon :
+  public Sapphire::ScriptAPI::InstanceContentScript
+{
+public:
+  MissTyphon() :
+    Sapphire::ScriptAPI::InstanceContentScript( 35020 )
+  { }
+
+  void onInit( InstanceContent& instance ) override
+  {
+    instance.registerEObj( "Entrance", 2000182, 7676036, 5, { 100.000000f, 2.000000f, 113.000000f }, 1.000000f, 0.000000f ); 
+      // States -> vf_lock_on (id: 11) vf_lock_of (id: 12) 
+    instance.registerEObj( "unknown_0", 2002618, 7738683, 4, { 96.000000f, 2.000000f, 104.000000f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_1", 2009702, 7767980, 4, { 103.000000f, 2.000000f, 105.000000f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_2", 2009703, 7767985, 4, { 101.000000f, 2.000000f, 88.000000f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_3", 2009704, 7767987, 4, { 100.053703f, 5.599999f, 100.556702f }, 1.000000f, 0.000000f ); 
+
+  }
+
+  void onUpdate( InstanceContent& instance, uint32_t currTime ) override
+  {
+
+  }
+
+  void onEnterTerritory( InstanceContent& instance, Entity::Player& player, uint32_t eventId, uint16_t param1,
+                         uint16_t param2 ) override
+  {
+
+  }
+
+};
+
+EXPOSE_SCRIPT( MissTyphon );
\ No newline at end of file
diff --git a/src/scripts/instances/maskedcarnivale/MuchAdoAboutPudding.cpp b/src/scripts/instances/maskedcarnivale/MuchAdoAboutPudding.cpp
new file mode 100644
index 00000000..49d9004e
--- /dev/null
+++ b/src/scripts/instances/maskedcarnivale/MuchAdoAboutPudding.cpp
@@ -0,0 +1,38 @@
+#include <ScriptObject.h>
+#include <Territory/InstanceContent.h>
+
+using namespace Sapphire;
+
+class MuchAdoAboutPudding :
+  public Sapphire::ScriptAPI::InstanceContentScript
+{
+public:
+  MuchAdoAboutPudding() :
+    Sapphire::ScriptAPI::InstanceContentScript( 35002 )
+  { }
+
+  void onInit( InstanceContent& instance ) override
+  {
+    instance.registerEObj( "Entrance", 2000182, 7676036, 5, { 100.000000f, 2.000000f, 113.000000f }, 1.000000f, 0.000000f ); 
+      // States -> vf_lock_on (id: 11) vf_lock_of (id: 12) 
+    instance.registerEObj( "unknown_0", 2002618, 7738683, 4, { 96.000000f, 2.000000f, 104.000000f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_1", 2009702, 7767980, 4, { 103.000000f, 2.000000f, 105.000000f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_2", 2009703, 7767985, 4, { 101.000000f, 2.000000f, 88.000000f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_3", 2009704, 7767987, 4, { 100.053703f, 5.599999f, 100.556702f }, 1.000000f, 0.000000f ); 
+
+  }
+
+  void onUpdate( InstanceContent& instance, uint32_t currTime ) override
+  {
+
+  }
+
+  void onEnterTerritory( InstanceContent& instance, Entity::Player& player, uint32_t eventId, uint16_t param1,
+                         uint16_t param2 ) override
+  {
+
+  }
+
+};
+
+EXPOSE_SCRIPT( MuchAdoAboutPudding );
\ No newline at end of file
diff --git a/src/scripts/instances/maskedcarnivale/OnaClearDayYouCanSmellForever.cpp b/src/scripts/instances/maskedcarnivale/OnaClearDayYouCanSmellForever.cpp
new file mode 100644
index 00000000..2aaef872
--- /dev/null
+++ b/src/scripts/instances/maskedcarnivale/OnaClearDayYouCanSmellForever.cpp
@@ -0,0 +1,38 @@
+#include <ScriptObject.h>
+#include <Territory/InstanceContent.h>
+
+using namespace Sapphire;
+
+class OnaClearDayYouCanSmellForever :
+  public Sapphire::ScriptAPI::InstanceContentScript
+{
+public:
+  OnaClearDayYouCanSmellForever() :
+    Sapphire::ScriptAPI::InstanceContentScript( 35019 )
+  { }
+
+  void onInit( InstanceContent& instance ) override
+  {
+    instance.registerEObj( "Entrance", 2000182, 7676036, 5, { 100.000000f, 2.000000f, 113.000000f }, 1.000000f, 0.000000f ); 
+      // States -> vf_lock_on (id: 11) vf_lock_of (id: 12) 
+    instance.registerEObj( "unknown_0", 2002618, 7738683, 4, { 96.000000f, 2.000000f, 104.000000f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_1", 2009702, 7767980, 4, { 103.000000f, 2.000000f, 105.000000f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_2", 2009703, 7767985, 4, { 101.000000f, 2.000000f, 88.000000f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_3", 2009704, 7767987, 4, { 100.053703f, 5.599999f, 100.556702f }, 1.000000f, 0.000000f ); 
+
+  }
+
+  void onUpdate( InstanceContent& instance, uint32_t currTime ) override
+  {
+
+  }
+
+  void onEnterTerritory( InstanceContent& instance, Entity::Player& player, uint32_t eventId, uint16_t param1,
+                         uint16_t param2 ) override
+  {
+
+  }
+
+};
+
+EXPOSE_SCRIPT( OnaClearDayYouCanSmellForever );
\ No newline at end of file
diff --git a/src/scripts/instances/maskedcarnivale/SomeLikeItExcruciatinglyHot.cpp b/src/scripts/instances/maskedcarnivale/SomeLikeItExcruciatinglyHot.cpp
new file mode 100644
index 00000000..ef20da08
--- /dev/null
+++ b/src/scripts/instances/maskedcarnivale/SomeLikeItExcruciatinglyHot.cpp
@@ -0,0 +1,38 @@
+#include <ScriptObject.h>
+#include <Territory/InstanceContent.h>
+
+using namespace Sapphire;
+
+class SomeLikeItExcruciatinglyHot :
+  public Sapphire::ScriptAPI::InstanceContentScript
+{
+public:
+  SomeLikeItExcruciatinglyHot() :
+    Sapphire::ScriptAPI::InstanceContentScript( 35011 )
+  { }
+
+  void onInit( InstanceContent& instance ) override
+  {
+    instance.registerEObj( "Entrance", 2000182, 7676036, 5, { 100.000000f, 2.000000f, 113.000000f }, 1.000000f, 0.000000f ); 
+      // States -> vf_lock_on (id: 11) vf_lock_of (id: 12) 
+    instance.registerEObj( "unknown_0", 2002618, 7738683, 4, { 96.000000f, 2.000000f, 104.000000f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_1", 2009702, 7767980, 4, { 103.000000f, 2.000000f, 105.000000f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_2", 2009703, 7767985, 4, { 101.000000f, 2.000000f, 88.000000f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_3", 2009704, 7767987, 4, { 100.053703f, 5.599999f, 100.556702f }, 1.000000f, 0.000000f ); 
+
+  }
+
+  void onUpdate( InstanceContent& instance, uint32_t currTime ) override
+  {
+
+  }
+
+  void onEnterTerritory( InstanceContent& instance, Entity::Player& player, uint32_t eventId, uint16_t param1,
+                         uint16_t param2 ) override
+  {
+
+  }
+
+};
+
+EXPOSE_SCRIPT( SomeLikeItExcruciatinglyHot );
\ No newline at end of file
diff --git a/src/scripts/instances/maskedcarnivale/SunsetBullevard.cpp b/src/scripts/instances/maskedcarnivale/SunsetBullevard.cpp
new file mode 100644
index 00000000..6f2eca88
--- /dev/null
+++ b/src/scripts/instances/maskedcarnivale/SunsetBullevard.cpp
@@ -0,0 +1,38 @@
+#include <ScriptObject.h>
+#include <Territory/InstanceContent.h>
+
+using namespace Sapphire;
+
+class SunsetBullevard :
+  public Sapphire::ScriptAPI::InstanceContentScript
+{
+public:
+  SunsetBullevard() :
+    Sapphire::ScriptAPI::InstanceContentScript( 35016 )
+  { }
+
+  void onInit( InstanceContent& instance ) override
+  {
+    instance.registerEObj( "Entrance", 2000182, 7676036, 5, { 100.000000f, 2.000000f, 113.000000f }, 1.000000f, 0.000000f ); 
+      // States -> vf_lock_on (id: 11) vf_lock_of (id: 12) 
+    instance.registerEObj( "unknown_0", 2002618, 7738683, 4, { 96.000000f, 2.000000f, 104.000000f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_1", 2009702, 7767980, 4, { 103.000000f, 2.000000f, 105.000000f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_2", 2009703, 7767985, 4, { 101.000000f, 2.000000f, 88.000000f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_3", 2009704, 7767987, 4, { 100.053703f, 5.599999f, 100.556702f }, 1.000000f, 0.000000f ); 
+
+  }
+
+  void onUpdate( InstanceContent& instance, uint32_t currTime ) override
+  {
+
+  }
+
+  void onEnterTerritory( InstanceContent& instance, Entity::Player& player, uint32_t eventId, uint16_t param1,
+                         uint16_t param2 ) override
+  {
+
+  }
+
+};
+
+EXPOSE_SCRIPT( SunsetBullevard );
\ No newline at end of file
diff --git a/src/scripts/instances/maskedcarnivale/TheMeNobodyNodes.cpp b/src/scripts/instances/maskedcarnivale/TheMeNobodyNodes.cpp
new file mode 100644
index 00000000..6115b7ad
--- /dev/null
+++ b/src/scripts/instances/maskedcarnivale/TheMeNobodyNodes.cpp
@@ -0,0 +1,38 @@
+#include <ScriptObject.h>
+#include <Territory/InstanceContent.h>
+
+using namespace Sapphire;
+
+class TheMeNobodyNodes :
+  public Sapphire::ScriptAPI::InstanceContentScript
+{
+public:
+  TheMeNobodyNodes() :
+    Sapphire::ScriptAPI::InstanceContentScript( 35015 )
+  { }
+
+  void onInit( InstanceContent& instance ) override
+  {
+    instance.registerEObj( "Entrance", 2000182, 7676036, 5, { 100.000000f, 2.000000f, 113.000000f }, 1.000000f, 0.000000f ); 
+      // States -> vf_lock_on (id: 11) vf_lock_of (id: 12) 
+    instance.registerEObj( "unknown_0", 2002618, 7738683, 4, { 96.000000f, 2.000000f, 104.000000f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_1", 2009702, 7767980, 4, { 103.000000f, 2.000000f, 105.000000f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_2", 2009703, 7767985, 4, { 101.000000f, 2.000000f, 88.000000f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_3", 2009704, 7767987, 4, { 100.053703f, 5.599999f, 100.556702f }, 1.000000f, 0.000000f ); 
+
+  }
+
+  void onUpdate( InstanceContent& instance, uint32_t currTime ) override
+  {
+
+  }
+
+  void onEnterTerritory( InstanceContent& instance, Entity::Player& player, uint32_t eventId, uint16_t param1,
+                         uint16_t param2 ) override
+  {
+
+  }
+
+};
+
+EXPOSE_SCRIPT( TheMeNobodyNodes );
\ No newline at end of file
diff --git a/src/scripts/instances/maskedcarnivale/ThePlantomoftheOpera.cpp b/src/scripts/instances/maskedcarnivale/ThePlantomoftheOpera.cpp
new file mode 100644
index 00000000..f556d5d9
--- /dev/null
+++ b/src/scripts/instances/maskedcarnivale/ThePlantomoftheOpera.cpp
@@ -0,0 +1,38 @@
+#include <ScriptObject.h>
+#include <Territory/InstanceContent.h>
+
+using namespace Sapphire;
+
+class ThePlantomoftheOpera :
+  public Sapphire::ScriptAPI::InstanceContentScript
+{
+public:
+  ThePlantomoftheOpera() :
+    Sapphire::ScriptAPI::InstanceContentScript( 35012 )
+  { }
+
+  void onInit( InstanceContent& instance ) override
+  {
+    instance.registerEObj( "Entrance", 2000182, 7676036, 5, { 100.000000f, 2.000000f, 113.000000f }, 1.000000f, 0.000000f ); 
+      // States -> vf_lock_on (id: 11) vf_lock_of (id: 12) 
+    instance.registerEObj( "unknown_0", 2002618, 7738683, 4, { 96.000000f, 2.000000f, 104.000000f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_1", 2009702, 7767980, 4, { 103.000000f, 2.000000f, 105.000000f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_2", 2009703, 7767985, 4, { 101.000000f, 2.000000f, 88.000000f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_3", 2009704, 7767987, 4, { 100.053703f, 5.599999f, 100.556702f }, 1.000000f, 0.000000f ); 
+
+  }
+
+  void onUpdate( InstanceContent& instance, uint32_t currTime ) override
+  {
+
+  }
+
+  void onEnterTerritory( InstanceContent& instance, Entity::Player& player, uint32_t eventId, uint16_t param1,
+                         uint16_t param2 ) override
+  {
+
+  }
+
+};
+
+EXPOSE_SCRIPT( ThePlantomoftheOpera );
\ No newline at end of file
diff --git a/src/scripts/instances/maskedcarnivale/TheSwordofMusic.cpp b/src/scripts/instances/maskedcarnivale/TheSwordofMusic.cpp
new file mode 100644
index 00000000..1df7b41f
--- /dev/null
+++ b/src/scripts/instances/maskedcarnivale/TheSwordofMusic.cpp
@@ -0,0 +1,38 @@
+#include <ScriptObject.h>
+#include <Territory/InstanceContent.h>
+
+using namespace Sapphire;
+
+class TheSwordofMusic :
+  public Sapphire::ScriptAPI::InstanceContentScript
+{
+public:
+  TheSwordofMusic() :
+    Sapphire::ScriptAPI::InstanceContentScript( 35017 )
+  { }
+
+  void onInit( InstanceContent& instance ) override
+  {
+    instance.registerEObj( "Entrance", 2000182, 7676036, 5, { 100.000000f, 2.000000f, 113.000000f }, 1.000000f, 0.000000f ); 
+      // States -> vf_lock_on (id: 11) vf_lock_of (id: 12) 
+    instance.registerEObj( "unknown_0", 2002618, 7738683, 4, { 96.000000f, 2.000000f, 104.000000f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_1", 2009702, 7767980, 4, { 103.000000f, 2.000000f, 105.000000f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_2", 2009703, 7767985, 4, { 101.000000f, 2.000000f, 88.000000f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_3", 2009704, 7767987, 4, { 100.053703f, 5.599999f, 100.556702f }, 1.000000f, 0.000000f ); 
+
+  }
+
+  void onUpdate( InstanceContent& instance, uint32_t currTime ) override
+  {
+
+  }
+
+  void onEnterTerritory( InstanceContent& instance, Entity::Player& player, uint32_t eventId, uint16_t param1,
+                         uint16_t param2 ) override
+  {
+
+  }
+
+};
+
+EXPOSE_SCRIPT( TheSwordofMusic );
\ No newline at end of file
diff --git a/src/scripts/instances/maskedcarnivale/TheThreepennyTurtles.cpp b/src/scripts/instances/maskedcarnivale/TheThreepennyTurtles.cpp
new file mode 100644
index 00000000..1f8c66e7
--- /dev/null
+++ b/src/scripts/instances/maskedcarnivale/TheThreepennyTurtles.cpp
@@ -0,0 +1,38 @@
+#include <ScriptObject.h>
+#include <Territory/InstanceContent.h>
+
+using namespace Sapphire;
+
+class TheThreepennyTurtles :
+  public Sapphire::ScriptAPI::InstanceContentScript
+{
+public:
+  TheThreepennyTurtles() :
+    Sapphire::ScriptAPI::InstanceContentScript( 35005 )
+  { }
+
+  void onInit( InstanceContent& instance ) override
+  {
+    instance.registerEObj( "Entrance", 2000182, 7676036, 5, { 100.000000f, 2.000000f, 113.000000f }, 1.000000f, 0.000000f ); 
+      // States -> vf_lock_on (id: 11) vf_lock_of (id: 12) 
+    instance.registerEObj( "unknown_0", 2002618, 7738683, 4, { 96.000000f, 2.000000f, 104.000000f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_1", 2009702, 7767980, 4, { 103.000000f, 2.000000f, 105.000000f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_2", 2009703, 7767985, 4, { 101.000000f, 2.000000f, 88.000000f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_3", 2009704, 7767987, 4, { 100.053703f, 5.599999f, 100.556702f }, 1.000000f, 0.000000f ); 
+
+  }
+
+  void onUpdate( InstanceContent& instance, uint32_t currTime ) override
+  {
+
+  }
+
+  void onEnterTerritory( InstanceContent& instance, Entity::Player& player, uint32_t eventId, uint16_t param1,
+                         uint16_t param2 ) override
+  {
+
+  }
+
+};
+
+EXPOSE_SCRIPT( TheThreepennyTurtles );
\ No newline at end of file
diff --git a/src/scripts/instances/maskedcarnivale/ToKillaMockingslime.cpp b/src/scripts/instances/maskedcarnivale/ToKillaMockingslime.cpp
new file mode 100644
index 00000000..0f740f86
--- /dev/null
+++ b/src/scripts/instances/maskedcarnivale/ToKillaMockingslime.cpp
@@ -0,0 +1,38 @@
+#include <ScriptObject.h>
+#include <Territory/InstanceContent.h>
+
+using namespace Sapphire;
+
+class ToKillaMockingslime :
+  public Sapphire::ScriptAPI::InstanceContentScript
+{
+public:
+  ToKillaMockingslime() :
+    Sapphire::ScriptAPI::InstanceContentScript( 35009 )
+  { }
+
+  void onInit( InstanceContent& instance ) override
+  {
+    instance.registerEObj( "Entrance", 2000182, 7676036, 5, { 100.000000f, 2.000000f, 113.000000f }, 1.000000f, 0.000000f ); 
+      // States -> vf_lock_on (id: 11) vf_lock_of (id: 12) 
+    instance.registerEObj( "unknown_0", 2002618, 7738683, 4, { 96.000000f, 2.000000f, 104.000000f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_1", 2009702, 7767980, 4, { 103.000000f, 2.000000f, 105.000000f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_2", 2009703, 7767985, 4, { 101.000000f, 2.000000f, 88.000000f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_3", 2009704, 7767987, 4, { 100.053703f, 5.599999f, 100.556702f }, 1.000000f, 0.000000f ); 
+
+  }
+
+  void onUpdate( InstanceContent& instance, uint32_t currTime ) override
+  {
+
+  }
+
+  void onEnterTerritory( InstanceContent& instance, Entity::Player& player, uint32_t eventId, uint16_t param1,
+                         uint16_t param2 ) override
+  {
+
+  }
+
+};
+
+EXPOSE_SCRIPT( ToKillaMockingslime );
\ No newline at end of file
diff --git a/src/scripts/instances/maskedcarnivale/WaitingforGolem.cpp b/src/scripts/instances/maskedcarnivale/WaitingforGolem.cpp
new file mode 100644
index 00000000..e426fb75
--- /dev/null
+++ b/src/scripts/instances/maskedcarnivale/WaitingforGolem.cpp
@@ -0,0 +1,38 @@
+#include <ScriptObject.h>
+#include <Territory/InstanceContent.h>
+
+using namespace Sapphire;
+
+class WaitingforGolem :
+  public Sapphire::ScriptAPI::InstanceContentScript
+{
+public:
+  WaitingforGolem() :
+    Sapphire::ScriptAPI::InstanceContentScript( 35003 )
+  { }
+
+  void onInit( InstanceContent& instance ) override
+  {
+    instance.registerEObj( "Entrance", 2000182, 7676036, 5, { 100.000000f, 2.000000f, 113.000000f }, 1.000000f, 0.000000f ); 
+      // States -> vf_lock_on (id: 11) vf_lock_of (id: 12) 
+    instance.registerEObj( "unknown_0", 2002618, 7738683, 4, { 96.000000f, 2.000000f, 104.000000f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_1", 2009702, 7767980, 4, { 103.000000f, 2.000000f, 105.000000f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_2", 2009703, 7767985, 4, { 101.000000f, 2.000000f, 88.000000f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_3", 2009704, 7767987, 4, { 100.053703f, 5.599999f, 100.556702f }, 1.000000f, 0.000000f ); 
+
+  }
+
+  void onUpdate( InstanceContent& instance, uint32_t currTime ) override
+  {
+
+  }
+
+  void onEnterTerritory( InstanceContent& instance, Entity::Player& player, uint32_t eventId, uint16_t param1,
+                         uint16_t param2 ) override
+  {
+
+  }
+
+};
+
+EXPOSE_SCRIPT( WaitingforGolem );
\ No newline at end of file
diff --git a/src/scripts/instances/pvp/Astragalos.cpp b/src/scripts/instances/pvp/Astragalos.cpp
deleted file mode 100644
index ec1acaea..00000000
--- a/src/scripts/instances/pvp/Astragalos.cpp
+++ /dev/null
@@ -1,61 +0,0 @@
-#include <ScriptObject.h>
-#include <Territory/InstanceContent.h>
-
-using namespace Sapphire;
-
-class Astragalos :
-  public Sapphire::ScriptAPI::InstanceContentScript
-{
-public:
-  Astragalos() :
-    Sapphire::ScriptAPI::InstanceContentScript( 51001 )
-  {
-  }
-
-  void onInit( InstanceContentPtr instance ) override
-  {
-    instance->registerEObj( "unknown_0", 2007457, 7033316, 4, { -140.058197f, 45.799999f, -133.960495f }, 1.000000f,
-                            0.000000f );
-    instance->registerEObj( "unknown_1", 2007457, 7033315, 4, { -123.008400f, 16.299999f, 103.779503f }, 1.000000f,
-                            0.000000f );
-    instance->registerEObj( "unknown_2", 2007457, 7033317, 4, { 105.712799f, 16.299980f, 114.356003f }, 1.000000f,
-                            0.000000f );
-    instance->registerEObj( "unknown_3", 2007457, 7033318, 4, { 183.420807f, 45.799980f, -111.239098f }, 1.000000f,
-                            0.000000f );
-    instance->registerEObj( "Powergenerator", 2009034, 7032566, 4, { 6.485046f, 46.386410f, -10.055730f }, 0.991760f,
-                            0.000048f );
-    instance->registerEObj( "Hangarterminal", 2009035, 7032549, 4, { -258.015198f, 44.361351f, 21.038191f }, 1.000000f,
-                            0.000000f );
-    instance->registerEObj( "Hangarterminal_1", 2009062, 7032550, 4, { -262.674988f, 44.773441f, -32.764599f },
-                            1.000000f, 0.000000f );
-    instance->registerEObj( "Hangarterminal_2", 2009063, 7032561, 4, { 276.628510f, 44.544209f, 18.968180f }, 1.000000f,
-                            0.000000f );
-    instance->registerEObj( "Hangarterminal_3", 2009064, 7032562, 4, { 258.262787f, 44.210709f, 69.718079f }, 1.000000f,
-                            0.000000f );
-    instance->registerEObj( "Ceruleumtank", 2009031, 0, 4, { 8.651855f, 46.280640f, -142.595596f }, 0.991760f,
-                            0.000048f );
-    instance->registerEObj( "Steamcannon", 2009032, 0, 4, { -181.307602f, 47.593700f, -28.846230f }, 1.000000f,
-                            0.000000f );
-    instance->registerEObj( "Steamcannon_1", 2009033, 0, 4, { -178.482193f, 47.593700f, 2.992350f }, 1.000000f,
-                            0.000000f );
-    instance->registerEObj( "Steamcannon_2", 2009040, 0, 4, { 186.000504f, 47.578602f, 31.721189f }, 0.991760f,
-                            -0.454976f );
-    instance->registerEObj( "Steamcannon_3", 2009041, 0, 4, { 196.952606f, 47.593700f, 1.659642f }, 1.000000f,
-                            -0.455053f );
-
-  }
-
-  void onUpdate( InstanceContentPtr instance, uint32_t currTime ) override
-  {
-
-  }
-
-  void onEnterTerritory( InstanceContentPtr instance, Entity::Player& player, uint32_t eventId, uint16_t param1,
-                         uint16_t param2 ) override
-  {
-
-  }
-
-};
-
-EXPOSE_SCRIPT( Astragalos );
\ No newline at end of file
diff --git a/src/scripts/instances/pvp/SealRockSeize.cpp b/src/scripts/instances/pvp/SealRockSeize.cpp
index 450f1da7..ffc9b3c2 100644
--- a/src/scripts/instances/pvp/SealRockSeize.cpp
+++ b/src/scripts/instances/pvp/SealRockSeize.cpp
@@ -9,20 +9,85 @@ class SealRockSeize :
 public:
   SealRockSeize() :
     Sapphire::ScriptAPI::InstanceContentScript( 50004 )
+  { }
+
+  void onInit( InstanceContent& instance ) override
   {
+    instance.registerEObj( "sgvf_w_lvd_b0286", 2005325, 7585378, 4, { 187.869202f, 8.108603f, 250.084000f }, 1.000000f, 0.000000f ); 
+      // States -> vf_lock_on (id: 11) vf_lock_of (id: 12) 
+    instance.registerEObj( "sgvf_w_lvd_b0286_1", 2005326, 7585380, 4, { 57.053249f, 17.165449f, -249.904694f }, 1.000000f, 0.000000f ); 
+      // States -> vf_lock_on (id: 11) vf_lock_of (id: 12) 
+    instance.registerEObj( "sgvf_w_lvd_b0286_2", 2005327, 7585382, 4, { -314.464996f, 41.657890f, 126.635803f }, 1.000000f, 0.000000f ); 
+      // States -> vf_lock_on (id: 11) vf_lock_of (id: 12) 
+    instance.registerEObj( "AllagantomelithA1", 2005338, 7585392, 4, { 18.148529f, 18.849100f, 267.572693f }, 0.991760f, 0.000048f ); 
+      // States -> ma_off (id: 4) ma_on (id: 5) ma_off2on (id: 8) ma_on2off (id: 9) ma_on_r (id: 10) ma_off2on_r (id: 11) ma_on_r2 (id: 12) ma_off2on_r2 (id: 13) ma_on2off_r (id: 24) ma_on2off_r2 (id: 30) 
+    instance.registerEObj( "sgbg_s2p1_q1_ocup1", 2005502, 7585393, 4, { 18.255230f, 16.804850f, 267.227814f }, 1.000000f, 0.000000f ); 
+      // States -> cap_ser_off2on (id: 5) cap_ser_on (id: 6) cap_off (id: 7) cap_on2off (id: 8) cap_fla_on (id: 9) cap_fla_off2on (id: 10) cap_sto_on (id: 11) cap_sto_off2on (id: 12) 
+    instance.registerEObj( "AllagantomelithA2", 2005339, 7585396, 4, { 8.120948f, 21.013821f, 167.772705f }, 0.991760f, 0.000048f ); 
+      // States -> ma_off (id: 4) ma_on (id: 5) ma_off2on (id: 8) ma_on2off (id: 9) ma_on_r (id: 10) ma_off2on_r (id: 11) ma_on_r2 (id: 12) ma_off2on_r2 (id: 13) ma_on2off_r (id: 24) ma_on2off_r2 (id: 30) 
+    instance.registerEObj( "sgbg_s2p1_q1_ocup1_1", 2005503, 7585397, 4, { 8.225257f, 19.763350f, 167.312195f }, 1.000000f, 0.000000f ); 
+      // States -> cap_ser_off2on (id: 5) cap_ser_on (id: 6) cap_off (id: 7) cap_on2off (id: 8) cap_fla_on (id: 9) cap_fla_off2on (id: 10) cap_sto_on (id: 11) cap_sto_off2on (id: 12) 
+    instance.registerEObj( "AllagantomelithA3", 2005340, 7585400, 4, { 96.414833f, 34.135899f, 108.177002f }, 0.991760f, 0.000048f ); 
+      // States -> ma_off (id: 4) ma_on (id: 5) ma_off2on (id: 8) ma_on2off (id: 9) ma_on_r (id: 10) ma_off2on_r (id: 11) ma_on_r2 (id: 12) ma_off2on_r2 (id: 13) ma_on2off_r (id: 24) ma_on2off_r2 (id: 30) 
+    instance.registerEObj( "sgbg_s2p1_q1_ocup1_2", 2005504, 7585401, 4, { 96.322990f, 33.288559f, 107.972397f }, 1.000000f, 0.000000f ); 
+      // States -> cap_ser_off2on (id: 5) cap_ser_on (id: 6) cap_off (id: 7) cap_on2off (id: 8) cap_fla_on (id: 9) cap_fla_off2on (id: 10) cap_sto_on (id: 11) cap_sto_off2on (id: 12) 
+    instance.registerEObj( "AllagantomelithA4", 2005341, 7585404, 4, { 200.335693f, 30.775141f, 68.234734f }, 0.991760f, 0.000048f ); 
+      // States -> ma_off (id: 4) ma_on (id: 5) ma_off2on (id: 8) ma_on2off (id: 9) ma_on_r (id: 10) ma_off2on_r (id: 11) ma_on_r2 (id: 12) ma_off2on_r2 (id: 13) ma_on2off_r (id: 24) ma_on2off_r2 (id: 30) 
+    instance.registerEObj( "sgbg_s2p1_q1_ocup1_3", 2005505, 7585405, 4, { 200.310593f, 29.688540f, 68.217537f }, 1.000000f, 0.000000f ); 
+      // States -> cap_ser_off2on (id: 5) cap_ser_on (id: 6) cap_off (id: 7) cap_on2off (id: 8) cap_fla_on (id: 9) cap_fla_off2on (id: 10) cap_sto_on (id: 11) cap_sto_off2on (id: 12) 
+    instance.registerEObj( "AllagantomelithB1", 2005342, 7585408, 4, { 157.733093f, 4.437783f, -49.087921f }, 0.991760f, 0.000048f ); 
+      // States -> ma_off (id: 4) ma_on (id: 5) ma_off2on (id: 8) ma_on2off (id: 9) ma_on_r (id: 10) ma_off2on_r (id: 11) ma_on_r2 (id: 12) ma_off2on_r2 (id: 13) ma_on2off_r (id: 24) ma_on2off_r2 (id: 30) 
+    instance.registerEObj( "sgbg_s2p1_q1_ocup1_4", 2005506, 7585409, 4, { 157.696793f, 2.356474f, -49.159088f }, 1.000000f, 0.000000f ); 
+      // States -> cap_ser_off2on (id: 5) cap_ser_on (id: 6) cap_off (id: 7) cap_on2off (id: 8) cap_fla_on (id: 9) cap_fla_off2on (id: 10) cap_sto_on (id: 11) cap_sto_off2on (id: 12) 
+    instance.registerEObj( "AllagantomelithB2", 2005343, 7585412, 4, { 51.290970f, 32.733749f, -82.673607f }, 0.991760f, 0.000000f ); 
+      // States -> ma_off (id: 4) ma_on (id: 5) ma_off2on (id: 8) ma_on2off (id: 9) ma_on_r (id: 10) ma_off2on_r (id: 11) ma_on_r2 (id: 12) ma_off2on_r2 (id: 13) ma_on2off_r (id: 24) ma_on2off_r2 (id: 30) 
+    instance.registerEObj( "sgbg_s2p1_q1_ocup1_5", 2005507, 7585413, 4, { 51.310070f, 31.154039f, -82.935127f }, 1.000000f, 0.000000f ); 
+      // States -> cap_ser_off2on (id: 5) cap_ser_on (id: 6) cap_off (id: 7) cap_on2off (id: 8) cap_fla_on (id: 9) cap_fla_off2on (id: 10) cap_sto_on (id: 11) cap_sto_off2on (id: 12) 
+    instance.registerEObj( "AllagantomelithB3", 2005344, 7585416, 4, { 74.829063f, 13.976150f, -16.412930f }, 0.991760f, 0.000048f ); 
+      // States -> ma_off (id: 4) ma_on (id: 5) ma_off2on (id: 8) ma_on2off (id: 9) ma_on_r (id: 10) ma_off2on_r (id: 11) ma_on_r2 (id: 12) ma_off2on_r2 (id: 13) ma_on2off_r (id: 24) ma_on2off_r2 (id: 30) 
+    instance.registerEObj( "sgbg_s2p1_q1_ocup1_6", 2005508, 7585417, 4, { 74.846779f, 11.294810f, -16.719721f }, 1.000000f, 0.000000f ); 
+      // States -> cap_ser_off2on (id: 5) cap_ser_on (id: 6) cap_off (id: 7) cap_on2off (id: 8) cap_fla_on (id: 9) cap_fla_off2on (id: 10) cap_sto_on (id: 11) cap_sto_off2on (id: 12) 
+    instance.registerEObj( "AllagantomelithB4", 2005345, 7585420, 4, { -47.222630f, 31.708929f, -92.240723f }, 0.991760f, 0.000048f ); 
+      // States -> ma_off (id: 4) ma_on (id: 5) ma_off2on (id: 8) ma_on2off (id: 9) ma_on_r (id: 10) ma_off2on_r (id: 11) ma_on_r2 (id: 12) ma_off2on_r2 (id: 13) ma_on2off_r (id: 24) ma_on2off_r2 (id: 30) 
+    instance.registerEObj( "sgbg_s2p1_q1_ocup1_7", 2005509, 7585421, 4, { -47.175869f, 29.272760f, -92.573776f }, 1.000000f, 0.000000f ); 
+      // States -> cap_ser_off2on (id: 5) cap_ser_on (id: 6) cap_off (id: 7) cap_on2off (id: 8) cap_fla_on (id: 9) cap_fla_off2on (id: 10) cap_sto_on (id: 11) cap_sto_off2on (id: 12) 
+    instance.registerEObj( "AllagantomelithC2", 2005346, 7585424, 4, { -163.868805f, 46.920021f, 1.751138f }, 0.991760f, 0.000048f ); 
+      // States -> ma_off (id: 4) ma_on (id: 5) ma_off2on (id: 8) ma_on2off (id: 9) ma_on_r (id: 10) ma_off2on_r (id: 11) ma_on_r2 (id: 12) ma_off2on_r2 (id: 13) ma_on2off_r (id: 24) ma_on2off_r2 (id: 30) 
+    instance.registerEObj( "sgbg_s2p1_q1_ocup1_8", 2005510, 7585425, 4, { -164.055405f, 45.557041f, 1.093665f }, 1.000000f, 0.000000f ); 
+      // States -> cap_ser_off2on (id: 5) cap_ser_on (id: 6) cap_off (id: 7) cap_on2off (id: 8) cap_fla_on (id: 9) cap_fla_off2on (id: 10) cap_sto_on (id: 11) cap_sto_off2on (id: 12) 
+    instance.registerEObj( "AllagantomelithD2", 2005347, 7585428, 4, { -32.930420f, 18.645050f, 19.141041f }, 0.991760f, 0.000048f ); 
+      // States -> ma_off (id: 4) ma_on (id: 5) ma_off2on (id: 8) ma_on2off (id: 9) ma_on_r (id: 10) ma_off2on_r (id: 11) ma_on_r2 (id: 12) ma_off2on_r2 (id: 13) ma_on2off_r (id: 24) ma_on2off_r2 (id: 30) 
+    instance.registerEObj( "sgbg_s2p1_q1_ocup1_9", 2005511, 7585429, 4, { -32.986580f, 17.328630f, 18.981670f }, 1.000000f, 0.000000f ); 
+      // States -> cap_ser_off2on (id: 5) cap_ser_on (id: 6) cap_off (id: 7) cap_on2off (id: 8) cap_fla_on (id: 9) cap_fla_off2on (id: 10) cap_sto_on (id: 11) cap_sto_off2on (id: 12) 
+    instance.registerEObj( "AllagantomelithD3", 2005348, 7585432, 4, { -62.119572f, 40.360111f, 48.813599f }, 0.991760f, 0.000048f ); 
+      // States -> ma_off (id: 4) ma_on (id: 5) ma_off2on (id: 8) ma_on2off (id: 9) ma_on_r (id: 10) ma_off2on_r (id: 11) ma_on_r2 (id: 12) ma_off2on_r2 (id: 13) ma_on2off_r (id: 24) ma_on2off_r2 (id: 30) 
+    instance.registerEObj( "sgbg_s2p1_q1_ocup1_10", 2005512, 7585433, 4, { -62.187111f, 38.493420f, 48.440479f }, 1.000000f, 0.000000f ); 
+      // States -> cap_ser_off2on (id: 5) cap_ser_on (id: 6) cap_off (id: 7) cap_on2off (id: 8) cap_fla_on (id: 9) cap_fla_off2on (id: 10) cap_sto_on (id: 11) cap_sto_off2on (id: 12) 
+    instance.registerEObj( "AllagantomelithC4", 2005349, 7585436, 4, { -148.508499f, 43.280338f, 161.458603f }, 0.991760f, 0.000048f ); 
+      // States -> ma_off (id: 4) ma_on (id: 5) ma_off2on (id: 8) ma_on2off (id: 9) ma_on_r (id: 10) ma_off2on_r (id: 11) ma_on_r2 (id: 12) ma_off2on_r2 (id: 13) ma_on2off_r (id: 24) ma_on2off_r2 (id: 30) 
+    instance.registerEObj( "sgbg_s2p1_q1_ocup1_11", 2005513, 7585437, 4, { -148.519196f, 41.333549f, 161.070908f }, 1.000000f, 0.000000f ); 
+      // States -> cap_ser_off2on (id: 5) cap_ser_on (id: 6) cap_off (id: 7) cap_on2off (id: 8) cap_fla_on (id: 9) cap_fla_off2on (id: 10) cap_sto_on (id: 11) cap_sto_off2on (id: 12) 
+    instance.registerEObj( "AllagantomelithC3", 2005350, 7585440, 4, { -167.072998f, 26.487570f, 71.059898f }, 0.991760f, 0.088708f ); 
+      // States -> ma_off (id: 4) ma_on (id: 5) ma_off2on (id: 8) ma_on2off (id: 9) ma_on_r (id: 10) ma_off2on_r (id: 11) ma_on_r2 (id: 12) ma_off2on_r2 (id: 13) ma_on2off_r (id: 24) ma_on2off_r2 (id: 30) 
+    instance.registerEObj( "sgbg_s2p1_q1_ocup1_12", 2005514, 7585441, 4, { -167.089294f, 24.449400f, 70.683212f }, 1.000000f, 0.000000f ); 
+      // States -> cap_ser_off2on (id: 5) cap_ser_on (id: 6) cap_off (id: 7) cap_on2off (id: 8) cap_fla_on (id: 9) cap_fla_off2on (id: 10) cap_sto_on (id: 11) cap_sto_off2on (id: 12) 
+    instance.registerEObj( "AllagantomelithC1", 2005351, 7585444, 4, { -120.087196f, 28.019110f, -46.859772f }, 0.991760f, 0.000048f ); 
+      // States -> ma_off (id: 4) ma_on (id: 5) ma_off2on (id: 8) ma_on2off (id: 9) ma_on_r (id: 10) ma_off2on_r (id: 11) ma_on_r2 (id: 12) ma_off2on_r2 (id: 13) ma_on2off_r (id: 24) ma_on2off_r2 (id: 30) 
+    instance.registerEObj( "sgbg_s2p1_q1_ocup1_13", 2005515, 7585445, 4, { -120.122597f, 27.122120f, -47.061981f }, 1.000000f, 0.000000f ); 
+      // States -> cap_ser_off2on (id: 5) cap_ser_on (id: 6) cap_off (id: 7) cap_on2off (id: 8) cap_fla_on (id: 9) cap_fla_off2on (id: 10) cap_sto_on (id: 11) cap_sto_off2on (id: 12) 
+    instance.registerEObj( "AllagantomelithD1", 2005352, 7585448, 4, { 15.841110f, 19.797770f, 101.591301f }, 0.991760f, 0.000048f ); 
+      // States -> ma_off (id: 4) ma_on (id: 5) ma_off2on (id: 8) ma_on2off (id: 9) ma_on_r (id: 10) ma_off2on_r (id: 11) ma_on_r2 (id: 12) ma_off2on_r2 (id: 13) ma_on2off_r (id: 24) ma_on2off_r2 (id: 30) 
+    instance.registerEObj( "sgbg_s2p1_q1_ocup1_14", 2005516, 7585449, 4, { 15.812600f, 18.748220f, 101.435699f }, 1.000000f, 0.000000f ); 
+      // States -> cap_ser_off2on (id: 5) cap_ser_on (id: 6) cap_off (id: 7) cap_on2off (id: 8) cap_fla_on (id: 9) cap_fla_off2on (id: 10) cap_sto_on (id: 11) cap_sto_off2on (id: 12) 
+
   }
 
-  void onInit( InstanceContentPtr instance ) override
+  void onUpdate( InstanceContent& instance, uint32_t currTime ) override
   {
 
   }
 
-  void onUpdate( InstanceContentPtr instance, uint32_t currTime ) override
-  {
-
-  }
-
-  void onEnterTerritory( InstanceContentPtr instance, Entity::Player& player, uint32_t eventId, uint16_t param1,
+  void onEnterTerritory( InstanceContent& instance, Entity::Player& player, uint32_t eventId, uint16_t param1,
                          uint16_t param2 ) override
   {
 
diff --git a/src/scripts/instances/pvp/TheBorderlandRuinsSecure.cpp b/src/scripts/instances/pvp/TheBorderlandRuinsSecure.cpp
index c5b547c0..6b91b4d8 100644
--- a/src/scripts/instances/pvp/TheBorderlandRuinsSecure.cpp
+++ b/src/scripts/instances/pvp/TheBorderlandRuinsSecure.cpp
@@ -9,60 +9,44 @@ class TheBorderlandRuinsSecure :
 public:
   TheBorderlandRuinsSecure() :
     Sapphire::ScriptAPI::InstanceContentScript( 50001 )
-  {
-  }
+  { }
 
-  void onInit( InstanceContentPtr instance ) override
+  void onInit( InstanceContent& instance ) override
   {
-    instance->registerEObj( "sgbg_l1p1_q3_swhu1", 2005078, 5573675, 4, { -150.601807f, -15.195440f, 86.396042f },
-                            0.991760f, 0.000048f );
-    // States -> magic_go magic_down magic_2down magic_on magic_2on
-    instance->registerEObj( "sgbg_l1p1_q3_swhu1_1", 2005079, 5573676, 4, { -160.177505f, -15.426880f, 111.877502f },
-                            0.991760f, 0.000048f );
-    // States -> magic_go magic_down magic_2down magic_on magic_2on
-    instance->registerEObj( "sgbg_l1p1_q3_swhu1_2", 2005080, 5573677, 4, { -178.133102f, -15.426880f, 85.038406f },
-                            0.991760f, 0.000048f );
-    // States -> magic_go magic_down magic_2down magic_on magic_2on
-    instance->registerEObj( "sgbg_l1p1_q3_swhu1_3", 2005081, 5573687, 4, { 147.790497f, -15.205700f, 85.606216f },
-                            0.991760f, 0.000048f );
-    // States -> magic_go magic_down magic_2down magic_on magic_2on
-    instance->registerEObj( "sgbg_l1p1_q3_swhu1_4", 2005082, 5573688, 4, { 181.170303f, -15.426880f, 81.284790f },
-                            0.991760f, 0.000048f );
-    // States -> magic_go magic_down magic_2down magic_on magic_2on
-    instance->registerEObj( "sgbg_l1p1_q3_swhu1_5", 2005083, 5573689, 4, { 160.730392f, -15.457460f, 117.518303f },
-                            0.991760f, 0.000048f );
-    // States -> magic_go magic_down magic_2down magic_on magic_2on
-    instance->registerEObj( "sgbg_l1p1_q3_swhu1_6", 2005084, 5573690, 4, { -0.015320f, -15.426880f, -162.924103f },
-                            0.991760f, 0.000048f );
-    // States -> magic_go magic_down magic_2down magic_on magic_2on
-    instance->registerEObj( "sgbg_l1p1_q3_swhu1_7", 2005085, 5573691, 4, { 19.010229f, -15.416970f, -200.015396f },
-                            1.000000f, 0.000000f );
-    // States -> magic_go magic_down magic_2down magic_on magic_2on
-    instance->registerEObj( "sgbg_l1p1_q3_swhu1_8", 2005086, 5573692, 4, { -18.994471f, -15.426880f, -199.992905f },
-                            0.991760f, 0.000048f );
-    // States -> magic_go magic_down magic_2down magic_on magic_2on
-    instance->registerEObj( "unknown_0", 2004187, 4724282, 4, { -0.007111f, 12.000000f, -386.299896f }, 1.000000f,
-                            0.000000f );
-    instance->registerEObj( "unknown_1", 2004188, 4724284, 4, { 335.025513f, 12.000000f, 193.711899f }, 1.000000f,
-                            0.000000f );
-    instance->registerEObj( "unknown_2", 2004189, 4724283, 4, { -334.556213f, 12.000000f, 193.274796f }, 1.000000f,
-                            0.000000f );
-    instance->registerEObj( "sgvf_l1p1_lvd_b0441", 2004202, 4797506, 4, { -0.101569f, 30.000000f, 1.413736f },
-                            1.000000f, 0.000000f );
-    // States -> STAGE_def STAGE_pop_anim
-    instance->registerEObj( "Magitekreaper", 2007710, 0, 4, { -0.135500f, 28.501801f, 18.021700f }, 1.000000f,
-                            0.000000f );
-    instance->registerEObj( "unknown_3", 2007722, 6642830, 4, { 7.805808f, 29.000000f, 0.239120f }, 1.000000f,
-                            0.000000f );
+    instance.registerEObj( "sgbg_l1p1_q3_swhu1", 2005078, 5573675, 4, { -150.601807f, -15.195440f, 86.396042f }, 0.991760f, 0.000048f ); 
+      // States -> magic_go (id: 33) magic_down (id: 56) magic_2down (id: 57) magic_on (id: 58) magic_2on (id: 59) 
+    instance.registerEObj( "sgbg_l1p1_q3_swhu1_1", 2005079, 5573676, 4, { -160.177505f, -15.426880f, 111.877502f }, 0.991760f, 0.000048f ); 
+      // States -> magic_go (id: 33) magic_down (id: 56) magic_2down (id: 57) magic_on (id: 58) magic_2on (id: 59) 
+    instance.registerEObj( "sgbg_l1p1_q3_swhu1_2", 2005080, 5573677, 4, { -178.133102f, -15.426880f, 85.038406f }, 0.991760f, 0.000048f ); 
+      // States -> magic_go (id: 33) magic_down (id: 56) magic_2down (id: 57) magic_on (id: 58) magic_2on (id: 59) 
+    instance.registerEObj( "sgbg_l1p1_q3_swhu1_3", 2005081, 5573687, 4, { 147.790497f, -15.205700f, 85.606216f }, 0.991760f, 0.000048f ); 
+      // States -> magic_go (id: 33) magic_down (id: 56) magic_2down (id: 57) magic_on (id: 58) magic_2on (id: 59) 
+    instance.registerEObj( "sgbg_l1p1_q3_swhu1_4", 2005082, 5573688, 4, { 181.170303f, -15.426880f, 81.284790f }, 0.991760f, 0.000048f ); 
+      // States -> magic_go (id: 33) magic_down (id: 56) magic_2down (id: 57) magic_on (id: 58) magic_2on (id: 59) 
+    instance.registerEObj( "sgbg_l1p1_q3_swhu1_5", 2005083, 5573689, 4, { 160.730392f, -15.457460f, 117.518303f }, 0.991760f, 0.000048f ); 
+      // States -> magic_go (id: 33) magic_down (id: 56) magic_2down (id: 57) magic_on (id: 58) magic_2on (id: 59) 
+    instance.registerEObj( "sgbg_l1p1_q3_swhu1_6", 2005084, 5573690, 4, { -0.015289f, -15.426890f, -162.924103f }, 0.991760f, 0.000048f ); 
+      // States -> magic_go (id: 33) magic_down (id: 56) magic_2down (id: 57) magic_on (id: 58) magic_2on (id: 59) 
+    instance.registerEObj( "sgbg_l1p1_q3_swhu1_7", 2005085, 5573691, 4, { 19.010250f, -15.416970f, -200.015396f }, 1.000000f, -0.000000f ); 
+      // States -> magic_go (id: 33) magic_down (id: 56) magic_2down (id: 57) magic_on (id: 58) magic_2on (id: 59) 
+    instance.registerEObj( "sgbg_l1p1_q3_swhu1_8", 2005086, 5573692, 4, { -18.994480f, -15.426890f, -199.992798f }, 0.991760f, 0.000048f ); 
+      // States -> magic_go (id: 33) magic_down (id: 56) magic_2down (id: 57) magic_on (id: 58) magic_2on (id: 59) 
+    instance.registerEObj( "unknown_0", 2004187, 4724282, 4, { 0.000000f, -7.200000f, -268.700012f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_1", 2004188, 4724284, 4, { 232.307495f, -7.200000f, 134.122894f }, 1.000000f, 0.542586f ); 
+    instance.registerEObj( "unknown_2", 2004189, 4724283, 4, { -232.837494f, -7.217590f, 134.416702f }, 0.991760f, 1.033762f ); 
+    instance.registerEObj( "sgvf_l1p1_lvd_b0441", 2004202, 4797506, 4, { -0.101569f, 30.000000f, 1.413736f }, 1.000000f, 0.000000f ); 
+      // States -> STAGE_def (id: 2) STAGE_pop_anim (id: 3) 
+    instance.registerEObj( "Magitekreaper", 2007710, 0, 4, { -0.135500f, 28.501801f, 18.021700f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_3", 2007722, 6642830, 4, { 7.805808f, 29.000000f, 0.239120f }, 1.000000f, 0.000000f ); 
 
   }
 
-  void onUpdate( InstanceContentPtr instance, uint32_t currTime ) override
+  void onUpdate( InstanceContent& instance, uint32_t currTime ) override
   {
 
   }
 
-  void onEnterTerritory( InstanceContentPtr instance, Entity::Player& player, uint32_t eventId, uint16_t param1,
+  void onEnterTerritory( InstanceContent& instance, Entity::Player& player, uint32_t eventId, uint16_t param1,
                          uint16_t param2 ) override
   {
 
diff --git a/src/scripts/instances/pvp/TheFeast4on4LightParty.cpp b/src/scripts/instances/pvp/TheFeast4on4LightParty.cpp
deleted file mode 100644
index 26c8749f..00000000
--- a/src/scripts/instances/pvp/TheFeast4on4LightParty.cpp
+++ /dev/null
@@ -1,41 +0,0 @@
-#include <ScriptObject.h>
-#include <Territory/InstanceContent.h>
-
-using namespace Sapphire;
-
-class TheFeast4on4LightParty :
-  public Sapphire::ScriptAPI::InstanceContentScript
-{
-public:
-  TheFeast4on4LightParty() :
-    Sapphire::ScriptAPI::InstanceContentScript( 40012 )
-  {
-  }
-
-  void onInit( InstanceContentPtr instance ) override
-  {
-    instance->registerEObj( "unknown_0", 2006819, 6218908, 4, { -89.012909f, 8.477110f, -0.326954f }, 1.000000f,
-                            0.000000f );
-    instance->registerEObj( "unknown_1", 2006818, 6218909, 4, { 95.872437f, 8.468750f, -0.320496f }, 0.991760f,
-                            0.000048f );
-    instance->registerEObj( "sgpl_w_lvd_collison_only", 2002618, 6220121, 4, { -78.605072f, 0.920299f, 0.000000f },
-                            1.000000f, 0.000000f );
-    instance->registerEObj( "sgpl_w_lvd_collison_only_1", 2002618, 6220123, 4, { 79.651703f, 0.811267f, -0.306571f },
-                            0.991760f, 0.000048f );
-
-  }
-
-  void onUpdate( InstanceContentPtr instance, uint32_t currTime ) override
-  {
-
-  }
-
-  void onEnterTerritory( InstanceContentPtr instance, Entity::Player& player, uint32_t eventId, uint16_t param1,
-                         uint16_t param2 ) override
-  {
-
-  }
-
-};
-
-EXPOSE_SCRIPT( TheFeast4on4LightParty );
\ No newline at end of file
diff --git a/src/scripts/instances/pvp/TheFeast4on4Ranked.cpp b/src/scripts/instances/pvp/TheFeast4on4Ranked.cpp
deleted file mode 100644
index 6e1f4c99..00000000
--- a/src/scripts/instances/pvp/TheFeast4on4Ranked.cpp
+++ /dev/null
@@ -1,37 +0,0 @@
-#include <ScriptObject.h>
-#include <Territory/InstanceContent.h>
-
-using namespace Sapphire;
-
-class TheFeast4on4Ranked :
-  public Sapphire::ScriptAPI::InstanceContentScript
-{
-public:
-  TheFeast4on4Ranked() :
-    Sapphire::ScriptAPI::InstanceContentScript( 40018 )
-  {
-  }
-
-  void onInit( InstanceContentPtr instance ) override
-  {
-    instance->registerEObj( "unknown_0", 2007657, 6632432, 4, { -64.289970f, 8.262049f, 13.375790f }, 0.991760f,
-                            0.000048f );
-    instance->registerEObj( "unknown_1", 2007658, 6632431, 4, { 39.169922f, 8.194031f, -45.822941f }, 0.991760f,
-                            0.000048f );
-
-  }
-
-  void onUpdate( InstanceContentPtr instance, uint32_t currTime ) override
-  {
-
-  }
-
-  void onEnterTerritory( InstanceContentPtr instance, Entity::Player& player, uint32_t eventId, uint16_t param1,
-                         uint16_t param2 ) override
-  {
-
-  }
-
-};
-
-EXPOSE_SCRIPT( TheFeast4on4Ranked );
\ No newline at end of file
diff --git a/src/scripts/instances/pvp/TheFeast4on4Training.cpp b/src/scripts/instances/pvp/TheFeast4on4Training.cpp
deleted file mode 100644
index 3b52a161..00000000
--- a/src/scripts/instances/pvp/TheFeast4on4Training.cpp
+++ /dev/null
@@ -1,37 +0,0 @@
-#include <ScriptObject.h>
-#include <Territory/InstanceContent.h>
-
-using namespace Sapphire;
-
-class TheFeast4on4Training :
-  public Sapphire::ScriptAPI::InstanceContentScript
-{
-public:
-  TheFeast4on4Training() :
-    Sapphire::ScriptAPI::InstanceContentScript( 40016 )
-  {
-  }
-
-  void onInit( InstanceContentPtr instance ) override
-  {
-    instance->registerEObj( "unknown_0", 2007657, 6632432, 4, { -64.289970f, 8.262049f, 13.375790f }, 0.991760f,
-                            0.000048f );
-    instance->registerEObj( "unknown_1", 2007658, 6632431, 4, { 39.169922f, 8.194031f, -45.822941f }, 0.991760f,
-                            0.000048f );
-
-  }
-
-  void onUpdate( InstanceContentPtr instance, uint32_t currTime ) override
-  {
-
-  }
-
-  void onEnterTerritory( InstanceContentPtr instance, Entity::Player& player, uint32_t eventId, uint16_t param1,
-                         uint16_t param2 ) override
-  {
-
-  }
-
-};
-
-EXPOSE_SCRIPT( TheFeast4on4Training );
\ No newline at end of file
diff --git a/src/scripts/instances/pvp/TheFeastCustomMatchCrystalTower.cpp b/src/scripts/instances/pvp/TheFeastCustomMatchCrystalTower.cpp
deleted file mode 100644
index 275f7579..00000000
--- a/src/scripts/instances/pvp/TheFeastCustomMatchCrystalTower.cpp
+++ /dev/null
@@ -1,45 +0,0 @@
-#include <ScriptObject.h>
-#include <Territory/InstanceContent.h>
-
-using namespace Sapphire;
-
-class TheFeastCustomMatchCrystalTower :
-  public Sapphire::ScriptAPI::InstanceContentScript
-{
-public:
-  TheFeastCustomMatchCrystalTower() :
-    Sapphire::ScriptAPI::InstanceContentScript( 40025 )
-  {
-  }
-
-  void onInit( InstanceContentPtr instance ) override
-  {
-    instance->registerEObj( "unknown_0", 2008986, 7240684, 4, { 0.000000f, 0.000000f, 0.000000f }, 1.000000f,
-                            -0.000000f );
-    instance->registerEObj( "unknown_1", 2008987, 7240683, 4, { 0.000000f, 0.000000f, 0.000000f }, 1.000000f,
-                            -0.000000f );
-    instance->registerEObj( "unknown_2", 2007457, 7164689, 4, { 0.000000f, 0.000000f, 0.000000f }, 1.000000f,
-                            -0.000000f );
-    instance->registerEObj( "unknown_3", 2007457, 7164690, 4, { 0.000000f, 0.000000f, 0.000000f }, 1.000000f,
-                            -0.000000f );
-    instance->registerEObj( "unknown_4", 2007457, 7164691, 4, { 0.000000f, 0.000000f, 0.000000f }, 1.000000f,
-                            -0.000000f );
-    instance->registerEObj( "unknown_5", 2007457, 7164692, 4, { 0.000000f, 0.000000f, 0.000000f }, 1.000000f,
-                            -0.000000f );
-
-  }
-
-  void onUpdate( InstanceContentPtr instance, uint32_t currTime ) override
-  {
-
-  }
-
-  void onEnterTerritory( InstanceContentPtr instance, Entity::Player& player, uint32_t eventId, uint16_t param1,
-                         uint16_t param2 ) override
-  {
-
-  }
-
-};
-
-EXPOSE_SCRIPT( TheFeastCustomMatchCrystalTower );
\ No newline at end of file
diff --git a/src/scripts/instances/pvp/TheFeastCustomMatchFeastingGrounds.cpp b/src/scripts/instances/pvp/TheFeastCustomMatchFeastingGrounds.cpp
deleted file mode 100644
index fe62f25c..00000000
--- a/src/scripts/instances/pvp/TheFeastCustomMatchFeastingGrounds.cpp
+++ /dev/null
@@ -1,41 +0,0 @@
-#include <ScriptObject.h>
-#include <Territory/InstanceContent.h>
-
-using namespace Sapphire;
-
-class TheFeastCustomMatchFeastingGrounds :
-  public Sapphire::ScriptAPI::InstanceContentScript
-{
-public:
-  TheFeastCustomMatchFeastingGrounds() :
-    Sapphire::ScriptAPI::InstanceContentScript( 40014 )
-  {
-  }
-
-  void onInit( InstanceContentPtr instance ) override
-  {
-    instance->registerEObj( "unknown_0", 2006819, 6218908, 4, { -89.012909f, 8.477110f, -0.326954f }, 1.000000f,
-                            0.000000f );
-    instance->registerEObj( "unknown_1", 2006818, 6218909, 4, { 95.872437f, 8.468750f, -0.320496f }, 0.991760f,
-                            0.000048f );
-    instance->registerEObj( "sgpl_w_lvd_collison_only", 2002618, 6220121, 4, { -78.605072f, 0.920299f, 0.000000f },
-                            1.000000f, 0.000000f );
-    instance->registerEObj( "sgpl_w_lvd_collison_only_1", 2002618, 6220123, 4, { 79.651703f, 0.811267f, -0.306571f },
-                            0.991760f, 0.000048f );
-
-  }
-
-  void onUpdate( InstanceContentPtr instance, uint32_t currTime ) override
-  {
-
-  }
-
-  void onEnterTerritory( InstanceContentPtr instance, Entity::Player& player, uint32_t eventId, uint16_t param1,
-                         uint16_t param2 ) override
-  {
-
-  }
-
-};
-
-EXPOSE_SCRIPT( TheFeastCustomMatchFeastingGrounds );
\ No newline at end of file
diff --git a/src/scripts/instances/pvp/TheFeastCustomMatchLichenweed.cpp b/src/scripts/instances/pvp/TheFeastCustomMatchLichenweed.cpp
deleted file mode 100644
index 1b07b1d8..00000000
--- a/src/scripts/instances/pvp/TheFeastCustomMatchLichenweed.cpp
+++ /dev/null
@@ -1,37 +0,0 @@
-#include <ScriptObject.h>
-#include <Territory/InstanceContent.h>
-
-using namespace Sapphire;
-
-class TheFeastCustomMatchLichenweed :
-  public Sapphire::ScriptAPI::InstanceContentScript
-{
-public:
-  TheFeastCustomMatchLichenweed() :
-    Sapphire::ScriptAPI::InstanceContentScript( 40021 )
-  {
-  }
-
-  void onInit( InstanceContentPtr instance ) override
-  {
-    instance->registerEObj( "unknown_0", 2007657, 6632432, 4, { -64.289970f, 8.262049f, 13.375790f }, 0.991760f,
-                            0.000048f );
-    instance->registerEObj( "unknown_1", 2007658, 6632431, 4, { 39.169922f, 8.194031f, -45.822941f }, 0.991760f,
-                            0.000048f );
-
-  }
-
-  void onUpdate( InstanceContentPtr instance, uint32_t currTime ) override
-  {
-
-  }
-
-  void onEnterTerritory( InstanceContentPtr instance, Entity::Player& player, uint32_t eventId, uint16_t param1,
-                         uint16_t param2 ) override
-  {
-
-  }
-
-};
-
-EXPOSE_SCRIPT( TheFeastCustomMatchLichenweed );
\ No newline at end of file
diff --git a/src/scripts/instances/pvp/TheFeastRanked.cpp b/src/scripts/instances/pvp/TheFeastRanked.cpp
deleted file mode 100644
index 993e7795..00000000
--- a/src/scripts/instances/pvp/TheFeastRanked.cpp
+++ /dev/null
@@ -1,45 +0,0 @@
-#include <ScriptObject.h>
-#include <Territory/InstanceContent.h>
-
-using namespace Sapphire;
-
-class TheFeastRanked :
-  public Sapphire::ScriptAPI::InstanceContentScript
-{
-public:
-  TheFeastRanked() :
-    Sapphire::ScriptAPI::InstanceContentScript( 40023 )
-  {
-  }
-
-  void onInit( InstanceContentPtr instance ) override
-  {
-    instance->registerEObj( "unknown_0", 2008986, 7240684, 4, { 0.000000f, 0.000000f, 0.000000f }, 1.000000f,
-                            -0.000000f );
-    instance->registerEObj( "unknown_1", 2008987, 7240683, 4, { 0.000000f, 0.000000f, 0.000000f }, 1.000000f,
-                            -0.000000f );
-    instance->registerEObj( "unknown_2", 2007457, 7164689, 4, { 0.000000f, 0.000000f, 0.000000f }, 1.000000f,
-                            -0.000000f );
-    instance->registerEObj( "unknown_3", 2007457, 7164690, 4, { 0.000000f, 0.000000f, 0.000000f }, 1.000000f,
-                            -0.000000f );
-    instance->registerEObj( "unknown_4", 2007457, 7164691, 4, { 0.000000f, 0.000000f, 0.000000f }, 1.000000f,
-                            -0.000000f );
-    instance->registerEObj( "unknown_5", 2007457, 7164692, 4, { 0.000000f, 0.000000f, 0.000000f }, 1.000000f,
-                            -0.000000f );
-
-  }
-
-  void onUpdate( InstanceContentPtr instance, uint32_t currTime ) override
-  {
-
-  }
-
-  void onEnterTerritory( InstanceContentPtr instance, Entity::Player& player, uint32_t eventId, uint16_t param1,
-                         uint16_t param2 ) override
-  {
-
-  }
-
-};
-
-EXPOSE_SCRIPT( TheFeastRanked );
\ No newline at end of file
diff --git a/src/scripts/instances/pvp/TheFeastTeamRanked.cpp b/src/scripts/instances/pvp/TheFeastTeamRanked.cpp
deleted file mode 100644
index c2db1e59..00000000
--- a/src/scripts/instances/pvp/TheFeastTeamRanked.cpp
+++ /dev/null
@@ -1,45 +0,0 @@
-#include <ScriptObject.h>
-#include <Territory/InstanceContent.h>
-
-using namespace Sapphire;
-
-class TheFeastTeamRanked :
-  public Sapphire::ScriptAPI::InstanceContentScript
-{
-public:
-  TheFeastTeamRanked() :
-    Sapphire::ScriptAPI::InstanceContentScript( 40022 )
-  {
-  }
-
-  void onInit( InstanceContentPtr instance ) override
-  {
-    instance->registerEObj( "unknown_0", 2008986, 7240684, 4, { 0.000000f, 0.000000f, 0.000000f }, 1.000000f,
-                            -0.000000f );
-    instance->registerEObj( "unknown_1", 2008987, 7240683, 4, { 0.000000f, 0.000000f, 0.000000f }, 1.000000f,
-                            -0.000000f );
-    instance->registerEObj( "unknown_2", 2007457, 7164689, 4, { 0.000000f, 0.000000f, 0.000000f }, 1.000000f,
-                            -0.000000f );
-    instance->registerEObj( "unknown_3", 2007457, 7164690, 4, { 0.000000f, 0.000000f, 0.000000f }, 1.000000f,
-                            -0.000000f );
-    instance->registerEObj( "unknown_4", 2007457, 7164691, 4, { 0.000000f, 0.000000f, 0.000000f }, 1.000000f,
-                            -0.000000f );
-    instance->registerEObj( "unknown_5", 2007457, 7164692, 4, { 0.000000f, 0.000000f, 0.000000f }, 1.000000f,
-                            -0.000000f );
-
-  }
-
-  void onUpdate( InstanceContentPtr instance, uint32_t currTime ) override
-  {
-
-  }
-
-  void onEnterTerritory( InstanceContentPtr instance, Entity::Player& player, uint32_t eventId, uint16_t param1,
-                         uint16_t param2 ) override
-  {
-
-  }
-
-};
-
-EXPOSE_SCRIPT( TheFeastTeamRanked );
\ No newline at end of file
diff --git a/src/scripts/instances/pvp/TheFeastTraining.cpp b/src/scripts/instances/pvp/TheFeastTraining.cpp
deleted file mode 100644
index b02d3c27..00000000
--- a/src/scripts/instances/pvp/TheFeastTraining.cpp
+++ /dev/null
@@ -1,45 +0,0 @@
-#include <ScriptObject.h>
-#include <Territory/InstanceContent.h>
-
-using namespace Sapphire;
-
-class TheFeastTraining :
-  public Sapphire::ScriptAPI::InstanceContentScript
-{
-public:
-  TheFeastTraining() :
-    Sapphire::ScriptAPI::InstanceContentScript( 40024 )
-  {
-  }
-
-  void onInit( InstanceContentPtr instance ) override
-  {
-    instance->registerEObj( "unknown_0", 2008986, 7240684, 4, { 0.000000f, 0.000000f, 0.000000f }, 1.000000f,
-                            -0.000000f );
-    instance->registerEObj( "unknown_1", 2008987, 7240683, 4, { 0.000000f, 0.000000f, 0.000000f }, 1.000000f,
-                            -0.000000f );
-    instance->registerEObj( "unknown_2", 2007457, 7164689, 4, { 0.000000f, 0.000000f, 0.000000f }, 1.000000f,
-                            -0.000000f );
-    instance->registerEObj( "unknown_3", 2007457, 7164690, 4, { 0.000000f, 0.000000f, 0.000000f }, 1.000000f,
-                            -0.000000f );
-    instance->registerEObj( "unknown_4", 2007457, 7164691, 4, { 0.000000f, 0.000000f, 0.000000f }, 1.000000f,
-                            -0.000000f );
-    instance->registerEObj( "unknown_5", 2007457, 7164692, 4, { 0.000000f, 0.000000f, 0.000000f }, 1.000000f,
-                            -0.000000f );
-
-  }
-
-  void onUpdate( InstanceContentPtr instance, uint32_t currTime ) override
-  {
-
-  }
-
-  void onEnterTerritory( InstanceContentPtr instance, Entity::Player& player, uint32_t eventId, uint16_t param1,
-                         uint16_t param2 ) override
-  {
-
-  }
-
-};
-
-EXPOSE_SCRIPT( TheFeastTraining );
\ No newline at end of file
diff --git a/src/scripts/instances/pvp/TheFieldsofGloryShatter.cpp b/src/scripts/instances/pvp/TheFieldsofGloryShatter.cpp
index 66ad47fd..7cb3715e 100644
--- a/src/scripts/instances/pvp/TheFieldsofGloryShatter.cpp
+++ b/src/scripts/instances/pvp/TheFieldsofGloryShatter.cpp
@@ -9,20 +9,47 @@ class TheFieldsofGloryShatter :
 public:
   TheFieldsofGloryShatter() :
     Sapphire::ScriptAPI::InstanceContentScript( 50005 )
+  { }
+
+  void onInit( InstanceContent& instance ) override
   {
+    instance.registerEObj( "sgvf_w_lvd_b0286", 2007022, 7583664, 4, { -263.444885f, 52.175270f, -209.921402f }, 1.000000f, 0.000000f ); 
+      // States -> vf_lock_on (id: 11) vf_lock_of (id: 12) 
+    instance.registerEObj( "sgvf_w_lvd_b0286_1", 2007023, 7583666, 4, { -91.249367f, 27.082781f, 248.251297f }, 1.000000f, 0.000000f ); 
+      // States -> vf_lock_on (id: 11) vf_lock_of (id: 12) 
+    instance.registerEObj( "sgvf_w_lvd_b0286_2", 2007024, 7583668, 4, { 262.704590f, 7.555402f, -83.636391f }, 0.991760f, 0.000048f ); 
+      // States -> vf_lock_on (id: 11) vf_lock_of (id: 12) 
+    instance.registerEObj( "sgbg_r2p1_q0_col02", 2007038, 7583676, 4, { -33.290001f, 8.500000f, -64.930000f }, 1.000000f, 0.345772f ); 
+    instance.registerEObj( "sgbg_r2p1_q0_col02_1", 2007039, 7583680, 4, { -29.181200f, 4.895900f, -181.130005f }, 1.000000f, -0.000000f ); 
+    instance.registerEObj( "sgbg_r2p1_q0_col02_2", 2007040, 7583684, 4, { 49.409801f, 1.000000f, 95.446404f }, 1.000000f, -0.000000f ); 
+    instance.registerEObj( "sgbg_r2p1_q0_col02_3", 2007041, 7583688, 4, { -139.203201f, 2.000000f, 42.698399f }, 1.000000f, -0.000000f ); 
+    instance.registerEObj( "sgbg_r2p1_q0_col01", 2007042, 7583692, 4, { 10.250100f, 7.501600f, -73.703102f }, 1.000000f, -0.207694f ); 
+    instance.registerEObj( "sgbg_r2p1_q0_col01_1", 2007126, 7583696, 4, { -21.009300f, 6.445800f, -124.468399f }, 1.000000f, -1.350824f ); 
+    instance.registerEObj( "sgbg_r2p1_q0_col01_2", 2007044, 7583700, 4, { -57.941700f, 7.532000f, -89.861702f }, 1.000000f, -0.478128f ); 
+    instance.registerEObj( "sgbg_r2p1_q0_col01_3", 2007043, 7583704, 4, { -28.053699f, 7.586800f, -20.808001f }, 1.000000f, -0.207694f ); 
+    instance.registerEObj( "sgbg_r2p1_q0_col01_4", 2007124, 7583708, 4, { -81.065201f, 8.327300f, -23.711300f }, 1.000000f, 0.491354f ); 
+    instance.registerEObj( "sgbg_r2p1_q0_col01_5", 2007122, 7583712, 4, { 17.876400f, 7.001300f, 11.047300f }, 1.000000f, -0.000000f ); 
+    instance.registerEObj( "sgbg_r2p1_q0_col01_6", 2007053, 7583716, 4, { -126.529999f, 35.526501f, -132.360001f }, 1.000000f, -0.000000f ); 
+    instance.registerEObj( "sgbg_r2p1_q0_col01_7", 2007125, 7583720, 4, { -224.454102f, 30.212000f, -33.290001f }, 1.000000f, 0.001382f ); 
+    instance.registerEObj( "sgbg_r2p1_q0_col01_8", 2007052, 7583724, 4, { -148.077499f, 48.772800f, -3.141700f }, 1.000000f, -0.003491f ); 
+    instance.registerEObj( "sgbg_r2p1_q0_col01_9", 2007051, 7583728, 4, { -195.641693f, 37.440800f, 80.677399f }, 1.000000f, 1.473960f ); 
+    instance.registerEObj( "sgbg_r2p1_q0_col01_10", 2007123, 7583732, 4, { -107.700996f, 10.249100f, 150.690598f }, 1.000000f, -0.528624f ); 
+    instance.registerEObj( "sgbg_r2p1_q0_col01_11", 2007050, 7583736, 4, { -8.180000f, 31.300200f, 107.550003f }, 1.000000f, -0.207694f ); 
+    instance.registerEObj( "sgbg_r2p1_q0_col01_12", 2007049, 7583740, 4, { 75.684898f, 35.111000f, 149.223801f }, 1.000000f, -0.207694f ); 
+    instance.registerEObj( "sgbg_r2p1_q0_col01_13", 2007048, 7583744, 4, { 174.059998f, 30.587099f, 122.660004f }, 1.000000f, -0.000000f ); 
+    instance.registerEObj( "sgbg_r2p1_q0_col01_14", 2007047, 7583748, 4, { 175.149307f, 0.118000f, 8.585100f }, 1.000000f, -0.383869f ); 
+    instance.registerEObj( "sgbg_r2p1_q0_col01_15", 2007046, 7583752, 4, { 121.235901f, 29.898701f, -190.225006f }, 1.000000f, -0.000000f ); 
+    instance.registerEObj( "sgbg_r2p1_q0_col01_16", 2007121, 7583756, 4, { 29.201799f, 37.825001f, -217.776505f }, 1.000000f, 1.518110f ); 
+    instance.registerEObj( "sgbg_r2p1_q0_col01_17", 2007045, 7583760, 4, { -43.203499f, 42.615501f, -229.343597f }, 1.000000f, 0.535781f ); 
+
   }
 
-  void onInit( InstanceContentPtr instance ) override
+  void onUpdate( InstanceContent& instance, uint32_t currTime ) override
   {
 
   }
 
-  void onUpdate( InstanceContentPtr instance, uint32_t currTime ) override
-  {
-
-  }
-
-  void onEnterTerritory( InstanceContentPtr instance, Entity::Player& player, uint32_t eventId, uint16_t param1,
+  void onEnterTerritory( InstanceContent& instance, Entity::Player& player, uint32_t eventId, uint16_t param1,
                          uint16_t param2 ) override
   {
 
diff --git a/src/scripts/instances/pvp/rivalwings/Astragalos.cpp b/src/scripts/instances/pvp/rivalwings/Astragalos.cpp
new file mode 100644
index 00000000..cd424925
--- /dev/null
+++ b/src/scripts/instances/pvp/rivalwings/Astragalos.cpp
@@ -0,0 +1,46 @@
+#include <ScriptObject.h>
+#include <Territory/InstanceContent.h>
+
+using namespace Sapphire;
+
+class Astragalos :
+  public Sapphire::ScriptAPI::InstanceContentScript
+{
+public:
+  Astragalos() :
+    Sapphire::ScriptAPI::InstanceContentScript( 51001 )
+  { }
+
+  void onInit( InstanceContent& instance ) override
+  {
+    instance.registerEObj( "unknown_0", 2007457, 7033316, 4, { -140.058197f, 45.799999f, -133.960495f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_1", 2007457, 7033315, 4, { -123.008400f, 16.299999f, 103.779503f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_2", 2007457, 7033317, 4, { 105.712799f, 16.299980f, 114.356003f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_3", 2007457, 7033318, 4, { 183.420807f, 45.799980f, -111.239098f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "Powergenerator", 2009034, 7032566, 4, { 6.485046f, 46.386410f, -10.055730f }, 0.991760f, 0.000048f ); 
+    instance.registerEObj( "Hangarterminal", 2009035, 7032549, 4, { -258.015198f, 44.361351f, 21.038191f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "Hangarterminal_1", 2009062, 7032550, 4, { -262.674988f, 44.773441f, -32.764599f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "Hangarterminal_2", 2009063, 7032561, 4, { 276.628510f, 44.544209f, 18.968180f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "Hangarterminal_3", 2009064, 7032562, 4, { 258.262787f, 44.210709f, 69.718079f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "Ceruleumtank", 2009031, 0, 4, { 8.651855f, 46.280640f, -142.595596f }, 0.991760f, 0.000048f ); 
+    instance.registerEObj( "Steamcannon", 2009032, 0, 4, { -181.307602f, 47.593700f, -28.846230f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "Steamcannon_1", 2009033, 0, 4, { -178.482193f, 47.593700f, 2.992350f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "Steamcannon_2", 2009040, 0, 4, { 186.000504f, 47.578602f, 31.721189f }, 0.991760f, -0.454976f ); 
+    instance.registerEObj( "Steamcannon_3", 2009041, 0, 4, { 196.952606f, 47.593700f, 1.659642f }, 1.000000f, -0.455053f ); 
+
+  }
+
+  void onUpdate( InstanceContent& instance, uint32_t currTime ) override
+  {
+
+  }
+
+  void onEnterTerritory( InstanceContent& instance, Entity::Player& player, uint32_t eventId, uint16_t param1,
+                         uint16_t param2 ) override
+  {
+
+  }
+
+};
+
+EXPOSE_SCRIPT( Astragalos );
\ No newline at end of file
diff --git a/src/scripts/instances/pvp/rivalwings/HiddenGorge.cpp b/src/scripts/instances/pvp/rivalwings/HiddenGorge.cpp
new file mode 100644
index 00000000..bc99911c
--- /dev/null
+++ b/src/scripts/instances/pvp/rivalwings/HiddenGorge.cpp
@@ -0,0 +1,45 @@
+#include <ScriptObject.h>
+#include <Territory/InstanceContent.h>
+
+using namespace Sapphire;
+
+class HiddenGorge :
+  public Sapphire::ScriptAPI::InstanceContentScript
+{
+public:
+  HiddenGorge() :
+    Sapphire::ScriptAPI::InstanceContentScript( 51002 )
+  { }
+
+  void onInit( InstanceContent& instance ) override
+  {
+    instance.registerEObj( "unknown_0", 2007457, 7677877, 4, { 99.992310f, 16.299459f, 89.982422f }, 0.991760f, 0.000048f ); 
+    instance.registerEObj( "unknown_1", 2007457, 7677876, 4, { 100.000000f, 16.299459f, -110.000000f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_2", 2007457, 7677878, 4, { -100.000000f, 16.299500f, 110.000000f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_3", 2007457, 7677879, 4, { -100.000000f, 16.299459f, -90.000000f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "Steamcannon", 2009040, 0, 4, { 121.355103f, 19.959841f, -0.442573f }, 0.991760f, 0.785458f ); 
+    instance.registerEObj( "Steamcannon_1", 2009041, 0, 4, { 121.392403f, 19.999960f, -19.606091f }, 1.000000f, 0.785398f ); 
+    instance.registerEObj( "Steamcannon_2", 2009032, 0, 4, { -121.390701f, 20.005421f, 0.356093f }, 0.991760f, -0.785362f ); 
+    instance.registerEObj( "Steamcannon_3", 2009033, 0, 4, { -121.391502f, 20.000010f, 19.612690f }, 1.000000f, -0.785398f ); 
+    instance.registerEObj( "Hangarterminal", 2009035, 7553226, 4, { -189.989395f, 16.493401f, 34.331669f }, 1.000000f, -1.570451f ); 
+    instance.registerEObj( "Hangarterminal_1", 2009062, 7553225, 4, { -189.969498f, 16.519770f, -14.365560f }, 1.000000f, -1.570451f ); 
+    instance.registerEObj( "Hangarterminal_2", 2009063, 7558250, 4, { 189.990799f, 16.518669f, -34.362301f }, 0.991760f, 1.570451f ); 
+    instance.registerEObj( "Hangarterminal_3", 2009064, 7558251, 4, { 189.993805f, 16.299999f, 13.374650f }, 1.000000f, 1.570451f ); 
+    instance.registerEObj( "Ceruleumtank", 2009031, 0, 4, { 0.000000f, 18.434999f, 0.000000f }, 1.000000f, 0.000000f ); 
+
+  }
+
+  void onUpdate( InstanceContent& instance, uint32_t currTime ) override
+  {
+
+  }
+
+  void onEnterTerritory( InstanceContent& instance, Entity::Player& player, uint32_t eventId, uint16_t param1,
+                         uint16_t param2 ) override
+  {
+
+  }
+
+};
+
+EXPOSE_SCRIPT( HiddenGorge );
\ No newline at end of file
diff --git a/src/scripts/instances/pvp/thefeast/TheFeast4on4Ranked.cpp b/src/scripts/instances/pvp/thefeast/TheFeast4on4Ranked.cpp
new file mode 100644
index 00000000..9861b4e7
--- /dev/null
+++ b/src/scripts/instances/pvp/thefeast/TheFeast4on4Ranked.cpp
@@ -0,0 +1,34 @@
+#include <ScriptObject.h>
+#include <Territory/InstanceContent.h>
+
+using namespace Sapphire;
+
+class TheFeast4on4Ranked :
+  public Sapphire::ScriptAPI::InstanceContentScript
+{
+public:
+  TheFeast4on4Ranked() :
+    Sapphire::ScriptAPI::InstanceContentScript( 40018 )
+  { }
+
+  void onInit( InstanceContent& instance ) override
+  {
+    instance.registerEObj( "unknown_0", 2007657, 6632432, 4, { -64.289970f, 8.262049f, 13.375790f }, 0.991760f, 0.000048f ); 
+    instance.registerEObj( "unknown_1", 2007658, 6632431, 4, { 39.169922f, 8.194031f, -45.822941f }, 0.991760f, 0.000048f ); 
+
+  }
+
+  void onUpdate( InstanceContent& instance, uint32_t currTime ) override
+  {
+
+  }
+
+  void onEnterTerritory( InstanceContent& instance, Entity::Player& player, uint32_t eventId, uint16_t param1,
+                         uint16_t param2 ) override
+  {
+
+  }
+
+};
+
+EXPOSE_SCRIPT( TheFeast4on4Ranked );
\ No newline at end of file
diff --git a/src/scripts/instances/pvp/thefeast/TheFeast4on4Training.cpp b/src/scripts/instances/pvp/thefeast/TheFeast4on4Training.cpp
new file mode 100644
index 00000000..0f647d9c
--- /dev/null
+++ b/src/scripts/instances/pvp/thefeast/TheFeast4on4Training.cpp
@@ -0,0 +1,34 @@
+#include <ScriptObject.h>
+#include <Territory/InstanceContent.h>
+
+using namespace Sapphire;
+
+class TheFeast4on4Training :
+  public Sapphire::ScriptAPI::InstanceContentScript
+{
+public:
+  TheFeast4on4Training() :
+    Sapphire::ScriptAPI::InstanceContentScript( 40016 )
+  { }
+
+  void onInit( InstanceContent& instance ) override
+  {
+    instance.registerEObj( "unknown_0", 2007657, 6632432, 4, { -64.289970f, 8.262049f, 13.375790f }, 0.991760f, 0.000048f ); 
+    instance.registerEObj( "unknown_1", 2007658, 6632431, 4, { 39.169922f, 8.194031f, -45.822941f }, 0.991760f, 0.000048f ); 
+
+  }
+
+  void onUpdate( InstanceContent& instance, uint32_t currTime ) override
+  {
+
+  }
+
+  void onEnterTerritory( InstanceContent& instance, Entity::Player& player, uint32_t eventId, uint16_t param1,
+                         uint16_t param2 ) override
+  {
+
+  }
+
+};
+
+EXPOSE_SCRIPT( TheFeast4on4Training );
\ No newline at end of file
diff --git a/src/scripts/instances/pvp/thefeast/TheFeastCustomMatchCrystalTower.cpp b/src/scripts/instances/pvp/thefeast/TheFeastCustomMatchCrystalTower.cpp
new file mode 100644
index 00000000..9fd10b15
--- /dev/null
+++ b/src/scripts/instances/pvp/thefeast/TheFeastCustomMatchCrystalTower.cpp
@@ -0,0 +1,34 @@
+#include <ScriptObject.h>
+#include <Territory/InstanceContent.h>
+
+using namespace Sapphire;
+
+class TheFeastCustomMatchCrystalTower :
+  public Sapphire::ScriptAPI::InstanceContentScript
+{
+public:
+  TheFeastCustomMatchCrystalTower() :
+    Sapphire::ScriptAPI::InstanceContentScript( 40025 )
+  { }
+
+  void onInit( InstanceContent& instance ) override
+  {
+    instance.registerEObj( "unknown_0", 2008986, 7403947, 4, { -58.000000f, 0.250000f, 0.000000f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_1", 2008987, 7403946, 4, { 58.000000f, 0.250000f, 0.000000f }, 1.000000f, -3.141593f ); 
+
+  }
+
+  void onUpdate( InstanceContent& instance, uint32_t currTime ) override
+  {
+
+  }
+
+  void onEnterTerritory( InstanceContent& instance, Entity::Player& player, uint32_t eventId, uint16_t param1,
+                         uint16_t param2 ) override
+  {
+
+  }
+
+};
+
+EXPOSE_SCRIPT( TheFeastCustomMatchCrystalTower );
\ No newline at end of file
diff --git a/src/scripts/instances/pvp/thefeast/TheFeastCustomMatchFeastingGrounds.cpp b/src/scripts/instances/pvp/thefeast/TheFeastCustomMatchFeastingGrounds.cpp
new file mode 100644
index 00000000..86d427da
--- /dev/null
+++ b/src/scripts/instances/pvp/thefeast/TheFeastCustomMatchFeastingGrounds.cpp
@@ -0,0 +1,36 @@
+#include <ScriptObject.h>
+#include <Territory/InstanceContent.h>
+
+using namespace Sapphire;
+
+class TheFeastCustomMatchFeastingGrounds :
+  public Sapphire::ScriptAPI::InstanceContentScript
+{
+public:
+  TheFeastCustomMatchFeastingGrounds() :
+    Sapphire::ScriptAPI::InstanceContentScript( 40014 )
+  { }
+
+  void onInit( InstanceContent& instance ) override
+  {
+    instance.registerEObj( "unknown_0", 2006819, 6218908, 4, { -89.012909f, 8.477110f, -0.326954f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_1", 2006818, 6218909, 4, { 95.872437f, 8.468750f, -0.320496f }, 0.991760f, 0.000048f ); 
+    instance.registerEObj( "sgpl_w_lvd_collison_only", 2002618, 6220121, 4, { -78.605072f, 0.920299f, 0.000000f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "sgpl_w_lvd_collison_only_1", 2002618, 6220123, 4, { 79.651703f, 0.811267f, -0.306571f }, 0.991760f, 0.000048f ); 
+
+  }
+
+  void onUpdate( InstanceContent& instance, uint32_t currTime ) override
+  {
+
+  }
+
+  void onEnterTerritory( InstanceContent& instance, Entity::Player& player, uint32_t eventId, uint16_t param1,
+                         uint16_t param2 ) override
+  {
+
+  }
+
+};
+
+EXPOSE_SCRIPT( TheFeastCustomMatchFeastingGrounds );
\ No newline at end of file
diff --git a/src/scripts/instances/pvp/thefeast/TheFeastCustomMatchLichenweed.cpp b/src/scripts/instances/pvp/thefeast/TheFeastCustomMatchLichenweed.cpp
new file mode 100644
index 00000000..6e9a992d
--- /dev/null
+++ b/src/scripts/instances/pvp/thefeast/TheFeastCustomMatchLichenweed.cpp
@@ -0,0 +1,34 @@
+#include <ScriptObject.h>
+#include <Territory/InstanceContent.h>
+
+using namespace Sapphire;
+
+class TheFeastCustomMatchLichenweed :
+  public Sapphire::ScriptAPI::InstanceContentScript
+{
+public:
+  TheFeastCustomMatchLichenweed() :
+    Sapphire::ScriptAPI::InstanceContentScript( 40021 )
+  { }
+
+  void onInit( InstanceContent& instance ) override
+  {
+    instance.registerEObj( "unknown_0", 2007657, 6632432, 4, { -64.289970f, 8.262049f, 13.375790f }, 0.991760f, 0.000048f ); 
+    instance.registerEObj( "unknown_1", 2007658, 6632431, 4, { 39.169922f, 8.194031f, -45.822941f }, 0.991760f, 0.000048f ); 
+
+  }
+
+  void onUpdate( InstanceContent& instance, uint32_t currTime ) override
+  {
+
+  }
+
+  void onEnterTerritory( InstanceContent& instance, Entity::Player& player, uint32_t eventId, uint16_t param1,
+                         uint16_t param2 ) override
+  {
+
+  }
+
+};
+
+EXPOSE_SCRIPT( TheFeastCustomMatchLichenweed );
\ No newline at end of file
diff --git a/src/scripts/instances/pvp/thefeast/TheFeastRanked.cpp b/src/scripts/instances/pvp/thefeast/TheFeastRanked.cpp
new file mode 100644
index 00000000..b63957a8
--- /dev/null
+++ b/src/scripts/instances/pvp/thefeast/TheFeastRanked.cpp
@@ -0,0 +1,34 @@
+#include <ScriptObject.h>
+#include <Territory/InstanceContent.h>
+
+using namespace Sapphire;
+
+class TheFeastRanked :
+  public Sapphire::ScriptAPI::InstanceContentScript
+{
+public:
+  TheFeastRanked() :
+    Sapphire::ScriptAPI::InstanceContentScript( 40023 )
+  { }
+
+  void onInit( InstanceContent& instance ) override
+  {
+    instance.registerEObj( "unknown_0", 2008986, 7403947, 4, { -58.000000f, 0.250000f, 0.000000f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_1", 2008987, 7403946, 4, { 58.000000f, 0.250000f, 0.000000f }, 1.000000f, -3.141593f ); 
+
+  }
+
+  void onUpdate( InstanceContent& instance, uint32_t currTime ) override
+  {
+
+  }
+
+  void onEnterTerritory( InstanceContent& instance, Entity::Player& player, uint32_t eventId, uint16_t param1,
+                         uint16_t param2 ) override
+  {
+
+  }
+
+};
+
+EXPOSE_SCRIPT( TheFeastRanked );
\ No newline at end of file
diff --git a/src/scripts/instances/pvp/thefeast/TheFeastTeamCustomMatchCrystalTower.cpp b/src/scripts/instances/pvp/thefeast/TheFeastTeamCustomMatchCrystalTower.cpp
new file mode 100644
index 00000000..94f41ede
--- /dev/null
+++ b/src/scripts/instances/pvp/thefeast/TheFeastTeamCustomMatchCrystalTower.cpp
@@ -0,0 +1,34 @@
+#include <ScriptObject.h>
+#include <Territory/InstanceContent.h>
+
+using namespace Sapphire;
+
+class TheFeastTeamCustomMatchCrystalTower :
+  public Sapphire::ScriptAPI::InstanceContentScript
+{
+public:
+  TheFeastTeamCustomMatchCrystalTower() :
+    Sapphire::ScriptAPI::InstanceContentScript( 40026 )
+  { }
+
+  void onInit( InstanceContent& instance ) override
+  {
+    instance.registerEObj( "unknown_0", 2008986, 7403947, 4, { -58.000000f, 0.250000f, 0.000000f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_1", 2008987, 7403946, 4, { 58.000000f, 0.250000f, 0.000000f }, 1.000000f, -3.141593f ); 
+
+  }
+
+  void onUpdate( InstanceContent& instance, uint32_t currTime ) override
+  {
+
+  }
+
+  void onEnterTerritory( InstanceContent& instance, Entity::Player& player, uint32_t eventId, uint16_t param1,
+                         uint16_t param2 ) override
+  {
+
+  }
+
+};
+
+EXPOSE_SCRIPT( TheFeastTeamCustomMatchCrystalTower );
\ No newline at end of file
diff --git a/src/scripts/instances/pvp/thefeast/TheFeastTeamRanked.cpp b/src/scripts/instances/pvp/thefeast/TheFeastTeamRanked.cpp
new file mode 100644
index 00000000..41571839
--- /dev/null
+++ b/src/scripts/instances/pvp/thefeast/TheFeastTeamRanked.cpp
@@ -0,0 +1,34 @@
+#include <ScriptObject.h>
+#include <Territory/InstanceContent.h>
+
+using namespace Sapphire;
+
+class TheFeastTeamRanked :
+  public Sapphire::ScriptAPI::InstanceContentScript
+{
+public:
+  TheFeastTeamRanked() :
+    Sapphire::ScriptAPI::InstanceContentScript( 40022 )
+  { }
+
+  void onInit( InstanceContent& instance ) override
+  {
+    instance.registerEObj( "unknown_0", 2008986, 7403947, 4, { -58.000000f, 0.250000f, 0.000000f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_1", 2008987, 7403946, 4, { 58.000000f, 0.250000f, 0.000000f }, 1.000000f, -3.141593f ); 
+
+  }
+
+  void onUpdate( InstanceContent& instance, uint32_t currTime ) override
+  {
+
+  }
+
+  void onEnterTerritory( InstanceContent& instance, Entity::Player& player, uint32_t eventId, uint16_t param1,
+                         uint16_t param2 ) override
+  {
+
+  }
+
+};
+
+EXPOSE_SCRIPT( TheFeastTeamRanked );
\ No newline at end of file
diff --git a/src/scripts/instances/pvp/thefeast/TheFeastTraining.cpp b/src/scripts/instances/pvp/thefeast/TheFeastTraining.cpp
new file mode 100644
index 00000000..b88d86a0
--- /dev/null
+++ b/src/scripts/instances/pvp/thefeast/TheFeastTraining.cpp
@@ -0,0 +1,34 @@
+#include <ScriptObject.h>
+#include <Territory/InstanceContent.h>
+
+using namespace Sapphire;
+
+class TheFeastTraining :
+  public Sapphire::ScriptAPI::InstanceContentScript
+{
+public:
+  TheFeastTraining() :
+    Sapphire::ScriptAPI::InstanceContentScript( 40024 )
+  { }
+
+  void onInit( InstanceContent& instance ) override
+  {
+    instance.registerEObj( "unknown_0", 2008986, 7403947, 4, { -58.000000f, 0.250000f, 0.000000f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_1", 2008987, 7403946, 4, { 58.000000f, 0.250000f, 0.000000f }, 1.000000f, -3.141593f ); 
+
+  }
+
+  void onUpdate( InstanceContent& instance, uint32_t currTime ) override
+  {
+
+  }
+
+  void onEnterTerritory( InstanceContent& instance, Entity::Player& player, uint32_t eventId, uint16_t param1,
+                         uint16_t param2 ) override
+  {
+
+  }
+
+};
+
+EXPOSE_SCRIPT( TheFeastTraining );
\ No newline at end of file
diff --git a/src/scripts/instances/questbattles/ABloodyReunion.cpp b/src/scripts/instances/questbattles/ABloodyReunion.cpp
index 1968d2ec..c10f1b31 100644
--- a/src/scripts/instances/questbattles/ABloodyReunion.cpp
+++ b/src/scripts/instances/questbattles/ABloodyReunion.cpp
@@ -9,20 +9,57 @@ class ABloodyReunion :
 public:
   ABloodyReunion() :
     Sapphire::ScriptAPI::InstanceContentScript( 5002 )
+  { }
+
+  void onInit( InstanceContent& instance ) override
   {
+    instance.registerEObj( "unknown_0", 2002735, 0, 4, { -133.497498f, 394.924286f, -295.299713f }, 1.400000f, -1.570451f ); 
+    instance.registerEObj( "sgpl_w_lvd_b0118_col_char", 2002872, 5786705, 4, { -140.602203f, 394.529388f, -295.997314f }, 1.000000f, 0.000000f ); 
+      // States -> vf_bextwall_on (id: 3) vf_bextwall_of (id: 4) 
+    instance.registerEObj( "unknown_1", 2005310, 5698551, 4, { -81.047653f, 394.430786f, -296.243713f }, 0.991760f, 0.000048f ); 
+    instance.registerEObj( "unknown_2", 2006038, 5891863, 4, { -103.765701f, 394.988708f, -312.957214f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_3", 2006039, 5891860, 4, { -102.201103f, 394.988708f, -278.118988f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_4", 2002735, 0, 4, { 228.611694f, 225.066895f, 272.124695f }, 1.400000f, -1.570451f ); 
+    instance.registerEObj( "sgpl_w_lvd_b0118_col_char_1", 2002872, 5786711, 4, { 220.192200f, 224.639603f, 271.691895f }, 1.000000f, 0.000000f ); 
+      // States -> vf_bextwall_on (id: 3) vf_bextwall_of (id: 4) 
+    instance.registerEObj( "sgpl_w_lvd_b0118_col_char_2", 2002872, 5786715, 4, { 265.170685f, 225.066895f, 271.760712f }, 1.000000f, 0.000000f ); 
+      // States -> vf_bextwall_on (id: 3) vf_bextwall_of (id: 4) 
+    instance.registerEObj( "unknown_5", 2002735, 0, 4, { 230.175598f, -96.457947f, -160.689804f }, 1.400000f, 0.000000f ); 
+    instance.registerEObj( "sgpl_w_lvd_b0118_col_char_3", 2002872, 5786724, 4, { 231.302200f, -96.512398f, -143.853394f }, 1.000000f, 0.000000f ); 
+      // States -> vf_bextwall_on (id: 3) vf_bextwall_of (id: 4) 
+    instance.registerEObj( "unknown_6", 2006040, 5855034, 4, { 230.235901f, -96.457947f, -181.102600f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "Exit", 2000139, 0, 4, { 230.936203f, -456.457886f, 65.952606f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_7", 2002735, 0, 4, { 229.505203f, -456.329193f, 99.828033f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "sgpl_w_lvd_b0118_col_char_4", 2002872, 5859273, 4, { 229.632996f, -456.457886f, 93.179420f }, 1.000000f, 0.000000f ); 
+      // States -> vf_bextwall_on (id: 3) vf_bextwall_of (id: 4) 
+    instance.registerEObj( "unknown_8", 2007177, 6268147, 4, { 230.075500f, -456.357605f, 58.431438f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_9", 2007178, 6275911, 4, { 230.467407f, -456.457886f, 79.306190f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_10", 2007168, 0, 4, { 248.035400f, 225.116302f, 271.869995f }, 0.991760f, 0.000048f ); 
+    instance.registerEObj( "unknown_11", 2005295, 5698524, 4, { -232.841797f, 402.044098f, -353.718689f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_12", 2005296, 5698521, 4, { -177.212006f, 398.044098f, -361.393311f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_13", 2005297, 5698523, 4, { -162.152802f, 398.044098f, -369.069885f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_14", 2005298, 5698522, 4, { -176.852295f, 398.044098f, -382.745087f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_15", 2005299, 5886628, 4, { -168.304993f, 394.044098f, -296.534088f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_16", 2005300, 5686456, 4, { 28.763180f, 209.979401f, 211.474701f }, 0.991760f, 0.000048f ); 
+    instance.registerEObj( "unknown_17", 2005301, 5686457, 4, { 100.159401f, 220.000000f, 272.267090f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_18", 2005293, 5889119, 4, { 28.122299f, 209.979401f, 220.050293f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_19", 2005294, 5889137, 4, { 111.924896f, 219.958694f, 271.931000f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "Liftterminal", 2005308, 0, 4, { 203.525803f, -28.163019f, 195.849503f }, 0.991760f, -1.570451f ); 
+    instance.registerEObj( "Liftterminal_1", 2005309, 0, 4, { 229.755005f, -59.269020f, 94.956909f }, 0.991760f, -1.570451f ); 
+    instance.registerEObj( "unknown_20", 2005306, 5815811, 4, { -359.609406f, -299.984009f, -249.805496f }, 0.991760f, 0.000048f ); 
+    instance.registerEObj( "Liftterminal_2", 2005307, 0, 4, { -351.717102f, -299.983887f, -250.003098f }, 0.991760f, -1.570451f ); 
+    instance.registerEObj( "Shortcut", 2000700, 0, 4, { -309.444885f, 400.000000f, -287.942108f }, 0.991760f, 0.000048f ); 
+    instance.registerEObj( "Entrance", 2000182, 5782651, 5, { -332.999207f, 400.000000f, -297.435211f }, 1.000000f, 0.000000f ); 
+      // States -> vf_lock_on (id: 11) vf_lock_of (id: 12) 
+
   }
 
-  void onInit( InstanceContentPtr instance ) override
+  void onUpdate( InstanceContent& instance, uint32_t currTime ) override
   {
 
   }
 
-  void onUpdate( InstanceContentPtr instance, uint32_t currTime ) override
-  {
-
-  }
-
-  void onEnterTerritory( InstanceContentPtr instance, Entity::Player& player, uint32_t eventId, uint16_t param1,
+  void onEnterTerritory( InstanceContent& instance, Entity::Player& player, uint32_t eventId, uint16_t param1,
                          uint16_t param2 ) override
   {
 
diff --git a/src/scripts/instances/questbattles/ASpectaclefortheAges.cpp b/src/scripts/instances/questbattles/ASpectaclefortheAges.cpp
index 0db030b7..782fad1e 100644
--- a/src/scripts/instances/questbattles/ASpectaclefortheAges.cpp
+++ b/src/scripts/instances/questbattles/ASpectaclefortheAges.cpp
@@ -9,52 +9,36 @@ class ASpectaclefortheAges :
 public:
   ASpectaclefortheAges() :
     Sapphire::ScriptAPI::InstanceContentScript( 5001 )
-  {
-  }
+  { }
 
-  void onInit( InstanceContentPtr instance ) override
+  void onInit( InstanceContent& instance ) override
   {
-    instance->registerEObj( "sgbg_w_qic_001_04a", 2006993, 6235274, 4, { -35.822102f, 298.899994f, -205.263199f },
-                            1.000000f, 0.000000f );
-    instance->registerEObj( "unknown_0", 2006952, 0, 4, { -35.712589f, 298.899994f, -204.878006f }, 1.000000f,
-                            0.000000f );
-    instance->registerEObj( "Exit", 2000139, 0, 4, { 556.049377f, 348.102509f, -752.435730f }, 1.000000f, 0.000000f );
-    instance->registerEObj( "Entrance", 2000182, 4600289, 5, { 523.532471f, 348.223389f, -736.685730f }, 1.000000f,
-                            0.000000f );
-    // States -> vf_lock_on vf_lock_of
-    instance->registerEObj( "unknown_1", 2002332, 0, 4, { 533.090881f, 348.691895f, -742.750916f }, 1.000000f,
-                            0.000000f );
-    instance->registerEObj( "unknown_2", 2002333, 0, 4, { 539.940430f, 348.836395f, -734.401489f }, 0.991760f,
-                            0.000048f );
-    instance->registerEObj( "unknown_3", 2000608, 3967803, 4, { 202.369598f, 257.761108f, 80.435272f }, 1.000000f,
-                            0.000000f );
-    instance->registerEObj( "unknown_4", 2000608, 3976993, 4, { 273.634705f, 254.600204f, 106.048500f }, 1.000000f,
-                            0.000000f );
-    instance->registerEObj( "unknown_5", 2000608, 3986797, 4, { 205.504898f, 246.188995f, 194.875702f }, 1.000000f,
-                            0.000000f );
-    instance->registerEObj( "unknown_6", 2000608, 3986798, 4, { 326.313385f, 239.193497f, 221.138901f }, 1.000000f,
-                            0.000000f );
-    instance->registerEObj( "unknown_7", 2000608, 2718481, 4, { 240.552307f, 302.769714f, -199.979996f }, 1.000000f,
-                            0.000000f );
-    instance->registerEObj( "unknown_8", 2000608, 4065433, 4, { 204.970001f, 302.119995f, -216.311600f }, 1.000000f,
-                            0.000000f );
-    instance->registerEObj( "unknown_9", 2000608, 2814617, 4, { 205.869995f, 302.219086f, -276.681396f }, 1.000000f,
-                            0.000000f );
-    instance->registerEObj( "unknown_10", 2000608, 2763112, 4, { -433.000000f, 211.007706f, -216.148605f }, 1.000000f,
-                            0.000000f );
-    instance->registerEObj( "unknown_11", 2000608, 4187649, 4, { -453.000000f, 211.000000f, -281.046600f }, 1.000000f,
-                            0.000000f );
-    instance->registerEObj( "unknown_12", 2000608, 4187961, 4, { -416.000000f, 210.788193f, -279.813812f }, 1.000000f,
-                            0.000000f );
+    instance.registerEObj( "sgbg_w_qic_001_04a", 2006993, 6235274, 4, { -35.822102f, 298.899994f, -205.263199f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_0", 2006952, 0, 4, { -35.712589f, 298.899994f, -204.878006f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "Exit", 2000139, 0, 4, { 556.049377f, 348.102509f, -752.435730f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "Entrance", 2000182, 4600289, 5, { 523.532471f, 348.223389f, -736.685730f }, 1.000000f, 0.000000f ); 
+      // States -> vf_lock_on (id: 11) vf_lock_of (id: 12) 
+    instance.registerEObj( "unknown_1", 2002332, 0, 4, { 533.090881f, 348.691895f, -742.750916f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_2", 2002333, 0, 4, { 539.940430f, 348.836395f, -734.401489f }, 0.991760f, 0.000048f ); 
+    instance.registerEObj( "unknown_3", 2000608, 3967803, 4, { 202.369598f, 257.761108f, 80.435272f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_4", 2000608, 3976993, 4, { 273.634705f, 254.600204f, 106.048500f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_5", 2000608, 3986797, 4, { 205.504898f, 246.188995f, 194.875702f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_6", 2000608, 3986798, 4, { 326.313385f, 239.193497f, 221.138901f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_7", 2000608, 2718481, 4, { 240.552307f, 302.769714f, -199.979996f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_8", 2000608, 4065433, 4, { 204.970001f, 302.119995f, -216.311600f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_9", 2000608, 2814617, 4, { 205.869995f, 302.219086f, -276.681396f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_10", 2000608, 2763112, 4, { -433.000000f, 211.007706f, -216.148605f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_11", 2000608, 4187649, 4, { -453.000000f, 211.000000f, -281.046600f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_12", 2000608, 4187961, 4, { -416.000000f, 210.788193f, -279.813812f }, 1.000000f, 0.000000f ); 
 
   }
 
-  void onUpdate( InstanceContentPtr instance, uint32_t currTime ) override
+  void onUpdate( InstanceContent& instance, uint32_t currTime ) override
   {
 
   }
 
-  void onEnterTerritory( InstanceContentPtr instance, Entity::Player& player, uint32_t eventId, uint16_t param1,
+  void onEnterTerritory( InstanceContent& instance, Entity::Player& player, uint32_t eventId, uint16_t param1,
                          uint16_t param2 ) override
   {
 
diff --git a/src/scripts/instances/questbattles/BloodDragoon.cpp b/src/scripts/instances/questbattles/BloodDragoon.cpp
index 6b4ff0e1..70333756 100644
--- a/src/scripts/instances/questbattles/BloodDragoon.cpp
+++ b/src/scripts/instances/questbattles/BloodDragoon.cpp
@@ -9,20 +9,49 @@ class BloodDragoon :
 public:
   BloodDragoon() :
     Sapphire::ScriptAPI::InstanceContentScript( 5021 )
+  { }
+
+  void onInit( InstanceContent& instance ) override
   {
+    instance.registerEObj( "sgvf_w_lvd_b0118", 2007896, 6803926, 4, { 3.704567f, -0.506593f, 225.007507f }, 1.000000f, 0.000000f ); 
+      // States -> vf_bextwall_on (id: 3) vf_bextwall_of (id: 4) 
+    instance.registerEObj( "sgvf_w_lvd_b0118_1", 2002872, 6805825, 4, { 4.867329f, -0.098875f, 275.309509f }, 1.000000f, 0.000000f ); 
+      // States -> vf_bextwall_on (id: 3) vf_bextwall_of (id: 4) 
+    instance.registerEObj( "unknown_0", 2002735, 0, 4, { 4.932000f, -0.320500f, 274.559509f }, 1.000000f, -0.000000f ); 
+    instance.registerEObj( "sgpl_w_transparent04", 2007899, 6802026, 4, { -28.138130f, -45.000000f, -32.892731f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "sgvf_w_lvd_b0118_2", 2002872, 6806775, 4, { -28.390051f, -45.148991f, 8.165403f }, 1.000000f, 0.000000f ); 
+      // States -> vf_bextwall_on (id: 3) vf_bextwall_of (id: 4) 
+    instance.registerEObj( "unknown_1", 2002735, 0, 4, { -28.551781f, -45.222500f, 5.617400f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_2", 2007903, 6773193, 4, { -18.557831f, -44.964081f, -0.932714f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_3", 2007904, 6773192, 4, { -30.723289f, -45.025860f, 1.953206f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_4", 2007905, 6773194, 4, { -42.383171f, -44.962471f, -5.125507f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_5", 2008196, 0, 4, { -37.125240f, -45.059940f, -9.414856f }, 0.991760f, 0.000048f ); 
+    instance.registerEObj( "unknown_6", 2008310, 6879064, 4, { -23.194941f, -45.000000f, -3.016589f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "sgbg_e3d2_d2_mete1", 2007457, 7008362, 4, { -28.500000f, -45.000000f, -14.000000f }, 1.000000f, -0.000000f ); 
+      // States -> b4_mete_off_01 (id: 1) b4_mete_off_02 (id: 2) b4_mete_on_01 (id: 3) b4_mete_off_03 (id: 4) b4_mete_on_02 (id: 5) b4_mete_on_03 (id: 6) b4_mete_on_04 (id: 7) b4_mete_on_05 (id: 8) b4_mete_on_06 (id: 9) b4_mete_fdout (id: 18) 
+    instance.registerEObj( "sgvf_w_lvd_b0118_3", 2002872, 6806776, 4, { 24.174879f, -167.392899f, -453.406586f }, 1.000000f, 0.000000f ); 
+      // States -> vf_bextwall_on (id: 3) vf_bextwall_of (id: 4) 
+    instance.registerEObj( "unknown_7", 2002735, 0, 4, { 24.419100f, -167.350601f, -455.580109f }, 1.000000f, -0.000000f ); 
+    instance.registerEObj( "unknown_8", 2007894, 6525794, 4, { -36.023540f, 4.305134f, 406.807404f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_9", 2007895, 6525806, 4, { 4.331786f, 1.464790f, 289.456207f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_10", 2007897, 6540078, 4, { -49.525101f, -45.174839f, 117.206200f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_11", 2007898, 6540093, 4, { -14.321400f, -42.200001f, 42.272179f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_12", 2007900, 6525664, 4, { -19.668949f, -188.037003f, -235.950302f }, 0.991760f, 0.000048f ); 
+    instance.registerEObj( "unknown_13", 2007901, 6525665, 4, { 25.192631f, -172.808502f, -362.417114f }, 0.991760f, 0.000048f ); 
+    instance.registerEObj( "unknown_14", 2007902, 6525180, 4, { 23.936859f, -172.125198f, -405.882996f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "Entrance", 2000182, 6797774, 5, { -23.838560f, 8.289917f, 482.742615f }, 1.000000f, 0.000000f ); 
+      // States -> vf_lock_on (id: 11) vf_lock_of (id: 12) 
+    instance.registerEObj( "Shortcut", 2000700, 0, 4, { -20.252930f, 8.134582f, 489.817200f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "Exit", 2000139, 0, 4, { 23.942671f, -167.617996f, -486.860809f }, 0.991760f, 0.000048f ); 
+
   }
 
-  void onInit( InstanceContentPtr instance ) override
+  void onUpdate( InstanceContent& instance, uint32_t currTime ) override
   {
 
   }
 
-  void onUpdate( InstanceContentPtr instance, uint32_t currTime ) override
-  {
-
-  }
-
-  void onEnterTerritory( InstanceContentPtr instance, Entity::Player& player, uint32_t eventId, uint16_t param1,
+  void onEnterTerritory( InstanceContent& instance, Entity::Player& player, uint32_t eventId, uint16_t param1,
                          uint16_t param2 ) override
   {
 
diff --git a/src/scripts/instances/questbattles/BloodontheDeck.cpp b/src/scripts/instances/questbattles/BloodontheDeck.cpp
index 7d1049db..16e3bb8d 100644
--- a/src/scripts/instances/questbattles/BloodontheDeck.cpp
+++ b/src/scripts/instances/questbattles/BloodontheDeck.cpp
@@ -9,23 +9,21 @@ class BloodontheDeck :
 public:
   BloodontheDeck() :
     Sapphire::ScriptAPI::InstanceContentScript( 5009 )
-  {
-  }
+  { }
 
-  void onInit( InstanceContentPtr instance ) override
+  void onInit( InstanceContent& instance ) override
   {
-    instance->registerEObj( "sgbg_w_qic_004_01a", 2007457, 6904219, 4, { 5.684449f, 16.347240f, 3.782750f }, 1.000000f,
-                            0.000000f );
-    // States -> cage01_close_01 cage01_open_01 cage01_open_02
+    instance.registerEObj( "sgbg_w_qic_004_01a", 2007457, 6904219, 4, { 5.684449f, 16.347240f, 3.782750f }, 1.000000f, 0.000000f ); 
+      // States -> cage01_close_01 (id: 8) cage01_open_01 (id: 10) cage01_open_02 (id: 11) 
 
   }
 
-  void onUpdate( InstanceContentPtr instance, uint32_t currTime ) override
+  void onUpdate( InstanceContent& instance, uint32_t currTime ) override
   {
 
   }
 
-  void onEnterTerritory( InstanceContentPtr instance, Entity::Player& player, uint32_t eventId, uint16_t param1,
+  void onEnterTerritory( InstanceContent& instance, Entity::Player& player, uint32_t eventId, uint16_t param1,
                          uint16_t param2 ) override
   {
 
diff --git a/src/scripts/instances/questbattles/CuriousGorgeMeetsHisMatch.cpp b/src/scripts/instances/questbattles/CuriousGorgeMeetsHisMatch.cpp
index 8b715e5a..4ffa7140 100644
--- a/src/scripts/instances/questbattles/CuriousGorgeMeetsHisMatch.cpp
+++ b/src/scripts/instances/questbattles/CuriousGorgeMeetsHisMatch.cpp
@@ -9,25 +9,22 @@ class CuriousGorgeMeetsHisMatch :
 public:
   CuriousGorgeMeetsHisMatch() :
     Sapphire::ScriptAPI::InstanceContentScript( 5013 )
-  {
-  }
+  { }
 
-  void onInit( InstanceContentPtr instance ) override
+  void onInit( InstanceContent& instance ) override
   {
-    instance->registerEObj( "Summoningbell", 2000401, 4260827, 4, { 14.143430f, 5.238082f, 13.664930f }, 1.000000f,
-                            0.000000f );
-    // States -> vf_rtbell_on
-    instance->registerEObj( "Teamboard", 2009097, 4302533, 4, { 15.508660f, 6.051773f, -14.767720f }, 1.000000f,
-                            0.000000f );
+    instance.registerEObj( "Summoningbell", 2000401, 4260827, 4, { 14.143430f, 5.238082f, 13.664930f }, 1.000000f, 0.000000f ); 
+      // States -> vf_rtbell_on (id: 10) 
+    instance.registerEObj( "Teamboard", 2009097, 4302533, 4, { 15.508660f, 6.051773f, -14.767720f }, 1.000000f, 0.000000f ); 
 
   }
 
-  void onUpdate( InstanceContentPtr instance, uint32_t currTime ) override
+  void onUpdate( InstanceContent& instance, uint32_t currTime ) override
   {
 
   }
 
-  void onEnterTerritory( InstanceContentPtr instance, Entity::Player& player, uint32_t eventId, uint16_t param1,
+  void onEnterTerritory( InstanceContent& instance, Entity::Player& player, uint32_t eventId, uint16_t param1,
                          uint16_t param2 ) override
   {
 
diff --git a/src/scripts/instances/questbattles/DarkwingDragon.cpp b/src/scripts/instances/questbattles/DarkwingDragon.cpp
index cffe80cb..37b44c5e 100644
--- a/src/scripts/instances/questbattles/DarkwingDragon.cpp
+++ b/src/scripts/instances/questbattles/DarkwingDragon.cpp
@@ -9,20 +9,32 @@ class DarkwingDragon :
 public:
   DarkwingDragon() :
     Sapphire::ScriptAPI::InstanceContentScript( 5016 )
+  { }
+
+  void onInit( InstanceContent& instance ) override
   {
+    instance.registerEObj( "unknown_0", 2008290, 6894789, 4, { 375.272888f, -4.893838f, 290.605011f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "Yol", 2008330, 0, 4, { 466.995514f, 21.157949f, -328.188995f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "Ovoo", 2008289, 6872570, 4, { 354.000000f, -0.790344f, 296.500000f }, 0.991760f, 0.000048f ); 
+      // States -> land_def (id: 3) land_def_anim (id: 4) land_on (id: 5) land_on_anim (id: 6) land_on_omen (id: 7) land_on_omen (id: 8) land_off (id: 19) land_off_anim (id: 20) 
+    instance.registerEObj( "unknown_1", 2004967, 0, 4, { -187.899506f, 1.653982f, 760.298279f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "sgbg_e3f3_q1_gmc02", 2007457, 7653044, 4, { -223.010605f, 3.178310f, 519.218811f }, 0.991760f, 0.000048f ); 
+      // States -> smto_on (id: 19) smto_c_on (id: 3) smto_off (id: 1) smto_off_anim (id: 2) smto_c_off (id: 4) smto_fdout (id: 18) 
+    instance.registerEObj( "sgvf_w_lvd_b1472", 2007457, 7653055, 4, { -186.572403f, 4.189117f, 532.602173f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "sgvf_w_lvd_b1472_1", 2007457, 7653056, 4, { -186.602600f, 6.933841f, 568.871582f }, 0.991760f, 0.000048f ); 
+    instance.registerEObj( "sgvf_w_lvd_b1199", 2007457, 7669017, 4, { -186.572403f, 5.921182f, 550.737427f }, 1.000000f, 0.000000f ); 
+      // States -> circle_off (id: 3) circle_off (id: 4) circle_on (id: 5) circle_on (id: 6) 
+    instance.registerEObj( "sgvf_w_lvd_b1199_1", 2007457, 7632420, 4, { -223.165497f, 2.660000f, 519.000000f }, 1.000000f, 0.000000f ); 
+      // States -> circle_off (id: 3) circle_off (id: 4) circle_on (id: 5) circle_on (id: 6) 
+
   }
 
-  void onInit( InstanceContentPtr instance ) override
+  void onUpdate( InstanceContent& instance, uint32_t currTime ) override
   {
 
   }
 
-  void onUpdate( InstanceContentPtr instance, uint32_t currTime ) override
-  {
-
-  }
-
-  void onEnterTerritory( InstanceContentPtr instance, Entity::Player& player, uint32_t eventId, uint16_t param1,
+  void onEnterTerritory( InstanceContent& instance, Entity::Player& player, uint32_t eventId, uint16_t param1,
                          uint16_t param2 ) override
   {
 
diff --git a/src/scripts/instances/questbattles/EmissaryoftheDawn.cpp b/src/scripts/instances/questbattles/EmissaryoftheDawn.cpp
new file mode 100644
index 00000000..a3f96cc3
--- /dev/null
+++ b/src/scripts/instances/questbattles/EmissaryoftheDawn.cpp
@@ -0,0 +1,36 @@
+#include <ScriptObject.h>
+#include <Territory/InstanceContent.h>
+
+using namespace Sapphire;
+
+class EmissaryoftheDawn :
+  public Sapphire::ScriptAPI::InstanceContentScript
+{
+public:
+  EmissaryoftheDawn() :
+    Sapphire::ScriptAPI::InstanceContentScript( 5025 )
+  { }
+
+  void onInit( InstanceContent& instance ) override
+  {
+    instance.registerEObj( "sgbg_e3e9_a1_grk01", 2007457, 7463402, 4, { -7.066119f, -0.015320f, 4.851629f }, 0.991760f, 0.000048f ); 
+    instance.registerEObj( "WoundedPopularis", 2009561, 7508935, 4, { -6.516740f, -0.015320f, 6.499700f }, 0.991760f, 0.000048f ); 
+    instance.registerEObj( "sgvf_w_lvd_b1199", 2007457, 7420739, 4, { -0.523771f, 0.000000f, 2.522100f }, 1.000000f, 0.000000f ); 
+      // States -> circle_off (id: 3) circle_off (id: 4) circle_on (id: 5) circle_on (id: 6) 
+
+  }
+
+  void onUpdate( InstanceContent& instance, uint32_t currTime ) override
+  {
+
+  }
+
+  void onEnterTerritory( InstanceContent& instance, Entity::Player& player, uint32_t eventId, uint16_t param1,
+                         uint16_t param2 ) override
+  {
+
+  }
+
+};
+
+EXPOSE_SCRIPT( EmissaryoftheDawn );
\ No newline at end of file
diff --git a/src/scripts/instances/questbattles/InThalsName.cpp b/src/scripts/instances/questbattles/InThalsName.cpp
index 0b982343..e5c38fc4 100644
--- a/src/scripts/instances/questbattles/InThalsName.cpp
+++ b/src/scripts/instances/questbattles/InThalsName.cpp
@@ -9,23 +9,21 @@ class InThalsName :
 public:
   InThalsName() :
     Sapphire::ScriptAPI::InstanceContentScript( 5006 )
-  {
-  }
+  { }
 
-  void onInit( InstanceContentPtr instance ) override
+  void onInit( InstanceContent& instance ) override
   {
-    instance->registerEObj( "unknown_0", 2004364, 0, 4, { -93.101089f, -13.129550f, 6.845694f }, 1.000000f, 0.000000f );
-    instance->registerEObj( "Companychest", 2000470, 4255822, 4, { 128.974701f, 5.067919f, -40.913502f }, 1.000000f,
-                            -0.343160f );
+    instance.registerEObj( "unknown_0", 2004364, 0, 4, { -93.101089f, -13.129550f, 6.845694f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "Companychest", 2000470, 4255822, 4, { 128.974701f, 5.067919f, -40.913502f }, 1.000000f, -0.343160f ); 
 
   }
 
-  void onUpdate( InstanceContentPtr instance, uint32_t currTime ) override
+  void onUpdate( InstanceContent& instance, uint32_t currTime ) override
   {
 
   }
 
-  void onEnterTerritory( InstanceContentPtr instance, Entity::Player& player, uint32_t eventId, uint16_t param1,
+  void onEnterTerritory( InstanceContent& instance, Entity::Player& player, uint32_t eventId, uint16_t param1,
                          uint16_t param2 ) override
   {
 
diff --git a/src/scripts/instances/questbattles/InterdimensionalRift.cpp b/src/scripts/instances/questbattles/InterdimensionalRift.cpp
index 57e116ac..fed42b04 100644
--- a/src/scripts/instances/questbattles/InterdimensionalRift.cpp
+++ b/src/scripts/instances/questbattles/InterdimensionalRift.cpp
@@ -9,20 +9,29 @@ class InterdimensionalRift :
 public:
   InterdimensionalRift() :
     Sapphire::ScriptAPI::InstanceContentScript( 5023 )
+  { }
+
+  void onInit( InstanceContent& instance ) override
   {
+    instance.registerEObj( "sgvf_z3o1_b1212", 2007457, 6944598, 4, { -14.915330f, -256.500000f, 385.545197f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "sgvf_z3o1_b1212_1", 2007457, 6944604, 4, { -280.000000f, -239.750000f, 196.500000f }, 1.000000f, -0.000000f ); 
+    instance.registerEObj( "sgvf_z3o1_b1212_2", 2007457, 6944605, 4, { -255.313797f, -226.000000f, -187.394394f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "sgvf_z3o1_b1212_3", 2007457, 6944606, 4, { -246.604706f, -226.000000f, -192.211807f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "Exit", 2000046, 0, 4, { 843.573914f, 427.000000f, 948.472290f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "Exit_1", 2000046, 0, 4, { -207.965302f, -224.000000f, -147.401306f }, 0.991760f, 0.000048f ); 
+    instance.registerEObj( "unknown_0", 2007457, 6889957, 4, { 1.846330f, -271.700012f, 428.457886f }, 0.991760f, 0.000049f ); 
+    instance.registerEObj( "Matterrelocationdevice", 2008501, 6938814, 4, { -16.956310f, -256.250000f, 382.407898f }, 0.991760f, 0.000048f ); 
+    instance.registerEObj( "sgbg_z3o1_a1_cub01", 2007457, 6954336, 4, { -7.878613f, -256.250000f, 385.557495f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "Matterrelocationdevice_1", 2000048, 6938826, 4, { -286.946014f, -239.764999f, 192.797699f }, 0.991760f, 0.000048f ); 
+
   }
 
-  void onInit( InstanceContentPtr instance ) override
+  void onUpdate( InstanceContent& instance, uint32_t currTime ) override
   {
 
   }
 
-  void onUpdate( InstanceContentPtr instance, uint32_t currTime ) override
-  {
-
-  }
-
-  void onEnterTerritory( InstanceContentPtr instance, Entity::Player& player, uint32_t eventId, uint16_t param1,
+  void onEnterTerritory( InstanceContent& instance, Entity::Player& player, uint32_t eventId, uint16_t param1,
                          uint16_t param2 ) override
   {
 
diff --git a/src/scripts/instances/questbattles/ItsProbablyaTrap.cpp b/src/scripts/instances/questbattles/ItsProbablyaTrap.cpp
index a2eac052..918bad75 100644
--- a/src/scripts/instances/questbattles/ItsProbablyaTrap.cpp
+++ b/src/scripts/instances/questbattles/ItsProbablyaTrap.cpp
@@ -9,20 +9,27 @@ class ItsProbablyaTrap :
 public:
   ItsProbablyaTrap() :
     Sapphire::ScriptAPI::InstanceContentScript( 5005 )
+  { }
+
+  void onInit( InstanceContent& instance ) override
   {
+    instance.registerEObj( "unknown_0", 2000608, 6538194, 4, { -27.571140f, -3.000000f, 46.619968f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_1", 2000608, 6538193, 4, { -28.307659f, 3.999977f, 61.762589f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "ClanHuntboard", 2008655, 6422886, 4, { -31.520060f, 0.076252f, -43.853790f }, 0.991760f, 0.000048f ); 
+    instance.registerEObj( "sgbg_w_qic_004_03a", 2002872, 6799085, 4, { -79.087517f, -3.006042f, 41.336670f }, 0.991760f, 0.000048f ); 
+    instance.registerEObj( "sgbg_w_qic_004_03a_1", 2002872, 6799087, 4, { -61.668732f, -3.014119f, 84.855003f }, 0.991760f, -1.567030f ); 
+    instance.registerEObj( "unknown_2", 2007457, 6611234, 4, { 137.621094f, 14.816470f, 92.484863f }, 0.991760f, 0.000048f ); 
+    instance.registerEObj( "unknown_3", 2007457, 6538193, 4, { -27.894131f, 3.999977f, 61.384491f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_4", 2007457, 6538194, 4, { -28.259020f, -3.000000f, 46.489510f }, 1.000000f, 0.000000f ); 
+
   }
 
-  void onInit( InstanceContentPtr instance ) override
+  void onUpdate( InstanceContent& instance, uint32_t currTime ) override
   {
 
   }
 
-  void onUpdate( InstanceContentPtr instance, uint32_t currTime ) override
-  {
-
-  }
-
-  void onEnterTerritory( InstanceContentPtr instance, Entity::Player& player, uint32_t eventId, uint16_t param1,
+  void onEnterTerritory( InstanceContent& instance, Entity::Player& player, uint32_t eventId, uint16_t param1,
                          uint16_t param2 ) override
   {
 
diff --git a/src/scripts/instances/questbattles/MatsubaMayhem.cpp b/src/scripts/instances/questbattles/MatsubaMayhem.cpp
index 878d28f6..0db75ab7 100644
--- a/src/scripts/instances/questbattles/MatsubaMayhem.cpp
+++ b/src/scripts/instances/questbattles/MatsubaMayhem.cpp
@@ -9,20 +9,27 @@ class MatsubaMayhem :
 public:
   MatsubaMayhem() :
     Sapphire::ScriptAPI::InstanceContentScript( 5011 )
+  { }
+
+  void onInit( InstanceContent& instance ) override
   {
+    instance.registerEObj( "unknown_0", 2000608, 6538194, 4, { -27.571140f, -3.000000f, 46.619968f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_1", 2000608, 6538193, 4, { -28.307659f, 3.999977f, 61.762589f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "ClanHuntboard", 2008655, 6422886, 4, { -31.520060f, 0.076252f, -43.853790f }, 0.991760f, 0.000048f ); 
+    instance.registerEObj( "sgbg_w_qic_004_03a", 2002872, 6799085, 4, { -79.087517f, -3.006042f, 41.336670f }, 0.991760f, 0.000048f ); 
+    instance.registerEObj( "sgbg_w_qic_004_03a_1", 2002872, 6799087, 4, { -61.668732f, -3.014119f, 84.855003f }, 0.991760f, -1.567030f ); 
+    instance.registerEObj( "unknown_2", 2007457, 6611234, 4, { 137.621094f, 14.816470f, 92.484863f }, 0.991760f, 0.000048f ); 
+    instance.registerEObj( "unknown_3", 2007457, 6538193, 4, { -27.894131f, 3.999977f, 61.384491f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_4", 2007457, 6538194, 4, { -28.259020f, -3.000000f, 46.489510f }, 1.000000f, 0.000000f ); 
+
   }
 
-  void onInit( InstanceContentPtr instance ) override
+  void onUpdate( InstanceContent& instance, uint32_t currTime ) override
   {
 
   }
 
-  void onUpdate( InstanceContentPtr instance, uint32_t currTime ) override
-  {
-
-  }
-
-  void onEnterTerritory( InstanceContentPtr instance, Entity::Player& player, uint32_t eventId, uint16_t param1,
+  void onEnterTerritory( InstanceContent& instance, Entity::Player& player, uint32_t eventId, uint16_t param1,
                          uint16_t param2 ) override
   {
 
diff --git a/src/scripts/instances/questbattles/Naadam.cpp b/src/scripts/instances/questbattles/Naadam.cpp
index 909f85fa..d682f424 100644
--- a/src/scripts/instances/questbattles/Naadam.cpp
+++ b/src/scripts/instances/questbattles/Naadam.cpp
@@ -9,20 +9,32 @@ class Naadam :
 public:
   Naadam() :
     Sapphire::ScriptAPI::InstanceContentScript( 5008 )
+  { }
+
+  void onInit( InstanceContent& instance ) override
   {
+    instance.registerEObj( "unknown_0", 2008290, 6894789, 4, { 375.272888f, -4.893838f, 290.605011f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "Yol", 2008330, 0, 4, { 466.995514f, 21.157949f, -328.188995f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "Ovoo", 2008289, 6872570, 4, { 354.000000f, -0.790344f, 296.500000f }, 0.991760f, 0.000048f ); 
+      // States -> land_def (id: 3) land_def_anim (id: 4) land_on (id: 5) land_on_anim (id: 6) land_on_omen (id: 7) land_on_omen (id: 8) land_off (id: 19) land_off_anim (id: 20) 
+    instance.registerEObj( "unknown_1", 2004967, 0, 4, { -187.899506f, 1.653982f, 760.298279f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "sgbg_e3f3_q1_gmc02", 2007457, 7653044, 4, { -223.010605f, 3.178310f, 519.218811f }, 0.991760f, 0.000048f ); 
+      // States -> smto_on (id: 19) smto_c_on (id: 3) smto_off (id: 1) smto_off_anim (id: 2) smto_c_off (id: 4) smto_fdout (id: 18) 
+    instance.registerEObj( "sgvf_w_lvd_b1472", 2007457, 7653055, 4, { -186.572403f, 4.189117f, 532.602173f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "sgvf_w_lvd_b1472_1", 2007457, 7653056, 4, { -186.602600f, 6.933841f, 568.871582f }, 0.991760f, 0.000048f ); 
+    instance.registerEObj( "sgvf_w_lvd_b1199", 2007457, 7669017, 4, { -186.572403f, 5.921182f, 550.737427f }, 1.000000f, 0.000000f ); 
+      // States -> circle_off (id: 3) circle_off (id: 4) circle_on (id: 5) circle_on (id: 6) 
+    instance.registerEObj( "sgvf_w_lvd_b1199_1", 2007457, 7632420, 4, { -223.165497f, 2.660000f, 519.000000f }, 1.000000f, 0.000000f ); 
+      // States -> circle_off (id: 3) circle_off (id: 4) circle_on (id: 5) circle_on (id: 6) 
+
   }
 
-  void onInit( InstanceContentPtr instance ) override
+  void onUpdate( InstanceContent& instance, uint32_t currTime ) override
   {
 
   }
 
-  void onUpdate( InstanceContentPtr instance, uint32_t currTime ) override
-  {
-
-  }
-
-  void onEnterTerritory( InstanceContentPtr instance, Entity::Player& player, uint32_t eventId, uint16_t param1,
+  void onEnterTerritory( InstanceContent& instance, Entity::Player& player, uint32_t eventId, uint16_t param1,
                          uint16_t param2 ) override
   {
 
diff --git a/src/scripts/instances/questbattles/OneLifeforOneWorld.cpp b/src/scripts/instances/questbattles/OneLifeforOneWorld.cpp
index 9a4ef284..2da03f1b 100644
--- a/src/scripts/instances/questbattles/OneLifeforOneWorld.cpp
+++ b/src/scripts/instances/questbattles/OneLifeforOneWorld.cpp
@@ -9,26 +9,24 @@ class OneLifeforOneWorld :
 public:
   OneLifeforOneWorld() :
     Sapphire::ScriptAPI::InstanceContentScript( 5003 )
-  {
-  }
+  { }
 
-  void onInit( InstanceContentPtr instance ) override
+  void onInit( InstanceContent& instance ) override
   {
-    instance->registerEObj( "Entrance", 2000182, 4177874, 5, { -16.000000f, 0.000000f, 0.000000f }, 1.000000f,
-                            0.000000f );
-    // States -> vf_lock_on vf_lock_of
-    instance->registerEObj( "Exit", 2000139, 0, 4, { 16.000000f, 0.000000f, 0.000000f }, 1.000000f, 0.000000f );
-    instance->registerEObj( "unknown_0", 2007452, 0, 4, { 0.000000f, 0.000000f, 0.000000f }, 1.000000f, 0.000000f );
-    instance->registerEObj( "BladeofLight", 2007454, 0, 4, { 0.000000f, 0.000000f, 11.300000f }, 0.991760f, 0.000048f );
+    instance.registerEObj( "Entrance", 2000182, 4177874, 5, { -16.000000f, 0.000000f, 0.000000f }, 1.000000f, 0.000000f ); 
+      // States -> vf_lock_on (id: 11) vf_lock_of (id: 12) 
+    instance.registerEObj( "Exit", 2000139, 0, 4, { 16.000000f, 0.000000f, 0.000000f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_0", 2007452, 0, 4, { 0.000000f, 0.000000f, 0.000000f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "BladeofLight", 2007454, 0, 4, { 0.000000f, 0.000000f, 11.300000f }, 0.991760f, 0.000048f ); 
 
   }
 
-  void onUpdate( InstanceContentPtr instance, uint32_t currTime ) override
+  void onUpdate( InstanceContent& instance, uint32_t currTime ) override
   {
 
   }
 
-  void onEnterTerritory( InstanceContentPtr instance, Entity::Player& player, uint32_t eventId, uint16_t param1,
+  void onEnterTerritory( InstanceContent& instance, Entity::Player& player, uint32_t eventId, uint16_t param1,
                          uint16_t param2 ) override
   {
 
diff --git a/src/scripts/instances/questbattles/OurCompromise.cpp b/src/scripts/instances/questbattles/OurCompromise.cpp
index b76fe846..19427e42 100644
--- a/src/scripts/instances/questbattles/OurCompromise.cpp
+++ b/src/scripts/instances/questbattles/OurCompromise.cpp
@@ -9,20 +9,21 @@ class OurCompromise :
 public:
   OurCompromise() :
     Sapphire::ScriptAPI::InstanceContentScript( 5020 )
+  { }
+
+  void onInit( InstanceContent& instance ) override
   {
+    instance.registerEObj( "sgpl_evt_300_jobdark03", 2007457, 6941254, 4, { -613.766602f, 59.266399f, -460.085205f }, 1.000000f, 0.294434f ); 
+      // States -> vfx_on (id: 49) vfx_off (id: 50) 
+
   }
 
-  void onInit( InstanceContentPtr instance ) override
+  void onUpdate( InstanceContent& instance, uint32_t currTime ) override
   {
 
   }
 
-  void onUpdate( InstanceContentPtr instance, uint32_t currTime ) override
-  {
-
-  }
-
-  void onEnterTerritory( InstanceContentPtr instance, Entity::Player& player, uint32_t eventId, uint16_t param1,
+  void onEnterTerritory( InstanceContent& instance, Entity::Player& player, uint32_t eventId, uint16_t param1,
                          uint16_t param2 ) override
   {
 
diff --git a/src/scripts/instances/questbattles/OurUnsungHeroes.cpp b/src/scripts/instances/questbattles/OurUnsungHeroes.cpp
index 8972d928..e3805b4e 100644
--- a/src/scripts/instances/questbattles/OurUnsungHeroes.cpp
+++ b/src/scripts/instances/questbattles/OurUnsungHeroes.cpp
@@ -9,105 +9,65 @@ class OurUnsungHeroes :
 public:
   OurUnsungHeroes() :
     Sapphire::ScriptAPI::InstanceContentScript( 5014 )
-  {
-  }
+  { }
 
-  void onInit( InstanceContentPtr instance ) override
+  void onInit( InstanceContent& instance ) override
   {
-    instance->registerEObj( "sgvf_w_lvd_b0118", 2002872, 6159060, 4, { -199.881607f, 11.999990f, -280.139313f },
-                            0.991760f, 0.000048f );
-    // States -> vf_bextwall_on vf_bextwall_of
-    instance->registerEObj( "unknown_0", 2002735, 0, 4, { -200.009201f, 12.116690f, -280.037506f }, 0.991760f,
-                            -1.570451f );
-    instance->registerEObj( "sgvf_w_lvd_b0118_1", 2003373, 6159063, 4, { -238.928894f, 12.100000f, -279.455688f },
-                            1.000000f, 0.000000f );
-    // States -> vf_bextwall_on vf_bextwall_of
-    instance->registerEObj( "unknown_1", 2006848, 0, 4, { -227.145905f, 11.978270f, -284.676086f }, 0.991760f,
-                            0.000048f );
-    instance->registerEObj( "sgvf_w_lvd_b0118_2", 2002872, 6158913, 4, { -262.326813f, -278.432312f, -241.982407f },
-                            1.000000f, -0.424392f );
-    // States -> vf_bextwall_on vf_bextwall_of
-    instance->registerEObj( "unknown_2", 2002735, 0, 4, { -261.926788f, -278.586792f, -242.680695f }, 0.800000f,
-                            -0.511830f );
-    instance->registerEObj( "sgvf_w_lvd_b0118_3", 2006850, 6161174, 4, { -281.669495f, -278.783203f, -207.507401f },
-                            1.000000f, 0.000000f );
-    // States -> vf_bextwall_on vf_bextwall_of
-    instance->registerEObj( "unknown_3", 2006851, 0, 4, { -287.205292f, -278.675507f, -219.428604f }, 0.991760f,
-                            0.000048f );
-    instance->registerEObj( "unknown_4", 2006852, 0, 4, { -285.709991f, -278.675507f, -222.022598f }, 0.991760f,
-                            0.000048f );
-    instance->registerEObj( "unknown_5", 2006853, 0, 4, { -284.489288f, -278.675507f, -217.719604f }, 0.991760f,
-                            0.000048f );
-    instance->registerEObj( "unknown_6", 2006854, 0, 4, { -282.932892f, -278.675507f, -220.527298f }, 0.991760f,
-                            0.000048f );
-    instance->registerEObj( "sgvf_w_lvd_b0118_4", 2002872, 6177873, 4, { 236.391098f, -854.348206f, 388.999908f },
-                            0.991760f, -0.424392f );
-    // States -> vf_bextwall_on vf_bextwall_of
-    instance->registerEObj( "unknown_7", 2002735, 0, 4, { 236.928299f, -854.301025f, 388.437988f }, 0.991760f,
-                            -0.272621f );
-    instance->registerEObj( "unknown_8", 2006855, 0, 4, { 245.654495f, -854.500000f, 408.186615f }, 0.991760f,
-                            0.000048f );
-    instance->registerEObj( "unknown_9", 2006856, 0, 4, { 245.602402f, -854.500000f, 408.203186f }, 0.991760f,
-                            0.000048f );
-    instance->registerEObj( "unknown_10", 2006857, 0, 4, { 217.570694f, -854.500000f, 414.970306f }, 0.991760f,
-                            0.000048f );
-    instance->registerEObj( "unknown_11", 2006867, 0, 4, { 238.696899f, -854.398376f, 400.472900f }, 0.991760f,
-                            0.000048f );
-    instance->registerEObj( "unknown_12", 2006868, 0, 4, { 225.070404f, -854.520508f, 402.559692f }, 0.991760f,
-                            0.000048f );
-    instance->registerEObj( "unknown_13", 2007000, 6217077, 4, { 230.880493f, -854.459717f, 414.889313f }, 1.000000f,
-                            0.000000f );
-    instance->registerEObj( "Guardianstatue", 2006976, 0, 4, { 231.118698f, -852.800171f, 414.090088f }, 1.000000f,
-                            0.000000f );
-    instance->registerEObj( "Guardianstatue_1", 2006977, 0, 4, { 231.113907f, -852.801514f, 414.085785f }, 1.000000f,
-                            0.000000f );
-    instance->registerEObj( "Guardianstatue_2", 2006978, 0, 4, { 231.101898f, -852.801514f, 414.089111f }, 1.000000f,
-                            0.000000f );
-    instance->registerEObj( "Entrance", 2000182, 6159123, 5, { 73.070312f, 100.000000f, -376.644592f }, 0.991760f,
-                            0.000048f );
-    // States -> vf_lock_on vf_lock_of
-    instance->registerEObj( "Shortcut", 2000700, 0, 4, { 65.173607f, 100.000000f, -382.604614f }, 1.000000f,
-                            0.000000f );
-    instance->registerEObj( "Exit", 2000139, 0, 4, { 228.895599f, -854.546082f, 420.274109f }, 0.991760f, -0.919204f );
-    instance->registerEObj( "unknown_14", 2006825, 6173434, 4, { -45.716091f, 57.999512f, -311.654205f }, 0.991760f,
-                            0.000048f );
-    instance->registerEObj( "unknown_15", 2006826, 6173447, 4, { -174.685303f, 6.271362f, -302.651215f }, 0.991760f,
-                            0.000048f );
-    instance->registerEObj( "unknown_16", 2006827, 6173458, 4, { -174.227493f, 6.973328f, -299.721588f }, 0.991760f,
-                            0.000048f );
-    instance->registerEObj( "unknown_17", 2006828, 6155704, 4, { -74.714241f, 58.247410f, -327.713287f }, 0.991760f,
-                            0.000048f );
-    instance->registerEObj( "unknown_18", 2006829, 6184879, 4, { -170.839996f, -252.613205f, -408.640503f }, 0.991760f,
-                            0.000048f );
-    instance->registerEObj( "unknown_19", 2006830, 6184881, 4, { -163.902496f, -272.319397f, -294.726501f }, 1.000000f,
-                            0.000000f );
-    instance->registerEObj( "unknown_20", 2006831, 6162191, 4, { -243.942093f, -280.660706f, -273.564789f }, 1.000000f,
-                            -0.000000f );
-    instance->registerEObj( "Stoneoftransference", 2006834, 6173379, 4, { -295.032104f, -273.037506f, -185.082397f },
-                            1.000000f, 0.000000f );
-    instance->registerEObj( "unknown_21", 2006832, 6177949, 4, { 166.001007f, -844.999817f, 265.365814f }, 1.000000f,
-                            0.000000f );
-    instance->registerEObj( "unknown_22", 2006833, 6177947, 4, { 226.690002f, -856.247681f, 262.675415f }, 1.000000f,
-                            0.000000f );
-    instance->registerEObj( "unknown_23", 2006835, 6202096, 4, { 255.720200f, -865.873474f, 319.853210f }, 1.000000f,
-                            0.000000f );
-    instance->registerEObj( "sgbg_w_qic_004_03a", 2002872, 6904891, 4, { 236.391205f, -854.348083f, 388.999908f },
-                            0.991760f, -0.424392f );
-    instance->registerEObj( "unknown_24", 2002735, 0, 4, { 236.928299f, -854.301025f, 388.437988f }, 0.991760f,
-                            -0.272621f );
-    instance->registerEObj( "sgbg_w_qic_004_03a_1", 2007457, 6904603, 4, { 249.195099f, -856.351624f, 343.526215f },
-                            0.991760f, 0.000048f );
-    instance->registerEObj( "unknown_25", 2007457, 6217077, 4, { 233.497299f, -854.546021f, 414.179413f }, 1.000000f,
-                            0.000000f );
+    instance.registerEObj( "sgvf_w_lvd_b0118", 2002872, 6159060, 4, { -199.881607f, 11.999990f, -280.139313f }, 0.991760f, 0.000048f ); 
+      // States -> vf_bextwall_on (id: 3) vf_bextwall_of (id: 4) 
+    instance.registerEObj( "unknown_0", 2002735, 0, 4, { -200.009201f, 12.116690f, -280.037506f }, 0.991760f, -1.570451f ); 
+    instance.registerEObj( "sgvf_w_lvd_b0118_1", 2003373, 6159063, 4, { -238.928894f, 12.100000f, -279.455688f }, 1.000000f, 0.000000f ); 
+      // States -> vf_bextwall_on (id: 3) vf_bextwall_of (id: 4) 
+    instance.registerEObj( "unknown_1", 2006848, 0, 4, { -227.145905f, 11.978270f, -284.676086f }, 0.991760f, 0.000048f ); 
+    instance.registerEObj( "sgvf_w_lvd_b0118_2", 2002872, 6158913, 4, { -262.326813f, -278.432312f, -241.982407f }, 1.000000f, -0.424392f ); 
+      // States -> vf_bextwall_on (id: 3) vf_bextwall_of (id: 4) 
+    instance.registerEObj( "unknown_2", 2002735, 0, 4, { -261.926788f, -278.586792f, -242.680695f }, 0.800000f, -0.511830f ); 
+    instance.registerEObj( "sgvf_w_lvd_b0118_3", 2006850, 6161174, 4, { -281.669495f, -278.783203f, -207.507401f }, 1.000000f, 0.000000f ); 
+      // States -> vf_bextwall_on (id: 3) vf_bextwall_of (id: 4) 
+    instance.registerEObj( "unknown_3", 2006851, 0, 4, { -287.205292f, -278.675507f, -219.428604f }, 0.991760f, 0.000048f ); 
+    instance.registerEObj( "unknown_4", 2006852, 0, 4, { -285.709991f, -278.675507f, -222.022598f }, 0.991760f, 0.000048f ); 
+    instance.registerEObj( "unknown_5", 2006853, 0, 4, { -284.489288f, -278.675507f, -217.719604f }, 0.991760f, 0.000048f ); 
+    instance.registerEObj( "unknown_6", 2006854, 0, 4, { -282.932892f, -278.675507f, -220.527298f }, 0.991760f, 0.000048f ); 
+    instance.registerEObj( "sgvf_w_lvd_b0118_4", 2002872, 6177873, 4, { 236.391098f, -854.348206f, 388.999908f }, 0.991760f, -0.424392f ); 
+      // States -> vf_bextwall_on (id: 3) vf_bextwall_of (id: 4) 
+    instance.registerEObj( "unknown_7", 2002735, 0, 4, { 236.928299f, -854.301025f, 388.437988f }, 0.991760f, -0.272621f ); 
+    instance.registerEObj( "unknown_8", 2006855, 0, 4, { 245.654495f, -854.500000f, 408.186615f }, 0.991760f, 0.000048f ); 
+    instance.registerEObj( "unknown_9", 2006856, 0, 4, { 245.602402f, -854.500000f, 408.203186f }, 0.991760f, 0.000048f ); 
+    instance.registerEObj( "unknown_10", 2006857, 0, 4, { 217.570694f, -854.500000f, 414.970306f }, 0.991760f, 0.000048f ); 
+    instance.registerEObj( "unknown_11", 2006867, 0, 4, { 238.696899f, -854.398376f, 400.472900f }, 0.991760f, 0.000048f ); 
+    instance.registerEObj( "unknown_12", 2006868, 0, 4, { 225.070404f, -854.520508f, 402.559692f }, 0.991760f, 0.000048f ); 
+    instance.registerEObj( "unknown_13", 2007000, 6217077, 4, { 230.880493f, -854.459717f, 414.889313f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "Guardianstatue", 2006976, 0, 4, { 231.118698f, -852.800171f, 414.090088f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "Guardianstatue_1", 2006977, 0, 4, { 231.113907f, -852.801514f, 414.085785f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "Guardianstatue_2", 2006978, 0, 4, { 231.101898f, -852.801514f, 414.089111f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "Entrance", 2000182, 6159123, 5, { 73.070312f, 100.000000f, -376.644592f }, 0.991760f, 0.000048f ); 
+      // States -> vf_lock_on (id: 11) vf_lock_of (id: 12) 
+    instance.registerEObj( "Shortcut", 2000700, 0, 4, { 65.173607f, 100.000000f, -382.604614f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "Exit", 2000139, 0, 4, { 228.895599f, -854.546082f, 420.274109f }, 0.991760f, -0.919204f ); 
+    instance.registerEObj( "unknown_14", 2006825, 6173434, 4, { -45.716091f, 57.999512f, -311.654205f }, 0.991760f, 0.000048f ); 
+    instance.registerEObj( "unknown_15", 2006826, 6173447, 4, { -174.685303f, 6.271362f, -302.651215f }, 0.991760f, 0.000048f ); 
+    instance.registerEObj( "unknown_16", 2006827, 6173458, 4, { -174.227493f, 6.973328f, -299.721588f }, 0.991760f, 0.000048f ); 
+    instance.registerEObj( "unknown_17", 2006828, 6155704, 4, { -74.714241f, 58.247410f, -327.713287f }, 0.991760f, 0.000048f ); 
+    instance.registerEObj( "unknown_18", 2006829, 6184879, 4, { -170.839996f, -252.613205f, -408.640503f }, 0.991760f, 0.000048f ); 
+    instance.registerEObj( "unknown_19", 2006830, 6184881, 4, { -163.902496f, -272.319397f, -294.726501f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_20", 2006831, 6162191, 4, { -243.942093f, -280.660706f, -273.564789f }, 1.000000f, -0.000000f ); 
+    instance.registerEObj( "Stoneoftransference", 2006834, 6173379, 4, { -295.032104f, -273.037506f, -185.082397f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_21", 2006832, 6177949, 4, { 166.001007f, -844.999817f, 265.365814f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_22", 2006833, 6177947, 4, { 226.690002f, -856.247681f, 262.675415f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_23", 2006835, 6202096, 4, { 255.720200f, -865.873474f, 319.853210f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "sgbg_w_qic_004_03a", 2002872, 6904891, 4, { 236.391205f, -854.348083f, 388.999908f }, 0.991760f, -0.424392f ); 
+    instance.registerEObj( "unknown_24", 2002735, 0, 4, { 236.928299f, -854.301025f, 388.437988f }, 0.991760f, -0.272621f ); 
+    instance.registerEObj( "sgbg_w_qic_004_03a_1", 2007457, 6904603, 4, { 249.195099f, -856.351624f, 343.526215f }, 0.991760f, 0.000048f ); 
+    instance.registerEObj( "unknown_25", 2007457, 6217077, 4, { 233.497299f, -854.546021f, 414.179413f }, 1.000000f, 0.000000f ); 
 
   }
 
-  void onUpdate( InstanceContentPtr instance, uint32_t currTime ) override
+  void onUpdate( InstanceContent& instance, uint32_t currTime ) override
   {
 
   }
 
-  void onEnterTerritory( InstanceContentPtr instance, Entity::Player& player, uint32_t eventId, uint16_t param1,
+  void onEnterTerritory( InstanceContent& instance, Entity::Player& player, uint32_t eventId, uint16_t param1,
                          uint16_t param2 ) override
   {
 
diff --git a/src/scripts/instances/questbattles/RaisingtheSword.cpp b/src/scripts/instances/questbattles/RaisingtheSword.cpp
index c5ca070e..29590c0f 100644
--- a/src/scripts/instances/questbattles/RaisingtheSword.cpp
+++ b/src/scripts/instances/questbattles/RaisingtheSword.cpp
@@ -9,23 +9,21 @@ class RaisingtheSword :
 public:
   RaisingtheSword() :
     Sapphire::ScriptAPI::InstanceContentScript( 5018 )
-  {
-  }
+  { }
 
-  void onInit( InstanceContentPtr instance ) override
+  void onInit( InstanceContent& instance ) override
   {
-    instance->registerEObj( "unknown_0", 2004364, 0, 4, { -93.101089f, -13.129550f, 6.845694f }, 1.000000f, 0.000000f );
-    instance->registerEObj( "Companychest", 2000470, 4255822, 4, { 128.974701f, 5.067919f, -40.913502f }, 1.000000f,
-                            -0.343160f );
+    instance.registerEObj( "unknown_0", 2004364, 0, 4, { -93.101089f, -13.129550f, 6.845694f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "Companychest", 2000470, 4255822, 4, { 128.974701f, 5.067919f, -40.913502f }, 1.000000f, -0.343160f ); 
 
   }
 
-  void onUpdate( InstanceContentPtr instance, uint32_t currTime ) override
+  void onUpdate( InstanceContent& instance, uint32_t currTime ) override
   {
 
   }
 
-  void onEnterTerritory( InstanceContentPtr instance, Entity::Player& player, uint32_t eventId, uint16_t param1,
+  void onEnterTerritory( InstanceContent& instance, Entity::Player& player, uint32_t eventId, uint16_t param1,
                          uint16_t param2 ) override
   {
 
diff --git a/src/scripts/instances/questbattles/ReturnoftheBull.cpp b/src/scripts/instances/questbattles/ReturnoftheBull.cpp
index 2c3fc7df..c36528ce 100644
--- a/src/scripts/instances/questbattles/ReturnoftheBull.cpp
+++ b/src/scripts/instances/questbattles/ReturnoftheBull.cpp
@@ -9,20 +9,56 @@ class ReturnoftheBull :
 public:
   ReturnoftheBull() :
     Sapphire::ScriptAPI::InstanceContentScript( 5024 )
+  { }
+
+  void onInit( InstanceContent& instance ) override
   {
+    instance.registerEObj( "sgvf_w_lvd_b0118", 2002872, 6894813, 4, { -209.363495f, 35.017460f, 72.069672f }, 1.000000f, 0.000000f ); 
+      // States -> vf_bextwall_on (id: 3) vf_bextwall_of (id: 4) 
+    instance.registerEObj( "sgvf_w_lvd_b0118_1", 2002872, 6894812, 4, { -172.226807f, 35.017342f, 72.369667f }, 1.000000f, 0.000000f ); 
+      // States -> vf_bextwall_on (id: 3) vf_bextwall_of (id: 4) 
+    instance.registerEObj( "unknown_0", 2002735, 0, 4, { -210.219406f, 35.017460f, 72.000000f }, 1.000000f, -1.570451f ); 
+    instance.registerEObj( "unknown_1", 2008685, 0, 4, { -192.767105f, 34.867069f, 71.984734f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "sgvf_w_lvd_b0118_2", 2002872, 6894833, 4, { 250.000000f, 106.496902f, -50.489590f }, 1.000000f, 0.000000f ); 
+      // States -> vf_bextwall_on (id: 3) vf_bextwall_of (id: 4) 
+    instance.registerEObj( "sgvf_w_lvd_b0118_3", 2002872, 6894834, 4, { 250.000000f, 106.496902f, -89.516243f }, 1.000000f, 0.000000f ); 
+      // States -> vf_bextwall_on (id: 3) vf_bextwall_of (id: 4) 
+    instance.registerEObj( "unknown_2", 2002735, 0, 4, { 250.000000f, 106.496902f, -50.000000f }, 1.000000f, -0.000000f ); 
+    instance.registerEObj( "sgvf_w_lvd_b0250", 2002872, 6895342, 4, { 248.500000f, 122.000000f, -329.291107f }, 1.000000f, -0.000000f ); 
+      // States -> vf_bextwall_on (id: 3) vf_bextwall_of (id: 4) 
+    instance.registerEObj( "unknown_3", 2007457, 6865535, 4, { 249.561295f, 121.995796f, -352.681793f }, 0.991760f, 0.000048f ); 
+    instance.registerEObj( "sgvf_w_lvd_b0249", 2007457, 6895343, 4, { 249.487595f, 122.005699f, -330.083801f }, 0.991760f, 0.000048f ); 
+      // States -> vf_line_on (id: 10) vf_line_of (id: 11) 
+    instance.registerEObj( "sgvf_w_lvd_b0250_1", 2002872, 6904529, 4, { 248.937500f, 122.000000f, -377.252899f }, 1.000000f, 0.000000f ); 
+      // States -> vf_bextwall_on (id: 3) vf_bextwall_of (id: 4) 
+    instance.registerEObj( "unknown_4", 2008350, 0, 4, { 250.000000f, 122.000000f, -353.000000f }, 1.000000f, -0.000000f ); 
+    instance.registerEObj( "unknown_5", 2007168, 0, 4, { 250.018997f, 121.995796f, -353.109009f }, 0.991760f, 0.000048f ); 
+    instance.registerEObj( "Entrance", 2000182, 6879593, 5, { -408.611298f, 2.500000f, 233.977905f }, 1.000000f, 0.000000f ); 
+      // States -> vf_lock_on (id: 11) vf_lock_of (id: 12) 
+    instance.registerEObj( "Shortcut", 2000700, 0, 4, { -398.118408f, 2.500000f, 236.857193f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "Exit", 2000139, 0, 4, { 250.007294f, 122.000000f, -370.492889f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_6", 2008319, 6844583, 4, { -342.881104f, 24.000010f, 149.680099f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_7", 2008319, 6844584, 4, { -258.130402f, 27.000010f, 99.970268f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_8", 2007457, 6840800, 4, { -100.167801f, 44.750629f, 73.001747f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_9", 2007457, 6853103, 4, { 193.710297f, 106.000000f, 128.847397f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_10", 2007457, 6847102, 4, { 263.424286f, 106.400002f, -8.750051f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_11", 2007457, 6847104, 4, { 249.800797f, 106.428101f, -108.873100f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_12", 2008335, 6844579, 4, { 233.630905f, 109.971703f, -155.596298f }, 0.991760f, 0.000048f ); 
+    instance.registerEObj( "unknown_13", 2008335, 6844578, 4, { 233.295197f, 109.971703f, -144.792892f }, 0.991760f, 0.000048f ); 
+    instance.registerEObj( "unknown_14", 2008335, 6844581, 4, { 224.912094f, 120.000000f, -248.707504f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_15", 2008335, 6844580, 4, { 210.809296f, 120.000000f, -248.716202f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_16", 2008336, 6845038, 4, { 249.895905f, 122.099899f, -294.475403f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_17", 2007457, 6942278, 4, { 233.967697f, 110.000000f, -150.215607f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_18", 2007457, 6942279, 4, { 217.761505f, 119.889999f, -247.455597f }, 0.991760f, 0.000048f ); 
+
   }
 
-  void onInit( InstanceContentPtr instance ) override
+  void onUpdate( InstanceContent& instance, uint32_t currTime ) override
   {
 
   }
 
-  void onUpdate( InstanceContentPtr instance, uint32_t currTime ) override
-  {
-
-  }
-
-  void onEnterTerritory( InstanceContentPtr instance, Entity::Player& player, uint32_t eventId, uint16_t param1,
+  void onEnterTerritory( InstanceContent& instance, Entity::Player& player, uint32_t eventId, uint16_t param1,
                          uint16_t param2 ) override
   {
 
diff --git a/src/scripts/instances/questbattles/TheBattleonBekko.cpp b/src/scripts/instances/questbattles/TheBattleonBekko.cpp
index 9e9421e6..a050b6fc 100644
--- a/src/scripts/instances/questbattles/TheBattleonBekko.cpp
+++ b/src/scripts/instances/questbattles/TheBattleonBekko.cpp
@@ -9,20 +9,21 @@ class TheBattleonBekko :
 public:
   TheBattleonBekko() :
     Sapphire::ScriptAPI::InstanceContentScript( 5012 )
+  { }
+
+  void onInit( InstanceContent& instance ) override
   {
+    instance.registerEObj( "unknown_0", 2008480, 6894787, 4, { 564.783630f, -60.304729f, -136.444901f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_1", 2004541, 0, 4, { 800.087585f, 0.000000f, 44.317749f }, 1.000000f, 0.000000f ); 
+
   }
 
-  void onInit( InstanceContentPtr instance ) override
+  void onUpdate( InstanceContent& instance, uint32_t currTime ) override
   {
 
   }
 
-  void onUpdate( InstanceContentPtr instance, uint32_t currTime ) override
-  {
-
-  }
-
-  void onEnterTerritory( InstanceContentPtr instance, Entity::Player& player, uint32_t eventId, uint16_t param1,
+  void onEnterTerritory( InstanceContent& instance, Entity::Player& player, uint32_t eventId, uint16_t param1,
                          uint16_t param2 ) override
   {
 
diff --git a/src/scripts/instances/questbattles/TheCarteneauFlatsHeliodrome.cpp b/src/scripts/instances/questbattles/TheCarteneauFlatsHeliodrome.cpp
index 21a21e90..7bae0626 100644
--- a/src/scripts/instances/questbattles/TheCarteneauFlatsHeliodrome.cpp
+++ b/src/scripts/instances/questbattles/TheCarteneauFlatsHeliodrome.cpp
@@ -9,60 +9,44 @@ class TheCarteneauFlatsHeliodrome :
 public:
   TheCarteneauFlatsHeliodrome() :
     Sapphire::ScriptAPI::InstanceContentScript( 5004 )
-  {
-  }
+  { }
 
-  void onInit( InstanceContentPtr instance ) override
+  void onInit( InstanceContent& instance ) override
   {
-    instance->registerEObj( "sgbg_l1p1_q3_swhu1", 2005078, 5573675, 4, { -150.601807f, -15.195440f, 86.396042f },
-                            0.991760f, 0.000048f );
-    // States -> magic_go magic_down magic_2down magic_on magic_2on
-    instance->registerEObj( "sgbg_l1p1_q3_swhu1_1", 2005079, 5573676, 4, { -160.177505f, -15.426880f, 111.877502f },
-                            0.991760f, 0.000048f );
-    // States -> magic_go magic_down magic_2down magic_on magic_2on
-    instance->registerEObj( "sgbg_l1p1_q3_swhu1_2", 2005080, 5573677, 4, { -178.133102f, -15.426880f, 85.038406f },
-                            0.991760f, 0.000048f );
-    // States -> magic_go magic_down magic_2down magic_on magic_2on
-    instance->registerEObj( "sgbg_l1p1_q3_swhu1_3", 2005081, 5573687, 4, { 147.790497f, -15.205700f, 85.606216f },
-                            0.991760f, 0.000048f );
-    // States -> magic_go magic_down magic_2down magic_on magic_2on
-    instance->registerEObj( "sgbg_l1p1_q3_swhu1_4", 2005082, 5573688, 4, { 181.170303f, -15.426880f, 81.284790f },
-                            0.991760f, 0.000048f );
-    // States -> magic_go magic_down magic_2down magic_on magic_2on
-    instance->registerEObj( "sgbg_l1p1_q3_swhu1_5", 2005083, 5573689, 4, { 160.730392f, -15.457460f, 117.518303f },
-                            0.991760f, 0.000048f );
-    // States -> magic_go magic_down magic_2down magic_on magic_2on
-    instance->registerEObj( "sgbg_l1p1_q3_swhu1_6", 2005084, 5573690, 4, { -0.015320f, -15.426880f, -162.924103f },
-                            0.991760f, 0.000048f );
-    // States -> magic_go magic_down magic_2down magic_on magic_2on
-    instance->registerEObj( "sgbg_l1p1_q3_swhu1_7", 2005085, 5573691, 4, { 19.010229f, -15.416970f, -200.015396f },
-                            1.000000f, 0.000000f );
-    // States -> magic_go magic_down magic_2down magic_on magic_2on
-    instance->registerEObj( "sgbg_l1p1_q3_swhu1_8", 2005086, 5573692, 4, { -18.994471f, -15.426880f, -199.992905f },
-                            0.991760f, 0.000048f );
-    // States -> magic_go magic_down magic_2down magic_on magic_2on
-    instance->registerEObj( "unknown_0", 2004187, 4724282, 4, { -0.007111f, 12.000000f, -386.299896f }, 1.000000f,
-                            0.000000f );
-    instance->registerEObj( "unknown_1", 2004188, 4724284, 4, { 335.025513f, 12.000000f, 193.711899f }, 1.000000f,
-                            0.000000f );
-    instance->registerEObj( "unknown_2", 2004189, 4724283, 4, { -334.556213f, 12.000000f, 193.274796f }, 1.000000f,
-                            0.000000f );
-    instance->registerEObj( "sgvf_l1p1_lvd_b0441", 2004202, 4797506, 4, { -0.101569f, 30.000000f, 1.413736f },
-                            1.000000f, 0.000000f );
-    // States -> STAGE_def STAGE_pop_anim
-    instance->registerEObj( "Magitekreaper", 2007710, 0, 4, { -0.135500f, 28.501801f, 18.021700f }, 1.000000f,
-                            0.000000f );
-    instance->registerEObj( "unknown_3", 2007722, 6642830, 4, { 7.805808f, 29.000000f, 0.239120f }, 1.000000f,
-                            0.000000f );
+    instance.registerEObj( "sgbg_l1p1_q3_swhu1", 2005078, 5573675, 4, { -150.601807f, -15.195440f, 86.396042f }, 0.991760f, 0.000048f ); 
+      // States -> magic_go (id: 33) magic_down (id: 56) magic_2down (id: 57) magic_on (id: 58) magic_2on (id: 59) 
+    instance.registerEObj( "sgbg_l1p1_q3_swhu1_1", 2005079, 5573676, 4, { -160.177505f, -15.426880f, 111.877502f }, 0.991760f, 0.000048f ); 
+      // States -> magic_go (id: 33) magic_down (id: 56) magic_2down (id: 57) magic_on (id: 58) magic_2on (id: 59) 
+    instance.registerEObj( "sgbg_l1p1_q3_swhu1_2", 2005080, 5573677, 4, { -178.133102f, -15.426880f, 85.038406f }, 0.991760f, 0.000048f ); 
+      // States -> magic_go (id: 33) magic_down (id: 56) magic_2down (id: 57) magic_on (id: 58) magic_2on (id: 59) 
+    instance.registerEObj( "sgbg_l1p1_q3_swhu1_3", 2005081, 5573687, 4, { 147.790497f, -15.205700f, 85.606216f }, 0.991760f, 0.000048f ); 
+      // States -> magic_go (id: 33) magic_down (id: 56) magic_2down (id: 57) magic_on (id: 58) magic_2on (id: 59) 
+    instance.registerEObj( "sgbg_l1p1_q3_swhu1_4", 2005082, 5573688, 4, { 181.170303f, -15.426880f, 81.284790f }, 0.991760f, 0.000048f ); 
+      // States -> magic_go (id: 33) magic_down (id: 56) magic_2down (id: 57) magic_on (id: 58) magic_2on (id: 59) 
+    instance.registerEObj( "sgbg_l1p1_q3_swhu1_5", 2005083, 5573689, 4, { 160.730392f, -15.457460f, 117.518303f }, 0.991760f, 0.000048f ); 
+      // States -> magic_go (id: 33) magic_down (id: 56) magic_2down (id: 57) magic_on (id: 58) magic_2on (id: 59) 
+    instance.registerEObj( "sgbg_l1p1_q3_swhu1_6", 2005084, 5573690, 4, { -0.015289f, -15.426890f, -162.924103f }, 0.991760f, 0.000048f ); 
+      // States -> magic_go (id: 33) magic_down (id: 56) magic_2down (id: 57) magic_on (id: 58) magic_2on (id: 59) 
+    instance.registerEObj( "sgbg_l1p1_q3_swhu1_7", 2005085, 5573691, 4, { 19.010250f, -15.416970f, -200.015396f }, 1.000000f, -0.000000f ); 
+      // States -> magic_go (id: 33) magic_down (id: 56) magic_2down (id: 57) magic_on (id: 58) magic_2on (id: 59) 
+    instance.registerEObj( "sgbg_l1p1_q3_swhu1_8", 2005086, 5573692, 4, { -18.994480f, -15.426890f, -199.992798f }, 0.991760f, 0.000048f ); 
+      // States -> magic_go (id: 33) magic_down (id: 56) magic_2down (id: 57) magic_on (id: 58) magic_2on (id: 59) 
+    instance.registerEObj( "unknown_0", 2004187, 4724282, 4, { 0.000000f, -7.200000f, -268.700012f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_1", 2004188, 4724284, 4, { 232.307495f, -7.200000f, 134.122894f }, 1.000000f, 0.542586f ); 
+    instance.registerEObj( "unknown_2", 2004189, 4724283, 4, { -232.837494f, -7.217590f, 134.416702f }, 0.991760f, 1.033762f ); 
+    instance.registerEObj( "sgvf_l1p1_lvd_b0441", 2004202, 4797506, 4, { -0.101569f, 30.000000f, 1.413736f }, 1.000000f, 0.000000f ); 
+      // States -> STAGE_def (id: 2) STAGE_pop_anim (id: 3) 
+    instance.registerEObj( "Magitekreaper", 2007710, 0, 4, { -0.135500f, 28.501801f, 18.021700f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_3", 2007722, 6642830, 4, { 7.805808f, 29.000000f, 0.239120f }, 1.000000f, 0.000000f ); 
 
   }
 
-  void onUpdate( InstanceContentPtr instance, uint32_t currTime ) override
+  void onUpdate( InstanceContent& instance, uint32_t currTime ) override
   {
 
   }
 
-  void onEnterTerritory( InstanceContentPtr instance, Entity::Player& player, uint32_t eventId, uint16_t param1,
+  void onEnterTerritory( InstanceContent& instance, Entity::Player& player, uint32_t eventId, uint16_t param1,
                          uint16_t param2 ) override
   {
 
diff --git a/src/scripts/instances/questbattles/TheFaceofTrueEvil.cpp b/src/scripts/instances/questbattles/TheFaceofTrueEvil.cpp
index b5a07ab4..9a980abb 100644
--- a/src/scripts/instances/questbattles/TheFaceofTrueEvil.cpp
+++ b/src/scripts/instances/questbattles/TheFaceofTrueEvil.cpp
@@ -9,20 +9,19 @@ class TheFaceofTrueEvil :
 public:
   TheFaceofTrueEvil() :
     Sapphire::ScriptAPI::InstanceContentScript( 5010 )
-  {
-  }
+  { }
 
-  void onInit( InstanceContentPtr instance ) override
+  void onInit( InstanceContent& instance ) override
   {
 
   }
 
-  void onUpdate( InstanceContentPtr instance, uint32_t currTime ) override
+  void onUpdate( InstanceContent& instance, uint32_t currTime ) override
   {
 
   }
 
-  void onEnterTerritory( InstanceContentPtr instance, Entity::Player& player, uint32_t eventId, uint16_t param1,
+  void onEnterTerritory( InstanceContent& instance, Entity::Player& player, uint32_t eventId, uint16_t param1,
                          uint16_t param2 ) override
   {
 
diff --git a/src/scripts/instances/questbattles/TheHeartoftheProblem.cpp b/src/scripts/instances/questbattles/TheHeartoftheProblem.cpp
index 9ee91d6f..00d3dc07 100644
--- a/src/scripts/instances/questbattles/TheHeartoftheProblem.cpp
+++ b/src/scripts/instances/questbattles/TheHeartoftheProblem.cpp
@@ -9,20 +9,32 @@ class TheHeartoftheProblem :
 public:
   TheHeartoftheProblem() :
     Sapphire::ScriptAPI::InstanceContentScript( 5015 )
+  { }
+
+  void onInit( InstanceContent& instance ) override
   {
+    instance.registerEObj( "unknown_0", 2008290, 6894789, 4, { 375.272888f, -4.893838f, 290.605011f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "Yol", 2008330, 0, 4, { 466.995514f, 21.157949f, -328.188995f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "Ovoo", 2008289, 6872570, 4, { 354.000000f, -0.790344f, 296.500000f }, 0.991760f, 0.000048f ); 
+      // States -> land_def (id: 3) land_def_anim (id: 4) land_on (id: 5) land_on_anim (id: 6) land_on_omen (id: 7) land_on_omen (id: 8) land_off (id: 19) land_off_anim (id: 20) 
+    instance.registerEObj( "unknown_1", 2004967, 0, 4, { -187.899506f, 1.653982f, 760.298279f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "sgbg_e3f3_q1_gmc02", 2007457, 7653044, 4, { -223.010605f, 3.178310f, 519.218811f }, 0.991760f, 0.000048f ); 
+      // States -> smto_on (id: 19) smto_c_on (id: 3) smto_off (id: 1) smto_off_anim (id: 2) smto_c_off (id: 4) smto_fdout (id: 18) 
+    instance.registerEObj( "sgvf_w_lvd_b1472", 2007457, 7653055, 4, { -186.572403f, 4.189117f, 532.602173f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "sgvf_w_lvd_b1472_1", 2007457, 7653056, 4, { -186.602600f, 6.933841f, 568.871582f }, 0.991760f, 0.000048f ); 
+    instance.registerEObj( "sgvf_w_lvd_b1199", 2007457, 7669017, 4, { -186.572403f, 5.921182f, 550.737427f }, 1.000000f, 0.000000f ); 
+      // States -> circle_off (id: 3) circle_off (id: 4) circle_on (id: 5) circle_on (id: 6) 
+    instance.registerEObj( "sgvf_w_lvd_b1199_1", 2007457, 7632420, 4, { -223.165497f, 2.660000f, 519.000000f }, 1.000000f, 0.000000f ); 
+      // States -> circle_off (id: 3) circle_off (id: 4) circle_on (id: 5) circle_on (id: 6) 
+
   }
 
-  void onInit( InstanceContentPtr instance ) override
+  void onUpdate( InstanceContent& instance, uint32_t currTime ) override
   {
 
   }
 
-  void onUpdate( InstanceContentPtr instance, uint32_t currTime ) override
-  {
-
-  }
-
-  void onEnterTerritory( InstanceContentPtr instance, Entity::Player& player, uint32_t eventId, uint16_t param1,
+  void onEnterTerritory( InstanceContent& instance, Entity::Player& player, uint32_t eventId, uint16_t param1,
                          uint16_t param2 ) override
   {
 
diff --git a/src/scripts/instances/questbattles/TheOrphansandtheBrokenBlade.cpp b/src/scripts/instances/questbattles/TheOrphansandtheBrokenBlade.cpp
index f6380354..48659911 100644
--- a/src/scripts/instances/questbattles/TheOrphansandtheBrokenBlade.cpp
+++ b/src/scripts/instances/questbattles/TheOrphansandtheBrokenBlade.cpp
@@ -9,20 +9,19 @@ class TheOrphansandtheBrokenBlade :
 public:
   TheOrphansandtheBrokenBlade() :
     Sapphire::ScriptAPI::InstanceContentScript( 5019 )
-  {
-  }
+  { }
 
-  void onInit( InstanceContentPtr instance ) override
+  void onInit( InstanceContent& instance ) override
   {
 
   }
 
-  void onUpdate( InstanceContentPtr instance, uint32_t currTime ) override
+  void onUpdate( InstanceContent& instance, uint32_t currTime ) override
   {
 
   }
 
-  void onEnterTerritory( InstanceContentPtr instance, Entity::Player& player, uint32_t eventId, uint16_t param1,
+  void onEnterTerritory( InstanceContent& instance, Entity::Player& player, uint32_t eventId, uint16_t param1,
                          uint16_t param2 ) override
   {
 
diff --git a/src/scripts/instances/questbattles/TheResonant.cpp b/src/scripts/instances/questbattles/TheResonant.cpp
index ba3da434..ea76eb5a 100644
--- a/src/scripts/instances/questbattles/TheResonant.cpp
+++ b/src/scripts/instances/questbattles/TheResonant.cpp
@@ -9,20 +9,25 @@ class TheResonant :
 public:
   TheResonant() :
     Sapphire::ScriptAPI::InstanceContentScript( 5017 )
+  { }
+
+  void onInit( InstanceContent& instance ) override
   {
+    instance.registerEObj( "unknown_0", 2007457, 6927333, 4, { 503.255096f, 70.000000f, 589.613708f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "Gatewinch", 2008907, 0, 4, { 508.261505f, 71.415131f, 575.156982f }, 0.991760f, 0.000048f ); 
+    instance.registerEObj( "sgbg_w_qic_004_04a", 2007457, 7012282, 4, { 702.654602f, 70.000000f, 532.514282f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_1", 2008678, 0, 4, { -139.654007f, 69.993042f, 667.066772f }, 0.991760f, 0.000048f ); 
+    instance.registerEObj( "unknown_2", 2008678, 0, 4, { -187.638397f, 69.993042f, 634.666504f }, 0.991760f, 0.000048f ); 
+    instance.registerEObj( "unknown_3", 2008678, 0, 4, { -73.946472f, 69.993042f, 652.456177f }, 0.991760f, 0.000048f ); 
+
   }
 
-  void onInit( InstanceContentPtr instance ) override
+  void onUpdate( InstanceContent& instance, uint32_t currTime ) override
   {
 
   }
 
-  void onUpdate( InstanceContentPtr instance, uint32_t currTime ) override
-  {
-
-  }
-
-  void onEnterTerritory( InstanceContentPtr instance, Entity::Player& player, uint32_t eventId, uint16_t param1,
+  void onEnterTerritory( InstanceContent& instance, Entity::Player& player, uint32_t eventId, uint16_t param1,
                          uint16_t param2 ) override
   {
 
diff --git a/src/scripts/instances/questbattles/TheWilloftheMoon.cpp b/src/scripts/instances/questbattles/TheWilloftheMoon.cpp
new file mode 100644
index 00000000..ff231f8d
--- /dev/null
+++ b/src/scripts/instances/questbattles/TheWilloftheMoon.cpp
@@ -0,0 +1,45 @@
+#include <ScriptObject.h>
+#include <Territory/InstanceContent.h>
+
+using namespace Sapphire;
+
+class TheWilloftheMoon :
+  public Sapphire::ScriptAPI::InstanceContentScript
+{
+public:
+  TheWilloftheMoon() :
+    Sapphire::ScriptAPI::InstanceContentScript( 5026 )
+  { }
+
+  void onInit( InstanceContent& instance ) override
+  {
+    instance.registerEObj( "unknown_0", 2008290, 6894789, 4, { 375.272888f, -4.893838f, 290.605011f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "Yol", 2008330, 0, 4, { 466.995514f, 21.157949f, -328.188995f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "Ovoo", 2008289, 6872570, 4, { 354.000000f, -0.790344f, 296.500000f }, 0.991760f, 0.000048f ); 
+      // States -> land_def (id: 3) land_def_anim (id: 4) land_on (id: 5) land_on_anim (id: 6) land_on_omen (id: 7) land_on_omen (id: 8) land_off (id: 19) land_off_anim (id: 20) 
+    instance.registerEObj( "unknown_1", 2004967, 0, 4, { -187.899506f, 1.653982f, 760.298279f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "sgbg_e3f3_q1_gmc02", 2007457, 7653044, 4, { -223.010605f, 3.178310f, 519.218811f }, 0.991760f, 0.000048f ); 
+      // States -> smto_on (id: 19) smto_c_on (id: 3) smto_off (id: 1) smto_off_anim (id: 2) smto_c_off (id: 4) smto_fdout (id: 18) 
+    instance.registerEObj( "sgvf_w_lvd_b1472", 2007457, 7653055, 4, { -186.572403f, 4.189117f, 532.602173f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "sgvf_w_lvd_b1472_1", 2007457, 7653056, 4, { -186.602600f, 6.933841f, 568.871582f }, 0.991760f, 0.000048f ); 
+    instance.registerEObj( "sgvf_w_lvd_b1199", 2007457, 7669017, 4, { -186.572403f, 5.921182f, 550.737427f }, 1.000000f, 0.000000f ); 
+      // States -> circle_off (id: 3) circle_off (id: 4) circle_on (id: 5) circle_on (id: 6) 
+    instance.registerEObj( "sgvf_w_lvd_b1199_1", 2007457, 7632420, 4, { -223.165497f, 2.660000f, 519.000000f }, 1.000000f, 0.000000f ); 
+      // States -> circle_off (id: 3) circle_off (id: 4) circle_on (id: 5) circle_on (id: 6) 
+
+  }
+
+  void onUpdate( InstanceContent& instance, uint32_t currTime ) override
+  {
+
+  }
+
+  void onEnterTerritory( InstanceContent& instance, Entity::Player& player, uint32_t eventId, uint16_t param1,
+                         uint16_t param2 ) override
+  {
+
+  }
+
+};
+
+EXPOSE_SCRIPT( TheWilloftheMoon );
\ No newline at end of file
diff --git a/src/scripts/instances/questbattles/WhenClansCollide.cpp b/src/scripts/instances/questbattles/WhenClansCollide.cpp
index 0d2f15a4..7f77cdb5 100644
--- a/src/scripts/instances/questbattles/WhenClansCollide.cpp
+++ b/src/scripts/instances/questbattles/WhenClansCollide.cpp
@@ -9,20 +9,32 @@ class WhenClansCollide :
 public:
   WhenClansCollide() :
     Sapphire::ScriptAPI::InstanceContentScript( 5022 )
+  { }
+
+  void onInit( InstanceContent& instance ) override
   {
+    instance.registerEObj( "unknown_0", 2008290, 6894789, 4, { 375.272888f, -4.893838f, 290.605011f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "Yol", 2008330, 0, 4, { 466.995514f, 21.157949f, -328.188995f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "Ovoo", 2008289, 6872570, 4, { 354.000000f, -0.790344f, 296.500000f }, 0.991760f, 0.000048f ); 
+      // States -> land_def (id: 3) land_def_anim (id: 4) land_on (id: 5) land_on_anim (id: 6) land_on_omen (id: 7) land_on_omen (id: 8) land_off (id: 19) land_off_anim (id: 20) 
+    instance.registerEObj( "unknown_1", 2004967, 0, 4, { -187.899506f, 1.653982f, 760.298279f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "sgbg_e3f3_q1_gmc02", 2007457, 7653044, 4, { -223.010605f, 3.178310f, 519.218811f }, 0.991760f, 0.000048f ); 
+      // States -> smto_on (id: 19) smto_c_on (id: 3) smto_off (id: 1) smto_off_anim (id: 2) smto_c_off (id: 4) smto_fdout (id: 18) 
+    instance.registerEObj( "sgvf_w_lvd_b1472", 2007457, 7653055, 4, { -186.572403f, 4.189117f, 532.602173f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "sgvf_w_lvd_b1472_1", 2007457, 7653056, 4, { -186.602600f, 6.933841f, 568.871582f }, 0.991760f, 0.000048f ); 
+    instance.registerEObj( "sgvf_w_lvd_b1199", 2007457, 7669017, 4, { -186.572403f, 5.921182f, 550.737427f }, 1.000000f, 0.000000f ); 
+      // States -> circle_off (id: 3) circle_off (id: 4) circle_on (id: 5) circle_on (id: 6) 
+    instance.registerEObj( "sgvf_w_lvd_b1199_1", 2007457, 7632420, 4, { -223.165497f, 2.660000f, 519.000000f }, 1.000000f, 0.000000f ); 
+      // States -> circle_off (id: 3) circle_off (id: 4) circle_on (id: 5) circle_on (id: 6) 
+
   }
 
-  void onInit( InstanceContentPtr instance ) override
+  void onUpdate( InstanceContent& instance, uint32_t currTime ) override
   {
 
   }
 
-  void onUpdate( InstanceContentPtr instance, uint32_t currTime ) override
-  {
-
-  }
-
-  void onEnterTerritory( InstanceContentPtr instance, Entity::Player& player, uint32_t eventId, uint16_t param1,
+  void onEnterTerritory( InstanceContent& instance, Entity::Player& player, uint32_t eventId, uint16_t param1,
                          uint16_t param2 ) override
   {
 
diff --git a/src/scripts/instances/questbattles/WithHeartandSteel.cpp b/src/scripts/instances/questbattles/WithHeartandSteel.cpp
index ee6590a3..88bfd2c0 100644
--- a/src/scripts/instances/questbattles/WithHeartandSteel.cpp
+++ b/src/scripts/instances/questbattles/WithHeartandSteel.cpp
@@ -9,20 +9,110 @@ class WithHeartandSteel :
 public:
   WithHeartandSteel() :
     Sapphire::ScriptAPI::InstanceContentScript( 5007 )
+  { }
+
+  void onInit( InstanceContent& instance ) override
   {
+    instance.registerEObj( "unknown_0", 2002735, 0, 4, { 16.000000f, -0.599972f, -25.600000f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "sgpl_w_lvd_b0118_wide", 2002872, 6255278, 4, { 15.499620f, -0.600000f, -32.576271f }, 1.000000f, 0.000000f ); 
+      // States -> vf_bextwall_on (id: 3) vf_bextwall_of (id: 4) 
+    instance.registerEObj( "sgpl_w_lvd_b0118_wide_1", 2002872, 6255280, 4, { 16.000000f, -0.599986f, -84.500000f }, 1.200000f, 0.000000f ); 
+      // States -> vf_bextwall_on (id: 3) vf_bextwall_of (id: 4) 
+    instance.registerEObj( "unknown_1", 2007130, 6259583, 4, { 16.141850f, -0.600000f, -58.088329f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "sgvf_z2r2_b0919", 2007131, 6271618, 4, { 16.141850f, -0.600000f, -58.088329f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_2", 2007127, 6263439, 4, { 2.786298f, 1.130917f, -81.495903f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_3", 2007128, 6263438, 4, { 44.322010f, 1.937706f, -52.936489f }, 0.991760f, 0.000048f ); 
+    instance.registerEObj( "unknown_4", 2007129, 6263356, 4, { -1.414551f, 2.361187f, -31.816429f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_5", 2002735, 0, 4, { -300.000000f, -73.990967f, -386.829315f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "sgpl_w_lvd_b0118_wide_2", 2002872, 6256300, 4, { -298.284485f, -74.099991f, -394.606812f }, 1.000000f, 0.000000f ); 
+      // States -> vf_bextwall_on (id: 3) vf_bextwall_of (id: 4) 
+    instance.registerEObj( "unknown_6", 2002872, 6252961, 4, { -298.284485f, -74.000061f, -446.164307f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_7", 2007174, 0, 4, { -301.925903f, -74.099998f, -434.771606f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "sgvf_z2r2_b0917", 2007175, 6275855, 4, { -305.091309f, -74.099998f, -434.266205f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "sgvf_z2r2_b0909", 2007176, 6275857, 4, { -299.330200f, -74.099998f, -441.272186f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_8", 2000034, 6252960, 4, { -301.382507f, -74.111649f, -397.150391f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_9", 2000035, 0, 4, { -300.012909f, -74.111687f, -411.038788f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_10", 2002735, 0, 4, { 280.000000f, -468.750000f, -352.734314f }, 0.991760f, 0.000048f ); 
+    instance.registerEObj( "sgpl_w_lvd_b0118_wide_3", 2002872, 6256312, 4, { 279.076385f, -468.799988f, -346.734894f }, 1.000000f, 0.000000f ); 
+      // States -> vf_bextwall_on (id: 3) vf_bextwall_of (id: 4) 
+    instance.registerEObj( "unknown_11", 2007092, 6246904, 4, { 271.681488f, -269.434998f, 263.484192f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_12", 2007093, 6246906, 4, { 299.983093f, -269.438812f, 263.439911f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_13", 2007094, 6246909, 4, { 328.133606f, -269.459900f, 263.349915f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_14", 2007095, 6246905, 4, { 272.007812f, -270.624695f, 249.703201f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_15", 2007096, 6246907, 4, { 299.972198f, -270.615295f, 249.808594f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_16", 2007097, 6246910, 4, { 327.886597f, -270.637299f, 249.556503f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "sgvf_z2r2_b0908", 2007098, 6276590, 4, { 271.976288f, -270.275513f, 254.027298f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "sgvf_z2r2_b0908_1", 2007099, 6276603, 4, { 300.073914f, -270.279907f, 253.881897f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "sgvf_z2r2_b0908_2", 2007100, 6276618, 4, { 328.117798f, -270.282501f, 253.919098f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "sgvf_z2r2_b0906", 2007101, 6277276, 4, { 300.580688f, -329.902802f, 215.101807f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_17", 2007102, 0, 4, { 313.999695f, -254.436203f, 249.057007f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_18", 2007091, 6253623, 4, { 280.196686f, -468.799988f, -340.444214f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "sgvf_w_lvd_b0186", 2000015, 6323645, 4, { 280.035004f, -444.700012f, -381.003815f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "sgvf_w_lvd_b0186_1", 2000015, 6323651, 4, { 255.731705f, -444.700012f, -423.649811f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "sgvf_w_lvd_b0186_2", 2000015, 6323650, 4, { 304.734985f, -444.700012f, -424.385590f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "sgvf_z2r2_b0954", 2007350, 6405524, 4, { 280.000000f, -446.006287f, -410.000000f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "sgpl_w_cylinder_col_on_off", 2002618, 6405504, 4, { 271.693695f, -445.000000f, -398.334412f }, 1.000000f, 0.000000f ); 
+      // States -> col_on (id: 17) col_off (id: 18) 
+    instance.registerEObj( "sgbg_z2r2_a4_navi1", 2002618, 6413337, 4, { 284.413513f, -444.945587f, -428.864410f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_19", 2002735, 0, 4, { -300.007690f, -436.179108f, -3.677429f }, 0.991760f, 0.000048f ); 
+    instance.registerEObj( "sgpl_w_lvd_b0118_wide_4", 2002872, 6256352, 4, { -299.044006f, -436.200012f, 1.934000f }, 1.000000f, 0.000000f ); 
+      // States -> vf_bextwall_on (id: 3) vf_bextwall_of (id: 4) 
+    instance.registerEObj( "Exit", 2000139, 0, 4, { -300.007690f, -436.057098f, -56.789539f }, 0.991760f, 0.000048f ); 
+    instance.registerEObj( "unknown_20", 2000019, 6223041, 4, { -293.815094f, -436.100006f, -36.657909f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "sgvf_z2r2_b0955", 2007363, 6403167, 4, { -300.000000f, -436.100006f, -34.000000f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_21", 2007381, 0, 4, { -288.659698f, -436.100006f, -36.228500f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_22", 2007104, 6253621, 4, { -293.853302f, -417.190002f, 338.020691f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_23", 2007105, 6262270, 4, { 279.377411f, -481.421112f, -273.999298f }, 1.000000f, 0.000048f ); 
+    instance.registerEObj( "unknown_24", 2007106, 6253622, 4, { 282.739197f, -506.212494f, -377.761414f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_25", 2007630, 0, 4, { -307.311310f, -74.111656f, -404.095490f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "sgvf_z2r2_b0606", 2007457, 6873350, 4, { -287.981812f, -74.111671f, -418.439789f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "b0893_onen_y_qic_s", 2007457, 7008372, 4, { -286.682404f, -74.111656f, -414.302185f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_26", 2000034, 6252960, 4, { -299.669098f, -74.111687f, -422.791412f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "sgbg_w_qic_004_03a", 2008306, 6873007, 4, { -299.592712f, -123.000000f, -313.306885f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_27", 2002735, 0, 4, { -300.000000f, -73.990967f, -386.829315f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "sgbg_w_qic_004_03a_1", 2002872, 6873032, 4, { -298.298706f, -74.113159f, -394.613586f }, 0.991760f, 0.000048f ); 
+    instance.registerEObj( "unknown_28", 2007112, 6252937, 4, { -258.522614f, -114.655602f, -231.454193f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_29", 2007112, 6403165, 4, { -360.672485f, -116.000198f, -271.268707f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "sgpl_a_evt_flyingship02", 2008452, 6889796, 4, { -239.520905f, -116.014397f, -230.853806f }, 0.991760f, 0.000048f ); 
+    instance.registerEObj( "sgbg_w_qic_004_03a_2", 2007457, 6941894, 4, { -299.583099f, -75.000023f, -353.118500f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_30", 2007108, 6252917, 4, { 52.989189f, 8.000000f, 109.725502f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_31", 2007109, 6252933, 4, { 40.849979f, 7.999999f, 54.685509f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "sgvf_z2r2_b0893", 2007110, 6258888, 4, { -217.946503f, -116.000000f, -210.519608f }, 0.991760f, 0.000048f ); 
+    instance.registerEObj( "sgvf_z2r2_b0893_1", 2007111, 6258889, 4, { -351.721313f, -116.000000f, -260.105499f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_32", 2007112, 6252937, 4, { -249.593796f, -116.000000f, -229.014603f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_33", 2007112, 6403165, 4, { -354.681885f, -116.000298f, -278.960693f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_34", 2002735, 0, 4, { -185.956604f, -394.699890f, 235.090607f }, 1.000000f, 1.047197f ); 
+    instance.registerEObj( "sgpl_w_lvd_b0118_col_char", 2002872, 6259368, 4, { -189.835297f, -394.768494f, 236.985107f }, 1.000000f, 0.000000f ); 
+      // States -> vf_bextwall_on (id: 3) vf_bextwall_of (id: 4) 
+    instance.registerEObj( "sgpl_w_lvd_b0118_col_char_1", 2002872, 6259369, 4, { -152.910706f, -394.522003f, 215.716797f }, 0.991760f, 0.000048f ); 
+      // States -> vf_bextwall_on (id: 3) vf_bextwall_of (id: 4) 
+    instance.registerEObj( "unknown_35", 2007114, 6265979, 4, { -179.125702f, -394.522003f, 205.950897f }, 0.991760f, 0.000048f ); 
+    instance.registerEObj( "unknown_36", 2007115, 6265980, 4, { -157.763107f, -394.522003f, 242.664200f }, 0.991760f, 0.000048f ); 
+    instance.registerEObj( "unknown_37", 2007116, 6265977, 4, { -181.536697f, -394.522003f, 201.556396f }, 0.991760f, 0.000048f ); 
+    instance.registerEObj( "unknown_38", 2007117, 6275728, 4, { -180.590607f, -394.522003f, 231.158905f }, 0.991760f, 0.000048f ); 
+    instance.registerEObj( "unknown_39", 2007118, 6262272, 4, { -156.623795f, -394.500092f, 244.445908f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_40", 2007119, 6264911, 4, { -168.688507f, -391.866913f, 224.567001f }, 0.991760f, 0.000048f ); 
+    instance.registerEObj( "unknown_41", 2007378, 6404242, 4, { -170.886597f, -394.500092f, 228.890305f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_42", 2007379, 6404243, 4, { -174.892807f, -394.500092f, 226.853806f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "Basicconveyanceunit", 2007054, 6277013, 4, { 29.465090f, 12.072440f, 173.291306f }, 0.991760f, 0.000048f ); 
+    instance.registerEObj( "Basicconveyanceunit_1", 2007055, 6277014, 4, { 10.055660f, 10.610950f, 59.293789f }, 0.991760f, 0.000048f ); 
+    instance.registerEObj( "Basicconveyanceunit_2", 2007056, 6277015, 4, { 21.985451f, -1.159537f, -124.736298f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "Basicconveyanceunit_3", 2007057, 6277012, 4, { -290.684998f, -71.292747f, -368.263885f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "Basicconveyanceunit_4", 2007058, 6235460, 4, { -244.833099f, -390.428986f, 258.731689f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "Basicconveyanceunit_5", 2007059, 6235461, 4, { 276.184296f, -461.318604f, -294.996796f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "Basicconveyanceunit_6", 2007060, 6235463, 4, { -304.521301f, -435.890594f, 23.143780f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_43", 2007103, 6259793, 4, { 16.303080f, -3.864367f, -114.426003f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "Entrance", 2000182, 6247654, 5, { 81.884888f, 13.000000f, 208.698303f }, 0.991760f, 0.292740f ); 
+      // States -> vf_lock_on (id: 11) vf_lock_of (id: 12) 
+
   }
 
-  void onInit( InstanceContentPtr instance ) override
+  void onUpdate( InstanceContent& instance, uint32_t currTime ) override
   {
 
   }
 
-  void onUpdate( InstanceContentPtr instance, uint32_t currTime ) override
-  {
-
-  }
-
-  void onEnterTerritory( InstanceContentPtr instance, Entity::Player& player, uint32_t eventId, uint16_t param1,
+  void onEnterTerritory( InstanceContent& instance, Entity::Player& player, uint32_t eventId, uint16_t param1,
                          uint16_t param2 ) override
   {
 
diff --git a/src/scripts/instances/raids/AlexanderTheArmoftheFather.cpp b/src/scripts/instances/raids/AlexanderTheArmoftheFather.cpp
index 99261b0c..bb7d5929 100644
--- a/src/scripts/instances/raids/AlexanderTheArmoftheFather.cpp
+++ b/src/scripts/instances/raids/AlexanderTheArmoftheFather.cpp
@@ -9,20 +9,38 @@ class AlexanderTheArmoftheFather :
 public:
   AlexanderTheArmoftheFather() :
     Sapphire::ScriptAPI::InstanceContentScript( 30023 )
+  { }
+
+  void onInit( InstanceContent& instance ) override
   {
+    instance.registerEObj( "unknown_0", 2005400, 0, 4, { 39.638931f, -9.000000f, -67.173187f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_1", 2005314, 5878653, 4, { 17.839520f, 42.000000f, 14.681990f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "sgpl_d2a3_wall", 2005314, 6048829, 4, { 17.839520f, 42.000000f, 14.681990f }, 1.000000f, 0.000000f ); 
+      // States -> wall_on (id: 24) wall_off (id: 25) 
+    instance.registerEObj( "unknown_2", 2006094, 5864098, 4, { 58.027489f, -0.000134f, -20.193150f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_3", 2002735, 0, 4, { 58.000000f, -0.000003f, -20.943159f }, 0.600000f, 0.000000f ); 
+    instance.registerEObj( "sgvf_w_lvd_b0118", 2002872, 5787963, 4, { 58.043961f, -0.000054f, -20.107550f }, 1.000000f, 0.000000f ); 
+      // States -> vf_bextwall_on (id: 3) vf_bextwall_of (id: 4) 
+    instance.registerEObj( "Exit", 2000139, 0, 4, { 100.941902f, -10.500000f, -63.000000f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_4", 2002872, 0, 4, { 87.814133f, -9.000000f, -61.109859f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_5", 2005911, 5814854, 4, { 58.000000f, -8.999999f, -63.000000f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "sgvf_d2a2_b0721", 2006095, 5905878, 4, { 58.000000f, -9.000000f, -63.000000f }, 1.000000f, 0.000000f ); 
+      // States -> thunder_off (id: 2) thunder_on2off (id: 3) thunder_on (id: 4) thunder_off2on (id: 5) 
+    instance.registerEObj( "Entrance", 2000182, 5787948, 5, { -0.015320f, -0.015320f, 43.037189f }, 0.778198f, 0.000048f ); 
+      // States -> vf_lock_on (id: 11) vf_lock_of (id: 12) 
+    instance.registerEObj( "Shortcut", 2000700, 0, 4, { 3.252589f, 0.000000f, 30.523800f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "Entrance_1", 2000182, 5911899, 5, { 58.000000f, -0.000049f, -11.175000f }, 0.800000f, 0.000000f ); 
+      // States -> vf_lock_on (id: 11) vf_lock_of (id: 12) 
+    instance.registerEObj( "sgpl_w_lvd_colwithnavi", 2000608, 5911895, 4, { 58.000000f, 0.841694f, -1.705941f }, 1.000000f, 0.000000f ); 
+
   }
 
-  void onInit( InstanceContentPtr instance ) override
+  void onUpdate( InstanceContent& instance, uint32_t currTime ) override
   {
 
   }
 
-  void onUpdate( InstanceContentPtr instance, uint32_t currTime ) override
-  {
-
-  }
-
-  void onEnterTerritory( InstanceContentPtr instance, Entity::Player& player, uint32_t eventId, uint16_t param1,
+  void onEnterTerritory( InstanceContent& instance, Entity::Player& player, uint32_t eventId, uint16_t param1,
                          uint16_t param2 ) override
   {
 
diff --git a/src/scripts/instances/raids/AlexanderTheArmoftheFatherSavage.cpp b/src/scripts/instances/raids/AlexanderTheArmoftheFatherSavage.cpp
index 21982ed1..63b438e7 100644
--- a/src/scripts/instances/raids/AlexanderTheArmoftheFatherSavage.cpp
+++ b/src/scripts/instances/raids/AlexanderTheArmoftheFatherSavage.cpp
@@ -9,20 +9,38 @@ class AlexanderTheArmoftheFatherSavage :
 public:
   AlexanderTheArmoftheFatherSavage() :
     Sapphire::ScriptAPI::InstanceContentScript( 30027 )
+  { }
+
+  void onInit( InstanceContent& instance ) override
   {
+    instance.registerEObj( "unknown_0", 2005400, 0, 4, { 39.638931f, -9.000000f, -67.173187f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_1", 2005314, 5878653, 4, { 17.839520f, 42.000000f, 14.681990f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "sgpl_d2a3_wall", 2005314, 6048829, 4, { 17.839520f, 42.000000f, 14.681990f }, 1.000000f, 0.000000f ); 
+      // States -> wall_on (id: 24) wall_off (id: 25) 
+    instance.registerEObj( "unknown_2", 2006094, 5864098, 4, { 58.027489f, -0.000134f, -20.193150f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_3", 2002735, 0, 4, { 58.000000f, -0.000003f, -20.943159f }, 0.600000f, 0.000000f ); 
+    instance.registerEObj( "sgvf_w_lvd_b0118", 2002872, 5787963, 4, { 58.043961f, -0.000054f, -20.107550f }, 1.000000f, 0.000000f ); 
+      // States -> vf_bextwall_on (id: 3) vf_bextwall_of (id: 4) 
+    instance.registerEObj( "Exit", 2000139, 0, 4, { 100.941902f, -10.500000f, -63.000000f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_4", 2002872, 0, 4, { 87.814133f, -9.000000f, -61.109859f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_5", 2005911, 5814854, 4, { 58.000000f, -8.999999f, -63.000000f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "sgvf_d2a2_b0721", 2006095, 5905878, 4, { 58.000000f, -9.000000f, -63.000000f }, 1.000000f, 0.000000f ); 
+      // States -> thunder_off (id: 2) thunder_on2off (id: 3) thunder_on (id: 4) thunder_off2on (id: 5) 
+    instance.registerEObj( "Entrance", 2000182, 5787948, 5, { -0.015320f, -0.015320f, 43.037189f }, 0.778198f, 0.000048f ); 
+      // States -> vf_lock_on (id: 11) vf_lock_of (id: 12) 
+    instance.registerEObj( "Shortcut", 2000700, 0, 4, { 3.252589f, 0.000000f, 30.523800f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "Entrance_1", 2000182, 5911899, 5, { 58.000000f, -0.000049f, -11.175000f }, 0.800000f, 0.000000f ); 
+      // States -> vf_lock_on (id: 11) vf_lock_of (id: 12) 
+    instance.registerEObj( "sgpl_w_lvd_colwithnavi", 2000608, 5911895, 4, { 58.000000f, 0.841694f, -1.705941f }, 1.000000f, 0.000000f ); 
+
   }
 
-  void onInit( InstanceContentPtr instance ) override
+  void onUpdate( InstanceContent& instance, uint32_t currTime ) override
   {
 
   }
 
-  void onUpdate( InstanceContentPtr instance, uint32_t currTime ) override
-  {
-
-  }
-
-  void onEnterTerritory( InstanceContentPtr instance, Entity::Player& player, uint32_t eventId, uint16_t param1,
+  void onEnterTerritory( InstanceContent& instance, Entity::Player& player, uint32_t eventId, uint16_t param1,
                          uint16_t param2 ) override
   {
 
diff --git a/src/scripts/instances/raids/AlexanderTheArmoftheSon.cpp b/src/scripts/instances/raids/AlexanderTheArmoftheSon.cpp
index e2ba242b..e65546d9 100644
--- a/src/scripts/instances/raids/AlexanderTheArmoftheSon.cpp
+++ b/src/scripts/instances/raids/AlexanderTheArmoftheSon.cpp
@@ -9,20 +9,69 @@ class AlexanderTheArmoftheSon :
 public:
   AlexanderTheArmoftheSon() :
     Sapphire::ScriptAPI::InstanceContentScript( 30032 )
+  { }
+
+  void onInit( InstanceContent& instance ) override
   {
+    instance.registerEObj( "unknown_0", 2006968, 6185537, 4, { 131.518402f, 80.000000f, 274.864899f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_1", 2006968, 6185538, 4, { 175.156296f, 80.000000f, 241.302505f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "Exhaustductβ", 2006967, 6166806, 4, { 200.016602f, 120.459198f, 366.976898f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "Exhaustductβ_1", 2006967, 6166805, 4, { 205.097305f, 120.459297f, 361.868408f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "Exhaustductβ_2", 2006967, 6166804, 4, { 209.928207f, 120.459297f, 357.120789f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "Exhaustductβ_3", 2006967, 6166803, 4, { 214.981201f, 120.459297f, 352.151215f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "Exhaustductα", 2006966, 6166799, 4, { 240.142395f, 120.459198f, 367.151886f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "Exhaustductα_1", 2006966, 6166800, 4, { 235.272293f, 120.459198f, 362.214691f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "Exhaustductα_2", 2006966, 6166801, 4, { 230.089401f, 120.459198f, 357.031799f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "Exhaustductα_3", 2006966, 6166802, 4, { 224.994095f, 120.439499f, 352.101807f }, 0.991760f, 0.000048f ); 
+    instance.registerEObj( "unknown_2", 2006968, 6185540, 4, { 67.856812f, 44.968262f, 161.486206f }, 0.991760f, 0.000048f ); 
+    instance.registerEObj( "unknown_3", 2006968, 6185539, 4, { 109.369904f, 44.998779f, 135.606796f }, 0.991760f, 0.000048f ); 
+    instance.registerEObj( "Exhaustductβ_4", 2006967, 6166815, 4, { 125.322304f, 79.972527f, 221.637207f }, 0.991760f, 0.000048f ); 
+    instance.registerEObj( "Exhaustductβ_5", 2006967, 6166816, 4, { 123.289001f, 79.972527f, 227.745804f }, 0.991760f, 0.000048f ); 
+    instance.registerEObj( "Exhaustductβ_6", 2006967, 6166817, 4, { 122.181702f, 79.972527f, 234.485397f }, 0.991760f, 0.000048f ); 
+    instance.registerEObj( "Exhaustductβ_7", 2006967, 6166818, 4, { 121.125298f, 79.972527f, 240.497803f }, 0.991760f, 0.000048f ); 
+    instance.registerEObj( "Exhaustductα_4", 2006966, 6166810, 4, { 128.984406f, 79.972527f, 220.023499f }, 0.991760f, 0.000048f ); 
+    instance.registerEObj( "Exhaustductα_5", 2006966, 6166809, 4, { 135.454193f, 79.972527f, 221.574799f }, 0.991760f, 0.000048f ); 
+    instance.registerEObj( "Exhaustductα_6", 2006966, 6166808, 4, { 141.527298f, 79.972527f, 223.192398f }, 0.991760f, 0.000048f ); 
+    instance.registerEObj( "Exhaustductα_7", 2006966, 6166807, 4, { 148.760101f, 79.972527f, 224.975006f }, 0.991760f, 0.000048f ); 
+    instance.registerEObj( "unknown_4", 2002735, 0, 4, { 51.013248f, 39.939819f, 88.328903f }, 1.000000f, -0.523599f ); 
+    instance.registerEObj( "sgvf_w_lvd_b0118", 2002872, 6184075, 4, { 51.497959f, 39.939819f, 88.859413f }, 0.991760f, 0.000048f ); 
+      // States -> vf_bextwall_on (id: 3) vf_bextwall_of (id: 4) 
+    instance.registerEObj( "unknown_5", 2006969, 6168354, 4, { 51.316040f, 39.993900f, 88.853271f }, 0.991760f, 0.000048f ); 
+    instance.registerEObj( "unknown_6", 2006954, 6169546, 4, { 76.247498f, 42.568901f, 132.191803f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_7", 2006968, 6242752, 4, { 76.247498f, 42.568901f, 132.191803f }, 1.000000f, -0.000000f ); 
+    instance.registerEObj( "unknown_8", 2006968, 6242751, 4, { 76.247543f, 42.568901f, 132.191803f }, 100.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_9", 2006954, 6162743, 4, { 0.000000f, 0.000000f, 0.000000f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_10", 2006955, 6197901, 4, { 0.000000f, 0.000000f, 0.000000f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_11", 2006958, 0, 4, { 0.447336f, 0.000000f, 4.119453f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_12", 2006611, 0, 4, { 23.000000f, 0.000000f, -23.000000f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_13", 2006612, 0, 4, { 23.000000f, 0.000000f, 23.000000f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_14", 2006650, 0, 4, { -23.000000f, 0.000000f, 23.000000f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_15", 2006698, 0, 4, { -23.000000f, 0.000000f, -23.000000f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "sgpl_d2a7_jail_col", 2006964, 6215558, 4, { 23.000000f, 0.000000f, -23.000000f }, 1.000000f, 0.000000f ); 
+      // States -> eyecol_on (id: 31) eyecol_off (id: 32) chrcol_on (id: 35) chrcol_off (id: 44) allcol_off (id: 46) 
+    instance.registerEObj( "sgpl_d2a7_jail_col_1", 2006964, 6215559, 4, { 23.000000f, 0.000000f, 23.000000f }, 1.000000f, 0.000000f ); 
+      // States -> eyecol_on (id: 31) eyecol_off (id: 32) chrcol_on (id: 35) chrcol_off (id: 44) allcol_off (id: 46) 
+    instance.registerEObj( "sgpl_d2a7_jail_col_2", 2006964, 6215560, 4, { -23.000000f, 0.000000f, -23.000000f }, 1.000000f, 0.000000f ); 
+      // States -> eyecol_on (id: 31) eyecol_off (id: 32) chrcol_on (id: 35) chrcol_off (id: 44) allcol_off (id: 46) 
+    instance.registerEObj( "sgpl_d2a7_jail_col_3", 2006964, 6215561, 4, { 23.000000f, 0.000000f, -23.000000f }, 1.000000f, 0.000000f ); 
+      // States -> eyecol_on (id: 31) eyecol_off (id: 32) chrcol_on (id: 35) chrcol_off (id: 44) allcol_off (id: 46) 
+    instance.registerEObj( "Exit", 2005313, 6185488, 4, { -0.329697f, 0.000000f, -28.830790f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_16", 2006979, 0, 4, { 23.000000f, 0.000000f, -23.000000f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "Shortcut", 2000700, 0, 4, { 220.005096f, 120.491501f, 359.291504f }, 0.991760f, 0.000048f ); 
+    instance.registerEObj( "Entrance", 2000182, 6177872, 5, { 220.000000f, 120.000000f, 383.467712f }, 1.000000f, 0.000000f ); 
+      // States -> vf_lock_on (id: 11) vf_lock_of (id: 12) 
+    instance.registerEObj( "Entrance_1", 2000182, 6184212, 5, { 62.804680f, 40.200001f, 108.771896f }, 0.991760f, -0.523599f ); 
+      // States -> vf_lock_on (id: 11) vf_lock_of (id: 12) 
+    instance.registerEObj( "Exit_1", 2000139, 0, 4, { 0.000000f, 0.000000f, -29.143539f }, 1.000000f, 0.000000f ); 
+
   }
 
-  void onInit( InstanceContentPtr instance ) override
+  void onUpdate( InstanceContent& instance, uint32_t currTime ) override
   {
 
   }
 
-  void onUpdate( InstanceContentPtr instance, uint32_t currTime ) override
-  {
-
-  }
-
-  void onEnterTerritory( InstanceContentPtr instance, Entity::Player& player, uint32_t eventId, uint16_t param1,
+  void onEnterTerritory( InstanceContent& instance, Entity::Player& player, uint32_t eventId, uint16_t param1,
                          uint16_t param2 ) override
   {
 
diff --git a/src/scripts/instances/raids/AlexanderTheArmoftheSonSavage.cpp b/src/scripts/instances/raids/AlexanderTheArmoftheSonSavage.cpp
index 981e71d9..c5559c12 100644
--- a/src/scripts/instances/raids/AlexanderTheArmoftheSonSavage.cpp
+++ b/src/scripts/instances/raids/AlexanderTheArmoftheSonSavage.cpp
@@ -9,20 +9,69 @@ class AlexanderTheArmoftheSonSavage :
 public:
   AlexanderTheArmoftheSonSavage() :
     Sapphire::ScriptAPI::InstanceContentScript( 30036 )
+  { }
+
+  void onInit( InstanceContent& instance ) override
   {
+    instance.registerEObj( "unknown_0", 2006968, 6185537, 4, { 131.518402f, 80.000000f, 274.864899f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_1", 2006968, 6185538, 4, { 175.156296f, 80.000000f, 241.302505f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "Exhaustductβ", 2006967, 6166806, 4, { 200.016602f, 120.459198f, 366.976898f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "Exhaustductβ_1", 2006967, 6166805, 4, { 205.097305f, 120.459297f, 361.868408f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "Exhaustductβ_2", 2006967, 6166804, 4, { 209.928207f, 120.459297f, 357.120789f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "Exhaustductβ_3", 2006967, 6166803, 4, { 214.981201f, 120.459297f, 352.151215f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "Exhaustductα", 2006966, 6166799, 4, { 240.142395f, 120.459198f, 367.151886f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "Exhaustductα_1", 2006966, 6166800, 4, { 235.272293f, 120.459198f, 362.214691f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "Exhaustductα_2", 2006966, 6166801, 4, { 230.089401f, 120.459198f, 357.031799f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "Exhaustductα_3", 2006966, 6166802, 4, { 224.994095f, 120.439499f, 352.101807f }, 0.991760f, 0.000048f ); 
+    instance.registerEObj( "unknown_2", 2006968, 6185540, 4, { 67.856812f, 44.968262f, 161.486206f }, 0.991760f, 0.000048f ); 
+    instance.registerEObj( "unknown_3", 2006968, 6185539, 4, { 109.369904f, 44.998779f, 135.606796f }, 0.991760f, 0.000048f ); 
+    instance.registerEObj( "Exhaustductβ_4", 2006967, 6166815, 4, { 125.322304f, 79.972527f, 221.637207f }, 0.991760f, 0.000048f ); 
+    instance.registerEObj( "Exhaustductβ_5", 2006967, 6166816, 4, { 123.289001f, 79.972527f, 227.745804f }, 0.991760f, 0.000048f ); 
+    instance.registerEObj( "Exhaustductβ_6", 2006967, 6166817, 4, { 122.181702f, 79.972527f, 234.485397f }, 0.991760f, 0.000048f ); 
+    instance.registerEObj( "Exhaustductβ_7", 2006967, 6166818, 4, { 121.125298f, 79.972527f, 240.497803f }, 0.991760f, 0.000048f ); 
+    instance.registerEObj( "Exhaustductα_4", 2006966, 6166810, 4, { 128.984406f, 79.972527f, 220.023499f }, 0.991760f, 0.000048f ); 
+    instance.registerEObj( "Exhaustductα_5", 2006966, 6166809, 4, { 135.454193f, 79.972527f, 221.574799f }, 0.991760f, 0.000048f ); 
+    instance.registerEObj( "Exhaustductα_6", 2006966, 6166808, 4, { 141.527298f, 79.972527f, 223.192398f }, 0.991760f, 0.000048f ); 
+    instance.registerEObj( "Exhaustductα_7", 2006966, 6166807, 4, { 148.760101f, 79.972527f, 224.975006f }, 0.991760f, 0.000048f ); 
+    instance.registerEObj( "unknown_4", 2002735, 0, 4, { 51.013248f, 39.939819f, 88.328903f }, 1.000000f, -0.523599f ); 
+    instance.registerEObj( "sgvf_w_lvd_b0118", 2002872, 6184075, 4, { 51.497959f, 39.939819f, 88.859413f }, 0.991760f, 0.000048f ); 
+      // States -> vf_bextwall_on (id: 3) vf_bextwall_of (id: 4) 
+    instance.registerEObj( "unknown_5", 2006969, 6168354, 4, { 51.316040f, 39.993900f, 88.853271f }, 0.991760f, 0.000048f ); 
+    instance.registerEObj( "unknown_6", 2006954, 6169546, 4, { 76.247498f, 42.568901f, 132.191803f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_7", 2006968, 6242752, 4, { 76.247498f, 42.568901f, 132.191803f }, 1.000000f, -0.000000f ); 
+    instance.registerEObj( "unknown_8", 2006968, 6242751, 4, { 76.247543f, 42.568901f, 132.191803f }, 100.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_9", 2006954, 6162743, 4, { 0.000000f, 0.000000f, 0.000000f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_10", 2006955, 6197901, 4, { 0.000000f, 0.000000f, 0.000000f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_11", 2006958, 0, 4, { 0.447336f, 0.000000f, 4.119453f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_12", 2006611, 0, 4, { 23.000000f, 0.000000f, -23.000000f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_13", 2006612, 0, 4, { 23.000000f, 0.000000f, 23.000000f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_14", 2006650, 0, 4, { -23.000000f, 0.000000f, 23.000000f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_15", 2006698, 0, 4, { -23.000000f, 0.000000f, -23.000000f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "sgpl_d2a7_jail_col", 2006964, 6215558, 4, { 23.000000f, 0.000000f, -23.000000f }, 1.000000f, 0.000000f ); 
+      // States -> eyecol_on (id: 31) eyecol_off (id: 32) chrcol_on (id: 35) chrcol_off (id: 44) allcol_off (id: 46) 
+    instance.registerEObj( "sgpl_d2a7_jail_col_1", 2006964, 6215559, 4, { 23.000000f, 0.000000f, 23.000000f }, 1.000000f, 0.000000f ); 
+      // States -> eyecol_on (id: 31) eyecol_off (id: 32) chrcol_on (id: 35) chrcol_off (id: 44) allcol_off (id: 46) 
+    instance.registerEObj( "sgpl_d2a7_jail_col_2", 2006964, 6215560, 4, { -23.000000f, 0.000000f, -23.000000f }, 1.000000f, 0.000000f ); 
+      // States -> eyecol_on (id: 31) eyecol_off (id: 32) chrcol_on (id: 35) chrcol_off (id: 44) allcol_off (id: 46) 
+    instance.registerEObj( "sgpl_d2a7_jail_col_3", 2006964, 6215561, 4, { 23.000000f, 0.000000f, -23.000000f }, 1.000000f, 0.000000f ); 
+      // States -> eyecol_on (id: 31) eyecol_off (id: 32) chrcol_on (id: 35) chrcol_off (id: 44) allcol_off (id: 46) 
+    instance.registerEObj( "Exit", 2005313, 6185488, 4, { -0.329697f, 0.000000f, -28.830790f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_16", 2006979, 0, 4, { 23.000000f, 0.000000f, -23.000000f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "Shortcut", 2000700, 0, 4, { 220.005096f, 120.491501f, 359.291504f }, 0.991760f, 0.000048f ); 
+    instance.registerEObj( "Entrance", 2000182, 6177872, 5, { 220.000000f, 120.000000f, 383.467712f }, 1.000000f, 0.000000f ); 
+      // States -> vf_lock_on (id: 11) vf_lock_of (id: 12) 
+    instance.registerEObj( "Entrance_1", 2000182, 6184212, 5, { 62.804680f, 40.200001f, 108.771896f }, 0.991760f, -0.523599f ); 
+      // States -> vf_lock_on (id: 11) vf_lock_of (id: 12) 
+    instance.registerEObj( "Exit_1", 2000139, 0, 4, { 0.000000f, 0.000000f, -29.143539f }, 1.000000f, 0.000000f ); 
+
   }
 
-  void onInit( InstanceContentPtr instance ) override
+  void onUpdate( InstanceContent& instance, uint32_t currTime ) override
   {
 
   }
 
-  void onUpdate( InstanceContentPtr instance, uint32_t currTime ) override
-  {
-
-  }
-
-  void onEnterTerritory( InstanceContentPtr instance, Entity::Player& player, uint32_t eventId, uint16_t param1,
+  void onEnterTerritory( InstanceContent& instance, Entity::Player& player, uint32_t eventId, uint16_t param1,
                          uint16_t param2 ) override
   {
 
diff --git a/src/scripts/instances/raids/AlexanderTheBreathoftheCreator.cpp b/src/scripts/instances/raids/AlexanderTheBreathoftheCreator.cpp
index 26a7b8ef..04c72e2c 100644
--- a/src/scripts/instances/raids/AlexanderTheBreathoftheCreator.cpp
+++ b/src/scripts/instances/raids/AlexanderTheBreathoftheCreator.cpp
@@ -9,20 +9,45 @@ class AlexanderTheBreathoftheCreator :
 public:
   AlexanderTheBreathoftheCreator() :
     Sapphire::ScriptAPI::InstanceContentScript( 30040 )
+  { }
+
+  void onInit( InstanceContent& instance ) override
   {
+    instance.registerEObj( "unknown_0", 2007457, 6424853, 4, { 0.000000f, -114.849998f, 12.000000f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_1", 2007457, 6424863, 4, { 0.000000f, -114.849998f, 0.000000f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_2", 2007457, 6424869, 4, { 0.000000f, -114.849998f, -12.000000f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_3", 2007457, 6418872, 4, { 0.000000f, -114.849998f, 0.000000f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_4", 2007457, 6421358, 4, { 0.000000f, -114.849998f, 10.000000f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_5", 2007457, 6421505, 4, { 0.000000f, -114.849998f, 0.000000f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_6", 2007457, 6421506, 4, { 0.000000f, -114.849998f, -10.000000f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_7", 2007496, 0, 4, { 0.000000f, 0.000000f, 0.000000f }, 1.000000f, -0.000000f ); 
+    instance.registerEObj( "unknown_8", 2007457, 6515444, 4, { 0.680462f, -115.000000f, 1.219872f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_9", 2007498, 0, 4, { 0.000000f, 0.000000f, 0.000000f }, 1.000000f, -0.000000f ); 
+    instance.registerEObj( "unknown_10", 2007457, 0, 4, { 0.000000f, -114.849998f, 10.000000f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "sgvf_d2aa_b0992", 2007457, 6538404, 4, { 0.000000f, -115.000000f, 4.000000f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "sgvf_d2aa_b0992_1", 2007457, 6538406, 4, { 0.000000f, -115.000000f, -4.000006f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_11", 2007457, 6294347, 4, { -17.866249f, -10.500000f, 148.102402f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_12", 2007457, 6294348, 4, { -44.597561f, -10.500000f, 101.743698f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "Exhaustvent", 2007470, 6367742, 4, { 1.716182f, -18.500000f, 37.358582f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "Ingress", 2007471, 0, 4, { 1.998901f, -16.647579f, 36.697880f }, 0.991760f, 0.000048f ); 
+    instance.registerEObj( "unknown_13", 2002735, 0, 4, { 2.000000f, -18.940580f, 37.027279f }, 0.500000f, 0.000000f ); 
+    instance.registerEObj( "sgvf_w_lvd_b0118", 2002872, 6487232, 4, { 1.792570f, -18.500000f, 38.188919f }, 1.000000f, 0.000000f ); 
+      // States -> vf_bextwall_on (id: 3) vf_bextwall_of (id: 4) 
+    instance.registerEObj( "Exit", 2006235, 0, 4, { 11.500000f, -115.007301f, -18.204100f }, 0.991760f, 0.000048f ); 
+    instance.registerEObj( "Entrance", 2000182, 6449464, 5, { -0.025814f, -10.500000f, 188.076599f }, 1.000000f, 0.000000f ); 
+      // States -> vf_lock_on (id: 11) vf_lock_of (id: 12) 
+    instance.registerEObj( "Shortcut", 2000700, 0, 4, { 2.874061f, -10.500000f, 177.815994f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "Entrance_1", 2000182, 6449481, 5, { -7.931533f, -18.500000f, 50.286880f }, 1.000000f, 0.000000f ); 
+      // States -> vf_lock_on (id: 11) vf_lock_of (id: 12) 
+
   }
 
-  void onInit( InstanceContentPtr instance ) override
+  void onUpdate( InstanceContent& instance, uint32_t currTime ) override
   {
 
   }
 
-  void onUpdate( InstanceContentPtr instance, uint32_t currTime ) override
-  {
-
-  }
-
-  void onEnterTerritory( InstanceContentPtr instance, Entity::Player& player, uint32_t eventId, uint16_t param1,
+  void onEnterTerritory( InstanceContent& instance, Entity::Player& player, uint32_t eventId, uint16_t param1,
                          uint16_t param2 ) override
   {
 
diff --git a/src/scripts/instances/raids/AlexanderTheBreathoftheCreatorSavage.cpp b/src/scripts/instances/raids/AlexanderTheBreathoftheCreatorSavage.cpp
index 04d2d39d..e6ae6244 100644
--- a/src/scripts/instances/raids/AlexanderTheBreathoftheCreatorSavage.cpp
+++ b/src/scripts/instances/raids/AlexanderTheBreathoftheCreatorSavage.cpp
@@ -9,20 +9,45 @@ class AlexanderTheBreathoftheCreatorSavage :
 public:
   AlexanderTheBreathoftheCreatorSavage() :
     Sapphire::ScriptAPI::InstanceContentScript( 30044 )
+  { }
+
+  void onInit( InstanceContent& instance ) override
   {
+    instance.registerEObj( "unknown_0", 2007457, 6424853, 4, { 0.000000f, -114.849998f, 12.000000f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_1", 2007457, 6424863, 4, { 0.000000f, -114.849998f, 0.000000f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_2", 2007457, 6424869, 4, { 0.000000f, -114.849998f, -12.000000f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_3", 2007457, 6418872, 4, { 0.000000f, -114.849998f, 0.000000f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_4", 2007457, 6421358, 4, { 0.000000f, -114.849998f, 10.000000f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_5", 2007457, 6421505, 4, { 0.000000f, -114.849998f, 0.000000f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_6", 2007457, 6421506, 4, { 0.000000f, -114.849998f, -10.000000f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_7", 2007496, 0, 4, { 0.000000f, 0.000000f, 0.000000f }, 1.000000f, -0.000000f ); 
+    instance.registerEObj( "unknown_8", 2007457, 6515444, 4, { 0.680462f, -115.000000f, 1.219872f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_9", 2007498, 0, 4, { 0.000000f, 0.000000f, 0.000000f }, 1.000000f, -0.000000f ); 
+    instance.registerEObj( "unknown_10", 2007457, 0, 4, { 0.000000f, -114.849998f, 10.000000f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "sgvf_d2aa_b0992", 2007457, 6538404, 4, { 0.000000f, -115.000000f, 4.000000f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "sgvf_d2aa_b0992_1", 2007457, 6538406, 4, { 0.000000f, -115.000000f, -4.000006f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_11", 2007457, 6294347, 4, { -17.866249f, -10.500000f, 148.102402f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_12", 2007457, 6294348, 4, { -44.597561f, -10.500000f, 101.743698f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "Exhaustvent", 2007470, 6367742, 4, { 1.716182f, -18.500000f, 37.358582f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "Ingress", 2007471, 0, 4, { 1.998901f, -16.647579f, 36.697880f }, 0.991760f, 0.000048f ); 
+    instance.registerEObj( "unknown_13", 2002735, 0, 4, { 2.000000f, -18.940580f, 37.027279f }, 0.500000f, 0.000000f ); 
+    instance.registerEObj( "sgvf_w_lvd_b0118", 2002872, 6487232, 4, { 1.792570f, -18.500000f, 38.188919f }, 1.000000f, 0.000000f ); 
+      // States -> vf_bextwall_on (id: 3) vf_bextwall_of (id: 4) 
+    instance.registerEObj( "Exit", 2006235, 0, 4, { 11.500000f, -115.007301f, -18.204100f }, 0.991760f, 0.000048f ); 
+    instance.registerEObj( "Entrance", 2000182, 6449464, 5, { -0.025814f, -10.500000f, 188.076599f }, 1.000000f, 0.000000f ); 
+      // States -> vf_lock_on (id: 11) vf_lock_of (id: 12) 
+    instance.registerEObj( "Shortcut", 2000700, 0, 4, { 2.874061f, -10.500000f, 177.815994f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "Entrance_1", 2000182, 6449481, 5, { -7.931533f, -18.500000f, 50.286880f }, 1.000000f, 0.000000f ); 
+      // States -> vf_lock_on (id: 11) vf_lock_of (id: 12) 
+
   }
 
-  void onInit( InstanceContentPtr instance ) override
+  void onUpdate( InstanceContent& instance, uint32_t currTime ) override
   {
 
   }
 
-  void onUpdate( InstanceContentPtr instance, uint32_t currTime ) override
-  {
-
-  }
-
-  void onEnterTerritory( InstanceContentPtr instance, Entity::Player& player, uint32_t eventId, uint16_t param1,
+  void onEnterTerritory( InstanceContent& instance, Entity::Player& player, uint32_t eventId, uint16_t param1,
                          uint16_t param2 ) override
   {
 
diff --git a/src/scripts/instances/raids/AlexanderTheBurdenoftheFather.cpp b/src/scripts/instances/raids/AlexanderTheBurdenoftheFather.cpp
index d1e88416..af42fb99 100644
--- a/src/scripts/instances/raids/AlexanderTheBurdenoftheFather.cpp
+++ b/src/scripts/instances/raids/AlexanderTheBurdenoftheFather.cpp
@@ -9,20 +9,23 @@ class AlexanderTheBurdenoftheFather :
 public:
   AlexanderTheBurdenoftheFather() :
     Sapphire::ScriptAPI::InstanceContentScript( 30024 )
+  { }
+
+  void onInit( InstanceContent& instance ) override
   {
+    instance.registerEObj( "unknown_0", 2005494, 5863691, 4, { 102.000000f, 43.646099f, 16.000000f }, 0.991760f, 0.000048f ); 
+    instance.registerEObj( "Entrance", 2000182, 5788043, 5, { -0.001985f, 10.900000f, 20.255680f }, 1.000000f, 0.000000f ); 
+      // States -> vf_lock_on (id: 11) vf_lock_of (id: 12) 
+    instance.registerEObj( "Exit", 2000139, 0, 4, { -0.015320f, 10.561610f, -23.025881f }, 0.991760f, 0.000048f ); 
+
   }
 
-  void onInit( InstanceContentPtr instance ) override
+  void onUpdate( InstanceContent& instance, uint32_t currTime ) override
   {
 
   }
 
-  void onUpdate( InstanceContentPtr instance, uint32_t currTime ) override
-  {
-
-  }
-
-  void onEnterTerritory( InstanceContentPtr instance, Entity::Player& player, uint32_t eventId, uint16_t param1,
+  void onEnterTerritory( InstanceContent& instance, Entity::Player& player, uint32_t eventId, uint16_t param1,
                          uint16_t param2 ) override
   {
 
diff --git a/src/scripts/instances/raids/AlexanderTheBurdenoftheFatherSavage.cpp b/src/scripts/instances/raids/AlexanderTheBurdenoftheFatherSavage.cpp
index b1a8c1fe..8c3cb4eb 100644
--- a/src/scripts/instances/raids/AlexanderTheBurdenoftheFatherSavage.cpp
+++ b/src/scripts/instances/raids/AlexanderTheBurdenoftheFatherSavage.cpp
@@ -9,20 +9,23 @@ class AlexanderTheBurdenoftheFatherSavage :
 public:
   AlexanderTheBurdenoftheFatherSavage() :
     Sapphire::ScriptAPI::InstanceContentScript( 30028 )
+  { }
+
+  void onInit( InstanceContent& instance ) override
   {
+    instance.registerEObj( "unknown_0", 2005494, 5863691, 4, { 102.000000f, 43.646099f, 16.000000f }, 0.991760f, 0.000048f ); 
+    instance.registerEObj( "Entrance", 2000182, 5788043, 5, { -0.001985f, 10.900000f, 20.255680f }, 1.000000f, 0.000000f ); 
+      // States -> vf_lock_on (id: 11) vf_lock_of (id: 12) 
+    instance.registerEObj( "Exit", 2000139, 0, 4, { -0.015320f, 10.561610f, -23.025881f }, 0.991760f, 0.000048f ); 
+
   }
 
-  void onInit( InstanceContentPtr instance ) override
+  void onUpdate( InstanceContent& instance, uint32_t currTime ) override
   {
 
   }
 
-  void onUpdate( InstanceContentPtr instance, uint32_t currTime ) override
-  {
-
-  }
-
-  void onEnterTerritory( InstanceContentPtr instance, Entity::Player& player, uint32_t eventId, uint16_t param1,
+  void onEnterTerritory( InstanceContent& instance, Entity::Player& player, uint32_t eventId, uint16_t param1,
                          uint16_t param2 ) override
   {
 
diff --git a/src/scripts/instances/raids/AlexanderTheBurdenoftheSon.cpp b/src/scripts/instances/raids/AlexanderTheBurdenoftheSon.cpp
index 614a1602..b6d90178 100644
--- a/src/scripts/instances/raids/AlexanderTheBurdenoftheSon.cpp
+++ b/src/scripts/instances/raids/AlexanderTheBurdenoftheSon.cpp
@@ -9,20 +9,26 @@ class AlexanderTheBurdenoftheSon :
 public:
   AlexanderTheBurdenoftheSon() :
     Sapphire::ScriptAPI::InstanceContentScript( 30033 )
+  { }
+
+  void onInit( InstanceContent& instance ) override
   {
+    instance.registerEObj( "Exit", 2000139, 0, 4, { 0.000000f, 10.705920f, -21.985399f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_0", 2006984, 6164617, 4, { -0.231898f, 10.500000f, -1.988388f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "sgvf_d2a8_b0882", 2006989, 6234571, 4, { 0.000000f, 10.500000f, 0.000000f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_1", 2006974, 0, 4, { -16.291439f, 10.500000f, 4.361944f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "Exit_1", 2005313, 6076667, 4, { 0.000000f, 10.500000f, 0.000000f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "Entrance", 2000182, 6177907, 5, { 0.000000f, 10.500000f, 19.500000f }, 1.000000f, 0.000000f ); 
+      // States -> vf_lock_on (id: 11) vf_lock_of (id: 12) 
+
   }
 
-  void onInit( InstanceContentPtr instance ) override
+  void onUpdate( InstanceContent& instance, uint32_t currTime ) override
   {
 
   }
 
-  void onUpdate( InstanceContentPtr instance, uint32_t currTime ) override
-  {
-
-  }
-
-  void onEnterTerritory( InstanceContentPtr instance, Entity::Player& player, uint32_t eventId, uint16_t param1,
+  void onEnterTerritory( InstanceContent& instance, Entity::Player& player, uint32_t eventId, uint16_t param1,
                          uint16_t param2 ) override
   {
 
diff --git a/src/scripts/instances/raids/AlexanderTheBurdenoftheSonSavage.cpp b/src/scripts/instances/raids/AlexanderTheBurdenoftheSonSavage.cpp
index bb6494b1..8858e3eb 100644
--- a/src/scripts/instances/raids/AlexanderTheBurdenoftheSonSavage.cpp
+++ b/src/scripts/instances/raids/AlexanderTheBurdenoftheSonSavage.cpp
@@ -9,20 +9,26 @@ class AlexanderTheBurdenoftheSonSavage :
 public:
   AlexanderTheBurdenoftheSonSavage() :
     Sapphire::ScriptAPI::InstanceContentScript( 30037 )
+  { }
+
+  void onInit( InstanceContent& instance ) override
   {
+    instance.registerEObj( "Exit", 2000139, 0, 4, { 0.000000f, 10.705920f, -21.985399f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_0", 2006984, 6164617, 4, { -0.231898f, 10.500000f, -1.988388f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "sgvf_d2a8_b0882", 2006989, 6234571, 4, { 0.000000f, 10.500000f, 0.000000f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_1", 2006974, 0, 4, { -16.291439f, 10.500000f, 4.361944f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "Exit_1", 2005313, 6076667, 4, { 0.000000f, 10.500000f, 0.000000f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "Entrance", 2000182, 6177907, 5, { 0.000000f, 10.500000f, 19.500000f }, 1.000000f, 0.000000f ); 
+      // States -> vf_lock_on (id: 11) vf_lock_of (id: 12) 
+
   }
 
-  void onInit( InstanceContentPtr instance ) override
+  void onUpdate( InstanceContent& instance, uint32_t currTime ) override
   {
 
   }
 
-  void onUpdate( InstanceContentPtr instance, uint32_t currTime ) override
-  {
-
-  }
-
-  void onEnterTerritory( InstanceContentPtr instance, Entity::Player& player, uint32_t eventId, uint16_t param1,
+  void onEnterTerritory( InstanceContent& instance, Entity::Player& player, uint32_t eventId, uint16_t param1,
                          uint16_t param2 ) override
   {
 
diff --git a/src/scripts/instances/raids/AlexanderTheCuffoftheFather.cpp b/src/scripts/instances/raids/AlexanderTheCuffoftheFather.cpp
index e144122c..a83d4879 100644
--- a/src/scripts/instances/raids/AlexanderTheCuffoftheFather.cpp
+++ b/src/scripts/instances/raids/AlexanderTheCuffoftheFather.cpp
@@ -9,20 +9,49 @@ class AlexanderTheCuffoftheFather :
 public:
   AlexanderTheCuffoftheFather() :
     Sapphire::ScriptAPI::InstanceContentScript( 30022 )
+  { }
+
+  void onInit( InstanceContent& instance ) override
   {
+    instance.registerEObj( "MagitekgobwalkerGVII", 2005126, 0, 4, { -23.299919f, -27.250000f, -93.915253f }, 2.500000f, 0.000000f ); 
+    instance.registerEObj( "MagitekgobwalkerGVII_1", 2005474, 0, 4, { -25.869850f, -27.250000f, -91.505951f }, 2.500000f, 0.000000f ); 
+    instance.registerEObj( "MagitekgobwalkerGVII_2", 2005475, 0, 4, { -28.364830f, -27.250000f, -89.139442f }, 2.500000f, 0.000000f ); 
+    instance.registerEObj( "MagitekgobwalkerGVII_3", 2005126, 0, 4, { -24.477819f, -27.250000f, -93.315643f }, 2.500000f, 0.000000f ); 
+    instance.registerEObj( "MagitekgobwalkerGVII_4", 2005474, 0, 4, { -27.127260f, -27.250000f, -90.671631f }, 2.500000f, 0.000000f ); 
+    instance.registerEObj( "unknown_0", 2005047, 5796486, 4, { -16.006710f, 28.995720f, 121.127502f }, 0.991760f, 0.000048f ); 
+    instance.registerEObj( "unknown_1", 2005047, 5796475, 4, { -15.991690f, 25.994120f, 104.104698f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_2", 2005047, 5796479, 4, { -0.042969f, -15.876210f, 39.414860f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_3", 2005047, 5796481, 4, { -0.042969f, -22.069151f, 4.294098f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "Steamspoutingcontraption", 2005048, 5828187, 4, { -20.999439f, 28.890051f, 120.379700f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_4", 2005428, 5828194, 4, { -20.812780f, 25.885040f, 102.729103f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_5", 2005428, 5828205, 4, { -5.111024f, -22.178221f, 3.677231f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "Shortcut", 2000700, 0, 4, { -19.655809f, 31.065201f, 144.212204f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "sgpl_d2a2_ring1wall", 2005047, 5962936, 4, { -16.018070f, 27.033091f, 118.517899f }, 1.000000f, 0.000000f ); 
+      // States -> rw01_def (id: 33) rw01_opn (id: 34) rw01_around2opn (id: 35) 
+    instance.registerEObj( "sgpl_d2a2_ring3wall", 2005047, 5962937, 4, { 4.629210f, -8.535899f, 53.038620f }, 1.000000f, 0.000000f ); 
+      // States -> rw03_def (id: 31) rw03_opn (id: 32) rw03_around2opn (id: 33) 
+    instance.registerEObj( "unknown_6", 2002735, 0, 4, { 0.000000f, -28.000000f, -53.246899f }, 0.750000f, 0.000000f ); 
+    instance.registerEObj( "sgvf_w_lvd_b0118", 2002872, 5787859, 4, { -0.137953f, -26.000000f, -52.603008f }, 1.000000f, 0.000000f ); 
+      // States -> vf_bextwall_on (id: 3) vf_bextwall_of (id: 4) 
+    instance.registerEObj( "sgvf_w_lvd_b0118_1", 2002872, 5787862, 4, { 0.000000f, -26.000000f, -96.909851f }, 1.000000f, 0.000000f ); 
+      // States -> vf_bextwall_on (id: 3) vf_bextwall_of (id: 4) 
+    instance.registerEObj( "unknown_7", 2006105, 5883005, 4, { 0.000000f, -28.000000f, -75.000000f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "Exit", 2005313, 5908620, 4, { 0.000000f, -26.000000f, -110.560898f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "Exit_1", 2000139, 0, 4, { 0.000000f, -27.991100f, -115.007500f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "Steamspoutingcontraption_1", 2005427, 5828202, 4, { -5.000190f, -15.985280f, 39.105530f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "Entrance", 2000182, 5787826, 5, { -16.006710f, 36.148560f, 161.008804f }, 0.991760f, 0.000048f ); 
+      // States -> vf_lock_on (id: 11) vf_lock_of (id: 12) 
+    instance.registerEObj( "Entrance_1", 2000182, 5908672, 5, { 0.002526f, -28.000019f, -23.439610f }, 0.991760f, 0.000048f ); 
+      // States -> vf_lock_on (id: 11) vf_lock_of (id: 12) 
+
   }
 
-  void onInit( InstanceContentPtr instance ) override
+  void onUpdate( InstanceContent& instance, uint32_t currTime ) override
   {
 
   }
 
-  void onUpdate( InstanceContentPtr instance, uint32_t currTime ) override
-  {
-
-  }
-
-  void onEnterTerritory( InstanceContentPtr instance, Entity::Player& player, uint32_t eventId, uint16_t param1,
+  void onEnterTerritory( InstanceContent& instance, Entity::Player& player, uint32_t eventId, uint16_t param1,
                          uint16_t param2 ) override
   {
 
diff --git a/src/scripts/instances/raids/AlexanderTheCuffoftheFatherSavage.cpp b/src/scripts/instances/raids/AlexanderTheCuffoftheFatherSavage.cpp
index 96f9699c..3ebacca2 100644
--- a/src/scripts/instances/raids/AlexanderTheCuffoftheFatherSavage.cpp
+++ b/src/scripts/instances/raids/AlexanderTheCuffoftheFatherSavage.cpp
@@ -9,20 +9,49 @@ class AlexanderTheCuffoftheFatherSavage :
 public:
   AlexanderTheCuffoftheFatherSavage() :
     Sapphire::ScriptAPI::InstanceContentScript( 30026 )
+  { }
+
+  void onInit( InstanceContent& instance ) override
   {
+    instance.registerEObj( "MagitekgobwalkerGVII", 2005126, 0, 4, { -23.299919f, -27.250000f, -93.915253f }, 2.500000f, 0.000000f ); 
+    instance.registerEObj( "MagitekgobwalkerGVII_1", 2005474, 0, 4, { -25.869850f, -27.250000f, -91.505951f }, 2.500000f, 0.000000f ); 
+    instance.registerEObj( "MagitekgobwalkerGVII_2", 2005475, 0, 4, { -28.364830f, -27.250000f, -89.139442f }, 2.500000f, 0.000000f ); 
+    instance.registerEObj( "MagitekgobwalkerGVII_3", 2005126, 0, 4, { -24.477819f, -27.250000f, -93.315643f }, 2.500000f, 0.000000f ); 
+    instance.registerEObj( "MagitekgobwalkerGVII_4", 2005474, 0, 4, { -27.127260f, -27.250000f, -90.671631f }, 2.500000f, 0.000000f ); 
+    instance.registerEObj( "unknown_0", 2005047, 5796486, 4, { -16.006710f, 28.995720f, 121.127502f }, 0.991760f, 0.000048f ); 
+    instance.registerEObj( "unknown_1", 2005047, 5796475, 4, { -15.991690f, 25.994120f, 104.104698f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_2", 2005047, 5796479, 4, { -0.042969f, -15.876210f, 39.414860f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_3", 2005047, 5796481, 4, { -0.042969f, -22.069151f, 4.294098f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "Steamspoutingcontraption", 2005048, 5828187, 4, { -20.999439f, 28.890051f, 120.379700f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_4", 2005428, 5828194, 4, { -20.812780f, 25.885040f, 102.729103f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_5", 2005428, 5828205, 4, { -5.111024f, -22.178221f, 3.677231f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "Shortcut", 2000700, 0, 4, { -19.655809f, 31.065201f, 144.212204f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "sgpl_d2a2_ring1wall", 2005047, 5962936, 4, { -16.018070f, 27.033091f, 118.517899f }, 1.000000f, 0.000000f ); 
+      // States -> rw01_def (id: 33) rw01_opn (id: 34) rw01_around2opn (id: 35) 
+    instance.registerEObj( "sgpl_d2a2_ring3wall", 2005047, 5962937, 4, { 4.629210f, -8.535899f, 53.038620f }, 1.000000f, 0.000000f ); 
+      // States -> rw03_def (id: 31) rw03_opn (id: 32) rw03_around2opn (id: 33) 
+    instance.registerEObj( "unknown_6", 2002735, 0, 4, { 0.000000f, -28.000000f, -53.246899f }, 0.750000f, 0.000000f ); 
+    instance.registerEObj( "sgvf_w_lvd_b0118", 2002872, 5787859, 4, { -0.137953f, -26.000000f, -52.603008f }, 1.000000f, 0.000000f ); 
+      // States -> vf_bextwall_on (id: 3) vf_bextwall_of (id: 4) 
+    instance.registerEObj( "sgvf_w_lvd_b0118_1", 2002872, 5787862, 4, { 0.000000f, -26.000000f, -96.909851f }, 1.000000f, 0.000000f ); 
+      // States -> vf_bextwall_on (id: 3) vf_bextwall_of (id: 4) 
+    instance.registerEObj( "unknown_7", 2006105, 5883005, 4, { 0.000000f, -28.000000f, -75.000000f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "Exit", 2005313, 5908620, 4, { 0.000000f, -26.000000f, -110.560898f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "Exit_1", 2000139, 0, 4, { 0.000000f, -27.991100f, -115.007500f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "Steamspoutingcontraption_1", 2005427, 5828202, 4, { -5.000190f, -15.985280f, 39.105530f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "Entrance", 2000182, 5787826, 5, { -16.006710f, 36.148560f, 161.008804f }, 0.991760f, 0.000048f ); 
+      // States -> vf_lock_on (id: 11) vf_lock_of (id: 12) 
+    instance.registerEObj( "Entrance_1", 2000182, 5908672, 5, { 0.002526f, -28.000019f, -23.439610f }, 0.991760f, 0.000048f ); 
+      // States -> vf_lock_on (id: 11) vf_lock_of (id: 12) 
+
   }
 
-  void onInit( InstanceContentPtr instance ) override
+  void onUpdate( InstanceContent& instance, uint32_t currTime ) override
   {
 
   }
 
-  void onUpdate( InstanceContentPtr instance, uint32_t currTime ) override
-  {
-
-  }
-
-  void onEnterTerritory( InstanceContentPtr instance, Entity::Player& player, uint32_t eventId, uint16_t param1,
+  void onEnterTerritory( InstanceContent& instance, Entity::Player& player, uint32_t eventId, uint16_t param1,
                          uint16_t param2 ) override
   {
 
diff --git a/src/scripts/instances/raids/AlexanderTheCuffoftheSon.cpp b/src/scripts/instances/raids/AlexanderTheCuffoftheSon.cpp
index 88542c28..0932da08 100644
--- a/src/scripts/instances/raids/AlexanderTheCuffoftheSon.cpp
+++ b/src/scripts/instances/raids/AlexanderTheCuffoftheSon.cpp
@@ -9,20 +9,49 @@ class AlexanderTheCuffoftheSon :
 public:
   AlexanderTheCuffoftheSon() :
     Sapphire::ScriptAPI::InstanceContentScript( 30031 )
+  { }
+
+  void onInit( InstanceContent& instance ) override
   {
+    instance.registerEObj( "unknown_0", 2005400, 0, 4, { -0.062597f, -7.999998f, -318.102112f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_1", 2004356, 6075850, 4, { 16.000000f, 17.661369f, 68.195396f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "Steamspoutingcontraption", 2004357, 6075772, 4, { 21.013269f, 19.288509f, 69.098198f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "sgpl_d2a2_ring1wall", 2004356, 6183194, 4, { 16.000000f, 17.933451f, 69.738426f }, 1.000000f, 0.000000f ); 
+      // States -> rw01_def (id: 33) rw01_opn (id: 34) rw01_around2opn (id: 35) 
+    instance.registerEObj( "unknown_2", 2004362, 6075779, 4, { 21.207670f, 12.939710f, 41.993370f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "sgvf_w_lvd_b0118", 2002872, 6183959, 4, { 0.000000f, -26.000000f, -99.284462f }, 1.000000f, 0.000000f ); 
+      // States -> vf_bextwall_on (id: 3) vf_bextwall_of (id: 4) 
+    instance.registerEObj( "unknown_3", 2002872, 6185722, 4, { 0.000000f, -25.918800f, -139.159302f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_4", 2002735, 0, 4, { 0.000000f, -26.000000f, -100.169899f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_5", 2002735, 0, 4, { 0.000000f, -20.000000f, -163.887405f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_6", 2002872, 6185721, 4, { 0.000000f, -19.913139f, -203.123398f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "sgvf_w_lvd_b0118_1", 2002872, 6183975, 4, { 0.000000f, -20.000000f, -163.001999f }, 1.000000f, 0.000000f ); 
+      // States -> vf_bextwall_on (id: 3) vf_bextwall_of (id: 4) 
+    instance.registerEObj( "unknown_7", 2002735, 0, 4, { 0.000000f, -14.000000f, -227.250000f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_8", 2002872, 6185576, 4, { 0.000000f, -14.000000f, -267.622406f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "sgvf_w_lvd_b0118_2", 2002872, 6183981, 4, { 0.000000f, -14.000000f, -226.639999f }, 1.000000f, 0.000000f ); 
+      // States -> vf_bextwall_on (id: 3) vf_bextwall_of (id: 4) 
+    instance.registerEObj( "unknown_9", 2002735, 0, 4, { 0.000000f, -8.031601f, -286.936798f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "sgvf_w_lvd_b0118_3", 2002872, 6183985, 4, { 0.000000f, -8.000000f, -286.051392f }, 1.000000f, 0.000000f ); 
+      // States -> vf_bextwall_on (id: 3) vf_bextwall_of (id: 4) 
+    instance.registerEObj( "Exit", 2005313, 6186651, 4, { -0.636187f, -7.999998f, -335.408813f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "Exit_1", 2000139, 0, 4, { 0.000000f, -7.921236f, -335.377502f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_10", 2006984, 6210606, 4, { -0.151275f, -14.000000f, -248.039703f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "sgvf_d2a8_b0882", 2006989, 6234539, 4, { 1.000000f, -20.000000f, -184.000000f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "Entrance", 2000182, 6177892, 5, { 16.000000f, 21.783440f, 91.573517f }, 1.000000f, 0.000000f ); 
+      // States -> vf_lock_on (id: 11) vf_lock_of (id: 12) 
+    instance.registerEObj( "Shortcut", 2000700, 0, 4, { 10.387650f, 18.918310f, 75.899696f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "Entrance_1", 2000182, 6184206, 5, { 0.000000f, -26.000000f, -65.141693f }, 1.000000f, 0.000000f ); 
+      // States -> vf_lock_on (id: 11) vf_lock_of (id: 12) 
+
   }
 
-  void onInit( InstanceContentPtr instance ) override
+  void onUpdate( InstanceContent& instance, uint32_t currTime ) override
   {
 
   }
 
-  void onUpdate( InstanceContentPtr instance, uint32_t currTime ) override
-  {
-
-  }
-
-  void onEnterTerritory( InstanceContentPtr instance, Entity::Player& player, uint32_t eventId, uint16_t param1,
+  void onEnterTerritory( InstanceContent& instance, Entity::Player& player, uint32_t eventId, uint16_t param1,
                          uint16_t param2 ) override
   {
 
diff --git a/src/scripts/instances/raids/AlexanderTheCuffoftheSonSavage.cpp b/src/scripts/instances/raids/AlexanderTheCuffoftheSonSavage.cpp
index 9bb39c8d..18a1d900 100644
--- a/src/scripts/instances/raids/AlexanderTheCuffoftheSonSavage.cpp
+++ b/src/scripts/instances/raids/AlexanderTheCuffoftheSonSavage.cpp
@@ -9,20 +9,49 @@ class AlexanderTheCuffoftheSonSavage :
 public:
   AlexanderTheCuffoftheSonSavage() :
     Sapphire::ScriptAPI::InstanceContentScript( 30035 )
+  { }
+
+  void onInit( InstanceContent& instance ) override
   {
+    instance.registerEObj( "unknown_0", 2005400, 0, 4, { -0.062597f, -7.999998f, -318.102112f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_1", 2004356, 6075850, 4, { 16.000000f, 17.661369f, 68.195396f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "Steamspoutingcontraption", 2004357, 6075772, 4, { 21.013269f, 19.288509f, 69.098198f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "sgpl_d2a2_ring1wall", 2004356, 6183194, 4, { 16.000000f, 17.933451f, 69.738426f }, 1.000000f, 0.000000f ); 
+      // States -> rw01_def (id: 33) rw01_opn (id: 34) rw01_around2opn (id: 35) 
+    instance.registerEObj( "unknown_2", 2004362, 6075779, 4, { 21.207670f, 12.939710f, 41.993370f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "sgvf_w_lvd_b0118", 2002872, 6183959, 4, { 0.000000f, -26.000000f, -99.284462f }, 1.000000f, 0.000000f ); 
+      // States -> vf_bextwall_on (id: 3) vf_bextwall_of (id: 4) 
+    instance.registerEObj( "unknown_3", 2002872, 6185722, 4, { 0.000000f, -25.918800f, -139.159302f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_4", 2002735, 0, 4, { 0.000000f, -26.000000f, -100.169899f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_5", 2002735, 0, 4, { 0.000000f, -20.000000f, -163.887405f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_6", 2002872, 6185721, 4, { 0.000000f, -19.913139f, -203.123398f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "sgvf_w_lvd_b0118_1", 2002872, 6183975, 4, { 0.000000f, -20.000000f, -163.001999f }, 1.000000f, 0.000000f ); 
+      // States -> vf_bextwall_on (id: 3) vf_bextwall_of (id: 4) 
+    instance.registerEObj( "unknown_7", 2002735, 0, 4, { 0.000000f, -14.000000f, -227.250000f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_8", 2002872, 6185576, 4, { 0.000000f, -14.000000f, -267.622406f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "sgvf_w_lvd_b0118_2", 2002872, 6183981, 4, { 0.000000f, -14.000000f, -226.639999f }, 1.000000f, 0.000000f ); 
+      // States -> vf_bextwall_on (id: 3) vf_bextwall_of (id: 4) 
+    instance.registerEObj( "unknown_9", 2002735, 0, 4, { 0.000000f, -8.031601f, -286.936798f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "sgvf_w_lvd_b0118_3", 2002872, 6183985, 4, { 0.000000f, -8.000000f, -286.051392f }, 1.000000f, 0.000000f ); 
+      // States -> vf_bextwall_on (id: 3) vf_bextwall_of (id: 4) 
+    instance.registerEObj( "Exit", 2005313, 6186651, 4, { -0.636187f, -7.999998f, -335.408813f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "Exit_1", 2000139, 0, 4, { 0.000000f, -7.921236f, -335.377502f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_10", 2006984, 6210606, 4, { -0.151275f, -14.000000f, -248.039703f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "sgvf_d2a8_b0882", 2006989, 6234539, 4, { 1.000000f, -20.000000f, -184.000000f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "Entrance", 2000182, 6177892, 5, { 16.000000f, 21.783440f, 91.573517f }, 1.000000f, 0.000000f ); 
+      // States -> vf_lock_on (id: 11) vf_lock_of (id: 12) 
+    instance.registerEObj( "Shortcut", 2000700, 0, 4, { 10.387650f, 18.918310f, 75.899696f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "Entrance_1", 2000182, 6184206, 5, { 0.000000f, -26.000000f, -65.141693f }, 1.000000f, 0.000000f ); 
+      // States -> vf_lock_on (id: 11) vf_lock_of (id: 12) 
+
   }
 
-  void onInit( InstanceContentPtr instance ) override
+  void onUpdate( InstanceContent& instance, uint32_t currTime ) override
   {
 
   }
 
-  void onUpdate( InstanceContentPtr instance, uint32_t currTime ) override
-  {
-
-  }
-
-  void onEnterTerritory( InstanceContentPtr instance, Entity::Player& player, uint32_t eventId, uint16_t param1,
+  void onEnterTerritory( InstanceContent& instance, Entity::Player& player, uint32_t eventId, uint16_t param1,
                          uint16_t param2 ) override
   {
 
diff --git a/src/scripts/instances/raids/AlexanderTheEyesoftheCreator.cpp b/src/scripts/instances/raids/AlexanderTheEyesoftheCreator.cpp
index 53909bf5..677c5cde 100644
--- a/src/scripts/instances/raids/AlexanderTheEyesoftheCreator.cpp
+++ b/src/scripts/instances/raids/AlexanderTheEyesoftheCreator.cpp
@@ -9,20 +9,49 @@ class AlexanderTheEyesoftheCreator :
 public:
   AlexanderTheEyesoftheCreator() :
     Sapphire::ScriptAPI::InstanceContentScript( 30039 )
+  { }
+
+  void onInit( InstanceContent& instance ) override
   {
+    instance.registerEObj( "unknown_0", 2007457, 6430458, 4, { 8.200209f, -250.000000f, -257.340210f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_1", 2007457, 6430459, 4, { 8.200209f, -250.000000f, -242.154495f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_2", 2007457, 6430457, 4, { -9.317612f, -250.000000f, -257.340210f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_3", 2007457, 6430456, 4, { -9.317612f, -250.000000f, -242.154495f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "Powergenerator", 2007469, 0, 4, { 13.381770f, -250.000000f, -248.034500f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_4", 2007457, 6513582, 4, { 10.437510f, -250.000000f, -260.791412f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_5", 2007457, 6513579, 4, { 10.437510f, -250.000000f, -238.786697f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_6", 2007457, 6513584, 4, { -11.731350f, -250.000000f, -260.791412f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_7", 2007457, 6511025, 4, { -11.731350f, -250.000000f, -238.786697f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_8", 2007457, 6516007, 4, { 0.000000f, -249.000000f, -250.000000f }, 1.000000f, -0.000000f ); 
+    instance.registerEObj( "unknown_9", 2007457, 6412089, 4, { -124.346802f, -26.965401f, -70.917450f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_10", 2007457, 6492511, 4, { -124.346802f, -26.965401f, -70.917503f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "Ingress", 2007456, 0, 4, { -40.238098f, 116.186600f, 3.921570f }, 0.991760f, 0.000048f ); 
+    instance.registerEObj( "unknown_11", 2002735, 0, 4, { -40.738098f, 114.683800f, 6.860600f }, 0.750000f, 0.154238f ); 
+    instance.registerEObj( "sgvf_w_lvd_b0118", 2002872, 6480419, 4, { -40.263161f, 114.683800f, 4.312012f }, 1.000000f, 0.000000f ); 
+      // States -> vf_bextwall_on (id: 3) vf_bextwall_of (id: 4) 
+    instance.registerEObj( "Exit", 2000139, 0, 4, { -0.015320f, -246.936798f, -289.430511f }, 0.991760f, 0.000048f ); 
+    instance.registerEObj( "Cranialhatch", 2007455, 6401919, 4, { -40.885181f, 114.683899f, 3.853281f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_12", 2002872, 6488523, 4, { -41.825008f, 114.671501f, -5.474617f }, 0.991760f, 0.000048f ); 
+    instance.registerEObj( "sgvf_w_lvd_b0118_1", 2007457, 6480499, 4, { 0.029205f, -250.000000f, -269.982300f }, 1.000000f, 0.000000f ); 
+      // States -> vf_bextwall_on (id: 3) vf_bextwall_of (id: 4) 
+    instance.registerEObj( "unknown_13", 2007457, 6422309, 4, { 0.029205f, -249.000000f, -271.779205f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_14", 2002587, 0, 4, { -36.774879f, 114.683701f, -18.658051f }, 1.200000f, 0.153589f ); 
+    instance.registerEObj( "sgvf_w_lvd_b0250", 2002872, 6502657, 4, { -36.910030f, 114.683701f, -17.920090f }, 1.000000f, 0.000000f ); 
+      // States -> vf_bextwall_on (id: 3) vf_bextwall_of (id: 4) 
+    instance.registerEObj( "Entrance", 2000182, 6449051, 5, { -133.348099f, -24.805401f, -98.991310f }, 1.000000f, 0.000000f ); 
+      // States -> vf_lock_on (id: 11) vf_lock_of (id: 12) 
+    instance.registerEObj( "Shortcut", 2000700, 0, 4, { -133.531906f, -24.595860f, -91.717850f }, 0.991760f, 0.000048f ); 
+    instance.registerEObj( "Entrance_1", 2000182, 6449334, 5, { -36.523010f, 114.683701f, -20.849701f }, 1.000000f, 0.155675f ); 
+      // States -> vf_lock_on (id: 11) vf_lock_of (id: 12) 
+
   }
 
-  void onInit( InstanceContentPtr instance ) override
+  void onUpdate( InstanceContent& instance, uint32_t currTime ) override
   {
 
   }
 
-  void onUpdate( InstanceContentPtr instance, uint32_t currTime ) override
-  {
-
-  }
-
-  void onEnterTerritory( InstanceContentPtr instance, Entity::Player& player, uint32_t eventId, uint16_t param1,
+  void onEnterTerritory( InstanceContent& instance, Entity::Player& player, uint32_t eventId, uint16_t param1,
                          uint16_t param2 ) override
   {
 
diff --git a/src/scripts/instances/raids/AlexanderTheEyesoftheCreatorSavage.cpp b/src/scripts/instances/raids/AlexanderTheEyesoftheCreatorSavage.cpp
index d9cf0a47..191bc951 100644
--- a/src/scripts/instances/raids/AlexanderTheEyesoftheCreatorSavage.cpp
+++ b/src/scripts/instances/raids/AlexanderTheEyesoftheCreatorSavage.cpp
@@ -9,20 +9,49 @@ class AlexanderTheEyesoftheCreatorSavage :
 public:
   AlexanderTheEyesoftheCreatorSavage() :
     Sapphire::ScriptAPI::InstanceContentScript( 30043 )
+  { }
+
+  void onInit( InstanceContent& instance ) override
   {
+    instance.registerEObj( "unknown_0", 2007457, 6430458, 4, { 8.200209f, -250.000000f, -257.340210f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_1", 2007457, 6430459, 4, { 8.200209f, -250.000000f, -242.154495f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_2", 2007457, 6430457, 4, { -9.317612f, -250.000000f, -257.340210f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_3", 2007457, 6430456, 4, { -9.317612f, -250.000000f, -242.154495f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "Powergenerator", 2007469, 0, 4, { 13.381770f, -250.000000f, -248.034500f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_4", 2007457, 6513582, 4, { 10.437510f, -250.000000f, -260.791412f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_5", 2007457, 6513579, 4, { 10.437510f, -250.000000f, -238.786697f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_6", 2007457, 6513584, 4, { -11.731350f, -250.000000f, -260.791412f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_7", 2007457, 6511025, 4, { -11.731350f, -250.000000f, -238.786697f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_8", 2007457, 6516007, 4, { 0.000000f, -249.000000f, -250.000000f }, 1.000000f, -0.000000f ); 
+    instance.registerEObj( "unknown_9", 2007457, 6412089, 4, { -124.346802f, -26.965401f, -70.917450f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_10", 2007457, 6492511, 4, { -124.346802f, -26.965401f, -70.917503f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "Ingress", 2007456, 0, 4, { -40.238098f, 116.186600f, 3.921570f }, 0.991760f, 0.000048f ); 
+    instance.registerEObj( "unknown_11", 2002735, 0, 4, { -40.738098f, 114.683800f, 6.860600f }, 0.750000f, 0.154238f ); 
+    instance.registerEObj( "sgvf_w_lvd_b0118", 2002872, 6480419, 4, { -40.263161f, 114.683800f, 4.312012f }, 1.000000f, 0.000000f ); 
+      // States -> vf_bextwall_on (id: 3) vf_bextwall_of (id: 4) 
+    instance.registerEObj( "Exit", 2000139, 0, 4, { -0.015320f, -246.936798f, -289.430511f }, 0.991760f, 0.000048f ); 
+    instance.registerEObj( "Cranialhatch", 2007455, 6401919, 4, { -40.885181f, 114.683899f, 3.853281f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_12", 2002872, 6488523, 4, { -41.825008f, 114.671501f, -5.474617f }, 0.991760f, 0.000048f ); 
+    instance.registerEObj( "sgvf_w_lvd_b0118_1", 2007457, 6480499, 4, { 0.029205f, -250.000000f, -269.982300f }, 1.000000f, 0.000000f ); 
+      // States -> vf_bextwall_on (id: 3) vf_bextwall_of (id: 4) 
+    instance.registerEObj( "unknown_13", 2007457, 6422309, 4, { 0.029205f, -249.000000f, -271.779205f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_14", 2002587, 0, 4, { -36.774879f, 114.683701f, -18.658051f }, 1.200000f, 0.153589f ); 
+    instance.registerEObj( "sgvf_w_lvd_b0250", 2002872, 6502657, 4, { -36.910030f, 114.683701f, -17.920090f }, 1.000000f, 0.000000f ); 
+      // States -> vf_bextwall_on (id: 3) vf_bextwall_of (id: 4) 
+    instance.registerEObj( "Entrance", 2000182, 6449051, 5, { -133.348099f, -24.805401f, -98.991310f }, 1.000000f, 0.000000f ); 
+      // States -> vf_lock_on (id: 11) vf_lock_of (id: 12) 
+    instance.registerEObj( "Shortcut", 2000700, 0, 4, { -133.531906f, -24.595860f, -91.717850f }, 0.991760f, 0.000048f ); 
+    instance.registerEObj( "Entrance_1", 2000182, 6449334, 5, { -36.523010f, 114.683701f, -20.849701f }, 1.000000f, 0.155675f ); 
+      // States -> vf_lock_on (id: 11) vf_lock_of (id: 12) 
+
   }
 
-  void onInit( InstanceContentPtr instance ) override
+  void onUpdate( InstanceContent& instance, uint32_t currTime ) override
   {
 
   }
 
-  void onUpdate( InstanceContentPtr instance, uint32_t currTime ) override
-  {
-
-  }
-
-  void onEnterTerritory( InstanceContentPtr instance, Entity::Player& player, uint32_t eventId, uint16_t param1,
+  void onEnterTerritory( InstanceContent& instance, Entity::Player& player, uint32_t eventId, uint16_t param1,
                          uint16_t param2 ) override
   {
 
diff --git a/src/scripts/instances/raids/AlexanderTheFistoftheFather.cpp b/src/scripts/instances/raids/AlexanderTheFistoftheFather.cpp
index d2751f97..ed51a6f3 100644
--- a/src/scripts/instances/raids/AlexanderTheFistoftheFather.cpp
+++ b/src/scripts/instances/raids/AlexanderTheFistoftheFather.cpp
@@ -9,20 +9,57 @@ class AlexanderTheFistoftheFather :
 public:
   AlexanderTheFistoftheFather() :
     Sapphire::ScriptAPI::InstanceContentScript( 30021 )
+  { }
+
+  void onInit( InstanceContent& instance ) override
   {
+    instance.registerEObj( "unknown_0", 2005032, 0, 4, { -10.154560f, -23.900000f, -171.851105f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_1", 2005046, 0, 4, { -13.656920f, -24.002501f, -180.132797f }, 0.991760f, 0.000048f ); 
+    instance.registerEObj( "unknown_2", 2005033, 0, 4, { -16.466789f, -24.000000f, -176.308197f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_3", 2002735, 0, 4, { 0.000000f, 8.000000f, -39.386002f }, 0.750000f, 0.000000f ); 
+    instance.registerEObj( "sgvf_w_lvd_b0118", 2002872, 5787765, 4, { -0.007763f, 8.000001f, -38.723202f }, 1.000000f, 0.000000f ); 
+      // States -> vf_bextwall_on (id: 3) vf_bextwall_of (id: 4) 
+    instance.registerEObj( "sgvf_w_lvd_b0118_1", 2002872, 5787769, 4, { -0.007763f, 8.000002f, -76.255096f }, 1.000000f, 0.000000f ); 
+      // States -> vf_bextwall_on (id: 3) vf_bextwall_of (id: 4) 
+    instance.registerEObj( "unknown_4", 2005148, 5835158, 4, { -5.000000f, -4.351456f, 18.500000f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_5", 2005149, 5835159, 4, { 5.000000f, -4.368736f, 18.500000f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_6", 2005150, 5835148, 4, { -4.000000f, -3.485719f, 13.500000f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_7", 2005151, 5835149, 4, { 4.000000f, -3.483227f, 13.500000f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_8", 2005315, 5835144, 4, { -4.000000f, -2.619212f, 8.500000f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_9", 2006035, 5835145, 4, { 4.000000f, -2.621703f, 8.500000f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_10", 2006053, 5835143, 4, { -3.000000f, -1.918940f, 4.500000f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_11", 2006054, 5835135, 4, { 3.000000f, -1.911465f, 4.500000f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_12", 2006055, 5835141, 4, { -3.000000f, -1.231334f, 0.500000f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_13", 2006056, 5835136, 4, { 3.000000f, -1.231335f, 0.500000f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_14", 2006057, 5835153, 4, { -9.000000f, -3.642947f, 14.500000f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_15", 2006058, 5835152, 4, { -9.000000f, -3.309154f, 12.500000f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_16", 2006059, 5835151, 4, { 9.000000f, -3.666079f, 14.500000f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_17", 2006060, 5835150, 4, { 9.000000f, -3.310075f, 12.500000f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_18", 2006093, 5858144, 4, { -0.006211f, 12.000000f, -107.218903f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "sgvf_w_lvd_b0118_2", 2002872, 5787778, 4, { 0.000000f, 12.000000f, -107.839302f }, 1.000000f, 0.000000f ); 
+      // States -> vf_bextwall_on (id: 3) vf_bextwall_of (id: 4) 
+    instance.registerEObj( "Exit", 2000139, 0, 4, { 0.035584f, -24.311769f, -187.660599f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_19", 2005402, 5815199, 4, { 1.317244f, -23.900000f, -173.937302f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_20", 2005401, 5837182, 4, { -0.350596f, -23.900000f, -171.328796f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "Exit_1", 2005313, 5908619, 4, { 0.000000f, -23.476339f, -186.888397f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_21", 2002735, 0, 4, { 0.000000f, 11.993800f, -108.070297f }, 0.500000f, 0.000000f ); 
+    instance.registerEObj( "Entrance", 2000182, 5786793, 5, { -0.057753f, -21.358721f, 88.563942f }, 1.000000f, 0.000000f ); 
+      // States -> vf_lock_on (id: 11) vf_lock_of (id: 12) 
+    instance.registerEObj( "Shortcut", 2000700, 0, 4, { -1.141299f, -16.781481f, 74.122673f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_22", 2005147, 5905927, 4, { -0.186450f, -20.599979f, 84.260910f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "Entrance_1", 2000182, 5911084, 5, { -0.057753f, 8.090733f, -31.639650f }, 1.000000f, 0.000000f ); 
+      // States -> vf_lock_on (id: 11) vf_lock_of (id: 12) 
+    instance.registerEObj( "sgpl_w_lvd_colwithnavi", 2000608, 5911088, 4, { -0.300161f, 5.743856f, -19.072269f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_23", 2005147, 5912244, 4, { -0.186450f, 8.755365f, -27.952221f }, 1.000000f, 0.000000f ); 
+
   }
 
-  void onInit( InstanceContentPtr instance ) override
+  void onUpdate( InstanceContent& instance, uint32_t currTime ) override
   {
 
   }
 
-  void onUpdate( InstanceContentPtr instance, uint32_t currTime ) override
-  {
-
-  }
-
-  void onEnterTerritory( InstanceContentPtr instance, Entity::Player& player, uint32_t eventId, uint16_t param1,
+  void onEnterTerritory( InstanceContent& instance, Entity::Player& player, uint32_t eventId, uint16_t param1,
                          uint16_t param2 ) override
   {
 
diff --git a/src/scripts/instances/raids/AlexanderTheFistoftheFatherSavage.cpp b/src/scripts/instances/raids/AlexanderTheFistoftheFatherSavage.cpp
index b233a1a2..b38b53ec 100644
--- a/src/scripts/instances/raids/AlexanderTheFistoftheFatherSavage.cpp
+++ b/src/scripts/instances/raids/AlexanderTheFistoftheFatherSavage.cpp
@@ -9,20 +9,57 @@ class AlexanderTheFistoftheFatherSavage :
 public:
   AlexanderTheFistoftheFatherSavage() :
     Sapphire::ScriptAPI::InstanceContentScript( 30025 )
+  { }
+
+  void onInit( InstanceContent& instance ) override
   {
+    instance.registerEObj( "unknown_0", 2005032, 0, 4, { -10.154560f, -23.900000f, -171.851105f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_1", 2005046, 0, 4, { -13.656920f, -24.002501f, -180.132797f }, 0.991760f, 0.000048f ); 
+    instance.registerEObj( "unknown_2", 2005033, 0, 4, { -16.466789f, -24.000000f, -176.308197f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_3", 2002735, 0, 4, { 0.000000f, 8.000000f, -39.386002f }, 0.750000f, 0.000000f ); 
+    instance.registerEObj( "sgvf_w_lvd_b0118", 2002872, 5787765, 4, { -0.007763f, 8.000001f, -38.723202f }, 1.000000f, 0.000000f ); 
+      // States -> vf_bextwall_on (id: 3) vf_bextwall_of (id: 4) 
+    instance.registerEObj( "sgvf_w_lvd_b0118_1", 2002872, 5787769, 4, { -0.007763f, 8.000002f, -76.255096f }, 1.000000f, 0.000000f ); 
+      // States -> vf_bextwall_on (id: 3) vf_bextwall_of (id: 4) 
+    instance.registerEObj( "unknown_4", 2005148, 5835158, 4, { -5.000000f, -4.351456f, 18.500000f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_5", 2005149, 5835159, 4, { 5.000000f, -4.368736f, 18.500000f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_6", 2005150, 5835148, 4, { -4.000000f, -3.485719f, 13.500000f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_7", 2005151, 5835149, 4, { 4.000000f, -3.483227f, 13.500000f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_8", 2005315, 5835144, 4, { -4.000000f, -2.619212f, 8.500000f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_9", 2006035, 5835145, 4, { 4.000000f, -2.621703f, 8.500000f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_10", 2006053, 5835143, 4, { -3.000000f, -1.918940f, 4.500000f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_11", 2006054, 5835135, 4, { 3.000000f, -1.911465f, 4.500000f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_12", 2006055, 5835141, 4, { -3.000000f, -1.231334f, 0.500000f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_13", 2006056, 5835136, 4, { 3.000000f, -1.231335f, 0.500000f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_14", 2006057, 5835153, 4, { -9.000000f, -3.642947f, 14.500000f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_15", 2006058, 5835152, 4, { -9.000000f, -3.309154f, 12.500000f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_16", 2006059, 5835151, 4, { 9.000000f, -3.666079f, 14.500000f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_17", 2006060, 5835150, 4, { 9.000000f, -3.310075f, 12.500000f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_18", 2006093, 5858144, 4, { -0.006211f, 12.000000f, -107.218903f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "sgvf_w_lvd_b0118_2", 2002872, 5787778, 4, { 0.000000f, 12.000000f, -107.839302f }, 1.000000f, 0.000000f ); 
+      // States -> vf_bextwall_on (id: 3) vf_bextwall_of (id: 4) 
+    instance.registerEObj( "Exit", 2000139, 0, 4, { 0.035584f, -24.311769f, -187.660599f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_19", 2005402, 5815199, 4, { 1.317244f, -23.900000f, -173.937302f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_20", 2005401, 5837182, 4, { -0.350596f, -23.900000f, -171.328796f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "Exit_1", 2005313, 5908619, 4, { 0.000000f, -23.476339f, -186.888397f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_21", 2002735, 0, 4, { 0.000000f, 11.993800f, -108.070297f }, 0.500000f, 0.000000f ); 
+    instance.registerEObj( "Entrance", 2000182, 5786793, 5, { -0.057753f, -21.358721f, 88.563942f }, 1.000000f, 0.000000f ); 
+      // States -> vf_lock_on (id: 11) vf_lock_of (id: 12) 
+    instance.registerEObj( "Shortcut", 2000700, 0, 4, { -1.141299f, -16.781481f, 74.122673f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_22", 2005147, 5905927, 4, { -0.186450f, -20.599979f, 84.260910f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "Entrance_1", 2000182, 5911084, 5, { -0.057753f, 8.090733f, -31.639650f }, 1.000000f, 0.000000f ); 
+      // States -> vf_lock_on (id: 11) vf_lock_of (id: 12) 
+    instance.registerEObj( "sgpl_w_lvd_colwithnavi", 2000608, 5911088, 4, { -0.300161f, 5.743856f, -19.072269f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_23", 2005147, 5912244, 4, { -0.186450f, 8.755365f, -27.952221f }, 1.000000f, 0.000000f ); 
+
   }
 
-  void onInit( InstanceContentPtr instance ) override
+  void onUpdate( InstanceContent& instance, uint32_t currTime ) override
   {
 
   }
 
-  void onUpdate( InstanceContentPtr instance, uint32_t currTime ) override
-  {
-
-  }
-
-  void onEnterTerritory( InstanceContentPtr instance, Entity::Player& player, uint32_t eventId, uint16_t param1,
+  void onEnterTerritory( InstanceContent& instance, Entity::Player& player, uint32_t eventId, uint16_t param1,
                          uint16_t param2 ) override
   {
 
diff --git a/src/scripts/instances/raids/AlexanderTheFistoftheSon.cpp b/src/scripts/instances/raids/AlexanderTheFistoftheSon.cpp
index 44ca56b6..5c2fcd6a 100644
--- a/src/scripts/instances/raids/AlexanderTheFistoftheSon.cpp
+++ b/src/scripts/instances/raids/AlexanderTheFistoftheSon.cpp
@@ -9,20 +9,48 @@ class AlexanderTheFistoftheSon :
 public:
   AlexanderTheFistoftheSon() :
     Sapphire::ScriptAPI::InstanceContentScript( 30030 )
+  { }
+
+  void onInit( InstanceContent& instance ) override
   {
+    instance.registerEObj( "unknown_0", 2006093, 0, 4, { -0.030479f, -18.000000f, -87.654160f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "sgvf_w_lvd_b0250", 2002872, 6179766, 4, { 0.048718f, -8.000000f, -25.550190f }, 1.000000f, 0.000000f ); 
+      // States -> vf_bextwall_on (id: 3) vf_bextwall_of (id: 4) 
+    instance.registerEObj( "sgvf_w_lvd_b0118", 2002872, 6179771, 4, { 0.348718f, -8.000000f, -62.819778f }, 1.000000f, 0.000000f ); 
+      // States -> vf_bextwall_on (id: 3) vf_bextwall_of (id: 4) 
+    instance.registerEObj( "unknown_1", 2002587, 0, 4, { 0.000000f, -7.796605f, -27.253839f }, 1.400000f, 0.000000f ); 
+    instance.registerEObj( "sgvf_w_lvd_b0118_1", 2002872, 6179774, 4, { 0.000000f, -18.000000f, -86.751549f }, 1.000000f, 0.000000f ); 
+      // States -> vf_bextwall_on (id: 3) vf_bextwall_of (id: 4) 
+    instance.registerEObj( "unknown_2", 2002735, 0, 4, { 0.000000f, -18.000000f, -88.696098f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "Exit", 2000139, 0, 4, { -10.159560f, -10.000000f, -208.556000f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_3", 2006965, 6200579, 4, { 0.000000f, -10.000000f, -190.000000f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "sgbg_d2a0_a5_spry4", 2004870, 6200506, 4, { -0.400928f, -10.000000f, -198.953598f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "sgbg_d2a0_a5_spry3", 2005111, 6200497, 4, { 9.766629f, -10.000000f, -190.029099f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "Koboldkey", 2006468, 6200507, 4, { -9.431794f, -10.000000f, -190.472397f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "Koboldkey_1", 2006469, 6200508, 4, { 0.206919f, -10.000000f, -180.011597f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_4", 2004363, 0, 4, { 0.000000f, -10.000000f, -190.000000f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_5", 2004367, 0, 4, { 0.000000f, -10.000000f, -206.000000f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_6", 2004368, 0, 4, { 16.000000f, -10.000000f, -190.000000f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_7", 2004369, 0, 4, { -16.000000f, -10.000000f, -190.000000f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_8", 2004575, 0, 4, { 0.000000f, -10.000000f, -174.000000f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "Exit_1", 2005313, 6180367, 4, { -8.545354f, -9.800000f, -209.792007f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "Entrance", 2000182, 6177861, 5, { 0.000000f, -60.199001f, 70.921097f }, 1.000000f, 0.000000f ); 
+      // States -> vf_lock_on (id: 11) vf_lock_of (id: 12) 
+    instance.registerEObj( "Shortcut", 2000700, 0, 4, { 1.189643f, -53.337769f, 57.917198f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_9", 2006105, 6185484, 4, { 0.000000f, -58.108219f, 65.176361f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "Entrance_1", 2000182, 6184198, 5, { 4.589292f, -3.826589f, 1.082808f }, 1.000000f, 0.000000f ); 
+      // States -> vf_lock_on (id: 11) vf_lock_of (id: 12) 
+    instance.registerEObj( "Shortcut_1", 2000700, 0, 4, { 3.135107f, -6.123573f, -3.436843f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_10", 2006105, 6198124, 4, { 4.362909f, -6.098227f, -3.232224f }, 0.991760f, 0.000048f ); 
+
   }
 
-  void onInit( InstanceContentPtr instance ) override
+  void onUpdate( InstanceContent& instance, uint32_t currTime ) override
   {
 
   }
 
-  void onUpdate( InstanceContentPtr instance, uint32_t currTime ) override
-  {
-
-  }
-
-  void onEnterTerritory( InstanceContentPtr instance, Entity::Player& player, uint32_t eventId, uint16_t param1,
+  void onEnterTerritory( InstanceContent& instance, Entity::Player& player, uint32_t eventId, uint16_t param1,
                          uint16_t param2 ) override
   {
 
diff --git a/src/scripts/instances/raids/AlexanderTheFistoftheSonSavage.cpp b/src/scripts/instances/raids/AlexanderTheFistoftheSonSavage.cpp
index e5f1b35c..fcb5bcbb 100644
--- a/src/scripts/instances/raids/AlexanderTheFistoftheSonSavage.cpp
+++ b/src/scripts/instances/raids/AlexanderTheFistoftheSonSavage.cpp
@@ -9,20 +9,48 @@ class AlexanderTheFistoftheSonSavage :
 public:
   AlexanderTheFistoftheSonSavage() :
     Sapphire::ScriptAPI::InstanceContentScript( 30034 )
+  { }
+
+  void onInit( InstanceContent& instance ) override
   {
+    instance.registerEObj( "unknown_0", 2006093, 0, 4, { -0.030479f, -18.000000f, -87.654160f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "sgvf_w_lvd_b0250", 2002872, 6179766, 4, { 0.048718f, -8.000000f, -25.550190f }, 1.000000f, 0.000000f ); 
+      // States -> vf_bextwall_on (id: 3) vf_bextwall_of (id: 4) 
+    instance.registerEObj( "sgvf_w_lvd_b0118", 2002872, 6179771, 4, { 0.348718f, -8.000000f, -62.819778f }, 1.000000f, 0.000000f ); 
+      // States -> vf_bextwall_on (id: 3) vf_bextwall_of (id: 4) 
+    instance.registerEObj( "unknown_1", 2002587, 0, 4, { 0.000000f, -7.796605f, -27.253839f }, 1.400000f, 0.000000f ); 
+    instance.registerEObj( "sgvf_w_lvd_b0118_1", 2002872, 6179774, 4, { 0.000000f, -18.000000f, -86.751549f }, 1.000000f, 0.000000f ); 
+      // States -> vf_bextwall_on (id: 3) vf_bextwall_of (id: 4) 
+    instance.registerEObj( "unknown_2", 2002735, 0, 4, { 0.000000f, -18.000000f, -88.696098f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "Exit", 2000139, 0, 4, { -10.159560f, -10.000000f, -208.556000f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_3", 2006965, 6200579, 4, { 0.000000f, -10.000000f, -190.000000f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "sgbg_d2a0_a5_spry4", 2004870, 6200506, 4, { -0.400928f, -10.000000f, -198.953598f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "sgbg_d2a0_a5_spry3", 2005111, 6200497, 4, { 9.766629f, -10.000000f, -190.029099f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "Koboldkey", 2006468, 6200507, 4, { -9.431794f, -10.000000f, -190.472397f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "Koboldkey_1", 2006469, 6200508, 4, { 0.206919f, -10.000000f, -180.011597f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_4", 2004363, 0, 4, { 0.000000f, -10.000000f, -190.000000f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_5", 2004367, 0, 4, { 0.000000f, -10.000000f, -206.000000f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_6", 2004368, 0, 4, { 16.000000f, -10.000000f, -190.000000f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_7", 2004369, 0, 4, { -16.000000f, -10.000000f, -190.000000f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_8", 2004575, 0, 4, { 0.000000f, -10.000000f, -174.000000f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "Exit_1", 2005313, 6180367, 4, { -8.545354f, -9.800000f, -209.792007f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "Entrance", 2000182, 6177861, 5, { 0.000000f, -60.199001f, 70.921097f }, 1.000000f, 0.000000f ); 
+      // States -> vf_lock_on (id: 11) vf_lock_of (id: 12) 
+    instance.registerEObj( "Shortcut", 2000700, 0, 4, { 1.189643f, -53.337769f, 57.917198f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_9", 2006105, 6185484, 4, { 0.000000f, -58.108219f, 65.176361f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "Entrance_1", 2000182, 6184198, 5, { 4.589292f, -3.826589f, 1.082808f }, 1.000000f, 0.000000f ); 
+      // States -> vf_lock_on (id: 11) vf_lock_of (id: 12) 
+    instance.registerEObj( "Shortcut_1", 2000700, 0, 4, { 3.135107f, -6.123573f, -3.436843f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_10", 2006105, 6198124, 4, { 4.362909f, -6.098227f, -3.232224f }, 0.991760f, 0.000048f ); 
+
   }
 
-  void onInit( InstanceContentPtr instance ) override
+  void onUpdate( InstanceContent& instance, uint32_t currTime ) override
   {
 
   }
 
-  void onUpdate( InstanceContentPtr instance, uint32_t currTime ) override
-  {
-
-  }
-
-  void onEnterTerritory( InstanceContentPtr instance, Entity::Player& player, uint32_t eventId, uint16_t param1,
+  void onEnterTerritory( InstanceContent& instance, Entity::Player& player, uint32_t eventId, uint16_t param1,
                          uint16_t param2 ) override
   {
 
diff --git a/src/scripts/instances/raids/AlexanderTheHeartoftheCreator.cpp b/src/scripts/instances/raids/AlexanderTheHeartoftheCreator.cpp
index f29f6511..b9079ed4 100644
--- a/src/scripts/instances/raids/AlexanderTheHeartoftheCreator.cpp
+++ b/src/scripts/instances/raids/AlexanderTheHeartoftheCreator.cpp
@@ -9,20 +9,60 @@ class AlexanderTheHeartoftheCreator :
 public:
   AlexanderTheHeartoftheCreator() :
     Sapphire::ScriptAPI::InstanceContentScript( 30041 )
+  { }
+
+  void onInit( InstanceContent& instance ) override
   {
+    instance.registerEObj( "Openduct", 2007466, 0, 4, { 0.000000f, -79.986076f, 42.000000f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "Openduct_1", 2007466, 0, 4, { 10.000000f, -79.986076f, 52.000000f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "Openduct_2", 2007466, 0, 4, { 0.000000f, -79.986076f, 62.000000f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "Openduct_3", 2007466, 0, 4, { -10.000000f, -79.986076f, 52.000000f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "sgpl_d2ab_syougai_col", 2007457, 6516055, 4, { 0.000000f, -79.986099f, 38.000000f }, 1.000000f, 0.000000f ); 
+      // States -> chrcol_on (id: 35) chrcol_off (id: 44) 
+    instance.registerEObj( "sgpl_d2ab_syougai_col_1", 2007457, 6516054, 4, { 0.000000f, -79.986099f, 38.000000f }, 1.000000f, 0.000000f ); 
+      // States -> chrcol_on (id: 35) chrcol_off (id: 44) 
+    instance.registerEObj( "sgpl_d2ab_syougai_col_2", 2007457, 6516050, 4, { 0.000000f, -79.986099f, 38.000000f }, 1.000000f, 0.000000f ); 
+      // States -> chrcol_on (id: 35) chrcol_off (id: 44) 
+    instance.registerEObj( "sgpl_d2ab_syougai_col_3", 2007457, 6516150, 4, { 0.000000f, -79.986099f, 38.000000f }, 1.000000f, 0.000000f ); 
+      // States -> chrcol_on (id: 35) chrcol_off (id: 44) 
+    instance.registerEObj( "sgpl_d2ab_syougai_col_4", 2007457, 6516057, 4, { 0.000000f, -79.986099f, 38.000000f }, 1.000000f, 0.000000f ); 
+      // States -> chrcol_on (id: 35) chrcol_off (id: 44) 
+    instance.registerEObj( "sgpl_d2ab_syougai_col_5", 2007457, 6516049, 4, { 0.000000f, -79.986099f, 38.000000f }, 1.000000f, 0.000000f ); 
+      // States -> chrcol_on (id: 35) chrcol_off (id: 44) 
+    instance.registerEObj( "sgpl_d2ab_syougai_col_6", 2007457, 6516058, 4, { 0.000000f, -79.986099f, 38.000000f }, 1.000000f, 0.000000f ); 
+      // States -> chrcol_on (id: 35) chrcol_off (id: 44) 
+    instance.registerEObj( "sgpl_d2ab_syougai_col_7", 2007457, 6516056, 4, { 0.000000f, -79.986099f, 38.000000f }, 1.000000f, 0.000000f ); 
+      // States -> chrcol_on (id: 35) chrcol_off (id: 44) 
+    instance.registerEObj( "unknown_0", 2007457, 6433752, 4, { 0.000000f, -79.986076f, 52.000000f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_1", 2007457, 6498824, 4, { 0.000000f, -79.986076f, 52.000000f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_2", 2007457, 6494083, 4, { -12.120000f, -79.986076f, 45.000000f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_3", 2007457, 6494060, 4, { 12.120000f, -79.986076f, 45.000000f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_4", 2007457, 6494084, 4, { 0.000000f, -79.986076f, 66.000000f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_5", 2007497, 0, 4, { 0.000000f, 0.000000f, 0.000000f }, 1.000000f, -0.000000f ); 
+    instance.registerEObj( "sgpl_d2ab_magic", 2007457, 6572855, 4, { 0.000000f, -80.000000f, 52.000000f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_6", 2007457, 6573190, 4, { 0.000000f, -79.986076f, 52.000000f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_7", 2007507, 0, 4, { 0.000000f, -79.986076f, 2.957292f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_8", 2007457, 6433738, 4, { 26.696230f, 0.000000f, 11.513790f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_9", 2007457, 6433741, 4, { -57.433731f, -40.000000f, -0.807872f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "Exit", 2000139, 0, 4, { 0.000000f, -79.986076f, 40.000000f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "sgvf_w_lvd_b0118", 2002872, 6485880, 4, { -58.072899f, -39.959671f, -0.860951f }, 1.000000f, 0.000000f ); 
+      // States -> vf_bextwall_on (id: 3) vf_bextwall_of (id: 4) 
+    instance.registerEObj( "unknown_10", 2002735, 0, 4, { -59.879780f, -40.078049f, 0.248821f }, 0.500000f, 0.055177f ); 
+    instance.registerEObj( "sgpl_d2ab_navi", 2006981, 6588684, 4, { 0.000000f, -80.000000f, 51.000000f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "Entrance", 2000182, 6449497, 5, { 5.000000f, 0.060100f, 29.472811f }, 1.000000f, 0.000000f ); 
+      // States -> vf_lock_on (id: 11) vf_lock_of (id: 12) 
+    instance.registerEObj( "Shortcut", 2000700, 0, 4, { 15.893050f, -0.000000f, 20.165380f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "Entrance_1", 2000182, 6449499, 5, { -46.692200f, -40.000000f, -16.064711f }, 2.000000f, 0.332888f ); 
+      // States -> vf_lock_on (id: 11) vf_lock_of (id: 12) 
+
   }
 
-  void onInit( InstanceContentPtr instance ) override
+  void onUpdate( InstanceContent& instance, uint32_t currTime ) override
   {
 
   }
 
-  void onUpdate( InstanceContentPtr instance, uint32_t currTime ) override
-  {
-
-  }
-
-  void onEnterTerritory( InstanceContentPtr instance, Entity::Player& player, uint32_t eventId, uint16_t param1,
+  void onEnterTerritory( InstanceContent& instance, Entity::Player& player, uint32_t eventId, uint16_t param1,
                          uint16_t param2 ) override
   {
 
diff --git a/src/scripts/instances/raids/AlexanderTheHeartoftheCreatorSavage.cpp b/src/scripts/instances/raids/AlexanderTheHeartoftheCreatorSavage.cpp
index b7237ba7..12fc642d 100644
--- a/src/scripts/instances/raids/AlexanderTheHeartoftheCreatorSavage.cpp
+++ b/src/scripts/instances/raids/AlexanderTheHeartoftheCreatorSavage.cpp
@@ -9,20 +9,60 @@ class AlexanderTheHeartoftheCreatorSavage :
 public:
   AlexanderTheHeartoftheCreatorSavage() :
     Sapphire::ScriptAPI::InstanceContentScript( 30045 )
+  { }
+
+  void onInit( InstanceContent& instance ) override
   {
+    instance.registerEObj( "Openduct", 2007466, 0, 4, { 0.000000f, -79.986076f, 42.000000f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "Openduct_1", 2007466, 0, 4, { 10.000000f, -79.986076f, 52.000000f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "Openduct_2", 2007466, 0, 4, { 0.000000f, -79.986076f, 62.000000f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "Openduct_3", 2007466, 0, 4, { -10.000000f, -79.986076f, 52.000000f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "sgpl_d2ab_syougai_col", 2007457, 6516055, 4, { 0.000000f, -79.986099f, 38.000000f }, 1.000000f, 0.000000f ); 
+      // States -> chrcol_on (id: 35) chrcol_off (id: 44) 
+    instance.registerEObj( "sgpl_d2ab_syougai_col_1", 2007457, 6516054, 4, { 0.000000f, -79.986099f, 38.000000f }, 1.000000f, 0.000000f ); 
+      // States -> chrcol_on (id: 35) chrcol_off (id: 44) 
+    instance.registerEObj( "sgpl_d2ab_syougai_col_2", 2007457, 6516050, 4, { 0.000000f, -79.986099f, 38.000000f }, 1.000000f, 0.000000f ); 
+      // States -> chrcol_on (id: 35) chrcol_off (id: 44) 
+    instance.registerEObj( "sgpl_d2ab_syougai_col_3", 2007457, 6516150, 4, { 0.000000f, -79.986099f, 38.000000f }, 1.000000f, 0.000000f ); 
+      // States -> chrcol_on (id: 35) chrcol_off (id: 44) 
+    instance.registerEObj( "sgpl_d2ab_syougai_col_4", 2007457, 6516057, 4, { 0.000000f, -79.986099f, 38.000000f }, 1.000000f, 0.000000f ); 
+      // States -> chrcol_on (id: 35) chrcol_off (id: 44) 
+    instance.registerEObj( "sgpl_d2ab_syougai_col_5", 2007457, 6516049, 4, { 0.000000f, -79.986099f, 38.000000f }, 1.000000f, 0.000000f ); 
+      // States -> chrcol_on (id: 35) chrcol_off (id: 44) 
+    instance.registerEObj( "sgpl_d2ab_syougai_col_6", 2007457, 6516058, 4, { 0.000000f, -79.986099f, 38.000000f }, 1.000000f, 0.000000f ); 
+      // States -> chrcol_on (id: 35) chrcol_off (id: 44) 
+    instance.registerEObj( "sgpl_d2ab_syougai_col_7", 2007457, 6516056, 4, { 0.000000f, -79.986099f, 38.000000f }, 1.000000f, 0.000000f ); 
+      // States -> chrcol_on (id: 35) chrcol_off (id: 44) 
+    instance.registerEObj( "unknown_0", 2007457, 6433752, 4, { 0.000000f, -79.986076f, 52.000000f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_1", 2007457, 6498824, 4, { 0.000000f, -79.986076f, 52.000000f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_2", 2007457, 6494083, 4, { -12.120000f, -79.986076f, 45.000000f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_3", 2007457, 6494060, 4, { 12.120000f, -79.986076f, 45.000000f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_4", 2007457, 6494084, 4, { 0.000000f, -79.986076f, 66.000000f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_5", 2007497, 0, 4, { 0.000000f, 0.000000f, 0.000000f }, 1.000000f, -0.000000f ); 
+    instance.registerEObj( "sgpl_d2ab_magic", 2007457, 6572855, 4, { 0.000000f, -80.000000f, 52.000000f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_6", 2007457, 6573190, 4, { 0.000000f, -79.986076f, 52.000000f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_7", 2007507, 0, 4, { 0.000000f, -79.986076f, 2.957292f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_8", 2007457, 6433738, 4, { 26.696230f, 0.000000f, 11.513790f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_9", 2007457, 6433741, 4, { -57.433731f, -40.000000f, -0.807872f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "Exit", 2000139, 0, 4, { 0.000000f, -79.986076f, 40.000000f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "sgvf_w_lvd_b0118", 2002872, 6485880, 4, { -58.072899f, -39.959671f, -0.860951f }, 1.000000f, 0.000000f ); 
+      // States -> vf_bextwall_on (id: 3) vf_bextwall_of (id: 4) 
+    instance.registerEObj( "unknown_10", 2002735, 0, 4, { -59.879780f, -40.078049f, 0.248821f }, 0.500000f, 0.055177f ); 
+    instance.registerEObj( "sgpl_d2ab_navi", 2006981, 6588684, 4, { 0.000000f, -80.000000f, 51.000000f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "Entrance", 2000182, 6449497, 5, { 5.000000f, 0.060100f, 29.472811f }, 1.000000f, 0.000000f ); 
+      // States -> vf_lock_on (id: 11) vf_lock_of (id: 12) 
+    instance.registerEObj( "Shortcut", 2000700, 0, 4, { 15.893050f, -0.000000f, 20.165380f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "Entrance_1", 2000182, 6449499, 5, { -46.692200f, -40.000000f, -16.064711f }, 2.000000f, 0.332888f ); 
+      // States -> vf_lock_on (id: 11) vf_lock_of (id: 12) 
+
   }
 
-  void onInit( InstanceContentPtr instance ) override
+  void onUpdate( InstanceContent& instance, uint32_t currTime ) override
   {
 
   }
 
-  void onUpdate( InstanceContentPtr instance, uint32_t currTime ) override
-  {
-
-  }
-
-  void onEnterTerritory( InstanceContentPtr instance, Entity::Player& player, uint32_t eventId, uint16_t param1,
+  void onEnterTerritory( InstanceContent& instance, Entity::Player& player, uint32_t eventId, uint16_t param1,
                          uint16_t param2 ) override
   {
 
diff --git a/src/scripts/instances/raids/AlexanderTheSouloftheCreator.cpp b/src/scripts/instances/raids/AlexanderTheSouloftheCreator.cpp
index 202ade08..28c88632 100644
--- a/src/scripts/instances/raids/AlexanderTheSouloftheCreator.cpp
+++ b/src/scripts/instances/raids/AlexanderTheSouloftheCreator.cpp
@@ -9,20 +9,41 @@ class AlexanderTheSouloftheCreator :
 public:
   AlexanderTheSouloftheCreator() :
     Sapphire::ScriptAPI::InstanceContentScript( 30042 )
+  { }
+
+  void onInit( InstanceContent& instance ) override
   {
+    instance.registerEObj( "Exit", 2000139, 0, 4, { 0.000000f, 400.000000f, -21.000000f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_0", 2007468, 0, 4, { 14.140000f, 400.049988f, -14.140000f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_1", 2007468, 0, 4, { 14.140000f, 400.049988f, -14.140000f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_2", 2007468, 0, 4, { 14.140000f, 400.049988f, 14.140000f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_3", 2007468, 0, 4, { -14.140000f, 400.049988f, -14.140000f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_4", 2007468, 0, 4, { -14.140000f, 400.049988f, 14.140000f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_5", 2007519, 0, 4, { 0.000000f, 0.000000f, 0.000000f }, 1.000000f, -0.000000f ); 
+    instance.registerEObj( "unknown_6", 2007520, 0, 4, { 0.000000f, 0.000000f, 0.000000f }, 1.000000f, -0.000000f ); 
+    instance.registerEObj( "unknown_7", 2007521, 0, 4, { 0.000000f, 0.000000f, 0.000000f }, 1.000000f, -0.000000f ); 
+    instance.registerEObj( "unknown_8", 2007457, 6421491, 4, { 0.000000f, 400.000000f, 0.000000f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_9", 2007516, 0, 4, { 0.000000f, 0.000000f, 0.000000f }, 1.000000f, -0.000000f ); 
+    instance.registerEObj( "unknown_10", 2007457, 6487368, 4, { 0.000000f, -470.000000f, 52.000000f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_11", 2007457, 6487369, 4, { 0.000000f, -470.000000f, 52.000000f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_12", 2007457, 6487367, 4, { 0.000000f, -470.000000f, 52.000000f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_13", 2007457, 6487366, 4, { 0.000000f, -470.000000f, 52.000000f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_14", 2007457, 6483882, 4, { 0.000000f, -470.000000f, 52.000000f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_15", 2007457, 6421479, 4, { 0.000000f, 400.168701f, 0.000000f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_16", 2007499, 0, 4, { 0.000000f, 0.000000f, 0.000000f }, 1.000000f, -0.000000f ); 
+    instance.registerEObj( "unknown_17", 2007534, 0, 4, { 0.000000f, 0.000000f, 0.000000f }, 1.000000f, -0.000000f ); 
+    instance.registerEObj( "unknown_18", 2007457, 6539545, 4, { 0.024963f, -480.000000f, 52.037621f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "Entrance", 2000182, 6449508, 5, { -0.015367f, 400.000000f, 21.278250f }, 1.000000f, 0.000000f ); 
+      // States -> vf_lock_on (id: 11) vf_lock_of (id: 12) 
+
   }
 
-  void onInit( InstanceContentPtr instance ) override
+  void onUpdate( InstanceContent& instance, uint32_t currTime ) override
   {
 
   }
 
-  void onUpdate( InstanceContentPtr instance, uint32_t currTime ) override
-  {
-
-  }
-
-  void onEnterTerritory( InstanceContentPtr instance, Entity::Player& player, uint32_t eventId, uint16_t param1,
+  void onEnterTerritory( InstanceContent& instance, Entity::Player& player, uint32_t eventId, uint16_t param1,
                          uint16_t param2 ) override
   {
 
diff --git a/src/scripts/instances/raids/AlexanderTheSouloftheCreatorSavage.cpp b/src/scripts/instances/raids/AlexanderTheSouloftheCreatorSavage.cpp
index 04aa30a0..0af111d9 100644
--- a/src/scripts/instances/raids/AlexanderTheSouloftheCreatorSavage.cpp
+++ b/src/scripts/instances/raids/AlexanderTheSouloftheCreatorSavage.cpp
@@ -9,20 +9,41 @@ class AlexanderTheSouloftheCreatorSavage :
 public:
   AlexanderTheSouloftheCreatorSavage() :
     Sapphire::ScriptAPI::InstanceContentScript( 30046 )
+  { }
+
+  void onInit( InstanceContent& instance ) override
   {
+    instance.registerEObj( "Exit", 2000139, 0, 4, { 0.000000f, 400.000000f, -21.000000f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_0", 2007468, 0, 4, { 14.140000f, 400.049988f, -14.140000f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_1", 2007468, 0, 4, { 14.140000f, 400.049988f, -14.140000f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_2", 2007468, 0, 4, { 14.140000f, 400.049988f, 14.140000f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_3", 2007468, 0, 4, { -14.140000f, 400.049988f, -14.140000f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_4", 2007468, 0, 4, { -14.140000f, 400.049988f, 14.140000f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_5", 2007519, 0, 4, { 0.000000f, 0.000000f, 0.000000f }, 1.000000f, -0.000000f ); 
+    instance.registerEObj( "unknown_6", 2007520, 0, 4, { 0.000000f, 0.000000f, 0.000000f }, 1.000000f, -0.000000f ); 
+    instance.registerEObj( "unknown_7", 2007521, 0, 4, { 0.000000f, 0.000000f, 0.000000f }, 1.000000f, -0.000000f ); 
+    instance.registerEObj( "unknown_8", 2007457, 6421491, 4, { 0.000000f, 400.000000f, 0.000000f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_9", 2007516, 0, 4, { 0.000000f, 0.000000f, 0.000000f }, 1.000000f, -0.000000f ); 
+    instance.registerEObj( "unknown_10", 2007457, 6487368, 4, { 0.000000f, -470.000000f, 52.000000f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_11", 2007457, 6487369, 4, { 0.000000f, -470.000000f, 52.000000f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_12", 2007457, 6487367, 4, { 0.000000f, -470.000000f, 52.000000f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_13", 2007457, 6487366, 4, { 0.000000f, -470.000000f, 52.000000f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_14", 2007457, 6483882, 4, { 0.000000f, -470.000000f, 52.000000f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_15", 2007457, 6421479, 4, { 0.000000f, 400.168701f, 0.000000f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_16", 2007499, 0, 4, { 0.000000f, 0.000000f, 0.000000f }, 1.000000f, -0.000000f ); 
+    instance.registerEObj( "unknown_17", 2007534, 0, 4, { 0.000000f, 0.000000f, 0.000000f }, 1.000000f, -0.000000f ); 
+    instance.registerEObj( "unknown_18", 2007457, 6539545, 4, { 0.024963f, -480.000000f, 52.037621f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "Entrance", 2000182, 6449508, 5, { -0.015367f, 400.000000f, 21.278250f }, 1.000000f, 0.000000f ); 
+      // States -> vf_lock_on (id: 11) vf_lock_of (id: 12) 
+
   }
 
-  void onInit( InstanceContentPtr instance ) override
+  void onUpdate( InstanceContent& instance, uint32_t currTime ) override
   {
 
   }
 
-  void onUpdate( InstanceContentPtr instance, uint32_t currTime ) override
-  {
-
-  }
-
-  void onEnterTerritory( InstanceContentPtr instance, Entity::Player& player, uint32_t eventId, uint16_t param1,
+  void onEnterTerritory( InstanceContent& instance, Entity::Player& player, uint32_t eventId, uint16_t param1,
                          uint16_t param2 ) override
   {
 
diff --git a/src/scripts/instances/raids/AlphascapeV10.cpp b/src/scripts/instances/raids/AlphascapeV10.cpp
new file mode 100644
index 00000000..9659d074
--- /dev/null
+++ b/src/scripts/instances/raids/AlphascapeV10.cpp
@@ -0,0 +1,41 @@
+#include <ScriptObject.h>
+#include <Territory/InstanceContent.h>
+
+using namespace Sapphire;
+
+class AlphascapeV10 :
+  public Sapphire::ScriptAPI::InstanceContentScript
+{
+public:
+  AlphascapeV10() :
+    Sapphire::ScriptAPI::InstanceContentScript( 30069 )
+  { }
+
+  void onInit( InstanceContent& instance ) override
+  {
+    instance.registerEObj( "unknown_0", 2007457, 7575331, 4, { 96.398201f, 0.000000f, 100.555702f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_1", 2007457, 7575332, 4, { 100.000000f, 0.000000f, 100.000000f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_2", 2007457, 7575333, 4, { 100.000000f, 0.000000f, 100.000000f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_3", 2007457, 7575334, 4, { 100.000000f, 0.000000f, 100.000000f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_4", 2007457, 7586460, 4, { 101.415100f, -0.000000f, 101.219002f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "Entrance", 2007457, 7574103, 5, { 105.000000f, 0.000000f, 115.000000f }, 1.000000f, 0.000000f ); 
+      // States -> vf_lock_on (id: 11) vf_lock_of (id: 12) 
+    instance.registerEObj( "Exit", 2000139, 0, 4, { 100.000000f, 0.000000f, 85.000000f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_5", 2007457, 7575443, 4, { 100.300003f, 0.000000f, 100.300003f }, 1.000000f, 0.000000f ); 
+
+  }
+
+  void onUpdate( InstanceContent& instance, uint32_t currTime ) override
+  {
+
+  }
+
+  void onEnterTerritory( InstanceContent& instance, Entity::Player& player, uint32_t eventId, uint16_t param1,
+                         uint16_t param2 ) override
+  {
+
+  }
+
+};
+
+EXPOSE_SCRIPT( AlphascapeV10 );
\ No newline at end of file
diff --git a/src/scripts/instances/raids/AlphascapeV10Savage.cpp b/src/scripts/instances/raids/AlphascapeV10Savage.cpp
new file mode 100644
index 00000000..14d1cf26
--- /dev/null
+++ b/src/scripts/instances/raids/AlphascapeV10Savage.cpp
@@ -0,0 +1,41 @@
+#include <ScriptObject.h>
+#include <Territory/InstanceContent.h>
+
+using namespace Sapphire;
+
+class AlphascapeV10Savage :
+  public Sapphire::ScriptAPI::InstanceContentScript
+{
+public:
+  AlphascapeV10Savage() :
+    Sapphire::ScriptAPI::InstanceContentScript( 30073 )
+  { }
+
+  void onInit( InstanceContent& instance ) override
+  {
+    instance.registerEObj( "unknown_0", 2007457, 7575331, 4, { 96.398201f, 0.000000f, 100.555702f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_1", 2007457, 7575332, 4, { 100.000000f, 0.000000f, 100.000000f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_2", 2007457, 7575333, 4, { 100.000000f, 0.000000f, 100.000000f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_3", 2007457, 7575334, 4, { 100.000000f, 0.000000f, 100.000000f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_4", 2007457, 7586460, 4, { 101.415100f, -0.000000f, 101.219002f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "Entrance", 2007457, 7574103, 5, { 105.000000f, 0.000000f, 115.000000f }, 1.000000f, 0.000000f ); 
+      // States -> vf_lock_on (id: 11) vf_lock_of (id: 12) 
+    instance.registerEObj( "Exit", 2000139, 0, 4, { 100.000000f, 0.000000f, 85.000000f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_5", 2007457, 7575443, 4, { 100.300003f, 0.000000f, 100.300003f }, 1.000000f, 0.000000f ); 
+
+  }
+
+  void onUpdate( InstanceContent& instance, uint32_t currTime ) override
+  {
+
+  }
+
+  void onEnterTerritory( InstanceContent& instance, Entity::Player& player, uint32_t eventId, uint16_t param1,
+                         uint16_t param2 ) override
+  {
+
+  }
+
+};
+
+EXPOSE_SCRIPT( AlphascapeV10Savage );
\ No newline at end of file
diff --git a/src/scripts/instances/raids/AlphascapeV20.cpp b/src/scripts/instances/raids/AlphascapeV20.cpp
new file mode 100644
index 00000000..cd5ca346
--- /dev/null
+++ b/src/scripts/instances/raids/AlphascapeV20.cpp
@@ -0,0 +1,36 @@
+#include <ScriptObject.h>
+#include <Territory/InstanceContent.h>
+
+using namespace Sapphire;
+
+class AlphascapeV20 :
+  public Sapphire::ScriptAPI::InstanceContentScript
+{
+public:
+  AlphascapeV20() :
+    Sapphire::ScriptAPI::InstanceContentScript( 30070 )
+  { }
+
+  void onInit( InstanceContent& instance ) override
+  {
+    instance.registerEObj( "unknown_0", 2007457, 7684588, 4, { 100.000000f, 0.000000f, 100.000000f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "Entrance", 2000182, 7581179, 5, { 100.000000f, 0.000000f, 115.000000f }, 1.000000f, -0.000000f ); 
+      // States -> vf_lock_on (id: 11) vf_lock_of (id: 12) 
+    instance.registerEObj( "Exit", 2000139, 0, 4, { 100.000000f, 0.000000f, 85.000000f }, 1.000000f, 0.000000f ); 
+
+  }
+
+  void onUpdate( InstanceContent& instance, uint32_t currTime ) override
+  {
+
+  }
+
+  void onEnterTerritory( InstanceContent& instance, Entity::Player& player, uint32_t eventId, uint16_t param1,
+                         uint16_t param2 ) override
+  {
+
+  }
+
+};
+
+EXPOSE_SCRIPT( AlphascapeV20 );
\ No newline at end of file
diff --git a/src/scripts/instances/raids/AlphascapeV20Savage.cpp b/src/scripts/instances/raids/AlphascapeV20Savage.cpp
new file mode 100644
index 00000000..bb521e66
--- /dev/null
+++ b/src/scripts/instances/raids/AlphascapeV20Savage.cpp
@@ -0,0 +1,36 @@
+#include <ScriptObject.h>
+#include <Territory/InstanceContent.h>
+
+using namespace Sapphire;
+
+class AlphascapeV20Savage :
+  public Sapphire::ScriptAPI::InstanceContentScript
+{
+public:
+  AlphascapeV20Savage() :
+    Sapphire::ScriptAPI::InstanceContentScript( 30074 )
+  { }
+
+  void onInit( InstanceContent& instance ) override
+  {
+    instance.registerEObj( "unknown_0", 2007457, 7684588, 4, { 100.000000f, 0.000000f, 100.000000f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "Entrance", 2000182, 7581179, 5, { 100.000000f, 0.000000f, 115.000000f }, 1.000000f, -0.000000f ); 
+      // States -> vf_lock_on (id: 11) vf_lock_of (id: 12) 
+    instance.registerEObj( "Exit", 2000139, 0, 4, { 100.000000f, 0.000000f, 85.000000f }, 1.000000f, 0.000000f ); 
+
+  }
+
+  void onUpdate( InstanceContent& instance, uint32_t currTime ) override
+  {
+
+  }
+
+  void onEnterTerritory( InstanceContent& instance, Entity::Player& player, uint32_t eventId, uint16_t param1,
+                         uint16_t param2 ) override
+  {
+
+  }
+
+};
+
+EXPOSE_SCRIPT( AlphascapeV20Savage );
\ No newline at end of file
diff --git a/src/scripts/instances/raids/AlphascapeV30.cpp b/src/scripts/instances/raids/AlphascapeV30.cpp
new file mode 100644
index 00000000..729d5e6b
--- /dev/null
+++ b/src/scripts/instances/raids/AlphascapeV30.cpp
@@ -0,0 +1,40 @@
+#include <ScriptObject.h>
+#include <Territory/InstanceContent.h>
+
+using namespace Sapphire;
+
+class AlphascapeV30 :
+  public Sapphire::ScriptAPI::InstanceContentScript
+{
+public:
+  AlphascapeV30() :
+    Sapphire::ScriptAPI::InstanceContentScript( 30071 )
+  { }
+
+  void onInit( InstanceContent& instance ) override
+  {
+    instance.registerEObj( "unknown_0", 2009609, 0, 4, { 92.761772f, 0.000000f, 106.354897f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_1", 2009610, 0, 4, { 93.034180f, -0.015320f, 106.645302f }, 0.991760f, 0.000048f ); 
+    instance.registerEObj( "unknown_2", 2007457, 7604877, 4, { 103.128403f, 0.000000f, 107.047600f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_3", 2007457, 7624116, 4, { 105.371498f, 0.000000f, 104.860802f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_4", 2009653, 0, 4, { 100.000000f, 0.000000f, 100.000000f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "Entrance", 2007457, 7593474, 5, { 104.466499f, 0.000000f, 114.605797f }, 1.000000f, 0.000000f ); 
+      // States -> vf_lock_on (id: 11) vf_lock_of (id: 12) 
+    instance.registerEObj( "Exit", 2000139, 0, 4, { 100.000000f, 0.000000f, 85.000000f }, 1.000000f, 0.000000f ); 
+
+  }
+
+  void onUpdate( InstanceContent& instance, uint32_t currTime ) override
+  {
+
+  }
+
+  void onEnterTerritory( InstanceContent& instance, Entity::Player& player, uint32_t eventId, uint16_t param1,
+                         uint16_t param2 ) override
+  {
+
+  }
+
+};
+
+EXPOSE_SCRIPT( AlphascapeV30 );
\ No newline at end of file
diff --git a/src/scripts/instances/raids/AlphascapeV30Savage.cpp b/src/scripts/instances/raids/AlphascapeV30Savage.cpp
new file mode 100644
index 00000000..a281cead
--- /dev/null
+++ b/src/scripts/instances/raids/AlphascapeV30Savage.cpp
@@ -0,0 +1,40 @@
+#include <ScriptObject.h>
+#include <Territory/InstanceContent.h>
+
+using namespace Sapphire;
+
+class AlphascapeV30Savage :
+  public Sapphire::ScriptAPI::InstanceContentScript
+{
+public:
+  AlphascapeV30Savage() :
+    Sapphire::ScriptAPI::InstanceContentScript( 30075 )
+  { }
+
+  void onInit( InstanceContent& instance ) override
+  {
+    instance.registerEObj( "unknown_0", 2009609, 0, 4, { 92.761772f, 0.000000f, 106.354897f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_1", 2009610, 0, 4, { 93.034180f, -0.015320f, 106.645302f }, 0.991760f, 0.000048f ); 
+    instance.registerEObj( "unknown_2", 2007457, 7604877, 4, { 103.128403f, 0.000000f, 107.047600f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_3", 2007457, 7624116, 4, { 105.371498f, 0.000000f, 104.860802f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_4", 2009653, 0, 4, { 100.000000f, 0.000000f, 100.000000f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "Entrance", 2007457, 7593474, 5, { 104.466499f, 0.000000f, 114.605797f }, 1.000000f, 0.000000f ); 
+      // States -> vf_lock_on (id: 11) vf_lock_of (id: 12) 
+    instance.registerEObj( "Exit", 2000139, 0, 4, { 100.000000f, 0.000000f, 85.000000f }, 1.000000f, 0.000000f ); 
+
+  }
+
+  void onUpdate( InstanceContent& instance, uint32_t currTime ) override
+  {
+
+  }
+
+  void onEnterTerritory( InstanceContent& instance, Entity::Player& player, uint32_t eventId, uint16_t param1,
+                         uint16_t param2 ) override
+  {
+
+  }
+
+};
+
+EXPOSE_SCRIPT( AlphascapeV30Savage );
\ No newline at end of file
diff --git a/src/scripts/instances/raids/AlphascapeV40.cpp b/src/scripts/instances/raids/AlphascapeV40.cpp
new file mode 100644
index 00000000..621c325e
--- /dev/null
+++ b/src/scripts/instances/raids/AlphascapeV40.cpp
@@ -0,0 +1,44 @@
+#include <ScriptObject.h>
+#include <Territory/InstanceContent.h>
+
+using namespace Sapphire;
+
+class AlphascapeV40 :
+  public Sapphire::ScriptAPI::InstanceContentScript
+{
+public:
+  AlphascapeV40() :
+    Sapphire::ScriptAPI::InstanceContentScript( 30072 )
+  { }
+
+  void onInit( InstanceContent& instance ) override
+  {
+    instance.registerEObj( "unknown_0", 2007457, 7570953, 4, { 100.000000f, 0.000000f, 100.000000f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_1", 2007457, 7624865, 4, { 100.000000f, 0.000000f, 100.000000f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_2", 2007457, 7624868, 4, { 100.000000f, 0.000000f, 100.000000f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_3", 2007457, 7624869, 4, { 100.000000f, 0.000000f, 100.000000f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_4", 2007457, 7624870, 4, { 100.000000f, 0.000000f, 100.000000f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_5", 2007457, 7624871, 4, { 100.000000f, 0.000000f, 100.000000f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_6", 2007457, 7624872, 4, { 100.000000f, 0.000000f, 100.000000f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_7", 2007457, 7624873, 4, { 100.000000f, 0.000000f, 100.000000f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_8", 2007457, 7672994, 4, { 100.000000f, 0.000000f, 100.000000f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "Entrance", 2000182, 7581279, 5, { 100.000000f, 0.000000f, 115.000000f }, 1.000000f, -0.000000f ); 
+      // States -> vf_lock_on (id: 11) vf_lock_of (id: 12) 
+    instance.registerEObj( "Exit", 2000139, 0, 4, { 100.000000f, 0.000000f, 84.000000f }, 1.000000f, 0.000000f ); 
+
+  }
+
+  void onUpdate( InstanceContent& instance, uint32_t currTime ) override
+  {
+
+  }
+
+  void onEnterTerritory( InstanceContent& instance, Entity::Player& player, uint32_t eventId, uint16_t param1,
+                         uint16_t param2 ) override
+  {
+
+  }
+
+};
+
+EXPOSE_SCRIPT( AlphascapeV40 );
\ No newline at end of file
diff --git a/src/scripts/instances/raids/AlphascapeV40Savage.cpp b/src/scripts/instances/raids/AlphascapeV40Savage.cpp
new file mode 100644
index 00000000..fc186f51
--- /dev/null
+++ b/src/scripts/instances/raids/AlphascapeV40Savage.cpp
@@ -0,0 +1,44 @@
+#include <ScriptObject.h>
+#include <Territory/InstanceContent.h>
+
+using namespace Sapphire;
+
+class AlphascapeV40Savage :
+  public Sapphire::ScriptAPI::InstanceContentScript
+{
+public:
+  AlphascapeV40Savage() :
+    Sapphire::ScriptAPI::InstanceContentScript( 30076 )
+  { }
+
+  void onInit( InstanceContent& instance ) override
+  {
+    instance.registerEObj( "unknown_0", 2007457, 7570953, 4, { 100.000000f, 0.000000f, 100.000000f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_1", 2007457, 7624865, 4, { 100.000000f, 0.000000f, 100.000000f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_2", 2007457, 7624868, 4, { 100.000000f, 0.000000f, 100.000000f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_3", 2007457, 7624869, 4, { 100.000000f, 0.000000f, 100.000000f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_4", 2007457, 7624870, 4, { 100.000000f, 0.000000f, 100.000000f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_5", 2007457, 7624871, 4, { 100.000000f, 0.000000f, 100.000000f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_6", 2007457, 7624872, 4, { 100.000000f, 0.000000f, 100.000000f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_7", 2007457, 7624873, 4, { 100.000000f, 0.000000f, 100.000000f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_8", 2007457, 7672994, 4, { 100.000000f, 0.000000f, 100.000000f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "Entrance", 2000182, 7581279, 5, { 100.000000f, 0.000000f, 115.000000f }, 1.000000f, -0.000000f ); 
+      // States -> vf_lock_on (id: 11) vf_lock_of (id: 12) 
+    instance.registerEObj( "Exit", 2000139, 0, 4, { 100.000000f, 0.000000f, 84.000000f }, 1.000000f, 0.000000f ); 
+
+  }
+
+  void onUpdate( InstanceContent& instance, uint32_t currTime ) override
+  {
+
+  }
+
+  void onEnterTerritory( InstanceContent& instance, Entity::Player& player, uint32_t eventId, uint16_t param1,
+                         uint16_t param2 ) override
+  {
+
+  }
+
+};
+
+EXPOSE_SCRIPT( AlphascapeV40Savage );
\ No newline at end of file
diff --git a/src/scripts/instances/raids/DeltascapeV10.cpp b/src/scripts/instances/raids/DeltascapeV10.cpp
index fc8dbf18..5c2556dc 100644
--- a/src/scripts/instances/raids/DeltascapeV10.cpp
+++ b/src/scripts/instances/raids/DeltascapeV10.cpp
@@ -9,20 +9,25 @@ class DeltascapeV10 :
 public:
   DeltascapeV10() :
     Sapphire::ScriptAPI::InstanceContentScript( 30049 )
+  { }
+
+  void onInit( InstanceContent& instance ) override
   {
+    instance.registerEObj( "unknown_0", 2007457, 6791878, 4, { 0.000000f, 0.000000f, 0.000000f }, 1.000000f, -0.000000f ); 
+    instance.registerEObj( "unknown_1", 2007457, 6885561, 4, { 0.000000f, 0.000000f, 0.000000f }, 1.000000f, -0.000000f ); 
+    instance.registerEObj( "unknown_2", 2007457, 6852121, 4, { 0.000000f, 0.000000f, 0.000000f }, 1.000000f, -0.000000f ); 
+    instance.registerEObj( "Entrance", 2000182, 6910535, 5, { 0.000000f, 0.000000f, 15.000000f }, 1.000000f, 0.000000f ); 
+      // States -> vf_lock_on (id: 11) vf_lock_of (id: 12) 
+    instance.registerEObj( "Exit", 2000139, 0, 4, { 0.000000f, 0.000000f, -16.000000f }, 1.000000f, 0.000000f ); 
+
   }
 
-  void onInit( InstanceContentPtr instance ) override
+  void onUpdate( InstanceContent& instance, uint32_t currTime ) override
   {
 
   }
 
-  void onUpdate( InstanceContentPtr instance, uint32_t currTime ) override
-  {
-
-  }
-
-  void onEnterTerritory( InstanceContentPtr instance, Entity::Player& player, uint32_t eventId, uint16_t param1,
+  void onEnterTerritory( InstanceContent& instance, Entity::Player& player, uint32_t eventId, uint16_t param1,
                          uint16_t param2 ) override
   {
 
diff --git a/src/scripts/instances/raids/DeltascapeV10Savage.cpp b/src/scripts/instances/raids/DeltascapeV10Savage.cpp
index ed20dac2..4f4c2f86 100644
--- a/src/scripts/instances/raids/DeltascapeV10Savage.cpp
+++ b/src/scripts/instances/raids/DeltascapeV10Savage.cpp
@@ -9,20 +9,25 @@ class DeltascapeV10Savage :
 public:
   DeltascapeV10Savage() :
     Sapphire::ScriptAPI::InstanceContentScript( 30053 )
+  { }
+
+  void onInit( InstanceContent& instance ) override
   {
+    instance.registerEObj( "unknown_0", 2007457, 6791878, 4, { 0.000000f, 0.000000f, 0.000000f }, 1.000000f, -0.000000f ); 
+    instance.registerEObj( "unknown_1", 2007457, 6885561, 4, { 0.000000f, 0.000000f, 0.000000f }, 1.000000f, -0.000000f ); 
+    instance.registerEObj( "unknown_2", 2007457, 6852121, 4, { 0.000000f, 0.000000f, 0.000000f }, 1.000000f, -0.000000f ); 
+    instance.registerEObj( "Entrance", 2000182, 6910535, 5, { 0.000000f, 0.000000f, 15.000000f }, 1.000000f, 0.000000f ); 
+      // States -> vf_lock_on (id: 11) vf_lock_of (id: 12) 
+    instance.registerEObj( "Exit", 2000139, 0, 4, { 0.000000f, 0.000000f, -16.000000f }, 1.000000f, 0.000000f ); 
+
   }
 
-  void onInit( InstanceContentPtr instance ) override
+  void onUpdate( InstanceContent& instance, uint32_t currTime ) override
   {
 
   }
 
-  void onUpdate( InstanceContentPtr instance, uint32_t currTime ) override
-  {
-
-  }
-
-  void onEnterTerritory( InstanceContentPtr instance, Entity::Player& player, uint32_t eventId, uint16_t param1,
+  void onEnterTerritory( InstanceContent& instance, Entity::Player& player, uint32_t eventId, uint16_t param1,
                          uint16_t param2 ) override
   {
 
diff --git a/src/scripts/instances/raids/DeltascapeV20.cpp b/src/scripts/instances/raids/DeltascapeV20.cpp
index a8549494..d6769afa 100644
--- a/src/scripts/instances/raids/DeltascapeV20.cpp
+++ b/src/scripts/instances/raids/DeltascapeV20.cpp
@@ -9,20 +9,24 @@ class DeltascapeV20 :
 public:
   DeltascapeV20() :
     Sapphire::ScriptAPI::InstanceContentScript( 30050 )
+  { }
+
+  void onInit( InstanceContent& instance ) override
   {
+    instance.registerEObj( "unknown_0", 2008482, 0, 4, { 0.000000f, 0.000000f, 0.000000f }, 1.000000f, -0.000000f ); 
+    instance.registerEObj( "unknown_1", 2007457, 6872632, 4, { 0.000000f, 0.000000f, 0.000000f }, 1.000000f, -0.000000f ); 
+    instance.registerEObj( "Entrance", 2000182, 6910926, 5, { 0.000000f, 0.000000f, 15.000000f }, 1.000000f, 0.000000f ); 
+      // States -> vf_lock_on (id: 11) vf_lock_of (id: 12) 
+    instance.registerEObj( "Exit", 2000139, 0, 4, { 0.000000f, 0.000000f, -16.000000f }, 1.000000f, 0.000000f ); 
+
   }
 
-  void onInit( InstanceContentPtr instance ) override
+  void onUpdate( InstanceContent& instance, uint32_t currTime ) override
   {
 
   }
 
-  void onUpdate( InstanceContentPtr instance, uint32_t currTime ) override
-  {
-
-  }
-
-  void onEnterTerritory( InstanceContentPtr instance, Entity::Player& player, uint32_t eventId, uint16_t param1,
+  void onEnterTerritory( InstanceContent& instance, Entity::Player& player, uint32_t eventId, uint16_t param1,
                          uint16_t param2 ) override
   {
 
diff --git a/src/scripts/instances/raids/DeltascapeV20Savage.cpp b/src/scripts/instances/raids/DeltascapeV20Savage.cpp
index 7449a3c4..00d5e9ee 100644
--- a/src/scripts/instances/raids/DeltascapeV20Savage.cpp
+++ b/src/scripts/instances/raids/DeltascapeV20Savage.cpp
@@ -9,20 +9,24 @@ class DeltascapeV20Savage :
 public:
   DeltascapeV20Savage() :
     Sapphire::ScriptAPI::InstanceContentScript( 30054 )
+  { }
+
+  void onInit( InstanceContent& instance ) override
   {
+    instance.registerEObj( "unknown_0", 2008482, 0, 4, { 0.000000f, 0.000000f, 0.000000f }, 1.000000f, -0.000000f ); 
+    instance.registerEObj( "unknown_1", 2007457, 6872632, 4, { 0.000000f, 0.000000f, 0.000000f }, 1.000000f, -0.000000f ); 
+    instance.registerEObj( "Entrance", 2000182, 6910926, 5, { 0.000000f, 0.000000f, 15.000000f }, 1.000000f, 0.000000f ); 
+      // States -> vf_lock_on (id: 11) vf_lock_of (id: 12) 
+    instance.registerEObj( "Exit", 2000139, 0, 4, { 0.000000f, 0.000000f, -16.000000f }, 1.000000f, 0.000000f ); 
+
   }
 
-  void onInit( InstanceContentPtr instance ) override
+  void onUpdate( InstanceContent& instance, uint32_t currTime ) override
   {
 
   }
 
-  void onUpdate( InstanceContentPtr instance, uint32_t currTime ) override
-  {
-
-  }
-
-  void onEnterTerritory( InstanceContentPtr instance, Entity::Player& player, uint32_t eventId, uint16_t param1,
+  void onEnterTerritory( InstanceContent& instance, Entity::Player& player, uint32_t eventId, uint16_t param1,
                          uint16_t param2 ) override
   {
 
diff --git a/src/scripts/instances/raids/DeltascapeV30.cpp b/src/scripts/instances/raids/DeltascapeV30.cpp
index bb0822cb..2f95efc2 100644
--- a/src/scripts/instances/raids/DeltascapeV30.cpp
+++ b/src/scripts/instances/raids/DeltascapeV30.cpp
@@ -9,20 +9,40 @@ class DeltascapeV30 :
 public:
   DeltascapeV30() :
     Sapphire::ScriptAPI::InstanceContentScript( 30051 )
+  { }
+
+  void onInit( InstanceContent& instance ) override
   {
+    instance.registerEObj( "Matterrelocationdevice", 2008501, 6913059, 4, { 230.975693f, 231.836197f, -19.028080f }, 0.991760f, 0.000048f ); 
+    instance.registerEObj( "unknown_0", 2007457, 6792212, 4, { 0.000000f, 0.000000f, 0.000000f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_1", 2007457, 6847573, 4, { 0.000000f, 0.000000f, 0.000000f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_2", 2007457, 6848219, 4, { 0.000000f, 0.000000f, 0.000000f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "sgbg_z3o4_a1_mto01", 2007457, 6953156, 4, { 250.000000f, 250.995605f, 0.000000f }, 1.000000f, -0.000000f ); 
+      // States -> mete_hide (id: 19) mete_pre (id: 20) mete_phase_1 (id: 21) mete_phase_2 (id: 22) mete_phase_3 (id: 23) mete_phase_4 (id: 24) mete_fade (id: 25) mete_phase_5 (id: 26) 
+    instance.registerEObj( "unknown_3", 2007457, 6929138, 4, { 0.000000f, 0.000000f, 0.000000f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_4", 2007457, 6847577, 4, { 0.000000f, 0.000000f, 0.000000f }, 1.000000f, -0.000000f ); 
+    instance.registerEObj( "unknown_5", 2007457, 6853325, 4, { 0.000000f, 0.000000f, 0.000000f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_6", 2007457, 6853774, 4, { 0.000000f, 0.000000f, 0.000000f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_7", 2007457, 6846630, 4, { -15.000000f, 0.000001f, 15.000000f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_8", 2007457, 6846632, 4, { -5.000000f, 0.000000f, 15.000000f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_9", 2007457, 6846634, 4, { 5.000000f, 0.000000f, 15.000000f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_10", 2007457, 6846637, 4, { 15.000000f, 0.000000f, 15.000000f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_11", 2007457, 6846642, 4, { -15.000000f, 0.000000f, -15.000000f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_12", 2007457, 6846643, 4, { -5.000000f, 0.000000f, -15.000000f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_13", 2007457, 6846644, 4, { 5.000000f, 0.000000f, -15.000000f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_14", 2007457, 6846645, 4, { 15.000000f, 0.000000f, -15.000000f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "Entrance", 2000182, 6912959, 5, { 0.000000f, 0.000000f, 15.000000f }, 1.000000f, 0.000000f ); 
+      // States -> vf_lock_on (id: 11) vf_lock_of (id: 12) 
+    instance.registerEObj( "Exit", 2000139, 0, 4, { 0.000000f, 0.000000f, -10.000000f }, 1.000000f, 0.000000f ); 
+
   }
 
-  void onInit( InstanceContentPtr instance ) override
+  void onUpdate( InstanceContent& instance, uint32_t currTime ) override
   {
 
   }
 
-  void onUpdate( InstanceContentPtr instance, uint32_t currTime ) override
-  {
-
-  }
-
-  void onEnterTerritory( InstanceContentPtr instance, Entity::Player& player, uint32_t eventId, uint16_t param1,
+  void onEnterTerritory( InstanceContent& instance, Entity::Player& player, uint32_t eventId, uint16_t param1,
                          uint16_t param2 ) override
   {
 
diff --git a/src/scripts/instances/raids/DeltascapeV30Savage.cpp b/src/scripts/instances/raids/DeltascapeV30Savage.cpp
index 5ef43554..cd5a810b 100644
--- a/src/scripts/instances/raids/DeltascapeV30Savage.cpp
+++ b/src/scripts/instances/raids/DeltascapeV30Savage.cpp
@@ -9,20 +9,40 @@ class DeltascapeV30Savage :
 public:
   DeltascapeV30Savage() :
     Sapphire::ScriptAPI::InstanceContentScript( 30055 )
+  { }
+
+  void onInit( InstanceContent& instance ) override
   {
+    instance.registerEObj( "Matterrelocationdevice", 2008501, 6913059, 4, { 230.975693f, 231.836197f, -19.028080f }, 0.991760f, 0.000048f ); 
+    instance.registerEObj( "unknown_0", 2007457, 6792212, 4, { 0.000000f, 0.000000f, 0.000000f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_1", 2007457, 6847573, 4, { 0.000000f, 0.000000f, 0.000000f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_2", 2007457, 6848219, 4, { 0.000000f, 0.000000f, 0.000000f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "sgbg_z3o4_a1_mto01", 2007457, 6953156, 4, { 250.000000f, 250.995605f, 0.000000f }, 1.000000f, -0.000000f ); 
+      // States -> mete_hide (id: 19) mete_pre (id: 20) mete_phase_1 (id: 21) mete_phase_2 (id: 22) mete_phase_3 (id: 23) mete_phase_4 (id: 24) mete_fade (id: 25) mete_phase_5 (id: 26) 
+    instance.registerEObj( "unknown_3", 2007457, 6929138, 4, { 0.000000f, 0.000000f, 0.000000f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_4", 2007457, 6847577, 4, { 0.000000f, 0.000000f, 0.000000f }, 1.000000f, -0.000000f ); 
+    instance.registerEObj( "unknown_5", 2007457, 6853325, 4, { 0.000000f, 0.000000f, 0.000000f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_6", 2007457, 6853774, 4, { 0.000000f, 0.000000f, 0.000000f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_7", 2007457, 6846630, 4, { -15.000000f, 0.000001f, 15.000000f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_8", 2007457, 6846632, 4, { -5.000000f, 0.000000f, 15.000000f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_9", 2007457, 6846634, 4, { 5.000000f, 0.000000f, 15.000000f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_10", 2007457, 6846637, 4, { 15.000000f, 0.000000f, 15.000000f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_11", 2007457, 6846642, 4, { -15.000000f, 0.000000f, -15.000000f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_12", 2007457, 6846643, 4, { -5.000000f, 0.000000f, -15.000000f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_13", 2007457, 6846644, 4, { 5.000000f, 0.000000f, -15.000000f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_14", 2007457, 6846645, 4, { 15.000000f, 0.000000f, -15.000000f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "Entrance", 2000182, 6912959, 5, { 0.000000f, 0.000000f, 15.000000f }, 1.000000f, 0.000000f ); 
+      // States -> vf_lock_on (id: 11) vf_lock_of (id: 12) 
+    instance.registerEObj( "Exit", 2000139, 0, 4, { 0.000000f, 0.000000f, -10.000000f }, 1.000000f, 0.000000f ); 
+
   }
 
-  void onInit( InstanceContentPtr instance ) override
+  void onUpdate( InstanceContent& instance, uint32_t currTime ) override
   {
 
   }
 
-  void onUpdate( InstanceContentPtr instance, uint32_t currTime ) override
-  {
-
-  }
-
-  void onEnterTerritory( InstanceContentPtr instance, Entity::Player& player, uint32_t eventId, uint16_t param1,
+  void onEnterTerritory( InstanceContent& instance, Entity::Player& player, uint32_t eventId, uint16_t param1,
                          uint16_t param2 ) override
   {
 
diff --git a/src/scripts/instances/raids/DeltascapeV40.cpp b/src/scripts/instances/raids/DeltascapeV40.cpp
index 354c573b..fa29b8f8 100644
--- a/src/scripts/instances/raids/DeltascapeV40.cpp
+++ b/src/scripts/instances/raids/DeltascapeV40.cpp
@@ -9,20 +9,29 @@ class DeltascapeV40 :
 public:
   DeltascapeV40() :
     Sapphire::ScriptAPI::InstanceContentScript( 30052 )
+  { }
+
+  void onInit( InstanceContent& instance ) override
   {
+    instance.registerEObj( "unknown_0", 2007457, 6925502, 4, { 0.000000f, 0.000000f, 0.038952f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_1", 2007457, 6925503, 4, { 0.000000f, 0.000000f, 0.038952f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_2", 2007457, 6925504, 4, { 0.000000f, 0.000000f, 0.038952f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_3", 2007457, 6936015, 4, { 0.000000f, 0.000000f, 0.038952f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_4", 2007457, 6865650, 4, { 0.000000f, 0.000000f, 0.038952f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_5", 2007457, 6872744, 4, { 0.000000f, 0.000000f, 0.038952f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_6", 2008483, 0, 4, { 0.000000f, 0.000000f, 0.000000f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "Exit", 2000139, 0, 4, { 0.000000f, 0.000000f, -17.000000f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "Entrance", 2000182, 6914211, 5, { 0.000000f, 0.000000f, 15.000000f }, 1.000000f, 0.000000f ); 
+      // States -> vf_lock_on (id: 11) vf_lock_of (id: 12) 
+
   }
 
-  void onInit( InstanceContentPtr instance ) override
+  void onUpdate( InstanceContent& instance, uint32_t currTime ) override
   {
 
   }
 
-  void onUpdate( InstanceContentPtr instance, uint32_t currTime ) override
-  {
-
-  }
-
-  void onEnterTerritory( InstanceContentPtr instance, Entity::Player& player, uint32_t eventId, uint16_t param1,
+  void onEnterTerritory( InstanceContent& instance, Entity::Player& player, uint32_t eventId, uint16_t param1,
                          uint16_t param2 ) override
   {
 
diff --git a/src/scripts/instances/raids/DeltascapeV40Savage.cpp b/src/scripts/instances/raids/DeltascapeV40Savage.cpp
index ebc95998..1b5c223c 100644
--- a/src/scripts/instances/raids/DeltascapeV40Savage.cpp
+++ b/src/scripts/instances/raids/DeltascapeV40Savage.cpp
@@ -9,20 +9,29 @@ class DeltascapeV40Savage :
 public:
   DeltascapeV40Savage() :
     Sapphire::ScriptAPI::InstanceContentScript( 30056 )
+  { }
+
+  void onInit( InstanceContent& instance ) override
   {
+    instance.registerEObj( "unknown_0", 2007457, 6925502, 4, { 0.000000f, 0.000000f, 0.038952f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_1", 2007457, 6925503, 4, { 0.000000f, 0.000000f, 0.038952f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_2", 2007457, 6925504, 4, { 0.000000f, 0.000000f, 0.038952f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_3", 2007457, 6936015, 4, { 0.000000f, 0.000000f, 0.038952f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_4", 2007457, 6865650, 4, { 0.000000f, 0.000000f, 0.038952f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_5", 2007457, 6872744, 4, { 0.000000f, 0.000000f, 0.038952f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_6", 2008483, 0, 4, { 0.000000f, 0.000000f, 0.000000f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "Exit", 2000139, 0, 4, { 0.000000f, 0.000000f, -17.000000f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "Entrance", 2000182, 6914211, 5, { 0.000000f, 0.000000f, 15.000000f }, 1.000000f, 0.000000f ); 
+      // States -> vf_lock_on (id: 11) vf_lock_of (id: 12) 
+
   }
 
-  void onInit( InstanceContentPtr instance ) override
+  void onUpdate( InstanceContent& instance, uint32_t currTime ) override
   {
 
   }
 
-  void onUpdate( InstanceContentPtr instance, uint32_t currTime ) override
-  {
-
-  }
-
-  void onEnterTerritory( InstanceContentPtr instance, Entity::Player& player, uint32_t eventId, uint16_t param1,
+  void onEnterTerritory( InstanceContent& instance, Entity::Player& player, uint32_t eventId, uint16_t param1,
                          uint16_t param2 ) override
   {
 
diff --git a/src/scripts/instances/raids/DunScaith.cpp b/src/scripts/instances/raids/DunScaith.cpp
index 66f2da64..7b75f229 100644
--- a/src/scripts/instances/raids/DunScaith.cpp
+++ b/src/scripts/instances/raids/DunScaith.cpp
@@ -9,20 +9,87 @@ class DunScaith :
 public:
   DunScaith() :
     Sapphire::ScriptAPI::InstanceContentScript( 30047 )
+  { }
+
+  void onInit( InstanceContent& instance ) override
   {
+    instance.registerEObj( "sgvf_w_lvd_b0250", 2002872, 6610729, 4, { 331.572388f, 2.765574f, 418.256012f }, 1.000000f, 0.000000f ); 
+      // States -> vf_bextwall_on (id: 3) vf_bextwall_of (id: 4) 
+    instance.registerEObj( "sgvf_w_lvd_b0250_1", 2007602, 6610730, 4, { 266.946014f, 2.765530f, 420.309692f }, 0.991760f, 0.000048f ); 
+      // States -> vf_bextwall_on (id: 3) vf_bextwall_of (id: 4) 
+    instance.registerEObj( "sgvf_z2r3_b1046", 2007609, 6612545, 4, { 276.236511f, 2.869957f, 402.357910f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "sgvf_z2r3_b1046_1", 2007610, 6612547, 4, { 291.404297f, 2.869957f, 402.158112f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "sgvf_z2r3_b1046_2", 2007611, 6612549, 4, { 306.464600f, 2.869963f, 402.176208f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "sgvf_z2r3_b1046_3", 2007612, 6612551, 4, { 321.436493f, 2.869970f, 402.213196f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "sgvf_z2r3_b1046_4", 2007613, 6612544, 4, { 276.728699f, 2.869961f, 417.200195f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "sgvf_z2r3_b1046_5", 2007614, 6612546, 4, { 291.491791f, 2.869957f, 417.279388f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "sgvf_z2r3_b1046_6", 2007615, 6612548, 4, { 306.298187f, 2.869963f, 417.075897f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "sgvf_z2r3_b1046_7", 2007616, 6612550, 4, { 321.398895f, 2.869969f, 417.089905f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "sgvf_z2r3_b1053", 2007603, 6612604, 4, { 279.000000f, 2.869900f, 398.600006f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "sgvf_z2r3_b1053_1", 2007604, 6612605, 4, { 305.000000f, 2.870000f, 398.600006f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "sgvf_z2r3_b1053_2", 2007605, 6612606, 4, { 319.000000f, 2.870000f, 398.600006f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "sgvf_z2r3_b1053_3", 2007606, 6612608, 4, { 287.000000f, 2.869900f, 420.600006f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "sgvf_z2r3_b1053_4", 2007607, 6612609, 4, { 305.000000f, 2.870000f, 420.600006f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "sgvf_z2r3_b1053_5", 2007608, 6612611, 4, { 315.000000f, 2.870000f, 420.600006f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_0", 2007619, 6613747, 4, { 299.266815f, 2.869962f, 409.699585f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_1", 2007617, 6584508, 4, { 255.549805f, 2.765237f, 401.452301f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_2", 2007783, 0, 4, { 316.110107f, 2.869910f, 411.214813f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_3", 2007791, 0, 4, { 329.623108f, 2.825000f, 409.616913f }, 1.250000f, 1.570451f ); 
+    instance.registerEObj( "sgvf_w_lvd_b0118", 2002872, 6613229, 4, { -348.000000f, -7.000000f, 256.488800f }, 1.000000f, 0.000000f ); 
+      // States -> vf_bextwall_on (id: 3) vf_bextwall_of (id: 4) 
+    instance.registerEObj( "unknown_4", 2002587, 0, 4, { -350.000000f, -7.000000f, 255.088806f }, 1.400000f, 0.000000f ); 
+    instance.registerEObj( "unknown_5", 2007620, 0, 4, { -366.689606f, -7.003906f, 224.200806f }, 0.991760f, 0.000048f ); 
+    instance.registerEObj( "unknown_6", 2007621, 0, 4, { -361.958405f, -7.000000f, 224.734894f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "sgvf_w_lvd_b0118_1", 2002872, 6620377, 4, { -0.071279f, -600.000000f, -18.220051f }, 1.000000f, 0.000000f ); 
+      // States -> vf_bextwall_on (id: 3) vf_bextwall_of (id: 4) 
+    instance.registerEObj( "unknown_7", 2007630, 0, 4, { -4.827496f, -600.000000f, -58.405430f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_8", 2007631, 0, 4, { 7.122071f, -600.000000f, -58.051449f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_9", 2007636, 6563525, 4, { -16.708380f, -600.000000f, -41.601891f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_10", 2007637, 6588851, 4, { -18.625420f, -600.000000f, -43.212120f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_11", 2007791, 0, 4, { 0.000000f, -600.000000f, -20.142851f }, 0.750000f, 0.000000f ); 
+    instance.registerEObj( "sgvf_w_lvd_b0118_2", 2002872, 6620064, 4, { -317.914093f, 1.360948f, -445.124115f }, 1.000000f, 0.000000f ); 
+      // States -> vf_bextwall_on (id: 3) vf_bextwall_of (id: 4) 
+    instance.registerEObj( "unknown_12", 2002587, 0, 4, { -320.546295f, 0.991760f, -444.693695f }, 0.991760f, 1.570451f ); 
+    instance.registerEObj( "unknown_13", 2007630, 0, 4, { -351.186401f, 0.991760f, -466.178406f }, 0.991760f, 0.000048f ); 
+    instance.registerEObj( "unknown_14", 2007631, 0, 4, { -366.506500f, 0.991760f, -461.936401f }, 0.991760f, 0.000048f ); 
+    instance.registerEObj( "unknown_15", 2007632, 0, 4, { -359.822998f, 0.991760f, -429.373688f }, 0.991760f, -1.570451f ); 
+    instance.registerEObj( "unknown_16", 2007633, 0, 4, { -347.127502f, 0.991760f, -428.549713f }, 0.991760f, -1.570451f ); 
+    instance.registerEObj( "sgvf_z2r3_b1045", 2007638, 6586142, 4, { 343.046997f, -300.000000f, -447.157593f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_17", 2007653, 6637716, 4, { -335.860596f, 1.000000f, -437.835388f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_18", 2007654, 6629695, 4, { -335.609100f, 1.000000f, -440.386108f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_19", 2007655, 6629831, 4, { -332.752014f, 1.000000f, -437.575012f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_20", 2007656, 6637880, 4, { -332.460205f, 1.000000f, -440.058685f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_21", 2007697, 0, 4, { -346.146393f, 1.000000f, -424.946991f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "sgbg_z2r3_a3_rod01", 2007787, 6752662, 4, { -368.030212f, 0.974755f, -434.419312f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "Basicconveyanceunit", 2007660, 6610748, 4, { 231.338699f, -6.515625f, 346.216797f }, 0.991760f, 0.000048f ); 
+    instance.registerEObj( "Basicconveyanceunit_1", 2007661, 6610750, 4, { -356.222900f, -7.000000f, 287.132996f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "Basicconveyanceunit_2", 2007699, 0, 4, { 397.550415f, 2.656644f, 398.343109f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_22", 2007667, 6606266, 4, { 188.339996f, -6.500000f, 359.549011f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_23", 2007668, 6606267, 4, { 19.479019f, -6.500000f, 316.675598f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_24", 2007669, 6606268, 4, { -110.310303f, 1.500000f, 315.310303f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_25", 2007670, 6606273, 4, { -357.075592f, -7.000000f, 201.676895f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "Basicconveyanceunit_3", 2007662, 6610755, 4, { -357.847107f, 12.985350f, 16.963461f }, 0.991760f, 0.000048f ); 
+    instance.registerEObj( "Basicconveyanceunit_4", 2007663, 6610756, 4, { -342.946594f, 13.000000f, -123.268700f }, 0.991760f, 0.000048f ); 
+    instance.registerEObj( "unknown_26", 2007671, 6601719, 4, { -356.908508f, 13.000000f, 12.522250f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_27", 2007672, 6601720, 4, { -356.563599f, 1.000000f, -74.405586f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_28", 2007698, 0, 4, { -94.983139f, 1.500000f, 320.626312f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_29", 2007703, 0, 4, { -94.909897f, 1.500000f, 313.278015f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_30", 2007702, 0, 4, { -364.034485f, 0.991760f, -43.015259f }, 0.991760f, 0.000048f ); 
+    instance.registerEObj( "Entrance", 2000182, 6610725, 5, { 386.739899f, 2.618790f, 416.983307f }, 0.991760f, 0.000048f ); 
+      // States -> vf_lock_on (id: 11) vf_lock_of (id: 12) 
+    instance.registerEObj( "Exit", 2000139, 0, 4, { -371.922791f, 1.000000f, -444.704590f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "sgvf_w_lvd_b0118_3", 2002872, 6638848, 4, { -344.433014f, 13.000000f, 7.243163f }, 1.000000f, 0.000000f ); 
+      // States -> vf_bextwall_on (id: 3) vf_bextwall_of (id: 4) 
+    instance.registerEObj( "unknown_31", 2002587, 0, 4, { -350.500793f, 13.000000f, 5.113899f }, 1.000000f, 0.000000f ); 
+
   }
 
-  void onInit( InstanceContentPtr instance ) override
+  void onUpdate( InstanceContent& instance, uint32_t currTime ) override
   {
 
   }
 
-  void onUpdate( InstanceContentPtr instance, uint32_t currTime ) override
-  {
-
-  }
-
-  void onEnterTerritory( InstanceContentPtr instance, Entity::Player& player, uint32_t eventId, uint16_t param1,
+  void onEnterTerritory( InstanceContent& instance, Entity::Player& player, uint32_t eventId, uint16_t param1,
                          uint16_t param2 ) override
   {
 
diff --git a/src/scripts/instances/raids/SigmascapeV10.cpp b/src/scripts/instances/raids/SigmascapeV10.cpp
index a12e9d68..78c21c98 100644
--- a/src/scripts/instances/raids/SigmascapeV10.cpp
+++ b/src/scripts/instances/raids/SigmascapeV10.cpp
@@ -9,20 +9,40 @@ class SigmascapeV10 :
 public:
   SigmascapeV10() :
     Sapphire::ScriptAPI::InstanceContentScript( 30059 )
+  { }
+
+  void onInit( InstanceContent& instance ) override
   {
+    instance.registerEObj( "sgbg_z3o7_a0_ghr01", 2007457, 7230603, 4, { -6.335131f, 0.049939f, -10.559780f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "sgbg_z3o7_a0_ghr01_1", 2007457, 7230604, 4, { -5.699108f, 0.049922f, -2.387848f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "sgbg_z3o7_a0_ghr01_2", 2007457, 7230605, 4, { -6.369749f, 0.050002f, 7.711805f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "sgbg_z3o7_a0_ghr01_3", 2007457, 7230606, 4, { -6.234384f, 0.050004f, 17.721371f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "sgvf_w_lvd_b1256", 2009408, 7231049, 4, { -3.117226f, 0.050002f, 9.861297f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "sgvf_z3o7_b1346", 2009409, 7231069, 4, { -25.851500f, 16.520651f, 22.008921f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_0", 2007457, 7274404, 4, { -22.963020f, -2.647718f, 8.151876f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "sgvf_z3o7_b1359", 2007457, 7297633, 4, { -30.500000f, 0.552600f, 43.000000f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_1", 2009384, 0, 4, { 220.569107f, -108.812103f, 5.081238f }, 0.991760f, 0.000048f ); 
+    instance.registerEObj( "Aetherialstream", 2009400, 7231089, 4, { 144.482300f, -110.000000f, -71.090813f }, 0.991760f, 0.000046f ); 
+    instance.registerEObj( "Aetherialstream_1", 2009401, 7231090, 4, { 144.468994f, -110.000000f, -23.514120f }, 0.991760f, 0.000048f ); 
+    instance.registerEObj( "Aetherialstream_2", 2009402, 7231091, 4, { 144.456100f, -110.000000f, 23.836590f }, 0.991760f, 0.000048f ); 
+    instance.registerEObj( "Aetherialstream_3", 2009403, 7231092, 4, { 144.470901f, -110.000000f, 71.062202f }, 0.991760f, 0.000048f ); 
+    instance.registerEObj( "Aetherialstream_4", 2009404, 7231093, 4, { 215.991302f, -110.000000f, -71.152832f }, 0.991760f, 0.000048f ); 
+    instance.registerEObj( "Aetherialstream_5", 2009405, 7231096, 4, { 215.991302f, -110.000000f, -23.514160f }, 0.991760f, 0.000048f ); 
+    instance.registerEObj( "Aetherialstream_6", 2009406, 7231097, 4, { 215.991302f, -110.000000f, 23.880310f }, 0.991760f, 0.000048f ); 
+    instance.registerEObj( "Aetherialstream_7", 2009407, 7231098, 4, { 215.991302f, -110.000000f, 71.061279f }, 0.991760f, 0.000048f ); 
+    instance.registerEObj( "sgvf_z3o7_b1359_1", 2007457, 7297634, 4, { 178.511902f, -110.002403f, -0.198364f }, 0.991760f, 0.000048f ); 
+    instance.registerEObj( "Entrance", 2007457, 7181869, 5, { -3.537696f, 0.000001f, 18.750830f }, 1.000000f, 0.000000f ); 
+      // States -> vf_lock_on (id: 11) vf_lock_of (id: 12) 
+    instance.registerEObj( "Exit", 2000139, 0, 4, { 0.076233f, -0.015320f, -9.170715f }, 0.991760f, 0.000048f ); 
+
   }
 
-  void onInit( InstanceContentPtr instance ) override
+  void onUpdate( InstanceContent& instance, uint32_t currTime ) override
   {
 
   }
 
-  void onUpdate( InstanceContentPtr instance, uint32_t currTime ) override
-  {
-
-  }
-
-  void onEnterTerritory( InstanceContentPtr instance, Entity::Player& player, uint32_t eventId, uint16_t param1,
+  void onEnterTerritory( InstanceContent& instance, Entity::Player& player, uint32_t eventId, uint16_t param1,
                          uint16_t param2 ) override
   {
 
diff --git a/src/scripts/instances/raids/SigmascapeV10Savage.cpp b/src/scripts/instances/raids/SigmascapeV10Savage.cpp
index e31673db..80b75234 100644
--- a/src/scripts/instances/raids/SigmascapeV10Savage.cpp
+++ b/src/scripts/instances/raids/SigmascapeV10Savage.cpp
@@ -9,20 +9,40 @@ class SigmascapeV10Savage :
 public:
   SigmascapeV10Savage() :
     Sapphire::ScriptAPI::InstanceContentScript( 30063 )
+  { }
+
+  void onInit( InstanceContent& instance ) override
   {
+    instance.registerEObj( "sgbg_z3o7_a0_ghr01", 2007457, 7230603, 4, { -6.335131f, 0.049939f, -10.559780f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "sgbg_z3o7_a0_ghr01_1", 2007457, 7230604, 4, { -5.699108f, 0.049922f, -2.387848f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "sgbg_z3o7_a0_ghr01_2", 2007457, 7230605, 4, { -6.369749f, 0.050002f, 7.711805f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "sgbg_z3o7_a0_ghr01_3", 2007457, 7230606, 4, { -6.234384f, 0.050004f, 17.721371f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "sgvf_w_lvd_b1256", 2009408, 7231049, 4, { -3.117226f, 0.050002f, 9.861297f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "sgvf_z3o7_b1346", 2009409, 7231069, 4, { -25.851500f, 16.520651f, 22.008921f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_0", 2007457, 7274404, 4, { -22.963020f, -2.647718f, 8.151876f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "sgvf_z3o7_b1359", 2007457, 7297633, 4, { -30.500000f, 0.552600f, 43.000000f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_1", 2009384, 0, 4, { 220.569107f, -108.812103f, 5.081238f }, 0.991760f, 0.000048f ); 
+    instance.registerEObj( "Aetherialstream", 2009400, 7231089, 4, { 144.482300f, -110.000000f, -71.090813f }, 0.991760f, 0.000046f ); 
+    instance.registerEObj( "Aetherialstream_1", 2009401, 7231090, 4, { 144.468994f, -110.000000f, -23.514120f }, 0.991760f, 0.000048f ); 
+    instance.registerEObj( "Aetherialstream_2", 2009402, 7231091, 4, { 144.456100f, -110.000000f, 23.836590f }, 0.991760f, 0.000048f ); 
+    instance.registerEObj( "Aetherialstream_3", 2009403, 7231092, 4, { 144.470901f, -110.000000f, 71.062202f }, 0.991760f, 0.000048f ); 
+    instance.registerEObj( "Aetherialstream_4", 2009404, 7231093, 4, { 215.991302f, -110.000000f, -71.152832f }, 0.991760f, 0.000048f ); 
+    instance.registerEObj( "Aetherialstream_5", 2009405, 7231096, 4, { 215.991302f, -110.000000f, -23.514160f }, 0.991760f, 0.000048f ); 
+    instance.registerEObj( "Aetherialstream_6", 2009406, 7231097, 4, { 215.991302f, -110.000000f, 23.880310f }, 0.991760f, 0.000048f ); 
+    instance.registerEObj( "Aetherialstream_7", 2009407, 7231098, 4, { 215.991302f, -110.000000f, 71.061279f }, 0.991760f, 0.000048f ); 
+    instance.registerEObj( "sgvf_z3o7_b1359_1", 2007457, 7297634, 4, { 178.511902f, -110.002403f, -0.198364f }, 0.991760f, 0.000048f ); 
+    instance.registerEObj( "Entrance", 2007457, 7181869, 5, { -3.537696f, 0.000001f, 18.750830f }, 1.000000f, 0.000000f ); 
+      // States -> vf_lock_on (id: 11) vf_lock_of (id: 12) 
+    instance.registerEObj( "Exit", 2000139, 0, 4, { 0.076233f, -0.015320f, -9.170715f }, 0.991760f, 0.000048f ); 
+
   }
 
-  void onInit( InstanceContentPtr instance ) override
+  void onUpdate( InstanceContent& instance, uint32_t currTime ) override
   {
 
   }
 
-  void onUpdate( InstanceContentPtr instance, uint32_t currTime ) override
-  {
-
-  }
-
-  void onEnterTerritory( InstanceContentPtr instance, Entity::Player& player, uint32_t eventId, uint16_t param1,
+  void onEnterTerritory( InstanceContent& instance, Entity::Player& player, uint32_t eventId, uint16_t param1,
                          uint16_t param2 ) override
   {
 
diff --git a/src/scripts/instances/raids/SigmascapeV20.cpp b/src/scripts/instances/raids/SigmascapeV20.cpp
index b437423d..47b13154 100644
--- a/src/scripts/instances/raids/SigmascapeV20.cpp
+++ b/src/scripts/instances/raids/SigmascapeV20.cpp
@@ -9,20 +9,38 @@ class SigmascapeV20 :
 public:
   SigmascapeV20() :
     Sapphire::ScriptAPI::InstanceContentScript( 30060 )
+  { }
+
+  void onInit( InstanceContent& instance ) override
   {
+    instance.registerEObj( "unknown_0", 2007457, 7244294, 4, { -6.511937f, 0.003125f, -4.958800f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_1", 2007457, 7181375, 4, { 12.476670f, -0.015002f, 6.948618f }, 0.991760f, 0.000048f ); 
+    instance.registerEObj( "unknown_2", 2007457, 7181377, 4, { 12.570220f, -0.015320f, -9.693607f }, 0.991760f, 0.000048f ); 
+    instance.registerEObj( "unknown_3", 2007457, 7329867, 4, { -4.318359f, -0.015320f, 5.722107f }, 0.991760f, 0.000048f ); 
+    instance.registerEObj( "unknown_4", 2007457, 7187344, 4, { -1.960858f, 0.001128f, 0.319698f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_5", 2007457, 7174526, 4, { -6.872698f, 0.004465f, 1.843464f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_6", 2007457, 7174523, 4, { 11.220570f, 0.054783f, -1.564175f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_7", 2007457, 7174518, 4, { 8.520967f, 0.009985f, -8.679861f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_8", 2007457, 7174519, 4, { 9.028366f, 0.055644f, 3.513119f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_9", 2007457, 7180548, 4, { 2.311234f, 0.003611f, 3.656348f }, 1.000000f, -0.000000f ); 
+    instance.registerEObj( "unknown_10", 2007457, 7244420, 4, { 2.385169f, 0.003358f, 3.242888f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_11", 2007457, 7181938, 4, { 15.676980f, 0.010429f, -11.942520f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_12", 2007457, 7181940, 4, { 16.526520f, 0.010429f, 11.441620f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_13", 2007457, 7181939, 4, { -16.083740f, 0.010429f, 11.147680f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_14", 2007457, 7181937, 4, { -16.250851f, -0.015320f, -11.795230f }, 0.991760f, 0.000048f ); 
+    instance.registerEObj( "Entrance", 2000182, 7179724, 5, { -1.443299f, 0.007087f, 6.836350f }, 1.000000f, 0.000000f ); 
+      // States -> vf_lock_on (id: 11) vf_lock_of (id: 12) 
+    instance.registerEObj( "Exit", 2000139, 0, 4, { 0.000000f, 0.000000f, -11.000000f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_15", 2007457, 7171885, 4, { 4.955309f, 0.000000f, -52.142441f }, 1.000000f, 0.000000f ); 
+
   }
 
-  void onInit( InstanceContentPtr instance ) override
+  void onUpdate( InstanceContent& instance, uint32_t currTime ) override
   {
 
   }
 
-  void onUpdate( InstanceContentPtr instance, uint32_t currTime ) override
-  {
-
-  }
-
-  void onEnterTerritory( InstanceContentPtr instance, Entity::Player& player, uint32_t eventId, uint16_t param1,
+  void onEnterTerritory( InstanceContent& instance, Entity::Player& player, uint32_t eventId, uint16_t param1,
                          uint16_t param2 ) override
   {
 
diff --git a/src/scripts/instances/raids/SigmascapeV20Savage.cpp b/src/scripts/instances/raids/SigmascapeV20Savage.cpp
index c22658d1..becd1116 100644
--- a/src/scripts/instances/raids/SigmascapeV20Savage.cpp
+++ b/src/scripts/instances/raids/SigmascapeV20Savage.cpp
@@ -9,20 +9,38 @@ class SigmascapeV20Savage :
 public:
   SigmascapeV20Savage() :
     Sapphire::ScriptAPI::InstanceContentScript( 30064 )
+  { }
+
+  void onInit( InstanceContent& instance ) override
   {
+    instance.registerEObj( "unknown_0", 2007457, 7244294, 4, { -6.511937f, 0.003125f, -4.958800f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_1", 2007457, 7181375, 4, { 12.476670f, -0.015002f, 6.948618f }, 0.991760f, 0.000048f ); 
+    instance.registerEObj( "unknown_2", 2007457, 7181377, 4, { 12.570220f, -0.015320f, -9.693607f }, 0.991760f, 0.000048f ); 
+    instance.registerEObj( "unknown_3", 2007457, 7329867, 4, { -4.318359f, -0.015320f, 5.722107f }, 0.991760f, 0.000048f ); 
+    instance.registerEObj( "unknown_4", 2007457, 7187344, 4, { -1.960858f, 0.001128f, 0.319698f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_5", 2007457, 7174526, 4, { -6.872698f, 0.004465f, 1.843464f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_6", 2007457, 7174523, 4, { 11.220570f, 0.054783f, -1.564175f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_7", 2007457, 7174518, 4, { 8.520967f, 0.009985f, -8.679861f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_8", 2007457, 7174519, 4, { 9.028366f, 0.055644f, 3.513119f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_9", 2007457, 7180548, 4, { 2.311234f, 0.003611f, 3.656348f }, 1.000000f, -0.000000f ); 
+    instance.registerEObj( "unknown_10", 2007457, 7244420, 4, { 2.385169f, 0.003358f, 3.242888f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_11", 2007457, 7181938, 4, { 15.676980f, 0.010429f, -11.942520f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_12", 2007457, 7181940, 4, { 16.526520f, 0.010429f, 11.441620f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_13", 2007457, 7181939, 4, { -16.083740f, 0.010429f, 11.147680f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_14", 2007457, 7181937, 4, { -16.250851f, -0.015320f, -11.795230f }, 0.991760f, 0.000048f ); 
+    instance.registerEObj( "Entrance", 2000182, 7179724, 5, { -1.443299f, 0.007087f, 6.836350f }, 1.000000f, 0.000000f ); 
+      // States -> vf_lock_on (id: 11) vf_lock_of (id: 12) 
+    instance.registerEObj( "Exit", 2000139, 0, 4, { 0.000000f, 0.000000f, -11.000000f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_15", 2007457, 7171885, 4, { 4.955309f, 0.000000f, -52.142441f }, 1.000000f, 0.000000f ); 
+
   }
 
-  void onInit( InstanceContentPtr instance ) override
+  void onUpdate( InstanceContent& instance, uint32_t currTime ) override
   {
 
   }
 
-  void onUpdate( InstanceContentPtr instance, uint32_t currTime ) override
-  {
-
-  }
-
-  void onEnterTerritory( InstanceContentPtr instance, Entity::Player& player, uint32_t eventId, uint16_t param1,
+  void onEnterTerritory( InstanceContent& instance, Entity::Player& player, uint32_t eventId, uint16_t param1,
                          uint16_t param2 ) override
   {
 
diff --git a/src/scripts/instances/raids/SigmascapeV30.cpp b/src/scripts/instances/raids/SigmascapeV30.cpp
index 61f9a496..3cbab682 100644
--- a/src/scripts/instances/raids/SigmascapeV30.cpp
+++ b/src/scripts/instances/raids/SigmascapeV30.cpp
@@ -9,20 +9,33 @@ class SigmascapeV30 :
 public:
   SigmascapeV30() :
     Sapphire::ScriptAPI::InstanceContentScript( 30061 )
+  { }
+
+  void onInit( InstanceContent& instance ) override
   {
+    instance.registerEObj( "Entrance", 2000182, 7174192, 5, { -0.028109f, 0.000000f, 12.665810f }, 1.000000f, 0.000000f ); 
+      // States -> vf_lock_on (id: 11) vf_lock_of (id: 12) 
+    instance.registerEObj( "Exit", 2000139, 0, 4, { 0.000000f, 0.000000f, -15.000000f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_0", 2009292, 7185733, 4, { -7.736383f, 3.268075f, -35.776291f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_1", 2009293, 7185734, 4, { 10.155860f, 3.268075f, -35.738319f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_2", 2009294, 0, 4, { 18.075230f, 0.000000f, -16.894060f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_3", 2009295, 0, 4, { 15.384740f, 0.000000f, -8.198026f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_4", 2009296, 0, 4, { 17.399639f, 0.000000f, -8.148316f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_5", 2009297, 0, 4, { 10.133680f, 0.000000f, -9.799342f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_6", 2009298, 0, 4, { 12.524550f, 0.000000f, -0.314495f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_7", 2009299, 0, 4, { 4.409851f, -0.015320f, -0.839294f }, 0.991760f, 0.000048f ); 
+    instance.registerEObj( "unknown_8", 2009300, 0, 4, { 10.240340f, 0.000000f, 2.827696f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_9", 2009301, 0, 4, { 12.606230f, 0.000000f, 7.149309f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_10", 2009302, 7178404, 4, { 0.616980f, 0.000000f, 0.677854f }, 1.000000f, 0.000000f ); 
+
   }
 
-  void onInit( InstanceContentPtr instance ) override
+  void onUpdate( InstanceContent& instance, uint32_t currTime ) override
   {
 
   }
 
-  void onUpdate( InstanceContentPtr instance, uint32_t currTime ) override
-  {
-
-  }
-
-  void onEnterTerritory( InstanceContentPtr instance, Entity::Player& player, uint32_t eventId, uint16_t param1,
+  void onEnterTerritory( InstanceContent& instance, Entity::Player& player, uint32_t eventId, uint16_t param1,
                          uint16_t param2 ) override
   {
 
diff --git a/src/scripts/instances/raids/SigmascapeV30Savage.cpp b/src/scripts/instances/raids/SigmascapeV30Savage.cpp
index 05de1144..3987b0f6 100644
--- a/src/scripts/instances/raids/SigmascapeV30Savage.cpp
+++ b/src/scripts/instances/raids/SigmascapeV30Savage.cpp
@@ -9,20 +9,33 @@ class SigmascapeV30Savage :
 public:
   SigmascapeV30Savage() :
     Sapphire::ScriptAPI::InstanceContentScript( 30065 )
+  { }
+
+  void onInit( InstanceContent& instance ) override
   {
+    instance.registerEObj( "Entrance", 2000182, 7174192, 5, { -0.028109f, 0.000000f, 12.665810f }, 1.000000f, 0.000000f ); 
+      // States -> vf_lock_on (id: 11) vf_lock_of (id: 12) 
+    instance.registerEObj( "Exit", 2000139, 0, 4, { 0.000000f, 0.000000f, -15.000000f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_0", 2009292, 7185733, 4, { -7.736383f, 3.268075f, -35.776291f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_1", 2009293, 7185734, 4, { 10.155860f, 3.268075f, -35.738319f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_2", 2009294, 0, 4, { 18.075230f, 0.000000f, -16.894060f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_3", 2009295, 0, 4, { 15.384740f, 0.000000f, -8.198026f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_4", 2009296, 0, 4, { 17.399639f, 0.000000f, -8.148316f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_5", 2009297, 0, 4, { 10.133680f, 0.000000f, -9.799342f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_6", 2009298, 0, 4, { 12.524550f, 0.000000f, -0.314495f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_7", 2009299, 0, 4, { 4.409851f, -0.015320f, -0.839294f }, 0.991760f, 0.000048f ); 
+    instance.registerEObj( "unknown_8", 2009300, 0, 4, { 10.240340f, 0.000000f, 2.827696f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_9", 2009301, 0, 4, { 12.606230f, 0.000000f, 7.149309f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_10", 2009302, 7178404, 4, { 0.616980f, 0.000000f, 0.677854f }, 1.000000f, 0.000000f ); 
+
   }
 
-  void onInit( InstanceContentPtr instance ) override
+  void onUpdate( InstanceContent& instance, uint32_t currTime ) override
   {
 
   }
 
-  void onUpdate( InstanceContentPtr instance, uint32_t currTime ) override
-  {
-
-  }
-
-  void onEnterTerritory( InstanceContentPtr instance, Entity::Player& player, uint32_t eventId, uint16_t param1,
+  void onEnterTerritory( InstanceContent& instance, Entity::Player& player, uint32_t eventId, uint16_t param1,
                          uint16_t param2 ) override
   {
 
diff --git a/src/scripts/instances/raids/SigmascapeV40.cpp b/src/scripts/instances/raids/SigmascapeV40.cpp
index b26b88ec..3053c1d4 100644
--- a/src/scripts/instances/raids/SigmascapeV40.cpp
+++ b/src/scripts/instances/raids/SigmascapeV40.cpp
@@ -9,20 +9,38 @@ class SigmascapeV40 :
 public:
   SigmascapeV40() :
     Sapphire::ScriptAPI::InstanceContentScript( 30062 )
+  { }
+
+  void onInit( InstanceContent& instance ) override
   {
+    instance.registerEObj( "sgbg_z3oa_a0_gmc01", 2007457, 7307403, 4, { 0.000000f, 0.000000f, 0.000000f }, 1.000000f, -0.000000f ); 
+    instance.registerEObj( "unknown_0", 2008982, 0, 4, { -0.015320f, -0.015320f, -0.015320f }, 0.991760f, 0.000048f ); 
+    instance.registerEObj( "unknown_1", 2008978, 0, 4, { 0.000000f, 0.000000f, 0.000000f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_2", 2008979, 0, 4, { 0.000000f, 0.000000f, 0.000000f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_3", 2008980, 0, 4, { 0.000000f, 0.000000f, 0.000000f }, 1.000000f, -0.000000f ); 
+    instance.registerEObj( "unknown_4", 2008981, 0, 4, { 0.000000f, 0.000000f, 0.000000f }, 1.000000f, -0.000000f ); 
+    instance.registerEObj( "unknown_5", 2008976, 0, 4, { 0.000000f, 0.000000f, 0.000000f }, 1.000000f, -0.000000f ); 
+    instance.registerEObj( "unknown_6", 2008977, 0, 4, { 0.000000f, 0.000000f, 0.000000f }, 1.000000f, -0.000000f ); 
+    instance.registerEObj( "sgvf_z3oa_b1351", 2007457, 7296769, 4, { 0.000000f, 0.000000f, 0.000000f }, 1.000000f, -0.000000f ); 
+    instance.registerEObj( "unknown_7", 2000051, 0, 4, { 0.000000f, 0.000000f, 0.000000f }, 1.000000f, -0.000000f ); 
+    instance.registerEObj( "unknown_8", 2000052, 0, 4, { 0.000000f, 0.000000f, -5.000000f }, 1.000000f, -0.000000f ); 
+    instance.registerEObj( "unknown_9", 2008626, 0, 4, { 0.000000f, 0.000000f, 0.000000f }, 1.000000f, -0.000000f ); 
+    instance.registerEObj( "unknown_10", 2008627, 0, 4, { 0.000000f, 0.000000f, 0.000000f }, 1.000000f, -0.000000f ); 
+    instance.registerEObj( "unknown_11", 2008629, 0, 4, { 0.000000f, 0.000000f, 0.000000f }, 1.000000f, -0.000000f ); 
+    instance.registerEObj( "unknown_12", 2008630, 0, 4, { 0.000000f, 0.000000f, 0.000000f }, 1.000000f, -0.000000f ); 
+    instance.registerEObj( "unknown_13", 2006821, 0, 4, { -0.015320f, -0.015320f, -0.015320f }, 0.991760f, 0.000048f ); 
+    instance.registerEObj( "Entrance", 2000182, 7181990, 5, { 0.000000f, 0.000000f, 14.000000f }, 1.000000f, 0.000000f ); 
+      // States -> vf_lock_on (id: 11) vf_lock_of (id: 12) 
+    instance.registerEObj( "Exit", 2000139, 0, 4, { 0.000000f, 0.000000f, -16.000000f }, 1.000000f, 0.000000f ); 
+
   }
 
-  void onInit( InstanceContentPtr instance ) override
+  void onUpdate( InstanceContent& instance, uint32_t currTime ) override
   {
 
   }
 
-  void onUpdate( InstanceContentPtr instance, uint32_t currTime ) override
-  {
-
-  }
-
-  void onEnterTerritory( InstanceContentPtr instance, Entity::Player& player, uint32_t eventId, uint16_t param1,
+  void onEnterTerritory( InstanceContent& instance, Entity::Player& player, uint32_t eventId, uint16_t param1,
                          uint16_t param2 ) override
   {
 
diff --git a/src/scripts/instances/raids/SigmascapeV40Savage.cpp b/src/scripts/instances/raids/SigmascapeV40Savage.cpp
index 1408c75e..e9c535dc 100644
--- a/src/scripts/instances/raids/SigmascapeV40Savage.cpp
+++ b/src/scripts/instances/raids/SigmascapeV40Savage.cpp
@@ -9,20 +9,38 @@ class SigmascapeV40Savage :
 public:
   SigmascapeV40Savage() :
     Sapphire::ScriptAPI::InstanceContentScript( 30066 )
+  { }
+
+  void onInit( InstanceContent& instance ) override
   {
+    instance.registerEObj( "sgbg_z3oa_a0_gmc01", 2007457, 7307403, 4, { 0.000000f, 0.000000f, 0.000000f }, 1.000000f, -0.000000f ); 
+    instance.registerEObj( "unknown_0", 2008982, 0, 4, { -0.015320f, -0.015320f, -0.015320f }, 0.991760f, 0.000048f ); 
+    instance.registerEObj( "unknown_1", 2008978, 0, 4, { 0.000000f, 0.000000f, 0.000000f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_2", 2008979, 0, 4, { 0.000000f, 0.000000f, 0.000000f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_3", 2008980, 0, 4, { 0.000000f, 0.000000f, 0.000000f }, 1.000000f, -0.000000f ); 
+    instance.registerEObj( "unknown_4", 2008981, 0, 4, { 0.000000f, 0.000000f, 0.000000f }, 1.000000f, -0.000000f ); 
+    instance.registerEObj( "unknown_5", 2008976, 0, 4, { 0.000000f, 0.000000f, 0.000000f }, 1.000000f, -0.000000f ); 
+    instance.registerEObj( "unknown_6", 2008977, 0, 4, { 0.000000f, 0.000000f, 0.000000f }, 1.000000f, -0.000000f ); 
+    instance.registerEObj( "sgvf_z3oa_b1351", 2007457, 7296769, 4, { 0.000000f, 0.000000f, 0.000000f }, 1.000000f, -0.000000f ); 
+    instance.registerEObj( "unknown_7", 2000051, 0, 4, { 0.000000f, 0.000000f, 0.000000f }, 1.000000f, -0.000000f ); 
+    instance.registerEObj( "unknown_8", 2000052, 0, 4, { 0.000000f, 0.000000f, -5.000000f }, 1.000000f, -0.000000f ); 
+    instance.registerEObj( "unknown_9", 2008626, 0, 4, { 0.000000f, 0.000000f, 0.000000f }, 1.000000f, -0.000000f ); 
+    instance.registerEObj( "unknown_10", 2008627, 0, 4, { 0.000000f, 0.000000f, 0.000000f }, 1.000000f, -0.000000f ); 
+    instance.registerEObj( "unknown_11", 2008629, 0, 4, { 0.000000f, 0.000000f, 0.000000f }, 1.000000f, -0.000000f ); 
+    instance.registerEObj( "unknown_12", 2008630, 0, 4, { 0.000000f, 0.000000f, 0.000000f }, 1.000000f, -0.000000f ); 
+    instance.registerEObj( "unknown_13", 2006821, 0, 4, { -0.015320f, -0.015320f, -0.015320f }, 0.991760f, 0.000048f ); 
+    instance.registerEObj( "Entrance", 2000182, 7181990, 5, { 0.000000f, 0.000000f, 14.000000f }, 1.000000f, 0.000000f ); 
+      // States -> vf_lock_on (id: 11) vf_lock_of (id: 12) 
+    instance.registerEObj( "Exit", 2000139, 0, 4, { 0.000000f, 0.000000f, -16.000000f }, 1.000000f, 0.000000f ); 
+
   }
 
-  void onInit( InstanceContentPtr instance ) override
+  void onUpdate( InstanceContent& instance, uint32_t currTime ) override
   {
 
   }
 
-  void onUpdate( InstanceContentPtr instance, uint32_t currTime ) override
-  {
-
-  }
-
-  void onEnterTerritory( InstanceContentPtr instance, Entity::Player& player, uint32_t eventId, uint16_t param1,
+  void onEnterTerritory( InstanceContent& instance, Entity::Player& player, uint32_t eventId, uint16_t param1,
                          uint16_t param2 ) override
   {
 
diff --git a/src/scripts/instances/raids/SyrcusTower.cpp b/src/scripts/instances/raids/SyrcusTower.cpp
index bc2ddfcf..e7af925c 100644
--- a/src/scripts/instances/raids/SyrcusTower.cpp
+++ b/src/scripts/instances/raids/SyrcusTower.cpp
@@ -9,139 +9,87 @@ class SyrcusTower :
 public:
   SyrcusTower() :
     Sapphire::ScriptAPI::InstanceContentScript( 30011 )
-  {
-  }
+  { }
 
-  void onInit( InstanceContentPtr instance ) override
+  void onInit( InstanceContent& instance ) override
   {
-    instance->registerEObj( "unknown_0", 2002587, 0, 4, { -370.000000f, 500.115387f, -199.956299f }, 0.700000f,
-                            -1.570451f );
-    instance->registerEObj( "sgvf_w_lvd_b0250", 2002872, 4738783, 4, { -394.730194f, 500.000000f, -199.572800f },
-                            0.991760f, 0.000048f );
-    // States -> vf_bextwall_on vf_bextwall_of
-    instance->registerEObj( "Exit", 2000139, 0, 4, { -415.668213f, 500.000000f, -200.003296f }, 1.000000f, 0.000000f );
-    instance->registerEObj( "sgbg_l1r2_d2_mete2", 2004244, 4757482, 4, { -390.384705f, 500.000000f, -194.533203f },
-                            1.000000f, 0.000000f );
-    // States -> b4_come_off_01 b4_come_off_02 b4_come_on_01 b4_come_off_03 b4_come_on_02 b4_come_on_03 b4_come_on_04 b4_come_on_05 b4_come_on_06 b4_come_fdout
-    instance->registerEObj( "sgbg_l1r2_d2_mete2_1", 2004292, 4757483, 4, { -401.338287f, 500.000000f, -196.787003f },
-                            1.000000f, 0.000000f );
-    // States -> b4_come_off_01 b4_come_off_02 b4_come_on_01 b4_come_off_03 b4_come_on_02 b4_come_on_03 b4_come_on_04 b4_come_on_05 b4_come_on_06 b4_come_fdout
-    instance->registerEObj( "sgbg_l1r2_d2_mete2_2", 2004293, 4757484, 4, { -403.504913f, 500.000000f, -196.539597f },
-                            1.000000f, 0.000000f );
-    // States -> b4_come_off_01 b4_come_off_02 b4_come_on_01 b4_come_off_03 b4_come_on_02 b4_come_on_03 b4_come_on_04 b4_come_on_05 b4_come_on_06 b4_come_fdout
-    instance->registerEObj( "sgbg_l1r2_d2_mete2_3", 2004294, 4757485, 4, { -405.170593f, 500.000000f, -202.118393f },
-                            1.000000f, 0.000000f );
-    // States -> b4_come_off_01 b4_come_off_02 b4_come_on_01 b4_come_off_03 b4_come_on_02 b4_come_on_03 b4_come_on_04 b4_come_on_05 b4_come_on_06 b4_come_fdout
-    instance->registerEObj( "sgbg_l1r2_d2_mete2_4", 2004295, 4757486, 4, { -400.173798f, 500.000000f, -200.892807f },
-                            1.000000f, 0.000000f );
-    // States -> b4_come_off_01 b4_come_off_02 b4_come_on_01 b4_come_off_03 b4_come_on_02 b4_come_on_03 b4_come_on_04 b4_come_on_05 b4_come_on_06 b4_come_fdout
-    instance->registerEObj( "sgbg_l1r2_d2_mete2_5", 2004296, 4757487, 4, { -395.280304f, 500.000000f, -200.854401f },
-                            1.000000f, 0.000000f );
-    // States -> b4_come_off_01 b4_come_off_02 b4_come_on_01 b4_come_off_03 b4_come_on_02 b4_come_on_03 b4_come_on_04 b4_come_on_05 b4_come_on_06 b4_come_fdout
-    instance->registerEObj( "sgbg_l1r2_d2_mete1", 2004243, 4757498, 4, { -400.242615f, 500.000000f, -197.116501f },
-                            1.000000f, 0.000000f );
-    // States -> b4_mete_off_01 b4_mete_off_02 b4_mete_on_01 b4_mete_off_03 b4_mete_on_02 b4_mete_on_03 b4_mete_on_04 b4_mete_on_05 b4_mete_on_06 b4_mete_fdout
-    instance->registerEObj( "unknown_1", 2004354, 0, 4, { -397.029785f, 500.000000f, -196.979202f }, 1.000000f,
-                            0.000000f );
-    instance->registerEObj( "unknown_2", 2004355, 0, 4, { -459.071411f, 506.001801f, -196.468506f }, 1.000000f,
-                            0.000000f );
-    instance->registerEObj( "unknown_3", 2004236, 4759659, 4, { -1.397732f, -589.900085f, -194.801498f }, 1.000000f,
-                            0.000000f );
-    instance->registerEObj( "unknown_4", 2004237, 0, 4, { 2.182007f, -589.929077f, -198.077499f }, 0.991760f,
-                            0.000048f );
-    instance->registerEObj( "unknown_5", 2002587, 0, 4, { -0.015320f, -590.000000f, -152.513794f }, 0.686646f,
-                            0.000048f );
-    instance->registerEObj( "sgvf_w_lvd_b0250_1", 2002872, 4725495, 4, { 0.228821f, -590.000000f, -174.995300f },
-                            0.991760f, 0.000048f );
-    // States -> vf_bextwall_on vf_bextwall_of
-    instance->registerEObj( "unknown_6", 2002587, 0, 4, { -0.883440f, -4.000000f, -141.001801f }, 0.700000f,
-                            0.000000f );
-    instance->registerEObj( "sgvf_w_lvd_b0250_2", 2002872, 4738653, 4, { -0.991882f, 0.000000f, -196.720993f },
-                            0.991760f, 0.000048f );
-    // States -> vf_bextwall_on vf_bextwall_of
-    instance->registerEObj( "unknown_7", 2004245, 4711823, 4, { -0.379705f, 0.000000f, -145.342300f }, 1.000000f,
-                            0.000000f );
-    instance->registerEObj( "unknown_8", 2004246, 4711824, 4, { 0.710614f, 0.000000f, -199.171204f }, 0.991760f,
-                            0.000048f );
-    instance->registerEObj( "unknown_9", 2004247, 4711825, 4, { 0.439319f, 0.000001f, -201.553802f }, 1.000000f,
-                            0.000000f );
-    instance->registerEObj( "unknown_10", 2004248, 4711828, 4, { 0.202690f, 0.000000f, -199.270599f }, 1.000000f,
-                            0.000000f );
-    instance->registerEObj( "unknown_11", 2004250, 4867789, 4, { -0.142451f, -0.000001f, -199.916000f }, 1.000000f,
-                            0.000000f );
-    instance->registerEObj( "unknown_12", 2004251, 4771487, 4, { 6.207808f, 0.025001f, -197.716293f }, 1.000000f,
-                            0.000000f );
-    instance->registerEObj( "unknown_13", 2004252, 4771488, 4, { 0.912855f, 0.000000f, -200.229401f }, 1.000000f,
-                            0.000000f );
-    instance->registerEObj( "unknown_14", 2004253, 4771264, 4, { -0.249095f, 0.000000f, -200.632095f }, 1.000000f,
-                            0.000000f );
-    instance->registerEObj( "unknown_15", 2004540, 0, 4, { 2.310606f, 0.000000f, -199.315903f }, 1.000000f, 0.000000f );
-    instance->registerEObj( "unknown_16", 2002587, 0, 4, { 16.500000f, 600.000000f, -175.000000f }, 0.700000f,
-                            -0.584685f );
-    instance->registerEObj( "sgvf_w_lvd_b0250_3", 2002872, 4738751, 4, { 6.038667f, 600.000000f, -191.625595f },
-                            1.000000f, 0.000000f );
-    // States -> vf_bextwall_on vf_bextwall_of
-    instance->registerEObj( "unknown_17", 2004249, 0, 4, { 0.534058f, 600.000000f, -204.089493f }, 0.991760f,
-                            0.000048f );
-    instance->registerEObj( "unknown_18", 2004372, 0, 4, { 2.491530f, 600.000000f, -197.343201f }, 1.000000f,
-                            0.000000f );
-    instance->registerEObj( "unknown_19", 2004498, 0, 4, { 7.797371f, 600.000000f, -197.855301f }, 1.000000f,
-                            0.000000f );
-    instance->registerEObj( "unknown_20", 2002587, 0, 4, { 0.000000f, -700.000000f, 79.955803f }, 0.700000f,
-                            0.000000f );
-    instance->registerEObj( "sgvf_w_lvd_b0250_4", 2002872, 4725557, 4, { -0.328611f, -700.000000f, 53.732899f },
-                            1.000000f, 0.000000f );
-    // States -> vf_bextwall_on vf_bextwall_of
-    instance->registerEObj( "unknown_21", 2002587, 0, 4, { 29.805300f, -400.000000f, -200.000000f }, 0.700000f,
-                            -1.570451f );
-    instance->registerEObj( "sgvf_w_lvd_b0250_5", 2002872, 4725580, 4, { 5.249963f, -400.000000f, -199.878006f },
-                            0.991760f, 0.000048f );
-    // States -> vf_bextwall_on vf_bextwall_of
-    instance->registerEObj( "unknown_22", 2002587, 0, 4, { 0.000000f, 200.000000f, -229.757797f }, 0.700000f,
-                            0.000000f );
-    instance->registerEObj( "sgvf_w_lvd_b0250_6", 2002872, 4738682, 4, { 0.542766f, 199.899994f, -231.713898f },
-                            1.000000f, 0.000000f );
-    // States -> vf_bextwall_on vf_bextwall_of
-    instance->registerEObj( "Entrance", 2000182, 4723157, 5, { -0.325782f, -897.940918f, 371.584106f }, 1.000000f,
-                            0.000000f );
-    // States -> vf_lock_on vf_lock_of
-    instance->registerEObj( "Allaganteleporter", 2004154, 4645409, 4, { -5.014030f, -894.781982f, 324.891296f },
-                            0.991760f, 0.000048f );
-    instance->registerEObj( "Allaganteleporter_1", 2004155, 4645410, 4, { 8.084772f, -708.339111f, 175.045898f },
-                            0.991760f, 0.000048f );
-    instance->registerEObj( "Allaganteleporter_2", 2004158, 4645412, 4, { 7.971835f, -598.362915f, -76.990211f },
-                            0.991760f, 0.000048f );
-    instance->registerEObj( "Allaganteleporter_3", 2004156, 4652344, 4, { 72.370857f, -402.456696f, -206.931000f },
-                            0.991760f, 0.000048f );
-    instance->registerEObj( "Allaganteleporter_4", 2004159, 4645415, 4, { -6.906353f, -2.365848f, -126.353897f },
-                            0.991760f, 0.000048f );
-    instance->registerEObj( "Allaganteleporter_5", 2004157, 4645417, 4, { -6.845924f, 197.827805f, -274.836700f },
-                            0.991760f, 0.000048f );
-    instance->registerEObj( "Allaganteleporter_6", 2004160, 4651219, 4, { 29.220949f, 599.725220f, -140.581406f },
-                            0.991760f, 0.000048f );
-    instance->registerEObj( "Allaganteleporter_7", 2004161, 4636419, 4, { -317.290192f, 500.821808f, -189.288193f },
-                            0.991760f, 0.000048f );
-    instance->registerEObj( "unknown_23", 2004164, 4738634, 4, { 0.448093f, -700.000000f, 104.558601f }, 1.000000f,
-                            0.000000f );
-    instance->registerEObj( "unknown_24", 2004173, 4720323, 4, { 0.019809f, -590.000000f, -150.897903f }, 1.000000f,
-                            0.000000f );
-    instance->registerEObj( "unknown_25", 2004167, 4711138, 4, { 44.295219f, -403.598602f, -199.389694f }, 0.991760f,
-                            0.000048f );
-    instance->registerEObj( "unknown_26", 2004176, 4710992, 4, { 0.045776f, 0.000000f, -180.284607f }, 0.991760f,
-                            0.000048f );
-    instance->registerEObj( "unknown_27", 2004170, 4710494, 4, { 0.449279f, 196.100006f, -262.072296f }, 0.991760f,
-                            0.000048f );
-    instance->registerEObj( "unknown_28", 2004179, 4742340, 4, { 28.708071f, 598.000183f, -156.658600f }, 1.000000f,
-                            0.000000f );
+    instance.registerEObj( "unknown_0", 2002587, 0, 4, { -370.000000f, 500.115387f, -199.956299f }, 0.700000f, -1.570451f ); 
+    instance.registerEObj( "sgvf_w_lvd_b0250", 2002872, 4738783, 4, { -394.730194f, 500.000000f, -199.572800f }, 0.991760f, 0.000048f ); 
+      // States -> vf_bextwall_on (id: 3) vf_bextwall_of (id: 4) 
+    instance.registerEObj( "Exit", 2000139, 0, 4, { -415.668213f, 500.000000f, -200.003296f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "sgbg_l1r2_d2_mete2", 2004244, 4757482, 4, { -390.384705f, 500.000000f, -194.533203f }, 1.000000f, 0.000000f ); 
+      // States -> b4_come_off_01 (id: 2) b4_come_off_02 (id: 3) b4_come_on_01 (id: 4) b4_come_off_03 (id: 5) b4_come_on_02 (id: 6) b4_come_on_03 (id: 7) b4_come_on_04 (id: 8) b4_come_on_05 (id: 9) b4_come_on_06 (id: 10) b4_come_fdout (id: 15) 
+    instance.registerEObj( "sgbg_l1r2_d2_mete2_1", 2004292, 4757483, 4, { -401.338287f, 500.000000f, -196.787003f }, 1.000000f, 0.000000f ); 
+      // States -> b4_come_off_01 (id: 2) b4_come_off_02 (id: 3) b4_come_on_01 (id: 4) b4_come_off_03 (id: 5) b4_come_on_02 (id: 6) b4_come_on_03 (id: 7) b4_come_on_04 (id: 8) b4_come_on_05 (id: 9) b4_come_on_06 (id: 10) b4_come_fdout (id: 15) 
+    instance.registerEObj( "sgbg_l1r2_d2_mete2_2", 2004293, 4757484, 4, { -403.504913f, 500.000000f, -196.539597f }, 1.000000f, 0.000000f ); 
+      // States -> b4_come_off_01 (id: 2) b4_come_off_02 (id: 3) b4_come_on_01 (id: 4) b4_come_off_03 (id: 5) b4_come_on_02 (id: 6) b4_come_on_03 (id: 7) b4_come_on_04 (id: 8) b4_come_on_05 (id: 9) b4_come_on_06 (id: 10) b4_come_fdout (id: 15) 
+    instance.registerEObj( "sgbg_l1r2_d2_mete2_3", 2004294, 4757485, 4, { -405.170593f, 500.000000f, -202.118393f }, 1.000000f, 0.000000f ); 
+      // States -> b4_come_off_01 (id: 2) b4_come_off_02 (id: 3) b4_come_on_01 (id: 4) b4_come_off_03 (id: 5) b4_come_on_02 (id: 6) b4_come_on_03 (id: 7) b4_come_on_04 (id: 8) b4_come_on_05 (id: 9) b4_come_on_06 (id: 10) b4_come_fdout (id: 15) 
+    instance.registerEObj( "sgbg_l1r2_d2_mete2_4", 2004295, 4757486, 4, { -400.173798f, 500.000000f, -200.892807f }, 1.000000f, 0.000000f ); 
+      // States -> b4_come_off_01 (id: 2) b4_come_off_02 (id: 3) b4_come_on_01 (id: 4) b4_come_off_03 (id: 5) b4_come_on_02 (id: 6) b4_come_on_03 (id: 7) b4_come_on_04 (id: 8) b4_come_on_05 (id: 9) b4_come_on_06 (id: 10) b4_come_fdout (id: 15) 
+    instance.registerEObj( "sgbg_l1r2_d2_mete2_5", 2004296, 4757487, 4, { -395.280304f, 500.000000f, -200.854401f }, 1.000000f, 0.000000f ); 
+      // States -> b4_come_off_01 (id: 2) b4_come_off_02 (id: 3) b4_come_on_01 (id: 4) b4_come_off_03 (id: 5) b4_come_on_02 (id: 6) b4_come_on_03 (id: 7) b4_come_on_04 (id: 8) b4_come_on_05 (id: 9) b4_come_on_06 (id: 10) b4_come_fdout (id: 15) 
+    instance.registerEObj( "sgbg_l1r2_d2_mete1", 2004243, 4757498, 4, { -400.242615f, 500.000000f, -197.116501f }, 1.000000f, 0.000000f ); 
+      // States -> b4_mete_off_01 (id: 1) b4_mete_off_02 (id: 2) b4_mete_on_01 (id: 3) b4_mete_off_03 (id: 4) b4_mete_on_02 (id: 5) b4_mete_on_03 (id: 6) b4_mete_on_04 (id: 7) b4_mete_on_05 (id: 8) b4_mete_on_06 (id: 9) b4_mete_fdout (id: 18) 
+    instance.registerEObj( "unknown_1", 2004354, 0, 4, { -397.029785f, 500.000000f, -196.979202f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_2", 2004355, 0, 4, { -459.071411f, 506.001801f, -196.468506f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_3", 2004236, 4759659, 4, { -1.397732f, -589.900085f, -194.801498f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_4", 2004237, 0, 4, { 2.182007f, -589.929077f, -198.077499f }, 0.991760f, 0.000048f ); 
+    instance.registerEObj( "unknown_5", 2002587, 0, 4, { -0.015320f, -590.000000f, -152.513794f }, 0.686646f, 0.000048f ); 
+    instance.registerEObj( "sgvf_w_lvd_b0250_1", 2002872, 4725495, 4, { 0.228821f, -590.000000f, -174.995300f }, 0.991760f, 0.000048f ); 
+      // States -> vf_bextwall_on (id: 3) vf_bextwall_of (id: 4) 
+    instance.registerEObj( "unknown_6", 2002587, 0, 4, { -0.883440f, -4.000000f, -141.001801f }, 0.700000f, 0.000000f ); 
+    instance.registerEObj( "sgvf_w_lvd_b0250_2", 2002872, 4738653, 4, { -0.991882f, 0.000000f, -196.720993f }, 0.991760f, 0.000048f ); 
+      // States -> vf_bextwall_on (id: 3) vf_bextwall_of (id: 4) 
+    instance.registerEObj( "unknown_7", 2004245, 4711823, 4, { -0.379705f, 0.000000f, -145.342300f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_8", 2004246, 4711824, 4, { 0.710614f, 0.000000f, -199.171204f }, 0.991760f, 0.000048f ); 
+    instance.registerEObj( "unknown_9", 2004247, 4711825, 4, { 0.439319f, 0.000001f, -201.553802f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_10", 2004248, 4711828, 4, { 0.202690f, 0.000000f, -199.270599f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_11", 2004250, 4867789, 4, { -0.142451f, -0.000001f, -199.916000f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_12", 2004251, 4771487, 4, { 6.207808f, 0.025001f, -197.716293f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_13", 2004252, 4771488, 4, { 0.912855f, 0.000000f, -200.229401f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_14", 2004253, 4771264, 4, { -0.249095f, 0.000000f, -200.632095f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_15", 2004540, 0, 4, { 2.310606f, 0.000000f, -199.315903f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_16", 2002587, 0, 4, { 16.500000f, 600.000000f, -175.000000f }, 0.700000f, -0.584685f ); 
+    instance.registerEObj( "sgvf_w_lvd_b0250_3", 2002872, 4738751, 4, { 6.038667f, 600.000000f, -191.625595f }, 1.000000f, 0.000000f ); 
+      // States -> vf_bextwall_on (id: 3) vf_bextwall_of (id: 4) 
+    instance.registerEObj( "unknown_17", 2004249, 0, 4, { 0.534058f, 600.000000f, -204.089493f }, 0.991760f, 0.000048f ); 
+    instance.registerEObj( "unknown_18", 2004372, 0, 4, { 2.491530f, 600.000000f, -197.343201f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_19", 2004498, 0, 4, { 7.797371f, 600.000000f, -197.855301f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_20", 2002587, 0, 4, { 0.000000f, -700.000000f, 79.955803f }, 0.700000f, 0.000000f ); 
+    instance.registerEObj( "sgvf_w_lvd_b0250_4", 2002872, 4725557, 4, { -0.328611f, -700.000000f, 53.732899f }, 1.000000f, 0.000000f ); 
+      // States -> vf_bextwall_on (id: 3) vf_bextwall_of (id: 4) 
+    instance.registerEObj( "unknown_21", 2002587, 0, 4, { 29.805300f, -400.000000f, -200.000000f }, 0.700000f, -1.570451f ); 
+    instance.registerEObj( "sgvf_w_lvd_b0250_5", 2002872, 4725580, 4, { 5.249963f, -400.000000f, -199.878006f }, 0.991760f, 0.000048f ); 
+      // States -> vf_bextwall_on (id: 3) vf_bextwall_of (id: 4) 
+    instance.registerEObj( "unknown_22", 2002587, 0, 4, { 0.000000f, 200.000000f, -229.757797f }, 0.700000f, 0.000000f ); 
+    instance.registerEObj( "sgvf_w_lvd_b0250_6", 2002872, 4738682, 4, { 0.542766f, 199.899994f, -231.713898f }, 1.000000f, 0.000000f ); 
+      // States -> vf_bextwall_on (id: 3) vf_bextwall_of (id: 4) 
+    instance.registerEObj( "Entrance", 2000182, 4723157, 5, { -0.325782f, -897.940918f, 371.584106f }, 1.000000f, 0.000000f ); 
+      // States -> vf_lock_on (id: 11) vf_lock_of (id: 12) 
+    instance.registerEObj( "Allaganteleporter", 2004154, 4645409, 4, { -5.014030f, -894.781982f, 324.891296f }, 0.991760f, 0.000048f ); 
+    instance.registerEObj( "Allaganteleporter_1", 2004155, 4645410, 4, { 8.084772f, -708.339111f, 175.045898f }, 0.991760f, 0.000048f ); 
+    instance.registerEObj( "Allaganteleporter_2", 2004158, 4645412, 4, { 7.971835f, -598.362915f, -76.990211f }, 0.991760f, 0.000048f ); 
+    instance.registerEObj( "Allaganteleporter_3", 2004156, 4652344, 4, { 72.370857f, -402.456696f, -206.931000f }, 0.991760f, 0.000048f ); 
+    instance.registerEObj( "Allaganteleporter_4", 2004159, 4645415, 4, { -6.906353f, -2.365848f, -126.353897f }, 0.991760f, 0.000048f ); 
+    instance.registerEObj( "Allaganteleporter_5", 2004157, 4645417, 4, { -6.845924f, 197.827805f, -274.836700f }, 0.991760f, 0.000048f ); 
+    instance.registerEObj( "Allaganteleporter_6", 2004160, 4651219, 4, { 29.220949f, 599.725220f, -140.581406f }, 0.991760f, 0.000048f ); 
+    instance.registerEObj( "Allaganteleporter_7", 2004161, 4636419, 4, { -317.290192f, 500.821808f, -189.288193f }, 0.991760f, 0.000048f ); 
+    instance.registerEObj( "unknown_23", 2004164, 4738634, 4, { 0.448093f, -700.000000f, 104.558601f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_24", 2004173, 4720323, 4, { 0.019809f, -590.000000f, -150.897903f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_25", 2004167, 4711138, 4, { 44.295219f, -403.598602f, -199.389694f }, 0.991760f, 0.000048f ); 
+    instance.registerEObj( "unknown_26", 2004176, 4710992, 4, { 0.045776f, 0.000000f, -180.284607f }, 0.991760f, 0.000048f ); 
+    instance.registerEObj( "unknown_27", 2004170, 4710494, 4, { 0.449279f, 196.100006f, -262.072296f }, 0.991760f, 0.000048f ); 
+    instance.registerEObj( "unknown_28", 2004179, 4742340, 4, { 28.708071f, 598.000183f, -156.658600f }, 1.000000f, 0.000000f ); 
 
   }
 
-  void onUpdate( InstanceContentPtr instance, uint32_t currTime ) override
+  void onUpdate( InstanceContent& instance, uint32_t currTime ) override
   {
 
   }
 
-  void onEnterTerritory( InstanceContentPtr instance, Entity::Player& player, uint32_t eventId, uint16_t param1,
+  void onEnterTerritory( InstanceContent& instance, Entity::Player& player, uint32_t eventId, uint16_t param1,
                          uint16_t param2 ) override
   {
 
diff --git a/src/scripts/instances/raids/TheBindingCoilofBahamutTurn1.cpp b/src/scripts/instances/raids/TheBindingCoilofBahamutTurn1.cpp
index 5412e8c4..a1c0cf04 100644
--- a/src/scripts/instances/raids/TheBindingCoilofBahamutTurn1.cpp
+++ b/src/scripts/instances/raids/TheBindingCoilofBahamutTurn1.cpp
@@ -9,87 +9,56 @@ class TheBindingCoilofBahamutTurn1 :
 public:
   TheBindingCoilofBahamutTurn1() :
     Sapphire::ScriptAPI::InstanceContentScript( 30002 )
-  {
-  }
+  { }
 
-  void onInit( InstanceContentPtr instance ) override
+  void onInit( InstanceContent& instance ) override
   {
-    instance->registerEObj( "sgvf_w_lvd_b0118", 2000620, 4293369, 4, { -1.810616f, 13.164380f, 57.682442f }, 1.000000f,
-                            0.000000f );
-    // States -> vf_bextwall_on vf_bextwall_of
-    instance->registerEObj( "sgvf_w_lvd_b0094", 2000619, 4293368, 4, { -3.276026f, 13.164380f, 57.488449f }, 1.000000f,
-                            0.000000f );
-    // States -> vf_line_on vf_line_of
-    instance->registerEObj( "unknown_0", 2000680, 0, 4, { 0.000000f, 5.245687f, 4.314113f }, 1.000000f, 0.000000f );
-    instance->registerEObj( "sgpl_s1b1_bosswall", 2000620, 4293633, 4, { 8.673634f, 4.398203f, -361.720886f },
-                            1.000000f, 0.000000f );
-    instance->registerEObj( "sgvf_w_lvd_b0249", 2000619, 4293632, 4, { 7.539745f, 4.948945f, -366.654388f }, 0.991760f,
-                            0.000048f );
-    // States -> vf_line_on vf_line_of
-    instance->registerEObj( "unknown_1", 2001137, 0, 4, { -8.048342f, 1.700000f, -412.088593f }, 1.000000f, 0.000000f );
-    instance->registerEObj( "unknown_2", 2001696, 0, 4, { -23.791620f, 1.300000f, -414.239990f }, 1.000000f,
-                            0.000000f );
-    instance->registerEObj( "Shortcut", 2000700, 0, 4, { -45.330261f, 25.136589f, 134.093399f }, 1.000000f, 0.000000f );
-    instance->registerEObj( "sgpl_s1b1_door_col", 2000486, 4374535, 4, { -5.435945f, 12.209330f, 0.953091f }, 0.991760f,
-                            0.000048f );
-    instance->registerEObj( "unknown_3", 2000746, 4312523, 4, { 57.321320f, 2.000001f, -254.168396f }, 1.000000f,
-                            0.000000f );
-    instance->registerEObj( "unknown_4", 2000746, 4312527, 4, { 36.303661f, 2.815034f, -341.235992f }, 1.000000f,
-                            0.000000f );
-    instance->registerEObj( "Allaganterminal", 2001154, 4083745, 4, { -38.633110f, 0.899952f, -414.162201f }, 1.000000f,
-                            0.000000f );
-    instance->registerEObj( "unknown_5", 2001167, 4329693, 4, { -50.832001f, 59.871399f, -332.417511f }, 1.000000f,
-                            0.000000f );
-    instance->registerEObj( "sgpl_s1b1_lightwall", 2002712, 4374479, 4, { 52.174641f, 2.740428f, -248.752899f },
-                            0.991760f, 0.000048f );
-    instance->registerEObj( "sgpl_s1b1_lightwall_1", 2002712, 4374482, 4, { 44.598309f, 1.549361f, -340.584991f },
-                            1.000000f, 0.000000f );
-    instance->registerEObj( "sgpl_f1r1_bossplusfloor", 2001152, 4374713, 4, { -4.591531f, 4.500000f, -379.052795f },
-                            1.000000f, 0.000000f );
-    instance->registerEObj( "sgpl_f1r1_bossplusfloor_1", 2001152, 4374714, 4, { -47.199150f, 4.900000f, -430.581299f },
-                            0.991760f, 0.000048f );
-    instance->registerEObj( "sgpl_f1r1_bossplusfloor_2", 2001152, 4374715, 4, { -12.391370f, -0.160584f, -378.187805f },
-                            0.991760f, 0.000048f );
-    instance->registerEObj( "sgpl_f1r1_bossplusfloor_3", 2001152, 4374749, 4, { -12.091370f, -0.160584f, -376.087799f },
-                            0.991760f, 0.000048f );
-    instance->registerEObj( "unknown_6", 2000681, 4312291, 4, { 0.534759f, 4.500000f, -374.000000f }, 1.000000f,
-                            0.000000f );
-    instance->registerEObj( "unknown_7", 2000681, 4312292, 4, { -7.437989f, 0.900002f, -387.547607f }, 1.000000f,
-                            0.000000f );
-    instance->registerEObj( "unknown_8", 2000681, 4312293, 4, { -23.117430f, 0.472961f, -387.472412f }, 0.991760f,
-                            0.000048f );
-    instance->registerEObj( "unknown_9", 2000681, 4312297, 4, { -46.428509f, 0.500000f, -400.448212f }, 1.000000f,
-                            0.000000f );
-    instance->registerEObj( "unknown_10", 2000681, 4312296, 4, { -30.738091f, 0.099998f, -400.874908f }, 1.000000f,
-                            0.000000f );
-    instance->registerEObj( "unknown_11", 2000681, 4312295, 4, { -14.994600f, -0.299999f, -400.505615f }, 1.000000f,
-                            0.000000f );
-    instance->registerEObj( "unknown_12", 2000681, 4312294, 4, { 0.589670f, -0.700001f, -400.720093f }, 1.000000f,
-                            0.000000f );
-    instance->registerEObj( "unknown_13", 2000681, 4312298, 4, { -7.442382f, 1.700001f, -414.361389f }, 1.000000f,
-                            0.000000f );
-    instance->registerEObj( "unknown_14", 2000681, 4312299, 4, { -22.934330f, 1.296936f, -414.053589f }, 0.991760f,
-                            0.000048f );
-    instance->registerEObj( "unknown_15", 2000681, 4312300, 4, { -38.631561f, 0.900004f, -414.153595f }, 1.000000f,
-                            0.000000f );
-    instance->registerEObj( "unknown_16", 2000681, 4312303, 4, { -49.847839f, 4.899996f, -429.440002f }, 1.000000f,
-                            0.000000f );
-    instance->registerEObj( "unknown_17", 2000681, 4312302, 4, { -30.867050f, 2.500000f, -428.009308f }, 1.000000f,
-                            0.000000f );
-    instance->registerEObj( "unknown_18", 2000681, 4312301, 4, { -15.123560f, 2.100006f, -427.852295f }, 1.000000f,
-                            0.000000f );
-    instance->registerEObj( "Entrance", 2000627, 4293311, 5, { -57.085258f, 25.136589f, 146.983200f }, 1.000000f,
-                            0.000000f );
-    // States -> vf_lock_on vf_lock_of
+    instance.registerEObj( "sgvf_w_lvd_b0118", 2000620, 4293369, 4, { -1.810616f, 13.164380f, 57.682442f }, 1.000000f, 0.000000f ); 
+      // States -> vf_bextwall_on (id: 3) vf_bextwall_of (id: 4) 
+    instance.registerEObj( "sgvf_w_lvd_b0094", 2000619, 4293368, 4, { -3.276026f, 13.164380f, 57.488449f }, 1.000000f, 0.000000f ); 
+      // States -> vf_line_on (id: 12) vf_line_of (id: 13) 
+    instance.registerEObj( "unknown_0", 2000680, 0, 4, { 0.000000f, 5.245687f, 4.314113f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "sgpl_s1b1_bosswall", 2000620, 4293633, 4, { 8.673634f, 4.398203f, -361.720886f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "sgvf_w_lvd_b0249", 2000619, 4293632, 4, { 7.539745f, 4.948945f, -366.654388f }, 0.991760f, 0.000048f ); 
+      // States -> vf_line_on (id: 10) vf_line_of (id: 11) 
+    instance.registerEObj( "unknown_1", 2001137, 0, 4, { -8.048342f, 1.700000f, -412.088593f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_2", 2001696, 0, 4, { -23.791620f, 1.300000f, -414.239990f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "Shortcut", 2000700, 0, 4, { -45.330261f, 25.136589f, 134.093399f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "sgpl_s1b1_door_col", 2000486, 4374535, 4, { -5.435945f, 12.209330f, 0.953091f }, 0.991760f, 0.000048f ); 
+    instance.registerEObj( "unknown_3", 2000746, 4312523, 4, { 57.321320f, 2.000001f, -254.168396f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_4", 2000746, 4312527, 4, { 36.303661f, 2.815034f, -341.235992f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "Allaganterminal", 2001154, 4083745, 4, { -38.633110f, 0.899952f, -414.162201f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_5", 2001167, 4329693, 4, { -50.832001f, 59.871399f, -332.417511f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "sgpl_s1b1_lightwall", 2002712, 4374479, 4, { 52.174641f, 2.740428f, -248.752899f }, 0.991760f, 0.000048f ); 
+    instance.registerEObj( "sgpl_s1b1_lightwall_1", 2002712, 4374482, 4, { 44.598309f, 1.549361f, -340.584991f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "sgpl_f1r1_bossplusfloor", 2001152, 4374713, 4, { -4.591531f, 4.500000f, -379.052795f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "sgpl_f1r1_bossplusfloor_1", 2001152, 4374714, 4, { -47.199150f, 4.900000f, -430.581299f }, 0.991760f, 0.000048f ); 
+    instance.registerEObj( "sgpl_f1r1_bossplusfloor_2", 2001152, 4374715, 4, { -12.391370f, -0.160584f, -378.187805f }, 0.991760f, 0.000048f ); 
+    instance.registerEObj( "sgpl_f1r1_bossplusfloor_3", 2001152, 4374749, 4, { -12.091370f, -0.160584f, -376.087799f }, 0.991760f, 0.000048f ); 
+    instance.registerEObj( "unknown_6", 2000681, 4312291, 4, { 0.534759f, 4.500000f, -374.000000f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_7", 2000681, 4312292, 4, { -7.437989f, 0.900002f, -387.547607f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_8", 2000681, 4312293, 4, { -23.117430f, 0.472961f, -387.472412f }, 0.991760f, 0.000048f ); 
+    instance.registerEObj( "unknown_9", 2000681, 4312297, 4, { -46.428509f, 0.500000f, -400.448212f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_10", 2000681, 4312296, 4, { -30.738091f, 0.099998f, -400.874908f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_11", 2000681, 4312295, 4, { -14.994600f, -0.299999f, -400.505615f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_12", 2000681, 4312294, 4, { 0.589670f, -0.700001f, -400.720093f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_13", 2000681, 4312298, 4, { -7.442382f, 1.700001f, -414.361389f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_14", 2000681, 4312299, 4, { -22.934330f, 1.296936f, -414.053589f }, 0.991760f, 0.000048f ); 
+    instance.registerEObj( "unknown_15", 2000681, 4312300, 4, { -38.631561f, 0.900004f, -414.153595f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_16", 2000681, 4312303, 4, { -49.847839f, 4.899996f, -429.440002f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_17", 2000681, 4312302, 4, { -30.867050f, 2.500000f, -428.009308f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_18", 2000681, 4312301, 4, { -15.123560f, 2.100006f, -427.852295f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "Entrance", 2000627, 4293311, 5, { -57.085258f, 25.136589f, 146.983200f }, 1.000000f, 0.000000f ); 
+      // States -> vf_lock_on (id: 11) vf_lock_of (id: 12) 
 
   }
 
-  void onUpdate( InstanceContentPtr instance, uint32_t currTime ) override
+  void onUpdate( InstanceContent& instance, uint32_t currTime ) override
   {
 
   }
 
-  void onEnterTerritory( InstanceContentPtr instance, Entity::Player& player, uint32_t eventId, uint16_t param1,
+  void onEnterTerritory( InstanceContent& instance, Entity::Player& player, uint32_t eventId, uint16_t param1,
                          uint16_t param2 ) override
   {
 
diff --git a/src/scripts/instances/raids/TheBindingCoilofBahamutTurn2.cpp b/src/scripts/instances/raids/TheBindingCoilofBahamutTurn2.cpp
index 017f377b..60244e2b 100644
--- a/src/scripts/instances/raids/TheBindingCoilofBahamutTurn2.cpp
+++ b/src/scripts/instances/raids/TheBindingCoilofBahamutTurn2.cpp
@@ -9,87 +9,57 @@ class TheBindingCoilofBahamutTurn2 :
 public:
   TheBindingCoilofBahamutTurn2() :
     Sapphire::ScriptAPI::InstanceContentScript( 30003 )
-  {
-  }
+  { }
 
-  void onInit( InstanceContentPtr instance ) override
+  void onInit( InstanceContent& instance ) override
   {
-    instance->registerEObj( "sgvf_w_lvd_b0094", 2000668, 4307413, 4, { -16.838060f, -60.912392f, 116.477898f },
-                            1.000000f, 0.000000f );
-    // States -> vf_line_on vf_line_of
-    instance->registerEObj( "sgpl_s1b2_bosswall_c", 2000669, 4307414, 4, { -16.655029f, -61.041161f, 117.352303f },
-                            1.000000f, 0.000000f );
-    // States -> vf_bextwall_on vf_bextwall_of
-    instance->registerEObj( "sgpl_s1b2_bossline2", 2000670, 4306762, 4, { -65.538063f, -38.998699f, 90.104332f },
-                            1.000000f, 0.000000f );
-    instance->registerEObj( "sgpl_s1b2_bosswall_r", 2000671, 4306763, 4, { -66.396652f, -38.998539f, 88.058296f },
-                            1.000000f, 0.000000f );
-    // States -> vf_bextwall_on vf_bextwall_of
-    instance->registerEObj( "unknown_0", 2000680, 0, 4, { -48.355518f, -38.578499f, 86.879211f }, 0.991760f,
-                            0.000048f );
-    instance->registerEObj( "sgpl_s1b2_bossline3", 2000672, 4293655, 4, { -51.865479f, -18.020941f, 35.080441f },
-                            0.991760f, 0.000048f );
-    instance->registerEObj( "sgpl_s1b2_bosswall_r_1", 2000673, 4293656, 4, { -50.583679f, -18.020941f, 35.538212f },
-                            0.991760f, 0.000048f );
-    // States -> vf_bextwall_on vf_bextwall_of
-    instance->registerEObj( "sgvf_w_lvd_b0249", 2000674, 4331576, 4, { 0.736900f, 0.033629f, 31.115801f }, 1.000000f,
-                            0.000000f );
-    // States -> vf_line_on vf_line_of
-    instance->registerEObj( "sgvf_w_lvd_b0250", 2000675, 4331583, 4, { 1.580210f, 0.032013f, 29.906660f }, 1.000000f,
-                            0.000000f );
-    // States -> vf_bextwall_on vf_bextwall_of
-    instance->registerEObj( "sgpl_s1b2_bossline5", 2000676, 4306493, 4, { 52.177799f, -21.010019f, 34.437031f },
-                            1.000000f, 0.000000f );
-    instance->registerEObj( "sgpl_s1b2_bosswall_r_2", 2000677, 4306494, 4, { 51.183399f, -21.011810f, 34.504452f },
-                            1.000000f, 0.000000f );
-    // States -> vf_bextwall_on vf_bextwall_of
-    instance->registerEObj( "sgpl_s1b2_bosswall_r_3", 2000679, 4306772, 4, { 60.934231f, -41.989620f, 101.246002f },
-                            1.000000f, 0.000000f );
-    // States -> vf_bextwall_on vf_bextwall_of
-    instance->registerEObj( "sgpl_s1b2_bossline6", 2000678, 4306771, 4, { 59.622169f, -41.994068f, 98.767616f },
-                            1.000000f, 0.000000f );
-    instance->registerEObj( "sgpl_s1b2_bossline", 2000621, 4307578, 4, { 0.106751f, -65.934273f, 82.291870f },
-                            0.991760f, 0.000048f );
-    instance->registerEObj( "sgpl_s1b2_bosswall", 2000622, 4307579, 4, { -0.320496f, -65.934273f, 82.322388f },
-                            0.991760f, 0.000048f );
-    instance->registerEObj( "unknown_1", 2000640, 4092173, 4, { -14.019790f, -0.010602f, 31.855391f }, 1.000000f,
-                            0.000000f );
-    instance->registerEObj( "unknown_2", 2000641, 4092174, 4, { 15.101930f, -0.029503f, 31.798840f }, 1.000000f,
-                            0.000000f );
-    instance->registerEObj( "unknown_3", 2000638, 4092177, 4, { -58.677170f, -18.016920f, 47.536171f }, 1.000000f,
-                            0.000000f );
-    instance->registerEObj( "unknown_4", 2000639, 4092181, 4, { -27.060640f, -18.102751f, 58.292858f }, 1.000000f,
-                            0.000000f );
-    instance->registerEObj( "unknown_5", 2000642, 4092183, 4, { 58.277191f, -20.996519f, 62.605671f }, 1.000000f,
-                            0.000000f );
-    instance->registerEObj( "unknown_6", 2000643, 4092178, 4, { 30.274019f, -20.952881f, 58.602650f }, 1.000000f,
-                            0.000000f );
-    instance->registerEObj( "unknown_7", 2000644, 4092182, 4, { 29.367611f, -41.975361f, 110.864998f }, 1.000000f,
-                            0.000000f );
-    instance->registerEObj( "unknown_8", 2000635, 4092184, 4, { 0.539888f, -62.460609f, 100.908897f }, 1.000000f,
-                            0.000000f );
-    instance->registerEObj( "unknown_9", 2000636, 4092179, 4, { -55.941719f, -38.998539f, 78.436340f }, 1.000000f,
-                            0.000000f );
-    instance->registerEObj( "unknown_10", 2000637, 4092180, 4, { -51.528130f, -38.998749f, 109.805901f }, 1.000000f,
-                            0.000000f );
-    instance->registerEObj( "unknown_11", 2000645, 4092175, 4, { 0.474554f, -65.943604f, 68.078178f }, 1.000000f,
-                            0.000000f );
-    instance->registerEObj( "Allaganterminal", 2001161, 4107517, 4, { -0.118857f, -102.612297f, 0.534058f }, 0.991760f,
-                            0.000048f );
-    instance->registerEObj( "unknown_12", 2001152, 4107515, 4, { 2.090964f, 0.000001f, 22.575050f }, 1.000000f,
-                            0.000000f );
-    instance->registerEObj( "Entrance", 2000628, 4293644, 5, { 0.852533f, 0.148087f, 20.254930f }, 1.000000f,
-                            0.000000f );
-    // States -> vf_lock_on vf_lock_of
+    instance.registerEObj( "sgvf_w_lvd_b0094", 2000668, 4307413, 4, { -16.838060f, -60.912392f, 116.477898f }, 1.000000f, 0.000000f ); 
+      // States -> vf_line_on (id: 12) vf_line_of (id: 13) 
+    instance.registerEObj( "sgpl_s1b2_bosswall_c", 2000669, 4307414, 4, { -16.655029f, -61.041161f, 117.352303f }, 1.000000f, 0.000000f ); 
+      // States -> vf_bextwall_on (id: 3) vf_bextwall_of (id: 4) 
+    instance.registerEObj( "sgpl_s1b2_bossline2", 2000670, 4306762, 4, { -65.538063f, -38.998699f, 90.104332f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "sgpl_s1b2_bosswall_r", 2000671, 4306763, 4, { -66.396652f, -38.998539f, 88.058296f }, 1.000000f, 0.000000f ); 
+      // States -> vf_bextwall_on (id: 3) vf_bextwall_of (id: 4) 
+    instance.registerEObj( "unknown_0", 2000680, 0, 4, { -48.355518f, -38.578499f, 86.879211f }, 0.991760f, 0.000048f ); 
+    instance.registerEObj( "sgpl_s1b2_bossline3", 2000672, 4293655, 4, { -51.865479f, -18.020941f, 35.080441f }, 0.991760f, 0.000048f ); 
+    instance.registerEObj( "sgpl_s1b2_bosswall_r_1", 2000673, 4293656, 4, { -50.583679f, -18.020941f, 35.538212f }, 0.991760f, 0.000048f ); 
+      // States -> vf_bextwall_on (id: 3) vf_bextwall_of (id: 4) 
+    instance.registerEObj( "sgvf_w_lvd_b0249", 2000674, 4331576, 4, { 0.736900f, 0.033629f, 31.115801f }, 1.000000f, 0.000000f ); 
+      // States -> vf_line_on (id: 10) vf_line_of (id: 11) 
+    instance.registerEObj( "sgvf_w_lvd_b0250", 2000675, 4331583, 4, { 1.580210f, 0.032013f, 29.906660f }, 1.000000f, 0.000000f ); 
+      // States -> vf_bextwall_on (id: 3) vf_bextwall_of (id: 4) 
+    instance.registerEObj( "sgpl_s1b2_bossline5", 2000676, 4306493, 4, { 52.177799f, -21.010019f, 34.437031f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "sgpl_s1b2_bosswall_r_2", 2000677, 4306494, 4, { 51.183399f, -21.011810f, 34.504452f }, 1.000000f, 0.000000f ); 
+      // States -> vf_bextwall_on (id: 3) vf_bextwall_of (id: 4) 
+    instance.registerEObj( "sgpl_s1b2_bosswall_r_3", 2000679, 4306772, 4, { 60.934231f, -41.989620f, 101.246002f }, 1.000000f, 0.000000f ); 
+      // States -> vf_bextwall_on (id: 3) vf_bextwall_of (id: 4) 
+    instance.registerEObj( "sgpl_s1b2_bossline6", 2000678, 4306771, 4, { 59.622169f, -41.994068f, 98.767616f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "sgpl_s1b2_bossline", 2000621, 4307578, 4, { 0.106751f, -65.934273f, 82.291870f }, 0.991760f, 0.000048f ); 
+    instance.registerEObj( "sgpl_s1b2_bosswall", 2000622, 4307579, 4, { -0.320496f, -65.934273f, 82.322388f }, 0.991760f, 0.000048f ); 
+    instance.registerEObj( "unknown_1", 2000640, 4092173, 4, { -14.019790f, -0.010602f, 31.855391f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_2", 2000641, 4092174, 4, { 15.101930f, -0.029503f, 31.798840f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_3", 2000638, 4092177, 4, { -58.677170f, -18.016920f, 47.536171f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_4", 2000639, 4092181, 4, { -27.060640f, -18.102751f, 58.292858f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_5", 2000642, 4092183, 4, { 58.277191f, -20.996519f, 62.605671f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_6", 2000643, 4092178, 4, { 30.274019f, -20.952881f, 58.602650f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_7", 2000644, 4092182, 4, { 29.367611f, -41.975361f, 110.864998f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_8", 2000635, 4092184, 4, { 0.539888f, -62.460609f, 100.908897f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_9", 2000636, 4092179, 4, { -55.941719f, -38.998539f, 78.436340f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_10", 2000637, 4092180, 4, { -51.528130f, -38.998749f, 109.805901f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_11", 2000645, 4092175, 4, { 0.474554f, -65.943604f, 68.078178f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "Allaganterminal", 2001161, 4107517, 4, { -0.118857f, -102.612297f, 0.534058f }, 0.991760f, 0.000048f ); 
+    instance.registerEObj( "unknown_12", 2001152, 4107515, 4, { 2.090964f, 0.000001f, 22.575050f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "Entrance", 2000628, 4293644, 5, { 0.852533f, 0.148087f, 20.254930f }, 1.000000f, 0.000000f ); 
+      // States -> vf_lock_on (id: 11) vf_lock_of (id: 12) 
 
   }
 
-  void onUpdate( InstanceContentPtr instance, uint32_t currTime ) override
+  void onUpdate( InstanceContent& instance, uint32_t currTime ) override
   {
 
   }
 
-  void onEnterTerritory( InstanceContentPtr instance, Entity::Player& player, uint32_t eventId, uint16_t param1,
+  void onEnterTerritory( InstanceContent& instance, Entity::Player& player, uint32_t eventId, uint16_t param1,
                          uint16_t param2 ) override
   {
 
diff --git a/src/scripts/instances/raids/TheBindingCoilofBahamutTurn3.cpp b/src/scripts/instances/raids/TheBindingCoilofBahamutTurn3.cpp
index d5026a8d..3b7c3679 100644
--- a/src/scripts/instances/raids/TheBindingCoilofBahamutTurn3.cpp
+++ b/src/scripts/instances/raids/TheBindingCoilofBahamutTurn3.cpp
@@ -9,114 +9,67 @@ class TheBindingCoilofBahamutTurn3 :
 public:
   TheBindingCoilofBahamutTurn3() :
     Sapphire::ScriptAPI::InstanceContentScript( 30004 )
-  {
-  }
+  { }
 
-  void onInit( InstanceContentPtr instance ) override
+  void onInit( InstanceContent& instance ) override
   {
-    instance->registerEObj( "unknown_0", 2001046, 4204647, 4, { -38.434280f, 0.755630f, 27.186541f }, 1.000000f,
-                            0.000000f );
-    instance->registerEObj( "unknown_1", 2001047, 4204649, 4, { -22.930870f, -38.074230f, 51.622608f }, 1.000000f,
-                            0.000000f );
-    instance->registerEObj( "unknown_2", 2001048, 4204652, 4, { 17.410521f, -36.911560f, 65.506958f }, 0.991760f,
-                            0.000048f );
-    instance->registerEObj( "unknown_3", 2001049, 4204654, 4, { 43.230721f, -36.854370f, 41.278610f }, 1.000000f,
-                            0.000000f );
-    instance->registerEObj( "unknown_4", 2001050, 4204661, 4, { 41.756340f, -37.405720f, 11.258040f }, 1.000000f,
-                            0.000000f );
-    instance->registerEObj( "unknown_5", 2001051, 4204644, 4, { 18.406361f, -75.101082f, 30.246229f }, 1.000000f,
-                            0.000000f );
-    instance->registerEObj( "unknown_6", 2001052, 4204665, 4, { -30.734369f, -111.808601f, 16.055771f }, 1.000000f,
-                            0.000000f );
-    instance->registerEObj( "unknown_7", 2001053, 4204660, 4, { 28.263350f, -74.681847f, -39.544411f }, 1.000000f,
-                            0.000000f );
-    instance->registerEObj( "unknown_8", 2001054, 4204664, 4, { -8.499553f, -113.039597f, -34.010311f }, 1.000000f,
-                            0.000000f );
-    instance->registerEObj( "unknown_9", 2001055, 4204662, 4, { -15.483490f, -112.471001f, -20.925671f }, 1.000000f,
-                            0.000000f );
-    instance->registerEObj( "Silentterminal", 2001132, 4322464, 4, { -6.976719f, -112.013496f, 23.202400f }, 0.991760f,
-                            0.000048f );
-    instance->registerEObj( "Shortcut", 2000700, 0, 4, { -16.955231f, -0.864158f, 0.593589f }, 1.000000f, 0.000000f );
-    instance->registerEObj( "unknown_10", 2001152, 4238687, 4, { -1.707294f, 0.000000f, 3.048101f }, 1.000000f,
-                            0.000000f );
-    instance->registerEObj( "unknown_11", 2001056, 4204669, 4, { -14.240080f, -150.417404f, 1.736771f }, 1.000000f,
-                            0.000000f );
-    instance->registerEObj( "unknown_12", 2001057, 4204678, 4, { -29.648090f, -188.419907f, -3.748357f }, 1.000000f,
-                            0.000000f );
-    instance->registerEObj( "unknown_13", 2001058, 4204672, 4, { -12.738200f, -187.302002f, 51.141499f }, 1.000000f,
-                            0.000000f );
-    instance->registerEObj( "unknown_14", 2001059, 4204697, 4, { 0.332115f, -225.076202f, 50.155842f }, 1.000000f,
-                            0.000000f );
-    instance->registerEObj( "unknown_15", 2001060, 4204703, 4, { 52.345329f, -224.740707f, 37.453941f }, 1.000000f,
-                            0.000000f );
-    instance->registerEObj( "unknown_16", 2001061, 4204709, 4, { 46.480949f, -262.093811f, 5.845346f }, 1.000000f,
-                            0.000000f );
-    instance->registerEObj( "unknown_17", 2001062, 4204723, 4, { 28.585011f, -299.527008f, 19.833670f }, 1.000000f,
-                            0.000000f );
-    instance->registerEObj( "unknown_18", 2001063, 4204712, 4, { -15.037280f, -262.281311f, 51.584450f }, 1.000000f,
-                            0.000000f );
-    instance->registerEObj( "unknown_19", 2001064, 4204725, 4, { -15.719740f, -300.085785f, -22.829020f }, 1.000000f,
-                            0.000000f );
-    instance->registerEObj( "unknown_20", 2001065, 4204720, 4, { -0.428782f, -300.866394f, 22.938450f }, 1.000000f,
-                            0.000000f );
-    instance->registerEObj( "unknown_21", 2001066, 4204671, 4, { 9.075709f, -150.864899f, -17.327230f }, 1.000000f,
-                            0.000000f );
-    instance->registerEObj( "unknown_22", 2001067, 4204680, 4, { -25.603180f, -188.390701f, -25.489799f }, 1.000000f,
-                            0.000000f );
-    instance->registerEObj( "unknown_23", 2001068, 4204687, 4, { 28.229540f, -188.408707f, -2.975939f }, 1.000000f,
-                            0.000000f );
-    instance->registerEObj( "unknown_24", 2001069, 4204684, 4, { 37.952412f, -187.292603f, -39.644798f }, 1.000000f,
-                            0.000000f );
-    instance->registerEObj( "unknown_25", 2001070, 4204707, 4, { -5.330157f, -225.534607f, -50.912369f }, 1.000000f,
-                            0.000000f );
-    instance->registerEObj( "unknown_26", 2001071, 4204688, 4, { 23.554840f, -223.922607f, -46.970329f }, 1.000000f,
-                            0.000000f );
-    instance->registerEObj( "unknown_27", 2001072, 4204689, 4, { -44.635330f, -225.534607f, -27.836760f }, 1.000000f,
-                            0.000000f );
-    instance->registerEObj( "unknown_28", 2001073, 4204715, 4, { -24.786400f, -262.708405f, -39.642220f }, 1.000000f,
-                            0.000000f );
-    instance->registerEObj( "unknown_29", 2001074, 4204716, 4, { -0.141846f, -262.624695f, -63.058170f }, 1.000000f,
-                            0.000000f );
-    instance->registerEObj( "Silentterminal_1", 2001140, 4328681, 4, { -8.207968f, -300.679108f, -11.383970f },
-                            0.991760f, 0.000048f );
-    instance->registerEObj( "unknown_30", 2001075, 4204730, 4, { -27.307819f, -347.278900f, 23.850750f }, 1.000000f,
-                            0.000000f );
-    instance->registerEObj( "unknown_31", 2001076, 4204722, 4, { -32.117531f, -347.483307f, -18.936440f }, 1.000000f,
-                            0.000000f );
-    instance->registerEObj( "unknown_32", 2001077, 4204728, 4, { -0.090805f, -348.068695f, -13.361250f }, 1.000000f,
-                            0.000000f );
-    instance->registerEObj( "unknown_33", 2001078, 4204719, 4, { 27.568150f, -347.808289f, 23.699249f }, 1.000000f,
-                            0.000000f );
-    instance->registerEObj( "unknown_34", 2001106, 4204738, 4, { -64.801163f, -383.539886f, -16.602329f }, 1.000000f,
-                            0.000000f );
-    instance->registerEObj( "unknown_35", 2001107, 4204740, 4, { -34.187149f, -383.967804f, -51.634480f }, 1.000000f,
-                            0.000000f );
-    instance->registerEObj( "unknown_36", 2001108, 4204732, 4, { 58.207191f, -383.523010f, -18.762280f }, 1.000000f,
-                            0.000000f );
-    instance->registerEObj( "unknown_37", 2001109, 4204735, 4, { 27.461531f, -384.122589f, 40.984268f }, 1.000000f,
-                            0.000000f );
-    instance->registerEObj( "unknown_38", 2001110, 4204746, 4, { 22.577141f, -422.501587f, 53.173019f }, 1.000000f,
-                            0.000000f );
-    instance->registerEObj( "unknown_39", 2001111, 4204744, 4, { -46.433231f, -422.842804f, 34.744751f }, 0.991760f,
-                            0.000048f );
-    instance->registerEObj( "unknown_40", 2001112, 4204747, 4, { 17.206091f, -423.418488f, -16.318670f }, 1.000000f,
-                            0.000000f );
-    instance->registerEObj( "Allaganterminal", 2001162, 4317929, 4, { -15.875440f, -423.430511f, 18.778770f },
-                            1.000000f, 0.000000f );
-    instance->registerEObj( "Silentterminal_2", 2002600, 4334493, 4, { -24.909149f, -423.472595f, 41.999378f },
-                            1.000000f, 0.000000f );
-    instance->registerEObj( "Entrance", 2000629, 4294859, 5, { -0.075790f, 0.000000f, 0.310051f }, 1.000000f,
-                            0.000000f );
-    // States -> vf_lock_on vf_lock_of
+    instance.registerEObj( "unknown_0", 2001046, 4204647, 4, { -38.434280f, 0.755630f, 27.186541f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_1", 2001047, 4204649, 4, { -22.930870f, -38.074230f, 51.622608f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_2", 2001048, 4204652, 4, { 17.410521f, -36.911560f, 65.506958f }, 0.991760f, 0.000048f ); 
+    instance.registerEObj( "unknown_3", 2001049, 4204654, 4, { 43.230721f, -36.854370f, 41.278610f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_4", 2001050, 4204661, 4, { 41.756340f, -37.405720f, 11.258040f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_5", 2001051, 4204644, 4, { 18.406361f, -75.101082f, 30.246229f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_6", 2001052, 4204665, 4, { -30.734369f, -111.808601f, 16.055771f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_7", 2001053, 4204660, 4, { 28.263350f, -74.681847f, -39.544411f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_8", 2001054, 4204664, 4, { -8.499553f, -113.039597f, -34.010311f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_9", 2001055, 4204662, 4, { -15.483490f, -112.471001f, -20.925671f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "Silentterminal", 2001132, 4322464, 4, { -6.976719f, -112.013496f, 23.202400f }, 0.991760f, 0.000048f ); 
+    instance.registerEObj( "Shortcut", 2000700, 0, 4, { -16.955231f, -0.864158f, 0.593589f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_10", 2001152, 4238687, 4, { -1.707294f, 0.000000f, 3.048101f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_11", 2001056, 4204669, 4, { -14.240080f, -150.417404f, 1.736771f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_12", 2001057, 4204678, 4, { -29.648090f, -188.419907f, -3.748357f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_13", 2001058, 4204672, 4, { -12.738200f, -187.302002f, 51.141499f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_14", 2001059, 4204697, 4, { 0.332115f, -225.076202f, 50.155842f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_15", 2001060, 4204703, 4, { 52.345329f, -224.740707f, 37.453941f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_16", 2001061, 4204709, 4, { 46.480949f, -262.093811f, 5.845346f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_17", 2001062, 4204723, 4, { 28.585011f, -299.527008f, 19.833670f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_18", 2001063, 4204712, 4, { -15.037280f, -262.281311f, 51.584450f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_19", 2001064, 4204725, 4, { -15.719740f, -300.085785f, -22.829020f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_20", 2001065, 4204720, 4, { -0.428782f, -300.866394f, 22.938450f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_21", 2001066, 4204671, 4, { 9.075709f, -150.864899f, -17.327230f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_22", 2001067, 4204680, 4, { -25.603180f, -188.390701f, -25.489799f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_23", 2001068, 4204687, 4, { 28.229540f, -188.408707f, -2.975939f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_24", 2001069, 4204684, 4, { 37.952412f, -187.292603f, -39.644798f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_25", 2001070, 4204707, 4, { -5.330157f, -225.534607f, -50.912369f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_26", 2001071, 4204688, 4, { 23.554840f, -223.922607f, -46.970329f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_27", 2001072, 4204689, 4, { -44.635330f, -225.534607f, -27.836760f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_28", 2001073, 4204715, 4, { -24.786400f, -262.708405f, -39.642220f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_29", 2001074, 4204716, 4, { -0.141846f, -262.624695f, -63.058170f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "Silentterminal_1", 2001140, 4328681, 4, { -8.207968f, -300.679108f, -11.383970f }, 0.991760f, 0.000048f ); 
+    instance.registerEObj( "unknown_30", 2001075, 4204730, 4, { -27.307819f, -347.278900f, 23.850750f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_31", 2001076, 4204722, 4, { -32.117531f, -347.483307f, -18.936440f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_32", 2001077, 4204728, 4, { -0.090805f, -348.068695f, -13.361250f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_33", 2001078, 4204719, 4, { 27.568150f, -347.808289f, 23.699249f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_34", 2001106, 4204738, 4, { -64.801163f, -383.539886f, -16.602329f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_35", 2001107, 4204740, 4, { -34.187149f, -383.967804f, -51.634480f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_36", 2001108, 4204732, 4, { 58.207191f, -383.523010f, -18.762280f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_37", 2001109, 4204735, 4, { 27.461531f, -384.122589f, 40.984268f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_38", 2001110, 4204746, 4, { 22.577141f, -422.501587f, 53.173019f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_39", 2001111, 4204744, 4, { -46.433231f, -422.842804f, 34.744751f }, 0.991760f, 0.000048f ); 
+    instance.registerEObj( "unknown_40", 2001112, 4204747, 4, { 17.206091f, -423.418488f, -16.318670f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "Allaganterminal", 2001162, 4317929, 4, { -15.875440f, -423.430511f, 18.778770f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "Silentterminal_2", 2002600, 4334493, 4, { -24.909149f, -423.472595f, 41.999378f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "Entrance", 2000629, 4294859, 5, { -0.075790f, 0.000000f, 0.310051f }, 1.000000f, 0.000000f ); 
+      // States -> vf_lock_on (id: 11) vf_lock_of (id: 12) 
 
   }
 
-  void onUpdate( InstanceContentPtr instance, uint32_t currTime ) override
+  void onUpdate( InstanceContent& instance, uint32_t currTime ) override
   {
 
   }
 
-  void onEnterTerritory( InstanceContentPtr instance, Entity::Player& player, uint32_t eventId, uint16_t param1,
+  void onEnterTerritory( InstanceContent& instance, Entity::Player& player, uint32_t eventId, uint16_t param1,
                          uint16_t param2 ) override
   {
 
diff --git a/src/scripts/instances/raids/TheBindingCoilofBahamutTurn4.cpp b/src/scripts/instances/raids/TheBindingCoilofBahamutTurn4.cpp
index 20bb4100..33ee78fb 100644
--- a/src/scripts/instances/raids/TheBindingCoilofBahamutTurn4.cpp
+++ b/src/scripts/instances/raids/TheBindingCoilofBahamutTurn4.cpp
@@ -9,52 +9,36 @@ class TheBindingCoilofBahamutTurn4 :
 public:
   TheBindingCoilofBahamutTurn4() :
     Sapphire::ScriptAPI::InstanceContentScript( 30005 )
-  {
-  }
+  { }
 
-  void onInit( InstanceContentPtr instance ) override
+  void onInit( InstanceContent& instance ) override
   {
-    instance->registerEObj( "Silentterminal", 2000633, 4974723, 4, { -16.904461f, 1.700597f, 17.125530f }, 1.000000f,
-                            0.000000f );
-    instance->registerEObj( "Silentterminal_1", 2000634, 4974724, 4, { 17.103741f, 1.662121f, 16.896111f }, 1.000000f,
-                            0.000000f );
-    instance->registerEObj( "unknown_0", 2001153, 4254608, 4, { 7.917505f, 0.058137f, -7.647632f }, 1.000000f,
-                            0.000000f );
-    instance->registerEObj( "unknown_1", 2001153, 4254609, 4, { 8.217505f, 0.058137f, -6.747632f }, 1.000000f,
-                            0.000000f );
-    instance->registerEObj( "unknown_2", 2001153, 4254607, 4, { 8.517506f, 0.000000f, -5.847631f }, 1.000000f,
-                            0.000000f );
-    instance->registerEObj( "unknown_3", 2001153, 4254606, 4, { 8.817506f, 0.000000f, -4.947631f }, 1.000000f,
-                            0.000000f );
-    instance->registerEObj( "unknown_4", 2001155, 4974722, 4, { -16.599979f, 0.058137f, -16.803070f }, 1.000000f,
-                            0.000000f );
-    instance->registerEObj( "unknown_5", 2001155, 4974721, 4, { 16.776859f, 0.058137f, -16.643490f }, 1.000000f,
-                            0.000000f );
-    instance->registerEObj( "unknown_6", 2001764, 3961628, 4, { -0.983059f, 0.058134f, 3.319265f }, 1.000000f,
-                            0.000000f );
-    instance->registerEObj( "unknown_7", 2001764, 4974712, 4, { -2.906071f, 0.058134f, 2.796373f }, 1.000000f,
-                            0.000000f );
-    instance->registerEObj( "unknown_8", 2001764, 3962580, 4, { -4.811448f, 0.000001f, 9.066607f }, 0.991760f,
-                            0.000048f );
-    instance->registerEObj( "unknown_9", 2001764, 4330325, 4, { 2.346304f, 0.058136f, 5.385328f }, 1.000000f,
-                            0.000000f );
-    instance->registerEObj( "unknown_10", 2001764, 4330326, 4, { 4.663461f, 0.058136f, 4.726402f }, 1.000000f,
-                            0.000000f );
-    instance->registerEObj( "Entrance", 2000630, 4294847, 5, { -12.531030f, 0.000001f, 12.592170f }, 1.000000f,
-                            0.000000f );
-    // States -> vf_lock_on vf_lock_of
-    instance->registerEObj( "sgvf_w_lvd_b0055", 2000615, 4374568, 4, { -15.534740f, 0.058137f, -15.601170f }, 1.000000f,
-                            0.000000f );
-    // States -> vf_dext01_of vf_dext01_on
+    instance.registerEObj( "Silentterminal", 2000633, 4974723, 4, { -16.904461f, 1.700597f, 17.125530f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "Silentterminal_1", 2000634, 4974724, 4, { 17.103741f, 1.662121f, 16.896111f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_0", 2001153, 4254608, 4, { 7.917505f, 0.058137f, -7.647632f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_1", 2001153, 4254609, 4, { 8.217505f, 0.058137f, -6.747632f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_2", 2001153, 4254607, 4, { 8.517506f, 0.000000f, -5.847631f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_3", 2001153, 4254606, 4, { 8.817506f, 0.000000f, -4.947631f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_4", 2001155, 4974722, 4, { -16.599979f, 0.058137f, -16.803070f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_5", 2001155, 4974721, 4, { 16.776859f, 0.058137f, -16.643490f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_6", 2001764, 3961628, 4, { -0.983059f, 0.058134f, 3.319265f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_7", 2001764, 4974712, 4, { -2.906071f, 0.058134f, 2.796373f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_8", 2001764, 3962580, 4, { -4.811448f, 0.000001f, 9.066607f }, 0.991760f, 0.000048f ); 
+    instance.registerEObj( "unknown_9", 2001764, 4330325, 4, { 2.346304f, 0.058136f, 5.385328f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_10", 2001764, 4330326, 4, { 4.663461f, 0.058136f, 4.726402f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "Entrance", 2000630, 4294847, 5, { -12.531030f, 0.000001f, 12.592170f }, 1.000000f, 0.000000f ); 
+      // States -> vf_lock_on (id: 11) vf_lock_of (id: 12) 
+    instance.registerEObj( "sgvf_w_lvd_b0055", 2000615, 4374568, 4, { -15.534740f, 0.058137f, -15.601170f }, 1.000000f, 0.000000f ); 
+      // States -> vf_dext01_of (id: 19) vf_dext01_on (id: 20) 
 
   }
 
-  void onUpdate( InstanceContentPtr instance, uint32_t currTime ) override
+  void onUpdate( InstanceContent& instance, uint32_t currTime ) override
   {
 
   }
 
-  void onEnterTerritory( InstanceContentPtr instance, Entity::Player& player, uint32_t eventId, uint16_t param1,
+  void onEnterTerritory( InstanceContent& instance, Entity::Player& player, uint32_t eventId, uint16_t param1,
                          uint16_t param2 ) override
   {
 
diff --git a/src/scripts/instances/raids/TheBindingCoilofBahamutTurn5.cpp b/src/scripts/instances/raids/TheBindingCoilofBahamutTurn5.cpp
index 4444bc98..80a85eae 100644
--- a/src/scripts/instances/raids/TheBindingCoilofBahamutTurn5.cpp
+++ b/src/scripts/instances/raids/TheBindingCoilofBahamutTurn5.cpp
@@ -9,34 +9,29 @@ class TheBindingCoilofBahamutTurn5 :
 public:
   TheBindingCoilofBahamutTurn5() :
     Sapphire::ScriptAPI::InstanceContentScript( 30006 )
-  {
-  }
+  { }
 
-  void onInit( InstanceContentPtr instance ) override
+  void onInit( InstanceContent& instance ) override
   {
-    instance->registerEObj( "unknown_0", 2000623, 4328290, 4, { -7.770457f, 54.493511f, -29.083250f }, 1.000000f,
-                            0.000000f );
-    instance->registerEObj( "unknown_1", 2000666, 4323972, 4, { -3.001781f, 50.022308f, -7.576328f }, 1.000000f,
-                            0.000000f );
-    instance->registerEObj( "unknown_2", 2000682, 0, 4, { -0.531223f, 50.025429f, 6.100062f }, 1.000000f, 0.000000f );
-    instance->registerEObj( "unknown_3", 2001151, 0, 4, { 11.681320f, 50.085152f, -0.915123f }, 1.000000f, 0.000000f );
-    instance->registerEObj( "unknown_4", 2001150, 0, 4, { 14.631230f, 50.087898f, 1.687731f }, 1.000000f, 0.000000f );
-    instance->registerEObj( "unknown_5", 2001168, 0, 4, { 17.845060f, 50.181900f, -0.676077f }, 1.000000f, 0.000000f );
-    instance->registerEObj( "unknown_6", 2002664, 0, 4, { -7.768790f, 50.005032f, -4.092178f }, 1.000000f, 0.000000f );
-    instance->registerEObj( "Allaganterminal", 2001163, 4328464, 4, { 51.910549f, 48.460838f, 72.757553f }, 1.000000f,
-                            0.000000f );
-    instance->registerEObj( "Entrance", 2000631, 4294944, 5, { -26.751080f, 100.099998f, -128.204498f }, 1.000000f,
-                            0.000000f );
-    // States -> vf_lock_on vf_lock_of
+    instance.registerEObj( "unknown_0", 2000623, 4328290, 4, { -7.770457f, 54.493511f, -29.083250f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_1", 2000666, 4323972, 4, { -3.001781f, 50.022308f, -7.576328f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_2", 2000682, 0, 4, { -0.531223f, 50.025429f, 6.100062f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_3", 2001151, 0, 4, { 11.681320f, 50.085152f, -0.915123f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_4", 2001150, 0, 4, { 14.631230f, 50.087898f, 1.687731f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_5", 2001168, 0, 4, { 17.845060f, 50.181900f, -0.676077f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_6", 2002664, 0, 4, { -7.768790f, 50.005032f, -4.092178f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "Allaganterminal", 2001163, 4328464, 4, { 51.910549f, 48.460838f, 72.757553f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "Entrance", 2000631, 4294944, 5, { -26.751080f, 100.099998f, -128.204498f }, 1.000000f, 0.000000f ); 
+      // States -> vf_lock_on (id: 11) vf_lock_of (id: 12) 
 
   }
 
-  void onUpdate( InstanceContentPtr instance, uint32_t currTime ) override
+  void onUpdate( InstanceContent& instance, uint32_t currTime ) override
   {
 
   }
 
-  void onEnterTerritory( InstanceContentPtr instance, Entity::Player& player, uint32_t eventId, uint16_t param1,
+  void onEnterTerritory( InstanceContent& instance, Entity::Player& player, uint32_t eventId, uint16_t param1,
                          uint16_t param2 ) override
   {
 
diff --git a/src/scripts/instances/raids/TheFinalCoilofBahamutTurn1.cpp b/src/scripts/instances/raids/TheFinalCoilofBahamutTurn1.cpp
index 76bc3653..5cecfc4d 100644
--- a/src/scripts/instances/raids/TheFinalCoilofBahamutTurn1.cpp
+++ b/src/scripts/instances/raids/TheFinalCoilofBahamutTurn1.cpp
@@ -9,67 +9,44 @@ class TheFinalCoilofBahamutTurn1 :
 public:
   TheFinalCoilofBahamutTurn1() :
     Sapphire::ScriptAPI::InstanceContentScript( 30016 )
-  {
-  }
+  { }
 
-  void onInit( InstanceContentPtr instance ) override
+  void onInit( InstanceContent& instance ) override
   {
-    instance->registerEObj( "unknown_0", 2004612, 0, 4, { -0.116493f, -0.000001f, -293.875214f }, 1.000000f,
-                            0.000000f );
-    instance->registerEObj( "unknown_1", 2004613, 0, 4, { -5.014206f, -0.000001f, -285.730896f }, 1.000000f,
-                            0.000000f );
-    instance->registerEObj( "Entrance", 2000182, 4894214, 5, { 0.172209f, 1.707170f, 221.425903f }, 1.000000f,
-                            0.000000f );
-    // States -> vf_lock_on vf_lock_of
-    instance->registerEObj( "Shortcut", 2000700, 0, 4, { -6.029538f, -0.000005f, 188.016205f }, 1.000000f, 0.000000f );
-    instance->registerEObj( "unknown_2", 2003679, 4868598, 4, { -0.125790f, 0.523954f, 167.023605f }, 1.000000f,
-                            0.000000f );
-    instance->registerEObj( "unknown_3", 2004605, 4852714, 4, { -0.194780f, -0.000003f, 177.104095f }, 1.000000f,
-                            0.000000f );
-    instance->registerEObj( "unknown_4", 2003849, 4881763, 4, { 0.031929f, -19.494820f, 141.135101f }, 0.991760f,
-                            0.000048f );
-    instance->registerEObj( "unknown_5", 2003905, 4868599, 4, { -0.095059f, -7.275987f, 79.729607f }, 1.000000f,
-                            0.000000f );
-    instance->registerEObj( "unknown_6", 2004605, 4879813, 4, { -10.904620f, -18.183340f, 116.685303f }, 1.000000f,
-                            0.000000f );
-    instance->registerEObj( "unknown_7", 2004605, 4879797, 4, { 11.416480f, -18.931650f, 116.685303f }, 1.000000f,
-                            0.000000f );
-    instance->registerEObj( "unknown_8", 2004605, 4879805, 4, { 11.416480f, -19.000000f, 103.064003f }, 1.000000f,
-                            0.000000f );
-    instance->registerEObj( "unknown_9", 2004605, 4879822, 4, { -11.312880f, -19.000000f, 103.064003f }, 1.000000f,
-                            0.000000f );
-    instance->registerEObj( "unknown_10", 2004116, 4881762, 4, { 0.171127f, -19.487169f, 30.039690f }, 1.000000f,
-                            0.000000f );
-    instance->registerEObj( "unknown_11", 2004117, 4868600, 4, { 0.009460f, -29.465590f, 10.045650f }, 1.000000f,
-                            0.000000f );
-    instance->registerEObj( "unknown_12", 2004605, 4879838, 4, { 0.047739f, -29.000000f, 19.918270f }, 1.000000f,
-                            0.000000f );
-    instance->registerEObj( "unknown_13", 2004605, 4879850, 4, { 0.018590f, -29.000000f, 19.923750f }, 1.000000f,
-                            0.000000f );
-    instance->registerEObj( "unknown_14", 2004118, 4881761, 4, { 0.003261f, -4.463747f, -152.984604f }, 1.000000f,
-                            0.000000f );
-    instance->registerEObj( "unknown_15", 2004119, 4868601, 4, { 0.003693f, -4.463205f, -166.994400f }, 0.991760f,
-                            0.000048f );
-    instance->registerEObj( "unknown_16", 2002735, 0, 4, { 0.007116f, -5.000001f, -171.749207f }, 1.000000f,
-                            0.000000f );
-    instance->registerEObj( "sgvf_w_lvd_b0118", 2002872, 4895024, 4, { -0.005186f, -4.890112f, -171.362305f },
-                            1.000000f, 0.000000f );
-    // States -> vf_bextwall_on vf_bextwall_of
-    instance->registerEObj( "unknown_17", 2004305, 4841650, 4, { 0.086417f, 0.090680f, -300.234711f }, 1.000000f,
-                            0.000000f );
-    instance->registerEObj( "Allaganterminal", 2004141, 4841682, 4, { 0.003672f, 1.083544f, -337.998596f }, 0.991760f,
-                            0.000048f );
-    instance->registerEObj( "sgpl_w_lvd_colwithnavi", 2004137, 4895069, 4, { 3.638081f, 0.152056f, -331.675415f },
-                            1.000000f, 0.000000f );
+    instance.registerEObj( "unknown_0", 2004612, 0, 4, { -0.116493f, -0.000001f, -293.875214f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_1", 2004613, 0, 4, { -5.014206f, -0.000001f, -285.730896f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "Entrance", 2000182, 4894214, 5, { 0.172209f, 1.707170f, 221.425903f }, 1.000000f, 0.000000f ); 
+      // States -> vf_lock_on (id: 11) vf_lock_of (id: 12) 
+    instance.registerEObj( "Shortcut", 2000700, 0, 4, { -6.029538f, -0.000005f, 188.016205f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_2", 2003679, 4868598, 4, { -0.125790f, 0.523954f, 167.023605f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_3", 2004605, 4852714, 4, { -0.194780f, -0.000003f, 177.104095f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_4", 2003849, 4881763, 4, { 0.031929f, -19.494820f, 141.135101f }, 0.991760f, 0.000048f ); 
+    instance.registerEObj( "unknown_5", 2003905, 4868599, 4, { -0.095059f, -7.275987f, 79.729607f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_6", 2004605, 4879813, 4, { -10.904620f, -18.183340f, 116.685303f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_7", 2004605, 4879797, 4, { 11.416480f, -18.931650f, 116.685303f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_8", 2004605, 4879805, 4, { 11.416480f, -19.000000f, 103.064003f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_9", 2004605, 4879822, 4, { -11.312880f, -19.000000f, 103.064003f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_10", 2004116, 4881762, 4, { 0.171127f, -19.487169f, 30.039690f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_11", 2004117, 4868600, 4, { 0.009460f, -29.465590f, 10.045650f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_12", 2004605, 4879838, 4, { 0.047739f, -29.000000f, 19.918270f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_13", 2004605, 4879850, 4, { 0.018590f, -29.000000f, 19.923750f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_14", 2004118, 4881761, 4, { 0.003261f, -4.463747f, -152.984604f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_15", 2004119, 4868601, 4, { 0.003693f, -4.463205f, -166.994400f }, 0.991760f, 0.000048f ); 
+    instance.registerEObj( "unknown_16", 2002735, 0, 4, { 0.007116f, -5.000001f, -171.749207f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "sgvf_w_lvd_b0118", 2002872, 4895024, 4, { -0.005186f, -4.890112f, -171.362305f }, 1.000000f, 0.000000f ); 
+      // States -> vf_bextwall_on (id: 3) vf_bextwall_of (id: 4) 
+    instance.registerEObj( "unknown_17", 2004305, 4841650, 4, { 0.086417f, 0.090680f, -300.234711f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "Allaganterminal", 2004141, 4841682, 4, { 0.003672f, 1.083544f, -337.998596f }, 0.991760f, 0.000048f ); 
+    instance.registerEObj( "sgpl_w_lvd_colwithnavi", 2004137, 4895069, 4, { 3.638081f, 0.152056f, -331.675415f }, 1.000000f, 0.000000f ); 
 
   }
 
-  void onUpdate( InstanceContentPtr instance, uint32_t currTime ) override
+  void onUpdate( InstanceContent& instance, uint32_t currTime ) override
   {
 
   }
 
-  void onEnterTerritory( InstanceContentPtr instance, Entity::Player& player, uint32_t eventId, uint16_t param1,
+  void onEnterTerritory( InstanceContent& instance, Entity::Player& player, uint32_t eventId, uint16_t param1,
                          uint16_t param2 ) override
   {
 
diff --git a/src/scripts/instances/raids/TheFinalCoilofBahamutTurn2.cpp b/src/scripts/instances/raids/TheFinalCoilofBahamutTurn2.cpp
index 16238e38..47e531fb 100644
--- a/src/scripts/instances/raids/TheFinalCoilofBahamutTurn2.cpp
+++ b/src/scripts/instances/raids/TheFinalCoilofBahamutTurn2.cpp
@@ -9,82 +9,54 @@ class TheFinalCoilofBahamutTurn2 :
 public:
   TheFinalCoilofBahamutTurn2() :
     Sapphire::ScriptAPI::InstanceContentScript( 30017 )
-  {
-  }
+  { }
 
-  void onInit( InstanceContentPtr instance ) override
+  void onInit( InstanceContent& instance ) override
   {
-    instance->registerEObj( "unknown_0", 2004618, 0, 4, { 8.377602f, -4.963000f, 2.130980f }, 1.000000f, 0.000000f );
-    instance->registerEObj( "sgvf_w1b2_b0338", 2004622, 5004388, 4, { 0.000000f, -4.963000f, 0.000000f }, 1.000000f,
-                            0.000000f );
-    // States -> brr_off brr_on2off brr_on brr_off2on
-    instance->registerEObj( "unknown_1", 2004138, 4985190, 4, { 3.028988f, -85.357613f, 329.862915f }, 0.991760f,
-                            0.000048f );
-    instance->registerEObj( "Shortcut", 2000700, 0, 4, { -8.983331f, -89.405617f, 340.705505f }, 1.000000f, 0.000000f );
-    instance->registerEObj( "Entrance", 2000182, 4895376, 5, { -2.304138f, -95.841980f, 373.883514f }, 0.991760f,
-                            0.000048f );
-    // States -> vf_lock_on vf_lock_of
-    instance->registerEObj( "unknown_2", 2004138, 4772070, 4, { -3.471196f, -85.362328f, 329.862915f }, 0.991760f,
-                            0.000048f );
-    instance->registerEObj( "unknown_3", 2004138, 0, 4, { 3.028988f, -85.357613f, 329.862915f }, 0.991760f, 0.000048f );
-    instance->registerEObj( "unknown_4", 2004138, 4772073, 4, { 82.671562f, 89.558182f, 312.686188f }, 1.000000f,
-                            0.000000f );
-    instance->registerEObj( "unknown_5", 2004138, 4772071, 4, { -87.694283f, 61.779518f, 322.880798f }, 1.000000f,
-                            0.000000f );
-    instance->registerEObj( "unknown_6", 2004138, 4772074, 4, { 68.781647f, 74.135750f, 257.001312f }, 1.000000f,
-                            0.000000f );
-    instance->registerEObj( "unknown_7", 2004138, 4772072, 4, { -71.265640f, 50.681782f, 262.029907f }, 1.000000f,
-                            0.000000f );
-    instance->registerEObj( "unknown_8", 2004138, 0, 4, { 3.045514f, -50.605240f, 198.785202f }, 1.000000f, 0.000000f );
-    instance->registerEObj( "unknown_9", 2004131, 4772088, 4, { -0.320496f, -61.905880f, 240.100693f }, 0.991760f,
-                            0.000048f );
-    instance->registerEObj( "unknown_10", 2004131, 4772089, 4, { -0.150618f, -58.926769f, 229.063507f }, 1.000000f,
-                            0.000000f );
-    instance->registerEObj( "unknown_11", 2004130, 4903493, 4, { 0.167786f, -56.382141f, 216.998505f }, 0.991760f,
-                            0.000048f );
-    instance->registerEObj( "unknown_12", 2004138, 4772084, 4, { 5.588670f, -50.254120f, 198.785202f }, 1.000000f,
-                            0.000000f );
-    instance->registerEObj( "unknown_13", 2004138, 4985729, 4, { -1.068177f, -50.250832f, 198.785202f }, 1.000000f,
-                            0.000000f );
-    instance->registerEObj( "unknown_14", 2004138, 4772077, 4, { 93.772713f, 2.760812f, 164.237198f }, 1.000000f,
-                            0.000000f );
-    instance->registerEObj( "unknown_15", 2004138, 4772078, 4, { 62.832458f, 2.703932f, 109.635002f }, 1.000000f,
-                            0.000000f );
-    instance->registerEObj( "unknown_16", 2004138, 4772079, 4, { -101.804497f, -15.054380f, 174.336105f }, 1.000000f,
-                            0.000000f );
-    instance->registerEObj( "unknown_17", 2004138, 4772080, 4, { -68.094177f, -9.272421f, 114.627701f }, 1.000000f,
-                            0.000000f );
-    instance->registerEObj( "unknown_18", 2004131, 4772085, 4, { -33.952530f, 1.069616f, 57.437080f }, 1.000000f,
-                            0.000000f );
-    instance->registerEObj( "unknown_19", 2004131, 4772087, 4, { 34.497631f, 1.062853f, 57.576210f }, 1.000000f,
-                            0.000000f );
-    instance->registerEObj( "unknown_20", 2004130, 4903494, 4, { -18.231251f, 0.578985f, 63.141258f }, 1.000000f,
-                            0.000000f );
-    instance->registerEObj( "unknown_21", 2004130, 4903495, 4, { 18.776350f, 0.578991f, 63.349949f }, 1.000000f,
-                            0.000000f );
-    instance->registerEObj( "unknown_22", 2004138, 4772081, 4, { 0.088281f, 0.909978f, 67.335487f }, 0.991760f,
-                            0.000048f );
-    instance->registerEObj( "unknown_23", 2004138, 4772082, 4, { -66.984283f, 1.029588f, -0.043371f }, 1.000000f,
-                            0.000000f );
-    instance->registerEObj( "unknown_24", 2004138, 4772083, 4, { 67.627632f, 1.029588f, -0.043371f }, 1.000000f,
-                            0.000000f );
-    instance->registerEObj( "unknown_25", 2002735, 0, 4, { 0.046454f, 0.339829f, 55.289249f }, 1.000000f, 0.000000f );
-    instance->registerEObj( "sgvf_w_lvd_b0118", 2002872, 4896001, 4, { -0.021759f, 0.578989f, 57.955990f }, 1.000000f,
-                            0.000000f );
-    // States -> vf_bextwall_on vf_bextwall_of
-    instance->registerEObj( "Allaganterminal", 2004142, 4797408, 4, { 0.001913f, -4.224863f, -30.000130f }, 1.000000f,
-                            0.000000f );
-    instance->registerEObj( "sgpl_w_lvd_colwithnavi", 2004137, 4895798, 4, { -0.366558f, -4.738363f, -24.911970f },
-                            1.000000f, 0.000000f );
+    instance.registerEObj( "unknown_0", 2004618, 0, 4, { 8.377602f, -4.963000f, 2.130980f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "sgvf_w1b2_b0338", 2004622, 5004388, 4, { 0.000000f, -4.963000f, 0.000000f }, 1.000000f, 0.000000f ); 
+      // States -> brr_off (id: 2) brr_on2off (id: 3) brr_on (id: 4) brr_off2on (id: 5) 
+    instance.registerEObj( "unknown_1", 2004138, 4985190, 4, { 3.028988f, -85.357613f, 329.862915f }, 0.991760f, 0.000048f ); 
+    instance.registerEObj( "Shortcut", 2000700, 0, 4, { -8.983331f, -89.405617f, 340.705505f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "Entrance", 2000182, 4895376, 5, { -2.304138f, -95.841980f, 373.883514f }, 0.991760f, 0.000048f ); 
+      // States -> vf_lock_on (id: 11) vf_lock_of (id: 12) 
+    instance.registerEObj( "unknown_2", 2004138, 4772070, 4, { -3.471196f, -85.362328f, 329.862915f }, 0.991760f, 0.000048f ); 
+    instance.registerEObj( "unknown_3", 2004138, 0, 4, { 3.028988f, -85.357613f, 329.862915f }, 0.991760f, 0.000048f ); 
+    instance.registerEObj( "unknown_4", 2004138, 4772073, 4, { 82.671562f, 89.558182f, 312.686188f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_5", 2004138, 4772071, 4, { -87.694283f, 61.779518f, 322.880798f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_6", 2004138, 4772074, 4, { 68.781647f, 74.135750f, 257.001312f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_7", 2004138, 4772072, 4, { -71.265640f, 50.681782f, 262.029907f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_8", 2004138, 0, 4, { 3.045514f, -50.605240f, 198.785202f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_9", 2004131, 4772088, 4, { -0.320496f, -61.905880f, 240.100693f }, 0.991760f, 0.000048f ); 
+    instance.registerEObj( "unknown_10", 2004131, 4772089, 4, { -0.150618f, -58.926769f, 229.063507f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_11", 2004130, 4903493, 4, { 0.167786f, -56.382141f, 216.998505f }, 0.991760f, 0.000048f ); 
+    instance.registerEObj( "unknown_12", 2004138, 4772084, 4, { 5.588670f, -50.254120f, 198.785202f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_13", 2004138, 4985729, 4, { -1.068177f, -50.250832f, 198.785202f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_14", 2004138, 4772077, 4, { 93.772713f, 2.760812f, 164.237198f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_15", 2004138, 4772078, 4, { 62.832458f, 2.703932f, 109.635002f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_16", 2004138, 4772079, 4, { -101.804497f, -15.054380f, 174.336105f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_17", 2004138, 4772080, 4, { -68.094177f, -9.272421f, 114.627701f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_18", 2004131, 4772085, 4, { -33.952530f, 1.069616f, 57.437080f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_19", 2004131, 4772087, 4, { 34.497631f, 1.062853f, 57.576210f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_20", 2004130, 4903494, 4, { -18.231251f, 0.578985f, 63.141258f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_21", 2004130, 4903495, 4, { 18.776350f, 0.578991f, 63.349949f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_22", 2004138, 4772081, 4, { 0.088281f, 0.909978f, 67.335487f }, 0.991760f, 0.000048f ); 
+    instance.registerEObj( "unknown_23", 2004138, 4772082, 4, { -66.984283f, 1.029588f, -0.043371f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_24", 2004138, 4772083, 4, { 67.627632f, 1.029588f, -0.043371f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_25", 2002735, 0, 4, { 0.046454f, 0.339829f, 55.289249f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "sgvf_w_lvd_b0118", 2002872, 4896001, 4, { -0.021759f, 0.578989f, 57.955990f }, 1.000000f, 0.000000f ); 
+      // States -> vf_bextwall_on (id: 3) vf_bextwall_of (id: 4) 
+    instance.registerEObj( "Allaganterminal", 2004142, 4797408, 4, { 0.001913f, -4.224863f, -30.000130f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "sgpl_w_lvd_colwithnavi", 2004137, 4895798, 4, { -0.366558f, -4.738363f, -24.911970f }, 1.000000f, 0.000000f ); 
 
   }
 
-  void onUpdate( InstanceContentPtr instance, uint32_t currTime ) override
+  void onUpdate( InstanceContent& instance, uint32_t currTime ) override
   {
 
   }
 
-  void onEnterTerritory( InstanceContentPtr instance, Entity::Player& player, uint32_t eventId, uint16_t param1,
+  void onEnterTerritory( InstanceContent& instance, Entity::Player& player, uint32_t eventId, uint16_t param1,
                          uint16_t param2 ) override
   {
 
diff --git a/src/scripts/instances/raids/TheFinalCoilofBahamutTurn3.cpp b/src/scripts/instances/raids/TheFinalCoilofBahamutTurn3.cpp
index af0e89ae..71eeefad 100644
--- a/src/scripts/instances/raids/TheFinalCoilofBahamutTurn3.cpp
+++ b/src/scripts/instances/raids/TheFinalCoilofBahamutTurn3.cpp
@@ -9,34 +9,27 @@ class TheFinalCoilofBahamutTurn3 :
 public:
   TheFinalCoilofBahamutTurn3() :
     Sapphire::ScriptAPI::InstanceContentScript( 30018 )
-  {
-  }
+  { }
 
-  void onInit( InstanceContentPtr instance ) override
+  void onInit( InstanceContent& instance ) override
   {
-    instance->registerEObj( "unknown_0", 2004611, 0, 4, { -7.491028f, -53.235149f, -153.215500f }, 1.000000f,
-                            0.000000f );
-    instance->registerEObj( "unknown_1", 2004610, 0, 4, { 22.322800f, -53.235241f, -154.775101f }, 1.000000f,
-                            0.000000f );
-    instance->registerEObj( "sgvf_w1b3_b0502", 2004627, 5009741, 4, { 0.000000f, -53.682961f, -160.000000f }, 1.000000f,
-                            0.000000f );
-    // States -> brr_off brr_on2off brr_on brr_off2on
-    instance->registerEObj( "unknown_2", 2004638, 0, 4, { -14.415940f, -53.682961f, -162.090302f }, 1.000000f,
-                            0.000000f );
-    instance->registerEObj( "Entrance", 2000182, 4895872, 5, { 0.005331f, -53.234989f, -140.846207f }, 1.000000f,
-                            0.000000f );
-    // States -> vf_lock_on vf_lock_of
-    instance->registerEObj( "Entrypoint", 2004650, 0, 4, { -0.019161f, -53.626511f, -182.364700f }, 1.000000f,
-                            0.000000f );
+    instance.registerEObj( "unknown_0", 2004611, 0, 4, { -7.491028f, -53.235149f, -153.215500f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_1", 2004610, 0, 4, { 22.322800f, -53.235241f, -154.775101f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "sgvf_w1b3_b0502", 2004627, 5009741, 4, { 0.000000f, -53.682961f, -160.000000f }, 1.000000f, 0.000000f ); 
+      // States -> brr_off (id: 2) brr_on2off (id: 3) brr_on (id: 4) brr_off2on (id: 5) 
+    instance.registerEObj( "unknown_2", 2004638, 0, 4, { -14.415940f, -53.682961f, -162.090302f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "Entrance", 2000182, 4895872, 5, { 0.005331f, -53.234989f, -140.846207f }, 1.000000f, 0.000000f ); 
+      // States -> vf_lock_on (id: 11) vf_lock_of (id: 12) 
+    instance.registerEObj( "Entrypoint", 2004650, 0, 4, { -0.019161f, -53.626511f, -182.364700f }, 1.000000f, 0.000000f ); 
 
   }
 
-  void onUpdate( InstanceContentPtr instance, uint32_t currTime ) override
+  void onUpdate( InstanceContent& instance, uint32_t currTime ) override
   {
 
   }
 
-  void onEnterTerritory( InstanceContentPtr instance, Entity::Player& player, uint32_t eventId, uint16_t param1,
+  void onEnterTerritory( InstanceContent& instance, Entity::Player& player, uint32_t eventId, uint16_t param1,
                          uint16_t param2 ) override
   {
 
diff --git a/src/scripts/instances/raids/TheFinalCoilofBahamutTurn4.cpp b/src/scripts/instances/raids/TheFinalCoilofBahamutTurn4.cpp
index b447fa35..29ecf9e5 100644
--- a/src/scripts/instances/raids/TheFinalCoilofBahamutTurn4.cpp
+++ b/src/scripts/instances/raids/TheFinalCoilofBahamutTurn4.cpp
@@ -9,31 +9,27 @@ class TheFinalCoilofBahamutTurn4 :
 public:
   TheFinalCoilofBahamutTurn4() :
     Sapphire::ScriptAPI::InstanceContentScript( 30019 )
-  {
-  }
+  { }
 
-  void onInit( InstanceContentPtr instance ) override
+  void onInit( InstanceContent& instance ) override
   {
-    instance->registerEObj( "unknown_0", 2004578, 0, 4, { 452.681213f, 0.000000f, 6.016883f }, 1.000000f, 0.000000f );
-    instance->registerEObj( "unknown_1", 2004579, 0, 4, { 450.366699f, -0.000000f, 5.948895f }, 1.000000f, 0.000000f );
-    instance->registerEObj( "unknown_2", 2004580, 0, 4, { 443.205688f, 0.000000f, 4.024448f }, 1.000000f, 0.000000f );
-    instance->registerEObj( "Entrance", 2000182, 4895882, 5, { 450.000000f, 0.000000f, 21.250090f }, 1.000000f,
-                            0.000000f );
-    // States -> vf_lock_on vf_lock_of
-    instance->registerEObj( "unknown_3", 2004785, 5039563, 4, { 450.000000f, 0.000000f, 0.000000f }, 1.000000f,
-                            0.000000f );
-    instance->registerEObj( "unknown_4", 2004649, 5018241, 4, { 448.419403f, 0.000000f, 4.765350f }, 1.000000f,
-                            0.000000f );
-    instance->registerEObj( "Exit", 2004651, 0, 4, { 450.000000f, 0.000000f, 29.273590f }, 1.000000f, 0.000000f );
+    instance.registerEObj( "unknown_0", 2004578, 0, 4, { 452.681213f, 0.000000f, 6.016883f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_1", 2004579, 0, 4, { 450.366699f, -0.000000f, 5.948895f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_2", 2004580, 0, 4, { 443.205688f, 0.000000f, 4.024448f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "Entrance", 2000182, 4895882, 5, { 450.000000f, 0.000000f, 21.250090f }, 1.000000f, 0.000000f ); 
+      // States -> vf_lock_on (id: 11) vf_lock_of (id: 12) 
+    instance.registerEObj( "unknown_3", 2004785, 5039563, 4, { 450.000000f, 0.000000f, 0.000000f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_4", 2004649, 5018241, 4, { 448.419403f, 0.000000f, 4.765350f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "Exit", 2004651, 0, 4, { 450.000000f, 0.000000f, 29.273590f }, 1.000000f, 0.000000f ); 
 
   }
 
-  void onUpdate( InstanceContentPtr instance, uint32_t currTime ) override
+  void onUpdate( InstanceContent& instance, uint32_t currTime ) override
   {
 
   }
 
-  void onEnterTerritory( InstanceContentPtr instance, Entity::Player& player, uint32_t eventId, uint16_t param1,
+  void onEnterTerritory( InstanceContent& instance, Entity::Player& player, uint32_t eventId, uint16_t param1,
                          uint16_t param2 ) override
   {
 
diff --git a/src/scripts/instances/raids/TheLabyrinthoftheAncients.cpp b/src/scripts/instances/raids/TheLabyrinthoftheAncients.cpp
index cb504b96..19abf604 100644
--- a/src/scripts/instances/raids/TheLabyrinthoftheAncients.cpp
+++ b/src/scripts/instances/raids/TheLabyrinthoftheAncients.cpp
@@ -9,165 +9,100 @@ class TheLabyrinthoftheAncients :
 public:
   TheLabyrinthoftheAncients() :
     Sapphire::ScriptAPI::InstanceContentScript( 30001 )
-  {
-  }
+  { }
 
-  void onInit( InstanceContentPtr instance ) override
+  void onInit( InstanceContent& instance ) override
   {
-    instance->registerEObj( "unknown_0", 2002108, 0, 4, { -109.946503f, 44.168140f, -165.619995f }, 0.991760f,
-                            0.000048f );
-    instance->registerEObj( "Entrance", 2000182, 4317322, 5, { -110.032799f, 30.372690f, 417.614990f }, 0.991760f,
-                            0.000048f );
-    // States -> vf_lock_on vf_lock_of
-    instance->registerEObj( "Allaganteleporter", 2001023, 3445281, 4, { -117.450104f, 45.942120f, 317.195892f },
-                            0.778198f, 0.000048f );
-    instance->registerEObj( "sgvf_w_lvd_b0294", 2002793, 4493308, 4, { -148.301498f, 48.301128f, 279.915802f },
-                            1.000000f, 0.000000f );
-    // States -> barrier_2loop barrier_stop barrier_loop barrier_2stop
-    instance->registerEObj( "sgvf_w_lvd_b0294_1", 2002794, 4493309, 4, { -109.977203f, 48.251709f, 243.024094f },
-                            0.991760f, 0.000048f );
-    // States -> barrier_2loop barrier_stop barrier_loop barrier_2stop
-    instance->registerEObj( "sgvf_w_lvd_b0294_2", 2002795, 4493310, 4, { -71.722931f, 48.301121f, 280.086487f },
-                            1.000000f, 0.000000f );
-    // States -> barrier_2loop barrier_stop barrier_loop barrier_2stop
-    instance->registerEObj( "unknown_1", 2001024, 4199521, 4, { -451.214386f, 41.580811f, 182.050903f }, 1.000000f,
-                            0.000048f );
-    instance->registerEObj( "sgpl_l1r1_boss1wall", 2001025, 4303928, 4, { -451.373688f, 24.800070f, 73.862427f },
-                            0.991760f, 0.000048f );
-    // States -> vf_bextwall_on vf_bextwall_of
-    instance->registerEObj( "unknown_2", 2001026, 0, 4, { -451.305206f, 24.873600f, 73.806000f }, 1.000000f,
-                            0.000000f );
-    instance->registerEObj( "unknown_3", 2002798, 0, 4, { -355.665405f, 41.884102f, 279.420288f }, 1.550000f,
-                            -1.570796f );
-    instance->registerEObj( "sgvf_w_lvd_b0250", 2002801, 4478011, 4, { -346.181488f, 42.801510f, 279.988708f },
-                            0.991760f, 0.000048f );
-    // States -> vf_bextwall_on vf_bextwall_of
-    instance->registerEObj( "unknown_4", 2002799, 0, 4, { -415.959198f, 42.400002f, 280.898804f }, 1.550000f,
-                            -1.570796f );
-    instance->registerEObj( "sgvf_w_lvd_b0250_1", 2002802, 4478013, 4, { -415.761597f, 42.400002f, 279.982788f },
-                            1.000000f, 0.000000f );
-    // States -> vf_bextwall_on vf_bextwall_of
-    instance->registerEObj( "unknown_5", 2002800, 0, 4, { -452.406799f, 42.400002f, 239.395096f }, 1.550000f,
-                            0.000000f );
-    instance->registerEObj( "sgvf_w_lvd_b0250_2", 2002803, 4478015, 4, { -451.081909f, 41.580811f, 243.305099f },
-                            0.991760f, 0.000048f );
-    // States -> vf_bextwall_on vf_bextwall_of
-    instance->registerEObj( "sgvf_w_lvd_b0269", 2002839, 4493435, 4, { -413.650909f, 42.000000f, 279.285889f },
-                            0.991760f, 0.000048f );
-    // States -> barrier_2loop barrier_stop barrier_loop barrier_2stop
-    instance->registerEObj( "sgvf_w_lvd_b0269_1", 2002840, 4493436, 4, { -450.220612f, 41.580811f, 247.690399f },
-                            0.991760f, 0.000048f );
-    // States -> barrier_2loop barrier_stop barrier_loop barrier_2stop
-    instance->registerEObj( "Allaganteleporter_1", 2002807, 3445282, 4, { -301.062592f, 54.375320f, 290.201904f },
-                            0.991760f, 0.000048f );
-    instance->registerEObj( "Allaganteleporter_2", 2002808, 3974161, 4, { -457.203400f, 38.418018f, 104.051903f },
-                            0.991760f, 0.000048f );
-    instance->registerEObj( "Shortcut", 2002804, 0, 4, { -451.176910f, 25.504910f, 18.912251f }, 1.000000f, 0.000000f );
-    instance->registerEObj( "sgpl_l1r1_trash2wall", 2001027, 4304910, 4, { 191.423996f, 51.658699f, 280.097992f },
-                            0.400000f, 0.000000f );
-    // States -> on off
-    instance->registerEObj( "sgpl_l1r1_trash2line", 2001028, 4304912, 4, { 191.145798f, 51.767059f, 279.359497f },
-                            0.400000f, 0.000000f );
-    instance->registerEObj( "unknown_6", 2001032, 0, 4, { 409.496094f, 66.240303f, 280.004395f }, 0.800000f,
-                            -1.570451f );
-    instance->registerEObj( "sgpl_l1r1_boss2wall", 2001031, 4304071, 4, { 438.027588f, 69.382690f, 281.602203f },
-                            0.778198f, -1.570451f );
-    // States -> vf_bextwall_on vf_bextwall_of
-    instance->registerEObj( "Allaganteleporter_3", 2002809, 3445284, 4, { 115.688499f, 65.110123f, 280.018311f },
-                            0.991760f, 0.000048f );
-    instance->registerEObj( "unknown_7", 2002813, 4199883, 4, { 253.669495f, 51.066391f, 244.695007f }, 1.000000f,
-                            0.000000f );
-    instance->registerEObj( "unknown_8", 2002814, 4199882, 4, { 253.676102f, 51.066399f, 279.965607f }, 1.000000f,
-                            0.000000f );
-    instance->registerEObj( "unknown_9", 2002815, 4199881, 4, { 253.683899f, 51.066360f, 315.213013f }, 1.000000f,
-                            0.000000f );
-    instance->registerEObj( "unknown_10", 2002816, 4199880, 4, { 213.707596f, 51.052799f, 244.895493f }, 1.000000f,
-                            0.000000f );
-    instance->registerEObj( "unknown_11", 2002817, 4199878, 4, { 213.688202f, 51.052799f, 280.125214f }, 1.000000f,
-                            0.000000f );
-    instance->registerEObj( "unknown_12", 2002818, 4199879, 4, { 213.723404f, 51.052799f, 315.105286f }, 1.000000f,
-                            0.000000f );
-    instance->registerEObj( "Allaganteleporter_4", 2002810, 3974166, 4, { 349.215515f, 60.567490f, 268.536591f },
-                            0.991760f, 0.000048f );
-    instance->registerEObj( "Shortcut_1", 2002805, 0, 4, { 455.122894f, 66.249268f, 279.987701f }, 0.991760f,
-                            0.000048f );
-    instance->registerEObj( "unknown_13", 2001030, 4199894, 4, { 264.739899f, 50.679981f, 279.921509f }, 1.000000f,
-                            0.000000f );
-    instance->registerEObj( "sgpl_l1r1_boss3wall", 2001033, 4305031, 4, { -110.210899f, 44.083248f, -116.227997f },
-                            0.381470f, 0.000048f );
-    // States -> vf_bextwall_on vf_bextwall_of
-    instance->registerEObj( "unknown_14", 2001034, 0, 4, { -110.254898f, 44.168098f, -111.387901f }, 1.000000f,
-                            0.000000f );
-    instance->registerEObj( "unknown_15", 2001035, 4317566, 4, { -110.054497f, 46.072929f, -214.578705f }, 0.400000f,
-                            0.000000f );
-    instance->registerEObj( "sgpl_l1r1_boss3wall_1", 2001036, 4305191, 4, { -111.224899f, 67.886620f, -344.147797f },
-                            0.400000f, 0.000000f );
-    // States -> vf_bextwall_on vf_bextwall_of
-    instance->registerEObj( "unknown_16", 2001037, 0, 4, { -109.930298f, 67.892403f, -338.731415f }, 1.000000f,
-                            0.000000f );
-    instance->registerEObj( "Energytowerconsole", 2001038, 0, 4, { -85.032784f, 70.241432f, -343.493713f }, 0.800000f,
-                            1.570451f );
-    instance->registerEObj( "Energytowerconsole_1", 2001039, 0, 4, { -85.044861f, 70.240898f, -393.307587f }, 0.800000f,
-                            0.000000f );
-    instance->registerEObj( "Energytowerconsole_2", 2001040, 0, 4, { -134.983994f, 70.240898f, -343.431213f },
-                            0.800000f, 0.000000f );
-    instance->registerEObj( "Energytowerconsole_3", 2001041, 0, 4, { -134.925201f, 70.240898f, -393.378296f },
-                            0.800000f, -1.570451f );
-    instance->registerEObj( "Allaganteleporter_5", 2002811, 3445283, 4, { -117.500000f, 39.417461f, -60.409302f },
-                            1.000000f, 0.000000f );
-    instance->registerEObj( "unknown_17", 2002819, 4317548, 4, { -109.942200f, 44.168140f, -140.697403f }, 1.000000f,
-                            0.000000f );
-    instance->registerEObj( "unknown_18", 2002820, 4317564, 4, { -109.933800f, 44.168140f, -190.218903f }, 1.000000f,
-                            0.000000f );
-    instance->registerEObj( "Allaganteleporter_6", 2002812, 3974167, 4, { -117.461098f, 57.435680f, -288.075104f },
-                            0.991760f, 0.000048f );
-    instance->registerEObj( "Shortcut_2", 2002806, 0, 4, { -109.976601f, 68.215019f, -378.115906f }, 1.000000f,
-                            0.000000f );
-    instance->registerEObj( "unknown_19", 2002821, 4407451, 4, { -110.134598f, 68.248489f, -367.669708f }, 1.000000f,
-                            0.000000f );
-    instance->registerEObj( "Allaganteleporter_7", 2002822, 4322323, 4, { -123.763496f, 650.608582f, 254.596695f },
-                            0.991760f, 0.000048f );
-    instance->registerEObj( "sgpl_l1r1_boss4wall", 2001042, 4491496, 4, { -110.122498f, 650.015808f, 227.968597f },
-                            1.000000f, 0.000000f );
-    // States -> vf_bextwall_on vf_bextwall_of
-    instance->registerEObj( "unknown_20", 2001043, 0, 4, { -110.052299f, 650.020020f, 227.514893f }, 0.800000f,
-                            0.000048f );
-    instance->registerEObj( "unknown_21", 2001044, 4497411, 4, { -109.941299f, 650.720886f, 194.445694f }, 0.991760f,
-                            0.000048f );
-    instance->registerEObj( "unknown_22", 2002823, 4101871, 4, { -86.638451f, 650.731018f, 191.568298f }, 1.000000f,
-                            0.000000f );
-    instance->registerEObj( "unknown_23", 2002824, 4101872, 4, { -109.887199f, 650.970886f, 207.029099f }, 1.000000f,
-                            0.000000f );
-    instance->registerEObj( "unknown_24", 2002825, 4101873, 4, { -132.905304f, 650.731018f, 191.279907f }, 1.000000f,
-                            0.000000f );
-    instance->registerEObj( "unknown_25", 2002826, 0, 4, { -78.160004f, 649.940125f, 206.024597f }, 0.800000f,
-                            -0.634151f );
-    instance->registerEObj( "unknown_26", 2002832, 0, 4, { -85.569000f, 649.940125f, 213.420593f }, 0.800000f,
-                            -0.911137f );
-    instance->registerEObj( "unknown_27", 2002833, 0, 4, { -94.658401f, 649.940125f, 218.672806f }, 0.800000f,
-                            -1.177247f );
-    instance->registerEObj( "unknown_28", 2002834, 0, 4, { -125.350403f, 649.940125f, 218.672806f }, 0.800000f,
-                            -1.153363f );
-    instance->registerEObj( "unknown_29", 2002835, 0, 4, { -134.429901f, 649.940125f, 213.420593f }, 0.800000f,
-                            -0.918754f );
-    instance->registerEObj( "unknown_30", 2002836, 0, 4, { -141.827698f, 649.940125f, 206.024597f }, 0.800000f,
-                            -0.639576f );
-    instance->registerEObj( "unknown_31", 2002837, 4478584, 4, { -89.563782f, 650.019226f, 209.632706f }, 1.000000f,
-                            0.000000f );
-    instance->registerEObj( "unknown_32", 2002838, 4478586, 4, { -131.352798f, 650.019226f, 210.327194f }, 1.000000f,
-                            0.000000f );
-    instance->registerEObj( "Exit", 2000139, 0, 4, { -110.009903f, 650.972229f, 157.832199f }, 0.793408f, 0.000048f );
-    instance->registerEObj( "unknown_33", 2001029, 4499125, 4, { -109.987602f, 650.731018f, 181.576202f }, 1.000000f,
-                            0.000000f );
+    instance.registerEObj( "unknown_0", 2002108, 0, 4, { -109.946503f, 44.168140f, -165.619995f }, 0.991760f, 0.000048f ); 
+    instance.registerEObj( "Entrance", 2000182, 4317322, 5, { -110.032799f, 30.372690f, 417.614990f }, 0.991760f, 0.000048f ); 
+      // States -> vf_lock_on (id: 11) vf_lock_of (id: 12) 
+    instance.registerEObj( "Allaganteleporter", 2001023, 3445281, 4, { -117.450104f, 45.942120f, 317.195892f }, 0.778198f, 0.000048f ); 
+    instance.registerEObj( "sgvf_w_lvd_b0294", 2002793, 4493308, 4, { -148.301498f, 48.301128f, 279.915802f }, 1.000000f, 0.000000f ); 
+      // States -> barrier_2loop (id: 3) barrier_stop (id: 4) barrier_loop (id: 10) barrier_2stop (id: 11) 
+    instance.registerEObj( "sgvf_w_lvd_b0294_1", 2002794, 4493309, 4, { -109.977203f, 48.251709f, 243.024094f }, 0.991760f, 0.000048f ); 
+      // States -> barrier_2loop (id: 3) barrier_stop (id: 4) barrier_loop (id: 10) barrier_2stop (id: 11) 
+    instance.registerEObj( "sgvf_w_lvd_b0294_2", 2002795, 4493310, 4, { -71.722931f, 48.301121f, 280.086487f }, 1.000000f, 0.000000f ); 
+      // States -> barrier_2loop (id: 3) barrier_stop (id: 4) barrier_loop (id: 10) barrier_2stop (id: 11) 
+    instance.registerEObj( "unknown_1", 2001024, 4199521, 4, { -451.214386f, 41.580811f, 182.050903f }, 1.000000f, 0.000048f ); 
+    instance.registerEObj( "sgpl_l1r1_boss1wall", 2001025, 4303928, 4, { -451.373688f, 24.800070f, 73.862427f }, 0.991760f, 0.000048f ); 
+      // States -> vf_bextwall_on (id: 3) vf_bextwall_of (id: 4) 
+    instance.registerEObj( "unknown_2", 2001026, 0, 4, { -451.305206f, 24.873600f, 73.806000f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_3", 2002798, 0, 4, { -355.665405f, 41.884102f, 279.420288f }, 1.550000f, -1.570796f ); 
+    instance.registerEObj( "sgvf_w_lvd_b0250", 2002801, 4478011, 4, { -346.181488f, 42.801510f, 279.988708f }, 0.991760f, 0.000048f ); 
+      // States -> vf_bextwall_on (id: 3) vf_bextwall_of (id: 4) 
+    instance.registerEObj( "unknown_4", 2002799, 0, 4, { -415.959198f, 42.400002f, 280.898804f }, 1.550000f, -1.570796f ); 
+    instance.registerEObj( "sgvf_w_lvd_b0250_1", 2002802, 4478013, 4, { -415.761597f, 42.400002f, 279.982788f }, 1.000000f, 0.000000f ); 
+      // States -> vf_bextwall_on (id: 3) vf_bextwall_of (id: 4) 
+    instance.registerEObj( "unknown_5", 2002800, 0, 4, { -452.406799f, 42.400002f, 239.395096f }, 1.550000f, 0.000000f ); 
+    instance.registerEObj( "sgvf_w_lvd_b0250_2", 2002803, 4478015, 4, { -451.081909f, 41.580811f, 243.305099f }, 0.991760f, 0.000048f ); 
+      // States -> vf_bextwall_on (id: 3) vf_bextwall_of (id: 4) 
+    instance.registerEObj( "sgvf_w_lvd_b0269", 2002839, 4493435, 4, { -413.650909f, 42.000000f, 279.285889f }, 0.991760f, 0.000048f ); 
+      // States -> barrier_2loop (id: 3) barrier_stop (id: 4) barrier_loop (id: 10) barrier_2stop (id: 11) 
+    instance.registerEObj( "sgvf_w_lvd_b0269_1", 2002840, 4493436, 4, { -450.220612f, 41.580811f, 247.690399f }, 0.991760f, 0.000048f ); 
+      // States -> barrier_2loop (id: 3) barrier_stop (id: 4) barrier_loop (id: 10) barrier_2stop (id: 11) 
+    instance.registerEObj( "Allaganteleporter_1", 2002807, 3445282, 4, { -301.062592f, 54.375320f, 290.201904f }, 0.991760f, 0.000048f ); 
+    instance.registerEObj( "Allaganteleporter_2", 2002808, 3974161, 4, { -457.203400f, 38.418018f, 104.051903f }, 0.991760f, 0.000048f ); 
+    instance.registerEObj( "Shortcut", 2002804, 0, 4, { -451.176910f, 25.504910f, 18.912251f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "sgpl_l1r1_trash2wall", 2001027, 4304910, 4, { 191.423996f, 51.658699f, 280.097992f }, 0.400000f, 0.000000f ); 
+      // States -> on (id: 20) off (id: 21) 
+    instance.registerEObj( "sgpl_l1r1_trash2line", 2001028, 4304912, 4, { 191.145798f, 51.767059f, 279.359497f }, 0.400000f, 0.000000f ); 
+    instance.registerEObj( "unknown_6", 2001032, 0, 4, { 409.496094f, 66.240303f, 280.004395f }, 0.800000f, -1.570451f ); 
+    instance.registerEObj( "sgpl_l1r1_boss2wall", 2001031, 4304071, 4, { 438.027588f, 69.382690f, 281.602203f }, 0.778198f, -1.570451f ); 
+      // States -> vf_bextwall_on (id: 3) vf_bextwall_of (id: 4) 
+    instance.registerEObj( "Allaganteleporter_3", 2002809, 3445284, 4, { 115.688499f, 65.110123f, 280.018311f }, 0.991760f, 0.000048f ); 
+    instance.registerEObj( "unknown_7", 2002813, 4199883, 4, { 253.669495f, 51.066391f, 244.695007f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_8", 2002814, 4199882, 4, { 253.676102f, 51.066399f, 279.965607f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_9", 2002815, 4199881, 4, { 253.683899f, 51.066360f, 315.213013f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_10", 2002816, 4199880, 4, { 213.707596f, 51.052799f, 244.895493f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_11", 2002817, 4199878, 4, { 213.688202f, 51.052799f, 280.125214f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_12", 2002818, 4199879, 4, { 213.723404f, 51.052799f, 315.105286f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "Allaganteleporter_4", 2002810, 3974166, 4, { 349.215515f, 60.567490f, 268.536591f }, 0.991760f, 0.000048f ); 
+    instance.registerEObj( "Shortcut_1", 2002805, 0, 4, { 455.122894f, 66.249268f, 279.987701f }, 0.991760f, 0.000048f ); 
+    instance.registerEObj( "unknown_13", 2001030, 4199894, 4, { 264.739899f, 50.679981f, 279.921509f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "sgpl_l1r1_boss3wall", 2001033, 4305031, 4, { -110.210899f, 44.083248f, -116.227997f }, 0.381470f, 0.000048f ); 
+      // States -> vf_bextwall_on (id: 3) vf_bextwall_of (id: 4) 
+    instance.registerEObj( "unknown_14", 2001034, 0, 4, { -110.254898f, 44.168098f, -111.387901f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_15", 2001035, 4317566, 4, { -110.054497f, 46.072929f, -214.578705f }, 0.400000f, 0.000000f ); 
+    instance.registerEObj( "sgpl_l1r1_boss3wall_1", 2001036, 4305191, 4, { -111.224899f, 67.886620f, -344.147797f }, 0.400000f, 0.000000f ); 
+      // States -> vf_bextwall_on (id: 3) vf_bextwall_of (id: 4) 
+    instance.registerEObj( "unknown_16", 2001037, 0, 4, { -109.930298f, 67.892403f, -338.731415f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "Energytowerconsole", 2001038, 0, 4, { -85.032784f, 70.241432f, -343.493713f }, 0.800000f, 1.570451f ); 
+    instance.registerEObj( "Energytowerconsole_1", 2001039, 0, 4, { -85.044861f, 70.240898f, -393.307587f }, 0.800000f, 0.000000f ); 
+    instance.registerEObj( "Energytowerconsole_2", 2001040, 0, 4, { -134.983994f, 70.240898f, -343.431213f }, 0.800000f, 0.000000f ); 
+    instance.registerEObj( "Energytowerconsole_3", 2001041, 0, 4, { -134.925201f, 70.240898f, -393.378296f }, 0.800000f, -1.570451f ); 
+    instance.registerEObj( "Allaganteleporter_5", 2002811, 3445283, 4, { -117.500000f, 39.417461f, -60.409302f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_17", 2002819, 4317548, 4, { -109.942200f, 44.168140f, -140.697403f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_18", 2002820, 4317564, 4, { -109.933800f, 44.168140f, -190.218903f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "Allaganteleporter_6", 2002812, 3974167, 4, { -117.461098f, 57.435680f, -288.075104f }, 0.991760f, 0.000048f ); 
+    instance.registerEObj( "Shortcut_2", 2002806, 0, 4, { -109.976601f, 68.215019f, -378.115906f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_19", 2002821, 4407451, 4, { -110.134598f, 68.248489f, -367.669708f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "Allaganteleporter_7", 2002822, 4322323, 4, { -123.763496f, 650.608582f, 254.596695f }, 0.991760f, 0.000048f ); 
+    instance.registerEObj( "sgpl_l1r1_boss4wall", 2001042, 4491496, 4, { -110.122498f, 650.015808f, 227.968597f }, 1.000000f, 0.000000f ); 
+      // States -> vf_bextwall_on (id: 3) vf_bextwall_of (id: 4) 
+    instance.registerEObj( "unknown_20", 2001043, 0, 4, { -110.052299f, 650.020020f, 227.514893f }, 0.800000f, 0.000048f ); 
+    instance.registerEObj( "unknown_21", 2001044, 4497411, 4, { -109.941299f, 650.720886f, 194.445694f }, 0.991760f, 0.000048f ); 
+    instance.registerEObj( "unknown_22", 2002823, 4101871, 4, { -86.638451f, 650.731018f, 191.568298f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_23", 2002824, 4101872, 4, { -109.887199f, 650.970886f, 207.029099f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_24", 2002825, 4101873, 4, { -132.905304f, 650.731018f, 191.279907f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_25", 2002826, 0, 4, { -78.160004f, 649.940125f, 206.024597f }, 0.800000f, -0.634151f ); 
+    instance.registerEObj( "unknown_26", 2002832, 0, 4, { -85.569000f, 649.940125f, 213.420593f }, 0.800000f, -0.911137f ); 
+    instance.registerEObj( "unknown_27", 2002833, 0, 4, { -94.658401f, 649.940125f, 218.672806f }, 0.800000f, -1.177247f ); 
+    instance.registerEObj( "unknown_28", 2002834, 0, 4, { -125.350403f, 649.940125f, 218.672806f }, 0.800000f, -1.153363f ); 
+    instance.registerEObj( "unknown_29", 2002835, 0, 4, { -134.429901f, 649.940125f, 213.420593f }, 0.800000f, -0.918754f ); 
+    instance.registerEObj( "unknown_30", 2002836, 0, 4, { -141.827698f, 649.940125f, 206.024597f }, 0.800000f, -0.639576f ); 
+    instance.registerEObj( "unknown_31", 2002837, 4478584, 4, { -89.563782f, 650.019226f, 209.632706f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_32", 2002838, 4478586, 4, { -131.352798f, 650.019226f, 210.327194f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "Exit", 2000139, 0, 4, { -110.009903f, 650.972229f, 157.832199f }, 0.793408f, 0.000048f ); 
+    instance.registerEObj( "unknown_33", 2001029, 4499125, 4, { -109.987602f, 650.731018f, 181.576202f }, 1.000000f, 0.000000f ); 
 
   }
 
-  void onUpdate( InstanceContentPtr instance, uint32_t currTime ) override
+  void onUpdate( InstanceContent& instance, uint32_t currTime ) override
   {
 
   }
 
-  void onEnterTerritory( InstanceContentPtr instance, Entity::Player& player, uint32_t eventId, uint16_t param1,
+  void onEnterTerritory( InstanceContent& instance, Entity::Player& player, uint32_t eventId, uint16_t param1,
                          uint16_t param2 ) override
   {
 
diff --git a/src/scripts/instances/raids/TheOrbonneMonastery.cpp b/src/scripts/instances/raids/TheOrbonneMonastery.cpp
new file mode 100644
index 00000000..0ff8b517
--- /dev/null
+++ b/src/scripts/instances/raids/TheOrbonneMonastery.cpp
@@ -0,0 +1,106 @@
+#include <ScriptObject.h>
+#include <Territory/InstanceContent.h>
+
+using namespace Sapphire;
+
+class TheOrbonneMonastery :
+  public Sapphire::ScriptAPI::InstanceContentScript
+{
+public:
+  TheOrbonneMonastery() :
+    Sapphire::ScriptAPI::InstanceContentScript( 30077 )
+  { }
+
+  void onInit( InstanceContent& instance ) override
+  {
+    instance.registerEObj( "sgvf_w_lvd_b0250", 2007457, 7725374, 4, { 599.697021f, 0.000000f, 384.788696f }, 1.000000f, 0.000000f ); 
+      // States -> vf_bextwall_on (id: 3) vf_bextwall_of (id: 4) 
+    instance.registerEObj( "unknown_0", 2007791, 0, 4, { 600.046814f, 0.000000f, 384.120605f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_1", 2009696, 0, 4, { 581.460022f, 0.000000f, 283.458313f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_2", 2002735, 0, 4, { 599.877808f, -31.021669f, -23.567789f }, 0.991760f, 0.000048f ); 
+    instance.registerEObj( "sgvf_w_lvd_b0118", 2007457, 7742069, 4, { 599.994080f, -31.000000f, -20.984110f }, 1.000000f, 0.000000f ); 
+      // States -> vf_bextwall_on (id: 3) vf_bextwall_of (id: 4) 
+    instance.registerEObj( "sgbg_z3r3_a2_swrd1", 2007457, 7746896, 4, { 589.026978f, -31.000000f, -64.958076f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "sgbg_z3r3_a2_swrd1_1", 2007457, 7746909, 4, { 609.340027f, -31.000000f, -43.261929f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "sgbg_z3r3_a2_shld1", 2007457, 7746912, 4, { 608.816589f, -31.000000f, -67.144180f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "sgbg_z3r3_a2_shld1_1", 2007457, 7746914, 4, { 592.940430f, -31.000000f, -41.502899f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "sgvf_w_lvd_b0118_1", 2007457, 7749814, 4, { 605.816284f, -31.000000f, -87.291206f }, 0.991760f, 0.000048f ); 
+      // States -> vf_bextwall_on (id: 3) vf_bextwall_of (id: 4) 
+    instance.registerEObj( "sgvf_z3r3_b1616", 2007457, 7842482, 4, { 600.000000f, -30.000000f, -54.000000f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "sgbg_z3r3_a2_swrd1_2", 2007457, 7844508, 4, { 300.000000f, 0.000000f, -50.000000f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "sgbg_z3r3_a2_shld3", 2007457, 7845647, 4, { 600.000000f, -31.000000f, -49.000000f }, 1.000000f, 0.000000f ); 
+      // States -> enable (id: 18) enable_a (id: 19) disable (id: 20) disable_a (id: 21) loop (id: 23) 
+    instance.registerEObj( "sgbg_z3r3_a2_shld3_1", 2007457, 7845648, 4, { 600.000000f, -31.000000f, -29.000000f }, 1.000000f, -0.000000f ); 
+      // States -> enable (id: 18) enable_a (id: 19) disable (id: 20) disable_a (id: 21) loop (id: 23) 
+    instance.registerEObj( "sgbg_z3r3_a2_shld3_2", 2007457, 7845649, 4, { 592.929016f, -31.000000f, -31.928900f }, 1.000000f, -0.000000f ); 
+      // States -> enable (id: 18) enable_a (id: 19) disable (id: 20) disable_a (id: 21) loop (id: 23) 
+    instance.registerEObj( "sgbg_z3r3_a2_shld3_3", 2007457, 7845650, 4, { 607.070984f, -31.000000f, -31.928900f }, 1.000000f, -0.000000f ); 
+      // States -> enable (id: 18) enable_a (id: 19) disable (id: 20) disable_a (id: 21) loop (id: 23) 
+    instance.registerEObj( "sgbg_z3r3_a2_shld3_4", 2007457, 7845651, 4, { 594.642517f, -31.000000f, -26.065701f }, 1.000000f, -0.000000f ); 
+      // States -> enable (id: 18) enable_a (id: 19) disable (id: 20) disable_a (id: 21) loop (id: 23) 
+    instance.registerEObj( "sgbg_z3r3_a2_shld3_5", 2007457, 7845652, 4, { 605.357483f, -31.000000f, -26.065701f }, 1.000000f, -0.000000f ); 
+      // States -> enable (id: 18) enable_a (id: 19) disable (id: 20) disable_a (id: 21) loop (id: 23) 
+    instance.registerEObj( "sgbg_z3r3_a2_shld3_6", 2007457, 7845653, 4, { 587.065674f, -31.000000f, -33.642399f }, 1.000000f, -0.000000f ); 
+      // States -> enable (id: 18) enable_a (id: 19) disable (id: 20) disable_a (id: 21) loop (id: 23) 
+    instance.registerEObj( "sgbg_z3r3_a2_shld3_7", 2007457, 7845654, 4, { 612.934326f, -31.000000f, -33.642399f }, 1.000000f, -0.000000f ); 
+      // States -> enable (id: 18) enable_a (id: 19) disable (id: 20) disable_a (id: 21) loop (id: 23) 
+    instance.registerEObj( "unknown_3", 2007791, 0, 4, { -600.000000f, -600.000000f, -545.500000f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "sgvf_w_lvd_b0250_1", 2007457, 7740888, 4, { -606.228577f, -600.000000f, -543.124695f }, 1.000000f, 0.000000f ); 
+      // States -> vf_bextwall_on (id: 3) vf_bextwall_of (id: 4) 
+    instance.registerEObj( "unknown_4", 2007457, 7741247, 4, { -611.437622f, -602.000000f, -586.861023f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_5", 2009684, 0, 4, { -613.782715f, -602.000000f, -582.841614f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_6", 2009685, 0, 4, { -611.078125f, -602.014221f, -583.093018f }, 0.991760f, 0.000048f ); 
+    instance.registerEObj( "unknown_7", 2009681, 0, 4, { 600.000000f, -600.000000f, -630.000000f }, 1.000000f, -0.000000f ); 
+    instance.registerEObj( "unknown_8", 2009682, 0, 4, { 600.000000f, -600.000000f, -600.000000f }, 1.000000f, -0.000000f ); 
+    instance.registerEObj( "unknown_9", 2009683, 0, 4, { 605.004822f, -600.000000f, -594.049011f }, 0.991760f, 0.000048f ); 
+    instance.registerEObj( "unknown_10", 2007457, 7718602, 4, { 600.000000f, -600.000000f, -600.000000f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_11", 2007457, 7718606, 4, { 600.000000f, -600.000000f, -600.000000f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_12", 2007457, 7718605, 4, { 600.000000f, -600.000000f, -605.000000f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_13", 2007457, 7739045, 4, { 600.000000f, -600.000000f, -620.000000f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_14", 2009697, 0, 4, { 599.816895f, -600.000000f, -610.040405f }, 0.991760f, 0.000048f ); 
+    instance.registerEObj( "unknown_15", 2009698, 0, 4, { 593.438599f, -600.000000f, -600.488281f }, 0.991760f, 0.000048f ); 
+    instance.registerEObj( "unknown_16", 2009699, 0, 4, { 605.523682f, -600.000000f, -596.581970f }, 1.000000f, -0.000000f ); 
+    instance.registerEObj( "unknown_17", 2009700, 0, 4, { 600.000000f, -600.000000f, -600.000000f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_18", 2002735, 0, 4, { -600.000000f, -624.000000f, -779.170715f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "sgvf_w_lvd_b0118_2", 2002872, 7826278, 4, { -600.000000f, -624.000000f, -779.051880f }, 1.000000f, 0.000000f ); 
+      // States -> vf_bextwall_on (id: 3) vf_bextwall_of (id: 4) 
+    instance.registerEObj( "sgvf_z3r1_b1258", 2009735, 7790960, 4, { 600.000000f, 0.000000f, 388.000000f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "sgvf_z3r1_b1258_1", 2009736, 7790961, 4, { 600.000000f, 0.000000f, 258.000000f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "sgvf_z3r1_b1258_2", 2009737, 7790972, 4, { -599.687073f, -599.483093f, -542.000000f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "sgvf_z3r1_b1258_3", 2009738, 7790976, 4, { -600.000000f, -602.000000f, -623.000000f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_19", 2002735, 0, 4, { 504.093506f, -27.491249f, 699.526611f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "sgvf_w_lvd_b0118_3", 2007457, 7791941, 4, { 503.957397f, -27.061510f, 699.645325f }, 1.000000f, 0.000000f ); 
+      // States -> vf_bextwall_on (id: 3) vf_bextwall_of (id: 4) 
+    instance.registerEObj( "sgvf_w_lvd_b0118_4", 2007457, 7792069, 4, { 503.000000f, -25.234091f, 659.863281f }, 1.000000f, 0.000000f ); 
+      // States -> vf_bextwall_on (id: 3) vf_bextwall_of (id: 4) 
+    instance.registerEObj( "unknown_20", 2002735, 0, 4, { -645.511597f, -587.562500f, -431.000000f }, 1.000000f, -1.570796f ); 
+    instance.registerEObj( "sgvf_w_lvd_b0118_5", 2007457, 7792412, 4, { -646.396729f, -587.562500f, -431.310394f }, 1.000000f, 0.000000f ); 
+      // States -> vf_bextwall_on (id: 3) vf_bextwall_of (id: 4) 
+    instance.registerEObj( "sgvf_w_lvd_b0118_6", 2007457, 7792413, 4, { -606.465515f, -587.562500f, -431.000000f }, 1.000000f, 0.000000f ); 
+      // States -> vf_bextwall_on (id: 3) vf_bextwall_of (id: 4) 
+    instance.registerEObj( "Teleportationcrystal", 2009717, 7790245, 4, { 494.000000f, -36.900440f, 764.000000f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "Teleportationcrystal_1", 2009718, 7790248, 4, { 595.000000f, -2.896687f, 404.905212f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "Teleportationcrystal_2", 2009719, 7790262, 4, { 597.404175f, -31.000000f, -16.571730f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "Teleportationcrystal_3", 2009720, 7790602, 4, { -650.538818f, -588.000000f, -436.780487f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "Teleportationcrystal_4", 2009721, 7790603, 4, { -604.447327f, -599.975830f, -519.493408f }, 0.991760f, 0.000048f ); 
+    instance.registerEObj( "Teleportationcrystal_5", 2009722, 7790604, 4, { -604.814819f, -624.000000f, -771.833679f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "sgvf_w_lvd_b0286", 2007457, 7724970, 4, { 500.022797f, -38.986820f, 782.467285f }, 0.991760f, 0.000048f ); 
+      // States -> vf_lock_on (id: 11) vf_lock_of (id: 12) 
+    instance.registerEObj( "Exit", 2000139, 0, 4, { 600.027710f, -600.000000f, -620.645081f }, 1.000000f, 0.000000f ); 
+
+  }
+
+  void onUpdate( InstanceContent& instance, uint32_t currTime ) override
+  {
+
+  }
+
+  void onEnterTerritory( InstanceContent& instance, Entity::Player& player, uint32_t eventId, uint16_t param1,
+                         uint16_t param2 ) override
+  {
+
+  }
+
+};
+
+EXPOSE_SCRIPT( TheOrbonneMonastery );
\ No newline at end of file
diff --git a/src/scripts/instances/raids/TheRidoranaLighthouse.cpp b/src/scripts/instances/raids/TheRidoranaLighthouse.cpp
new file mode 100644
index 00000000..44042ca6
--- /dev/null
+++ b/src/scripts/instances/raids/TheRidoranaLighthouse.cpp
@@ -0,0 +1,109 @@
+#include <ScriptObject.h>
+#include <Territory/InstanceContent.h>
+
+using namespace Sapphire;
+
+class TheRidoranaLighthouse :
+  public Sapphire::ScriptAPI::InstanceContentScript
+{
+public:
+  TheRidoranaLighthouse() :
+    Sapphire::ScriptAPI::InstanceContentScript( 30068 )
+  { }
+
+  void onInit( InstanceContent& instance ) override
+  {
+    instance.registerEObj( "sgvf_w_lvd_b0118", 2007457, 7377897, 4, { -200.000305f, 5.000000f, 101.000000f }, 1.000000f, -0.000000f ); 
+      // States -> vf_bextwall_on (id: 3) vf_bextwall_of (id: 4) 
+    instance.registerEObj( "unknown_0", 2007791, 0, 4, { -200.000305f, 5.000000f, 101.000000f }, 0.880000f, -0.000000f ); 
+    instance.registerEObj( "sgvf_w_lvd_b0118_1", 2007457, 7377900, 4, { -200.000107f, 4.999996f, 30.600080f }, 1.000000f, -0.000000f ); 
+      // States -> vf_bextwall_on (id: 3) vf_bextwall_of (id: 4) 
+    instance.registerEObj( "unknown_1", 2009485, 0, 4, { -211.062103f, 5.000000f, 63.169151f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "sgvf_z3r2_b1409", 2007457, 7379112, 4, { -210.250793f, 5.000000f, 72.932854f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_2", 2002735, 0, 4, { -200.002106f, 584.000000f, -510.574188f }, 1.000000f, -0.000000f ); 
+    instance.registerEObj( "sgvf_w_lvd_b0118_2", 2007457, 7388431, 4, { -200.002106f, 584.000000f, -509.807709f }, 1.000000f, -0.000000f ); 
+      // States -> vf_bextwall_on (id: 3) vf_bextwall_of (id: 4) 
+    instance.registerEObj( "unknown_3", 2009508, 0, 4, { -200.000000f, 584.000000f, -541.000000f }, 1.000000f, -0.000000f ); 
+    instance.registerEObj( "unknown_4", 2009509, 0, 4, { -200.000000f, 584.000000f, -541.000000f }, 1.000000f, -0.000000f ); 
+    instance.registerEObj( "sgvf_w_lvd_b0118_3", 2007457, 7448801, 4, { -200.002106f, 584.000000f, -570.796204f }, 1.000000f, 0.000000f ); 
+      // States -> vf_bextwall_on (id: 3) vf_bextwall_of (id: 4) 
+    instance.registerEObj( "sgvf_w_lvd_b0118_4", 2007457, 7387054, 4, { 800.000000f, -968.000000f, -110.439796f }, 1.000000f, 0.000000f ); 
+      // States -> vf_bextwall_on (id: 3) vf_bextwall_of (id: 4) 
+    instance.registerEObj( "sgvf_w_lvd_b0118_5", 2007457, 7387076, 4, { 800.000000f, -968.000000f, -171.377106f }, 1.000000f, 0.000000f ); 
+      // States -> vf_bextwall_on (id: 3) vf_bextwall_of (id: 4) 
+    instance.registerEObj( "unknown_5", 2007457, 7387494, 4, { 777.444885f, -440.500000f, 812.995483f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_6", 2007457, 7387496, 4, { 800.000000f, -440.500000f, 774.175781f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_7", 2007457, 7387498, 4, { 822.724609f, -440.500000f, 812.995483f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_8", 2007457, 7370829, 4, { 800.000000f, -968.000000f, -141.000000f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_9", 2007457, 7401445, 4, { 800.000000f, -440.000000f, 800.000000f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "sgvf_z3r2_b1444", 2007457, 7409377, 4, { 800.000000f, -968.000000f, -141.000000f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_10", 2002735, 0, 4, { 800.000000f, -968.000000f, -109.954399f }, 1.200000f, -0.000000f ); 
+    instance.registerEObj( "sgvf_w_lvd_b0118_6", 2007457, 7380261, 4, { 799.984619f, -815.518372f, -369.771912f }, 0.991760f, 0.000048f ); 
+      // States -> vf_bextwall_on (id: 3) vf_bextwall_of (id: 4) 
+    instance.registerEObj( "unknown_11", 2002735, 0, 4, { 800.000000f, -815.500000f, -370.055695f }, 1.000000f, -0.000000f ); 
+    instance.registerEObj( "Entrance", 2000182, 7359055, 5, { -181.813400f, 14.312280f, 237.000000f }, 1.000000f, 0.000000f ); 
+      // States -> vf_lock_on (id: 11) vf_lock_of (id: 12) 
+    instance.registerEObj( "Exit", 2000139, 0, 4, { 800.146179f, -815.500000f, -417.868286f }, 0.991760f, 0.000048f ); 
+    instance.registerEObj( "sgbg_col_wall_02", 2007457, 7447710, 4, { -200.061096f, 12.985350f, -21.103331f }, 0.991760f, 0.000048f ); 
+      // States -> col_on (id: 24) col_off (id: 25) 
+    instance.registerEObj( "Ancientclockworkdevice", 2009544, 7334375, 4, { -269.105011f, 122.000000f, -438.046509f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_12", 2007457, 7404715, 4, { -268.778900f, 123.000000f, -449.397705f }, 0.991760f, 0.000048f ); 
+    instance.registerEObj( "unknown_13", 2007457, 7447787, 4, { -269.825287f, 278.980713f, -520.805725f }, 0.991760f, 0.000048f ); 
+    instance.registerEObj( "sgbg_col_wall_02_1", 2007457, 7447840, 4, { -226.977997f, 429.983887f, -438.986786f }, 0.991760f, 0.000048f ); 
+      // States -> col_on (id: 24) col_off (id: 25) 
+    instance.registerEObj( "unknown_14", 2007457, 7447789, 4, { -199.398300f, 432.999908f, -475.179199f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "Ancientclockworkdevice_1", 2009545, 7371810, 4, { -199.628098f, 584.000000f, -585.090027f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_15", 2007457, 7404716, 4, { -199.364105f, 584.999817f, -599.228027f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "Ancientclockworkdevice_2", 2009546, 7377745, 4, { 837.565613f, -984.000000f, 96.709007f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "Ancientclockworkdevice_3", 2009547, 7377746, 4, { 772.549072f, -979.951721f, -38.537811f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "sgbg_col_wall_02_2", 2007457, 7447954, 4, { 840.023987f, -984.000000f, 103.811798f }, 1.000000f, 0.000000f ); 
+      // States -> col_on (id: 24) col_off (id: 25) 
+    instance.registerEObj( "sgbg_col_wall_02_3", 2007457, 7447962, 4, { 770.034485f, -979.851624f, -46.041550f }, 1.000000f, 0.000000f ); 
+      // States -> col_on (id: 24) col_off (id: 25) 
+    instance.registerEObj( "unknown_16", 2007457, 7447790, 4, { 800.592407f, -967.000000f, -202.262695f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "sgbg_z3r1_a4_stn03", 2007457, 7450744, 4, { 798.167419f, -815.500000f, -404.830505f }, 0.991760f, 0.000048f ); 
+    instance.registerEObj( "Ancientengraving", 2009579, 0, 4, { -194.500000f, 15.000000f, -19.750000f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "Crudescrawling", 2009580, 0, 4, { 835.500000f, -986.500000f, 68.750000f }, 1.000000f, -0.000000f ); 
+    instance.registerEObj( "Crudescrawling_1", 2009581, 0, 4, { 764.500000f, -983.000000f, -16.250000f }, 1.000000f, -0.000000f ); 
+    instance.registerEObj( "Teleportationcrystal", 2009534, 7359613, 4, { -187.989700f, 14.788980f, 218.822296f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "Teleportationcrystal_1", 2009535, 7359705, 4, { -204.159302f, 112.000000f, -395.631805f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "Teleportationcrystal_2", 2009536, 7359716, 4, { -251.343994f, 428.000000f, -517.234192f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "Teleportationcrystal_3", 2009537, 7359767, 4, { -203.934204f, 582.000122f, -493.438599f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "Teleportationcrystal_4", 2009538, 7359772, 4, { 844.205322f, -988.006409f, 73.136467f }, 0.991760f, 0.000048f ); 
+    instance.registerEObj( "Teleportationcrystal_5", 2009539, 7359776, 4, { 767.945312f, -968.000000f, 90.974548f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "Teleportationcrystal_6", 2009540, 7359779, 4, { 795.302795f, -972.000000f, -95.739433f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "Teleportationcrystal_7", 2009541, 7359782, 4, { 792.833984f, -806.109985f, -299.344299f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_17", 2002735, 0, 4, { 769.949524f, -964.000000f, 77.562500f }, 0.700000f, 0.000000f ); 
+    instance.registerEObj( "sgvf_w_lvd_b0118_7", 2007457, 7407058, 4, { 769.975586f, -964.000000f, 76.127197f }, 0.991760f, 0.000048f ); 
+      // States -> vf_bextwall_on (id: 3) vf_bextwall_of (id: 4) 
+    instance.registerEObj( "sgbg_col_wall_02_4", 2007457, 7445782, 4, { 770.168579f, -964.019226f, 37.949100f }, 0.991760f, 0.000048f ); 
+      // States -> col_on (id: 24) col_off (id: 25) 
+    instance.registerEObj( "unknown_18", 2007457, 7409325, 4, { 761.133728f, -964.000000f, 38.468330f }, 0.991760f, 0.000048f ); 
+    instance.registerEObj( "unknown_19", 2007457, 7409326, 4, { 766.931396f, -964.000000f, 38.589489f }, 0.991760f, 0.000048f ); 
+    instance.registerEObj( "unknown_20", 2007457, 7409327, 4, { 772.973328f, -964.000000f, 38.480419f }, 0.991760f, 0.000048f ); 
+    instance.registerEObj( "unknown_21", 2007457, 7409328, 4, { 779.146301f, -964.000000f, 38.587101f }, 0.991760f, 0.000048f ); 
+    instance.registerEObj( "unknown_22", 2007457, 7407517, 4, { 751.235291f, -964.000000f, 66.028107f }, 0.991760f, 0.000048f ); 
+    instance.registerEObj( "unknown_23", 2007457, 7408156, 4, { 751.337280f, -964.000000f, 59.946270f }, 0.991760f, 0.000048f ); 
+    instance.registerEObj( "unknown_24", 2007457, 7409322, 4, { 751.462219f, -964.000000f, 53.939960f }, 0.991760f, 0.000048f ); 
+    instance.registerEObj( "unknown_25", 2007457, 7409323, 4, { 751.451477f, -964.000000f, 47.949421f }, 0.991760f, 0.000048f ); 
+    instance.registerEObj( "unknown_26", 2007457, 7409332, 4, { 788.401917f, -963.999878f, 65.974800f }, 0.991760f, 0.000048f ); 
+    instance.registerEObj( "unknown_27", 2007457, 7409331, 4, { 788.503784f, -963.999878f, 59.892960f }, 0.991760f, 0.000048f ); 
+    instance.registerEObj( "unknown_28", 2007457, 7409330, 4, { 788.601318f, -964.019226f, 53.879639f }, 0.991760f, 0.000048f ); 
+    instance.registerEObj( "unknown_29", 2007457, 7409329, 4, { 788.618225f, -964.000000f, 47.896111f }, 0.991760f, 0.000048f ); 
+
+  }
+
+  void onUpdate( InstanceContent& instance, uint32_t currTime ) override
+  {
+
+  }
+
+  void onEnterTerritory( InstanceContent& instance, Entity::Player& player, uint32_t eventId, uint16_t param1,
+                         uint16_t param2 ) override
+  {
+
+  }
+
+};
+
+EXPOSE_SCRIPT( TheRidoranaLighthouse );
\ No newline at end of file
diff --git a/src/scripts/instances/raids/TheRoyalCityofRabanastre.cpp b/src/scripts/instances/raids/TheRoyalCityofRabanastre.cpp
index e16b4cef..7b0d6a2a 100644
--- a/src/scripts/instances/raids/TheRoyalCityofRabanastre.cpp
+++ b/src/scripts/instances/raids/TheRoyalCityofRabanastre.cpp
@@ -9,20 +9,120 @@ class TheRoyalCityofRabanastre :
 public:
   TheRoyalCityofRabanastre() :
     Sapphire::ScriptAPI::InstanceContentScript( 30058 )
+  { }
+
+  void onInit( InstanceContent& instance ) override
   {
+    instance.registerEObj( "unknown_0", 2002735, 0, 4, { -319.173004f, 9.994568f, 320.515686f }, 0.991760f, 0.000048f ); 
+    instance.registerEObj( "sgvf_w_lvd_b0118", 2007457, 7069100, 4, { -319.896515f, 10.000000f, 325.206085f }, 1.000000f, 0.000000f ); 
+      // States -> vf_bextwall_on (id: 3) vf_bextwall_of (id: 4) 
+    instance.registerEObj( "sgvf_z3r1_b1269", 2007457, 7075766, 4, { -320.000000f, 1.230700f, 221.199997f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "sgvf_z3r1_b1269_1", 2007457, 7075769, 4, { -320.351501f, 1.230694f, 262.307892f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "sgvf_z3r1_b1269_2", 2007457, 7075770, 4, { -346.200012f, 1.229800f, 238.000000f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_1", 2009060, 0, 4, { -311.306702f, 1.230747f, 242.805496f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_2", 2009061, 0, 4, { -316.517914f, 1.205444f, 246.509399f }, 0.991760f, 0.000048f ); 
+    instance.registerEObj( "sgvf_w_lvd_b0118_1", 2007457, 7069107, 4, { -319.661407f, 10.000000f, -11.625690f }, 1.000000f, 0.000000f ); 
+      // States -> vf_bextwall_on (id: 3) vf_bextwall_of (id: 4) 
+    instance.registerEObj( "unknown_3", 2009055, 0, 4, { -336.110504f, 9.964111f, -51.682369f }, 1.000000f, -0.000000f ); 
+    instance.registerEObj( "unknown_4", 2009057, 0, 4, { -306.355408f, 9.964111f, -48.539001f }, 1.000000f, -0.000000f ); 
+    instance.registerEObj( "sgvf_w_lvd_b0118_2", 2007457, 7075611, 4, { -320.081390f, 10.000000f, -69.048653f }, 1.000000f, 0.000000f ); 
+      // States -> vf_bextwall_on (id: 3) vf_bextwall_of (id: 4) 
+    instance.registerEObj( "sgbg_z3r1_a2_lc01a", 2007457, 7075799, 4, { -320.000702f, 10.000000f, -56.500000f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "sgbg_z3r1_a2_lc01a_1", 2007457, 7075800, 4, { -310.799988f, 10.000000f, -41.000000f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "sgbg_z3r1_a2_lc01a_2", 2007457, 7075801, 4, { -329.200012f, 10.000000f, -41.000000f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_5", 2007457, 7076220, 4, { -315.688690f, 10.000000f, -47.888401f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "sgvf_w_btl_b0527", 2007457, 7075820, 4, { -316.520996f, 10.000000f, -31.534470f }, 1.000000f, 0.000000f ); 
+      // States -> hadokyu_off_a (id: 7) hadokyu_on_a (id: 8) hadokyu_on_b (id: 9) hadokyu_on_c (id: 10) 
+    instance.registerEObj( "unknown_6", 2007457, 7077538, 4, { -338.909393f, 10.000000f, -32.073681f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_7", 2007791, 0, 4, { -319.963013f, 10.052400f, -16.952101f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_8", 2009242, 0, 4, { -332.255402f, 10.108630f, -33.994350f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "sgvf_w_lvd_b0250", 2007457, 7080565, 4, { 106.000000f, -694.000000f, -128.399994f }, 1.000000f, 0.000000f ); 
+      // States -> vf_bextwall_on (id: 3) vf_bextwall_of (id: 4) 
+    instance.registerEObj( "unknown_9", 2007791, 0, 4, { 106.000000f, -694.000000f, -128.399994f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "sgvf_w_btl_b1275", 2007457, 7082088, 4, { 108.221199f, -694.000000f, -208.120697f }, 1.000000f, 0.000000f ); 
+      // States -> cd_off (id: 3) cd_omen (id: 4) cd_omen_anim (id: 5) cd_on (id: 6) cd_on_anim (id: 7) cd_off_anim (id: 8) 
+    instance.registerEObj( "sgvf_w_btl_b1275_1", 2007457, 7082089, 4, { 121.728897f, -694.000000f, -183.748199f }, 1.000000f, 0.000000f ); 
+      // States -> cd_off (id: 3) cd_omen (id: 4) cd_omen_anim (id: 5) cd_on (id: 6) cd_on_anim (id: 7) cd_off_anim (id: 8) 
+    instance.registerEObj( "sgvf_w_btl_b1275_2", 2007457, 7082090, 4, { 94.008781f, -694.000000f, -182.456207f }, 1.000000f, 0.000000f ); 
+      // States -> cd_off (id: 3) cd_omen (id: 4) cd_omen_anim (id: 5) cd_on (id: 6) cd_on_anim (id: 7) cd_off_anim (id: 8) 
+    instance.registerEObj( "Darkcircle", 2009076, 0, 4, { 83.147507f, -694.000000f, -193.267899f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "Darkcircle_1", 2009203, 0, 4, { 83.057159f, -694.000000f, -182.946304f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "Darkcircle_2", 2009204, 0, 4, { 89.546783f, -694.000000f, -172.278000f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "Darkcircle_3", 2009205, 0, 4, { 96.837830f, -694.000000f, -165.190094f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "Darkcircle_4", 2009206, 0, 4, { 105.990601f, -694.000000f, -164.696304f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "Darkcircle_5", 2009207, 0, 4, { 117.216599f, -694.000000f, -169.060196f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "Darkcircle_6", 2009208, 0, 4, { 125.204498f, -694.000000f, -175.811493f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "Darkcircle_7", 2009209, 0, 4, { 130.969604f, -694.000000f, -185.265594f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "Darkcircle_8", 2009210, 0, 4, { 130.999893f, -694.000000f, -195.328003f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "Darkcircle_9", 2009211, 0, 4, { 124.798302f, -694.000000f, -204.280807f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "Darkcircle_10", 2009212, 0, 4, { 114.994301f, -694.000000f, -210.576996f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "Darkcircle_11", 2009213, 0, 4, { 103.221703f, -694.000000f, -213.151794f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "sgvf_w_lvd_b0250_1", 2007457, 7079402, 4, { 104.478500f, -679.000000f, -322.819489f }, 0.991760f, 0.000048f ); 
+      // States -> vf_bextwall_on (id: 3) vf_bextwall_of (id: 4) 
+    instance.registerEObj( "unknown_10", 2007791, 0, 4, { 106.449997f, -679.000000f, -328.250000f }, 0.991760f, 0.000048f ); 
+    instance.registerEObj( "unknown_11", 2009068, 0, 4, { 97.794479f, -679.000000f, -387.672394f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_12", 2009069, 0, 4, { 101.213097f, -679.000000f, -388.533600f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_13", 2009070, 0, 4, { 104.362602f, -679.000000f, -388.768097f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "sgvf_z3r1_b1284", 2007457, 7081152, 4, { 101.446701f, -679.000000f, -398.626587f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "sgvf_z3r1_b1278", 2007457, 7081153, 4, { 114.988701f, -679.000000f, -399.119598f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "sgvf_z3r1_b1277", 2007457, 7081154, 4, { 105.230202f, -679.000000f, -389.831512f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "sgbg_z3r1_a4_stn03", 2007457, 7151392, 4, { 105.983803f, -679.025024f, -386.058899f }, 1.000000f, -0.000000f ); 
+    instance.registerEObj( "sgvf_z3r1_b1258", 2009221, 7094307, 4, { -323.781189f, 9.994568f, 322.467499f }, 0.991760f, 0.000048f ); 
+    instance.registerEObj( "sgvf_z3r1_b1258_1", 2009222, 7094363, 4, { -325.789886f, 1.230697f, 217.839005f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_14", 2007457, 7041438, 4, { -274.571594f, 2.310245f, 37.022179f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "Waterwaygatelever", 2009184, 7080218, 4, { 338.918091f, -262.287415f, 267.698608f }, 0.991760f, 0.000048f ); 
+    instance.registerEObj( "Waterwaygatelever_1", 2009186, 7080217, 4, { 337.924988f, -322.267212f, 299.494385f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "Waterwaygatelever_2", 2009188, 7080216, 4, { 338.580200f, -292.267212f, 331.283905f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_15", 2007457, 7080221, 4, { 323.797211f, -262.267395f, 275.364105f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_16", 2007457, 7080220, 4, { 324.137909f, -322.267303f, 308.012604f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_17", 2007457, 7080219, 4, { 325.866394f, -292.267212f, 339.968201f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_18", 2007457, 7080213, 4, { 205.647507f, -374.000092f, 339.617889f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_19", 2007457, 7080215, 4, { 164.959000f, -374.000092f, 324.108002f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "Passagecontrols", 2009200, 0, 4, { 189.533096f, -373.602295f, 305.302490f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "Passagecontrols_1", 2009201, 0, 4, { 162.416901f, -373.621887f, 283.383911f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "Passagecontrols_2", 2009202, 0, 4, { 167.371002f, -373.190186f, 332.672913f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "Scratchedlettering", 2009271, 0, 4, { 272.859009f, -490.182709f, 293.584595f }, 0.991760f, 0.000048f ); 
+    instance.registerEObj( "Scratchedlettering_1", 2009272, 0, 4, { 212.923599f, -491.264191f, 290.957306f }, 0.991760f, 0.000048f ); 
+    instance.registerEObj( "Scratchedlettering_2", 2009273, 0, 4, { 211.674301f, -491.485199f, 242.033600f }, 0.991760f, 0.000048f ); 
+    instance.registerEObj( "Skypiratesscrawlings", 2009435, 0, 4, { 222.766403f, -333.455414f, 360.799591f }, 0.991760f, 0.000048f ); 
+    instance.registerEObj( "sgvf_z3r1_b1258_2", 2009223, 7102857, 4, { 101.048698f, -694.000000f, -122.909698f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "sgvf_z3r1_b1258_3", 2009224, 7102858, 4, { 99.562241f, -694.000000f, -216.590393f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "sgvf_z3r1_b1258_4", 2009225, 7102860, 4, { 99.290398f, -679.011230f, -323.639587f }, 0.991760f, 0.000048f ); 
+    instance.registerEObj( "unknown_20", 2009190, 0, 4, { -298.663086f, -4.197479f, 44.907139f }, 0.991760f, 0.000048f ); 
+    instance.registerEObj( "unknown_21", 2009191, 0, 4, { -301.684296f, -4.350000f, 41.550209f }, 0.991760f, 0.000048f ); 
+    instance.registerEObj( "unknown_22", 2009192, 0, 4, { -304.369995f, -4.219625f, 44.113739f }, 0.991760f, 0.000048f ); 
+    instance.registerEObj( "unknown_23", 2009193, 0, 4, { -316.182190f, -4.226807f, 42.099609f }, 0.991760f, 0.000048f ); 
+    instance.registerEObj( "unknown_24", 2009194, 0, 4, { -319.364990f, -4.219666f, 44.197979f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_25", 2009195, 0, 4, { -322.700989f, -4.219666f, 42.268631f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_26", 2009196, 0, 4, { -331.298615f, -4.379395f, 42.587891f }, 0.991760f, 0.000048f ); 
+    instance.registerEObj( "unknown_27", 2009197, 0, 4, { -334.136810f, -4.379395f, 39.322510f }, 0.991760f, 0.000048f ); 
+    instance.registerEObj( "unknown_28", 2009198, 0, 4, { -337.097107f, -4.379391f, 41.112068f }, 0.991760f, 0.000048f ); 
+    instance.registerEObj( "unknown_29", 2009199, 0, 4, { -320.000000f, 19.928169f, -182.845596f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_30", 2002735, 0, 4, { -320.106812f, 19.946039f, -144.699493f }, 1.750000f, 0.000000f ); 
+    instance.registerEObj( "sgvf_w_lvd_b0118_3", 2007457, 7099082, 4, { -320.132294f, 19.899990f, -145.586395f }, 1.000000f, 0.000000f ); 
+      // States -> vf_bextwall_on (id: 3) vf_bextwall_of (id: 4) 
+    instance.registerEObj( "sgvf_w_lvd_b0118_4", 2007457, 7099092, 4, { -319.884003f, 19.900000f, -202.859207f }, 1.000000f, 0.000000f ); 
+      // States -> vf_bextwall_on (id: 3) vf_bextwall_of (id: 4) 
+    instance.registerEObj( "Teleportationcrystal", 2009176, 7102798, 4, { -326.309998f, 5.729747f, 406.047699f }, 0.991760f, 0.000048f ); 
+    instance.registerEObj( "Teleportationcrystal_1", 2009177, 7102799, 4, { -326.251099f, 9.753006f, 115.489799f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "Teleportationcrystal_2", 2009178, 7102800, 4, { -326.389801f, 10.000000f, -10.478860f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "Teleportationcrystal_3", 2009179, 7102801, 4, { -312.818115f, 19.899851f, -141.350296f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "Teleportationcrystal_4", 2009180, 7102802, 4, { 439.169189f, -229.561905f, 292.789886f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "Teleportationcrystal_5", 2009181, 7102803, 4, { 133.837006f, -374.000092f, 311.904785f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "Teleportationcrystal_6", 2009182, 7102804, 4, { 114.414299f, -694.000000f, -113.204399f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "Teleportationcrystal_7", 2009183, 7102805, 4, { 97.279610f, -679.000000f, -305.258087f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "Entrance", 2000182, 7069095, 5, { -328.378906f, 0.730057f, 439.144012f }, 0.991760f, 0.000048f ); 
+      // States -> vf_lock_on (id: 11) vf_lock_of (id: 12) 
+    instance.registerEObj( "Exit", 2000139, 0, 4, { 106.318901f, -679.000000f, -398.354614f }, 0.991760f, 0.000048f ); 
+
   }
 
-  void onInit( InstanceContentPtr instance ) override
+  void onUpdate( InstanceContent& instance, uint32_t currTime ) override
   {
 
   }
 
-  void onUpdate( InstanceContentPtr instance, uint32_t currTime ) override
-  {
-
-  }
-
-  void onEnterTerritory( InstanceContentPtr instance, Entity::Player& player, uint32_t eventId, uint16_t param1,
+  void onEnterTerritory( InstanceContent& instance, Entity::Player& player, uint32_t eventId, uint16_t param1,
                          uint16_t param2 ) override
   {
 
diff --git a/src/scripts/instances/raids/TheSecondCoilofBahamutSavageTurn1.cpp b/src/scripts/instances/raids/TheSecondCoilofBahamutSavageTurn1.cpp
index 95639e7c..4f564d42 100644
--- a/src/scripts/instances/raids/TheSecondCoilofBahamutSavageTurn1.cpp
+++ b/src/scripts/instances/raids/TheSecondCoilofBahamutSavageTurn1.cpp
@@ -9,48 +9,35 @@ class TheSecondCoilofBahamutSavageTurn1 :
 public:
   TheSecondCoilofBahamutSavageTurn1() :
     Sapphire::ScriptAPI::InstanceContentScript( 30012 )
-  {
-  }
+  { }
 
-  void onInit( InstanceContentPtr instance ) override
+  void onInit( InstanceContent& instance ) override
   {
-    instance->registerEObj( "unknown_0", 2003012, 0, 4, { -266.882690f, 10.421330f, 43.491699f }, 1.000000f,
-                            0.000000f );
-    instance->registerEObj( "unknown_1", 2003043, 0, 4, { -261.309113f, 10.383500f, 37.739429f }, 1.000000f,
-                            0.000000f );
-    instance->registerEObj( "unknown_2", 2003044, 0, 4, { -259.553802f, 10.421330f, 31.442730f }, 1.000000f,
-                            0.000000f );
-    instance->registerEObj( "unknown_3", 2003045, 0, 4, { -262.154510f, 10.421330f, 23.808010f }, 1.000000f,
-                            0.000000f );
-    instance->registerEObj( "Entrance", 2000182, 4614306, 5, { -120.168602f, 11.010820f, -99.074913f }, 1.000000f,
-                            0.000000f );
-    // States -> vf_lock_on vf_lock_of
-    instance->registerEObj( "Shortcut", 2000700, 0, 4, { -131.611206f, 9.156082f, -82.660057f }, 1.000000f, 0.000000f );
-    instance->registerEObj( "unknown_4", 2001269, 4544126, 4, { -137.669403f, 9.502172f, -11.353470f }, 1.000000f,
-                            0.000000f );
-    instance->registerEObj( "Destination", 2002372, 4579467, 4, { -171.978897f, -49.907219f, -10.220380f }, 1.000000f,
-                            0.000000f );
-    instance->registerEObj( "sgpl_f1b2_bosswall", 2002872, 4616656, 4, { -248.873596f, 10.236450f, 33.155060f },
-                            1.000000f, -0.000000f );
-    // States -> vf_bextwall_on vf_bextwall_of
-    instance->registerEObj( "unknown_5", 2002735, 0, 4, { -246.919006f, 9.938496f, 34.239399f }, 1.000000f,
-                            -1.570451f );
-    instance->registerEObj( "Allaganterminal", 2003416, 4664435, 4, { -314.106995f, 9.414734f, 43.198238f }, 0.991760f,
-                            0.000048f );
-    instance->registerEObj( "sgpl_w_lvd_b0118_col_char", 2003421, 4651262, 4, { -292.780701f, 10.351920f, 39.414989f },
-                            1.000000f, 0.000000f );
-    // States -> vf_bextwall_on vf_bextwall_of
-    instance->registerEObj( "unknown_6", 2003428, 4615269, 4, { -120.556702f, 8.820233f, -76.764412f }, 1.000000f,
-                            0.000000f );
+    instance.registerEObj( "unknown_0", 2003012, 0, 4, { -266.882690f, 10.421330f, 43.491699f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_1", 2003043, 0, 4, { -261.309113f, 10.383500f, 37.739429f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_2", 2003044, 0, 4, { -259.553802f, 10.421330f, 31.442730f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_3", 2003045, 0, 4, { -262.154510f, 10.421330f, 23.808010f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "Entrance", 2000182, 4614306, 5, { -120.168602f, 11.010820f, -99.074913f }, 1.000000f, 0.000000f ); 
+      // States -> vf_lock_on (id: 11) vf_lock_of (id: 12) 
+    instance.registerEObj( "Shortcut", 2000700, 0, 4, { -131.611206f, 9.156082f, -82.660057f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_4", 2001269, 4544126, 4, { -137.669403f, 9.502172f, -11.353470f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "Destination", 2002372, 4579467, 4, { -171.978897f, -49.907219f, -10.220380f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "sgpl_f1b2_bosswall", 2002872, 4616656, 4, { -248.873596f, 10.236450f, 33.155060f }, 1.000000f, -0.000000f ); 
+      // States -> vf_bextwall_on (id: 3) vf_bextwall_of (id: 4) 
+    instance.registerEObj( "unknown_5", 2002735, 0, 4, { -246.919006f, 9.938496f, 34.239399f }, 1.000000f, -1.570451f ); 
+    instance.registerEObj( "Allaganterminal", 2003416, 4664435, 4, { -314.106995f, 9.414734f, 43.198238f }, 0.991760f, 0.000048f ); 
+    instance.registerEObj( "sgpl_w_lvd_b0118_col_char", 2003421, 4651262, 4, { -292.780701f, 10.351920f, 39.414989f }, 1.000000f, 0.000000f ); 
+      // States -> vf_bextwall_on (id: 3) vf_bextwall_of (id: 4) 
+    instance.registerEObj( "unknown_6", 2003428, 4615269, 4, { -120.556702f, 8.820233f, -76.764412f }, 1.000000f, 0.000000f ); 
 
   }
 
-  void onUpdate( InstanceContentPtr instance, uint32_t currTime ) override
+  void onUpdate( InstanceContent& instance, uint32_t currTime ) override
   {
 
   }
 
-  void onEnterTerritory( InstanceContentPtr instance, Entity::Player& player, uint32_t eventId, uint16_t param1,
+  void onEnterTerritory( InstanceContent& instance, Entity::Player& player, uint32_t eventId, uint16_t param1,
                          uint16_t param2 ) override
   {
 
diff --git a/src/scripts/instances/raids/TheSecondCoilofBahamutSavageTurn2.cpp b/src/scripts/instances/raids/TheSecondCoilofBahamutSavageTurn2.cpp
index 4ce0735a..8b8b793c 100644
--- a/src/scripts/instances/raids/TheSecondCoilofBahamutSavageTurn2.cpp
+++ b/src/scripts/instances/raids/TheSecondCoilofBahamutSavageTurn2.cpp
@@ -9,49 +9,35 @@ class TheSecondCoilofBahamutSavageTurn2 :
 public:
   TheSecondCoilofBahamutSavageTurn2() :
     Sapphire::ScriptAPI::InstanceContentScript( 30013 )
-  {
-  }
+  { }
 
-  void onInit( InstanceContentPtr instance ) override
+  void onInit( InstanceContent& instance ) override
   {
-    instance->registerEObj( "unknown_0", 2003299, 4646804, 4, { -449.999908f, 800.027222f, 69.995399f }, 0.991760f,
-                            0.000048f );
-    instance->registerEObj( "unknown_1", 2003311, 4646803, 4, { -449.999908f, 800.027222f, 69.995354f }, 0.991760f,
-                            0.000048f );
-    instance->registerEObj( "Ripenedbulb", 2003293, 4646806, 4, { -449.999908f, 800.027222f, 69.995399f }, 0.991760f,
-                            0.000048f );
-    instance->registerEObj( "Entrance", 2000182, 4646962, 5, { -358.417694f, -270.655487f, -0.875555f }, 0.991760f,
-                            0.000048f );
-    // States -> vf_lock_on vf_lock_of
-    instance->registerEObj( "Shortcut", 2000700, 0, 4, { -384.512085f, -270.435699f, -2.731445f }, 0.991760f,
-                            0.000048f );
-    instance->registerEObj( "unknown_2", 2002469, 4646048, 4, { -447.239197f, 799.923584f, 70.054077f }, 0.991760f,
-                            0.000048f );
-    instance->registerEObj( "sgpl_w_lvd_colwithnavi", 2002470, 4646986, 4, { -448.371613f, 800.000000f, 20.807449f },
-                            1.000000f, 0.000000f );
-    instance->registerEObj( "unknown_3", 2002471, 4646049, 4, { -372.196899f, -270.740997f, -1.014158f }, 0.991760f,
-                            0.000048f );
-    instance->registerEObj( "Innerbulkhead", 2003415, 0, 4, { -375.434814f, -268.802399f, -0.859896f }, 1.000000f,
-                            0.000000f );
-    instance->registerEObj( "Allaganterminal", 2003417, 4682781, 4, { -450.001099f, 799.969971f, 143.447495f },
-                            1.000000f, 0.000000f );
-    instance->registerEObj( "unknown_4", 2002735, 0, 4, { -449.981689f, 800.000000f, 47.625530f }, 0.991760f,
-                            0.000048f );
-    instance->registerEObj( "sgpl_f1b2_bosswall", 2002872, 4646969, 4, { -449.981689f, 801.188416f, 47.036610f },
-                            0.991760f, 0.000048f );
-    // States -> vf_bextwall_on vf_bextwall_of
-    instance->registerEObj( "sgpl_w_lvd_b0118_col_char", 2002472, 4646987, 4, { -449.121704f, 800.000000f, 91.049332f },
-                            1.000000f, 0.000000f );
-    // States -> vf_bextwall_on vf_bextwall_of
+    instance.registerEObj( "unknown_0", 2003299, 4646804, 4, { -449.999908f, 800.027222f, 69.995399f }, 0.991760f, 0.000048f ); 
+    instance.registerEObj( "unknown_1", 2003311, 4646803, 4, { -449.999908f, 800.027222f, 69.995354f }, 0.991760f, 0.000048f ); 
+    instance.registerEObj( "Ripenedbulb", 2003293, 4646806, 4, { -449.999908f, 800.027222f, 69.995399f }, 0.991760f, 0.000048f ); 
+    instance.registerEObj( "Entrance", 2000182, 4646962, 5, { -358.417694f, -270.655487f, -0.875555f }, 0.991760f, 0.000048f ); 
+      // States -> vf_lock_on (id: 11) vf_lock_of (id: 12) 
+    instance.registerEObj( "Shortcut", 2000700, 0, 4, { -384.512085f, -270.435699f, -2.731445f }, 0.991760f, 0.000048f ); 
+    instance.registerEObj( "unknown_2", 2002469, 4646048, 4, { -447.239197f, 799.923584f, 70.054077f }, 0.991760f, 0.000048f ); 
+    instance.registerEObj( "sgpl_w_lvd_colwithnavi", 2002470, 4646986, 4, { -448.371613f, 800.000000f, 20.807449f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_3", 2002471, 4646049, 4, { -372.196899f, -270.740997f, -1.014158f }, 0.991760f, 0.000048f ); 
+    instance.registerEObj( "Innerbulkhead", 2003415, 0, 4, { -375.434814f, -268.802399f, -0.859896f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "Allaganterminal", 2003417, 4682781, 4, { -450.001099f, 799.969971f, 143.447495f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_4", 2002735, 0, 4, { -449.981689f, 800.000000f, 47.625530f }, 0.991760f, 0.000048f ); 
+    instance.registerEObj( "sgpl_f1b2_bosswall", 2002872, 4646969, 4, { -449.981689f, 801.188416f, 47.036610f }, 0.991760f, 0.000048f ); 
+      // States -> vf_bextwall_on (id: 3) vf_bextwall_of (id: 4) 
+    instance.registerEObj( "sgpl_w_lvd_b0118_col_char", 2002472, 4646987, 4, { -449.121704f, 800.000000f, 91.049332f }, 1.000000f, 0.000000f ); 
+      // States -> vf_bextwall_on (id: 3) vf_bextwall_of (id: 4) 
 
   }
 
-  void onUpdate( InstanceContentPtr instance, uint32_t currTime ) override
+  void onUpdate( InstanceContent& instance, uint32_t currTime ) override
   {
 
   }
 
-  void onEnterTerritory( InstanceContentPtr instance, Entity::Player& player, uint32_t eventId, uint16_t param1,
+  void onEnterTerritory( InstanceContent& instance, Entity::Player& player, uint32_t eventId, uint16_t param1,
                          uint16_t param2 ) override
   {
 
diff --git a/src/scripts/instances/raids/TheSecondCoilofBahamutSavageTurn3.cpp b/src/scripts/instances/raids/TheSecondCoilofBahamutSavageTurn3.cpp
index 99c1f518..3b9619dc 100644
--- a/src/scripts/instances/raids/TheSecondCoilofBahamutSavageTurn3.cpp
+++ b/src/scripts/instances/raids/TheSecondCoilofBahamutSavageTurn3.cpp
@@ -9,147 +9,98 @@ class TheSecondCoilofBahamutSavageTurn3 :
 public:
   TheSecondCoilofBahamutSavageTurn3() :
     Sapphire::ScriptAPI::InstanceContentScript( 30014 )
-  {
-  }
+  { }
 
-  void onInit( InstanceContentPtr instance ) override
+  void onInit( InstanceContent& instance ) override
   {
-    instance->registerEObj( "Fragrantbloom", 2003342, 0, 4, { 5.540659f, -506.930115f, 105.670197f }, 1.000000f,
-                            0.000000f );
-    instance->registerEObj( "Destination", 2003387, 0, 4, { 5.248638f, -506.929993f, 104.130501f }, 1.000000f,
-                            0.000000f );
-    instance->registerEObj( "Sylphpodling", 2003348, 0, 4, { 4.584954f, -506.929993f, 106.997597f }, 1.000000f,
-                            0.000000f );
-    instance->registerEObj( "Skybulb", 2003358, 0, 4, { 3.469964f, -506.929993f, 104.900299f }, 1.000000f, 0.000000f );
-    instance->registerEObj( "Destination_1", 2003289, 4681305, 4, { -28.488001f, -506.700012f, 105.307297f }, 1.000000f,
-                            -1.570796f );
-    // States -> tower_off tower_on2off tower_up tower_off2up tower_on tower_up2on tower_step1 tower_step0_1 tower_step2 tower_step1_2 tower_step3 tower_step2_3 tower_step4 tower_step3_4 tower_step5 tower_step4_5
-    instance->registerEObj( "Destination_2", 2003289, 4681302, 4, { -2.644600f, -506.700012f, 79.710602f }, 1.000000f,
-                            0.000000f );
-    // States -> tower_off tower_on2off tower_up tower_off2up tower_on tower_up2on tower_step1 tower_step0_1 tower_step2 tower_step1_2 tower_step3 tower_step2_3 tower_step4 tower_step3_4 tower_step5 tower_step4_5
-    instance->registerEObj( "Destination_3", 2003289, 4681303, 4, { 23.007401f, -506.700012f, 105.309097f }, 1.000000f,
-                            1.570796f );
-    // States -> tower_off tower_on2off tower_up tower_off2up tower_on tower_up2on tower_step1 tower_step0_1 tower_step2 tower_step1_2 tower_step3 tower_step2_3 tower_step4 tower_step3_4 tower_step5 tower_step4_5
-    instance->registerEObj( "Destination_4", 2003289, 4681304, 4, { -2.685100f, -506.700012f, 131.011307f }, 1.000000f,
-                            -3.141593f );
-    // States -> tower_off tower_on2off tower_up tower_off2up tower_on tower_up2on tower_step1 tower_step0_1 tower_step2 tower_step1_2 tower_step3 tower_step2_3 tower_step4 tower_step3_4 tower_step5 tower_step4_5
-    instance->registerEObj( "Entrance", 2000182, 4649322, 5, { 71.763351f, -505.710297f, -183.265305f }, 1.000000f,
-                            0.000000f );
-    // States -> vf_lock_on vf_lock_of
-    instance->registerEObj( "Shortcut", 2000700, 0, 4, { 78.751831f, -508.192688f, -166.063995f }, 0.991760f,
-                            0.000048f );
-    instance->registerEObj( "sgvf_f1b3_b0384", 2003117, 4649426, 4, { 71.787033f, -523.938416f, -91.769341f },
-                            1.000000f, 0.000000f );
-    // States -> vf_lese_on
-    instance->registerEObj( "sgvf_f1b3_b0384_1", 2003149, 4649428, 4, { 71.647507f, -539.766907f, -10.543050f },
-                            1.000000f, 0.000000f );
-    // States -> vf_lese_on
-    instance->registerEObj( "sgvf_f1b3_b0384_2", 2003178, 4649429, 4, { -72.118347f, -523.848206f, -91.955490f },
-                            1.000000f, 0.000000f );
-    // States -> vf_lese_on
-    instance->registerEObj( "sgvf_f1b3_b0384_3", 2003179, 4649430, 4, { -71.857773f, -539.706909f, -11.043210f },
-                            1.000000f, 0.000000f );
-    // States -> vf_lese_on
-    instance->registerEObj( "sgvf_f1b3_b0384_4", 2003180, 4649427, 4, { 32.211380f, -491.286011f, -105.322304f },
-                            1.000000f, 0.000000f );
-    // States -> vf_lese_on
-    instance->registerEObj( "sgvf_f1b3_b0384_5", 2003187, 4649436, 4, { 31.604389f, -498.100800f, -68.374847f },
-                            1.000000f, 0.000000f );
-    // States -> vf_lese_on
-    instance->registerEObj( "sgvf_f1b3_b0384_6", 2003188, 4649435, 4, { 31.776440f, -506.867188f, -22.942039f },
-                            1.000000f, 0.000000f );
-    // States -> vf_lese_on
-    instance->registerEObj( "sgvf_f1b3_b0384_7", 2003196, 4649437, 4, { 31.800430f, -514.005920f, 12.637740f },
-                            1.000000f, 0.000000f );
-    // States -> vf_lese_on
-    instance->registerEObj( "sgvf_f1b3_b0384_8", 2003198, 4649442, 4, { -32.055038f, -491.285187f, -104.874397f },
-                            1.000000f, 0.000000f );
-    // States -> vf_lese_on
-    instance->registerEObj( "sgvf_f1b3_b0384_9", 2003200, 4649444, 4, { -31.019110f, -497.691315f, -68.166161f },
-                            1.000000f, 0.000000f );
-    // States -> vf_lese_on
-    instance->registerEObj( "sgvf_f1b3_b0384_10", 2003201, 4649443, 4, { -32.114700f, -507.132690f, -23.686880f },
-                            1.000000f, 0.000000f );
-    // States -> vf_lese_on
-    instance->registerEObj( "sgvf_f1b3_b0384_11", 2003202, 4649445, 4, { -32.647800f, -514.520386f, 12.987520f },
-                            1.000000f, 0.000000f );
-    // States -> vf_lese_on
-    instance->registerEObj( "sgvf_f1b3_b0384_12", 2003203, 4649441, 4, { 39.004780f, -451.620209f, -100.687401f },
-                            1.000000f, 0.000000f );
-    // States -> vf_lese_on
-    instance->registerEObj( "sgvf_f1b3_b0384_13", 2003204, 4649439, 4, { 36.536411f, -459.008911f, -57.215809f },
-                            1.000000f, 0.000000f );
-    // States -> vf_lese_on
-    instance->registerEObj( "sgvf_f1b3_b0384_14", 2003211, 4649440, 4, { 36.232590f, -468.665405f, -16.744450f },
-                            1.000000f, 0.000000f );
-    // States -> vf_lese_on
-    instance->registerEObj( "sgvf_f1b3_b0384_15", 2003212, 4649438, 4, { 39.456009f, -475.805695f, 24.956329f },
-                            1.000000f, 0.000000f );
-    // States -> vf_lese_on
-    instance->registerEObj( "sgvf_f1b3_b0384_16", 2003220, 4649449, 4, { -38.816181f, -450.369904f, -100.764801f },
-                            1.000000f, 0.000000f );
-    // States -> vf_lese_on
-    instance->registerEObj( "sgvf_f1b3_b0384_17", 2003272, 4649447, 4, { -39.033329f, -459.976013f, -57.518230f },
-                            1.000000f, 0.000000f );
-    // States -> vf_lese_on
-    instance->registerEObj( "sgvf_f1b3_b0384_18", 2003273, 4649448, 4, { -38.558640f, -467.593109f, -20.011221f },
-                            1.000000f, 0.000000f );
-    // States -> vf_lese_on
-    instance->registerEObj( "sgvf_f1b3_b0384_19", 2003274, 4649446, 4, { -39.651970f, -475.626709f, 24.849569f },
-                            1.000000f, 0.000000f );
-    // States -> vf_lese_on
-    instance->registerEObj( "sgvf_f1b3_b0384_20", 2003275, 4649434, 4, { 72.266907f, -442.713989f, -75.343910f },
-                            1.000000f, 0.000000f );
-    // States -> vf_lese_on
-    instance->registerEObj( "sgvf_f1b3_b0384_21", 2003286, 4649431, 4, { 71.894348f, -458.468506f, 5.267881f },
-                            1.000000f, 0.000000f );
-    // States -> vf_lese_on
-    instance->registerEObj( "sgvf_f1b3_b0384_22", 2003287, 4649432, 4, { -71.852654f, -442.697113f, -75.916992f },
-                            1.000000f, 0.000000f );
-    // States -> vf_lese_on
-    instance->registerEObj( "sgvf_f1b3_b0384_23", 2003288, 4649433, 4, { -71.777451f, -458.403107f, 4.927437f },
-                            1.000000f, 0.000000f );
-    // States -> vf_lese_on
-    instance->registerEObj( "unknown_0", 2002473, 4649110, 4, { 71.824219f, -515.343018f, -132.707794f }, 0.991760f,
-                            0.000048f );
-    instance->registerEObj( "unknown_1", 2002474, 4649108, 4, { 71.847183f, -531.168091f, -51.265450f }, 1.000000f,
-                            0.000000f );
-    instance->registerEObj( "unknown_2", 2002579, 4649109, 4, { 71.850891f, -546.907227f, 29.809669f }, 0.991760f,
-                            0.000048f );
-    instance->registerEObj( "Boxofcrystals", 2002592, 4649105, 4, { -71.854797f, -515.314209f, -132.724899f },
-                            0.991760f, 0.000048f );
-    instance->registerEObj( "Boxofcrystals_1", 2002593, 4649103, 4, { -71.848587f, -531.122681f, -51.389240f },
-                            1.000000f, 0.000000f );
-    instance->registerEObj( "Boxofcrystals_2", 2002594, 4649104, 4, { -71.852577f, -547.315125f, 29.686489f },
-                            0.991760f, 0.000048f );
-    instance->registerEObj( "unknown_3", 2002885, 4649106, 4, { -0.000875f, -482.805389f, -84.219566f }, 0.991760f,
-                            0.000048f );
-    instance->registerEObj( "unknown_4", 2002886, 4649107, 4, { -0.003072f, -498.601105f, -3.013031f }, 1.000000f,
-                            0.000000f );
-    instance->registerEObj( "unknown_5", 2003453, 4672990, 4, { 0.015892f, -506.314087f, 46.485531f }, 1.000000f,
-                            0.000000f );
-    instance->registerEObj( "sgpl_f1b3_bosswall", 2002872, 4649551, 4, { -2.840854f, -506.553986f, 68.877274f },
-                            0.991760f, 0.000048f );
-    // States -> vf_bextwall_on vf_bextwall_of
-    instance->registerEObj( "unknown_6", 2002735, 0, 4, { -2.788200f, -507.313385f, 68.893646f }, 1.000000f,
-                            0.000000f );
-    instance->registerEObj( "Allaganterminal", 2003418, 4672991, 4, { -2.071490f, -506.798004f, 144.172394f },
-                            1.000000f, 0.000000f );
-    instance->registerEObj( "Frontalbulkhead", 2003420, 4649112, 4, { -0.091233f, -505.180695f, 26.463760f }, 1.000000f,
-                            0.000000f );
-    instance->registerEObj( "sgpl_f1b3_boss_col", 2003422, 4651265, 4, { -2.657619f, -506.929993f, 124.653297f },
-                            1.000000f, 0.000000f );
-    instance->registerEObj( "sgpl_w_lvd_board_col_only", 2003677, 4681484, 4, { -2.678503f, -506.980103f, 84.769417f },
-                            1.000000f, 0.000000f );
+    instance.registerEObj( "Fragrantbloom", 2003342, 0, 4, { 5.540659f, -506.930115f, 105.670197f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "Destination", 2003387, 0, 4, { 5.248638f, -506.929993f, 104.130501f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "Sylphpodling", 2003348, 0, 4, { 4.584954f, -506.929993f, 106.997597f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "Skybulb", 2003358, 0, 4, { 3.469964f, -506.929993f, 104.900299f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "Destination_1", 2003289, 4681305, 4, { -28.488001f, -506.700012f, 105.307297f }, 1.000000f, -1.570796f ); 
+      // States -> tower_off (id: 16) tower_on2off (id: 17) tower_up (id: 18) tower_off2up (id: 19) tower_on (id: 20) tower_up2on (id: 21) tower_step1 (id: 22) tower_step0_1 (id: 23) tower_step2 (id: 24) tower_step1_2 (id: 25) tower_step3 (id: 26) tower_step2_3 (id: 27) tower_step4 (id: 28) tower_step3_4 (id: 29) tower_step5 (id: 30) tower_step4_5 (id: 31) 
+    instance.registerEObj( "Destination_2", 2003289, 4681302, 4, { -2.644600f, -506.700012f, 79.710602f }, 1.000000f, 0.000000f ); 
+      // States -> tower_off (id: 16) tower_on2off (id: 17) tower_up (id: 18) tower_off2up (id: 19) tower_on (id: 20) tower_up2on (id: 21) tower_step1 (id: 22) tower_step0_1 (id: 23) tower_step2 (id: 24) tower_step1_2 (id: 25) tower_step3 (id: 26) tower_step2_3 (id: 27) tower_step4 (id: 28) tower_step3_4 (id: 29) tower_step5 (id: 30) tower_step4_5 (id: 31) 
+    instance.registerEObj( "Destination_3", 2003289, 4681303, 4, { 23.007401f, -506.700012f, 105.309097f }, 1.000000f, 1.570796f ); 
+      // States -> tower_off (id: 16) tower_on2off (id: 17) tower_up (id: 18) tower_off2up (id: 19) tower_on (id: 20) tower_up2on (id: 21) tower_step1 (id: 22) tower_step0_1 (id: 23) tower_step2 (id: 24) tower_step1_2 (id: 25) tower_step3 (id: 26) tower_step2_3 (id: 27) tower_step4 (id: 28) tower_step3_4 (id: 29) tower_step5 (id: 30) tower_step4_5 (id: 31) 
+    instance.registerEObj( "Destination_4", 2003289, 4681304, 4, { -2.685100f, -506.700012f, 131.011307f }, 1.000000f, -3.141593f ); 
+      // States -> tower_off (id: 16) tower_on2off (id: 17) tower_up (id: 18) tower_off2up (id: 19) tower_on (id: 20) tower_up2on (id: 21) tower_step1 (id: 22) tower_step0_1 (id: 23) tower_step2 (id: 24) tower_step1_2 (id: 25) tower_step3 (id: 26) tower_step2_3 (id: 27) tower_step4 (id: 28) tower_step3_4 (id: 29) tower_step5 (id: 30) tower_step4_5 (id: 31) 
+    instance.registerEObj( "Entrance", 2000182, 4649322, 5, { 71.763351f, -505.710297f, -183.265305f }, 1.000000f, 0.000000f ); 
+      // States -> vf_lock_on (id: 11) vf_lock_of (id: 12) 
+    instance.registerEObj( "Shortcut", 2000700, 0, 4, { 78.751831f, -508.192688f, -166.063995f }, 0.991760f, 0.000048f ); 
+    instance.registerEObj( "sgvf_f1b3_b0384", 2003117, 4649426, 4, { 71.787033f, -523.938416f, -91.769341f }, 1.000000f, 0.000000f ); 
+      // States -> vf_lese_on (id: 2) 
+    instance.registerEObj( "sgvf_f1b3_b0384_1", 2003149, 4649428, 4, { 71.647507f, -539.766907f, -10.543050f }, 1.000000f, 0.000000f ); 
+      // States -> vf_lese_on (id: 2) 
+    instance.registerEObj( "sgvf_f1b3_b0384_2", 2003178, 4649429, 4, { -72.118347f, -523.848206f, -91.955490f }, 1.000000f, 0.000000f ); 
+      // States -> vf_lese_on (id: 2) 
+    instance.registerEObj( "sgvf_f1b3_b0384_3", 2003179, 4649430, 4, { -71.857773f, -539.706909f, -11.043210f }, 1.000000f, 0.000000f ); 
+      // States -> vf_lese_on (id: 2) 
+    instance.registerEObj( "sgvf_f1b3_b0384_4", 2003180, 4649427, 4, { 32.211380f, -491.286011f, -105.322304f }, 1.000000f, 0.000000f ); 
+      // States -> vf_lese_on (id: 2) 
+    instance.registerEObj( "sgvf_f1b3_b0384_5", 2003187, 4649436, 4, { 31.604389f, -498.100800f, -68.374847f }, 1.000000f, 0.000000f ); 
+      // States -> vf_lese_on (id: 2) 
+    instance.registerEObj( "sgvf_f1b3_b0384_6", 2003188, 4649435, 4, { 31.776440f, -506.867188f, -22.942039f }, 1.000000f, 0.000000f ); 
+      // States -> vf_lese_on (id: 2) 
+    instance.registerEObj( "sgvf_f1b3_b0384_7", 2003196, 4649437, 4, { 31.800430f, -514.005920f, 12.637740f }, 1.000000f, 0.000000f ); 
+      // States -> vf_lese_on (id: 2) 
+    instance.registerEObj( "sgvf_f1b3_b0384_8", 2003198, 4649442, 4, { -32.055038f, -491.285187f, -104.874397f }, 1.000000f, 0.000000f ); 
+      // States -> vf_lese_on (id: 2) 
+    instance.registerEObj( "sgvf_f1b3_b0384_9", 2003200, 4649444, 4, { -31.019110f, -497.691315f, -68.166161f }, 1.000000f, 0.000000f ); 
+      // States -> vf_lese_on (id: 2) 
+    instance.registerEObj( "sgvf_f1b3_b0384_10", 2003201, 4649443, 4, { -32.114700f, -507.132690f, -23.686880f }, 1.000000f, 0.000000f ); 
+      // States -> vf_lese_on (id: 2) 
+    instance.registerEObj( "sgvf_f1b3_b0384_11", 2003202, 4649445, 4, { -32.647800f, -514.520386f, 12.987520f }, 1.000000f, 0.000000f ); 
+      // States -> vf_lese_on (id: 2) 
+    instance.registerEObj( "sgvf_f1b3_b0384_12", 2003203, 4649441, 4, { 39.004780f, -451.620209f, -100.687401f }, 1.000000f, 0.000000f ); 
+      // States -> vf_lese_on (id: 2) 
+    instance.registerEObj( "sgvf_f1b3_b0384_13", 2003204, 4649439, 4, { 36.536411f, -459.008911f, -57.215809f }, 1.000000f, 0.000000f ); 
+      // States -> vf_lese_on (id: 2) 
+    instance.registerEObj( "sgvf_f1b3_b0384_14", 2003211, 4649440, 4, { 36.232590f, -468.665405f, -16.744450f }, 1.000000f, 0.000000f ); 
+      // States -> vf_lese_on (id: 2) 
+    instance.registerEObj( "sgvf_f1b3_b0384_15", 2003212, 4649438, 4, { 39.456009f, -475.805695f, 24.956329f }, 1.000000f, 0.000000f ); 
+      // States -> vf_lese_on (id: 2) 
+    instance.registerEObj( "sgvf_f1b3_b0384_16", 2003220, 4649449, 4, { -38.816181f, -450.369904f, -100.764801f }, 1.000000f, 0.000000f ); 
+      // States -> vf_lese_on (id: 2) 
+    instance.registerEObj( "sgvf_f1b3_b0384_17", 2003272, 4649447, 4, { -39.033329f, -459.976013f, -57.518230f }, 1.000000f, 0.000000f ); 
+      // States -> vf_lese_on (id: 2) 
+    instance.registerEObj( "sgvf_f1b3_b0384_18", 2003273, 4649448, 4, { -38.558640f, -467.593109f, -20.011221f }, 1.000000f, 0.000000f ); 
+      // States -> vf_lese_on (id: 2) 
+    instance.registerEObj( "sgvf_f1b3_b0384_19", 2003274, 4649446, 4, { -39.651970f, -475.626709f, 24.849569f }, 1.000000f, 0.000000f ); 
+      // States -> vf_lese_on (id: 2) 
+    instance.registerEObj( "sgvf_f1b3_b0384_20", 2003275, 4649434, 4, { 72.266907f, -442.713989f, -75.343910f }, 1.000000f, 0.000000f ); 
+      // States -> vf_lese_on (id: 2) 
+    instance.registerEObj( "sgvf_f1b3_b0384_21", 2003286, 4649431, 4, { 71.894348f, -458.468506f, 5.267881f }, 1.000000f, 0.000000f ); 
+      // States -> vf_lese_on (id: 2) 
+    instance.registerEObj( "sgvf_f1b3_b0384_22", 2003287, 4649432, 4, { -71.852654f, -442.697113f, -75.916992f }, 1.000000f, 0.000000f ); 
+      // States -> vf_lese_on (id: 2) 
+    instance.registerEObj( "sgvf_f1b3_b0384_23", 2003288, 4649433, 4, { -71.777451f, -458.403107f, 4.927437f }, 1.000000f, 0.000000f ); 
+      // States -> vf_lese_on (id: 2) 
+    instance.registerEObj( "unknown_0", 2002473, 4649110, 4, { 71.824219f, -515.343018f, -132.707794f }, 0.991760f, 0.000048f ); 
+    instance.registerEObj( "unknown_1", 2002474, 4649108, 4, { 71.847183f, -531.168091f, -51.265450f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_2", 2002579, 4649109, 4, { 71.850891f, -546.907227f, 29.809669f }, 0.991760f, 0.000048f ); 
+    instance.registerEObj( "Boxofcrystals", 2002592, 4649105, 4, { -71.854797f, -515.314209f, -132.724899f }, 0.991760f, 0.000048f ); 
+    instance.registerEObj( "Boxofcrystals_1", 2002593, 4649103, 4, { -71.848587f, -531.122681f, -51.389240f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "Boxofcrystals_2", 2002594, 4649104, 4, { -71.852577f, -547.315125f, 29.686489f }, 0.991760f, 0.000048f ); 
+    instance.registerEObj( "unknown_3", 2002885, 4649106, 4, { -0.000875f, -482.805389f, -84.219566f }, 0.991760f, 0.000048f ); 
+    instance.registerEObj( "unknown_4", 2002886, 4649107, 4, { -0.003072f, -498.601105f, -3.013031f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_5", 2003453, 4672990, 4, { 0.015892f, -506.314087f, 46.485531f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "sgpl_f1b3_bosswall", 2002872, 4649551, 4, { -2.840854f, -506.553986f, 68.877274f }, 0.991760f, 0.000048f ); 
+      // States -> vf_bextwall_on (id: 3) vf_bextwall_of (id: 4) 
+    instance.registerEObj( "unknown_6", 2002735, 0, 4, { -2.788200f, -507.313385f, 68.893646f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "Allaganterminal", 2003418, 4672991, 4, { -2.071490f, -506.798004f, 144.172394f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "Frontalbulkhead", 2003420, 4649112, 4, { -0.091233f, -505.180695f, 26.463760f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "sgpl_f1b3_boss_col", 2003422, 4651265, 4, { -2.657619f, -506.929993f, 124.653297f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "sgpl_w_lvd_board_col_only", 2003677, 4681484, 4, { -2.678503f, -506.980103f, 84.769417f }, 1.000000f, 0.000000f ); 
 
   }
 
-  void onUpdate( InstanceContentPtr instance, uint32_t currTime ) override
+  void onUpdate( InstanceContent& instance, uint32_t currTime ) override
   {
 
   }
 
-  void onEnterTerritory( InstanceContentPtr instance, Entity::Player& player, uint32_t eventId, uint16_t param1,
+  void onEnterTerritory( InstanceContent& instance, Entity::Player& player, uint32_t eventId, uint16_t param1,
                          uint16_t param2 ) override
   {
 
diff --git a/src/scripts/instances/raids/TheSecondCoilofBahamutSavageTurn4.cpp b/src/scripts/instances/raids/TheSecondCoilofBahamutSavageTurn4.cpp
index 2d9ec62d..c9e6ee4a 100644
--- a/src/scripts/instances/raids/TheSecondCoilofBahamutSavageTurn4.cpp
+++ b/src/scripts/instances/raids/TheSecondCoilofBahamutSavageTurn4.cpp
@@ -9,44 +9,34 @@ class TheSecondCoilofBahamutSavageTurn4 :
 public:
   TheSecondCoilofBahamutSavageTurn4() :
     Sapphire::ScriptAPI::InstanceContentScript( 30015 )
-  {
-  }
+  { }
 
-  void onInit( InstanceContentPtr instance ) override
+  void onInit( InstanceContent& instance ) override
   {
-    instance->registerEObj( "unknown_0", 2003412, 0, 4, { -1.586798f, 0.000000f, 6.322940f }, 1.000000f, 0.000000f );
-    instance->registerEObj( "unknown_1", 2003413, 4592650, 4, { 0.246630f, 0.000000f, -0.575616f }, 1.000000f,
-                            0.000000f );
-    instance->registerEObj( "unknown_2", 2003414, 4596280, 4, { 2.330916f, 0.000000f, 1.675908f }, 1.000000f,
-                            0.000000f );
-    instance->registerEObj( "unknown_3", 2003411, 4585907, 4, { -0.036626f, -0.000000f, -0.514996f }, 1.000000f,
-                            0.000000f );
-    instance->registerEObj( "unknown_4", 2003392, 4632812, 4, { 0.000000f, -0.000002f, 0.000000f }, 1.000000f,
-                            0.000000f );
-    instance->registerEObj( "unknown_5", 2003393, 0, 4, { 16.296391f, -0.000002f, -4.751545f }, 1.000000f, 0.000000f );
-    instance->registerEObj( "unknown_6", 2003394, 0, 4, { 11.781120f, -0.000001f, 4.780689f }, 1.000000f, 0.000000f );
-    instance->registerEObj( "unknown_7", 2003391, 0, 4, { 8.938168f, 0.060000f, -11.440830f }, 1.000000f, 0.000000f );
-    instance->registerEObj( "sgvf_w_btl_b0427", 2003427, 4664504, 4, { 0.000000f, 0.000000f, 0.000000f }, 1.000000f,
-                            -0.000000f );
-    // States -> on off
-    instance->registerEObj( "Entrance", 2000182, 4614314, 5, { -0.059309f, -0.000001f, 15.090750f }, 1.000000f,
-                            0.000000f );
-    // States -> vf_lock_on vf_lock_of
-    instance->registerEObj( "Allaganterminal", 2003419, 4682784, 4, { -15.104980f, 0.572263f, -27.316570f }, 1.000000f,
-                            0.000000f );
-    instance->registerEObj( "unknown_8", 2003452, 4615853, 4, { 0.000000f, 0.000000f, 0.000000f }, 1.000000f,
-                            0.000000f );
-    instance->registerEObj( "unknown_9", 2003678, 4663755, 4, { 16.207529f, 0.571903f, 28.091551f }, 1.000000f,
-                            0.000000f );
+    instance.registerEObj( "unknown_0", 2003412, 0, 4, { -1.586798f, 0.000000f, 6.322940f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_1", 2003413, 4592650, 4, { 0.246630f, 0.000000f, -0.575616f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_2", 2003414, 4596280, 4, { 2.330916f, 0.000000f, 1.675908f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_3", 2003411, 4585907, 4, { -0.036626f, -0.000000f, -0.514996f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_4", 2003392, 4632812, 4, { 0.000000f, -0.000002f, 0.000000f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_5", 2003393, 0, 4, { 16.296391f, -0.000002f, -4.751545f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_6", 2003394, 0, 4, { 11.781120f, -0.000001f, 4.780689f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_7", 2003391, 0, 4, { 8.938168f, 0.060000f, -11.440830f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "sgvf_w_btl_b0427", 2003427, 4664504, 4, { 0.000000f, 0.000000f, 0.000000f }, 1.000000f, -0.000000f ); 
+      // States -> on (id: 2) off (id: 3) 
+    instance.registerEObj( "Entrance", 2000182, 4614314, 5, { -0.059309f, -0.000001f, 15.090750f }, 1.000000f, 0.000000f ); 
+      // States -> vf_lock_on (id: 11) vf_lock_of (id: 12) 
+    instance.registerEObj( "Allaganterminal", 2003419, 4682784, 4, { -15.104980f, 0.572263f, -27.316570f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_8", 2003452, 4615853, 4, { 0.000000f, 0.000000f, 0.000000f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_9", 2003678, 4663755, 4, { 16.207529f, 0.571903f, 28.091551f }, 1.000000f, 0.000000f ); 
 
   }
 
-  void onUpdate( InstanceContentPtr instance, uint32_t currTime ) override
+  void onUpdate( InstanceContent& instance, uint32_t currTime ) override
   {
 
   }
 
-  void onEnterTerritory( InstanceContentPtr instance, Entity::Player& player, uint32_t eventId, uint16_t param1,
+  void onEnterTerritory( InstanceContent& instance, Entity::Player& player, uint32_t eventId, uint16_t param1,
                          uint16_t param2 ) override
   {
 
diff --git a/src/scripts/instances/raids/TheSecondCoilofBahamutTurn1.cpp b/src/scripts/instances/raids/TheSecondCoilofBahamutTurn1.cpp
index 53fef1da..1cc02925 100644
--- a/src/scripts/instances/raids/TheSecondCoilofBahamutTurn1.cpp
+++ b/src/scripts/instances/raids/TheSecondCoilofBahamutTurn1.cpp
@@ -9,48 +9,35 @@ class TheSecondCoilofBahamutTurn1 :
 public:
   TheSecondCoilofBahamutTurn1() :
     Sapphire::ScriptAPI::InstanceContentScript( 30007 )
-  {
-  }
+  { }
 
-  void onInit( InstanceContentPtr instance ) override
+  void onInit( InstanceContent& instance ) override
   {
-    instance->registerEObj( "unknown_0", 2003012, 0, 4, { -266.882690f, 10.421330f, 43.491699f }, 1.000000f,
-                            0.000000f );
-    instance->registerEObj( "unknown_1", 2003043, 0, 4, { -261.309113f, 10.383500f, 37.739429f }, 1.000000f,
-                            0.000000f );
-    instance->registerEObj( "unknown_2", 2003044, 0, 4, { -259.553802f, 10.421330f, 31.442730f }, 1.000000f,
-                            0.000000f );
-    instance->registerEObj( "unknown_3", 2003045, 0, 4, { -262.154510f, 10.421330f, 23.808010f }, 1.000000f,
-                            0.000000f );
-    instance->registerEObj( "Entrance", 2000182, 4614306, 5, { -120.168602f, 11.010820f, -99.074913f }, 1.000000f,
-                            0.000000f );
-    // States -> vf_lock_on vf_lock_of
-    instance->registerEObj( "Shortcut", 2000700, 0, 4, { -131.611206f, 9.156082f, -82.660057f }, 1.000000f, 0.000000f );
-    instance->registerEObj( "unknown_4", 2001269, 4544126, 4, { -137.669403f, 9.502172f, -11.353470f }, 1.000000f,
-                            0.000000f );
-    instance->registerEObj( "Destination", 2002372, 4579467, 4, { -171.978897f, -49.907219f, -10.220380f }, 1.000000f,
-                            0.000000f );
-    instance->registerEObj( "sgpl_f1b2_bosswall", 2002872, 4616656, 4, { -248.873596f, 10.236450f, 33.155060f },
-                            1.000000f, -0.000000f );
-    // States -> vf_bextwall_on vf_bextwall_of
-    instance->registerEObj( "unknown_5", 2002735, 0, 4, { -246.919006f, 9.938496f, 34.239399f }, 1.000000f,
-                            -1.570451f );
-    instance->registerEObj( "Allaganterminal", 2003416, 4664435, 4, { -314.106995f, 9.414734f, 43.198238f }, 0.991760f,
-                            0.000048f );
-    instance->registerEObj( "sgpl_w_lvd_b0118_col_char", 2003421, 4651262, 4, { -292.780701f, 10.351920f, 39.414989f },
-                            1.000000f, 0.000000f );
-    // States -> vf_bextwall_on vf_bextwall_of
-    instance->registerEObj( "unknown_6", 2003428, 4615269, 4, { -120.556702f, 8.820233f, -76.764412f }, 1.000000f,
-                            0.000000f );
+    instance.registerEObj( "unknown_0", 2003012, 0, 4, { -266.882690f, 10.421330f, 43.491699f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_1", 2003043, 0, 4, { -261.309113f, 10.383500f, 37.739429f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_2", 2003044, 0, 4, { -259.553802f, 10.421330f, 31.442730f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_3", 2003045, 0, 4, { -262.154510f, 10.421330f, 23.808010f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "Entrance", 2000182, 4614306, 5, { -120.168602f, 11.010820f, -99.074913f }, 1.000000f, 0.000000f ); 
+      // States -> vf_lock_on (id: 11) vf_lock_of (id: 12) 
+    instance.registerEObj( "Shortcut", 2000700, 0, 4, { -131.611206f, 9.156082f, -82.660057f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_4", 2001269, 4544126, 4, { -137.669403f, 9.502172f, -11.353470f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "Destination", 2002372, 4579467, 4, { -171.978897f, -49.907219f, -10.220380f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "sgpl_f1b2_bosswall", 2002872, 4616656, 4, { -248.873596f, 10.236450f, 33.155060f }, 1.000000f, -0.000000f ); 
+      // States -> vf_bextwall_on (id: 3) vf_bextwall_of (id: 4) 
+    instance.registerEObj( "unknown_5", 2002735, 0, 4, { -246.919006f, 9.938496f, 34.239399f }, 1.000000f, -1.570451f ); 
+    instance.registerEObj( "Allaganterminal", 2003416, 4664435, 4, { -314.106995f, 9.414734f, 43.198238f }, 0.991760f, 0.000048f ); 
+    instance.registerEObj( "sgpl_w_lvd_b0118_col_char", 2003421, 4651262, 4, { -292.780701f, 10.351920f, 39.414989f }, 1.000000f, 0.000000f ); 
+      // States -> vf_bextwall_on (id: 3) vf_bextwall_of (id: 4) 
+    instance.registerEObj( "unknown_6", 2003428, 4615269, 4, { -120.556702f, 8.820233f, -76.764412f }, 1.000000f, 0.000000f ); 
 
   }
 
-  void onUpdate( InstanceContentPtr instance, uint32_t currTime ) override
+  void onUpdate( InstanceContent& instance, uint32_t currTime ) override
   {
 
   }
 
-  void onEnterTerritory( InstanceContentPtr instance, Entity::Player& player, uint32_t eventId, uint16_t param1,
+  void onEnterTerritory( InstanceContent& instance, Entity::Player& player, uint32_t eventId, uint16_t param1,
                          uint16_t param2 ) override
   {
 
diff --git a/src/scripts/instances/raids/TheSecondCoilofBahamutTurn2.cpp b/src/scripts/instances/raids/TheSecondCoilofBahamutTurn2.cpp
index 042d2f61..f15acf09 100644
--- a/src/scripts/instances/raids/TheSecondCoilofBahamutTurn2.cpp
+++ b/src/scripts/instances/raids/TheSecondCoilofBahamutTurn2.cpp
@@ -9,49 +9,35 @@ class TheSecondCoilofBahamutTurn2 :
 public:
   TheSecondCoilofBahamutTurn2() :
     Sapphire::ScriptAPI::InstanceContentScript( 30008 )
-  {
-  }
+  { }
 
-  void onInit( InstanceContentPtr instance ) override
+  void onInit( InstanceContent& instance ) override
   {
-    instance->registerEObj( "unknown_0", 2003299, 4646804, 4, { -449.999908f, 800.027222f, 69.995399f }, 0.991760f,
-                            0.000048f );
-    instance->registerEObj( "unknown_1", 2003311, 4646803, 4, { -449.999908f, 800.027222f, 69.995354f }, 0.991760f,
-                            0.000048f );
-    instance->registerEObj( "Ripenedbulb", 2003293, 4646806, 4, { -449.999908f, 800.027222f, 69.995399f }, 0.991760f,
-                            0.000048f );
-    instance->registerEObj( "Entrance", 2000182, 4646962, 5, { -358.417694f, -270.655487f, -0.875555f }, 0.991760f,
-                            0.000048f );
-    // States -> vf_lock_on vf_lock_of
-    instance->registerEObj( "Shortcut", 2000700, 0, 4, { -384.512085f, -270.435699f, -2.731445f }, 0.991760f,
-                            0.000048f );
-    instance->registerEObj( "unknown_2", 2002469, 4646048, 4, { -447.239197f, 799.923584f, 70.054077f }, 0.991760f,
-                            0.000048f );
-    instance->registerEObj( "sgpl_w_lvd_colwithnavi", 2002470, 4646986, 4, { -448.371613f, 800.000000f, 20.807449f },
-                            1.000000f, 0.000000f );
-    instance->registerEObj( "unknown_3", 2002471, 4646049, 4, { -372.196899f, -270.740997f, -1.014158f }, 0.991760f,
-                            0.000048f );
-    instance->registerEObj( "Innerbulkhead", 2003415, 0, 4, { -375.434814f, -268.802399f, -0.859896f }, 1.000000f,
-                            0.000000f );
-    instance->registerEObj( "Allaganterminal", 2003417, 4682781, 4, { -450.001099f, 799.969971f, 143.447495f },
-                            1.000000f, 0.000000f );
-    instance->registerEObj( "unknown_4", 2002735, 0, 4, { -449.981689f, 800.000000f, 47.625530f }, 0.991760f,
-                            0.000048f );
-    instance->registerEObj( "sgpl_f1b2_bosswall", 2002872, 4646969, 4, { -449.981689f, 801.188416f, 47.036610f },
-                            0.991760f, 0.000048f );
-    // States -> vf_bextwall_on vf_bextwall_of
-    instance->registerEObj( "sgpl_w_lvd_b0118_col_char", 2002472, 4646987, 4, { -449.121704f, 800.000000f, 91.049332f },
-                            1.000000f, 0.000000f );
-    // States -> vf_bextwall_on vf_bextwall_of
+    instance.registerEObj( "unknown_0", 2003299, 4646804, 4, { -449.999908f, 800.027222f, 69.995399f }, 0.991760f, 0.000048f ); 
+    instance.registerEObj( "unknown_1", 2003311, 4646803, 4, { -449.999908f, 800.027222f, 69.995354f }, 0.991760f, 0.000048f ); 
+    instance.registerEObj( "Ripenedbulb", 2003293, 4646806, 4, { -449.999908f, 800.027222f, 69.995399f }, 0.991760f, 0.000048f ); 
+    instance.registerEObj( "Entrance", 2000182, 4646962, 5, { -358.417694f, -270.655487f, -0.875555f }, 0.991760f, 0.000048f ); 
+      // States -> vf_lock_on (id: 11) vf_lock_of (id: 12) 
+    instance.registerEObj( "Shortcut", 2000700, 0, 4, { -384.512085f, -270.435699f, -2.731445f }, 0.991760f, 0.000048f ); 
+    instance.registerEObj( "unknown_2", 2002469, 4646048, 4, { -447.239197f, 799.923584f, 70.054077f }, 0.991760f, 0.000048f ); 
+    instance.registerEObj( "sgpl_w_lvd_colwithnavi", 2002470, 4646986, 4, { -448.371613f, 800.000000f, 20.807449f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_3", 2002471, 4646049, 4, { -372.196899f, -270.740997f, -1.014158f }, 0.991760f, 0.000048f ); 
+    instance.registerEObj( "Innerbulkhead", 2003415, 0, 4, { -375.434814f, -268.802399f, -0.859896f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "Allaganterminal", 2003417, 4682781, 4, { -450.001099f, 799.969971f, 143.447495f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_4", 2002735, 0, 4, { -449.981689f, 800.000000f, 47.625530f }, 0.991760f, 0.000048f ); 
+    instance.registerEObj( "sgpl_f1b2_bosswall", 2002872, 4646969, 4, { -449.981689f, 801.188416f, 47.036610f }, 0.991760f, 0.000048f ); 
+      // States -> vf_bextwall_on (id: 3) vf_bextwall_of (id: 4) 
+    instance.registerEObj( "sgpl_w_lvd_b0118_col_char", 2002472, 4646987, 4, { -449.121704f, 800.000000f, 91.049332f }, 1.000000f, 0.000000f ); 
+      // States -> vf_bextwall_on (id: 3) vf_bextwall_of (id: 4) 
 
   }
 
-  void onUpdate( InstanceContentPtr instance, uint32_t currTime ) override
+  void onUpdate( InstanceContent& instance, uint32_t currTime ) override
   {
 
   }
 
-  void onEnterTerritory( InstanceContentPtr instance, Entity::Player& player, uint32_t eventId, uint16_t param1,
+  void onEnterTerritory( InstanceContent& instance, Entity::Player& player, uint32_t eventId, uint16_t param1,
                          uint16_t param2 ) override
   {
 
diff --git a/src/scripts/instances/raids/TheSecondCoilofBahamutTurn3.cpp b/src/scripts/instances/raids/TheSecondCoilofBahamutTurn3.cpp
index d129ab24..26575dc7 100644
--- a/src/scripts/instances/raids/TheSecondCoilofBahamutTurn3.cpp
+++ b/src/scripts/instances/raids/TheSecondCoilofBahamutTurn3.cpp
@@ -9,147 +9,98 @@ class TheSecondCoilofBahamutTurn3 :
 public:
   TheSecondCoilofBahamutTurn3() :
     Sapphire::ScriptAPI::InstanceContentScript( 30009 )
-  {
-  }
+  { }
 
-  void onInit( InstanceContentPtr instance ) override
+  void onInit( InstanceContent& instance ) override
   {
-    instance->registerEObj( "Fragrantbloom", 2003342, 0, 4, { 5.540659f, -506.930115f, 105.670197f }, 1.000000f,
-                            0.000000f );
-    instance->registerEObj( "Destination", 2003387, 0, 4, { 5.248638f, -506.929993f, 104.130501f }, 1.000000f,
-                            0.000000f );
-    instance->registerEObj( "Sylphpodling", 2003348, 0, 4, { 4.584954f, -506.929993f, 106.997597f }, 1.000000f,
-                            0.000000f );
-    instance->registerEObj( "Skybulb", 2003358, 0, 4, { 3.469964f, -506.929993f, 104.900299f }, 1.000000f, 0.000000f );
-    instance->registerEObj( "Destination_1", 2003289, 4681305, 4, { -28.488001f, -506.700012f, 105.307297f }, 1.000000f,
-                            -1.570796f );
-    // States -> tower_off tower_on2off tower_up tower_off2up tower_on tower_up2on tower_step1 tower_step0_1 tower_step2 tower_step1_2 tower_step3 tower_step2_3 tower_step4 tower_step3_4 tower_step5 tower_step4_5
-    instance->registerEObj( "Destination_2", 2003289, 4681302, 4, { -2.644600f, -506.700012f, 79.710602f }, 1.000000f,
-                            0.000000f );
-    // States -> tower_off tower_on2off tower_up tower_off2up tower_on tower_up2on tower_step1 tower_step0_1 tower_step2 tower_step1_2 tower_step3 tower_step2_3 tower_step4 tower_step3_4 tower_step5 tower_step4_5
-    instance->registerEObj( "Destination_3", 2003289, 4681303, 4, { 23.007401f, -506.700012f, 105.309097f }, 1.000000f,
-                            1.570796f );
-    // States -> tower_off tower_on2off tower_up tower_off2up tower_on tower_up2on tower_step1 tower_step0_1 tower_step2 tower_step1_2 tower_step3 tower_step2_3 tower_step4 tower_step3_4 tower_step5 tower_step4_5
-    instance->registerEObj( "Destination_4", 2003289, 4681304, 4, { -2.685100f, -506.700012f, 131.011307f }, 1.000000f,
-                            -3.141593f );
-    // States -> tower_off tower_on2off tower_up tower_off2up tower_on tower_up2on tower_step1 tower_step0_1 tower_step2 tower_step1_2 tower_step3 tower_step2_3 tower_step4 tower_step3_4 tower_step5 tower_step4_5
-    instance->registerEObj( "Entrance", 2000182, 4649322, 5, { 71.763351f, -505.710297f, -183.265305f }, 1.000000f,
-                            0.000000f );
-    // States -> vf_lock_on vf_lock_of
-    instance->registerEObj( "Shortcut", 2000700, 0, 4, { 78.751831f, -508.192688f, -166.063995f }, 0.991760f,
-                            0.000048f );
-    instance->registerEObj( "sgvf_f1b3_b0384", 2003117, 4649426, 4, { 71.787033f, -523.938416f, -91.769341f },
-                            1.000000f, 0.000000f );
-    // States -> vf_lese_on
-    instance->registerEObj( "sgvf_f1b3_b0384_1", 2003149, 4649428, 4, { 71.647507f, -539.766907f, -10.543050f },
-                            1.000000f, 0.000000f );
-    // States -> vf_lese_on
-    instance->registerEObj( "sgvf_f1b3_b0384_2", 2003178, 4649429, 4, { -72.118347f, -523.848206f, -91.955490f },
-                            1.000000f, 0.000000f );
-    // States -> vf_lese_on
-    instance->registerEObj( "sgvf_f1b3_b0384_3", 2003179, 4649430, 4, { -71.857773f, -539.706909f, -11.043210f },
-                            1.000000f, 0.000000f );
-    // States -> vf_lese_on
-    instance->registerEObj( "sgvf_f1b3_b0384_4", 2003180, 4649427, 4, { 32.211380f, -491.286011f, -105.322304f },
-                            1.000000f, 0.000000f );
-    // States -> vf_lese_on
-    instance->registerEObj( "sgvf_f1b3_b0384_5", 2003187, 4649436, 4, { 31.604389f, -498.100800f, -68.374847f },
-                            1.000000f, 0.000000f );
-    // States -> vf_lese_on
-    instance->registerEObj( "sgvf_f1b3_b0384_6", 2003188, 4649435, 4, { 31.776440f, -506.867188f, -22.942039f },
-                            1.000000f, 0.000000f );
-    // States -> vf_lese_on
-    instance->registerEObj( "sgvf_f1b3_b0384_7", 2003196, 4649437, 4, { 31.800430f, -514.005920f, 12.637740f },
-                            1.000000f, 0.000000f );
-    // States -> vf_lese_on
-    instance->registerEObj( "sgvf_f1b3_b0384_8", 2003198, 4649442, 4, { -32.055038f, -491.285187f, -104.874397f },
-                            1.000000f, 0.000000f );
-    // States -> vf_lese_on
-    instance->registerEObj( "sgvf_f1b3_b0384_9", 2003200, 4649444, 4, { -31.019110f, -497.691315f, -68.166161f },
-                            1.000000f, 0.000000f );
-    // States -> vf_lese_on
-    instance->registerEObj( "sgvf_f1b3_b0384_10", 2003201, 4649443, 4, { -32.114700f, -507.132690f, -23.686880f },
-                            1.000000f, 0.000000f );
-    // States -> vf_lese_on
-    instance->registerEObj( "sgvf_f1b3_b0384_11", 2003202, 4649445, 4, { -32.647800f, -514.520386f, 12.987520f },
-                            1.000000f, 0.000000f );
-    // States -> vf_lese_on
-    instance->registerEObj( "sgvf_f1b3_b0384_12", 2003203, 4649441, 4, { 39.004780f, -451.620209f, -100.687401f },
-                            1.000000f, 0.000000f );
-    // States -> vf_lese_on
-    instance->registerEObj( "sgvf_f1b3_b0384_13", 2003204, 4649439, 4, { 36.536411f, -459.008911f, -57.215809f },
-                            1.000000f, 0.000000f );
-    // States -> vf_lese_on
-    instance->registerEObj( "sgvf_f1b3_b0384_14", 2003211, 4649440, 4, { 36.232590f, -468.665405f, -16.744450f },
-                            1.000000f, 0.000000f );
-    // States -> vf_lese_on
-    instance->registerEObj( "sgvf_f1b3_b0384_15", 2003212, 4649438, 4, { 39.456009f, -475.805695f, 24.956329f },
-                            1.000000f, 0.000000f );
-    // States -> vf_lese_on
-    instance->registerEObj( "sgvf_f1b3_b0384_16", 2003220, 4649449, 4, { -38.816181f, -450.369904f, -100.764801f },
-                            1.000000f, 0.000000f );
-    // States -> vf_lese_on
-    instance->registerEObj( "sgvf_f1b3_b0384_17", 2003272, 4649447, 4, { -39.033329f, -459.976013f, -57.518230f },
-                            1.000000f, 0.000000f );
-    // States -> vf_lese_on
-    instance->registerEObj( "sgvf_f1b3_b0384_18", 2003273, 4649448, 4, { -38.558640f, -467.593109f, -20.011221f },
-                            1.000000f, 0.000000f );
-    // States -> vf_lese_on
-    instance->registerEObj( "sgvf_f1b3_b0384_19", 2003274, 4649446, 4, { -39.651970f, -475.626709f, 24.849569f },
-                            1.000000f, 0.000000f );
-    // States -> vf_lese_on
-    instance->registerEObj( "sgvf_f1b3_b0384_20", 2003275, 4649434, 4, { 72.266907f, -442.713989f, -75.343910f },
-                            1.000000f, 0.000000f );
-    // States -> vf_lese_on
-    instance->registerEObj( "sgvf_f1b3_b0384_21", 2003286, 4649431, 4, { 71.894348f, -458.468506f, 5.267881f },
-                            1.000000f, 0.000000f );
-    // States -> vf_lese_on
-    instance->registerEObj( "sgvf_f1b3_b0384_22", 2003287, 4649432, 4, { -71.852654f, -442.697113f, -75.916992f },
-                            1.000000f, 0.000000f );
-    // States -> vf_lese_on
-    instance->registerEObj( "sgvf_f1b3_b0384_23", 2003288, 4649433, 4, { -71.777451f, -458.403107f, 4.927437f },
-                            1.000000f, 0.000000f );
-    // States -> vf_lese_on
-    instance->registerEObj( "unknown_0", 2002473, 4649110, 4, { 71.824219f, -515.343018f, -132.707794f }, 0.991760f,
-                            0.000048f );
-    instance->registerEObj( "unknown_1", 2002474, 4649108, 4, { 71.847183f, -531.168091f, -51.265450f }, 1.000000f,
-                            0.000000f );
-    instance->registerEObj( "unknown_2", 2002579, 4649109, 4, { 71.850891f, -546.907227f, 29.809669f }, 0.991760f,
-                            0.000048f );
-    instance->registerEObj( "Boxofcrystals", 2002592, 4649105, 4, { -71.854797f, -515.314209f, -132.724899f },
-                            0.991760f, 0.000048f );
-    instance->registerEObj( "Boxofcrystals_1", 2002593, 4649103, 4, { -71.848587f, -531.122681f, -51.389240f },
-                            1.000000f, 0.000000f );
-    instance->registerEObj( "Boxofcrystals_2", 2002594, 4649104, 4, { -71.852577f, -547.315125f, 29.686489f },
-                            0.991760f, 0.000048f );
-    instance->registerEObj( "unknown_3", 2002885, 4649106, 4, { -0.000875f, -482.805389f, -84.219566f }, 0.991760f,
-                            0.000048f );
-    instance->registerEObj( "unknown_4", 2002886, 4649107, 4, { -0.003072f, -498.601105f, -3.013031f }, 1.000000f,
-                            0.000000f );
-    instance->registerEObj( "unknown_5", 2003453, 4672990, 4, { 0.015892f, -506.314087f, 46.485531f }, 1.000000f,
-                            0.000000f );
-    instance->registerEObj( "sgpl_f1b3_bosswall", 2002872, 4649551, 4, { -2.840854f, -506.553986f, 68.877274f },
-                            0.991760f, 0.000048f );
-    // States -> vf_bextwall_on vf_bextwall_of
-    instance->registerEObj( "unknown_6", 2002735, 0, 4, { -2.788200f, -507.313385f, 68.893646f }, 1.000000f,
-                            0.000000f );
-    instance->registerEObj( "Allaganterminal", 2003418, 4672991, 4, { -2.071490f, -506.798004f, 144.172394f },
-                            1.000000f, 0.000000f );
-    instance->registerEObj( "Frontalbulkhead", 2003420, 4649112, 4, { -0.091233f, -505.180695f, 26.463760f }, 1.000000f,
-                            0.000000f );
-    instance->registerEObj( "sgpl_f1b3_boss_col", 2003422, 4651265, 4, { -2.657619f, -506.929993f, 124.653297f },
-                            1.000000f, 0.000000f );
-    instance->registerEObj( "sgpl_w_lvd_board_col_only", 2003677, 4681484, 4, { -2.678503f, -506.980103f, 84.769417f },
-                            1.000000f, 0.000000f );
+    instance.registerEObj( "Fragrantbloom", 2003342, 0, 4, { 5.540659f, -506.930115f, 105.670197f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "Destination", 2003387, 0, 4, { 5.248638f, -506.929993f, 104.130501f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "Sylphpodling", 2003348, 0, 4, { 4.584954f, -506.929993f, 106.997597f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "Skybulb", 2003358, 0, 4, { 3.469964f, -506.929993f, 104.900299f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "Destination_1", 2003289, 4681305, 4, { -28.488001f, -506.700012f, 105.307297f }, 1.000000f, -1.570796f ); 
+      // States -> tower_off (id: 16) tower_on2off (id: 17) tower_up (id: 18) tower_off2up (id: 19) tower_on (id: 20) tower_up2on (id: 21) tower_step1 (id: 22) tower_step0_1 (id: 23) tower_step2 (id: 24) tower_step1_2 (id: 25) tower_step3 (id: 26) tower_step2_3 (id: 27) tower_step4 (id: 28) tower_step3_4 (id: 29) tower_step5 (id: 30) tower_step4_5 (id: 31) 
+    instance.registerEObj( "Destination_2", 2003289, 4681302, 4, { -2.644600f, -506.700012f, 79.710602f }, 1.000000f, 0.000000f ); 
+      // States -> tower_off (id: 16) tower_on2off (id: 17) tower_up (id: 18) tower_off2up (id: 19) tower_on (id: 20) tower_up2on (id: 21) tower_step1 (id: 22) tower_step0_1 (id: 23) tower_step2 (id: 24) tower_step1_2 (id: 25) tower_step3 (id: 26) tower_step2_3 (id: 27) tower_step4 (id: 28) tower_step3_4 (id: 29) tower_step5 (id: 30) tower_step4_5 (id: 31) 
+    instance.registerEObj( "Destination_3", 2003289, 4681303, 4, { 23.007401f, -506.700012f, 105.309097f }, 1.000000f, 1.570796f ); 
+      // States -> tower_off (id: 16) tower_on2off (id: 17) tower_up (id: 18) tower_off2up (id: 19) tower_on (id: 20) tower_up2on (id: 21) tower_step1 (id: 22) tower_step0_1 (id: 23) tower_step2 (id: 24) tower_step1_2 (id: 25) tower_step3 (id: 26) tower_step2_3 (id: 27) tower_step4 (id: 28) tower_step3_4 (id: 29) tower_step5 (id: 30) tower_step4_5 (id: 31) 
+    instance.registerEObj( "Destination_4", 2003289, 4681304, 4, { -2.685100f, -506.700012f, 131.011307f }, 1.000000f, -3.141593f ); 
+      // States -> tower_off (id: 16) tower_on2off (id: 17) tower_up (id: 18) tower_off2up (id: 19) tower_on (id: 20) tower_up2on (id: 21) tower_step1 (id: 22) tower_step0_1 (id: 23) tower_step2 (id: 24) tower_step1_2 (id: 25) tower_step3 (id: 26) tower_step2_3 (id: 27) tower_step4 (id: 28) tower_step3_4 (id: 29) tower_step5 (id: 30) tower_step4_5 (id: 31) 
+    instance.registerEObj( "Entrance", 2000182, 4649322, 5, { 71.763351f, -505.710297f, -183.265305f }, 1.000000f, 0.000000f ); 
+      // States -> vf_lock_on (id: 11) vf_lock_of (id: 12) 
+    instance.registerEObj( "Shortcut", 2000700, 0, 4, { 78.751831f, -508.192688f, -166.063995f }, 0.991760f, 0.000048f ); 
+    instance.registerEObj( "sgvf_f1b3_b0384", 2003117, 4649426, 4, { 71.787033f, -523.938416f, -91.769341f }, 1.000000f, 0.000000f ); 
+      // States -> vf_lese_on (id: 2) 
+    instance.registerEObj( "sgvf_f1b3_b0384_1", 2003149, 4649428, 4, { 71.647507f, -539.766907f, -10.543050f }, 1.000000f, 0.000000f ); 
+      // States -> vf_lese_on (id: 2) 
+    instance.registerEObj( "sgvf_f1b3_b0384_2", 2003178, 4649429, 4, { -72.118347f, -523.848206f, -91.955490f }, 1.000000f, 0.000000f ); 
+      // States -> vf_lese_on (id: 2) 
+    instance.registerEObj( "sgvf_f1b3_b0384_3", 2003179, 4649430, 4, { -71.857773f, -539.706909f, -11.043210f }, 1.000000f, 0.000000f ); 
+      // States -> vf_lese_on (id: 2) 
+    instance.registerEObj( "sgvf_f1b3_b0384_4", 2003180, 4649427, 4, { 32.211380f, -491.286011f, -105.322304f }, 1.000000f, 0.000000f ); 
+      // States -> vf_lese_on (id: 2) 
+    instance.registerEObj( "sgvf_f1b3_b0384_5", 2003187, 4649436, 4, { 31.604389f, -498.100800f, -68.374847f }, 1.000000f, 0.000000f ); 
+      // States -> vf_lese_on (id: 2) 
+    instance.registerEObj( "sgvf_f1b3_b0384_6", 2003188, 4649435, 4, { 31.776440f, -506.867188f, -22.942039f }, 1.000000f, 0.000000f ); 
+      // States -> vf_lese_on (id: 2) 
+    instance.registerEObj( "sgvf_f1b3_b0384_7", 2003196, 4649437, 4, { 31.800430f, -514.005920f, 12.637740f }, 1.000000f, 0.000000f ); 
+      // States -> vf_lese_on (id: 2) 
+    instance.registerEObj( "sgvf_f1b3_b0384_8", 2003198, 4649442, 4, { -32.055038f, -491.285187f, -104.874397f }, 1.000000f, 0.000000f ); 
+      // States -> vf_lese_on (id: 2) 
+    instance.registerEObj( "sgvf_f1b3_b0384_9", 2003200, 4649444, 4, { -31.019110f, -497.691315f, -68.166161f }, 1.000000f, 0.000000f ); 
+      // States -> vf_lese_on (id: 2) 
+    instance.registerEObj( "sgvf_f1b3_b0384_10", 2003201, 4649443, 4, { -32.114700f, -507.132690f, -23.686880f }, 1.000000f, 0.000000f ); 
+      // States -> vf_lese_on (id: 2) 
+    instance.registerEObj( "sgvf_f1b3_b0384_11", 2003202, 4649445, 4, { -32.647800f, -514.520386f, 12.987520f }, 1.000000f, 0.000000f ); 
+      // States -> vf_lese_on (id: 2) 
+    instance.registerEObj( "sgvf_f1b3_b0384_12", 2003203, 4649441, 4, { 39.004780f, -451.620209f, -100.687401f }, 1.000000f, 0.000000f ); 
+      // States -> vf_lese_on (id: 2) 
+    instance.registerEObj( "sgvf_f1b3_b0384_13", 2003204, 4649439, 4, { 36.536411f, -459.008911f, -57.215809f }, 1.000000f, 0.000000f ); 
+      // States -> vf_lese_on (id: 2) 
+    instance.registerEObj( "sgvf_f1b3_b0384_14", 2003211, 4649440, 4, { 36.232590f, -468.665405f, -16.744450f }, 1.000000f, 0.000000f ); 
+      // States -> vf_lese_on (id: 2) 
+    instance.registerEObj( "sgvf_f1b3_b0384_15", 2003212, 4649438, 4, { 39.456009f, -475.805695f, 24.956329f }, 1.000000f, 0.000000f ); 
+      // States -> vf_lese_on (id: 2) 
+    instance.registerEObj( "sgvf_f1b3_b0384_16", 2003220, 4649449, 4, { -38.816181f, -450.369904f, -100.764801f }, 1.000000f, 0.000000f ); 
+      // States -> vf_lese_on (id: 2) 
+    instance.registerEObj( "sgvf_f1b3_b0384_17", 2003272, 4649447, 4, { -39.033329f, -459.976013f, -57.518230f }, 1.000000f, 0.000000f ); 
+      // States -> vf_lese_on (id: 2) 
+    instance.registerEObj( "sgvf_f1b3_b0384_18", 2003273, 4649448, 4, { -38.558640f, -467.593109f, -20.011221f }, 1.000000f, 0.000000f ); 
+      // States -> vf_lese_on (id: 2) 
+    instance.registerEObj( "sgvf_f1b3_b0384_19", 2003274, 4649446, 4, { -39.651970f, -475.626709f, 24.849569f }, 1.000000f, 0.000000f ); 
+      // States -> vf_lese_on (id: 2) 
+    instance.registerEObj( "sgvf_f1b3_b0384_20", 2003275, 4649434, 4, { 72.266907f, -442.713989f, -75.343910f }, 1.000000f, 0.000000f ); 
+      // States -> vf_lese_on (id: 2) 
+    instance.registerEObj( "sgvf_f1b3_b0384_21", 2003286, 4649431, 4, { 71.894348f, -458.468506f, 5.267881f }, 1.000000f, 0.000000f ); 
+      // States -> vf_lese_on (id: 2) 
+    instance.registerEObj( "sgvf_f1b3_b0384_22", 2003287, 4649432, 4, { -71.852654f, -442.697113f, -75.916992f }, 1.000000f, 0.000000f ); 
+      // States -> vf_lese_on (id: 2) 
+    instance.registerEObj( "sgvf_f1b3_b0384_23", 2003288, 4649433, 4, { -71.777451f, -458.403107f, 4.927437f }, 1.000000f, 0.000000f ); 
+      // States -> vf_lese_on (id: 2) 
+    instance.registerEObj( "unknown_0", 2002473, 4649110, 4, { 71.824219f, -515.343018f, -132.707794f }, 0.991760f, 0.000048f ); 
+    instance.registerEObj( "unknown_1", 2002474, 4649108, 4, { 71.847183f, -531.168091f, -51.265450f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_2", 2002579, 4649109, 4, { 71.850891f, -546.907227f, 29.809669f }, 0.991760f, 0.000048f ); 
+    instance.registerEObj( "Boxofcrystals", 2002592, 4649105, 4, { -71.854797f, -515.314209f, -132.724899f }, 0.991760f, 0.000048f ); 
+    instance.registerEObj( "Boxofcrystals_1", 2002593, 4649103, 4, { -71.848587f, -531.122681f, -51.389240f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "Boxofcrystals_2", 2002594, 4649104, 4, { -71.852577f, -547.315125f, 29.686489f }, 0.991760f, 0.000048f ); 
+    instance.registerEObj( "unknown_3", 2002885, 4649106, 4, { -0.000875f, -482.805389f, -84.219566f }, 0.991760f, 0.000048f ); 
+    instance.registerEObj( "unknown_4", 2002886, 4649107, 4, { -0.003072f, -498.601105f, -3.013031f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_5", 2003453, 4672990, 4, { 0.015892f, -506.314087f, 46.485531f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "sgpl_f1b3_bosswall", 2002872, 4649551, 4, { -2.840854f, -506.553986f, 68.877274f }, 0.991760f, 0.000048f ); 
+      // States -> vf_bextwall_on (id: 3) vf_bextwall_of (id: 4) 
+    instance.registerEObj( "unknown_6", 2002735, 0, 4, { -2.788200f, -507.313385f, 68.893646f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "Allaganterminal", 2003418, 4672991, 4, { -2.071490f, -506.798004f, 144.172394f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "Frontalbulkhead", 2003420, 4649112, 4, { -0.091233f, -505.180695f, 26.463760f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "sgpl_f1b3_boss_col", 2003422, 4651265, 4, { -2.657619f, -506.929993f, 124.653297f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "sgpl_w_lvd_board_col_only", 2003677, 4681484, 4, { -2.678503f, -506.980103f, 84.769417f }, 1.000000f, 0.000000f ); 
 
   }
 
-  void onUpdate( InstanceContentPtr instance, uint32_t currTime ) override
+  void onUpdate( InstanceContent& instance, uint32_t currTime ) override
   {
 
   }
 
-  void onEnterTerritory( InstanceContentPtr instance, Entity::Player& player, uint32_t eventId, uint16_t param1,
+  void onEnterTerritory( InstanceContent& instance, Entity::Player& player, uint32_t eventId, uint16_t param1,
                          uint16_t param2 ) override
   {
 
diff --git a/src/scripts/instances/raids/TheSecondCoilofBahamutTurn4.cpp b/src/scripts/instances/raids/TheSecondCoilofBahamutTurn4.cpp
index e2039138..127b0ced 100644
--- a/src/scripts/instances/raids/TheSecondCoilofBahamutTurn4.cpp
+++ b/src/scripts/instances/raids/TheSecondCoilofBahamutTurn4.cpp
@@ -9,44 +9,34 @@ class TheSecondCoilofBahamutTurn4 :
 public:
   TheSecondCoilofBahamutTurn4() :
     Sapphire::ScriptAPI::InstanceContentScript( 30010 )
-  {
-  }
+  { }
 
-  void onInit( InstanceContentPtr instance ) override
+  void onInit( InstanceContent& instance ) override
   {
-    instance->registerEObj( "unknown_0", 2003412, 0, 4, { -1.586798f, 0.000000f, 6.322940f }, 1.000000f, 0.000000f );
-    instance->registerEObj( "unknown_1", 2003413, 4592650, 4, { 0.246630f, 0.000000f, -0.575616f }, 1.000000f,
-                            0.000000f );
-    instance->registerEObj( "unknown_2", 2003414, 4596280, 4, { 2.330916f, 0.000000f, 1.675908f }, 1.000000f,
-                            0.000000f );
-    instance->registerEObj( "unknown_3", 2003411, 4585907, 4, { -0.036626f, -0.000000f, -0.514996f }, 1.000000f,
-                            0.000000f );
-    instance->registerEObj( "unknown_4", 2003392, 4632812, 4, { 0.000000f, -0.000002f, 0.000000f }, 1.000000f,
-                            0.000000f );
-    instance->registerEObj( "unknown_5", 2003393, 0, 4, { 16.296391f, -0.000002f, -4.751545f }, 1.000000f, 0.000000f );
-    instance->registerEObj( "unknown_6", 2003394, 0, 4, { 11.781120f, -0.000001f, 4.780689f }, 1.000000f, 0.000000f );
-    instance->registerEObj( "unknown_7", 2003391, 0, 4, { 8.938168f, 0.060000f, -11.440830f }, 1.000000f, 0.000000f );
-    instance->registerEObj( "sgvf_w_btl_b0427", 2003427, 4664504, 4, { 0.000000f, 0.000000f, 0.000000f }, 1.000000f,
-                            -0.000000f );
-    // States -> on off
-    instance->registerEObj( "Entrance", 2000182, 4614314, 5, { -0.059309f, -0.000001f, 15.090750f }, 1.000000f,
-                            0.000000f );
-    // States -> vf_lock_on vf_lock_of
-    instance->registerEObj( "Allaganterminal", 2003419, 4682784, 4, { -15.104980f, 0.572263f, -27.316570f }, 1.000000f,
-                            0.000000f );
-    instance->registerEObj( "unknown_8", 2003452, 4615853, 4, { 0.000000f, 0.000000f, 0.000000f }, 1.000000f,
-                            0.000000f );
-    instance->registerEObj( "unknown_9", 2003678, 4663755, 4, { 16.207529f, 0.571903f, 28.091551f }, 1.000000f,
-                            0.000000f );
+    instance.registerEObj( "unknown_0", 2003412, 0, 4, { -1.586798f, 0.000000f, 6.322940f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_1", 2003413, 4592650, 4, { 0.246630f, 0.000000f, -0.575616f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_2", 2003414, 4596280, 4, { 2.330916f, 0.000000f, 1.675908f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_3", 2003411, 4585907, 4, { -0.036626f, -0.000000f, -0.514996f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_4", 2003392, 4632812, 4, { 0.000000f, -0.000002f, 0.000000f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_5", 2003393, 0, 4, { 16.296391f, -0.000002f, -4.751545f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_6", 2003394, 0, 4, { 11.781120f, -0.000001f, 4.780689f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_7", 2003391, 0, 4, { 8.938168f, 0.060000f, -11.440830f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "sgvf_w_btl_b0427", 2003427, 4664504, 4, { 0.000000f, 0.000000f, 0.000000f }, 1.000000f, -0.000000f ); 
+      // States -> on (id: 2) off (id: 3) 
+    instance.registerEObj( "Entrance", 2000182, 4614314, 5, { -0.059309f, -0.000001f, 15.090750f }, 1.000000f, 0.000000f ); 
+      // States -> vf_lock_on (id: 11) vf_lock_of (id: 12) 
+    instance.registerEObj( "Allaganterminal", 2003419, 4682784, 4, { -15.104980f, 0.572263f, -27.316570f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_8", 2003452, 4615853, 4, { 0.000000f, 0.000000f, 0.000000f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_9", 2003678, 4663755, 4, { 16.207529f, 0.571903f, 28.091551f }, 1.000000f, 0.000000f ); 
 
   }
 
-  void onUpdate( InstanceContentPtr instance, uint32_t currTime ) override
+  void onUpdate( InstanceContent& instance, uint32_t currTime ) override
   {
 
   }
 
-  void onEnterTerritory( InstanceContentPtr instance, Entity::Player& player, uint32_t eventId, uint16_t param1,
+  void onEnterTerritory( InstanceContent& instance, Entity::Player& player, uint32_t eventId, uint16_t param1,
                          uint16_t param2 ) override
   {
 
diff --git a/src/scripts/instances/raids/TheUnendingCoilofBahamutUltimate.cpp b/src/scripts/instances/raids/TheUnendingCoilofBahamutUltimate.cpp
index 0fa37f13..dbc2b0f6 100644
--- a/src/scripts/instances/raids/TheUnendingCoilofBahamutUltimate.cpp
+++ b/src/scripts/instances/raids/TheUnendingCoilofBahamutUltimate.cpp
@@ -9,36 +9,28 @@ class TheUnendingCoilofBahamutUltimate :
 public:
   TheUnendingCoilofBahamutUltimate() :
     Sapphire::ScriptAPI::InstanceContentScript( 30057 )
-  {
-  }
+  { }
 
-  void onInit( InstanceContentPtr instance ) override
+  void onInit( InstanceContent& instance ) override
   {
-    instance->registerEObj( "unknown_0", 2007457, 7040178, 4, { 0.000000f, 0.000000f, 0.000000f }, 1.000000f,
-                            0.000000f );
-    instance->registerEObj( "unknown_1", 2007457, 7040443, 4, { 0.000000f, 0.000000f, 0.000000f }, 1.000000f,
-                            0.000000f );
-    instance->registerEObj( "unknown_2", 2007457, 7040473, 4, { 0.000000f, 0.000000f, 0.000000f }, 1.000000f,
-                            0.000000f );
-    instance->registerEObj( "unknown_3", 2007457, 7144982, 4, { 0.000000f, 0.017127f, 0.000000f }, 1.000000f,
-                            0.000000f );
-    instance->registerEObj( "unknown_4", 2007457, 7075281, 4, { 0.000000f, 0.017127f, 0.000000f }, 1.000000f,
-                            0.000000f );
-    instance->registerEObj( "unknown_5", 2007457, 7144855, 4, { 0.000000f, 0.017127f, 0.000000f }, 1.000000f,
-                            0.000000f );
-    instance->registerEObj( "Exit", 2000139, 0, 4, { 0.000000f, 0.000000f, -20.000000f }, 1.000000f, 0.000000f );
-    instance->registerEObj( "Entrance", 2000182, 7068018, 5, { 0.000000f, 0.000000f, 18.000000f }, 1.000000f,
-                            0.000000f );
-    // States -> vf_lock_on vf_lock_of
+    instance.registerEObj( "unknown_0", 2007457, 7040178, 4, { 0.000000f, 0.000000f, 0.000000f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_1", 2007457, 7040443, 4, { 0.000000f, 0.000000f, 0.000000f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_2", 2007457, 7040473, 4, { 0.000000f, 0.000000f, 0.000000f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_3", 2007457, 7144982, 4, { 0.000000f, 0.017127f, 0.000000f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_4", 2007457, 7075281, 4, { 0.000000f, 0.017127f, 0.000000f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_5", 2007457, 7144855, 4, { 0.000000f, 0.017127f, 0.000000f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "Exit", 2000139, 0, 4, { 0.000000f, 0.000000f, -20.000000f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "Entrance", 2000182, 7068018, 5, { 0.000000f, 0.000000f, 18.000000f }, 1.000000f, 0.000000f ); 
+      // States -> vf_lock_on (id: 11) vf_lock_of (id: 12) 
 
   }
 
-  void onUpdate( InstanceContentPtr instance, uint32_t currTime ) override
+  void onUpdate( InstanceContent& instance, uint32_t currTime ) override
   {
 
   }
 
-  void onEnterTerritory( InstanceContentPtr instance, Entity::Player& player, uint32_t eventId, uint16_t param1,
+  void onEnterTerritory( InstanceContent& instance, Entity::Player& player, uint32_t eventId, uint16_t param1,
                          uint16_t param2 ) override
   {
 
diff --git a/src/scripts/instances/raids/TheVoidArk.cpp b/src/scripts/instances/raids/TheVoidArk.cpp
index 78ef23aa..f12516b2 100644
--- a/src/scripts/instances/raids/TheVoidArk.cpp
+++ b/src/scripts/instances/raids/TheVoidArk.cpp
@@ -9,20 +9,112 @@ class TheVoidArk :
 public:
   TheVoidArk() :
     Sapphire::ScriptAPI::InstanceContentScript( 30029 )
+  { }
+
+  void onInit( InstanceContent& instance ) override
   {
+    instance.registerEObj( "unknown_0", 2002735, 0, 4, { -288.000000f, 196.497299f, 30.140800f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "sgpl_w_lvd_b0118_col_char", 2002872, 5965588, 4, { -288.643890f, 196.450897f, 30.140779f }, 1.000000f, 0.000000f ); 
+      // States -> vf_bextwall_on (id: 3) vf_bextwall_of (id: 4) 
+    instance.registerEObj( "sgpl_w_lvd_b0118_col_char_1", 2002872, 5965606, 4, { -315.195099f, 196.497299f, 1.375446f }, 1.000000f, 0.000000f ); 
+      // States -> vf_bextwall_on (id: 3) vf_bextwall_of (id: 4) 
+    instance.registerEObj( "unknown_1", 2006489, 5961744, 4, { -289.112610f, 196.497299f, -1.589648f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_2", 2002735, 0, 4, { 0.220062f, -191.999893f, 170.174606f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "sgpl_w_lvd_b0118_col_char_2", 2002872, 5965590, 4, { 0.354952f, -191.297607f, 150.971207f }, 1.000000f, 0.000000f ); 
+      // States -> vf_bextwall_on (id: 3) vf_bextwall_of (id: 4) 
+    instance.registerEObj( "sgvf_w_lvd_b0118", 2002872, 6047090, 4, { -0.028858f, -192.000000f, 97.337067f }, 1.000000f, 0.000000f ); 
+      // States -> vf_bextwall_on (id: 3) vf_bextwall_of (id: 4) 
+    instance.registerEObj( "unknown_3", 2006559, 5996197, 4, { -0.306469f, -192.000000f, 68.934158f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_4", 2006595, 6067109, 4, { 0.064018f, -192.000107f, 129.936996f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_5", 2002735, 0, 4, { 288.000000f, -400.000000f, 205.443207f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "sgpl_w_lvd_b0118_col_char_3", 2002872, 5965591, 4, { 287.996399f, -400.000000f, 205.904694f }, 1.000000f, 0.000000f ); 
+      // States -> vf_bextwall_on (id: 3) vf_bextwall_of (id: 4) 
+    instance.registerEObj( "sgvf_z2r1_b0762", 2006503, 6046596, 4, { 288.000000f, -415.885803f, 122.751602f }, 1.000000f, 0.000000f ); 
+      // States -> tower_hide (id: 2) tower_show_anim (id: 4) tower_hide_anim (id: 5) 
+    instance.registerEObj( "sgvf_z2r1_b0762_1", 2006504, 6046597, 4, { 304.000000f, -415.885803f, 138.751602f }, 1.000000f, 0.000000f ); 
+      // States -> tower_hide (id: 2) tower_show_anim (id: 4) tower_hide_anim (id: 5) 
+    instance.registerEObj( "sgvf_z2r1_b0762_2", 2006505, 6046598, 4, { 288.000000f, -415.885803f, 154.751602f }, 1.000000f, 0.000000f ); 
+      // States -> tower_hide (id: 2) tower_show_anim (id: 4) tower_hide_anim (id: 5) 
+    instance.registerEObj( "sgvf_z2r1_b0762_3", 2006506, 6046599, 4, { 272.000000f, -415.885803f, 138.751602f }, 1.000000f, 0.000000f ); 
+      // States -> tower_hide (id: 2) tower_show_anim (id: 4) tower_hide_anim (id: 5) 
+    instance.registerEObj( "unknown_6", 2006507, 5960467, 4, { 287.856598f, -415.885803f, 143.716400f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_7", 2006508, 5960881, 4, { 285.596008f, -415.885803f, 140.864807f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "sgvf_z2r1_b0764", 2006509, 6046600, 4, { 302.141998f, -415.885803f, 124.609596f }, 1.000000f, 0.000000f ); 
+      // States -> sign_hide (id: 2) sign_show (id: 3) sign_show_anim (id: 4) sign_hide_anim (id: 5) 
+    instance.registerEObj( "sgvf_z2r1_b0764_1", 2006510, 6046601, 4, { 302.141998f, -415.885803f, 152.893600f }, 1.000000f, 0.000000f ); 
+      // States -> sign_hide (id: 2) sign_show (id: 3) sign_show_anim (id: 4) sign_hide_anim (id: 5) 
+    instance.registerEObj( "sgvf_z2r1_b0764_2", 2006511, 6046603, 4, { 273.858002f, -415.885803f, 152.893600f }, 1.000000f, 0.000000f ); 
+      // States -> sign_hide (id: 2) sign_show (id: 3) sign_show_anim (id: 4) sign_hide_anim (id: 5) 
+    instance.registerEObj( "sgvf_z2r1_b0764_3", 2006512, 6046605, 4, { 273.858002f, -415.885803f, 124.609596f }, 1.000000f, 0.000000f ); 
+      // States -> sign_hide (id: 2) sign_show (id: 3) sign_show_anim (id: 4) sign_hide_anim (id: 5) 
+    instance.registerEObj( "unknown_8", 2006557, 0, 4, { 287.799805f, -404.548615f, 195.221893f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_9", 2002735, 0, 4, { 288.000000f, -384.162506f, -95.628960f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "sgpl_w_lvd_b0118_col_char_4", 2002872, 5965592, 4, { 288.000000f, -384.162506f, -95.628960f }, 1.000000f, 0.000000f ); 
+      // States -> vf_bextwall_on (id: 3) vf_bextwall_of (id: 4) 
+    instance.registerEObj( "Exit", 2000139, 0, 4, { 288.126709f, -384.000000f, -148.276505f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_10", 2006553, 5963619, 4, { 315.121185f, -383.995300f, -124.638199f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_11", 2006554, 5963620, 4, { 306.932800f, -383.996399f, -105.577400f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_12", 2006555, 5963624, 4, { 269.917114f, -383.996613f, -104.726303f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_13", 2006556, 5963623, 4, { 260.673615f, -383.995697f, -124.058601f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_14", 2006558, 5962617, 4, { 290.482605f, -383.959595f, -120.825897f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "sgpl_w_lvd_collison_only", 2002618, 6081545, 4, { -299.194611f, 190.131699f, 168.493698f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_15", 2006480, 6038921, 4, { 0.900612f, -170.857101f, -94.333923f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_16", 2006481, 6038938, 4, { -0.336078f, -173.837097f, -233.919296f }, 0.991760f, 0.000048f ); 
+    instance.registerEObj( "unknown_17", 2006482, 6038951, 4, { 288.027313f, -389.776489f, 270.818390f }, 0.991760f, 0.000048f ); 
+    instance.registerEObj( "unknown_18", 2006483, 6038992, 4, { 287.894806f, -401.574585f, 187.283997f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_19", 2006484, 6038994, 4, { 284.993500f, -415.823212f, 86.327766f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_20", 2006485, 6039015, 4, { 287.921509f, -390.522614f, 3.389776f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "sgvf_w_lvd_b0118_1", 2002872, 5965364, 4, { -300.557312f, 212.000000f, 117.936600f }, 1.000000f, 0.000000f ); 
+      // States -> vf_bextwall_on (id: 3) vf_bextwall_of (id: 4) 
+    instance.registerEObj( "sgvf_w_lvd_b0118_2", 2002872, 5965516, 4, { -278.075989f, 212.000000f, 79.110680f }, 1.000000f, 0.000000f ); 
+      // States -> vf_bextwall_on (id: 3) vf_bextwall_of (id: 4) 
+    instance.registerEObj( "unknown_21", 2006486, 6035569, 4, { -315.424896f, 212.000000f, 174.253601f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_22", 2006487, 6034672, 4, { -258.244904f, 212.000000f, 126.032799f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "sgpl_z2r1_lvd_collison", 2006488, 6048680, 4, { -328.040894f, 212.000000f, 55.589699f }, 1.000000f, 0.000000f ); 
+      // States -> collison_off (id: 10) collison_on (id: 11) 
+    instance.registerEObj( "unknown_23", 2002735, 0, 4, { -419.231812f, 186.000000f, -74.560600f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "sgpl_w_lvd_b0118_col_char_5", 2002872, 5965586, 4, { -419.093201f, 186.000000f, -73.534798f }, 1.000000f, 0.000000f ); 
+      // States -> vf_bextwall_on (id: 3) vf_bextwall_of (id: 4) 
+    instance.registerEObj( "unknown_24", 2006513, 6035498, 4, { -419.235107f, 186.000000f, -161.599701f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_25", 2006514, 0, 4, { -431.485107f, 186.000000f, -119.195801f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_26", 2006515, 6035399, 4, { -436.306396f, 186.750000f, -119.027199f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_27", 2006516, 6035398, 4, { -435.929291f, 186.750000f, -118.520103f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_28", 2006517, 6035400, 4, { -436.270203f, 186.750000f, -119.108101f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_29", 2006518, 6035453, 4, { -456.071899f, 186.169495f, -117.249802f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_30", 2006519, 6046161, 4, { -422.286713f, 186.000000f, -116.948799f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_31", 2002735, 0, 4, { 0.000000f, -191.204102f, -65.541000f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "sgpl_w_lvd_b0118_col_char_6", 2002872, 5965587, 4, { -0.369300f, -191.254105f, -64.493927f }, 1.000000f, 0.000000f ); 
+      // States -> vf_bextwall_on (id: 3) vf_bextwall_of (id: 4) 
+    instance.registerEObj( "unknown_32", 2006490, 5960825, 4, { 0.213054f, -159.951599f, -180.332703f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_33", 2006491, 5960830, 4, { -8.808896f, -159.965195f, -172.749893f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_34", 2006492, 5960829, 4, { 0.816076f, -160.000000f, -164.794800f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_35", 2006493, 5960826, 4, { 9.567483f, -160.000000f, -172.413895f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_36", 2006494, 5960831, 4, { 11.416360f, -160.000000f, -185.623001f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_37", 2006495, 5960837, 4, { 21.345461f, -160.000000f, -178.053101f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_38", 2006496, 5960835, 4, { 21.132700f, -159.955307f, -155.512405f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_39", 2006497, 5960832, 4, { 10.413970f, -159.959305f, -145.012100f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_40", 2006498, 5960833, 4, { -11.132170f, -159.967697f, -145.107101f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_41", 2006499, 5960834, 4, { -23.702101f, -159.669800f, -155.260895f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_42", 2006500, 5960836, 4, { -22.808531f, -160.000000f, -178.798004f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_43", 2006501, 5960817, 4, { -11.047090f, -159.967697f, -185.956802f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "Basicconveyanceunit", 2006473, 5939346, 4, { -319.478088f, 216.000000f, 222.247696f }, 0.991760f, 0.000048f ); 
+    instance.registerEObj( "Basicconveyanceunit_1", 2006474, 5939357, 4, { -288.014099f, 196.138107f, 47.531738f }, 0.991760f, 0.000048f ); 
+    instance.registerEObj( "Basicconveyanceunit_2", 2006475, 5938845, 4, { -429.923004f, 190.000000f, -34.653320f }, 0.991760f, 0.000048f ); 
+    instance.registerEObj( "Basicconveyanceunit_3", 2006476, 5938846, 4, { 10.635500f, -192.000000f, 224.872192f }, 0.991760f, 0.000048f ); 
+    instance.registerEObj( "Basicconveyanceunit_4", 2006477, 5937335, 4, { 4.501404f, -192.000000f, -0.015320f }, 0.991760f, 0.000048f ); 
+    instance.registerEObj( "Basicconveyanceunit_5", 2006478, 5941617, 4, { 283.497314f, -400.000000f, 229.022598f }, 0.991760f, 0.000048f ); 
+    instance.registerEObj( "Basicconveyanceunit_6", 2006479, 5941618, 4, { 292.469604f, -400.000000f, 48.325321f }, 0.991760f, 0.000048f ); 
+    instance.registerEObj( "Entrance", 2000182, 5965017, 5, { -312.459290f, 216.000000f, 229.715897f }, 1.000000f, 0.000000f ); 
+      // States -> vf_lock_on (id: 11) vf_lock_of (id: 12) 
+
   }
 
-  void onInit( InstanceContentPtr instance ) override
+  void onUpdate( InstanceContent& instance, uint32_t currTime ) override
   {
 
   }
 
-  void onUpdate( InstanceContentPtr instance, uint32_t currTime ) override
-  {
-
-  }
-
-  void onEnterTerritory( InstanceContentPtr instance, Entity::Player& player, uint32_t eventId, uint16_t param1,
+  void onEnterTerritory( InstanceContent& instance, Entity::Player& player, uint32_t eventId, uint16_t param1,
                          uint16_t param2 ) override
   {
 
diff --git a/src/scripts/instances/raids/TheWeaponsRefrainUltimate.cpp b/src/scripts/instances/raids/TheWeaponsRefrainUltimate.cpp
index 3a961b9f..7f396e1b 100644
--- a/src/scripts/instances/raids/TheWeaponsRefrainUltimate.cpp
+++ b/src/scripts/instances/raids/TheWeaponsRefrainUltimate.cpp
@@ -9,39 +9,31 @@ class TheWeaponsRefrainUltimate :
 public:
   TheWeaponsRefrainUltimate() :
     Sapphire::ScriptAPI::InstanceContentScript( 30067 )
+  { }
+
+  void onInit( InstanceContent& instance ) override
   {
+    instance.registerEObj( "unknown_0", 2009480, 0, 4, { 94.011192f, 0.000000f, 107.700996f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "sgvf_w1fz_b1432", 2007457, 7372735, 4, { 100.000000f, 0.000000f, 100.000000f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_1", 2007457, 7373056, 4, { 100.000000f, 0.000000f, 100.000000f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_2", 2009481, 0, 4, { 101.695602f, 0.000000f, 101.959396f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_3", 2007457, 7237754, 4, { 100.000000f, 0.000000f, 100.000000f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_4", 2007457, 7237753, 4, { 100.000000f, 0.000000f, 100.000000f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_5", 2007457, 7237756, 4, { 100.000000f, 0.000000f, 100.000000f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_6", 2007457, 7237755, 4, { 100.000000f, 0.000000f, 100.000000f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "Entrance", 2007457, 7343478, 5, { 100.000000f, 0.000000f, 116.000000f }, 1.000000f, 0.000000f ); 
+      // States -> vf_lock_on (id: 11) vf_lock_of (id: 12) 
+    instance.registerEObj( "Exit", 2000139, 0, 4, { 100.000000f, 0.000000f, 85.000000f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_7", 2007457, 7538258, 4, { 100.160004f, 0.000000f, 101.443398f }, 1.000000f, 0.000000f ); 
+
   }
 
-  void onInit( InstanceContentPtr instance ) override
-  {
-    instance->registerEObj( "unknown_0", 2009480, 0, 4, { 94.011192f, 0.000000f, 107.700996f }, 1.000000f, 0.000000f );
-    instance->registerEObj( "sgvf_w1fz_b1432", 2007457, 7372735, 4, { 100.000000f, 0.000000f, 100.000000f }, 1.000000f,
-                            0.000000f );
-    instance->registerEObj( "unknown_1", 2007457, 7373056, 4, { 100.000000f, 0.000000f, 100.000000f }, 1.000000f,
-                            0.000000f );
-    instance->registerEObj( "unknown_2", 2009481, 0, 4, { 101.695602f, 0.000000f, 101.959396f }, 1.000000f, 0.000000f );
-    instance->registerEObj( "unknown_3", 2007457, 7237754, 4, { 100.000000f, 0.000000f, 100.000000f }, 1.000000f,
-                            0.000000f );
-    instance->registerEObj( "unknown_4", 2007457, 7237753, 4, { 100.000000f, 0.000000f, 100.000000f }, 1.000000f,
-                            0.000000f );
-    instance->registerEObj( "unknown_5", 2007457, 7237756, 4, { 100.000000f, 0.000000f, 100.000000f }, 1.000000f,
-                            0.000000f );
-    instance->registerEObj( "unknown_6", 2007457, 7237755, 4, { 100.000000f, 0.000000f, 100.000000f }, 1.000000f,
-                            0.000000f );
-    instance->registerEObj( "Entrance", 2007457, 7343478, 5, { 100.000000f, 0.000000f, 116.000000f }, 1.000000f,
-                            0.000000f );
-    // States -> vf_lock_on vf_lock_of
-    instance->registerEObj( "Exit", 2000139, 0, 4, { 100.000000f, 0.000000f, 85.000000f }, 1.000000f, 0.000000f );
-    instance->registerEObj( "unknown_7", 2007457, 7538258, 4, { 100.160004f, 0.000000f, 101.443398f }, 1.000000f,
-                            0.000000f );
-  }
-
-  void onUpdate( InstanceContentPtr instance, uint32_t currTime ) override
+  void onUpdate( InstanceContent& instance, uint32_t currTime ) override
   {
 
   }
 
-  void onEnterTerritory( InstanceContentPtr instance, Entity::Player& player, uint32_t eventId, uint16_t param1,
+  void onEnterTerritory( InstanceContent& instance, Entity::Player& player, uint32_t eventId, uint16_t param1,
                          uint16_t param2 ) override
   {
 
diff --git a/src/scripts/instances/raids/TheWeepingCityofMhach.cpp b/src/scripts/instances/raids/TheWeepingCityofMhach.cpp
index 42932054..a4cbd323 100644
--- a/src/scripts/instances/raids/TheWeepingCityofMhach.cpp
+++ b/src/scripts/instances/raids/TheWeepingCityofMhach.cpp
@@ -9,20 +9,110 @@ class TheWeepingCityofMhach :
 public:
   TheWeepingCityofMhach() :
     Sapphire::ScriptAPI::InstanceContentScript( 30038 )
+  { }
+
+  void onInit( InstanceContent& instance ) override
   {
+    instance.registerEObj( "unknown_0", 2002735, 0, 4, { 16.000000f, -0.599972f, -25.600000f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "sgpl_w_lvd_b0118_wide", 2002872, 6255278, 4, { 15.499620f, -0.600000f, -32.576271f }, 1.000000f, 0.000000f ); 
+      // States -> vf_bextwall_on (id: 3) vf_bextwall_of (id: 4) 
+    instance.registerEObj( "sgpl_w_lvd_b0118_wide_1", 2002872, 6255280, 4, { 16.000000f, -0.599986f, -84.500000f }, 1.200000f, 0.000000f ); 
+      // States -> vf_bextwall_on (id: 3) vf_bextwall_of (id: 4) 
+    instance.registerEObj( "unknown_1", 2007130, 6259583, 4, { 16.141850f, -0.600000f, -58.088329f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "sgvf_z2r2_b0919", 2007131, 6271618, 4, { 16.141850f, -0.600000f, -58.088329f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_2", 2007127, 6263439, 4, { 2.786298f, 1.130917f, -81.495903f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_3", 2007128, 6263438, 4, { 44.322010f, 1.937706f, -52.936489f }, 0.991760f, 0.000048f ); 
+    instance.registerEObj( "unknown_4", 2007129, 6263356, 4, { -1.414551f, 2.361187f, -31.816429f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_5", 2002735, 0, 4, { -300.000000f, -73.990967f, -386.829315f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "sgpl_w_lvd_b0118_wide_2", 2002872, 6256300, 4, { -298.284485f, -74.099991f, -394.606812f }, 1.000000f, 0.000000f ); 
+      // States -> vf_bextwall_on (id: 3) vf_bextwall_of (id: 4) 
+    instance.registerEObj( "unknown_6", 2002872, 6252961, 4, { -298.284485f, -74.000061f, -446.164307f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_7", 2007174, 0, 4, { -301.925903f, -74.099998f, -434.771606f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "sgvf_z2r2_b0917", 2007175, 6275855, 4, { -305.091309f, -74.099998f, -434.266205f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "sgvf_z2r2_b0909", 2007176, 6275857, 4, { -299.330200f, -74.099998f, -441.272186f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_8", 2000034, 6252960, 4, { -301.382507f, -74.111649f, -397.150391f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_9", 2000035, 0, 4, { -300.012909f, -74.111687f, -411.038788f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_10", 2002735, 0, 4, { 280.000000f, -468.750000f, -352.734314f }, 0.991760f, 0.000048f ); 
+    instance.registerEObj( "sgpl_w_lvd_b0118_wide_3", 2002872, 6256312, 4, { 279.076385f, -468.799988f, -346.734894f }, 1.000000f, 0.000000f ); 
+      // States -> vf_bextwall_on (id: 3) vf_bextwall_of (id: 4) 
+    instance.registerEObj( "unknown_11", 2007092, 6246904, 4, { 271.681488f, -269.434998f, 263.484192f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_12", 2007093, 6246906, 4, { 299.983093f, -269.438812f, 263.439911f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_13", 2007094, 6246909, 4, { 328.133606f, -269.459900f, 263.349915f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_14", 2007095, 6246905, 4, { 272.007812f, -270.624695f, 249.703201f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_15", 2007096, 6246907, 4, { 299.972198f, -270.615295f, 249.808594f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_16", 2007097, 6246910, 4, { 327.886597f, -270.637299f, 249.556503f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "sgvf_z2r2_b0908", 2007098, 6276590, 4, { 271.976288f, -270.275513f, 254.027298f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "sgvf_z2r2_b0908_1", 2007099, 6276603, 4, { 300.073914f, -270.279907f, 253.881897f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "sgvf_z2r2_b0908_2", 2007100, 6276618, 4, { 328.117798f, -270.282501f, 253.919098f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "sgvf_z2r2_b0906", 2007101, 6277276, 4, { 300.580688f, -329.902802f, 215.101807f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_17", 2007102, 0, 4, { 313.999695f, -254.436203f, 249.057007f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_18", 2007091, 6253623, 4, { 280.196686f, -468.799988f, -340.444214f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "sgvf_w_lvd_b0186", 2000015, 6323645, 4, { 280.035004f, -444.700012f, -381.003815f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "sgvf_w_lvd_b0186_1", 2000015, 6323651, 4, { 255.731705f, -444.700012f, -423.649811f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "sgvf_w_lvd_b0186_2", 2000015, 6323650, 4, { 304.734985f, -444.700012f, -424.385590f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "sgvf_z2r2_b0954", 2007350, 6405524, 4, { 280.000000f, -446.006287f, -410.000000f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "sgpl_w_cylinder_col_on_off", 2002618, 6405504, 4, { 271.693695f, -445.000000f, -398.334412f }, 1.000000f, 0.000000f ); 
+      // States -> col_on (id: 17) col_off (id: 18) 
+    instance.registerEObj( "sgbg_z2r2_a4_navi1", 2002618, 6413337, 4, { 284.413513f, -444.945587f, -428.864410f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_19", 2002735, 0, 4, { -300.007690f, -436.179108f, -3.677429f }, 0.991760f, 0.000048f ); 
+    instance.registerEObj( "sgpl_w_lvd_b0118_wide_4", 2002872, 6256352, 4, { -299.044006f, -436.200012f, 1.934000f }, 1.000000f, 0.000000f ); 
+      // States -> vf_bextwall_on (id: 3) vf_bextwall_of (id: 4) 
+    instance.registerEObj( "Exit", 2000139, 0, 4, { -300.007690f, -436.057098f, -56.789539f }, 0.991760f, 0.000048f ); 
+    instance.registerEObj( "unknown_20", 2000019, 6223041, 4, { -293.815094f, -436.100006f, -36.657909f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "sgvf_z2r2_b0955", 2007363, 6403167, 4, { -300.000000f, -436.100006f, -34.000000f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_21", 2007381, 0, 4, { -288.659698f, -436.100006f, -36.228500f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_22", 2007104, 6253621, 4, { -293.853302f, -417.190002f, 338.020691f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_23", 2007105, 6262270, 4, { 279.377411f, -481.421112f, -273.999298f }, 1.000000f, 0.000048f ); 
+    instance.registerEObj( "unknown_24", 2007106, 6253622, 4, { 282.739197f, -506.212494f, -377.761414f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_25", 2007630, 0, 4, { -307.311310f, -74.111656f, -404.095490f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "sgvf_z2r2_b0606", 2007457, 6873350, 4, { -287.981812f, -74.111671f, -418.439789f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "b0893_onen_y_qic_s", 2007457, 7008372, 4, { -286.682404f, -74.111656f, -414.302185f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_26", 2000034, 6252960, 4, { -299.669098f, -74.111687f, -422.791412f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "sgbg_w_qic_004_03a", 2008306, 6873007, 4, { -299.592712f, -123.000000f, -313.306885f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_27", 2002735, 0, 4, { -300.000000f, -73.990967f, -386.829315f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "sgbg_w_qic_004_03a_1", 2002872, 6873032, 4, { -298.298706f, -74.113159f, -394.613586f }, 0.991760f, 0.000048f ); 
+    instance.registerEObj( "unknown_28", 2007112, 6252937, 4, { -258.522614f, -114.655602f, -231.454193f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_29", 2007112, 6403165, 4, { -360.672485f, -116.000198f, -271.268707f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "sgpl_a_evt_flyingship02", 2008452, 6889796, 4, { -239.520905f, -116.014397f, -230.853806f }, 0.991760f, 0.000048f ); 
+    instance.registerEObj( "sgbg_w_qic_004_03a_2", 2007457, 6941894, 4, { -299.583099f, -75.000023f, -353.118500f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_30", 2007108, 6252917, 4, { 52.989189f, 8.000000f, 109.725502f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_31", 2007109, 6252933, 4, { 40.849979f, 7.999999f, 54.685509f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "sgvf_z2r2_b0893", 2007110, 6258888, 4, { -217.946503f, -116.000000f, -210.519608f }, 0.991760f, 0.000048f ); 
+    instance.registerEObj( "sgvf_z2r2_b0893_1", 2007111, 6258889, 4, { -351.721313f, -116.000000f, -260.105499f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_32", 2007112, 6252937, 4, { -249.593796f, -116.000000f, -229.014603f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_33", 2007112, 6403165, 4, { -354.681885f, -116.000298f, -278.960693f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_34", 2002735, 0, 4, { -185.956604f, -394.699890f, 235.090607f }, 1.000000f, 1.047197f ); 
+    instance.registerEObj( "sgpl_w_lvd_b0118_col_char", 2002872, 6259368, 4, { -189.835297f, -394.768494f, 236.985107f }, 1.000000f, 0.000000f ); 
+      // States -> vf_bextwall_on (id: 3) vf_bextwall_of (id: 4) 
+    instance.registerEObj( "sgpl_w_lvd_b0118_col_char_1", 2002872, 6259369, 4, { -152.910706f, -394.522003f, 215.716797f }, 0.991760f, 0.000048f ); 
+      // States -> vf_bextwall_on (id: 3) vf_bextwall_of (id: 4) 
+    instance.registerEObj( "unknown_35", 2007114, 6265979, 4, { -179.125702f, -394.522003f, 205.950897f }, 0.991760f, 0.000048f ); 
+    instance.registerEObj( "unknown_36", 2007115, 6265980, 4, { -157.763107f, -394.522003f, 242.664200f }, 0.991760f, 0.000048f ); 
+    instance.registerEObj( "unknown_37", 2007116, 6265977, 4, { -181.536697f, -394.522003f, 201.556396f }, 0.991760f, 0.000048f ); 
+    instance.registerEObj( "unknown_38", 2007117, 6275728, 4, { -180.590607f, -394.522003f, 231.158905f }, 0.991760f, 0.000048f ); 
+    instance.registerEObj( "unknown_39", 2007118, 6262272, 4, { -156.623795f, -394.500092f, 244.445908f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_40", 2007119, 6264911, 4, { -168.688507f, -391.866913f, 224.567001f }, 0.991760f, 0.000048f ); 
+    instance.registerEObj( "unknown_41", 2007378, 6404242, 4, { -170.886597f, -394.500092f, 228.890305f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_42", 2007379, 6404243, 4, { -174.892807f, -394.500092f, 226.853806f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "Basicconveyanceunit", 2007054, 6277013, 4, { 29.465090f, 12.072440f, 173.291306f }, 0.991760f, 0.000048f ); 
+    instance.registerEObj( "Basicconveyanceunit_1", 2007055, 6277014, 4, { 10.055660f, 10.610950f, 59.293789f }, 0.991760f, 0.000048f ); 
+    instance.registerEObj( "Basicconveyanceunit_2", 2007056, 6277015, 4, { 21.985451f, -1.159537f, -124.736298f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "Basicconveyanceunit_3", 2007057, 6277012, 4, { -290.684998f, -71.292747f, -368.263885f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "Basicconveyanceunit_4", 2007058, 6235460, 4, { -244.833099f, -390.428986f, 258.731689f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "Basicconveyanceunit_5", 2007059, 6235461, 4, { 276.184296f, -461.318604f, -294.996796f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "Basicconveyanceunit_6", 2007060, 6235463, 4, { -304.521301f, -435.890594f, 23.143780f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_43", 2007103, 6259793, 4, { 16.303080f, -3.864367f, -114.426003f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "Entrance", 2000182, 6247654, 5, { 81.884888f, 13.000000f, 208.698303f }, 0.991760f, 0.292740f ); 
+      // States -> vf_lock_on (id: 11) vf_lock_of (id: 12) 
+
   }
 
-  void onInit( InstanceContentPtr instance ) override
+  void onUpdate( InstanceContent& instance, uint32_t currTime ) override
   {
 
   }
 
-  void onUpdate( InstanceContentPtr instance, uint32_t currTime ) override
-  {
-
-  }
-
-  void onEnterTerritory( InstanceContentPtr instance, Entity::Player& player, uint32_t eventId, uint16_t param1,
+  void onEnterTerritory( InstanceContent& instance, Entity::Player& player, uint32_t eventId, uint16_t param1,
                          uint16_t param2 ) override
   {
 
diff --git a/src/scripts/instances/raids/TheWorldofDarkness.cpp b/src/scripts/instances/raids/TheWorldofDarkness.cpp
index 278a85b5..8ee8670f 100644
--- a/src/scripts/instances/raids/TheWorldofDarkness.cpp
+++ b/src/scripts/instances/raids/TheWorldofDarkness.cpp
@@ -9,226 +9,136 @@ class TheWorldofDarkness :
 public:
   TheWorldofDarkness() :
     Sapphire::ScriptAPI::InstanceContentScript( 30020 )
-  {
-  }
+  { }
 
-  void onInit( InstanceContentPtr instance ) override
+  void onInit( InstanceContent& instance ) override
   {
-    instance->registerEObj( "sgvf_w_lvd_b0118", 2002872, 5033058, 4, { -148.309006f, 25.000000f, 327.505005f },
-                            1.000000f, -0.785398f );
-    // States -> vf_bextwall_on vf_bextwall_of
-    instance->registerEObj( "unknown_0", 2002735, 0, 4, { -147.190506f, 34.000000f, 326.593597f }, 1.000000f,
-                            0.000000f );
-    instance->registerEObj( "sgvf_w_lvd_b0118_1", 2002872, 5033059, 4, { -116.020401f, 25.000000f, 291.514313f },
-                            1.000000f, 0.000000f );
-    // States -> vf_bextwall_on vf_bextwall_of
-    instance->registerEObj( "unknown_1", 2004749, 5022919, 4, { -150.811707f, 33.999840f, 292.778412f }, 1.000000f,
-                            0.000000f );
-    instance->registerEObj( "unknown_2", 2004750, 5022920, 4, { -143.519608f, 34.000000f, 294.027710f }, 1.000000f,
-                            0.000000f );
-    instance->registerEObj( "unknown_3", 2004751, 5022915, 4, { -143.096893f, 34.000000f, 301.814209f }, 1.000000f,
-                            0.000000f );
-    instance->registerEObj( "unknown_4", 2004752, 5022916, 4, { -151.221893f, 34.000000f, 301.291809f }, 1.000000f,
-                            0.000000f );
-    instance->registerEObj( "unknown_5", 2004753, 5034307, 4, { -153.117905f, 34.000000f, 292.031494f }, 0.991760f,
-                            0.000048f );
-    instance->registerEObj( "unknown_6", 2004754, 5034303, 4, { -141.245300f, 34.000000f, 291.586212f }, 1.000000f,
-                            0.000000f );
-    instance->registerEObj( "unknown_7", 2004755, 5034301, 4, { -141.807693f, 34.000000f, 303.198395f }, 1.000000f,
-                            0.000000f );
-    instance->registerEObj( "unknown_8", 2004756, 5034306, 4, { -151.877304f, 34.000000f, 303.085297f }, 1.000000f,
-                            0.000000f );
-    instance->registerEObj( "unknown_9", 2004748, 5033636, 4, { -149.922104f, 34.000000f, 293.955414f }, 1.000000f,
-                            0.000000f );
-    instance->registerEObj( "unknown_10", 2004774, 5033642, 4, { -144.841095f, 34.000000f, 295.275208f }, 1.000000f,
-                            0.000000f );
-    instance->registerEObj( "unknown_11", 2004775, 5033641, 4, { -144.940308f, 34.000000f, 300.121399f }, 1.000000f,
-                            0.000000f );
-    instance->registerEObj( "unknown_12", 2004776, 5033639, 4, { -150.097397f, 34.000000f, 299.867798f }, 1.000000f,
-                            0.000000f );
-    instance->registerEObj( "sgvf_l1r3_b0541a", 2005026, 5444436, 4, { -147.017593f, 34.000000f, 317.352814f },
-                            1.000000f, 0.000000f );
-    // States -> boss_pop_off_a boss_pop_on_a boss_pop_on_c
-    instance->registerEObj( "sgvf_w_lvd_b0118_2", 2002872, 5033193, 4, { 200.082001f, 81.974503f, 211.096603f },
-                            1.000000f, -0.785398f );
-    // States -> vf_bextwall_on vf_bextwall_of
-    instance->registerEObj( "unknown_13", 2002735, 0, 4, { 200.000000f, 82.124329f, 208.778595f }, 1.000000f,
-                            0.000000f );
-    instance->registerEObj( "sgvf_w_lvd_b0118_3", 2002872, 5035970, 4, { 167.647797f, 81.909058f, 178.824493f },
-                            1.000000f, 0.000000f );
-    // States -> vf_bextwall_on vf_bextwall_of
-    instance->registerEObj( "unknown_14", 2004777, 0, 4, { 192.319397f, 82.000000f, 182.835999f }, 1.000000f,
-                            0.000000f );
-    instance->registerEObj( "unknown_15", 2004778, 0, 4, { 197.039703f, 81.986687f, 184.863007f }, 0.991760f,
-                            0.000048f );
-    instance->registerEObj( "unknown_16", 2004779, 0, 4, { 204.338196f, 82.000000f, 183.053802f }, 1.000000f,
-                            0.000000f );
-    instance->registerEObj( "unknown_17", 2004780, 0, 4, { 189.642700f, 82.000000f, 176.451202f }, 1.000000f,
-                            0.000000f );
-    instance->registerEObj( "unknown_18", 2005018, 0, 4, { 199.442200f, 82.000000f, 183.869598f }, 1.000000f,
-                            0.000000f );
-    instance->registerEObj( "unknown_19", 2002587, 0, 4, { 0.000000f, 129.250000f, -157.414307f }, 1.000000f,
-                            0.000000f );
-    instance->registerEObj( "sgvf_w_lvd_b0118_4", 2002872, 5040833, 4, { -0.855141f, 129.250000f, -164.190598f },
-                            0.991760f, -0.785362f );
-    // States -> vf_bextwall_on vf_bextwall_of
-    instance->registerEObj( "unknown_20", 2002872, 5039743, 4, { 0.048592f, 128.906403f, -155.346100f }, 1.000000f,
-                            0.000000f );
-    instance->registerEObj( "Openfetter", 2004787, 0, 4, { 2.542549f, 129.250000f, -205.570496f }, 1.000000f,
-                            0.000000f );
-    instance->registerEObj( "Openfetter_1", 2004789, 0, 4, { 3.817404f, 129.250000f, -207.100800f }, 1.000000f,
-                            0.000000f );
-    instance->registerEObj( "Magickedfetter", 2004790, 5039668, 4, { -17.519341f, 129.250000f, -235.697693f },
-                            1.000000f, 0.000000f );
-    instance->registerEObj( "Magickedfetter_1", 2004791, 5039667, 4, { 17.275551f, 129.198105f, -235.656799f },
-                            0.991760f, 0.000048f );
-    instance->registerEObj( "unknown_21", 2004808, 5039717, 4, { -10.696810f, -497.601990f, -204.956100f }, 1.000000f,
-                            0.000000f );
-    instance->registerEObj( "unknown_22", 2004809, 5039714, 4, { 6.635397f, -498.601898f, -210.257507f }, 1.000000f,
-                            0.000000f );
-    instance->registerEObj( "unknown_23", 2004810, 5039710, 4, { 11.312720f, -498.093597f, -196.581207f }, 1.000000f,
-                            0.000000f );
-    instance->registerEObj( "unknown_24", 2004811, 5039721, 4, { -9.022294f, -499.107513f, -190.416397f }, 1.000000f,
-                            0.000000f );
-    instance->registerEObj( "unknown_25", 2004548, 0, 4, { 1.212110f, 129.300003f, -202.733398f }, 1.000000f,
-                            0.000000f );
-    instance->registerEObj( "unknown_26", 2002735, 0, 4, { -0.000000f, 143.250000f, -314.710114f }, 1.000000f,
-                            0.000048f );
-    instance->registerEObj( "sgvf_w_lvd_b0118_5", 2002872, 5041153, 4, { -0.147327f, 143.250000f, -328.516998f },
-                            0.991760f, -0.785362f );
-    // States -> vf_bextwall_on vf_bextwall_of
-    instance->registerEObj( "unknown_27", 2004732, 5039981, 4, { -0.015320f, 143.236298f, -316.334808f }, 0.991760f,
-                            0.000048f );
-    instance->registerEObj( "Exit", 2000139, 0, 4, { -299.977112f, 279.987701f, -420.645508f }, 0.991760f, 0.000048f );
-    instance->registerEObj( "unknown_28", 2004814, 0, 4, { -300.240906f, 280.000000f, -402.510712f }, 1.000000f,
-                            0.000000f );
-    instance->registerEObj( "unknown_29", 2004815, 0, 4, { -300.687103f, 280.000000f, -398.160706f }, 1.000000f,
-                            0.000000f );
-    instance->registerEObj( "unknown_30", 2004620, 0, 4, { 0.203211f, 129.250000f, -202.244904f }, 1.000000f,
-                            0.000000f );
-    instance->registerEObj( "sgvf_w_btl_b0528", 2004816, 5041561, 4, { -304.280212f, 279.987701f, -415.243805f },
-                            0.991760f, 0.000048f );
-    // States -> baria_off baria_omen_a baria_omen_b baria_a baria_b baria_c
-    instance->registerEObj( "sgvf_w_btl_b0528_1", 2004817, 5041563, 4, { -286.856506f, 280.000000f, -392.695404f },
-                            1.000000f, 0.000000f );
-    // States -> baria_off baria_omen_a baria_omen_b baria_a baria_b baria_c
-    instance->registerEObj( "sgvf_w_btl_b0528_2", 2004818, 5041562, 4, { -313.290710f, 280.000000f, -392.472412f },
-                            1.000000f, 0.000000f );
-    // States -> baria_off baria_omen_a baria_omen_b baria_a baria_b baria_c
-    instance->registerEObj( "sgvf_w_lvd_b0118_6", 2002872, 5032353, 4, { -54.450321f, 16.000000f, 406.409088f },
-                            1.000000f, -0.785398f );
-    // States -> vf_bextwall_on vf_bextwall_of
-    instance->registerEObj( "unknown_31", 2002735, 0, 4, { -56.151901f, 16.000000f, 403.855896f }, 1.000000f,
-                            -0.785398f );
-    instance->registerEObj( "sgvf_w_lvd_b0118_7", 2002872, 5032356, 4, { -102.950996f, 16.000000f, 383.202911f },
-                            1.000000f, 0.000000f );
-    // States -> vf_bextwall_on vf_bextwall_of
-    instance->registerEObj( "sgvf_l1r3_b0541b", 2004735, 5437119, 4, { -76.985458f, 16.000000f, 382.746613f },
-                            1.000000f, 0.000000f );
-    // States -> boss_pop2_off_a boss_pop2_on_a
-    instance->registerEObj( "unknown_32", 2004736, 0, 4, { -74.916229f, 16.000000f, 380.485291f }, 1.000000f,
-                            0.000000f );
-    instance->registerEObj( "unknown_33", 2002735, 0, 4, { 99.718719f, 63.999989f, 265.143799f }, 1.000000f,
-                            -1.570451f );
-    instance->registerEObj( "sgvf_w_lvd_b0118_8", 2002872, 5035968, 4, { 95.926514f, 63.980949f, 265.796906f },
-                            0.991760f, -0.785362f );
-    // States -> vf_bextwall_on vf_bextwall_of
-    instance->registerEObj( "sgvf_w_lvd_b0118_9", 2002872, 5035969, 4, { 167.944199f, 65.533363f, 264.945587f },
-                            1.000000f, 0.000000f );
-    // States -> vf_bextwall_on vf_bextwall_of
-    instance->registerEObj( "Treasurecoffer", 2004745, 0, 4, { 130.000000f, 63.999989f, 264.710388f }, 1.000000f,
-                            1.570796f );
-    instance->registerEObj( "sgvf_l1r3_b0541b_1", 2004738, 5437120, 4, { 130.000000f, 65.431679f, 264.710388f },
-                            0.991760f, 0.000048f );
-    // States -> boss_pop2_off_a boss_pop2_on_a
-    instance->registerEObj( "sgvf_w_lvd_b0556", 2004739, 5037994, 4, { 138.468002f, 63.999989f, 275.781311f },
-                            1.000000f, 0.000000f );
-    // States -> void_off_a void_off_b void_on_a void_omen
-    instance->registerEObj( "sgvf_w_lvd_b0556_1", 2004740, 5037996, 4, { 129.901001f, 63.999729f, 278.588593f },
-                            1.000000f, 0.000000f );
-    // States -> void_off_a void_off_b void_on_a void_omen
-    instance->registerEObj( "sgvf_w_lvd_b0556_2", 2004741, 5037997, 4, { 121.644699f, 63.999729f, 275.762695f },
-                            1.000000f, 0.000000f );
-    // States -> void_off_a void_off_b void_on_a void_omen
-    instance->registerEObj( "sgvf_w_lvd_b0556_3", 2004742, 5037998, 4, { 138.356506f, 63.999989f, 250.555603f },
-                            1.000000f, 0.000000f );
-    // States -> void_off_a void_off_b void_on_a void_omen
-    instance->registerEObj( "sgvf_w_lvd_b0556_4", 2004743, 5037999, 4, { 129.881393f, 64.000031f, 250.721893f },
-                            1.000000f, 0.000000f );
-    // States -> void_off_a void_off_b void_on_a void_omen
-    instance->registerEObj( "sgvf_w_lvd_b0556_5", 2004744, 5038000, 4, { 121.628601f, 63.999989f, 250.572296f },
-                            1.000000f, 0.000000f );
-    // States -> void_off_a void_off_b void_on_a void_omen
-    instance->registerEObj( "sgvf_w_lvd_b0557", 2004746, 5037995, 4, { 130.020493f, 63.999748f, 279.027191f },
-                            1.000000f, 0.000000f );
-    // States -> void_off_a void_off_b void_on_a void_omen
-    instance->registerEObj( "sgvf_w_lvd_b0557_1", 2004747, 5038001, 4, { 130.056702f, 63.999989f, 249.980301f },
-                            1.000000f, 0.000000f );
-    // States -> void_off_a void_off_b void_on_a void_omen
-    instance->registerEObj( "unknown_34", 2002735, 0, 4, { 0.000000f, 94.750053f, 84.669502f }, 0.991760f, 0.000048f );
-    instance->registerEObj( "unknown_35", 2004788, 5499560, 4, { 0.320374f, 95.231567f, 31.296261f }, 0.991760f,
-                            0.000048f );
-    instance->registerEObj( "unknown_36", 2004792, 5038584, 4, { -28.578890f, 95.250008f, 39.174721f }, 1.000000f,
-                            0.000000f );
-    instance->registerEObj( "unknown_37", 2004793, 5038586, 4, { -21.418350f, 95.250008f, 51.649750f }, 1.000000f,
-                            0.000000f );
-    instance->registerEObj( "unknown_38", 2004794, 5038587, 4, { -33.994980f, 95.250008f, 58.976070f }, 0.991760f,
-                            0.000048f );
-    instance->registerEObj( "unknown_39", 2004795, 5038580, 4, { -41.014271f, 95.250008f, 46.442242f }, 1.000000f,
-                            0.000000f );
-    instance->registerEObj( "unknown_40", 2004796, 5038588, 4, { 7.240406f, 95.250008f, -12.319770f }, 1.000000f,
-                            0.000000f );
-    instance->registerEObj( "unknown_41", 2004797, 5038590, 4, { 7.179711f, 95.250008f, 2.152661f }, 1.000000f,
-                            0.000000f );
-    instance->registerEObj( "unknown_42", 2004798, 5038589, 4, { -7.245643f, 95.250008f, 2.096094f }, 1.000000f,
-                            0.000000f );
-    instance->registerEObj( "unknown_43", 2004799, 5038570, 4, { -7.080731f, 95.250008f, -12.155750f }, 1.000000f,
-                            0.000000f );
-    instance->registerEObj( "unknown_44", 2004800, 5038591, 4, { 41.068710f, 95.250008f, 46.325569f }, 1.000000f,
-                            0.000000f );
-    instance->registerEObj( "unknown_45", 2004801, 5038592, 4, { 33.762070f, 95.250008f, 58.721840f }, 1.000000f,
-                            0.000000f );
-    instance->registerEObj( "unknown_46", 2004802, 5038593, 4, { 21.204290f, 95.250008f, 51.578461f }, 1.000000f,
-                            0.000000f );
-    instance->registerEObj( "unknown_47", 2004803, 5038571, 4, { 28.640770f, 95.250008f, 39.349319f }, 1.000000f,
-                            0.000000f );
-    instance->registerEObj( "sgvf_w_lvd_b0250", 2002872, 5038256, 4, { -0.165812f, 94.731613f, 85.317574f }, 0.991760f,
-                            -0.785362f );
-    // States -> vf_bextwall_on vf_bextwall_of
-    instance->registerEObj( "unknown_48", 2004784, 5489265, 4, { 0.294310f, 90.349991f, 22.469700f }, 0.991760f,
-                            0.000048f );
-    instance->registerEObj( "unknown_49", 2005042, 5476812, 4, { -0.380919f, 99.969032f, 29.779119f }, 1.000000f,
-                            0.000000f );
-    instance->registerEObj( "Entrance", 2000182, 5032012, 5, { 0.112444f, 1.000004f, 460.032898f }, 1.000000f,
-                            0.000000f );
-    // States -> vf_lock_on vf_lock_of
-    instance->registerEObj( "Wormholegenerator", 2004722, 4985258, 4, { -9.284863f, 0.332117f, 436.627411f }, 0.991760f,
-                            0.000048f );
-    instance->registerEObj( "Wormholegenerator_1", 2004723, 4985259, 4, { -157.081207f, 25.477930f, 382.938385f },
-                            0.991760f, 0.000048f );
-    instance->registerEObj( "Wormholegenerator_2", 2004724, 4985260, 4, { 65.994957f, 65.452766f, 265.003998f },
-                            0.991760f, 0.000048f );
-    instance->registerEObj( "Wormholegenerator_3", 2004725, 4985261, 4, { 210.040405f, 73.397346f, 264.987091f },
-                            0.991760f, 0.000048f );
-    instance->registerEObj( "Wormholegenerator_4", 2004726, 4985262, 4, { 9.958203f, 96.762039f, 104.047096f },
-                            0.991760f, 0.000048f );
-    instance->registerEObj( "Wormholegenerator_5", 2004727, 4985263, 4, { -9.978291f, 128.313095f, -121.979301f },
-                            0.991760f, 0.000048f );
-    instance->registerEObj( "Wormholegenerator_6", 2004728, 4985264, 4, { 9.998364f, 128.645798f, -274.001892f },
-                            0.991760f, 0.000048f );
-    instance->registerEObj( "unknown_50", 2004729, 5034813, 4, { -91.447388f, 32.791962f, 296.223389f }, 0.991760f,
-                            0.000048f );
-    instance->registerEObj( "unknown_51", 2004730, 5034821, 4, { 143.374405f, 80.799957f, 179.826706f }, 1.000000f,
-                            0.000000f );
+    instance.registerEObj( "sgvf_w_lvd_b0118", 2002872, 5033058, 4, { -148.309006f, 25.000000f, 327.505005f }, 1.000000f, -0.785398f ); 
+      // States -> vf_bextwall_on (id: 3) vf_bextwall_of (id: 4) 
+    instance.registerEObj( "unknown_0", 2002735, 0, 4, { -147.190506f, 34.000000f, 326.593597f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "sgvf_w_lvd_b0118_1", 2002872, 5033059, 4, { -116.020401f, 25.000000f, 291.514313f }, 1.000000f, 0.000000f ); 
+      // States -> vf_bextwall_on (id: 3) vf_bextwall_of (id: 4) 
+    instance.registerEObj( "unknown_1", 2004749, 5022919, 4, { -150.811707f, 33.999840f, 292.778412f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_2", 2004750, 5022920, 4, { -143.519608f, 34.000000f, 294.027710f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_3", 2004751, 5022915, 4, { -143.096893f, 34.000000f, 301.814209f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_4", 2004752, 5022916, 4, { -151.221893f, 34.000000f, 301.291809f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_5", 2004753, 5034307, 4, { -153.117905f, 34.000000f, 292.031494f }, 0.991760f, 0.000048f ); 
+    instance.registerEObj( "unknown_6", 2004754, 5034303, 4, { -141.245300f, 34.000000f, 291.586212f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_7", 2004755, 5034301, 4, { -141.807693f, 34.000000f, 303.198395f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_8", 2004756, 5034306, 4, { -151.877304f, 34.000000f, 303.085297f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_9", 2004748, 5033636, 4, { -149.922104f, 34.000000f, 293.955414f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_10", 2004774, 5033642, 4, { -144.841095f, 34.000000f, 295.275208f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_11", 2004775, 5033641, 4, { -144.940308f, 34.000000f, 300.121399f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_12", 2004776, 5033639, 4, { -150.097397f, 34.000000f, 299.867798f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "sgvf_l1r3_b0541a", 2005026, 5444436, 4, { -147.017593f, 34.000000f, 317.352814f }, 1.000000f, 0.000000f ); 
+      // States -> boss_pop_off_a (id: 2) boss_pop_on_a (id: 3) boss_pop_on_c (id: 5) 
+    instance.registerEObj( "sgvf_w_lvd_b0118_2", 2002872, 5033193, 4, { 200.082001f, 81.974503f, 211.096603f }, 1.000000f, -0.785398f ); 
+      // States -> vf_bextwall_on (id: 3) vf_bextwall_of (id: 4) 
+    instance.registerEObj( "unknown_13", 2002735, 0, 4, { 200.000000f, 82.124329f, 208.778595f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "sgvf_w_lvd_b0118_3", 2002872, 5035970, 4, { 167.647797f, 81.909058f, 178.824493f }, 1.000000f, 0.000000f ); 
+      // States -> vf_bextwall_on (id: 3) vf_bextwall_of (id: 4) 
+    instance.registerEObj( "unknown_14", 2004777, 0, 4, { 192.319397f, 82.000000f, 182.835999f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_15", 2004778, 0, 4, { 197.039703f, 81.986687f, 184.863007f }, 0.991760f, 0.000048f ); 
+    instance.registerEObj( "unknown_16", 2004779, 0, 4, { 204.338196f, 82.000000f, 183.053802f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_17", 2004780, 0, 4, { 189.642700f, 82.000000f, 176.451202f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_18", 2005018, 0, 4, { 199.442200f, 82.000000f, 183.869598f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_19", 2002587, 0, 4, { 0.000000f, 129.250000f, -157.414307f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "sgvf_w_lvd_b0118_4", 2002872, 5040833, 4, { -0.855141f, 129.250000f, -164.190598f }, 0.991760f, -0.785362f ); 
+      // States -> vf_bextwall_on (id: 3) vf_bextwall_of (id: 4) 
+    instance.registerEObj( "unknown_20", 2002872, 5039743, 4, { 0.048592f, 128.906403f, -155.346100f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "Openfetter", 2004787, 0, 4, { 2.542549f, 129.250000f, -205.570496f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "Openfetter_1", 2004789, 0, 4, { 3.817404f, 129.250000f, -207.100800f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "Magickedfetter", 2004790, 5039668, 4, { -17.519341f, 129.250000f, -235.697693f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "Magickedfetter_1", 2004791, 5039667, 4, { 17.275551f, 129.198105f, -235.656799f }, 0.991760f, 0.000048f ); 
+    instance.registerEObj( "unknown_21", 2004808, 5039717, 4, { -10.696810f, -497.601990f, -204.956100f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_22", 2004809, 5039714, 4, { 6.635397f, -498.601898f, -210.257507f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_23", 2004810, 5039710, 4, { 11.312720f, -498.093597f, -196.581207f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_24", 2004811, 5039721, 4, { -9.022294f, -499.107513f, -190.416397f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_25", 2004548, 0, 4, { 1.212110f, 129.300003f, -202.733398f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_26", 2002735, 0, 4, { -0.000000f, 143.250000f, -314.710114f }, 1.000000f, 0.000048f ); 
+    instance.registerEObj( "sgvf_w_lvd_b0118_5", 2002872, 5041153, 4, { -0.147327f, 143.250000f, -328.516998f }, 0.991760f, -0.785362f ); 
+      // States -> vf_bextwall_on (id: 3) vf_bextwall_of (id: 4) 
+    instance.registerEObj( "unknown_27", 2004732, 5039981, 4, { -0.015320f, 143.236298f, -316.334808f }, 0.991760f, 0.000048f ); 
+    instance.registerEObj( "Exit", 2000139, 0, 4, { -299.977112f, 279.987701f, -420.645508f }, 0.991760f, 0.000048f ); 
+    instance.registerEObj( "unknown_28", 2004814, 0, 4, { -300.240906f, 280.000000f, -402.510712f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_29", 2004815, 0, 4, { -300.687103f, 280.000000f, -398.160706f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_30", 2004620, 0, 4, { 0.203211f, 129.250000f, -202.244904f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "sgvf_w_btl_b0528", 2004816, 5041561, 4, { -304.280212f, 279.987701f, -415.243805f }, 0.991760f, 0.000048f ); 
+      // States -> baria_off (id: 3) baria_omen_a (id: 4) baria_omen_b (id: 5) baria_a (id: 6) baria_b (id: 7) baria_c (id: 8) 
+    instance.registerEObj( "sgvf_w_btl_b0528_1", 2004817, 5041563, 4, { -286.856506f, 280.000000f, -392.695404f }, 1.000000f, 0.000000f ); 
+      // States -> baria_off (id: 3) baria_omen_a (id: 4) baria_omen_b (id: 5) baria_a (id: 6) baria_b (id: 7) baria_c (id: 8) 
+    instance.registerEObj( "sgvf_w_btl_b0528_2", 2004818, 5041562, 4, { -313.290710f, 280.000000f, -392.472412f }, 1.000000f, 0.000000f ); 
+      // States -> baria_off (id: 3) baria_omen_a (id: 4) baria_omen_b (id: 5) baria_a (id: 6) baria_b (id: 7) baria_c (id: 8) 
+    instance.registerEObj( "sgvf_w_lvd_b0118_6", 2002872, 5032353, 4, { -54.450321f, 16.000000f, 406.409088f }, 1.000000f, -0.785398f ); 
+      // States -> vf_bextwall_on (id: 3) vf_bextwall_of (id: 4) 
+    instance.registerEObj( "unknown_31", 2002735, 0, 4, { -56.151901f, 16.000000f, 403.855896f }, 1.000000f, -0.785398f ); 
+    instance.registerEObj( "sgvf_w_lvd_b0118_7", 2002872, 5032356, 4, { -102.950996f, 16.000000f, 383.202911f }, 1.000000f, 0.000000f ); 
+      // States -> vf_bextwall_on (id: 3) vf_bextwall_of (id: 4) 
+    instance.registerEObj( "sgvf_l1r3_b0541b", 2004735, 5437119, 4, { -76.985458f, 16.000000f, 382.746613f }, 1.000000f, 0.000000f ); 
+      // States -> boss_pop2_off_a (id: 2) boss_pop2_on_a (id: 3) 
+    instance.registerEObj( "unknown_32", 2004736, 0, 4, { -74.916229f, 16.000000f, 380.485291f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_33", 2002735, 0, 4, { 99.718719f, 63.999989f, 265.143799f }, 1.000000f, -1.570451f ); 
+    instance.registerEObj( "sgvf_w_lvd_b0118_8", 2002872, 5035968, 4, { 95.926514f, 63.980949f, 265.796906f }, 0.991760f, -0.785362f ); 
+      // States -> vf_bextwall_on (id: 3) vf_bextwall_of (id: 4) 
+    instance.registerEObj( "sgvf_w_lvd_b0118_9", 2002872, 5035969, 4, { 167.944199f, 65.533363f, 264.945587f }, 1.000000f, 0.000000f ); 
+      // States -> vf_bextwall_on (id: 3) vf_bextwall_of (id: 4) 
+    instance.registerEObj( "Treasurecoffer", 2004745, 0, 4, { 130.000000f, 63.999989f, 264.710388f }, 1.000000f, 1.570796f ); 
+    instance.registerEObj( "sgvf_l1r3_b0541b_1", 2004738, 5437120, 4, { 130.000000f, 65.431679f, 264.710388f }, 0.991760f, 0.000048f ); 
+      // States -> boss_pop2_off_a (id: 2) boss_pop2_on_a (id: 3) 
+    instance.registerEObj( "sgvf_w_lvd_b0556", 2004739, 5037994, 4, { 138.468002f, 63.999989f, 275.781311f }, 1.000000f, 0.000000f ); 
+      // States -> void_off_a (id: 2) void_off_b (id: 3) void_on_a (id: 4) void_omen (id: 5) 
+    instance.registerEObj( "sgvf_w_lvd_b0556_1", 2004740, 5037996, 4, { 129.901001f, 63.999729f, 278.588593f }, 1.000000f, 0.000000f ); 
+      // States -> void_off_a (id: 2) void_off_b (id: 3) void_on_a (id: 4) void_omen (id: 5) 
+    instance.registerEObj( "sgvf_w_lvd_b0556_2", 2004741, 5037997, 4, { 121.644699f, 63.999729f, 275.762695f }, 1.000000f, 0.000000f ); 
+      // States -> void_off_a (id: 2) void_off_b (id: 3) void_on_a (id: 4) void_omen (id: 5) 
+    instance.registerEObj( "sgvf_w_lvd_b0556_3", 2004742, 5037998, 4, { 138.356506f, 63.999989f, 250.555603f }, 1.000000f, 0.000000f ); 
+      // States -> void_off_a (id: 2) void_off_b (id: 3) void_on_a (id: 4) void_omen (id: 5) 
+    instance.registerEObj( "sgvf_w_lvd_b0556_4", 2004743, 5037999, 4, { 129.881393f, 64.000031f, 250.721893f }, 1.000000f, 0.000000f ); 
+      // States -> void_off_a (id: 2) void_off_b (id: 3) void_on_a (id: 4) void_omen (id: 5) 
+    instance.registerEObj( "sgvf_w_lvd_b0556_5", 2004744, 5038000, 4, { 121.628601f, 63.999989f, 250.572296f }, 1.000000f, 0.000000f ); 
+      // States -> void_off_a (id: 2) void_off_b (id: 3) void_on_a (id: 4) void_omen (id: 5) 
+    instance.registerEObj( "sgvf_w_lvd_b0557", 2004746, 5037995, 4, { 130.020493f, 63.999748f, 279.027191f }, 1.000000f, 0.000000f ); 
+      // States -> void_off_a (id: 2) void_off_b (id: 3) void_on_a (id: 4) void_omen (id: 5) 
+    instance.registerEObj( "sgvf_w_lvd_b0557_1", 2004747, 5038001, 4, { 130.056702f, 63.999989f, 249.980301f }, 1.000000f, 0.000000f ); 
+      // States -> void_off_a (id: 2) void_off_b (id: 3) void_on_a (id: 4) void_omen (id: 5) 
+    instance.registerEObj( "unknown_34", 2002735, 0, 4, { 0.000000f, 94.750053f, 84.669502f }, 0.991760f, 0.000048f ); 
+    instance.registerEObj( "unknown_35", 2004788, 5499560, 4, { 0.320374f, 95.231567f, 31.296261f }, 0.991760f, 0.000048f ); 
+    instance.registerEObj( "unknown_36", 2004792, 5038584, 4, { -28.578890f, 95.250008f, 39.174721f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_37", 2004793, 5038586, 4, { -21.418350f, 95.250008f, 51.649750f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_38", 2004794, 5038587, 4, { -33.994980f, 95.250008f, 58.976070f }, 0.991760f, 0.000048f ); 
+    instance.registerEObj( "unknown_39", 2004795, 5038580, 4, { -41.014271f, 95.250008f, 46.442242f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_40", 2004796, 5038588, 4, { 7.240406f, 95.250008f, -12.319770f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_41", 2004797, 5038590, 4, { 7.179711f, 95.250008f, 2.152661f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_42", 2004798, 5038589, 4, { -7.245643f, 95.250008f, 2.096094f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_43", 2004799, 5038570, 4, { -7.080731f, 95.250008f, -12.155750f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_44", 2004800, 5038591, 4, { 41.068710f, 95.250008f, 46.325569f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_45", 2004801, 5038592, 4, { 33.762070f, 95.250008f, 58.721840f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_46", 2004802, 5038593, 4, { 21.204290f, 95.250008f, 51.578461f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_47", 2004803, 5038571, 4, { 28.640770f, 95.250008f, 39.349319f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "sgvf_w_lvd_b0250", 2002872, 5038256, 4, { -0.165812f, 94.731613f, 85.317574f }, 0.991760f, -0.785362f ); 
+      // States -> vf_bextwall_on (id: 3) vf_bextwall_of (id: 4) 
+    instance.registerEObj( "unknown_48", 2004784, 5489265, 4, { 0.294310f, 90.349991f, 22.469700f }, 0.991760f, 0.000048f ); 
+    instance.registerEObj( "unknown_49", 2005042, 5476812, 4, { -0.380919f, 99.969032f, 29.779119f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "Entrance", 2000182, 5032012, 5, { 0.112444f, 1.000004f, 460.032898f }, 1.000000f, 0.000000f ); 
+      // States -> vf_lock_on (id: 11) vf_lock_of (id: 12) 
+    instance.registerEObj( "Wormholegenerator", 2004722, 4985258, 4, { -9.284863f, 0.332117f, 436.627411f }, 0.991760f, 0.000048f ); 
+    instance.registerEObj( "Wormholegenerator_1", 2004723, 4985259, 4, { -157.081207f, 25.477930f, 382.938385f }, 0.991760f, 0.000048f ); 
+    instance.registerEObj( "Wormholegenerator_2", 2004724, 4985260, 4, { 65.994957f, 65.452766f, 265.003998f }, 0.991760f, 0.000048f ); 
+    instance.registerEObj( "Wormholegenerator_3", 2004725, 4985261, 4, { 210.040405f, 73.397346f, 264.987091f }, 0.991760f, 0.000048f ); 
+    instance.registerEObj( "Wormholegenerator_4", 2004726, 4985262, 4, { 9.958203f, 96.762039f, 104.047096f }, 0.991760f, 0.000048f ); 
+    instance.registerEObj( "Wormholegenerator_5", 2004727, 4985263, 4, { -9.978291f, 128.313095f, -121.979301f }, 0.991760f, 0.000048f ); 
+    instance.registerEObj( "Wormholegenerator_6", 2004728, 4985264, 4, { 9.998364f, 128.645798f, -274.001892f }, 0.991760f, 0.000048f ); 
+    instance.registerEObj( "unknown_50", 2004729, 5034813, 4, { -91.447388f, 32.791962f, 296.223389f }, 0.991760f, 0.000048f ); 
+    instance.registerEObj( "unknown_51", 2004730, 5034821, 4, { 143.374405f, 80.799957f, 179.826706f }, 1.000000f, 0.000000f ); 
 
   }
 
-  void onUpdate( InstanceContentPtr instance, uint32_t currTime ) override
+  void onUpdate( InstanceContent& instance, uint32_t currTime ) override
   {
 
   }
 
-  void onEnterTerritory( InstanceContentPtr instance, Entity::Player& player, uint32_t eventId, uint16_t param1,
+  void onEnterTerritory( InstanceContent& instance, Entity::Player& player, uint32_t eventId, uint16_t param1,
                          uint16_t param2 ) override
   {
 
diff --git a/src/scripts/instances/treasurehunt/TheAquapolis.cpp b/src/scripts/instances/treasurehunt/TheAquapolis.cpp
index f3119985..6854fc9d 100644
--- a/src/scripts/instances/treasurehunt/TheAquapolis.cpp
+++ b/src/scripts/instances/treasurehunt/TheAquapolis.cpp
@@ -9,211 +9,121 @@ class TheAquapolis :
 public:
   TheAquapolis() :
     Sapphire::ScriptAPI::InstanceContentScript( 55001 )
-  {
-  }
+  { }
 
-  void onInit( InstanceContentPtr instance ) override
+  void onInit( InstanceContent& instance ) override
   {
-    instance->registerEObj( "Treasurecoffer", 2007190, 0, 4, { 0.001130f, 0.200000f, 340.004486f }, 1.000000f,
-                            0.000000f );
-    instance->registerEObj( "Treasurecoffer_1", 2007191, 0, 4, { 0.002947f, -7.800000f, 215.005096f }, 1.000000f,
-                            0.000000f );
-    instance->registerEObj( "Treasurecoffer_2", 2007192, 0, 4, { 0.002900f, -15.800000f, 90.001167f }, 1.000000f,
-                            0.000000f );
-    instance->registerEObj( "Treasurecoffer_3", 2007193, 0, 4, { -0.000139f, -23.819401f, -34.999279f }, 0.991760f,
-                            0.000048f );
-    instance->registerEObj( "Treasurecoffer_4", 2007194, 0, 4, { 0.001485f, -31.815121f, -160.003693f }, 0.991760f,
-                            0.000048f );
-    instance->registerEObj( "Treasurecoffer_5", 2007195, 0, 4, { 0.004197f, -39.810791f, -284.993011f }, 0.991760f,
-                            0.000048f );
-    instance->registerEObj( "Treasurecoffer_6", 2007196, 0, 4, { 0.000420f, -47.806580f, -409.995514f }, 0.991760f,
-                            0.000048f );
-    instance->registerEObj( "unknown_0", 2002735, 0, 4, { -0.122746f, 0.000000f, 361.538513f }, 1.000000f, -0.000000f );
-    instance->registerEObj( "sgvf_w_lvd_b0118", 2002872, 6288992, 4, { 0.686486f, 0.049996f, 362.050415f }, 1.000000f,
-                            0.000000f );
-    // States -> vf_bextwall_on vf_bextwall_of
-    instance->registerEObj( "Vaultdoor", 2007203, 6287388, 4, { -18.243860f, 0.099997f, 321.842285f }, 1.000000f,
-                            0.000000f );
-    instance->registerEObj( "Vaultdoor_1", 2007204, 6287665, 4, { 18.988001f, 0.099997f, 321.533508f }, 1.000000f,
-                            0.000000f );
-    instance->registerEObj( "unknown_1", 2007287, 6288229, 4, { -25.275770f, 0.000000f, 340.210388f }, 1.000000f,
-                            0.000000f );
-    instance->registerEObj( "unknown_2", 2007288, 6288231, 4, { 0.185137f, 0.000000f, 312.600098f }, 1.000000f,
-                            0.000000f );
-    instance->registerEObj( "unknown_3", 2007289, 6288233, 4, { 25.078310f, 0.000000f, 339.623596f }, 1.000000f,
-                            0.000000f );
-    instance->registerEObj( "Vaultkey", 2007282, 0, 4, { 0.829522f, 0.220668f, 337.850708f }, 1.000000f, 0.000000f );
-    instance->registerEObj( "unknown_4", 2007316, 6288699, 4, { -18.478701f, -5.661133f, 279.285889f }, 0.991760f,
-                            0.000048f );
-    instance->registerEObj( "unknown_5", 2007317, 6286455, 4, { 15.609920f, -6.088379f, 277.302094f }, 0.991760f,
-                            0.000048f );
-    instance->registerEObj( "unknown_6", 2007328, 6383033, 4, { -16.922300f, 0.076233f, 321.705902f }, 0.991760f,
-                            0.000048f );
-    instance->registerEObj( "unknown_7", 2007329, 6383032, 4, { 18.844851f, 0.076233f, 322.468903f }, 0.991760f,
-                            0.000048f );
-    instance->registerEObj( "unknown_8", 2007343, 6289147, 4, { 3.738403f, 0.198364f, 339.833588f }, 0.991760f,
-                            0.000048f );
-    instance->registerEObj( "unknown_9", 2002735, 0, 4, { -0.120655f, -7.700002f, 236.767395f }, 1.000000f,
-                            -0.000000f );
-    instance->registerEObj( "sgvf_w_lvd_b0118_1", 2002872, 6289205, 4, { -0.442505f, -7.827942f, 237.140396f },
-                            0.991760f, 0.000048f );
-    // States -> vf_bextwall_on vf_bextwall_of
-    instance->registerEObj( "Vaultdoor_2", 2007205, 6288210, 4, { -18.722839f, -7.827942f, 196.063095f }, 0.991760f,
-                            0.000048f );
-    instance->registerEObj( "Vaultdoor_3", 2007206, 6288211, 4, { 18.844851f, -7.827942f, 196.185196f }, 0.991760f,
-                            0.000048f );
-    instance->registerEObj( "unknown_10", 2007290, 6288342, 4, { -25.317570f, -7.980009f, 215.039398f }, 1.000000f,
-                            0.000000f );
-    instance->registerEObj( "unknown_11", 2007291, 6288340, 4, { 0.322333f, -7.980009f, 189.283798f }, 1.000000f,
-                            0.000000f );
-    instance->registerEObj( "unknown_12", 2007292, 6288337, 4, { 24.222750f, -7.980009f, 215.066498f }, 1.000000f,
-                            0.000000f );
-    instance->registerEObj( "Vaultkey_1", 2007311, 0, 4, { -3.870050f, -7.800000f, 213.458496f }, 1.000000f,
-                            0.000000f );
-    instance->registerEObj( "unknown_13", 2007318, 6288701, 4, { -16.983280f, -13.870480f, 153.185303f }, 0.991760f,
-                            0.000048f );
-    instance->registerEObj( "unknown_14", 2007319, 6286451, 4, { 16.678040f, -13.962040f, 152.574997f }, 0.991760f,
-                            0.000048f );
-    instance->registerEObj( "unknown_15", 2007330, 6383034, 4, { -17.685249f, -7.797425f, 197.619507f }, 0.991760f,
-                            0.000048f );
-    instance->registerEObj( "unknown_16", 2007331, 6383035, 4, { 18.509090f, -7.827942f, 197.497406f }, 0.991760f,
-                            0.000048f );
-    instance->registerEObj( "unknown_17", 2007344, 6289152, 4, { -1.286773f, -7.800001f, 215.448593f }, 1.000000f,
-                            0.000000f );
-    instance->registerEObj( "sgvf_w_lvd_b0118_2", 2002872, 6289228, 4, { -0.142505f, -15.800000f, 112.190002f },
-                            0.991760f, 0.000048f );
-    // States -> vf_bextwall_on vf_bextwall_of
-    instance->registerEObj( "unknown_18", 2002735, 0, 4, { 0.053155f, -15.700000f, 111.576698f }, 1.000000f,
-                            -0.000000f );
-    instance->registerEObj( "Vaultdoor_4", 2007207, 6288213, 4, { -18.719660f, -15.805200f, 71.150551f }, 1.000000f,
-                            0.000000f );
-    instance->registerEObj( "Vaultdoor_5", 2007208, 6288215, 4, { 18.666090f, -15.800000f, 71.347427f }, 1.000000f,
-                            0.000000f );
-    instance->registerEObj( "unknown_19", 2007293, 6288400, 4, { -25.407360f, -15.950010f, 89.850311f }, 1.000000f,
-                            0.000000f );
-    instance->registerEObj( "unknown_20", 2007294, 6288402, 4, { 0.914349f, -15.950010f, 64.629997f }, 1.000000f,
-                            0.000000f );
-    instance->registerEObj( "unknown_21", 2007295, 6288404, 4, { 24.828060f, -15.950010f, 89.997643f }, 1.000000f,
-                            0.000000f );
-    instance->registerEObj( "Vaultkey_2", 2007312, 0, 4, { 0.302402f, -15.800000f, 94.839752f }, 1.000000f, 0.000000f );
-    instance->registerEObj( "unknown_22", 2007320, 6288702, 4, { -17.441099f, -21.797001f, 28.519039f }, 0.991760f,
-                            0.000048f );
-    instance->registerEObj( "unknown_23", 2007321, 6286453, 4, { 16.342409f, -21.896730f, 28.458010f }, 0.991760f,
-                            0.000048f );
-    instance->registerEObj( "unknown_24", 2007332, 6383037, 4, { -16.861271f, -15.915160f, 70.694946f }, 0.991760f,
-                            0.000048f );
-    instance->registerEObj( "unknown_25", 2007333, 6383036, 4, { 18.326050f, -15.915160f, 72.465088f }, 0.991760f,
-                            0.000048f );
-    instance->registerEObj( "unknown_26", 2007345, 6289153, 4, { 4.112751f, -15.800000f, 94.003380f }, 1.000000f,
-                            0.000000f );
-    instance->registerEObj( "sgvf_w_lvd_b0118_3", 2002872, 6289248, 4, { -0.327447f, -23.797190f, -12.626270f },
-                            0.991760f, 0.000048f );
-    // States -> vf_bextwall_on vf_bextwall_of
-    instance->registerEObj( "unknown_27", 2002735, 0, 4, { -0.005597f, -23.697189f, -13.437240f }, 1.000000f,
-                            -0.000000f );
-    instance->registerEObj( "Vaultdoor_6", 2007209, 6288216, 4, { -18.686550f, -23.797190f, -53.735790f }, 1.000000f,
-                            0.000000f );
-    instance->registerEObj( "Vaultdoor_7", 2007210, 6288218, 4, { 18.561710f, -23.797190f, -53.381920f }, 1.000000f,
-                            0.000000f );
-    instance->registerEObj( "unknown_28", 2007296, 6288442, 4, { -24.187929f, -23.863649f, -34.945591f }, 1.000000f,
-                            0.000000f );
-    instance->registerEObj( "unknown_29", 2007297, 6288444, 4, { 0.165738f, -23.873119f, -62.594398f }, 1.000000f,
-                            0.000000f );
-    instance->registerEObj( "unknown_30", 2007298, 6288446, 4, { 25.276409f, -23.913509f, -35.549301f }, 1.000000f,
-                            0.000000f );
-    instance->registerEObj( "Vaultkey_3", 2007313, 0, 4, { -2.565299f, -23.799999f, -37.906879f }, 1.000000f,
-                            0.000000f );
-    instance->registerEObj( "unknown_31", 2007322, 6288703, 4, { -16.708679f, -29.892460f, -96.391296f }, 0.991760f,
-                            0.000048f );
-    instance->registerEObj( "unknown_32", 2007323, 6288689, 4, { 15.640440f, -30.075560f, -97.917236f }, 0.991760f,
-                            0.000048f );
-    instance->registerEObj( "unknown_33", 2007334, 6383039, 4, { -17.044371f, -23.910950f, -54.093319f }, 0.991760f,
-                            0.000048f );
-    instance->registerEObj( "unknown_34", 2007335, 6383038, 4, { 18.326050f, -23.910950f, -52.323238f }, 0.991760f,
-                            0.000048f );
-    instance->registerEObj( "unknown_35", 2007346, 6289154, 4, { 1.893377f, -23.785940f, -36.201401f }, 1.000000f,
-                            0.000000f );
-    instance->registerEObj( "sgvf_w_lvd_b0118_4", 2002872, 6289271, 4, { -0.402360f, -31.785391f, -137.661194f },
-                            0.991760f, 0.000048f );
-    // States -> vf_bextwall_on vf_bextwall_of
-    instance->registerEObj( "unknown_36", 2002735, 0, 4, { 0.026965f, -31.685390f, -138.459503f }, 1.000000f,
-                            -0.000000f );
-    instance->registerEObj( "Vaultdoor_8", 2007211, 6288221, 4, { -18.820810f, -31.785391f, -179.046600f }, 1.000000f,
-                            0.000000f );
-    instance->registerEObj( "Vaultdoor_9", 2007212, 6288219, 4, { 18.590670f, -31.785391f, -178.683807f }, 1.000000f,
-                            0.000000f );
-    instance->registerEObj( "unknown_37", 2007299, 6288471, 4, { -25.063971f, -31.928049f, -159.375900f }, 1.000000f,
-                            0.000000f );
-    instance->registerEObj( "unknown_38", 2007300, 6288469, 4, { -0.225626f, -31.950010f, -184.941803f }, 1.000000f,
-                            0.000000f );
-    instance->registerEObj( "unknown_39", 2007301, 6288473, 4, { 24.164009f, -31.929609f, -159.852798f }, 1.000000f,
-                            0.000000f );
-    instance->registerEObj( "Vaultkey_4", 2007314, 0, 4, { -1.933799f, -31.799999f, -161.905502f }, 1.000000f,
-                            0.000000f );
-    instance->registerEObj( "unknown_40", 2007324, 6288704, 4, { -15.976260f, -38.010250f, -222.247696f }, 0.991760f,
-                            0.000048f );
-    instance->registerEObj( "unknown_41", 2007325, 6288690, 4, { 15.274170f, -38.071289f, -222.339203f }, 0.991760f,
-                            0.000048f );
-    instance->registerEObj( "unknown_42", 2007336, 6383042, 4, { -17.596230f, -31.900000f, -178.846298f }, 1.000000f,
-                            0.000000f );
-    instance->registerEObj( "unknown_43", 2007337, 6383041, 4, { 18.875370f, -31.906679f, -177.538803f }, 0.991760f,
-                            0.000048f );
-    instance->registerEObj( "unknown_44", 2007347, 6289155, 4, { 1.494756f, -31.797430f, -156.976593f }, 1.000000f,
-                            0.000000f );
-    instance->registerEObj( "sgvf_w_lvd_b0118_5", 2002872, 6289287, 4, { -0.102360f, -39.780590f, -262.818298f },
-                            0.991760f, 0.000048f );
-    // States -> vf_bextwall_on vf_bextwall_of
-    instance->registerEObj( "unknown_45", 2002735, 0, 4, { -0.061376f, -39.680592f, -263.631805f }, 1.000000f,
-                            -0.000000f );
-    instance->registerEObj( "Vaultdoor_10", 2007213, 6288224, 4, { -18.631350f, -39.810791f, -303.547699f }, 0.991760f,
-                            0.000048f );
-    instance->registerEObj( "Vaultdoor_11", 2007214, 6288223, 4, { 18.847080f, -39.780579f, -304.087585f }, 1.000000f,
-                            0.000000f );
-    instance->registerEObj( "unknown_46", 2007302, 6288508, 4, { -24.544001f, -39.909939f, -284.787201f }, 1.000000f,
-                            0.000000f );
-    instance->registerEObj( "unknown_47", 2007303, 6288524, 4, { -0.272618f, -39.928360f, -310.519714f }, 1.000000f,
-                            0.000000f );
-    instance->registerEObj( "unknown_48", 2007304, 6288522, 4, { 24.354900f, -39.900742f, -285.109314f }, 1.000000f,
-                            0.000000f );
-    instance->registerEObj( "Vaultkey_5", 2007315, 0, 4, { -2.969681f, -39.799999f, -286.637512f }, 1.000000f,
-                            0.000000f );
-    instance->registerEObj( "unknown_49", 2007326, 6288705, 4, { -15.793150f, -45.975460f, -346.730804f }, 0.991760f,
-                            0.000048f );
-    instance->registerEObj( "unknown_50", 2007327, 6288694, 4, { 16.555969f, -46.005981f, -347.859894f }, 0.991760f,
-                            0.000048f );
-    instance->registerEObj( "unknown_51", 2007338, 6383044, 4, { -17.091330f, -39.875000f, -302.618896f }, 1.000000f,
-                            0.000000f );
-    instance->registerEObj( "unknown_52", 2007339, 6383045, 4, { 17.074829f, -39.902340f, -303.334198f }, 0.991760f,
-                            0.000048f );
-    instance->registerEObj( "unknown_53", 2007348, 6289156, 4, { 1.662274f, -39.779591f, -284.155792f }, 1.000000f,
-                            0.000000f );
-    instance->registerEObj( "sgvf_w_lvd_b0118_6", 2002872, 6289300, 4, { 0.019862f, -47.800430f, -387.795288f },
-                            0.991760f, 0.000048f );
-    // States -> vf_bextwall_on vf_bextwall_of
-    instance->registerEObj( "unknown_54", 2002735, 0, 4, { 0.060846f, -47.799999f, -388.568115f }, 1.000000f,
-                            -0.000000f );
-    instance->registerEObj( "Exit", 2000139, 0, 4, { 0.076233f, -47.887440f, -427.461304f }, 0.991760f, 0.000048f );
-    instance->registerEObj( "unknown_55", 2007305, 6288552, 4, { -24.623159f, -47.927639f, -409.027313f }, 1.000000f,
-                            0.000000f );
-    instance->registerEObj( "unknown_56", 2007306, 6288548, 4, { -0.124747f, -47.950401f, -433.348785f }, 1.000000f,
-                            0.000000f );
-    instance->registerEObj( "unknown_57", 2007307, 6288550, 4, { 23.612570f, -47.899090f, -409.669586f }, 1.000000f,
-                            0.000000f );
-    instance->registerEObj( "unknown_58", 2007349, 6395686, 4, { 2.822051f, -47.754410f, -409.509888f }, 1.000000f,
-                            0.000000f );
-    instance->registerEObj( "Entrance", 2000182, 6289067, 5, { 1.346699f, 0.199998f, 429.462097f }, 1.000000f,
-                            0.000000f );
-    // States -> vf_lock_on vf_lock_of
-    instance->registerEObj( "Shortcut", 2000700, 0, 4, { 3.438223f, -0.100000f, 415.292694f }, 1.000000f, 0.000000f );
+    instance.registerEObj( "Treasurecoffer", 2007190, 0, 4, { 0.001130f, 0.200000f, 340.004486f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "Treasurecoffer_1", 2007191, 0, 4, { 0.002947f, -7.800000f, 215.005096f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "Treasurecoffer_2", 2007192, 0, 4, { 0.002900f, -15.800000f, 90.001167f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "Treasurecoffer_3", 2007193, 0, 4, { -0.000139f, -23.819401f, -34.999279f }, 0.991760f, 0.000048f ); 
+    instance.registerEObj( "Treasurecoffer_4", 2007194, 0, 4, { 0.001485f, -31.815121f, -160.003693f }, 0.991760f, 0.000048f ); 
+    instance.registerEObj( "Treasurecoffer_5", 2007195, 0, 4, { 0.004197f, -39.810791f, -284.993011f }, 0.991760f, 0.000048f ); 
+    instance.registerEObj( "Treasurecoffer_6", 2007196, 0, 4, { 0.000420f, -47.806580f, -409.995514f }, 0.991760f, 0.000048f ); 
+    instance.registerEObj( "unknown_0", 2002735, 0, 4, { -0.122746f, 0.000000f, 361.538513f }, 1.000000f, -0.000000f ); 
+    instance.registerEObj( "sgvf_w_lvd_b0118", 2002872, 6288992, 4, { 0.686486f, 0.049996f, 362.050415f }, 1.000000f, 0.000000f ); 
+      // States -> vf_bextwall_on (id: 3) vf_bextwall_of (id: 4) 
+    instance.registerEObj( "Vaultdoor", 2007203, 6287388, 4, { -18.243860f, 0.099997f, 321.842285f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "Vaultdoor_1", 2007204, 6287665, 4, { 18.988001f, 0.099997f, 321.533508f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_1", 2007287, 6288229, 4, { -25.275770f, 0.000000f, 340.210388f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_2", 2007288, 6288231, 4, { 0.185137f, 0.000000f, 312.600098f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_3", 2007289, 6288233, 4, { 25.078310f, 0.000000f, 339.623596f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "Vaultkey", 2007282, 0, 4, { 0.829522f, 0.220668f, 337.850708f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_4", 2007316, 6288699, 4, { -18.478701f, -5.661133f, 279.285889f }, 0.991760f, 0.000048f ); 
+    instance.registerEObj( "unknown_5", 2007317, 6286455, 4, { 15.609920f, -6.088379f, 277.302094f }, 0.991760f, 0.000048f ); 
+    instance.registerEObj( "unknown_6", 2007328, 6383033, 4, { -16.922300f, 0.076233f, 321.705902f }, 0.991760f, 0.000048f ); 
+    instance.registerEObj( "unknown_7", 2007329, 6383032, 4, { 18.844851f, 0.076233f, 322.468903f }, 0.991760f, 0.000048f ); 
+    instance.registerEObj( "unknown_8", 2007343, 6289147, 4, { 3.738403f, 0.198364f, 339.833588f }, 0.991760f, 0.000048f ); 
+    instance.registerEObj( "unknown_9", 2002735, 0, 4, { -0.120655f, -7.700002f, 236.767395f }, 1.000000f, -0.000000f ); 
+    instance.registerEObj( "sgvf_w_lvd_b0118_1", 2002872, 6289205, 4, { -0.442505f, -7.827942f, 237.140396f }, 0.991760f, 0.000048f ); 
+      // States -> vf_bextwall_on (id: 3) vf_bextwall_of (id: 4) 
+    instance.registerEObj( "Vaultdoor_2", 2007205, 6288210, 4, { -18.722839f, -7.827942f, 196.063095f }, 0.991760f, 0.000048f ); 
+    instance.registerEObj( "Vaultdoor_3", 2007206, 6288211, 4, { 18.844851f, -7.827942f, 196.185196f }, 0.991760f, 0.000048f ); 
+    instance.registerEObj( "unknown_10", 2007290, 6288342, 4, { -25.317570f, -7.980009f, 215.039398f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_11", 2007291, 6288340, 4, { 0.322333f, -7.980009f, 189.283798f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_12", 2007292, 6288337, 4, { 24.222750f, -7.980009f, 215.066498f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "Vaultkey_1", 2007311, 0, 4, { -3.870050f, -7.800000f, 213.458496f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_13", 2007318, 6288701, 4, { -16.983280f, -13.870480f, 153.185303f }, 0.991760f, 0.000048f ); 
+    instance.registerEObj( "unknown_14", 2007319, 6286451, 4, { 16.678040f, -13.962040f, 152.574997f }, 0.991760f, 0.000048f ); 
+    instance.registerEObj( "unknown_15", 2007330, 6383034, 4, { -17.685249f, -7.797425f, 197.619507f }, 0.991760f, 0.000048f ); 
+    instance.registerEObj( "unknown_16", 2007331, 6383035, 4, { 18.509090f, -7.827942f, 197.497406f }, 0.991760f, 0.000048f ); 
+    instance.registerEObj( "unknown_17", 2007344, 6289152, 4, { -1.286773f, -7.800001f, 215.448593f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "sgvf_w_lvd_b0118_2", 2002872, 6289228, 4, { -0.142505f, -15.800000f, 112.190002f }, 0.991760f, 0.000048f ); 
+      // States -> vf_bextwall_on (id: 3) vf_bextwall_of (id: 4) 
+    instance.registerEObj( "unknown_18", 2002735, 0, 4, { 0.053155f, -15.700000f, 111.576698f }, 1.000000f, -0.000000f ); 
+    instance.registerEObj( "Vaultdoor_4", 2007207, 6288213, 4, { -18.719660f, -15.805200f, 71.150551f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "Vaultdoor_5", 2007208, 6288215, 4, { 18.666090f, -15.800000f, 71.347427f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_19", 2007293, 6288400, 4, { -25.407360f, -15.950010f, 89.850311f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_20", 2007294, 6288402, 4, { 0.914349f, -15.950010f, 64.629997f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_21", 2007295, 6288404, 4, { 24.828060f, -15.950010f, 89.997643f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "Vaultkey_2", 2007312, 0, 4, { 0.302402f, -15.800000f, 94.839752f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_22", 2007320, 6288702, 4, { -17.441099f, -21.797001f, 28.519039f }, 0.991760f, 0.000048f ); 
+    instance.registerEObj( "unknown_23", 2007321, 6286453, 4, { 16.342409f, -21.896730f, 28.458010f }, 0.991760f, 0.000048f ); 
+    instance.registerEObj( "unknown_24", 2007332, 6383037, 4, { -16.861271f, -15.915160f, 70.694946f }, 0.991760f, 0.000048f ); 
+    instance.registerEObj( "unknown_25", 2007333, 6383036, 4, { 18.326050f, -15.915160f, 72.465088f }, 0.991760f, 0.000048f ); 
+    instance.registerEObj( "unknown_26", 2007345, 6289153, 4, { 4.112751f, -15.800000f, 94.003380f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "sgvf_w_lvd_b0118_3", 2002872, 6289248, 4, { -0.327447f, -23.797190f, -12.626270f }, 0.991760f, 0.000048f ); 
+      // States -> vf_bextwall_on (id: 3) vf_bextwall_of (id: 4) 
+    instance.registerEObj( "unknown_27", 2002735, 0, 4, { -0.005597f, -23.697189f, -13.437240f }, 1.000000f, -0.000000f ); 
+    instance.registerEObj( "Vaultdoor_6", 2007209, 6288216, 4, { -18.686550f, -23.797190f, -53.735790f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "Vaultdoor_7", 2007210, 6288218, 4, { 18.561710f, -23.797190f, -53.381920f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_28", 2007296, 6288442, 4, { -24.187929f, -23.863649f, -34.945591f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_29", 2007297, 6288444, 4, { 0.165738f, -23.873119f, -62.594398f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_30", 2007298, 6288446, 4, { 25.276409f, -23.913509f, -35.549301f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "Vaultkey_3", 2007313, 0, 4, { -2.565299f, -23.799999f, -37.906879f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_31", 2007322, 6288703, 4, { -16.708679f, -29.892460f, -96.391296f }, 0.991760f, 0.000048f ); 
+    instance.registerEObj( "unknown_32", 2007323, 6288689, 4, { 15.640440f, -30.075560f, -97.917236f }, 0.991760f, 0.000048f ); 
+    instance.registerEObj( "unknown_33", 2007334, 6383039, 4, { -17.044371f, -23.910950f, -54.093319f }, 0.991760f, 0.000048f ); 
+    instance.registerEObj( "unknown_34", 2007335, 6383038, 4, { 18.326050f, -23.910950f, -52.323238f }, 0.991760f, 0.000048f ); 
+    instance.registerEObj( "unknown_35", 2007346, 6289154, 4, { 1.893377f, -23.785940f, -36.201401f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "sgvf_w_lvd_b0118_4", 2002872, 6289271, 4, { -0.402360f, -31.785391f, -137.661194f }, 0.991760f, 0.000048f ); 
+      // States -> vf_bextwall_on (id: 3) vf_bextwall_of (id: 4) 
+    instance.registerEObj( "unknown_36", 2002735, 0, 4, { 0.026965f, -31.685390f, -138.459503f }, 1.000000f, -0.000000f ); 
+    instance.registerEObj( "Vaultdoor_8", 2007211, 6288221, 4, { -18.820810f, -31.785391f, -179.046600f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "Vaultdoor_9", 2007212, 6288219, 4, { 18.590670f, -31.785391f, -178.683807f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_37", 2007299, 6288471, 4, { -25.063971f, -31.928049f, -159.375900f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_38", 2007300, 6288469, 4, { -0.225626f, -31.950010f, -184.941803f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_39", 2007301, 6288473, 4, { 24.164009f, -31.929609f, -159.852798f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "Vaultkey_4", 2007314, 0, 4, { -1.933799f, -31.799999f, -161.905502f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_40", 2007324, 6288704, 4, { -15.976260f, -38.010250f, -222.247696f }, 0.991760f, 0.000048f ); 
+    instance.registerEObj( "unknown_41", 2007325, 6288690, 4, { 15.274170f, -38.071289f, -222.339203f }, 0.991760f, 0.000048f ); 
+    instance.registerEObj( "unknown_42", 2007336, 6383042, 4, { -17.596230f, -31.900000f, -178.846298f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_43", 2007337, 6383041, 4, { 18.875370f, -31.906679f, -177.538803f }, 0.991760f, 0.000048f ); 
+    instance.registerEObj( "unknown_44", 2007347, 6289155, 4, { 1.494756f, -31.797430f, -156.976593f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "sgvf_w_lvd_b0118_5", 2002872, 6289287, 4, { -0.102360f, -39.780590f, -262.818298f }, 0.991760f, 0.000048f ); 
+      // States -> vf_bextwall_on (id: 3) vf_bextwall_of (id: 4) 
+    instance.registerEObj( "unknown_45", 2002735, 0, 4, { -0.061376f, -39.680592f, -263.631805f }, 1.000000f, -0.000000f ); 
+    instance.registerEObj( "Vaultdoor_10", 2007213, 6288224, 4, { -18.631350f, -39.810791f, -303.547699f }, 0.991760f, 0.000048f ); 
+    instance.registerEObj( "Vaultdoor_11", 2007214, 6288223, 4, { 18.847080f, -39.780579f, -304.087585f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_46", 2007302, 6288508, 4, { -24.544001f, -39.909939f, -284.787201f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_47", 2007303, 6288524, 4, { -0.272618f, -39.928360f, -310.519714f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_48", 2007304, 6288522, 4, { 24.354900f, -39.900742f, -285.109314f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "Vaultkey_5", 2007315, 0, 4, { -2.969681f, -39.799999f, -286.637512f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_49", 2007326, 6288705, 4, { -15.793150f, -45.975460f, -346.730804f }, 0.991760f, 0.000048f ); 
+    instance.registerEObj( "unknown_50", 2007327, 6288694, 4, { 16.555969f, -46.005981f, -347.859894f }, 0.991760f, 0.000048f ); 
+    instance.registerEObj( "unknown_51", 2007338, 6383044, 4, { -17.091330f, -39.875000f, -302.618896f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_52", 2007339, 6383045, 4, { 17.074829f, -39.902340f, -303.334198f }, 0.991760f, 0.000048f ); 
+    instance.registerEObj( "unknown_53", 2007348, 6289156, 4, { 1.662274f, -39.779591f, -284.155792f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "sgvf_w_lvd_b0118_6", 2002872, 6289300, 4, { 0.019862f, -47.800430f, -387.795288f }, 0.991760f, 0.000048f ); 
+      // States -> vf_bextwall_on (id: 3) vf_bextwall_of (id: 4) 
+    instance.registerEObj( "unknown_54", 2002735, 0, 4, { 0.060846f, -47.799999f, -388.568115f }, 1.000000f, -0.000000f ); 
+    instance.registerEObj( "Exit", 2000139, 0, 4, { 0.076233f, -47.887440f, -427.461304f }, 0.991760f, 0.000048f ); 
+    instance.registerEObj( "unknown_55", 2007305, 6288552, 4, { -24.623159f, -47.927639f, -409.027313f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_56", 2007306, 6288548, 4, { -0.124747f, -47.950401f, -433.348785f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_57", 2007307, 6288550, 4, { 23.612570f, -47.899090f, -409.669586f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_58", 2007349, 6395686, 4, { 2.822051f, -47.754410f, -409.509888f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "Entrance", 2000182, 6289067, 5, { 1.346699f, 0.199998f, 429.462097f }, 1.000000f, 0.000000f ); 
+      // States -> vf_lock_on (id: 11) vf_lock_of (id: 12) 
+    instance.registerEObj( "Shortcut", 2000700, 0, 4, { 3.438223f, -0.100000f, 415.292694f }, 1.000000f, 0.000000f ); 
 
   }
 
-  void onUpdate( InstanceContentPtr instance, uint32_t currTime ) override
+  void onUpdate( InstanceContent& instance, uint32_t currTime ) override
   {
 
   }
 
-  void onEnterTerritory( InstanceContentPtr instance, Entity::Player& player, uint32_t eventId, uint16_t param1,
+  void onEnterTerritory( InstanceContent& instance, Entity::Player& player, uint32_t eventId, uint16_t param1,
                          uint16_t param2 ) override
   {
 
diff --git a/src/scripts/instances/treasurehunt/TheHiddenCanalsofUznair.cpp b/src/scripts/instances/treasurehunt/TheHiddenCanalsofUznair.cpp
index 4b7c4b96..8534be34 100644
--- a/src/scripts/instances/treasurehunt/TheHiddenCanalsofUznair.cpp
+++ b/src/scripts/instances/treasurehunt/TheHiddenCanalsofUznair.cpp
@@ -9,20 +9,142 @@ class TheHiddenCanalsofUznair :
 public:
   TheHiddenCanalsofUznair() :
     Sapphire::ScriptAPI::InstanceContentScript( 55003 )
+  { }
+
+  void onInit( InstanceContent& instance ) override
   {
+    instance.registerEObj( "Sluicegate", 2008671, 6880327, 4, { 0.568258f, 100.300003f, 274.168488f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "Sluicegate_1", 2008672, 6880319, 4, { 0.269765f, 50.299999f, 154.680405f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_0", 2007457, 6879916, 4, { -1.092401f, 100.300003f, 275.638214f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_1", 2007457, 6879843, 4, { -1.524224f, 50.299999f, 155.176193f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "Sluicegate_2", 2008673, 6880331, 4, { 0.313768f, 0.272164f, 33.151051f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "Sluicegate_3", 2008674, 6880926, 4, { -0.058978f, -49.700001f, -85.039810f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "Sluicegate_4", 2008675, 6880353, 4, { -0.094499f, -99.699997f, -204.539307f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "Sluicegate_5", 2008676, 6880364, 4, { -0.132713f, -149.699997f, -325.173187f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_2", 2007457, 6878453, 4, { -0.983721f, 0.299997f, 33.876339f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_3", 2007457, 6878661, 4, { -1.446076f, -49.700001f, -85.301064f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_4", 2007457, 6878563, 4, { -1.907748f, -99.699997f, -205.542297f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_5", 2007457, 6874398, 4, { 0.861505f, -149.699997f, -323.648102f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "High", 2008960, 7005817, 4, { 0.995313f, 100.400002f, 303.008911f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "Low", 2008961, 7005818, 4, { 2.977269f, 100.400002f, 303.015686f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "High_1", 2008962, 7005819, 4, { 1.004384f, 50.369999f, 183.038193f }, 0.991760f, 0.000048f ); 
+    instance.registerEObj( "Low_1", 2008963, 7005820, 4, { 3.018387f, 50.400009f, 183.009003f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "High_2", 2008964, 7005821, 4, { 1.013391f, 0.381469f, 63.020931f }, 0.991760f, 0.000048f ); 
+    instance.registerEObj( "Low_2", 2008965, 7005822, 4, { 3.000382f, 0.400042f, 63.011879f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "High_3", 2008966, 7005823, 4, { 0.999980f, -49.628479f, -56.984692f }, 0.991760f, 0.000048f ); 
+    instance.registerEObj( "Low_3", 2008967, 7005824, 4, { 2.994332f, -49.599289f, -56.969849f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "High_4", 2008968, 7005825, 4, { 0.976013f, -99.617447f, -176.984695f }, 0.991760f, 0.000048f ); 
+    instance.registerEObj( "Low_4", 2008969, 7005826, 4, { 3.016492f, -99.599678f, -176.996704f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "High_5", 2008970, 7005827, 4, { 1.002942f, -149.605804f, -296.980713f }, 0.991760f, 0.000048f ); 
+    instance.registerEObj( "Low_5", 2008971, 7005828, 4, { 3.024055f, -149.599503f, -297.002808f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "High_6", 2008972, 7005829, 4, { 1.005902f, -199.603302f, -416.980988f }, 0.991760f, 0.000048f ); 
+    instance.registerEObj( "Low_6", 2008973, 7005830, 4, { 3.005575f, -199.600403f, -416.998596f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "sgvf_w_lvd_b1231", 2007457, 6996412, 4, { -4.068258f, 100.300003f, 294.718903f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "sgvf_w_lvd_b1232", 2007457, 6996413, 4, { 3.038667f, 100.300003f, 294.803009f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "sgvf_w_lvd_b1231_1", 2007457, 6996415, 4, { -4.038448f, 50.400009f, 176.206604f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "sgvf_w_lvd_b1232_1", 2007457, 6996416, 4, { 3.159257f, 50.400009f, 176.996399f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "sgvf_w_lvd_b1231_2", 2007457, 6996417, 4, { -5.237320f, 0.309626f, 53.443291f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "sgvf_w_lvd_b1232_2", 2007457, 6996418, 4, { 1.048808f, 0.300000f, 53.069832f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "sgvf_w_lvd_b1231_3", 2007457, 6996420, 4, { -4.622195f, -49.700001f, -65.730782f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "sgvf_w_lvd_b1232_3", 2007457, 6996419, 4, { 3.246223f, -49.700001f, -66.129990f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "sgvf_w_lvd_b1231_4", 2007457, 6996421, 4, { -4.211632f, -99.699997f, -185.489395f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "sgvf_w_lvd_b1232_4", 2007457, 6996422, 4, { 3.121258f, -99.697990f, -185.125397f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "sgvf_w_lvd_b1231_5", 2007457, 6996424, 4, { -3.555968f, -149.663605f, -304.656311f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "sgvf_w_lvd_b1232_5", 2007457, 6996423, 4, { 2.999705f, -149.599503f, -304.547394f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "sgvf_w_lvd_b1231_6", 2007457, 6996425, 4, { -3.452516f, -199.699997f, -425.304108f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "sgvf_w_lvd_b1232_6", 2007457, 6996426, 4, { 3.398586f, -199.699997f, -425.457886f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "Entrance", 2000182, 6904134, 5, { 2.648753f, 150.300003f, 421.065491f }, 1.000000f, 0.000000f ); 
+      // States -> vf_lock_on (id: 11) vf_lock_of (id: 12) 
+    instance.registerEObj( "Shortcut", 2000700, 0, 4, { 4.024228f, 150.300003f, 411.372498f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_6", 2002735, 0, 4, { 0.000000f, 100.300003f, 317.628296f }, 1.200000f, 0.000000f ); 
+    instance.registerEObj( "sgvf_w_lvd_b0118", 2002872, 6904820, 4, { 0.778198f, 99.992310f, 319.020294f }, 0.991760f, 0.000048f ); 
+      // States -> vf_bextwall_on (id: 3) vf_bextwall_of (id: 4) 
+    instance.registerEObj( "Sluicegate_6", 2008593, 6880322, 4, { -17.906931f, 99.999687f, 282.242706f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "Sluicegate_7", 2008594, 6880329, 4, { 18.638870f, 99.999748f, 281.840912f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "Treasurecoffer", 2008566, 0, 4, { 0.000000f, 100.400002f, 300.000000f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_7", 2007457, 6837839, 4, { -24.428419f, 99.999702f, 299.505890f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_8", 2007457, 6837819, 4, { 3.431039f, 99.999771f, 274.684387f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_9", 2007457, 6837820, 4, { 24.678801f, 99.999672f, 300.109589f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_10", 2007457, 6837843, 4, { 1.030507f, 100.399696f, 298.205200f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_11", 2007457, 6879918, 4, { -19.918140f, 99.999687f, 285.122803f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_12", 2007457, 6879917, 4, { 16.073009f, 99.999748f, 280.430511f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_13", 2002735, 0, 4, { -0.000000f, 50.299999f, 197.665695f }, 1.200000f, -0.000000f ); 
+    instance.registerEObj( "sgvf_w_lvd_b0118_1", 2002872, 6908678, 4, { 0.647792f, 49.999809f, 199.196106f }, 1.000000f, 0.000000f ); 
+      // States -> vf_bextwall_on (id: 3) vf_bextwall_of (id: 4) 
+    instance.registerEObj( "Sluicegate_8", 2008595, 6880321, 4, { -18.062990f, 49.999699f, 162.414703f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "Sluicegate_9", 2008596, 6880320, 4, { 18.482809f, 49.999790f, 162.012894f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "Treasurecoffer_1", 2008567, 0, 4, { 0.000000f, 50.399700f, 180.000000f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_14", 2007457, 6859376, 4, { -24.584480f, 49.999680f, 179.677902f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_15", 2007457, 6859374, 4, { 3.274982f, 49.999809f, 154.856400f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_16", 2007457, 6859375, 4, { 24.522739f, 49.999729f, 180.281601f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_17", 2007457, 6859377, 4, { 0.874450f, 50.399719f, 178.377197f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_18", 2007457, 6879845, 4, { -20.074200f, 49.999729f, 165.294800f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_19", 2007457, 6879844, 4, { 15.916950f, 49.999790f, 160.602493f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_20", 2002735, 0, 4, { -0.000000f, 0.300000f, 77.670822f }, 1.200000f, 0.000048f ); 
+    instance.registerEObj( "sgvf_w_lvd_b0118_2", 2002872, 6908750, 4, { 0.647792f, -0.000183f, 79.265778f }, 1.000000f, 0.000000f ); 
+      // States -> vf_bextwall_on (id: 3) vf_bextwall_of (id: 4) 
+    instance.registerEObj( "Sluicegate_10", 2008597, 6880336, 4, { -18.062990f, -0.000261f, 42.484371f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "Sluicegate_11", 2008598, 6880333, 4, { 18.482809f, -0.000181f, 42.082581f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "Treasurecoffer_2", 2008568, 0, 4, { 0.000000f, 0.399994f, 60.000000f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_21", 2007457, 6859445, 4, { -24.584480f, -0.000300f, 59.747551f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_22", 2007457, 6859443, 4, { 3.274982f, -0.000159f, 34.926048f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_23", 2007457, 6859444, 4, { 24.522739f, -0.000267f, 60.351250f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_24", 2007457, 6880919, 4, { 0.874450f, 0.399750f, 58.446869f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_25", 2007457, 6878455, 4, { -20.074200f, -0.000246f, 45.364471f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_26", 2007457, 6878454, 4, { 15.916950f, -0.000182f, 40.672180f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_27", 2002735, 0, 4, { -0.000000f, -49.700001f, -42.294621f }, 1.200000f, 0.000048f ); 
+    instance.registerEObj( "sgvf_w_lvd_b0118_3", 2002872, 6910488, 4, { 0.647793f, -49.999901f, -40.657509f }, 1.000000f, 0.000000f ); 
+      // States -> vf_bextwall_on (id: 3) vf_bextwall_of (id: 4) 
+    instance.registerEObj( "Sluicegate_12", 2008599, 6880352, 4, { -18.062990f, -49.999981f, -77.438744f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "Sluicegate_13", 2008600, 6880349, 4, { 18.478640f, -50.003849f, -77.866821f }, 0.991760f, 0.000048f ); 
+    instance.registerEObj( "Treasurecoffer_3", 2008569, 0, 4, { 0.000000f, -49.600010f, -60.000000f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_28", 2007457, 6859528, 4, { -24.584480f, -50.000099f, -60.175560f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_29", 2007457, 6859530, 4, { 3.275066f, -50.000000f, -84.997147f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_30", 2007457, 6859529, 4, { 24.522739f, -49.999950f, -59.571861f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_31", 2007457, 6859527, 4, { 0.874527f, -49.599991f, -61.476238f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_32", 2007457, 6878662, 4, { -20.074200f, -49.999969f, -74.558640f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_33", 2007457, 6878660, 4, { 15.916950f, -49.999950f, -79.250931f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_34", 2002735, 0, 4, { 0.000000f, -99.699997f, -162.569397f }, 1.200000f, 0.000047f ); 
+    instance.registerEObj( "sgvf_w_lvd_b0118_4", 2002872, 6910585, 4, { 0.625610f, -100.000000f, -160.942093f }, 0.991760f, 0.000048f ); 
+      // States -> vf_bextwall_on (id: 3) vf_bextwall_of (id: 4) 
+    instance.registerEObj( "Sluicegate_14", 2008601, 6880358, 4, { -18.062990f, -100.000000f, -197.715500f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "Sluicegate_15", 2008602, 6880354, 4, { 18.478640f, -100.022903f, -198.168900f }, 0.991760f, 0.000048f ); 
+    instance.registerEObj( "Treasurecoffer_4", 2008570, 0, 4, { 0.000000f, -99.600014f, -180.000000f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_35", 2007457, 6843688, 4, { -24.612850f, -100.000099f, -180.473694f }, 0.991760f, 0.000048f ); 
+    instance.registerEObj( "unknown_36", 2007457, 6843689, 4, { 3.250122f, -100.000000f, -205.284805f }, 0.991760f, 0.000048f ); 
+    instance.registerEObj( "unknown_37", 2007457, 6843686, 4, { 24.521240f, -100.000000f, -179.863297f }, 0.991760f, 0.000048f ); 
+    instance.registerEObj( "unknown_38", 2007457, 6843671, 4, { 0.869751f, -99.600113f, -181.755402f }, 0.991760f, 0.000048f ); 
+    instance.registerEObj( "unknown_39", 2007457, 6878564, 4, { -20.096189f, -100.000000f, -194.847595f }, 0.991760f, 0.000048f ); 
+    instance.registerEObj( "unknown_40", 2007457, 6878562, 4, { 15.915160f, -100.000000f, -199.547394f }, 0.991760f, 0.000048f ); 
+    instance.registerEObj( "unknown_41", 2002735, 0, 4, { 0.000000f, -149.699997f, -282.259888f }, 1.200000f, 0.000048f ); 
+    instance.registerEObj( "sgvf_w_lvd_b0118_5", 2002872, 6910763, 4, { 0.625622f, -150.000107f, -281.035614f }, 0.991760f, 0.000048f ); 
+      // States -> vf_bextwall_on (id: 3) vf_bextwall_of (id: 4) 
+    instance.registerEObj( "Sluicegate_16", 2008603, 6880362, 4, { -18.081970f, -150.000107f, -317.830200f }, 0.991760f, 0.000048f ); 
+    instance.registerEObj( "Sluicegate_17", 2008604, 6880366, 4, { 17.127180f, -150.000107f, -317.622009f }, 0.991760f, 0.000048f ); 
+    instance.registerEObj( "Treasurecoffer_5", 2008571, 0, 4, { 0.000000f, -149.600006f, -300.000000f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_42", 2007457, 6859613, 4, { -24.612820f, -150.000198f, -300.567108f }, 0.991760f, 0.000048f ); 
+    instance.registerEObj( "unknown_43", 2007457, 6859615, 4, { 3.250126f, -150.000107f, -325.378296f }, 0.991760f, 0.000048f ); 
+    instance.registerEObj( "unknown_44", 2007457, 6859614, 4, { 24.521259f, -150.000107f, -299.956696f }, 0.991760f, 0.000048f ); 
+    instance.registerEObj( "unknown_45", 2007457, 6859612, 4, { 0.869759f, -149.600204f, -301.848907f }, 0.991760f, 0.000048f ); 
+    instance.registerEObj( "unknown_46", 2007457, 6874400, 4, { -20.096189f, -150.000107f, -314.941101f }, 0.991760f, 0.000048f ); 
+    instance.registerEObj( "unknown_47", 2007457, 6874396, 4, { 15.915160f, -150.000107f, -319.640900f }, 0.991760f, 0.000048f ); 
+    instance.registerEObj( "unknown_48", 2002735, 0, 4, { 0.000000f, -199.699997f, -402.035004f }, 1.200000f, 0.000048f ); 
+    instance.registerEObj( "sgvf_w_lvd_b0118_6", 2002872, 6910821, 4, { 0.625622f, -200.000305f, -400.930389f }, 0.991760f, 0.000048f ); 
+      // States -> vf_bextwall_on (id: 3) vf_bextwall_of (id: 4) 
+    instance.registerEObj( "Exit", 2000139, 0, 4, { -0.069897f, -200.000305f, -436.982697f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_49", 2007457, 6859698, 4, { -24.612860f, -200.000504f, -420.461792f }, 0.991760f, 0.000048f ); 
+    instance.registerEObj( "unknown_50", 2007457, 6859700, 4, { 3.250122f, -200.000397f, -445.273010f }, 0.991760f, 0.000048f ); 
+    instance.registerEObj( "unknown_51", 2007457, 6859699, 4, { 24.521210f, -200.000305f, -419.851410f }, 0.991760f, 0.000048f ); 
+    instance.registerEObj( "unknown_52", 2007457, 6859697, 4, { 0.869759f, -199.600403f, -421.743500f }, 0.991760f, 0.000048f ); 
+
   }
 
-  void onInit( InstanceContentPtr instance ) override
+  void onUpdate( InstanceContent& instance, uint32_t currTime ) override
   {
 
   }
 
-  void onUpdate( InstanceContentPtr instance, uint32_t currTime ) override
-  {
-
-  }
-
-  void onEnterTerritory( InstanceContentPtr instance, Entity::Player& player, uint32_t eventId, uint16_t param1,
+  void onEnterTerritory( InstanceContent& instance, Entity::Player& player, uint32_t eventId, uint16_t param1,
                          uint16_t param2 ) override
   {
 
diff --git a/src/scripts/instances/treasurehunt/TheLostCanalsofUznair.cpp b/src/scripts/instances/treasurehunt/TheLostCanalsofUznair.cpp
index 735ccf6a..3e7741bd 100644
--- a/src/scripts/instances/treasurehunt/TheLostCanalsofUznair.cpp
+++ b/src/scripts/instances/treasurehunt/TheLostCanalsofUznair.cpp
@@ -9,20 +9,142 @@ class TheLostCanalsofUznair :
 public:
   TheLostCanalsofUznair() :
     Sapphire::ScriptAPI::InstanceContentScript( 55002 )
+  { }
+
+  void onInit( InstanceContent& instance ) override
   {
+    instance.registerEObj( "Sluicegate", 2008671, 6880327, 4, { 0.568258f, 100.300003f, 274.168488f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "Sluicegate_1", 2008672, 6880319, 4, { 0.269765f, 50.299999f, 154.680405f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_0", 2007457, 6879916, 4, { -1.092401f, 100.300003f, 275.638214f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_1", 2007457, 6879843, 4, { -1.524224f, 50.299999f, 155.176193f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "Sluicegate_2", 2008673, 6880331, 4, { 0.313768f, 0.272164f, 33.151051f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "Sluicegate_3", 2008674, 6880926, 4, { -0.058978f, -49.700001f, -85.039810f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "Sluicegate_4", 2008675, 6880353, 4, { -0.094499f, -99.699997f, -204.539307f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "Sluicegate_5", 2008676, 6880364, 4, { -0.132713f, -149.699997f, -325.173187f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_2", 2007457, 6878453, 4, { -0.983721f, 0.299997f, 33.876339f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_3", 2007457, 6878661, 4, { -1.446076f, -49.700001f, -85.301064f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_4", 2007457, 6878563, 4, { -1.907748f, -99.699997f, -205.542297f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_5", 2007457, 6874398, 4, { 0.861505f, -149.699997f, -323.648102f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "High", 2008960, 7005817, 4, { 0.995313f, 100.400002f, 303.008911f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "Low", 2008961, 7005818, 4, { 2.977269f, 100.400002f, 303.015686f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "High_1", 2008962, 7005819, 4, { 1.004384f, 50.369999f, 183.038193f }, 0.991760f, 0.000048f ); 
+    instance.registerEObj( "Low_1", 2008963, 7005820, 4, { 3.018387f, 50.400009f, 183.009003f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "High_2", 2008964, 7005821, 4, { 1.013391f, 0.381469f, 63.020931f }, 0.991760f, 0.000048f ); 
+    instance.registerEObj( "Low_2", 2008965, 7005822, 4, { 3.000382f, 0.400042f, 63.011879f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "High_3", 2008966, 7005823, 4, { 0.999980f, -49.628479f, -56.984692f }, 0.991760f, 0.000048f ); 
+    instance.registerEObj( "Low_3", 2008967, 7005824, 4, { 2.994332f, -49.599289f, -56.969849f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "High_4", 2008968, 7005825, 4, { 0.976013f, -99.617447f, -176.984695f }, 0.991760f, 0.000048f ); 
+    instance.registerEObj( "Low_4", 2008969, 7005826, 4, { 3.016492f, -99.599678f, -176.996704f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "High_5", 2008970, 7005827, 4, { 1.002942f, -149.605804f, -296.980713f }, 0.991760f, 0.000048f ); 
+    instance.registerEObj( "Low_5", 2008971, 7005828, 4, { 3.024055f, -149.599503f, -297.002808f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "High_6", 2008972, 7005829, 4, { 1.005902f, -199.603302f, -416.980988f }, 0.991760f, 0.000048f ); 
+    instance.registerEObj( "Low_6", 2008973, 7005830, 4, { 3.005575f, -199.600403f, -416.998596f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "sgvf_w_lvd_b1231", 2007457, 6996412, 4, { -4.068258f, 100.300003f, 294.718903f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "sgvf_w_lvd_b1232", 2007457, 6996413, 4, { 3.038667f, 100.300003f, 294.803009f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "sgvf_w_lvd_b1231_1", 2007457, 6996415, 4, { -4.038448f, 50.400009f, 176.206604f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "sgvf_w_lvd_b1232_1", 2007457, 6996416, 4, { 3.159257f, 50.400009f, 176.996399f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "sgvf_w_lvd_b1231_2", 2007457, 6996417, 4, { -5.237320f, 0.309626f, 53.443291f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "sgvf_w_lvd_b1232_2", 2007457, 6996418, 4, { 1.048808f, 0.300000f, 53.069832f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "sgvf_w_lvd_b1231_3", 2007457, 6996420, 4, { -4.622195f, -49.700001f, -65.730782f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "sgvf_w_lvd_b1232_3", 2007457, 6996419, 4, { 3.246223f, -49.700001f, -66.129990f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "sgvf_w_lvd_b1231_4", 2007457, 6996421, 4, { -4.211632f, -99.699997f, -185.489395f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "sgvf_w_lvd_b1232_4", 2007457, 6996422, 4, { 3.121258f, -99.697990f, -185.125397f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "sgvf_w_lvd_b1231_5", 2007457, 6996424, 4, { -3.555968f, -149.663605f, -304.656311f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "sgvf_w_lvd_b1232_5", 2007457, 6996423, 4, { 2.999705f, -149.599503f, -304.547394f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "sgvf_w_lvd_b1231_6", 2007457, 6996425, 4, { -3.452516f, -199.699997f, -425.304108f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "sgvf_w_lvd_b1232_6", 2007457, 6996426, 4, { 3.398586f, -199.699997f, -425.457886f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "Entrance", 2000182, 6904134, 5, { 2.648753f, 150.300003f, 421.065491f }, 1.000000f, 0.000000f ); 
+      // States -> vf_lock_on (id: 11) vf_lock_of (id: 12) 
+    instance.registerEObj( "Shortcut", 2000700, 0, 4, { 4.024228f, 150.300003f, 411.372498f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_6", 2002735, 0, 4, { 0.000000f, 100.300003f, 317.628296f }, 1.200000f, 0.000000f ); 
+    instance.registerEObj( "sgvf_w_lvd_b0118", 2002872, 6904820, 4, { 0.778198f, 99.992310f, 319.020294f }, 0.991760f, 0.000048f ); 
+      // States -> vf_bextwall_on (id: 3) vf_bextwall_of (id: 4) 
+    instance.registerEObj( "Sluicegate_6", 2008593, 6880322, 4, { -17.906931f, 99.999687f, 282.242706f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "Sluicegate_7", 2008594, 6880329, 4, { 18.638870f, 99.999748f, 281.840912f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "Treasurecoffer", 2008566, 0, 4, { 0.000000f, 100.400002f, 300.000000f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_7", 2007457, 6837839, 4, { -24.428419f, 99.999702f, 299.505890f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_8", 2007457, 6837819, 4, { 3.431039f, 99.999771f, 274.684387f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_9", 2007457, 6837820, 4, { 24.678801f, 99.999672f, 300.109589f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_10", 2007457, 6837843, 4, { 1.030507f, 100.399696f, 298.205200f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_11", 2007457, 6879918, 4, { -19.918140f, 99.999687f, 285.122803f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_12", 2007457, 6879917, 4, { 16.073009f, 99.999748f, 280.430511f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_13", 2002735, 0, 4, { -0.000000f, 50.299999f, 197.665695f }, 1.200000f, -0.000000f ); 
+    instance.registerEObj( "sgvf_w_lvd_b0118_1", 2002872, 6908678, 4, { 0.647792f, 49.999809f, 199.196106f }, 1.000000f, 0.000000f ); 
+      // States -> vf_bextwall_on (id: 3) vf_bextwall_of (id: 4) 
+    instance.registerEObj( "Sluicegate_8", 2008595, 6880321, 4, { -18.062990f, 49.999699f, 162.414703f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "Sluicegate_9", 2008596, 6880320, 4, { 18.482809f, 49.999790f, 162.012894f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "Treasurecoffer_1", 2008567, 0, 4, { 0.000000f, 50.399700f, 180.000000f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_14", 2007457, 6859376, 4, { -24.584480f, 49.999680f, 179.677902f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_15", 2007457, 6859374, 4, { 3.274982f, 49.999809f, 154.856400f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_16", 2007457, 6859375, 4, { 24.522739f, 49.999729f, 180.281601f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_17", 2007457, 6859377, 4, { 0.874450f, 50.399719f, 178.377197f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_18", 2007457, 6879845, 4, { -20.074200f, 49.999729f, 165.294800f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_19", 2007457, 6879844, 4, { 15.916950f, 49.999790f, 160.602493f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_20", 2002735, 0, 4, { -0.000000f, 0.300000f, 77.670822f }, 1.200000f, 0.000048f ); 
+    instance.registerEObj( "sgvf_w_lvd_b0118_2", 2002872, 6908750, 4, { 0.647792f, -0.000183f, 79.265778f }, 1.000000f, 0.000000f ); 
+      // States -> vf_bextwall_on (id: 3) vf_bextwall_of (id: 4) 
+    instance.registerEObj( "Sluicegate_10", 2008597, 6880336, 4, { -18.062990f, -0.000261f, 42.484371f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "Sluicegate_11", 2008598, 6880333, 4, { 18.482809f, -0.000181f, 42.082581f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "Treasurecoffer_2", 2008568, 0, 4, { 0.000000f, 0.399994f, 60.000000f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_21", 2007457, 6859445, 4, { -24.584480f, -0.000300f, 59.747551f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_22", 2007457, 6859443, 4, { 3.274982f, -0.000159f, 34.926048f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_23", 2007457, 6859444, 4, { 24.522739f, -0.000267f, 60.351250f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_24", 2007457, 6880919, 4, { 0.874450f, 0.399750f, 58.446869f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_25", 2007457, 6878455, 4, { -20.074200f, -0.000246f, 45.364471f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_26", 2007457, 6878454, 4, { 15.916950f, -0.000182f, 40.672180f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_27", 2002735, 0, 4, { -0.000000f, -49.700001f, -42.294621f }, 1.200000f, 0.000048f ); 
+    instance.registerEObj( "sgvf_w_lvd_b0118_3", 2002872, 6910488, 4, { 0.647793f, -49.999901f, -40.657509f }, 1.000000f, 0.000000f ); 
+      // States -> vf_bextwall_on (id: 3) vf_bextwall_of (id: 4) 
+    instance.registerEObj( "Sluicegate_12", 2008599, 6880352, 4, { -18.062990f, -49.999981f, -77.438744f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "Sluicegate_13", 2008600, 6880349, 4, { 18.478640f, -50.003849f, -77.866821f }, 0.991760f, 0.000048f ); 
+    instance.registerEObj( "Treasurecoffer_3", 2008569, 0, 4, { 0.000000f, -49.600010f, -60.000000f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_28", 2007457, 6859528, 4, { -24.584480f, -50.000099f, -60.175560f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_29", 2007457, 6859530, 4, { 3.275066f, -50.000000f, -84.997147f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_30", 2007457, 6859529, 4, { 24.522739f, -49.999950f, -59.571861f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_31", 2007457, 6859527, 4, { 0.874527f, -49.599991f, -61.476238f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_32", 2007457, 6878662, 4, { -20.074200f, -49.999969f, -74.558640f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_33", 2007457, 6878660, 4, { 15.916950f, -49.999950f, -79.250931f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_34", 2002735, 0, 4, { 0.000000f, -99.699997f, -162.569397f }, 1.200000f, 0.000047f ); 
+    instance.registerEObj( "sgvf_w_lvd_b0118_4", 2002872, 6910585, 4, { 0.625610f, -100.000000f, -160.942093f }, 0.991760f, 0.000048f ); 
+      // States -> vf_bextwall_on (id: 3) vf_bextwall_of (id: 4) 
+    instance.registerEObj( "Sluicegate_14", 2008601, 6880358, 4, { -18.062990f, -100.000000f, -197.715500f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "Sluicegate_15", 2008602, 6880354, 4, { 18.478640f, -100.022903f, -198.168900f }, 0.991760f, 0.000048f ); 
+    instance.registerEObj( "Treasurecoffer_4", 2008570, 0, 4, { 0.000000f, -99.600014f, -180.000000f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_35", 2007457, 6843688, 4, { -24.612850f, -100.000099f, -180.473694f }, 0.991760f, 0.000048f ); 
+    instance.registerEObj( "unknown_36", 2007457, 6843689, 4, { 3.250122f, -100.000000f, -205.284805f }, 0.991760f, 0.000048f ); 
+    instance.registerEObj( "unknown_37", 2007457, 6843686, 4, { 24.521240f, -100.000000f, -179.863297f }, 0.991760f, 0.000048f ); 
+    instance.registerEObj( "unknown_38", 2007457, 6843671, 4, { 0.869751f, -99.600113f, -181.755402f }, 0.991760f, 0.000048f ); 
+    instance.registerEObj( "unknown_39", 2007457, 6878564, 4, { -20.096189f, -100.000000f, -194.847595f }, 0.991760f, 0.000048f ); 
+    instance.registerEObj( "unknown_40", 2007457, 6878562, 4, { 15.915160f, -100.000000f, -199.547394f }, 0.991760f, 0.000048f ); 
+    instance.registerEObj( "unknown_41", 2002735, 0, 4, { 0.000000f, -149.699997f, -282.259888f }, 1.200000f, 0.000048f ); 
+    instance.registerEObj( "sgvf_w_lvd_b0118_5", 2002872, 6910763, 4, { 0.625622f, -150.000107f, -281.035614f }, 0.991760f, 0.000048f ); 
+      // States -> vf_bextwall_on (id: 3) vf_bextwall_of (id: 4) 
+    instance.registerEObj( "Sluicegate_16", 2008603, 6880362, 4, { -18.081970f, -150.000107f, -317.830200f }, 0.991760f, 0.000048f ); 
+    instance.registerEObj( "Sluicegate_17", 2008604, 6880366, 4, { 17.127180f, -150.000107f, -317.622009f }, 0.991760f, 0.000048f ); 
+    instance.registerEObj( "Treasurecoffer_5", 2008571, 0, 4, { 0.000000f, -149.600006f, -300.000000f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_42", 2007457, 6859613, 4, { -24.612820f, -150.000198f, -300.567108f }, 0.991760f, 0.000048f ); 
+    instance.registerEObj( "unknown_43", 2007457, 6859615, 4, { 3.250126f, -150.000107f, -325.378296f }, 0.991760f, 0.000048f ); 
+    instance.registerEObj( "unknown_44", 2007457, 6859614, 4, { 24.521259f, -150.000107f, -299.956696f }, 0.991760f, 0.000048f ); 
+    instance.registerEObj( "unknown_45", 2007457, 6859612, 4, { 0.869759f, -149.600204f, -301.848907f }, 0.991760f, 0.000048f ); 
+    instance.registerEObj( "unknown_46", 2007457, 6874400, 4, { -20.096189f, -150.000107f, -314.941101f }, 0.991760f, 0.000048f ); 
+    instance.registerEObj( "unknown_47", 2007457, 6874396, 4, { 15.915160f, -150.000107f, -319.640900f }, 0.991760f, 0.000048f ); 
+    instance.registerEObj( "unknown_48", 2002735, 0, 4, { 0.000000f, -199.699997f, -402.035004f }, 1.200000f, 0.000048f ); 
+    instance.registerEObj( "sgvf_w_lvd_b0118_6", 2002872, 6910821, 4, { 0.625622f, -200.000305f, -400.930389f }, 0.991760f, 0.000048f ); 
+      // States -> vf_bextwall_on (id: 3) vf_bextwall_of (id: 4) 
+    instance.registerEObj( "Exit", 2000139, 0, 4, { -0.069897f, -200.000305f, -436.982697f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_49", 2007457, 6859698, 4, { -24.612860f, -200.000504f, -420.461792f }, 0.991760f, 0.000048f ); 
+    instance.registerEObj( "unknown_50", 2007457, 6859700, 4, { 3.250122f, -200.000397f, -445.273010f }, 0.991760f, 0.000048f ); 
+    instance.registerEObj( "unknown_51", 2007457, 6859699, 4, { 24.521210f, -200.000305f, -419.851410f }, 0.991760f, 0.000048f ); 
+    instance.registerEObj( "unknown_52", 2007457, 6859697, 4, { 0.869759f, -199.600403f, -421.743500f }, 0.991760f, 0.000048f ); 
+
   }
 
-  void onInit( InstanceContentPtr instance ) override
+  void onUpdate( InstanceContent& instance, uint32_t currTime ) override
   {
 
   }
 
-  void onUpdate( InstanceContentPtr instance, uint32_t currTime ) override
-  {
-
-  }
-
-  void onEnterTerritory( InstanceContentPtr instance, Entity::Player& player, uint32_t eventId, uint16_t param1,
+  void onEnterTerritory( InstanceContent& instance, Entity::Player& player, uint32_t eventId, uint16_t param1,
                          uint16_t param2 ) override
   {
 
diff --git a/src/scripts/instances/treasurehunt/TheShiftingAltarsofUznair.cpp b/src/scripts/instances/treasurehunt/TheShiftingAltarsofUznair.cpp
new file mode 100644
index 00000000..08ee926e
--- /dev/null
+++ b/src/scripts/instances/treasurehunt/TheShiftingAltarsofUznair.cpp
@@ -0,0 +1,55 @@
+#include <ScriptObject.h>
+#include <Territory/InstanceContent.h>
+
+using namespace Sapphire;
+
+class TheShiftingAltarsofUznair :
+  public Sapphire::ScriptAPI::InstanceContentScript
+{
+public:
+  TheShiftingAltarsofUznair() :
+    Sapphire::ScriptAPI::InstanceContentScript( 55004 )
+  { }
+
+  void onInit( InstanceContent& instance ) override
+  {
+    instance.registerEObj( "Entrance", 2007457, 7598712, 5, { 100.000000f, 0.000000f, 115.000000f }, 1.000000f, 0.000000f ); 
+      // States -> vf_lock_on (id: 11) vf_lock_of (id: 12) 
+    instance.registerEObj( "Exit", 2000139, 0, 4, { 100.000000f, 0.000000f, 85.000000f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_0", 2007457, 7610562, 4, { 100.000000f, 0.100000f, 100.000000f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_1", 2007457, 7610560, 4, { 100.000000f, 0.100000f, 100.000000f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_2", 2007457, 7623148, 4, { 100.000000f, 0.100000f, 100.000000f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_3", 2007457, 7610561, 4, { 100.000000f, 0.100000f, 100.000000f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "Arcanesphere", 2009598, 7621803, 4, { 100.000000f, 0.084079f, 108.947601f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_4", 2007457, 7575335, 4, { 100.000000f, 18.916941f, 100.000000f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_5", 2007457, 7541027, 4, { 99.999992f, -0.000000f, 82.000008f }, 1.000000f, -0.000000f ); 
+    instance.registerEObj( "unknown_6", 2007457, 7541023, 4, { 109.000000f, 0.000000f, 84.411560f }, 1.000000f, 0.523599f ); 
+    instance.registerEObj( "unknown_7", 2007457, 7541029, 4, { 115.588501f, 0.000000f, 91.000023f }, 1.000000f, 1.047197f ); 
+    instance.registerEObj( "unknown_8", 2007457, 7541025, 4, { 118.000000f, 0.000000f, 99.993782f }, 1.000000f, 1.570451f ); 
+    instance.registerEObj( "unknown_9", 2007457, 7541030, 4, { 115.588501f, 0.000000f, 109.000000f }, 1.000000f, 1.047197f ); 
+    instance.registerEObj( "unknown_10", 2007457, 7541031, 4, { 109.000000f, -0.000000f, 115.588501f }, 1.000000f, 0.523599f ); 
+    instance.registerEObj( "unknown_11", 2007457, 7541026, 4, { 100.000000f, -0.000000f, 118.000000f }, 1.000000f, -0.000000f ); 
+    instance.registerEObj( "unknown_12", 2007457, 7541028, 4, { 91.000000f, -0.000000f, 115.588501f }, 1.000000f, -0.523599f ); 
+    instance.registerEObj( "unknown_13", 2007457, 7541032, 4, { 84.411537f, -0.000000f, 109.000000f }, 1.000000f, -1.047197f ); 
+    instance.registerEObj( "unknown_14", 2007457, 7541034, 4, { 82.000000f, 0.000000f, 99.993782f }, 1.000000f, -1.570451f ); 
+    instance.registerEObj( "unknown_15", 2007457, 7541033, 4, { 84.411537f, 0.000000f, 91.000000f }, 1.000000f, -1.047197f ); 
+    instance.registerEObj( "unknown_16", 2007457, 7541024, 4, { 91.000000f, -0.000000f, 84.411537f }, 1.000000f, -0.523599f ); 
+    instance.registerEObj( "unknown_17", 2009602, 0, 4, { 100.000000f, 0.000000f, 100.000000f }, 1.000000f, -0.000000f ); 
+    instance.registerEObj( "unknown_18", 2007457, 7541112, 4, { 100.000000f, 0.100000f, 100.000000f }, 1.000000f, 0.000000f ); 
+
+  }
+
+  void onUpdate( InstanceContent& instance, uint32_t currTime ) override
+  {
+
+  }
+
+  void onEnterTerritory( InstanceContent& instance, Entity::Player& player, uint32_t eventId, uint16_t param1,
+                         uint16_t param2 ) override
+  {
+
+  }
+
+};
+
+EXPOSE_SCRIPT( TheShiftingAltarsofUznair );
\ No newline at end of file
diff --git a/src/scripts/instances/trials/ARelicReborntheChimera.cpp b/src/scripts/instances/trials/ARelicReborntheChimera.cpp
index 41bf7fc3..d570207b 100644
--- a/src/scripts/instances/trials/ARelicReborntheChimera.cpp
+++ b/src/scripts/instances/trials/ARelicReborntheChimera.cpp
@@ -9,52 +9,36 @@ class ARelicReborntheChimera :
 public:
   ARelicReborntheChimera() :
     Sapphire::ScriptAPI::InstanceContentScript( 20019 )
-  {
-  }
+  { }
 
-  void onInit( InstanceContentPtr instance ) override
+  void onInit( InstanceContent& instance ) override
   {
-    instance->registerEObj( "sgbg_w_qic_001_04a", 2006993, 6235274, 4, { -35.822102f, 298.899994f, -205.263199f },
-                            1.000000f, 0.000000f );
-    instance->registerEObj( "unknown_0", 2006952, 0, 4, { -35.712589f, 298.899994f, -204.878006f }, 1.000000f,
-                            0.000000f );
-    instance->registerEObj( "Exit", 2000139, 0, 4, { 556.049377f, 348.102509f, -752.435730f }, 1.000000f, 0.000000f );
-    instance->registerEObj( "Entrance", 2000182, 4600289, 5, { 523.532471f, 348.223389f, -736.685730f }, 1.000000f,
-                            0.000000f );
-    // States -> vf_lock_on vf_lock_of
-    instance->registerEObj( "unknown_1", 2002332, 0, 4, { 533.090881f, 348.691895f, -742.750916f }, 1.000000f,
-                            0.000000f );
-    instance->registerEObj( "unknown_2", 2002333, 0, 4, { 539.940430f, 348.836395f, -734.401489f }, 0.991760f,
-                            0.000048f );
-    instance->registerEObj( "unknown_3", 2000608, 3967803, 4, { 202.369598f, 257.761108f, 80.435272f }, 1.000000f,
-                            0.000000f );
-    instance->registerEObj( "unknown_4", 2000608, 3976993, 4, { 273.634705f, 254.600204f, 106.048500f }, 1.000000f,
-                            0.000000f );
-    instance->registerEObj( "unknown_5", 2000608, 3986797, 4, { 205.504898f, 246.188995f, 194.875702f }, 1.000000f,
-                            0.000000f );
-    instance->registerEObj( "unknown_6", 2000608, 3986798, 4, { 326.313385f, 239.193497f, 221.138901f }, 1.000000f,
-                            0.000000f );
-    instance->registerEObj( "unknown_7", 2000608, 2718481, 4, { 240.552307f, 302.769714f, -199.979996f }, 1.000000f,
-                            0.000000f );
-    instance->registerEObj( "unknown_8", 2000608, 4065433, 4, { 204.970001f, 302.119995f, -216.311600f }, 1.000000f,
-                            0.000000f );
-    instance->registerEObj( "unknown_9", 2000608, 2814617, 4, { 205.869995f, 302.219086f, -276.681396f }, 1.000000f,
-                            0.000000f );
-    instance->registerEObj( "unknown_10", 2000608, 2763112, 4, { -433.000000f, 211.007706f, -216.148605f }, 1.000000f,
-                            0.000000f );
-    instance->registerEObj( "unknown_11", 2000608, 4187649, 4, { -453.000000f, 211.000000f, -281.046600f }, 1.000000f,
-                            0.000000f );
-    instance->registerEObj( "unknown_12", 2000608, 4187961, 4, { -416.000000f, 210.788193f, -279.813812f }, 1.000000f,
-                            0.000000f );
+    instance.registerEObj( "sgbg_w_qic_001_04a", 2006993, 6235274, 4, { -35.822102f, 298.899994f, -205.263199f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_0", 2006952, 0, 4, { -35.712589f, 298.899994f, -204.878006f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "Exit", 2000139, 0, 4, { 556.049377f, 348.102509f, -752.435730f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "Entrance", 2000182, 4600289, 5, { 523.532471f, 348.223389f, -736.685730f }, 1.000000f, 0.000000f ); 
+      // States -> vf_lock_on (id: 11) vf_lock_of (id: 12) 
+    instance.registerEObj( "unknown_1", 2002332, 0, 4, { 533.090881f, 348.691895f, -742.750916f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_2", 2002333, 0, 4, { 539.940430f, 348.836395f, -734.401489f }, 0.991760f, 0.000048f ); 
+    instance.registerEObj( "unknown_3", 2000608, 3967803, 4, { 202.369598f, 257.761108f, 80.435272f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_4", 2000608, 3976993, 4, { 273.634705f, 254.600204f, 106.048500f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_5", 2000608, 3986797, 4, { 205.504898f, 246.188995f, 194.875702f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_6", 2000608, 3986798, 4, { 326.313385f, 239.193497f, 221.138901f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_7", 2000608, 2718481, 4, { 240.552307f, 302.769714f, -199.979996f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_8", 2000608, 4065433, 4, { 204.970001f, 302.119995f, -216.311600f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_9", 2000608, 2814617, 4, { 205.869995f, 302.219086f, -276.681396f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_10", 2000608, 2763112, 4, { -433.000000f, 211.007706f, -216.148605f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_11", 2000608, 4187649, 4, { -453.000000f, 211.000000f, -281.046600f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_12", 2000608, 4187961, 4, { -416.000000f, 210.788193f, -279.813812f }, 1.000000f, 0.000000f ); 
 
   }
 
-  void onUpdate( InstanceContentPtr instance, uint32_t currTime ) override
+  void onUpdate( InstanceContent& instance, uint32_t currTime ) override
   {
 
   }
 
-  void onEnterTerritory( InstanceContentPtr instance, Entity::Player& player, uint32_t eventId, uint16_t param1,
+  void onEnterTerritory( InstanceContent& instance, Entity::Player& player, uint32_t eventId, uint16_t param1,
                          uint16_t param2 ) override
   {
 
diff --git a/src/scripts/instances/trials/ARelicReborntheHydra.cpp b/src/scripts/instances/trials/ARelicReborntheHydra.cpp
index e7e3b968..a073ca94 100644
--- a/src/scripts/instances/trials/ARelicReborntheHydra.cpp
+++ b/src/scripts/instances/trials/ARelicReborntheHydra.cpp
@@ -9,109 +9,70 @@ class ARelicReborntheHydra :
 public:
   ARelicReborntheHydra() :
     Sapphire::ScriptAPI::InstanceContentScript( 20020 )
-  {
-  }
+  { }
 
-  void onInit( InstanceContentPtr instance ) override
+  void onInit( InstanceContent& instance ) override
   {
-    instance->registerEObj( "Entrance", 2000182, 4600269, 5, { -245.383194f, 17.225630f, 16.103081f }, 1.000000f,
-                            0.000000f );
-    // States -> vf_lock_on vf_lock_of
-    instance->registerEObj( "Exit", 2000139, 0, 4, { -279.773407f, 17.233170f, 19.434681f }, 1.000000f, 0.000000f );
-    instance->registerEObj( "unknown_0", 2001609, 0, 4, { 241.292603f, 11.057950f, 9.784212f }, 1.000000f, 0.000000f );
-    instance->registerEObj( "Entrance_1", 2001649, 4097866, 5, { 238.950500f, 9.900879f, -1.209344f }, 1.000000f,
-                            0.000000f );
-    // States -> vf_lock_on vf_lock_of
-    instance->registerEObj( "Exit_1", 2001610, 4097973, 4, { -280.512299f, 17.240601f, 20.057501f }, 1.000000f,
-                            0.000000f );
-    // States -> vf_htras1_on vf_htras1_of
-    instance->registerEObj( "sgvf_w_lvd_b0094", 2001611, 4097992, 4, { 19.113859f, 0.900208f, 98.170502f }, 0.991760f,
-                            0.000048f );
-    // States -> vf_line_on vf_line_of
-    instance->registerEObj( "sgvf_w_lvd_b0118", 2001612, 4098036, 4, { 17.948280f, 0.925217f, 99.310219f }, 1.000000f,
-                            0.000000f );
-    // States -> vf_bextwall_on vf_bextwall_of
-    instance->registerEObj( "sgvf_w_lvd_b0094_1", 2001613, 4098064, 4, { -120.074501f, -5.801239f, -111.402496f },
-                            1.000000f, 0.000000f );
-    // States -> vf_line_on vf_line_of
-    instance->registerEObj( "sgvf_w_lvd_b0118_1", 2001614, 4098077, 4, { -121.598503f, -5.727614f, -112.049599f },
-                            1.000000f, 0.000000f );
-    // States -> vf_bextwall_on vf_bextwall_of
-    instance->registerEObj( "sgvf_w_lvd_b0094_2", 2001615, 4098237, 4, { -228.286301f, 17.565599f, 16.208900f },
-                            1.000000f, 0.000048f );
-    // States -> vf_line_on vf_line_of
-    instance->registerEObj( "sgvf_w_lvd_b0118_2", 2001616, 4098241, 4, { -229.136703f, 17.565599f, 16.208900f },
-                            1.000000f, 0.000048f );
-    // States -> vf_bextwall_on vf_bextwall_of
-    instance->registerEObj( "unknown_1", 2001618, 4014394, 4, { 29.098881f, 1.785278f, 130.418793f }, 0.991760f,
-                            0.000048f );
-    instance->registerEObj( "Aetherialflow", 2001619, 0, 4, { 32.968849f, 3.815735f, 131.179199f }, 0.991760f,
-                            0.000048f );
-    instance->registerEObj( "unknown_2", 2001620, 2815987, 4, { 120.471397f, -0.516086f, -57.500610f }, 1.000000f,
-                            0.000000f );
-    instance->registerEObj( "unknown_3", 2001621, 4098194, 4, { -95.942581f, -9.659227f, -101.942596f }, 1.000000f,
-                            0.000000f );
-    instance->registerEObj( "unknown_4", 2001622, 4043181, 4, { -94.468628f, -2.151611f, -68.864014f }, 0.991760f,
-                            0.000048f );
-    instance->registerEObj( "Ludusdoor", 2001623, 4005252, 4, { -172.249695f, 12.559910f, 12.742130f }, 1.000000f,
-                            0.000000f );
-    instance->registerEObj( "Chainwinch", 2001624, 4016950, 4, { 74.518059f, -10.988300f, -107.067703f }, 1.000000f,
-                            0.000000f );
-    instance->registerEObj( "Chainwinch_1", 2001625, 4016951, 4, { 42.154171f, -10.941640f, -84.664078f }, 1.000000f,
-                            0.000000f );
-    instance->registerEObj( "Chainwinch_2", 2001626, 4016952, 4, { 17.515020f, -10.957320f, -190.023102f }, 1.000000f,
-                            0.000000f );
-    instance->registerEObj( "Chainwinch_3", 2001627, 4016953, 4, { -39.127491f, -11.066550f, -129.097504f }, 1.000000f,
-                            0.000000f );
-    instance->registerEObj( "Chainwinch_4", 2001628, 4016954, 4, { -82.474548f, -10.952540f, -113.137199f }, 0.991760f,
-                            0.000048f );
-    instance->registerEObj( "unknown_5", 2001634, 4082420, 4, { -129.441193f, 9.833186f, -0.625334f }, 1.000000f,
-                            0.000000f );
-    instance->registerEObj( "unknown_6", 2001635, 3629276, 4, { -3.044897f, 0.927666f, 144.884506f }, 1.000000f,
-                            0.000000f );
-    instance->registerEObj( "unknown_7", 2001636, 3629274, 4, { 27.769211f, 0.954134f, 166.929398f }, 1.000000f,
-                            0.000000f );
-    instance->registerEObj( "unknown_8", 2001637, 3629277, 4, { 69.039284f, 0.968122f, 137.080902f }, 1.000000f,
-                            0.000000f );
-    instance->registerEObj( "unknown_9", 2001638, 4016486, 4, { -19.781490f, 2.187618f, 152.349899f }, 1.000000f,
-                            0.000000f );
-    instance->registerEObj( "unknown_10", 2001639, 4016487, 4, { 24.469919f, 2.233563f, 180.853195f }, 1.000000f,
-                            0.000000f );
-    instance->registerEObj( "unknown_11", 2001640, 4016488, 4, { 89.225769f, 2.247621f, 140.072006f }, 1.000000f,
-                            0.000000f );
-    instance->registerEObj( "unknown_12", 2001641, 4018090, 4, { -277.600494f, 17.568609f, 40.599701f }, 1.000000f,
-                            0.000000f );
-    instance->registerEObj( "unknown_13", 2001642, 4018091, 4, { -255.703506f, 17.578291f, 47.590672f }, 1.000000f,
-                            0.000000f );
-    instance->registerEObj( "unknown_14", 2001643, 4018092, 4, { -237.108002f, 17.604349f, 38.970459f }, 1.000000f,
-                            0.000000f );
-    instance->registerEObj( "unknown_15", 2001644, 4018089, 4, { -279.140015f, 17.555901f, -2.742105f }, 1.000000f,
-                            0.000000f );
-    instance->registerEObj( "unknown_16", 2001645, 4018088, 4, { -261.194214f, 17.568060f, -11.064940f }, 1.000000f,
-                            0.000000f );
-    instance->registerEObj( "unknown_17", 2001646, 4018087, 4, { -239.163101f, 17.568661f, -4.435994f }, 1.000000f,
-                            0.000000f );
-    instance->registerEObj( "Aetherialflow_1", 2001647, 4103310, 4, { -177.996506f, -14.694460f, -133.043503f },
-                            0.991760f, 0.000048f );
-    // States -> tornade_off tornade_on
-    instance->registerEObj( "unknown_18", 2001648, 4105956, 4, { -171.435196f, -14.633480f, -127.946999f }, 0.991760f,
-                            0.000048f );
-    instance->registerEObj( "unknown_19", 2001650, 0, 4, { -230.125793f, 17.157061f, 16.380630f }, 1.000000f,
-                            0.000000f );
-    instance->registerEObj( "Shortcut", 2000700, 0, 4, { 242.225601f, 9.970665f, -11.333600f }, 1.000000f, 0.000000f );
-    instance->registerEObj( "unknown_20", 2001712, 0, 4, { -131.216003f, 10.073990f, -1.326215f }, 1.000000f,
-                            0.000000f );
-    instance->registerEObj( "unknown_21", 2000210, 0, 4, { -256.084503f, 17.537910f, 17.740490f }, 1.000000f,
-                            0.000000f );
+    instance.registerEObj( "Entrance", 2000182, 4600269, 5, { -245.383194f, 17.225630f, 16.103081f }, 1.000000f, 0.000000f ); 
+      // States -> vf_lock_on (id: 11) vf_lock_of (id: 12) 
+    instance.registerEObj( "Exit", 2000139, 0, 4, { -279.773407f, 17.233170f, 19.434681f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_0", 2001609, 0, 4, { 241.292603f, 11.057950f, 9.784212f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "Entrance_1", 2001649, 4097866, 5, { 238.950500f, 9.900879f, -1.209344f }, 1.000000f, 0.000000f ); 
+      // States -> vf_lock_on (id: 11) vf_lock_of (id: 12) 
+    instance.registerEObj( "Exit_1", 2001610, 4097973, 4, { -280.512299f, 17.240601f, 20.057501f }, 1.000000f, 0.000000f ); 
+      // States -> vf_htras1_on (id: 2) vf_htras1_of (id: 3) 
+    instance.registerEObj( "sgvf_w_lvd_b0094", 2001611, 4097992, 4, { 19.113859f, 0.900208f, 98.170502f }, 0.991760f, 0.000048f ); 
+      // States -> vf_line_on (id: 12) vf_line_of (id: 13) 
+    instance.registerEObj( "sgvf_w_lvd_b0118", 2001612, 4098036, 4, { 17.948280f, 0.925217f, 99.310219f }, 1.000000f, 0.000000f ); 
+      // States -> vf_bextwall_on (id: 3) vf_bextwall_of (id: 4) 
+    instance.registerEObj( "sgvf_w_lvd_b0094_1", 2001613, 4098064, 4, { -120.074501f, -5.801239f, -111.402496f }, 1.000000f, 0.000000f ); 
+      // States -> vf_line_on (id: 12) vf_line_of (id: 13) 
+    instance.registerEObj( "sgvf_w_lvd_b0118_1", 2001614, 4098077, 4, { -121.598503f, -5.727614f, -112.049599f }, 1.000000f, 0.000000f ); 
+      // States -> vf_bextwall_on (id: 3) vf_bextwall_of (id: 4) 
+    instance.registerEObj( "sgvf_w_lvd_b0094_2", 2001615, 4098237, 4, { -228.286301f, 17.565599f, 16.208900f }, 1.000000f, 0.000048f ); 
+      // States -> vf_line_on (id: 12) vf_line_of (id: 13) 
+    instance.registerEObj( "sgvf_w_lvd_b0118_2", 2001616, 4098241, 4, { -229.136703f, 17.565599f, 16.208900f }, 1.000000f, 0.000048f ); 
+      // States -> vf_bextwall_on (id: 3) vf_bextwall_of (id: 4) 
+    instance.registerEObj( "unknown_1", 2001618, 4014394, 4, { 29.098881f, 1.785278f, 130.418793f }, 0.991760f, 0.000048f ); 
+    instance.registerEObj( "Aetherialflow", 2001619, 0, 4, { 32.968849f, 3.815735f, 131.179199f }, 0.991760f, 0.000048f ); 
+    instance.registerEObj( "unknown_2", 2001620, 2815987, 4, { 120.471397f, -0.516086f, -57.500610f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_3", 2001621, 4098194, 4, { -95.942581f, -9.659227f, -101.942596f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_4", 2001622, 4043181, 4, { -94.468628f, -2.151611f, -68.864014f }, 0.991760f, 0.000048f ); 
+    instance.registerEObj( "Ludusdoor", 2001623, 4005252, 4, { -172.249695f, 12.559910f, 12.742130f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "Chainwinch", 2001624, 4016950, 4, { 74.518059f, -10.988300f, -107.067703f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "Chainwinch_1", 2001625, 4016951, 4, { 42.154171f, -10.941640f, -84.664078f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "Chainwinch_2", 2001626, 4016952, 4, { 17.515020f, -10.957320f, -190.023102f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "Chainwinch_3", 2001627, 4016953, 4, { -39.127491f, -11.066550f, -129.097504f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "Chainwinch_4", 2001628, 4016954, 4, { -82.474548f, -10.952540f, -113.137199f }, 0.991760f, 0.000048f ); 
+    instance.registerEObj( "unknown_5", 2001634, 4082420, 4, { -129.441193f, 9.833186f, -0.625334f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_6", 2001635, 3629276, 4, { -3.044897f, 0.927666f, 144.884506f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_7", 2001636, 3629274, 4, { 27.769211f, 0.954134f, 166.929398f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_8", 2001637, 3629277, 4, { 69.039284f, 0.968122f, 137.080902f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_9", 2001638, 4016486, 4, { -19.781490f, 2.187618f, 152.349899f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_10", 2001639, 4016487, 4, { 24.469919f, 2.233563f, 180.853195f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_11", 2001640, 4016488, 4, { 89.225769f, 2.247621f, 140.072006f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_12", 2001641, 4018090, 4, { -277.600494f, 17.568609f, 40.599701f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_13", 2001642, 4018091, 4, { -255.703506f, 17.578291f, 47.590672f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_14", 2001643, 4018092, 4, { -237.108002f, 17.604349f, 38.970459f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_15", 2001644, 4018089, 4, { -279.140015f, 17.555901f, -2.742105f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_16", 2001645, 4018088, 4, { -261.194214f, 17.568060f, -11.064940f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_17", 2001646, 4018087, 4, { -239.163101f, 17.568661f, -4.435994f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "Aetherialflow_1", 2001647, 4103310, 4, { -177.996506f, -14.694460f, -133.043503f }, 0.991760f, 0.000048f ); 
+      // States -> tornade_off (id: 2) tornade_on (id: 3) 
+    instance.registerEObj( "unknown_18", 2001648, 4105956, 4, { -171.435196f, -14.633480f, -127.946999f }, 0.991760f, 0.000048f ); 
+    instance.registerEObj( "unknown_19", 2001650, 0, 4, { -230.125793f, 17.157061f, 16.380630f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "Shortcut", 2000700, 0, 4, { 242.225601f, 9.970665f, -11.333600f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_20", 2001712, 0, 4, { -131.216003f, 10.073990f, -1.326215f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_21", 2000210, 0, 4, { -256.084503f, 17.537910f, 17.740490f }, 1.000000f, 0.000000f ); 
 
   }
 
-  void onUpdate( InstanceContentPtr instance, uint32_t currTime ) override
+  void onUpdate( InstanceContent& instance, uint32_t currTime ) override
   {
 
   }
 
-  void onEnterTerritory( InstanceContentPtr instance, Entity::Player& player, uint32_t eventId, uint16_t param1,
+  void onEnterTerritory( InstanceContent& instance, Entity::Player& player, uint32_t eventId, uint16_t param1,
                          uint16_t param2 ) override
   {
 
diff --git a/src/scripts/instances/trials/AkhAfahAmphitheatreExtreme.cpp b/src/scripts/instances/trials/AkhAfahAmphitheatreExtreme.cpp
index 736e18cd..fd2ddfb5 100644
--- a/src/scripts/instances/trials/AkhAfahAmphitheatreExtreme.cpp
+++ b/src/scripts/instances/trials/AkhAfahAmphitheatreExtreme.cpp
@@ -3,45 +3,39 @@
 
 using namespace Sapphire;
 
-class AkhAfahAmphitheatreExtreme : public Sapphire::ScriptAPI::InstanceContentScript
+class AkhAfahAmphitheatreExtreme :
+  public Sapphire::ScriptAPI::InstanceContentScript
 {
 public:
-  AkhAfahAmphitheatreExtreme() : Sapphire::ScriptAPI::InstanceContentScript( 20025 )
-  {
-  }
+  AkhAfahAmphitheatreExtreme() :
+    Sapphire::ScriptAPI::InstanceContentScript( 20025 )
+  { }
 
-  void onInit( InstanceContentPtr instance ) override
+  void onInit( InstanceContent& instance ) override
   {
-    instance->registerEObj( "unknown_0", 2004238, 4772738, 4, { -1.210436f, 0.000000f, -0.715586f }, 1.000000f,
-                            0.000000f );
-    instance->registerEObj( "sgvf_r1fc_b0472", 2004239, 4797573, 4, { 1.181316f, -0.000000f, 1.563968f }, 1.000000f,
-                            0.000000f );
-    // States -> wind_def wind_def_anim wind_pop wind_pop_anim
-    instance->registerEObj( "sgvf_r1fc_b0471", 2004240, 4841629, 4, { 11.000000f, 0.000000f, -11.000000f }, 1.000000f,
-                            0.793709f );
-    // States -> magi_def magi_def_anim magi_pop magi_pop_anim
-    instance->registerEObj( "sgvf_r1fc_b0471_1", 2004349, 4841631, 4, { 12.811310f, -0.000000f, 9.376424f }, 1.000000f,
-                            0.000000f );
-    // States -> magi_def magi_def_anim magi_pop magi_pop_anim
-    instance->registerEObj( "sgvf_r1fc_b0471_2", 2004350, 4841632, 4, { -8.033875f, 0.000000f, 10.406790f }, 1.000000f,
-                            0.000000f );
-    // States -> magi_def magi_def_anim magi_pop magi_pop_anim
-    instance->registerEObj( "sgvf_r1fc_b0471_3", 2004351, 4841633, 4, { -8.319038f, -0.000001f, -10.997720f },
-                            1.000000f, 0.000000f );
-    // States -> magi_def magi_def_anim magi_pop magi_pop_anim
-    instance->registerEObj( "Entrance", 2000182, 4738599, 5, { 9.717670f, 0.000000f, 14.522430f }, 1.000000f,
-                            0.000000f );
-    // States -> vf_lock_on vf_lock_of
-    instance->registerEObj( "Exit", 2000139, 0, 4, { 0.000000f, 0.000000f, -15.000000f }, 1.000000f, 0.000000f );
+    instance.registerEObj( "unknown_0", 2004238, 4772738, 4, { -1.210436f, 0.000000f, -0.715586f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "sgvf_r1fc_b0472", 2004239, 4797573, 4, { 1.181316f, -0.000000f, 1.563968f }, 1.000000f, 0.000000f ); 
+      // States -> wind_def (id: 2) wind_def_anim (id: 3) wind_pop (id: 4) wind_pop_anim (id: 5) 
+    instance.registerEObj( "sgvf_r1fc_b0471", 2004240, 4841629, 4, { 11.000000f, 0.000000f, -11.000000f }, 1.000000f, 0.793709f ); 
+      // States -> magi_def (id: 2) magi_def_anim (id: 3) magi_pop (id: 4) magi_pop_anim (id: 5) 
+    instance.registerEObj( "sgvf_r1fc_b0471_1", 2004349, 4841631, 4, { 12.811310f, -0.000000f, 9.376424f }, 1.000000f, 0.000000f ); 
+      // States -> magi_def (id: 2) magi_def_anim (id: 3) magi_pop (id: 4) magi_pop_anim (id: 5) 
+    instance.registerEObj( "sgvf_r1fc_b0471_2", 2004350, 4841632, 4, { -8.033875f, 0.000000f, 10.406790f }, 1.000000f, 0.000000f ); 
+      // States -> magi_def (id: 2) magi_def_anim (id: 3) magi_pop (id: 4) magi_pop_anim (id: 5) 
+    instance.registerEObj( "sgvf_r1fc_b0471_3", 2004351, 4841633, 4, { -8.319038f, -0.000001f, -10.997720f }, 1.000000f, 0.000000f ); 
+      // States -> magi_def (id: 2) magi_def_anim (id: 3) magi_pop (id: 4) magi_pop_anim (id: 5) 
+    instance.registerEObj( "Entrance", 2000182, 4738599, 5, { 9.717670f, 0.000000f, 14.522430f }, 1.000000f, 0.000000f ); 
+      // States -> vf_lock_on (id: 11) vf_lock_of (id: 12) 
+    instance.registerEObj( "Exit", 2000139, 0, 4, { 0.000000f, 0.000000f, -15.000000f }, 1.000000f, 0.000000f ); 
 
   }
 
-  void onUpdate( InstanceContentPtr instance, uint32_t currTime ) override
+  void onUpdate( InstanceContent& instance, uint32_t currTime ) override
   {
 
   }
 
-  void onEnterTerritory( InstanceContentPtr instance, Entity::Player& player, uint32_t eventId, uint16_t param1,
+  void onEnterTerritory( InstanceContent& instance, Entity::Player& player, uint32_t eventId, uint16_t param1,
                          uint16_t param2 ) override
   {
 
diff --git a/src/scripts/instances/trials/AkhAfahAmphitheatreHard.cpp b/src/scripts/instances/trials/AkhAfahAmphitheatreHard.cpp
index 0c15024e..bdc9ecd4 100644
--- a/src/scripts/instances/trials/AkhAfahAmphitheatreHard.cpp
+++ b/src/scripts/instances/trials/AkhAfahAmphitheatreHard.cpp
@@ -9,41 +9,33 @@ class AkhAfahAmphitheatreHard :
 public:
   AkhAfahAmphitheatreHard() :
     Sapphire::ScriptAPI::InstanceContentScript( 20024 )
-  {
-  }
+  { }
 
-  void onInit( InstanceContentPtr instance ) override
+  void onInit( InstanceContent& instance ) override
   {
-    instance->registerEObj( "unknown_0", 2004238, 4772738, 4, { -1.210436f, 0.000000f, -0.715586f }, 1.000000f,
-                            0.000000f );
-    instance->registerEObj( "sgvf_r1fc_b0472", 2004239, 4797573, 4, { 1.181316f, -0.000000f, 1.563968f }, 1.000000f,
-                            0.000000f );
-    // States -> wind_def wind_def_anim wind_pop wind_pop_anim
-    instance->registerEObj( "sgvf_r1fc_b0471", 2004240, 4841629, 4, { 11.000000f, 0.000000f, -11.000000f }, 1.000000f,
-                            0.793709f );
-    // States -> magi_def magi_def_anim magi_pop magi_pop_anim
-    instance->registerEObj( "sgvf_r1fc_b0471_1", 2004349, 4841631, 4, { 12.811310f, -0.000000f, 9.376424f }, 1.000000f,
-                            0.000000f );
-    // States -> magi_def magi_def_anim magi_pop magi_pop_anim
-    instance->registerEObj( "sgvf_r1fc_b0471_2", 2004350, 4841632, 4, { -8.033875f, 0.000000f, 10.406790f }, 1.000000f,
-                            0.000000f );
-    // States -> magi_def magi_def_anim magi_pop magi_pop_anim
-    instance->registerEObj( "sgvf_r1fc_b0471_3", 2004351, 4841633, 4, { -8.319038f, -0.000001f, -10.997720f },
-                            1.000000f, 0.000000f );
-    // States -> magi_def magi_def_anim magi_pop magi_pop_anim
-    instance->registerEObj( "Entrance", 2000182, 4738599, 5, { 9.717670f, 0.000000f, 14.522430f }, 1.000000f,
-                            0.000000f );
-    // States -> vf_lock_on vf_lock_of
-    instance->registerEObj( "Exit", 2000139, 0, 4, { 0.000000f, 0.000000f, -15.000000f }, 1.000000f, 0.000000f );
+    instance.registerEObj( "unknown_0", 2004238, 4772738, 4, { -1.210436f, 0.000000f, -0.715586f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "sgvf_r1fc_b0472", 2004239, 4797573, 4, { 1.181316f, -0.000000f, 1.563968f }, 1.000000f, 0.000000f ); 
+      // States -> wind_def (id: 2) wind_def_anim (id: 3) wind_pop (id: 4) wind_pop_anim (id: 5) 
+    instance.registerEObj( "sgvf_r1fc_b0471", 2004240, 4841629, 4, { 11.000000f, 0.000000f, -11.000000f }, 1.000000f, 0.793709f ); 
+      // States -> magi_def (id: 2) magi_def_anim (id: 3) magi_pop (id: 4) magi_pop_anim (id: 5) 
+    instance.registerEObj( "sgvf_r1fc_b0471_1", 2004349, 4841631, 4, { 12.811310f, -0.000000f, 9.376424f }, 1.000000f, 0.000000f ); 
+      // States -> magi_def (id: 2) magi_def_anim (id: 3) magi_pop (id: 4) magi_pop_anim (id: 5) 
+    instance.registerEObj( "sgvf_r1fc_b0471_2", 2004350, 4841632, 4, { -8.033875f, 0.000000f, 10.406790f }, 1.000000f, 0.000000f ); 
+      // States -> magi_def (id: 2) magi_def_anim (id: 3) magi_pop (id: 4) magi_pop_anim (id: 5) 
+    instance.registerEObj( "sgvf_r1fc_b0471_3", 2004351, 4841633, 4, { -8.319038f, -0.000001f, -10.997720f }, 1.000000f, 0.000000f ); 
+      // States -> magi_def (id: 2) magi_def_anim (id: 3) magi_pop (id: 4) magi_pop_anim (id: 5) 
+    instance.registerEObj( "Entrance", 2000182, 4738599, 5, { 9.717670f, 0.000000f, 14.522430f }, 1.000000f, 0.000000f ); 
+      // States -> vf_lock_on (id: 11) vf_lock_of (id: 12) 
+    instance.registerEObj( "Exit", 2000139, 0, 4, { 0.000000f, 0.000000f, -15.000000f }, 1.000000f, 0.000000f ); 
 
   }
 
-  void onUpdate( InstanceContentPtr instance, uint32_t currTime ) override
+  void onUpdate( InstanceContent& instance, uint32_t currTime ) override
   {
 
   }
 
-  void onEnterTerritory( InstanceContentPtr instance, Entity::Player& player, uint32_t eventId, uint16_t param1,
+  void onEnterTerritory( InstanceContent& instance, Entity::Player& player, uint32_t eventId, uint16_t param1,
                          uint16_t param2 ) override
   {
 
diff --git a/src/scripts/instances/trials/BattleintheBigKeep.cpp b/src/scripts/instances/trials/BattleintheBigKeep.cpp
index a2a26060..f637c181 100644
--- a/src/scripts/instances/trials/BattleintheBigKeep.cpp
+++ b/src/scripts/instances/trials/BattleintheBigKeep.cpp
@@ -9,222 +9,142 @@ class BattleintheBigKeep :
 public:
   BattleintheBigKeep() :
     Sapphire::ScriptAPI::InstanceContentScript( 20030 )
-  {
-  }
+  { }
 
-  void onInit( InstanceContentPtr instance ) override
+  void onInit( InstanceContent& instance ) override
   {
-    instance->registerEObj( "sgbg_f1d3_a1_gar2", 2000551, 4277027, 4, { -3.577190f, 48.000000f, -12.625050f },
-                            1.000000f, 0.000000f );
-    // States -> on off vfx_on
-    instance->registerEObj( "sgbg_f1d3_a1_gar2_1", 2000552, 4277005, 4, { 21.455280f, 48.000011f, -12.604770f },
-                            1.000000f, 0.000000f );
-    // States -> on off vfx_on
-    instance->registerEObj( "sgbg_f1d3_a1_gar2_2", 2000553, 4277029, 4, { -3.963791f, 48.000000f, 9.699657f },
-                            1.000000f, 0.000000f );
-    // States -> on off vfx_on
-    instance->registerEObj( "sgbg_f1d3_a1_gar2_3", 2000554, 4277028, 4, { 21.081841f, 47.999920f, 9.731779f },
-                            1.000000f, 0.000000f );
-    // States -> on off vfx_on
-    instance->registerEObj( "Entrance", 2000491, 4246565, 5, { -254.388702f, -8.857766f, -0.323940f }, 1.000000f,
-                            0.000000f );
-    // States -> vf_lock_on vf_lock_of
-    instance->registerEObj( "unknown_0", 2000492, 0, 4, { -266.179810f, -9.200000f, -0.162207f }, 1.000000f,
-                            0.000000f );
-    instance->registerEObj( "Exit", 2000493, 4246574, 4, { -12.466670f, 48.285069f, -0.015320f }, 0.991760f,
-                            0.000048f );
-    // States -> vf_htras1_on vf_htras1_of
-    instance->registerEObj( "sgvf_w_lvd_b0094", 2000494, 4246576, 4, { -81.527344f, 0.000003f, -1.602537f }, 1.000000f,
-                            0.000000f );
-    // States -> vf_line_on vf_line_of
-    instance->registerEObj( "sgvf_w_lvd_b0118", 2000495, 4246594, 4, { -81.412201f, 0.000003f, 0.186550f }, 1.000000f,
-                            0.000000f );
-    // States -> vf_bextwall_on vf_bextwall_of
-    instance->registerEObj( "sgvf_w_lvd_b0094_1", 2000496, 4246595, 4, { 199.816895f, 21.957701f, -104.781303f },
-                            0.991760f, 0.000048f );
-    // States -> vf_line_on vf_line_of
-    instance->registerEObj( "sgpl_w_lvd_b0118_f1d2", 2000497, 4246596, 4, { 200.915497f, 21.957701f, -104.598198f },
-                            0.991760f, 0.000048f );
-    // States -> vf_bextwall_on vf_bextwall_of
-    instance->registerEObj( "sgvf_w_lvd_b0249", 2000498, 4246617, 4, { 34.775269f, 48.081181f, 0.381470f }, 0.991760f,
-                            0.000048f );
-    // States -> vf_line_on vf_line_of
-    instance->registerEObj( "sgvf_w_lvd_b0250", 2000499, 4246618, 4, { 34.775269f, 48.081181f, -0.839294f }, 0.991760f,
-                            0.000048f );
-    // States -> vf_bextwall_on vf_bextwall_of
-    instance->registerEObj( "Shortcut", 2000700, 0, 4, { -246.833496f, -8.499996f, 4.016408f }, 1.000000f, 0.000000f );
-    instance->registerEObj( "Aetherialflow", 2000500, 4247835, 4, { -10.236110f, -0.000000f, -0.015320f }, 0.991760f,
-                            0.000048f );
-    instance->registerEObj( "PresenceChamberdoor", 2000502, 4308888, 4, { 60.483269f, 48.174511f, -0.015320f },
-                            0.991760f, 0.000048f );
-    instance->registerEObj( "BloodyTranseptdoor", 2000687, 4308274, 4, { 199.985397f, 22.200001f, -103.389503f },
-                            1.000000f, 0.000000f );
-    instance->registerEObj( "sgvf_f1d1_b0008", 2002741, 4388278, 4, { -82.462273f, 0.000002f, 0.045686f }, 1.000000f,
-                            0.000000f );
-    // States -> vf_baria1_off vf_baria_on
-    instance->registerEObj( "sgbg_f1d3_a1_gar1", 2000509, 4271520, 4, { 134.111496f, 22.079769f, -5.935791f },
-                            0.991760f, 0.000048f );
-    instance->registerEObj( "sgbg_f1d3_a1_gar1_1", 2000510, 4271522, 4, { 142.229202f, 22.079769f, -6.088379f },
-                            0.991760f, 0.000048f );
-    instance->registerEObj( "sgbg_f1d3_a1_gar1_2", 2000511, 4271529, 4, { 158.129196f, 22.079769f, -6.088379f },
-                            0.991760f, 0.000048f );
-    instance->registerEObj( "sgbg_f1d3_a1_gar1_3", 2000512, 4271531, 4, { 133.958893f, 22.079769f, 6.271362f },
-                            0.991760f, 0.000048f );
-    instance->registerEObj( "sgbg_f1d3_a1_gar1_4", 2000513, 4271532, 4, { 142.015594f, 22.079769f, 6.271362f },
-                            0.991760f, 0.000048f );
-    instance->registerEObj( "sgbg_f1d3_a1_gar1_5", 2000514, 4271533, 4, { 158.190201f, 22.079769f, 6.271362f },
-                            0.991760f, 0.000048f );
-    instance->registerEObj( "sgbg_f1d3_a1_gar1_6", 2000521, 4274657, 4, { 193.987900f, 22.110291f, 42.099609f },
-                            0.991760f, 0.000048f );
-    instance->registerEObj( "sgbg_f1d3_a1_gar1_7", 2000522, 4274656, 4, { 193.804794f, 22.079769f, 57.938480f },
-                            0.991760f, 0.000048f );
-    instance->registerEObj( "sgbg_f1d3_a1_gar1_8", 2000523, 4274655, 4, { 193.804794f, 22.079769f, 65.964722f },
-                            0.991760f, 0.000048f );
-    instance->registerEObj( "sgbg_f1d3_a1_gar1_9", 2000524, 4274661, 4, { 206.317093f, 22.079769f, 42.038570f },
-                            0.991760f, 0.000048f );
-    instance->registerEObj( "sgbg_f1d3_a1_gar1_10", 2000525, 4274660, 4, { 206.286697f, 22.079769f, 57.968990f },
-                            0.991760f, 0.000048f );
-    instance->registerEObj( "sgbg_f1d3_a1_gar1_11", 2000526, 4274659, 4, { 206.286697f, 22.079769f, 65.995239f },
-                            0.991760f, 0.000048f );
-    instance->registerEObj( "sgbg_f1d3_a1_gar1_12", 2000533, 4274648, 4, { 241.992798f, 22.079769f, -6.332520f },
-                            0.991760f, 0.000048f );
-    instance->registerEObj( "sgbg_f1d3_a1_gar1_13", 2000534, 4274649, 4, { 258.075806f, 22.079769f, -6.332520f },
-                            0.991760f, 0.000048f );
-    instance->registerEObj( "sgbg_f1d3_a1_gar1_14", 2000535, 4274650, 4, { 265.949493f, 22.079769f, -6.271484f },
-                            0.991760f, 0.000048f );
-    instance->registerEObj( "sgbg_f1d3_a1_gar1_15", 2000536, 4274651, 4, { 241.931793f, 22.079769f, 6.240906f },
-                            0.991760f, 0.000048f );
-    instance->registerEObj( "sgbg_f1d3_a1_gar1_16", 2000537, 4274652, 4, { 258.075806f, 22.079769f, 6.271362f },
-                            0.991760f, 0.000048f );
-    instance->registerEObj( "sgbg_f1d3_a1_gar1_17", 2000538, 4274653, 4, { 266.071503f, 22.079769f, 6.271362f },
-                            0.991760f, 0.000048f );
-    instance->registerEObj( "sgbg_f1d3_a1_gar1_18", 2000545, 4274662, 4, { 193.804794f, 22.079769f, -34.042912f },
-                            0.991760f, 0.000048f );
-    instance->registerEObj( "sgbg_f1d3_a1_gar1_19", 2000546, 4274667, 4, { 193.804794f, 22.079769f, -42.008121f },
-                            0.991760f, 0.000048f );
-    instance->registerEObj( "sgbg_f1d3_a1_gar1_20", 2000547, 4274666, 4, { 193.804794f, 22.079769f, -58.335270f },
-                            0.991760f, 0.000048f );
-    instance->registerEObj( "sgbg_f1d3_a1_gar1_21", 2000548, 4274663, 4, { 206.317093f, 22.079769f, -33.890320f },
-                            0.991760f, 0.000048f );
-    instance->registerEObj( "sgbg_f1d3_a1_gar1_22", 2000549, 4274665, 4, { 206.317093f, 22.079769f, -41.916561f },
-                            0.991760f, 0.000048f );
-    instance->registerEObj( "sgbg_f1d3_a1_gar1_23", 2000550, 4274664, 4, { 206.317093f, 22.079769f, -58.274231f },
-                            0.991760f, 0.000048f );
-    instance->registerEObj( "sgbg_f1d3_a1_gar2_4", 2000503, 4274671, 4, { 134.111496f, 22.079769f, -5.935791f },
-                            0.991760f, 0.000048f );
-    // States -> on off vfx_on
-    instance->registerEObj( "sgbg_f1d3_a1_gar2_5", 2000504, 4274672, 4, { 142.229202f, 22.079769f, -6.088379f },
-                            0.991760f, 0.000048f );
-    // States -> on off vfx_on
-    instance->registerEObj( "sgbg_f1d3_a1_gar2_6", 2000505, 4274673, 4, { 158.129196f, 22.079769f, -6.088379f },
-                            0.991760f, 0.000048f );
-    // States -> on off vfx_on
-    instance->registerEObj( "sgbg_f1d3_a1_gar2_7", 2000506, 4274674, 4, { 133.958893f, 22.079769f, 6.271362f },
-                            0.991760f, 0.000048f );
-    // States -> on off vfx_on
-    instance->registerEObj( "sgbg_f1d3_a1_gar2_8", 2000507, 4274675, 4, { 142.015594f, 22.079769f, 6.271362f },
-                            0.991760f, 0.000048f );
-    // States -> on off vfx_on
-    instance->registerEObj( "sgbg_f1d3_a1_gar2_9", 2000508, 4274676, 4, { 158.190201f, 22.079769f, 6.271362f },
-                            0.991760f, 0.000048f );
-    // States -> on off vfx_on
-    instance->registerEObj( "sgbg_f1d3_a1_gar2_10", 2000515, 4274685, 4, { 193.987900f, 22.110291f, 42.099609f },
-                            0.991760f, 0.000048f );
-    // States -> on off vfx_on
-    instance->registerEObj( "sgbg_f1d3_a1_gar2_11", 2000516, 4274684, 4, { 193.804794f, 22.079769f, 57.938480f },
-                            0.991760f, 0.000048f );
-    // States -> on off vfx_on
-    instance->registerEObj( "sgbg_f1d3_a1_gar2_12", 2000517, 4274683, 4, { 193.804794f, 22.079769f, 65.964722f },
-                            0.991760f, 0.000048f );
-    // States -> on off vfx_on
-    instance->registerEObj( "sgbg_f1d3_a1_gar2_13", 2000518, 4274688, 4, { 206.317093f, 22.079769f, 42.038570f },
-                            0.991760f, 0.000048f );
-    // States -> on off vfx_on
-    instance->registerEObj( "sgbg_f1d3_a1_gar2_14", 2000519, 4274687, 4, { 206.317093f, 22.079769f, 57.968990f },
-                            0.991760f, 0.000048f );
-    // States -> on off vfx_on
-    instance->registerEObj( "sgbg_f1d3_a1_gar2_15", 2000520, 4274686, 4, { 206.317093f, 22.079769f, 65.995239f },
-                            0.991760f, 0.000048f );
-    // States -> on off vfx_on
-    instance->registerEObj( "sgbg_f1d3_a1_gar2_16", 2000527, 4274677, 4, { 241.992798f, 22.079769f, -6.332520f },
-                            0.991760f, 0.000048f );
-    // States -> on off vfx_on
-    instance->registerEObj( "sgbg_f1d3_a1_gar2_17", 2000528, 4274678, 4, { 258.075806f, 22.079769f, -6.332520f },
-                            0.991760f, 0.000048f );
-    // States -> on off vfx_on
-    instance->registerEObj( "sgbg_f1d3_a1_gar2_18", 2000529, 4274679, 4, { 265.949493f, 22.079769f, -6.271484f },
-                            0.991760f, 0.000048f );
-    // States -> on off vfx_on
-    instance->registerEObj( "sgbg_f1d3_a1_gar2_19", 2000530, 4274680, 4, { 241.931793f, 22.079769f, 6.271362f },
-                            0.991760f, 0.000048f );
-    // States -> on off vfx_on
-    instance->registerEObj( "sgbg_f1d3_a1_gar2_20", 2000531, 4274681, 4, { 258.075806f, 22.079769f, 6.271362f },
-                            0.991760f, 0.000048f );
-    // States -> on off vfx_on
-    instance->registerEObj( "sgbg_f1d3_a1_gar2_21", 2000532, 4274682, 4, { 266.071503f, 22.079769f, 6.271362f },
-                            0.991760f, 0.000048f );
-    // States -> on off vfx_on
-    instance->registerEObj( "sgbg_f1d3_a1_gar2_22", 2000539, 4274689, 4, { 193.804794f, 22.079769f, -34.042912f },
-                            0.991760f, 0.000048f );
-    // States -> on off vfx_on
-    instance->registerEObj( "sgbg_f1d3_a1_gar2_23", 2000540, 4274694, 4, { 193.804794f, 22.079769f, -42.008121f },
-                            0.991760f, 0.000048f );
-    // States -> on off vfx_on
-    instance->registerEObj( "sgbg_f1d3_a1_gar2_24", 2000541, 4274693, 4, { 193.804794f, 22.079769f, -58.335270f },
-                            0.991760f, 0.000048f );
-    // States -> on off vfx_on
-    instance->registerEObj( "sgbg_f1d3_a1_gar2_25", 2000542, 4274690, 4, { 206.317093f, 22.079769f, -33.890320f },
-                            0.991760f, 0.000048f );
-    // States -> on off vfx_on
-    instance->registerEObj( "sgbg_f1d3_a1_gar2_26", 2000543, 4274692, 4, { 206.317093f, 22.079769f, -41.916561f },
-                            0.991760f, 0.000048f );
-    // States -> on off vfx_on
-    instance->registerEObj( "sgbg_f1d3_a1_gar2_27", 2000544, 4274691, 4, { 206.317093f, 22.079769f, -58.274231f },
-                            0.991760f, 0.000048f );
-    // States -> on off vfx_on
-    instance->registerEObj( "Entrance_1", 2000182, 5608623, 5, { -156.520401f, -2.800003f, -5.140180f }, 1.000000f,
-                            0.000000f );
-    // States -> vf_lock_on vf_lock_of
-    instance->registerEObj( "sgvf_w_lvd_b0118_1", 2002872, 5608617, 4, { -154.662003f, -2.800003f, 5.028913f },
-                            1.000000f, 0.000000f );
-    // States -> vf_bextwall_on vf_bextwall_of
-    instance->registerEObj( "unknown_1", 2002735, 0, 4, { -151.232193f, -2.822998f, 0.289556f }, 1.174927f,
-                            -1.570451f );
-    instance->registerEObj( "sgvf_w_lvd_b0118_2", 2005128, 5608619, 4, { -112.240501f, -2.800003f, -0.701091f },
-                            1.000000f, 0.000000f );
-    // States -> vf_bextwall_on vf_bextwall_of
-    instance->registerEObj( "unknown_2", 2002735, 0, 4, { -46.585720f, 0.045776f, 0.190301f }, 1.179312f, -1.570451f );
-    instance->registerEObj( "sgvf_w_lvd_b0118_3", 2002872, 5608620, 4, { -46.476231f, 0.000000f, -0.510445f },
-                            1.000000f, 0.000000f );
-    // States -> vf_bextwall_on vf_bextwall_of
-    instance->registerEObj( "Exit_1", 2000139, 0, 4, { -7.766907f, -0.015320f, 0.015198f }, 0.991760f, 0.000048f );
-    instance->registerEObj( "sgvf_f1d3_bo189", 2000561, 4248559, 4, { 200.121902f, 21.988159f, -114.000000f },
-                            1.000000f, 0.000048f );
-    instance->registerEObj( "sgbg_col_wall_00", 2000555, 4249099, 4, { 200.000000f, 21.988159f, -151.822800f },
-                            0.991760f, 0.000048f );
-    instance->registerEObj( "Aetherialflow_1", 2000501, 4247838, 4, { 200.061005f, 22.000000f, -165.266006f },
-                            0.991760f, 0.000048f );
-    instance->registerEObj( "sgbg_col_wall_00_1", 2000556, 4249100, 4, { 200.000000f, 21.988159f, -146.822800f },
-                            0.991760f, 0.000048f );
-    instance->registerEObj( "sgbg_col_wall_00_2", 2000557, 4249101, 4, { 200.000000f, 21.988159f, -141.822800f },
-                            0.991760f, 0.000048f );
-    instance->registerEObj( "sgbg_col_wall_00_3", 2000560, 4249104, 4, { 200.000000f, 21.988159f, -126.822800f },
-                            0.991760f, 0.000048f );
-    instance->registerEObj( "sgbg_col_wall_00_4", 2000602, 4253048, 4, { 200.000000f, 21.988159f, -121.822800f },
-                            0.991760f, 0.000048f );
-    instance->registerEObj( "sgbg_col_wall_00_5", 2000559, 4249103, 4, { 200.000000f, 21.988159f, -131.822800f },
-                            0.991760f, 0.000048f );
-    instance->registerEObj( "sgbg_col_wall_00_6", 2000558, 4249102, 4, { 200.000000f, 21.957701f, -136.838501f },
-                            0.991760f, 0.000048f );
+    instance.registerEObj( "sgbg_f1d3_a1_gar2", 2000551, 4277027, 4, { -3.577190f, 48.000000f, -12.625050f }, 1.000000f, 0.000000f ); 
+      // States -> on (id: 4) off (id: 5) vfx_on (id: 8) 
+    instance.registerEObj( "sgbg_f1d3_a1_gar2_1", 2000552, 4277005, 4, { 21.455280f, 48.000011f, -12.604770f }, 1.000000f, 0.000000f ); 
+      // States -> on (id: 4) off (id: 5) vfx_on (id: 8) 
+    instance.registerEObj( "sgbg_f1d3_a1_gar2_2", 2000553, 4277029, 4, { -3.963791f, 48.000000f, 9.699657f }, 1.000000f, 0.000000f ); 
+      // States -> on (id: 4) off (id: 5) vfx_on (id: 8) 
+    instance.registerEObj( "sgbg_f1d3_a1_gar2_3", 2000554, 4277028, 4, { 21.081841f, 47.999920f, 9.731779f }, 1.000000f, 0.000000f ); 
+      // States -> on (id: 4) off (id: 5) vfx_on (id: 8) 
+    instance.registerEObj( "Entrance", 2000491, 4246565, 5, { -254.388702f, -8.857766f, -0.323940f }, 1.000000f, 0.000000f ); 
+      // States -> vf_lock_on (id: 11) vf_lock_of (id: 12) 
+    instance.registerEObj( "unknown_0", 2000492, 0, 4, { -266.179810f, -9.200000f, -0.162207f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "Exit", 2000493, 4246574, 4, { -12.466670f, 48.285069f, -0.015320f }, 0.991760f, 0.000048f ); 
+      // States -> vf_htras1_on (id: 2) vf_htras1_of (id: 3) 
+    instance.registerEObj( "sgvf_w_lvd_b0094", 2000494, 4246576, 4, { -81.527344f, 0.000003f, -1.602537f }, 1.000000f, 0.000000f ); 
+      // States -> vf_line_on (id: 12) vf_line_of (id: 13) 
+    instance.registerEObj( "sgvf_w_lvd_b0118", 2000495, 4246594, 4, { -81.412201f, 0.000003f, 0.186550f }, 1.000000f, 0.000000f ); 
+      // States -> vf_bextwall_on (id: 3) vf_bextwall_of (id: 4) 
+    instance.registerEObj( "sgvf_w_lvd_b0094_1", 2000496, 4246595, 4, { 199.816895f, 21.957701f, -104.781303f }, 0.991760f, 0.000048f ); 
+      // States -> vf_line_on (id: 12) vf_line_of (id: 13) 
+    instance.registerEObj( "sgpl_w_lvd_b0118_f1d2", 2000497, 4246596, 4, { 200.915497f, 21.957701f, -104.598198f }, 0.991760f, 0.000048f ); 
+      // States -> vf_bextwall_on (id: 3) vf_bextwall_of (id: 4) 
+    instance.registerEObj( "sgvf_w_lvd_b0249", 2000498, 4246617, 4, { 34.775269f, 48.081181f, 0.381470f }, 0.991760f, 0.000048f ); 
+      // States -> vf_line_on (id: 10) vf_line_of (id: 11) 
+    instance.registerEObj( "sgvf_w_lvd_b0250", 2000499, 4246618, 4, { 34.775269f, 48.081181f, -0.839294f }, 0.991760f, 0.000048f ); 
+      // States -> vf_bextwall_on (id: 3) vf_bextwall_of (id: 4) 
+    instance.registerEObj( "Shortcut", 2000700, 0, 4, { -246.833496f, -8.499996f, 4.016408f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "Aetherialflow", 2000500, 4247835, 4, { -10.236110f, -0.000000f, -0.015320f }, 0.991760f, 0.000048f ); 
+    instance.registerEObj( "PresenceChamberdoor", 2000502, 4308888, 4, { 60.483269f, 48.174511f, -0.015320f }, 0.991760f, 0.000048f ); 
+    instance.registerEObj( "BloodyTranseptdoor", 2000687, 4308274, 4, { 199.985397f, 22.200001f, -103.389503f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "sgvf_f1d1_b0008", 2002741, 4388278, 4, { -82.462273f, 0.000002f, 0.045686f }, 1.000000f, 0.000000f ); 
+      // States -> vf_baria1_off (id: 3) vf_baria_on (id: 6) 
+    instance.registerEObj( "sgbg_f1d3_a1_gar1", 2000509, 4271520, 4, { 134.111496f, 22.079769f, -5.935791f }, 0.991760f, 0.000048f ); 
+    instance.registerEObj( "sgbg_f1d3_a1_gar1_1", 2000510, 4271522, 4, { 142.229202f, 22.079769f, -6.088379f }, 0.991760f, 0.000048f ); 
+    instance.registerEObj( "sgbg_f1d3_a1_gar1_2", 2000511, 4271529, 4, { 158.129196f, 22.079769f, -6.088379f }, 0.991760f, 0.000048f ); 
+    instance.registerEObj( "sgbg_f1d3_a1_gar1_3", 2000512, 4271531, 4, { 133.958893f, 22.079769f, 6.271362f }, 0.991760f, 0.000048f ); 
+    instance.registerEObj( "sgbg_f1d3_a1_gar1_4", 2000513, 4271532, 4, { 142.015594f, 22.079769f, 6.271362f }, 0.991760f, 0.000048f ); 
+    instance.registerEObj( "sgbg_f1d3_a1_gar1_5", 2000514, 4271533, 4, { 158.190201f, 22.079769f, 6.271362f }, 0.991760f, 0.000048f ); 
+    instance.registerEObj( "sgbg_f1d3_a1_gar1_6", 2000521, 4274657, 4, { 193.987900f, 22.110291f, 42.099609f }, 0.991760f, 0.000048f ); 
+    instance.registerEObj( "sgbg_f1d3_a1_gar1_7", 2000522, 4274656, 4, { 193.804794f, 22.079769f, 57.938480f }, 0.991760f, 0.000048f ); 
+    instance.registerEObj( "sgbg_f1d3_a1_gar1_8", 2000523, 4274655, 4, { 193.804794f, 22.079769f, 65.964722f }, 0.991760f, 0.000048f ); 
+    instance.registerEObj( "sgbg_f1d3_a1_gar1_9", 2000524, 4274661, 4, { 206.317093f, 22.079769f, 42.038570f }, 0.991760f, 0.000048f ); 
+    instance.registerEObj( "sgbg_f1d3_a1_gar1_10", 2000525, 4274660, 4, { 206.286697f, 22.079769f, 57.968990f }, 0.991760f, 0.000048f ); 
+    instance.registerEObj( "sgbg_f1d3_a1_gar1_11", 2000526, 4274659, 4, { 206.286697f, 22.079769f, 65.995239f }, 0.991760f, 0.000048f ); 
+    instance.registerEObj( "sgbg_f1d3_a1_gar1_12", 2000533, 4274648, 4, { 241.992798f, 22.079769f, -6.332520f }, 0.991760f, 0.000048f ); 
+    instance.registerEObj( "sgbg_f1d3_a1_gar1_13", 2000534, 4274649, 4, { 258.075806f, 22.079769f, -6.332520f }, 0.991760f, 0.000048f ); 
+    instance.registerEObj( "sgbg_f1d3_a1_gar1_14", 2000535, 4274650, 4, { 265.949493f, 22.079769f, -6.271484f }, 0.991760f, 0.000048f ); 
+    instance.registerEObj( "sgbg_f1d3_a1_gar1_15", 2000536, 4274651, 4, { 241.931793f, 22.079769f, 6.240906f }, 0.991760f, 0.000048f ); 
+    instance.registerEObj( "sgbg_f1d3_a1_gar1_16", 2000537, 4274652, 4, { 258.075806f, 22.079769f, 6.271362f }, 0.991760f, 0.000048f ); 
+    instance.registerEObj( "sgbg_f1d3_a1_gar1_17", 2000538, 4274653, 4, { 266.071503f, 22.079769f, 6.271362f }, 0.991760f, 0.000048f ); 
+    instance.registerEObj( "sgbg_f1d3_a1_gar1_18", 2000545, 4274662, 4, { 193.804794f, 22.079769f, -34.042912f }, 0.991760f, 0.000048f ); 
+    instance.registerEObj( "sgbg_f1d3_a1_gar1_19", 2000546, 4274667, 4, { 193.804794f, 22.079769f, -42.008121f }, 0.991760f, 0.000048f ); 
+    instance.registerEObj( "sgbg_f1d3_a1_gar1_20", 2000547, 4274666, 4, { 193.804794f, 22.079769f, -58.335270f }, 0.991760f, 0.000048f ); 
+    instance.registerEObj( "sgbg_f1d3_a1_gar1_21", 2000548, 4274663, 4, { 206.317093f, 22.079769f, -33.890320f }, 0.991760f, 0.000048f ); 
+    instance.registerEObj( "sgbg_f1d3_a1_gar1_22", 2000549, 4274665, 4, { 206.317093f, 22.079769f, -41.916561f }, 0.991760f, 0.000048f ); 
+    instance.registerEObj( "sgbg_f1d3_a1_gar1_23", 2000550, 4274664, 4, { 206.317093f, 22.079769f, -58.274231f }, 0.991760f, 0.000048f ); 
+    instance.registerEObj( "sgbg_f1d3_a1_gar2_4", 2000503, 4274671, 4, { 134.111496f, 22.079769f, -5.935791f }, 0.991760f, 0.000048f ); 
+      // States -> on (id: 4) off (id: 5) vfx_on (id: 8) 
+    instance.registerEObj( "sgbg_f1d3_a1_gar2_5", 2000504, 4274672, 4, { 142.229202f, 22.079769f, -6.088379f }, 0.991760f, 0.000048f ); 
+      // States -> on (id: 4) off (id: 5) vfx_on (id: 8) 
+    instance.registerEObj( "sgbg_f1d3_a1_gar2_6", 2000505, 4274673, 4, { 158.129196f, 22.079769f, -6.088379f }, 0.991760f, 0.000048f ); 
+      // States -> on (id: 4) off (id: 5) vfx_on (id: 8) 
+    instance.registerEObj( "sgbg_f1d3_a1_gar2_7", 2000506, 4274674, 4, { 133.958893f, 22.079769f, 6.271362f }, 0.991760f, 0.000048f ); 
+      // States -> on (id: 4) off (id: 5) vfx_on (id: 8) 
+    instance.registerEObj( "sgbg_f1d3_a1_gar2_8", 2000507, 4274675, 4, { 142.015594f, 22.079769f, 6.271362f }, 0.991760f, 0.000048f ); 
+      // States -> on (id: 4) off (id: 5) vfx_on (id: 8) 
+    instance.registerEObj( "sgbg_f1d3_a1_gar2_9", 2000508, 4274676, 4, { 158.190201f, 22.079769f, 6.271362f }, 0.991760f, 0.000048f ); 
+      // States -> on (id: 4) off (id: 5) vfx_on (id: 8) 
+    instance.registerEObj( "sgbg_f1d3_a1_gar2_10", 2000515, 4274685, 4, { 193.987900f, 22.110291f, 42.099609f }, 0.991760f, 0.000048f ); 
+      // States -> on (id: 4) off (id: 5) vfx_on (id: 8) 
+    instance.registerEObj( "sgbg_f1d3_a1_gar2_11", 2000516, 4274684, 4, { 193.804794f, 22.079769f, 57.938480f }, 0.991760f, 0.000048f ); 
+      // States -> on (id: 4) off (id: 5) vfx_on (id: 8) 
+    instance.registerEObj( "sgbg_f1d3_a1_gar2_12", 2000517, 4274683, 4, { 193.804794f, 22.079769f, 65.964722f }, 0.991760f, 0.000048f ); 
+      // States -> on (id: 4) off (id: 5) vfx_on (id: 8) 
+    instance.registerEObj( "sgbg_f1d3_a1_gar2_13", 2000518, 4274688, 4, { 206.317093f, 22.079769f, 42.038570f }, 0.991760f, 0.000048f ); 
+      // States -> on (id: 4) off (id: 5) vfx_on (id: 8) 
+    instance.registerEObj( "sgbg_f1d3_a1_gar2_14", 2000519, 4274687, 4, { 206.317093f, 22.079769f, 57.968990f }, 0.991760f, 0.000048f ); 
+      // States -> on (id: 4) off (id: 5) vfx_on (id: 8) 
+    instance.registerEObj( "sgbg_f1d3_a1_gar2_15", 2000520, 4274686, 4, { 206.317093f, 22.079769f, 65.995239f }, 0.991760f, 0.000048f ); 
+      // States -> on (id: 4) off (id: 5) vfx_on (id: 8) 
+    instance.registerEObj( "sgbg_f1d3_a1_gar2_16", 2000527, 4274677, 4, { 241.992798f, 22.079769f, -6.332520f }, 0.991760f, 0.000048f ); 
+      // States -> on (id: 4) off (id: 5) vfx_on (id: 8) 
+    instance.registerEObj( "sgbg_f1d3_a1_gar2_17", 2000528, 4274678, 4, { 258.075806f, 22.079769f, -6.332520f }, 0.991760f, 0.000048f ); 
+      // States -> on (id: 4) off (id: 5) vfx_on (id: 8) 
+    instance.registerEObj( "sgbg_f1d3_a1_gar2_18", 2000529, 4274679, 4, { 265.949493f, 22.079769f, -6.271484f }, 0.991760f, 0.000048f ); 
+      // States -> on (id: 4) off (id: 5) vfx_on (id: 8) 
+    instance.registerEObj( "sgbg_f1d3_a1_gar2_19", 2000530, 4274680, 4, { 241.931793f, 22.079769f, 6.271362f }, 0.991760f, 0.000048f ); 
+      // States -> on (id: 4) off (id: 5) vfx_on (id: 8) 
+    instance.registerEObj( "sgbg_f1d3_a1_gar2_20", 2000531, 4274681, 4, { 258.075806f, 22.079769f, 6.271362f }, 0.991760f, 0.000048f ); 
+      // States -> on (id: 4) off (id: 5) vfx_on (id: 8) 
+    instance.registerEObj( "sgbg_f1d3_a1_gar2_21", 2000532, 4274682, 4, { 266.071503f, 22.079769f, 6.271362f }, 0.991760f, 0.000048f ); 
+      // States -> on (id: 4) off (id: 5) vfx_on (id: 8) 
+    instance.registerEObj( "sgbg_f1d3_a1_gar2_22", 2000539, 4274689, 4, { 193.804794f, 22.079769f, -34.042912f }, 0.991760f, 0.000048f ); 
+      // States -> on (id: 4) off (id: 5) vfx_on (id: 8) 
+    instance.registerEObj( "sgbg_f1d3_a1_gar2_23", 2000540, 4274694, 4, { 193.804794f, 22.079769f, -42.008121f }, 0.991760f, 0.000048f ); 
+      // States -> on (id: 4) off (id: 5) vfx_on (id: 8) 
+    instance.registerEObj( "sgbg_f1d3_a1_gar2_24", 2000541, 4274693, 4, { 193.804794f, 22.079769f, -58.335270f }, 0.991760f, 0.000048f ); 
+      // States -> on (id: 4) off (id: 5) vfx_on (id: 8) 
+    instance.registerEObj( "sgbg_f1d3_a1_gar2_25", 2000542, 4274690, 4, { 206.317093f, 22.079769f, -33.890320f }, 0.991760f, 0.000048f ); 
+      // States -> on (id: 4) off (id: 5) vfx_on (id: 8) 
+    instance.registerEObj( "sgbg_f1d3_a1_gar2_26", 2000543, 4274692, 4, { 206.317093f, 22.079769f, -41.916561f }, 0.991760f, 0.000048f ); 
+      // States -> on (id: 4) off (id: 5) vfx_on (id: 8) 
+    instance.registerEObj( "sgbg_f1d3_a1_gar2_27", 2000544, 4274691, 4, { 206.317093f, 22.079769f, -58.274231f }, 0.991760f, 0.000048f ); 
+      // States -> on (id: 4) off (id: 5) vfx_on (id: 8) 
+    instance.registerEObj( "Entrance_1", 2000182, 5608623, 5, { -156.520401f, -2.800003f, -5.140180f }, 1.000000f, 0.000000f ); 
+      // States -> vf_lock_on (id: 11) vf_lock_of (id: 12) 
+    instance.registerEObj( "sgvf_w_lvd_b0118_1", 2002872, 5608617, 4, { -154.662003f, -2.800003f, 5.028913f }, 1.000000f, 0.000000f ); 
+      // States -> vf_bextwall_on (id: 3) vf_bextwall_of (id: 4) 
+    instance.registerEObj( "unknown_1", 2002735, 0, 4, { -151.232193f, -2.822998f, 0.289556f }, 1.174927f, -1.570451f ); 
+    instance.registerEObj( "sgvf_w_lvd_b0118_2", 2005128, 5608619, 4, { -112.240501f, -2.800003f, -0.701091f }, 1.000000f, 0.000000f ); 
+      // States -> vf_bextwall_on (id: 3) vf_bextwall_of (id: 4) 
+    instance.registerEObj( "unknown_2", 2002735, 0, 4, { -46.585720f, 0.045776f, 0.190301f }, 1.179312f, -1.570451f ); 
+    instance.registerEObj( "sgvf_w_lvd_b0118_3", 2002872, 5608620, 4, { -46.476231f, 0.000000f, -0.510445f }, 1.000000f, 0.000000f ); 
+      // States -> vf_bextwall_on (id: 3) vf_bextwall_of (id: 4) 
+    instance.registerEObj( "Exit_1", 2000139, 0, 4, { -7.766907f, -0.015320f, 0.015198f }, 0.991760f, 0.000048f ); 
+    instance.registerEObj( "sgvf_f1d3_bo189", 2000561, 4248559, 4, { 200.121902f, 21.988159f, -114.000000f }, 1.000000f, 0.000048f ); 
+    instance.registerEObj( "sgbg_col_wall_00", 2000555, 4249099, 4, { 200.000000f, 21.988159f, -151.822800f }, 0.991760f, 0.000048f ); 
+    instance.registerEObj( "Aetherialflow_1", 2000501, 4247838, 4, { 200.061005f, 22.000000f, -165.266006f }, 0.991760f, 0.000048f ); 
+    instance.registerEObj( "sgbg_col_wall_00_1", 2000556, 4249100, 4, { 200.000000f, 21.988159f, -146.822800f }, 0.991760f, 0.000048f ); 
+    instance.registerEObj( "sgbg_col_wall_00_2", 2000557, 4249101, 4, { 200.000000f, 21.988159f, -141.822800f }, 0.991760f, 0.000048f ); 
+    instance.registerEObj( "sgbg_col_wall_00_3", 2000560, 4249104, 4, { 200.000000f, 21.988159f, -126.822800f }, 0.991760f, 0.000048f ); 
+    instance.registerEObj( "sgbg_col_wall_00_4", 2000602, 4253048, 4, { 200.000000f, 21.988159f, -121.822800f }, 0.991760f, 0.000048f ); 
+    instance.registerEObj( "sgbg_col_wall_00_5", 2000559, 4249103, 4, { 200.000000f, 21.988159f, -131.822800f }, 0.991760f, 0.000048f ); 
+    instance.registerEObj( "sgbg_col_wall_00_6", 2000558, 4249102, 4, { 200.000000f, 21.957701f, -136.838501f }, 0.991760f, 0.000048f ); 
 
   }
 
-  void onUpdate( InstanceContentPtr instance, uint32_t currTime ) override
+  void onUpdate( InstanceContent& instance, uint32_t currTime ) override
   {
 
   }
 
-  void onEnterTerritory( InstanceContentPtr instance, Entity::Player& player, uint32_t eventId, uint16_t param1,
+  void onEnterTerritory( InstanceContent& instance, Entity::Player& player, uint32_t eventId, uint16_t param1,
                          uint16_t param2 ) override
   {
 
diff --git a/src/scripts/instances/trials/BattleontheBigBridge.cpp b/src/scripts/instances/trials/BattleontheBigBridge.cpp
index bf7daa50..d82c85a9 100644
--- a/src/scripts/instances/trials/BattleontheBigBridge.cpp
+++ b/src/scripts/instances/trials/BattleontheBigBridge.cpp
@@ -9,37 +9,31 @@ class BattleontheBigBridge :
 public:
   BattleontheBigBridge() :
     Sapphire::ScriptAPI::InstanceContentScript( 20021 )
-  {
-  }
+  { }
 
-  void onInit( InstanceContentPtr instance ) override
+  void onInit( InstanceContent& instance ) override
   {
-    instance->registerEObj( "unknown_0", 2002735, 0, 4, { 106.355499f, -5.000003f, -0.049812f }, 0.404395f,
-                            -1.570451f );
-    instance->registerEObj( "sgvf_w_lvd_b0118", 2002872, 4630952, 4, { 109.916496f, -5.000003f, -0.035030f }, 1.000000f,
-                            0.000000f );
-    // States -> vf_bextwall_on vf_bextwall_of
-    instance->registerEObj( "unknown_1", 2002735, 0, 4, { -75.653900f, 1.999997f, 0.149403f }, 0.500000f, -1.570451f );
-    instance->registerEObj( "sgvf_w_lvd_b0118_1", 2002872, 4635071, 4, { -72.579193f, 1.999997f, 0.830825f }, 1.000000f,
-                            0.000000f );
-    // States -> vf_bextwall_on vf_bextwall_of
-    instance->registerEObj( "sgvf_w_lvd_b0118_2", 2003902, 4635078, 4, { -37.106110f, 2.000000f, 1.552188f }, 1.000000f,
-                            0.000000f );
-    // States -> vf_bextwall_on vf_bextwall_of
-    instance->registerEObj( "Entrance", 2000182, 4630929, 5, { -141.564804f, 1.314597f, 3.459962f }, 1.000000f,
-                            0.000000f );
-    // States -> vf_lock_on vf_lock_of
-    instance->registerEObj( "Exit", 2000139, 0, 4, { 143.814301f, -5.000000f, -0.081344f }, 1.000000f, 0.000000f );
-    instance->registerEObj( "Shortcut", 2000700, 0, 4, { -136.750107f, 1.329580f, 5.374416f }, 1.000000f, 0.000000f );
+    instance.registerEObj( "unknown_0", 2002735, 0, 4, { 106.355499f, -5.000003f, -0.049812f }, 0.404395f, -1.570451f ); 
+    instance.registerEObj( "sgvf_w_lvd_b0118", 2002872, 4630952, 4, { 109.916496f, -5.000003f, -0.035030f }, 1.000000f, 0.000000f ); 
+      // States -> vf_bextwall_on (id: 3) vf_bextwall_of (id: 4) 
+    instance.registerEObj( "unknown_1", 2002735, 0, 4, { -75.653900f, 1.999997f, 0.149403f }, 0.500000f, -1.570451f ); 
+    instance.registerEObj( "sgvf_w_lvd_b0118_1", 2002872, 4635071, 4, { -72.579193f, 1.999997f, 0.830825f }, 1.000000f, 0.000000f ); 
+      // States -> vf_bextwall_on (id: 3) vf_bextwall_of (id: 4) 
+    instance.registerEObj( "sgvf_w_lvd_b0118_2", 2003902, 4635078, 4, { -37.106110f, 2.000000f, 1.552188f }, 1.000000f, 0.000000f ); 
+      // States -> vf_bextwall_on (id: 3) vf_bextwall_of (id: 4) 
+    instance.registerEObj( "Entrance", 2000182, 4630929, 5, { -141.564804f, 1.314597f, 3.459962f }, 1.000000f, 0.000000f ); 
+      // States -> vf_lock_on (id: 11) vf_lock_of (id: 12) 
+    instance.registerEObj( "Exit", 2000139, 0, 4, { 143.814301f, -5.000000f, -0.081344f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "Shortcut", 2000700, 0, 4, { -136.750107f, 1.329580f, 5.374416f }, 1.000000f, 0.000000f ); 
 
   }
 
-  void onUpdate( InstanceContentPtr instance, uint32_t currTime ) override
+  void onUpdate( InstanceContent& instance, uint32_t currTime ) override
   {
 
   }
 
-  void onEnterTerritory( InstanceContentPtr instance, Entity::Player& player, uint32_t eventId, uint16_t param1,
+  void onEnterTerritory( InstanceContent& instance, Entity::Player& player, uint32_t eventId, uint16_t param1,
                          uint16_t param2 ) override
   {
 
diff --git a/src/scripts/instances/trials/CapeWestwind.cpp b/src/scripts/instances/trials/CapeWestwind.cpp
index 80451863..abc32e4f 100644
--- a/src/scripts/instances/trials/CapeWestwind.cpp
+++ b/src/scripts/instances/trials/CapeWestwind.cpp
@@ -9,26 +9,23 @@ class CapeWestwind :
 public:
   CapeWestwind() :
     Sapphire::ScriptAPI::InstanceContentScript( 20007 )
-  {
-  }
+  { }
 
-  void onInit( InstanceContentPtr instance ) override
+  void onInit( InstanceContent& instance ) override
   {
-    instance->registerEObj( "Exit", 2000605, 0, 4, { -715.942383f, 69.420113f, -830.370300f }, 1.000000f, 0.000000f );
-    instance->registerEObj( "unknown_0", 2000606, 3861081, 4, { -670.462280f, 63.293751f, -801.510986f }, 1.000000f,
-                            0.000000f );
-    instance->registerEObj( "Entrance", 2000604, 4262798, 5, { -677.634888f, 64.116386f, -803.174927f }, 1.000000f,
-                            0.000000f );
-    // States -> vf_lock_on vf_lock_of
+    instance.registerEObj( "Exit", 2000605, 0, 4, { -715.942383f, 69.420113f, -830.370300f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_0", 2000606, 3861081, 4, { -670.462280f, 63.293751f, -801.510986f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "Entrance", 2000604, 4262798, 5, { -677.634888f, 64.116386f, -803.174927f }, 1.000000f, 0.000000f ); 
+      // States -> vf_lock_on (id: 11) vf_lock_of (id: 12) 
 
   }
 
-  void onUpdate( InstanceContentPtr instance, uint32_t currTime ) override
+  void onUpdate( InstanceContent& instance, uint32_t currTime ) override
   {
 
   }
 
-  void onEnterTerritory( InstanceContentPtr instance, Entity::Player& player, uint32_t eventId, uint16_t param1,
+  void onEnterTerritory( InstanceContent& instance, Entity::Player& player, uint32_t eventId, uint16_t param1,
                          uint16_t param2 ) override
   {
 
diff --git a/src/scripts/instances/trials/CastrumFluminis.cpp b/src/scripts/instances/trials/CastrumFluminis.cpp
new file mode 100644
index 00000000..9b04f06c
--- /dev/null
+++ b/src/scripts/instances/trials/CastrumFluminis.cpp
@@ -0,0 +1,48 @@
+#include <ScriptObject.h>
+#include <Territory/InstanceContent.h>
+
+using namespace Sapphire;
+
+class CastrumFluminis :
+  public Sapphire::ScriptAPI::InstanceContentScript
+{
+public:
+  CastrumFluminis() :
+    Sapphire::ScriptAPI::InstanceContentScript( 20055 )
+  { }
+
+  void onInit( InstanceContent& instance ) override
+  {
+    instance.registerEObj( "Entrance", 2000182, 7345082, 5, { 100.000000f, 0.000000f, 115.000000f }, 1.000000f, 0.000000f ); 
+      // States -> vf_lock_on (id: 11) vf_lock_of (id: 12) 
+    instance.registerEObj( "Exit", 2000139, 0, 4, { 100.000000f, 0.000000f, 87.000000f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "sgvf_e3fd_b1404", 2007457, 7391200, 4, { 100.000000f, 0.000001f, 84.000000f }, 1.000000f, -0.000000f ); 
+    instance.registerEObj( "sgvf_e3fd_b1404_1", 2007457, 7391209, 4, { 116.000000f, 0.000001f, 100.000000f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "sgvf_e3fd_b1404_2", 2007457, 7391210, 4, { 84.000000f, 0.000001f, 100.000000f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "sgvf_e3fd_b1404_3", 2007457, 7391212, 4, { 111.313698f, 0.000000f, 88.686287f }, 1.000000f, -0.000000f ); 
+    instance.registerEObj( "sgvf_e3fd_b1404_4", 2007457, 7391214, 4, { 88.686302f, 0.000000f, 111.313698f }, 1.000000f, -0.000000f ); 
+    instance.registerEObj( "sgvf_e3fd_b1404_5", 2007457, 7391215, 4, { 88.686287f, 0.000000f, 88.686287f }, 1.000000f, -0.000000f ); 
+    instance.registerEObj( "sgvf_e3fd_b1404_6", 2007457, 7391217, 4, { 100.000000f, 0.000001f, 109.000000f }, 1.000000f, -0.000000f ); 
+    instance.registerEObj( "sgvf_e3fd_b1404_7", 2007457, 7398352, 4, { 100.000000f, 0.000001f, 84.000000f }, 1.000000f, -0.000000f ); 
+    instance.registerEObj( "sgvf_e3fd_b1404_8", 2007457, 7398353, 4, { 116.000000f, 0.000001f, 100.000000f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "sgvf_e3fd_b1404_9", 2007457, 7398354, 4, { 111.313698f, 0.000000f, 88.686287f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "sgvf_e3fd_b1404_10", 2007457, 7398355, 4, { 88.686302f, 0.000000f, 111.313698f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "sgvf_e3fd_b1404_11", 2007457, 7398356, 4, { 100.000000f, 0.000001f, 109.000000f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_0", 2007457, 7393493, 4, { 100.000000f, 0.000000f, 100.000000f }, 1.000000f, 0.000000f ); 
+
+  }
+
+  void onUpdate( InstanceContent& instance, uint32_t currTime ) override
+  {
+
+  }
+
+  void onEnterTerritory( InstanceContent& instance, Entity::Player& player, uint32_t eventId, uint16_t param1,
+                         uint16_t param2 ) override
+  {
+
+  }
+
+};
+
+EXPOSE_SCRIPT( CastrumFluminis );
\ No newline at end of file
diff --git a/src/scripts/instances/trials/ContainmentBayP1T6.cpp b/src/scripts/instances/trials/ContainmentBayP1T6.cpp
index b782d21c..df944764 100644
--- a/src/scripts/instances/trials/ContainmentBayP1T6.cpp
+++ b/src/scripts/instances/trials/ContainmentBayP1T6.cpp
@@ -9,20 +9,28 @@ class ContainmentBayP1T6 :
 public:
   ContainmentBayP1T6() :
     Sapphire::ScriptAPI::InstanceContentScript( 20041 )
+  { }
+
+  void onInit( InstanceContent& instance ) override
   {
+    instance.registerEObj( "unknown_0", 2007340, 6383469, 4, { -0.194161f, 0.000000f, 3.451970f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_1", 2007442, 6424145, 4, { -5.251681f, 0.000000f, -1.313751f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_2", 2007443, 0, 4, { -4.046182f, 0.000000f, 3.618896f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_3", 2007449, 0, 4, { 2.914429f, -0.015320f, -2.731445f }, 0.991760f, 0.000048f ); 
+    instance.registerEObj( "unknown_4", 2007464, 0, 4, { -0.015320f, -0.015320f, -14.419800f }, 0.991760f, 0.000048f ); 
+    instance.registerEObj( "sgpl_w_lvd_collison_only", 2002618, 6563705, 4, { 6.090889f, 0.000000f, -1.422338f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "Entrance", 2000182, 6392588, 5, { 0.132306f, 0.592461f, 10.611330f }, 1.000000f, 0.000000f ); 
+      // States -> vf_lock_on (id: 11) vf_lock_of (id: 12) 
+    instance.registerEObj( "Exit", 2000139, 0, 4, { 0.001971f, 0.000000f, -11.776730f }, 1.000000f, 0.000000f ); 
+
   }
 
-  void onInit( InstanceContentPtr instance ) override
+  void onUpdate( InstanceContent& instance, uint32_t currTime ) override
   {
 
   }
 
-  void onUpdate( InstanceContentPtr instance, uint32_t currTime ) override
-  {
-
-  }
-
-  void onEnterTerritory( InstanceContentPtr instance, Entity::Player& player, uint32_t eventId, uint16_t param1,
+  void onEnterTerritory( InstanceContent& instance, Entity::Player& player, uint32_t eventId, uint16_t param1,
                          uint16_t param2 ) override
   {
 
diff --git a/src/scripts/instances/trials/ContainmentBayP1T6Extreme.cpp b/src/scripts/instances/trials/ContainmentBayP1T6Extreme.cpp
index a10cb3c5..c5ba7308 100644
--- a/src/scripts/instances/trials/ContainmentBayP1T6Extreme.cpp
+++ b/src/scripts/instances/trials/ContainmentBayP1T6Extreme.cpp
@@ -9,20 +9,28 @@ class ContainmentBayP1T6Extreme :
 public:
   ContainmentBayP1T6Extreme() :
     Sapphire::ScriptAPI::InstanceContentScript( 20042 )
+  { }
+
+  void onInit( InstanceContent& instance ) override
   {
+    instance.registerEObj( "unknown_0", 2007340, 6383469, 4, { -0.194161f, 0.000000f, 3.451970f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_1", 2007442, 6424145, 4, { -5.251681f, 0.000000f, -1.313751f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_2", 2007443, 0, 4, { -4.046182f, 0.000000f, 3.618896f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_3", 2007449, 0, 4, { 2.914429f, -0.015320f, -2.731445f }, 0.991760f, 0.000048f ); 
+    instance.registerEObj( "unknown_4", 2007464, 0, 4, { -0.015320f, -0.015320f, -14.419800f }, 0.991760f, 0.000048f ); 
+    instance.registerEObj( "sgpl_w_lvd_collison_only", 2002618, 6563705, 4, { 6.090889f, 0.000000f, -1.422338f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "Entrance", 2000182, 6392588, 5, { 0.132306f, 0.592461f, 10.611330f }, 1.000000f, 0.000000f ); 
+      // States -> vf_lock_on (id: 11) vf_lock_of (id: 12) 
+    instance.registerEObj( "Exit", 2000139, 0, 4, { 0.001971f, 0.000000f, -11.776730f }, 1.000000f, 0.000000f ); 
+
   }
 
-  void onInit( InstanceContentPtr instance ) override
+  void onUpdate( InstanceContent& instance, uint32_t currTime ) override
   {
 
   }
 
-  void onUpdate( InstanceContentPtr instance, uint32_t currTime ) override
-  {
-
-  }
-
-  void onEnterTerritory( InstanceContentPtr instance, Entity::Player& player, uint32_t eventId, uint16_t param1,
+  void onEnterTerritory( InstanceContent& instance, Entity::Player& player, uint32_t eventId, uint16_t param1,
                          uint16_t param2 ) override
   {
 
diff --git a/src/scripts/instances/trials/ContainmentBayS1T7.cpp b/src/scripts/instances/trials/ContainmentBayS1T7.cpp
index 912eb1ee..2ad967ba 100644
--- a/src/scripts/instances/trials/ContainmentBayS1T7.cpp
+++ b/src/scripts/instances/trials/ContainmentBayS1T7.cpp
@@ -9,20 +9,35 @@ class ContainmentBayS1T7 :
 public:
   ContainmentBayS1T7() :
     Sapphire::ScriptAPI::InstanceContentScript( 20037 )
+  { }
+
+  void onInit( InstanceContent& instance ) override
   {
+    instance.registerEObj( "sgvf_a2fd_b0818", 2006840, 6175219, 4, { 0.000000f, 0.000000f, -10.000000f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "sgvf_a2fd_b0818_1", 2006841, 6175220, 4, { 7.071130f, 0.000000f, -7.071100f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "sgvf_a2fd_b0818_2", 2006842, 6175221, 4, { 10.000000f, 0.000000f, 0.000000f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "sgvf_a2fd_b0818_3", 2006843, 6175222, 4, { 7.071130f, 0.000000f, 7.071130f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "sgvf_a2fd_b0818_4", 2006844, 6175223, 4, { 0.000000f, 0.000000f, 10.000000f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "sgvf_a2fd_b0818_5", 2006845, 6175224, 4, { -7.071130f, 0.000000f, 7.071100f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "sgvf_a2fd_b0818_6", 2006846, 6175225, 4, { -10.000000f, 0.000000f, 0.000000f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "sgvf_a2fd_b0818_7", 2006847, 6175226, 4, { -7.071130f, 0.000000f, -7.071130f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_0", 2006837, 6174136, 4, { 0.000000f, 0.052026f, -19.799999f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_1", 2006839, 6164929, 4, { 0.000000f, 0.002934f, 0.000000f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_2", 2006838, 6171564, 4, { 0.116409f, 0.002934f, -0.768936f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_3", 2006840, 6175957, 4, { -0.836018f, 0.050520f, -2.055523f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "sgvf_a2fd_b0818_8", 2006983, 6219989, 4, { 0.000000f, 0.043380f, 0.000000f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "Entrance", 2000182, 6173855, 5, { -0.006781f, 0.052026f, 13.691250f }, 1.000000f, 0.000000f ); 
+      // States -> vf_lock_on (id: 11) vf_lock_of (id: 12) 
+    instance.registerEObj( "Exit", 2000139, 0, 4, { 0.000000f, 0.000000f, -16.500000f }, 1.000000f, 0.000000f ); 
+
   }
 
-  void onInit( InstanceContentPtr instance ) override
+  void onUpdate( InstanceContent& instance, uint32_t currTime ) override
   {
 
   }
 
-  void onUpdate( InstanceContentPtr instance, uint32_t currTime ) override
-  {
-
-  }
-
-  void onEnterTerritory( InstanceContentPtr instance, Entity::Player& player, uint32_t eventId, uint16_t param1,
+  void onEnterTerritory( InstanceContent& instance, Entity::Player& player, uint32_t eventId, uint16_t param1,
                          uint16_t param2 ) override
   {
 
diff --git a/src/scripts/instances/trials/ContainmentBayS1T7Extreme.cpp b/src/scripts/instances/trials/ContainmentBayS1T7Extreme.cpp
index ddd8d9f3..ca913506 100644
--- a/src/scripts/instances/trials/ContainmentBayS1T7Extreme.cpp
+++ b/src/scripts/instances/trials/ContainmentBayS1T7Extreme.cpp
@@ -9,20 +9,35 @@ class ContainmentBayS1T7Extreme :
 public:
   ContainmentBayS1T7Extreme() :
     Sapphire::ScriptAPI::InstanceContentScript( 20038 )
+  { }
+
+  void onInit( InstanceContent& instance ) override
   {
+    instance.registerEObj( "sgvf_a2fd_b0818", 2006840, 6175219, 4, { 0.000000f, 0.000000f, -10.000000f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "sgvf_a2fd_b0818_1", 2006841, 6175220, 4, { 7.071130f, 0.000000f, -7.071100f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "sgvf_a2fd_b0818_2", 2006842, 6175221, 4, { 10.000000f, 0.000000f, 0.000000f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "sgvf_a2fd_b0818_3", 2006843, 6175222, 4, { 7.071130f, 0.000000f, 7.071130f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "sgvf_a2fd_b0818_4", 2006844, 6175223, 4, { 0.000000f, 0.000000f, 10.000000f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "sgvf_a2fd_b0818_5", 2006845, 6175224, 4, { -7.071130f, 0.000000f, 7.071100f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "sgvf_a2fd_b0818_6", 2006846, 6175225, 4, { -10.000000f, 0.000000f, 0.000000f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "sgvf_a2fd_b0818_7", 2006847, 6175226, 4, { -7.071130f, 0.000000f, -7.071130f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_0", 2006837, 6174136, 4, { 0.000000f, 0.052026f, -19.799999f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_1", 2006839, 6164929, 4, { 0.000000f, 0.002934f, 0.000000f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_2", 2006838, 6171564, 4, { 0.116409f, 0.002934f, -0.768936f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_3", 2006840, 6175957, 4, { -0.836018f, 0.050520f, -2.055523f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "sgvf_a2fd_b0818_8", 2006983, 6219989, 4, { 0.000000f, 0.043380f, 0.000000f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "Entrance", 2000182, 6173855, 5, { -0.006781f, 0.052026f, 13.691250f }, 1.000000f, 0.000000f ); 
+      // States -> vf_lock_on (id: 11) vf_lock_of (id: 12) 
+    instance.registerEObj( "Exit", 2000139, 0, 4, { 0.000000f, 0.000000f, -16.500000f }, 1.000000f, 0.000000f ); 
+
   }
 
-  void onInit( InstanceContentPtr instance ) override
+  void onUpdate( InstanceContent& instance, uint32_t currTime ) override
   {
 
   }
 
-  void onUpdate( InstanceContentPtr instance, uint32_t currTime ) override
-  {
-
-  }
-
-  void onEnterTerritory( InstanceContentPtr instance, Entity::Player& player, uint32_t eventId, uint16_t param1,
+  void onEnterTerritory( InstanceContent& instance, Entity::Player& player, uint32_t eventId, uint16_t param1,
                          uint16_t param2 ) override
   {
 
diff --git a/src/scripts/instances/trials/ContainmentBayZ1T9.cpp b/src/scripts/instances/trials/ContainmentBayZ1T9.cpp
index 32e7c242..c38d1fc6 100644
--- a/src/scripts/instances/trials/ContainmentBayZ1T9.cpp
+++ b/src/scripts/instances/trials/ContainmentBayZ1T9.cpp
@@ -9,20 +9,34 @@ class ContainmentBayZ1T9 :
 public:
   ContainmentBayZ1T9() :
     Sapphire::ScriptAPI::InstanceContentScript( 20043 )
+  { }
+
+  void onInit( InstanceContent& instance ) override
   {
+    instance.registerEObj( "unknown_0", 2007719, 0, 4, { 5.447040f, 0.000002f, -9.308832f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_1", 2007720, 0, 4, { 9.576125f, 0.000002f, -3.402662f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_2", 2007716, 0, 4, { 11.420000f, 0.000004f, 11.783210f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_3", 2007717, 0, 4, { -11.656410f, -0.000002f, 12.218210f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_4", 2007718, 0, 4, { -17.805031f, 0.000000f, 4.207765f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "Entrance", 2000182, 6625715, 5, { 0.000000f, 0.000000f, 14.500000f }, 1.000000f, -3.141593f ); 
+      // States -> vf_lock_on (id: 11) vf_lock_of (id: 12) 
+    instance.registerEObj( "Exit", 2000139, 0, 4, { 0.000000f, 0.000000f, -14.500000f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_5", 2007689, 6621345, 4, { -3.765648f, 0.000001f, 14.953240f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_6", 2007690, 6643541, 4, { -12.141200f, -0.000001f, 4.715301f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_7", 2007691, 6621347, 4, { 5.404188f, 0.000000f, -14.762600f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_8", 2007692, 6621352, 4, { 14.969930f, 0.000002f, -2.525420f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_9", 2007693, 6621398, 4, { -1.996956f, 0.000000f, 6.613101f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_10", 2007694, 6621516, 4, { 5.478731f, 0.000000f, 9.952977f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_11", 2007695, 0, 4, { 5.515548f, 0.000000f, 11.770850f }, 1.000000f, 0.000000f ); 
+
   }
 
-  void onInit( InstanceContentPtr instance ) override
+  void onUpdate( InstanceContent& instance, uint32_t currTime ) override
   {
 
   }
 
-  void onUpdate( InstanceContentPtr instance, uint32_t currTime ) override
-  {
-
-  }
-
-  void onEnterTerritory( InstanceContentPtr instance, Entity::Player& player, uint32_t eventId, uint16_t param1,
+  void onEnterTerritory( InstanceContent& instance, Entity::Player& player, uint32_t eventId, uint16_t param1,
                          uint16_t param2 ) override
   {
 
diff --git a/src/scripts/instances/trials/ContainmentBayZ1T9Extreme.cpp b/src/scripts/instances/trials/ContainmentBayZ1T9Extreme.cpp
index fb02936a..d2223683 100644
--- a/src/scripts/instances/trials/ContainmentBayZ1T9Extreme.cpp
+++ b/src/scripts/instances/trials/ContainmentBayZ1T9Extreme.cpp
@@ -9,20 +9,34 @@ class ContainmentBayZ1T9Extreme :
 public:
   ContainmentBayZ1T9Extreme() :
     Sapphire::ScriptAPI::InstanceContentScript( 20044 )
+  { }
+
+  void onInit( InstanceContent& instance ) override
   {
+    instance.registerEObj( "unknown_0", 2007719, 0, 4, { 5.447040f, 0.000002f, -9.308832f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_1", 2007720, 0, 4, { 9.576125f, 0.000002f, -3.402662f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_2", 2007716, 0, 4, { 11.420000f, 0.000004f, 11.783210f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_3", 2007717, 0, 4, { -11.656410f, -0.000002f, 12.218210f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_4", 2007718, 0, 4, { -17.805031f, 0.000000f, 4.207765f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "Entrance", 2000182, 6625715, 5, { 0.000000f, 0.000000f, 14.500000f }, 1.000000f, -3.141593f ); 
+      // States -> vf_lock_on (id: 11) vf_lock_of (id: 12) 
+    instance.registerEObj( "Exit", 2000139, 0, 4, { 0.000000f, 0.000000f, -14.500000f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_5", 2007689, 6621345, 4, { -3.765648f, 0.000001f, 14.953240f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_6", 2007690, 6643541, 4, { -12.141200f, -0.000001f, 4.715301f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_7", 2007691, 6621347, 4, { 5.404188f, 0.000000f, -14.762600f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_8", 2007692, 6621352, 4, { 14.969930f, 0.000002f, -2.525420f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_9", 2007693, 6621398, 4, { -1.996956f, 0.000000f, 6.613101f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_10", 2007694, 6621516, 4, { 5.478731f, 0.000000f, 9.952977f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_11", 2007695, 0, 4, { 5.515548f, 0.000000f, 11.770850f }, 1.000000f, 0.000000f ); 
+
   }
 
-  void onInit( InstanceContentPtr instance ) override
+  void onUpdate( InstanceContent& instance, uint32_t currTime ) override
   {
 
   }
 
-  void onUpdate( InstanceContentPtr instance, uint32_t currTime ) override
-  {
-
-  }
-
-  void onEnterTerritory( InstanceContentPtr instance, Entity::Player& player, uint32_t eventId, uint16_t param1,
+  void onEnterTerritory( InstanceContent& instance, Entity::Player& player, uint32_t eventId, uint16_t param1,
                          uint16_t param2 ) override
   {
 
diff --git a/src/scripts/instances/trials/Emanation.cpp b/src/scripts/instances/trials/Emanation.cpp
index 5343691b..d341be34 100644
--- a/src/scripts/instances/trials/Emanation.cpp
+++ b/src/scripts/instances/trials/Emanation.cpp
@@ -9,20 +9,22 @@ class Emanation :
 public:
   Emanation() :
     Sapphire::ScriptAPI::InstanceContentScript( 20048 )
+  { }
+
+  void onInit( InstanceContent& instance ) override
   {
+    instance.registerEObj( "Entrance", 2000182, 6894521, 5, { 0.000796f, 0.035467f, 12.032630f }, 1.000000f, 0.000000f ); 
+      // States -> vf_lock_on (id: 11) vf_lock_of (id: 12) 
+    instance.registerEObj( "Exit", 2000139, 0, 4, { 0.000000f, 0.062970f, -12.000000f }, 1.000000f, 0.000000f ); 
+
   }
 
-  void onInit( InstanceContentPtr instance ) override
+  void onUpdate( InstanceContent& instance, uint32_t currTime ) override
   {
 
   }
 
-  void onUpdate( InstanceContentPtr instance, uint32_t currTime ) override
-  {
-
-  }
-
-  void onEnterTerritory( InstanceContentPtr instance, Entity::Player& player, uint32_t eventId, uint16_t param1,
+  void onEnterTerritory( InstanceContent& instance, Entity::Player& player, uint32_t eventId, uint16_t param1,
                          uint16_t param2 ) override
   {
 
diff --git a/src/scripts/instances/trials/EmanationExtreme.cpp b/src/scripts/instances/trials/EmanationExtreme.cpp
index da5b97da..4e073fa5 100644
--- a/src/scripts/instances/trials/EmanationExtreme.cpp
+++ b/src/scripts/instances/trials/EmanationExtreme.cpp
@@ -9,20 +9,22 @@ class EmanationExtreme :
 public:
   EmanationExtreme() :
     Sapphire::ScriptAPI::InstanceContentScript( 20049 )
+  { }
+
+  void onInit( InstanceContent& instance ) override
   {
+    instance.registerEObj( "Entrance", 2000182, 6894521, 5, { 0.000796f, 0.035467f, 12.032630f }, 1.000000f, 0.000000f ); 
+      // States -> vf_lock_on (id: 11) vf_lock_of (id: 12) 
+    instance.registerEObj( "Exit", 2000139, 0, 4, { 0.000000f, 0.062970f, -12.000000f }, 1.000000f, 0.000000f ); 
+
   }
 
-  void onInit( InstanceContentPtr instance ) override
+  void onUpdate( InstanceContent& instance, uint32_t currTime ) override
   {
 
   }
 
-  void onUpdate( InstanceContentPtr instance, uint32_t currTime ) override
-  {
-
-  }
-
-  void onEnterTerritory( InstanceContentPtr instance, Entity::Player& player, uint32_t eventId, uint16_t param1,
+  void onEnterTerritory( InstanceContent& instance, Entity::Player& player, uint32_t eventId, uint16_t param1,
                          uint16_t param2 ) override
   {
 
diff --git a/src/scripts/instances/trials/HellsKier.cpp b/src/scripts/instances/trials/HellsKier.cpp
new file mode 100644
index 00000000..485bf077
--- /dev/null
+++ b/src/scripts/instances/trials/HellsKier.cpp
@@ -0,0 +1,47 @@
+#include <ScriptObject.h>
+#include <Territory/InstanceContent.h>
+
+using namespace Sapphire;
+
+class HellsKier :
+  public Sapphire::ScriptAPI::InstanceContentScript
+{
+public:
+  HellsKier() :
+    Sapphire::ScriptAPI::InstanceContentScript( 20057 )
+  { }
+
+  void onInit( InstanceContent& instance ) override
+  {
+    instance.registerEObj( "unknown_0", 2009599, 0, 4, { 98.496948f, -2.000000f, 103.288200f }, 0.991760f, 0.000048f ); 
+    instance.registerEObj( "unknown_1", 2009600, 0, 4, { 101.619202f, -2.000000f, 103.096199f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_2", 2007457, 7537726, 4, { 99.992310f, 0.991760f, 99.992310f }, 0.991760f, 0.000048f ); 
+    instance.registerEObj( "sgvf_e3fe_b1521", 2007457, 7669820, 4, { 100.000000f, 0.000000f, 100.000000f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "sgvf_e3fe_b1523", 2007457, 7679422, 4, { 100.000000f, 0.000000f, 92.000000f }, 1.000000f, -0.000000f ); 
+    instance.registerEObj( "sgvf_e3fe_b1523_1", 2007457, 7679423, 4, { 105.699997f, 0.000000f, 94.300003f }, 1.000000f, -0.000000f ); 
+    instance.registerEObj( "sgvf_e3fe_b1523_2", 2007457, 7679424, 4, { 108.000000f, 0.000000f, 100.000000f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "sgvf_e3fe_b1523_3", 2007457, 7679425, 4, { 105.699997f, 0.000000f, 105.699997f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "sgvf_e3fe_b1523_4", 2007457, 7679426, 4, { 100.000000f, 0.000000f, 108.000000f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "sgvf_e3fe_b1523_5", 2007457, 7679427, 4, { 94.300003f, 0.000000f, 105.699997f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "sgvf_e3fe_b1523_6", 2007457, 7679428, 4, { 92.000000f, 0.000000f, 100.000000f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "sgvf_e3fe_b1523_7", 2007457, 7679429, 4, { 94.300003f, 0.000000f, 94.300003f }, 1.000000f, -0.000000f ); 
+    instance.registerEObj( "Entrance", 2007457, 7591190, 5, { 100.000000f, 0.000000f, 115.000000f }, 1.000000f, -0.000000f ); 
+      // States -> vf_lock_on (id: 11) vf_lock_of (id: 12) 
+    instance.registerEObj( "Exit", 2000139, 0, 4, { 100.000000f, 0.000000f, 85.000000f }, 1.000000f, 0.000000f ); 
+
+  }
+
+  void onUpdate( InstanceContent& instance, uint32_t currTime ) override
+  {
+
+  }
+
+  void onEnterTerritory( InstanceContent& instance, Entity::Player& player, uint32_t eventId, uint16_t param1,
+                         uint16_t param2 ) override
+  {
+
+  }
+
+};
+
+EXPOSE_SCRIPT( HellsKier );
\ No newline at end of file
diff --git a/src/scripts/instances/trials/HellsKierExtreme.cpp b/src/scripts/instances/trials/HellsKierExtreme.cpp
new file mode 100644
index 00000000..f7eefff5
--- /dev/null
+++ b/src/scripts/instances/trials/HellsKierExtreme.cpp
@@ -0,0 +1,47 @@
+#include <ScriptObject.h>
+#include <Territory/InstanceContent.h>
+
+using namespace Sapphire;
+
+class HellsKierExtreme :
+  public Sapphire::ScriptAPI::InstanceContentScript
+{
+public:
+  HellsKierExtreme() :
+    Sapphire::ScriptAPI::InstanceContentScript( 20058 )
+  { }
+
+  void onInit( InstanceContent& instance ) override
+  {
+    instance.registerEObj( "unknown_0", 2009599, 0, 4, { 98.496948f, -2.000000f, 103.288200f }, 0.991760f, 0.000048f ); 
+    instance.registerEObj( "unknown_1", 2009600, 0, 4, { 101.619202f, -2.000000f, 103.096199f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_2", 2007457, 7537726, 4, { 99.992310f, 0.991760f, 99.992310f }, 0.991760f, 0.000048f ); 
+    instance.registerEObj( "sgvf_e3fe_b1521", 2007457, 7669820, 4, { 100.000000f, 0.000000f, 100.000000f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "sgvf_e3fe_b1523", 2007457, 7679422, 4, { 100.000000f, 0.000000f, 92.000000f }, 1.000000f, -0.000000f ); 
+    instance.registerEObj( "sgvf_e3fe_b1523_1", 2007457, 7679423, 4, { 105.699997f, 0.000000f, 94.300003f }, 1.000000f, -0.000000f ); 
+    instance.registerEObj( "sgvf_e3fe_b1523_2", 2007457, 7679424, 4, { 108.000000f, 0.000000f, 100.000000f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "sgvf_e3fe_b1523_3", 2007457, 7679425, 4, { 105.699997f, 0.000000f, 105.699997f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "sgvf_e3fe_b1523_4", 2007457, 7679426, 4, { 100.000000f, 0.000000f, 108.000000f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "sgvf_e3fe_b1523_5", 2007457, 7679427, 4, { 94.300003f, 0.000000f, 105.699997f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "sgvf_e3fe_b1523_6", 2007457, 7679428, 4, { 92.000000f, 0.000000f, 100.000000f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "sgvf_e3fe_b1523_7", 2007457, 7679429, 4, { 94.300003f, 0.000000f, 94.300003f }, 1.000000f, -0.000000f ); 
+    instance.registerEObj( "Entrance", 2007457, 7591190, 5, { 100.000000f, 0.000000f, 115.000000f }, 1.000000f, -0.000000f ); 
+      // States -> vf_lock_on (id: 11) vf_lock_of (id: 12) 
+    instance.registerEObj( "Exit", 2000139, 0, 4, { 100.000000f, 0.000000f, 85.000000f }, 1.000000f, 0.000000f ); 
+
+  }
+
+  void onUpdate( InstanceContent& instance, uint32_t currTime ) override
+  {
+
+  }
+
+  void onEnterTerritory( InstanceContent& instance, Entity::Player& player, uint32_t eventId, uint16_t param1,
+                         uint16_t param2 ) override
+  {
+
+  }
+
+};
+
+EXPOSE_SCRIPT( HellsKierExtreme );
\ No newline at end of file
diff --git a/src/scripts/instances/trials/SpecialEventI.cpp b/src/scripts/instances/trials/SpecialEventI.cpp
index 8408fc03..c17e8fd0 100644
--- a/src/scripts/instances/trials/SpecialEventI.cpp
+++ b/src/scripts/instances/trials/SpecialEventI.cpp
@@ -8,25 +8,24 @@ class SpecialEventI :
 {
 public:
   SpecialEventI() :
-    Sapphire::ScriptAPI::InstanceContentScript( 20014 )
-  {
-  }
+    Sapphire::ScriptAPI::InstanceContentScript( 20015 )
+  { }
 
-  void onInit( InstanceContentPtr instance ) override
+  void onInit( InstanceContent& instance ) override
   {
-    instance->registerEObj( "Entrance", 2000182, 4236868, 5, { 0.000000f, 0.000000f, 24.000000f }, 1.000000f,
-                            0.000000f );
-    // States -> vf_lock_on vf_lock_of
-    instance->registerEObj( "Exit", 2000139, 0, 4, { 0.000000f, 0.000000f, -10.000000f }, 1.000000f, 0.000000f );
+    instance.registerEObj( "Entrance", 2007457, 7579598, 5, { 107.893997f, 0.000000f, 114.054703f }, 1.000000f, 0.000000f ); 
+      // States -> vf_lock_on (id: 11) vf_lock_of (id: 12) 
+    instance.registerEObj( "Exit", 2000139, 0, 4, { 99.992310f, -0.015320f, 85.984497f }, 0.991760f, 0.000048f ); 
+    instance.registerEObj( "unknown_0", 2007457, 7587533, 4, { 100.000000f, 0.000000f, 100.000000f }, 1.000000f, 0.000000f ); 
 
   }
 
-  void onUpdate( InstanceContentPtr instance, uint32_t currTime ) override
+  void onUpdate( InstanceContent& instance, uint32_t currTime ) override
   {
 
   }
 
-  void onEnterTerritory( InstanceContentPtr instance, Entity::Player& player, uint32_t eventId, uint16_t param1,
+  void onEnterTerritory( InstanceContent& instance, Entity::Player& player, uint32_t eventId, uint16_t param1,
                          uint16_t param2 ) override
   {
 
diff --git a/src/scripts/instances/trials/SpecialEventII.cpp b/src/scripts/instances/trials/SpecialEventII.cpp
index f9aada2e..5b1be894 100644
--- a/src/scripts/instances/trials/SpecialEventII.cpp
+++ b/src/scripts/instances/trials/SpecialEventII.cpp
@@ -8,21 +8,36 @@ class SpecialEventII :
 {
 public:
   SpecialEventII() :
-    Sapphire::ScriptAPI::InstanceContentScript( 20015 )
+    Sapphire::ScriptAPI::InstanceContentScript( 20016 )
+  { }
+
+  void onInit( InstanceContent& instance ) override
   {
+    instance.registerEObj( "sgvf_a2fd_b0818", 2006840, 6175219, 4, { 0.000000f, 0.000000f, -10.000000f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "sgvf_a2fd_b0818_1", 2006841, 6175220, 4, { 7.071130f, 0.000000f, -7.071100f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "sgvf_a2fd_b0818_2", 2006842, 6175221, 4, { 10.000000f, 0.000000f, 0.000000f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "sgvf_a2fd_b0818_3", 2006843, 6175222, 4, { 7.071130f, 0.000000f, 7.071130f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "sgvf_a2fd_b0818_4", 2006844, 6175223, 4, { 0.000000f, 0.000000f, 10.000000f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "sgvf_a2fd_b0818_5", 2006845, 6175224, 4, { -7.071130f, 0.000000f, 7.071100f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "sgvf_a2fd_b0818_6", 2006846, 6175225, 4, { -10.000000f, 0.000000f, 0.000000f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "sgvf_a2fd_b0818_7", 2006847, 6175226, 4, { -7.071130f, 0.000000f, -7.071130f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_0", 2006837, 6174136, 4, { 0.000000f, 0.052026f, -19.799999f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_1", 2006839, 6164929, 4, { 0.000000f, 0.002934f, 0.000000f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_2", 2006838, 6171564, 4, { 0.116409f, 0.002934f, -0.768936f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_3", 2006840, 6175957, 4, { -0.836018f, 0.050520f, -2.055523f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "sgvf_a2fd_b0818_8", 2006983, 6219989, 4, { 0.000000f, 0.043380f, 0.000000f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "Entrance", 2000182, 6173855, 5, { -0.006781f, 0.052026f, 13.691250f }, 1.000000f, 0.000000f ); 
+      // States -> vf_lock_on (id: 11) vf_lock_of (id: 12) 
+    instance.registerEObj( "Exit", 2000139, 0, 4, { 0.000000f, 0.000000f, -16.500000f }, 1.000000f, 0.000000f ); 
+
   }
 
-  void onInit( InstanceContentPtr instance ) override
+  void onUpdate( InstanceContent& instance, uint32_t currTime ) override
   {
 
   }
 
-  void onUpdate( InstanceContentPtr instance, uint32_t currTime ) override
-  {
-
-  }
-
-  void onEnterTerritory( InstanceContentPtr instance, Entity::Player& player, uint32_t eventId, uint16_t param1,
+  void onEnterTerritory( InstanceContent& instance, Entity::Player& player, uint32_t eventId, uint16_t param1,
                          uint16_t param2 ) override
   {
 
diff --git a/src/scripts/instances/trials/SpecialEventIII.cpp b/src/scripts/instances/trials/SpecialEventIII.cpp
index 40e330f0..41db796b 100644
--- a/src/scripts/instances/trials/SpecialEventIII.cpp
+++ b/src/scripts/instances/trials/SpecialEventIII.cpp
@@ -8,21 +8,23 @@ class SpecialEventIII :
 {
 public:
   SpecialEventIII() :
-    Sapphire::ScriptAPI::InstanceContentScript( 20016 )
+    Sapphire::ScriptAPI::InstanceContentScript( 20014 )
+  { }
+
+  void onInit( InstanceContent& instance ) override
   {
+    instance.registerEObj( "Entrance", 2000182, 4236868, 5, { 0.000000f, 0.000000f, 24.000000f }, 1.000000f, 0.000000f ); 
+      // States -> vf_lock_on (id: 11) vf_lock_of (id: 12) 
+    instance.registerEObj( "Exit", 2000139, 0, 4, { 0.000000f, 0.000000f, -10.000000f }, 1.000000f, 0.000000f ); 
+
   }
 
-  void onInit( InstanceContentPtr instance ) override
+  void onUpdate( InstanceContent& instance, uint32_t currTime ) override
   {
 
   }
 
-  void onUpdate( InstanceContentPtr instance, uint32_t currTime ) override
-  {
-
-  }
-
-  void onEnterTerritory( InstanceContentPtr instance, Entity::Player& player, uint32_t eventId, uint16_t param1,
+  void onEnterTerritory( InstanceContent& instance, Entity::Player& player, uint32_t eventId, uint16_t param1,
                          uint16_t param2 ) override
   {
 
diff --git a/src/scripts/instances/trials/TheBowlofEmbers.cpp b/src/scripts/instances/trials/TheBowlofEmbers.cpp
index d740f248..36c7df76 100644
--- a/src/scripts/instances/trials/TheBowlofEmbers.cpp
+++ b/src/scripts/instances/trials/TheBowlofEmbers.cpp
@@ -9,26 +9,24 @@ class TheBowlofEmbers :
 public:
   TheBowlofEmbers() :
     Sapphire::ScriptAPI::InstanceContentScript( 20001 )
-  {
-  }
+  { }
 
-  void onInit( InstanceContentPtr instance ) override
+  void onInit( InstanceContent& instance ) override
   {
-    instance->registerEObj( "Entrance", 2000182, 4177874, 5, { -16.000000f, 0.000000f, 0.000000f }, 1.000000f,
-                            0.000000f );
-    // States -> vf_lock_on vf_lock_of
-    instance->registerEObj( "Exit", 2000139, 0, 4, { 16.000000f, 0.000000f, 0.000000f }, 1.000000f, 0.000000f );
-    instance->registerEObj( "unknown_0", 2007452, 0, 4, { 0.000000f, 0.000000f, 0.000000f }, 1.000000f, 0.000000f );
-    instance->registerEObj( "BladeofLight", 2007454, 0, 4, { 0.000000f, 0.000000f, 11.300000f }, 0.991760f, 0.000048f );
+    instance.registerEObj( "Entrance", 2000182, 4177874, 5, { -16.000000f, 0.000000f, 0.000000f }, 1.000000f, 0.000000f ); 
+      // States -> vf_lock_on (id: 11) vf_lock_of (id: 12) 
+    instance.registerEObj( "Exit", 2000139, 0, 4, { 16.000000f, 0.000000f, 0.000000f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_0", 2007452, 0, 4, { 0.000000f, 0.000000f, 0.000000f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "BladeofLight", 2007454, 0, 4, { 0.000000f, 0.000000f, 11.300000f }, 0.991760f, 0.000048f ); 
 
   }
 
-  void onUpdate( InstanceContentPtr instance, uint32_t currTime ) override
+  void onUpdate( InstanceContent& instance, uint32_t currTime ) override
   {
 
   }
 
-  void onEnterTerritory( InstanceContentPtr instance, Entity::Player& player, uint32_t eventId, uint16_t param1,
+  void onEnterTerritory( InstanceContent& instance, Entity::Player& player, uint32_t eventId, uint16_t param1,
                          uint16_t param2 ) override
   {
 
diff --git a/src/scripts/instances/trials/TheBowlofEmbersExtreme.cpp b/src/scripts/instances/trials/TheBowlofEmbersExtreme.cpp
index 14a28f9c..1a518b2d 100644
--- a/src/scripts/instances/trials/TheBowlofEmbersExtreme.cpp
+++ b/src/scripts/instances/trials/TheBowlofEmbersExtreme.cpp
@@ -9,26 +9,24 @@ class TheBowlofEmbersExtreme :
 public:
   TheBowlofEmbersExtreme() :
     Sapphire::ScriptAPI::InstanceContentScript( 20008 )
-  {
-  }
+  { }
 
-  void onInit( InstanceContentPtr instance ) override
+  void onInit( InstanceContent& instance ) override
   {
-    instance->registerEObj( "Entrance", 2000182, 4177874, 5, { -16.000000f, 0.000000f, 0.000000f }, 1.000000f,
-                            0.000000f );
-    // States -> vf_lock_on vf_lock_of
-    instance->registerEObj( "Exit", 2000139, 0, 4, { 16.000000f, 0.000000f, 0.000000f }, 1.000000f, 0.000000f );
-    instance->registerEObj( "unknown_0", 2007452, 0, 4, { 0.000000f, 0.000000f, 0.000000f }, 1.000000f, 0.000000f );
-    instance->registerEObj( "BladeofLight", 2007454, 0, 4, { 0.000000f, 0.000000f, 11.300000f }, 0.991760f, 0.000048f );
+    instance.registerEObj( "Entrance", 2000182, 4177874, 5, { -16.000000f, 0.000000f, 0.000000f }, 1.000000f, 0.000000f ); 
+      // States -> vf_lock_on (id: 11) vf_lock_of (id: 12) 
+    instance.registerEObj( "Exit", 2000139, 0, 4, { 16.000000f, 0.000000f, 0.000000f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_0", 2007452, 0, 4, { 0.000000f, 0.000000f, 0.000000f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "BladeofLight", 2007454, 0, 4, { 0.000000f, 0.000000f, 11.300000f }, 0.991760f, 0.000048f ); 
 
   }
 
-  void onUpdate( InstanceContentPtr instance, uint32_t currTime ) override
+  void onUpdate( InstanceContent& instance, uint32_t currTime ) override
   {
 
   }
 
-  void onEnterTerritory( InstanceContentPtr instance, Entity::Player& player, uint32_t eventId, uint16_t param1,
+  void onEnterTerritory( InstanceContent& instance, Entity::Player& player, uint32_t eventId, uint16_t param1,
                          uint16_t param2 ) override
   {
 
diff --git a/src/scripts/instances/trials/TheBowlofEmbersHard.cpp b/src/scripts/instances/trials/TheBowlofEmbersHard.cpp
index 929f36bc..16531f8e 100644
--- a/src/scripts/instances/trials/TheBowlofEmbersHard.cpp
+++ b/src/scripts/instances/trials/TheBowlofEmbersHard.cpp
@@ -9,26 +9,24 @@ class TheBowlofEmbersHard :
 public:
   TheBowlofEmbersHard() :
     Sapphire::ScriptAPI::InstanceContentScript( 20004 )
-  {
-  }
+  { }
 
-  void onInit( InstanceContentPtr instance ) override
+  void onInit( InstanceContent& instance ) override
   {
-    instance->registerEObj( "Entrance", 2000182, 4177874, 5, { -16.000000f, 0.000000f, 0.000000f }, 1.000000f,
-                            0.000000f );
-    // States -> vf_lock_on vf_lock_of
-    instance->registerEObj( "Exit", 2000139, 0, 4, { 16.000000f, 0.000000f, 0.000000f }, 1.000000f, 0.000000f );
-    instance->registerEObj( "unknown_0", 2007452, 0, 4, { 0.000000f, 0.000000f, 0.000000f }, 1.000000f, 0.000000f );
-    instance->registerEObj( "BladeofLight", 2007454, 0, 4, { 0.000000f, 0.000000f, 11.300000f }, 0.991760f, 0.000048f );
+    instance.registerEObj( "Entrance", 2000182, 4177874, 5, { -16.000000f, 0.000000f, 0.000000f }, 1.000000f, 0.000000f ); 
+      // States -> vf_lock_on (id: 11) vf_lock_of (id: 12) 
+    instance.registerEObj( "Exit", 2000139, 0, 4, { 16.000000f, 0.000000f, 0.000000f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_0", 2007452, 0, 4, { 0.000000f, 0.000000f, 0.000000f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "BladeofLight", 2007454, 0, 4, { 0.000000f, 0.000000f, 11.300000f }, 0.991760f, 0.000048f ); 
 
   }
 
-  void onUpdate( InstanceContentPtr instance, uint32_t currTime ) override
+  void onUpdate( InstanceContent& instance, uint32_t currTime ) override
   {
 
   }
 
-  void onEnterTerritory( InstanceContentPtr instance, Entity::Player& player, uint32_t eventId, uint16_t param1,
+  void onEnterTerritory( InstanceContent& instance, Entity::Player& player, uint32_t eventId, uint16_t param1,
                          uint16_t param2 ) override
   {
 
diff --git a/src/scripts/instances/trials/TheChrysalis.cpp b/src/scripts/instances/trials/TheChrysalis.cpp
index 8ac197dd..d5d76457 100644
--- a/src/scripts/instances/trials/TheChrysalis.cpp
+++ b/src/scripts/instances/trials/TheChrysalis.cpp
@@ -9,68 +9,52 @@ class TheChrysalis :
 public:
   TheChrysalis() :
     Sapphire::ScriptAPI::InstanceContentScript( 20029 )
-  {
-  }
+  { }
 
-  void onInit( InstanceContentPtr instance ) override
+  void onInit( InstanceContent& instance ) override
   {
-    instance->registerEObj( "sgvf_z1e9_b0606", 2005209, 5689928, 4, { -0.866003f, 0.000000f, -29.632271f }, 1.000000f,
-                            0.000000f );
-    instance->registerEObj( "Entrance", 2000182, 5649517, 5, { -0.064617f, 0.000000f, 21.704861f }, 1.000000f,
-                            0.000000f );
-    // States -> vf_lock_on vf_lock_of
-    instance->registerEObj( "Exit", 2000139, 0, 4, { 0.000000f, 0.000000f, -22.000000f }, 1.000000f, 0.000000f );
-    instance->registerEObj( "sgbg_z1e9_t1_yuka1", 2005160, 5652375, 4, { -1.683807f, -0.002888f, -0.074251f },
-                            1.000000f, 0.000000f );
-    // States -> d_def d_def_anim d_01 d_01_anim d_02 d_02_anim d_03 d_03_anim d_04 d_04_anim
-    instance->registerEObj( "unknown_0", 2005158, 0, 4, { 220.000000f, -0.045776f, 0.000000f }, 0.991760f, 0.000048f );
-    instance->registerEObj( "unknown_1", 2005159, 0, 4, { 229.899994f, -0.013268f, 9.900000f }, 0.991760f, 0.000048f );
-    instance->registerEObj( "unknown_2", 2004550, 0, 4, { 0.068370f, -0.002887f, -0.230858f }, 1.000000f, 0.000000f );
-    instance->registerEObj( "sgvf_z1e1_b0598", 2005161, 5652362, 4, { 219.837494f, -0.000000f, -20.737341f }, 1.000000f,
-                            0.000000f );
-    // States -> crack_def crack_01 crack_01_anim crack_02 crack_02_anim crack_03 crack_03_anim crack_04 crack_04_anim
-    instance->registerEObj( "sgvf_z1e1_b0598_1", 2005198, 5675943, 4, { 234.366592f, -0.000818f, -14.481080f },
-                            1.000000f, 0.000000f );
-    // States -> crack_def crack_01 crack_01_anim crack_02 crack_02_anim crack_03 crack_03_anim crack_04 crack_04_anim
-    instance->registerEObj( "sgvf_z1e1_b0598_2", 2005199, 5675944, 4, { 238.872803f, -0.002887f, -0.791933f },
-                            1.000000f, 0.000000f );
-    // States -> crack_def crack_01 crack_01_anim crack_02 crack_02_anim crack_03 crack_03_anim crack_04 crack_04_anim
-    instance->registerEObj( "sgvf_z1e1_b0598_3", 2005200, 5675945, 4, { 233.135101f, -0.002692f, 13.732260f },
-                            1.000000f, 0.000000f );
-    // States -> crack_def crack_01 crack_01_anim crack_02 crack_02_anim crack_03 crack_03_anim crack_04 crack_04_anim
-    instance->registerEObj( "sgvf_z1e1_b0598_4", 2005201, 5675946, 4, { 220.264893f, -0.002887f, 18.895180f },
-                            1.000000f, 0.000000f );
-    // States -> crack_def crack_01 crack_01_anim crack_02 crack_02_anim crack_03 crack_03_anim crack_04 crack_04_anim
-    instance->registerEObj( "sgvf_z1e1_b0598_5", 2005202, 5675947, 4, { 206.385605f, -0.002087f, 13.131840f },
-                            1.000000f, 0.000000f );
-    // States -> crack_def crack_01 crack_01_anim crack_02 crack_02_anim crack_03 crack_03_anim crack_04 crack_04_anim
-    instance->registerEObj( "sgvf_z1e1_b0598_6", 2005203, 5675948, 4, { 201.101196f, -0.002887f, -0.591635f },
-                            1.000000f, 0.000000f );
-    // States -> crack_def crack_01 crack_01_anim crack_02 crack_02_anim crack_03 crack_03_anim crack_04 crack_04_anim
-    instance->registerEObj( "sgvf_z1e1_b0598_7", 2005204, 5675951, 4, { 206.584305f, -0.002887f, -14.412730f },
-                            1.000000f, 0.000000f );
-    // States -> crack_def crack_01 crack_01_anim crack_02 crack_02_anim crack_03 crack_03_anim crack_04 crack_04_anim
-    instance->registerEObj( "sgvf_z1e1_b0598_8", 2005205, 5675952, 4, { 227.781204f, -0.002888f, -8.587747f },
-                            1.000000f, 0.000000f );
-    // States -> crack_def crack_01 crack_01_anim crack_02 crack_02_anim crack_03 crack_03_anim crack_04 crack_04_anim
-    instance->registerEObj( "sgvf_z1e1_b0598_9", 2005206, 5675953, 4, { 227.676605f, -0.002889f, 8.141966f }, 1.000000f,
-                            0.000000f );
-    // States -> crack_def crack_01 crack_01_anim crack_02 crack_02_anim crack_03 crack_03_anim crack_04 crack_04_anim
-    instance->registerEObj( "sgvf_z1e1_b0598_10", 2005207, 5675954, 4, { 211.709396f, -0.002890f, 7.657639f },
-                            1.000000f, 0.000000f );
-    // States -> crack_def crack_01 crack_01_anim crack_02 crack_02_anim crack_03 crack_03_anim crack_04 crack_04_anim
-    instance->registerEObj( "sgvf_z1e1_b0598_11", 2005208, 5675955, 4, { 211.825500f, -0.001177f, -9.651319f },
-                            1.000000f, 0.000000f );
-    // States -> crack_def crack_01 crack_01_anim crack_02 crack_02_anim crack_03 crack_03_anim crack_04 crack_04_anim
+    instance.registerEObj( "sgvf_z1e9_b0606", 2005209, 5689928, 4, { -0.866003f, 0.000000f, -29.632271f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "Entrance", 2000182, 5649517, 5, { -0.064617f, 0.000000f, 21.704861f }, 1.000000f, 0.000000f ); 
+      // States -> vf_lock_on (id: 11) vf_lock_of (id: 12) 
+    instance.registerEObj( "Exit", 2000139, 0, 4, { 0.000000f, 0.000000f, -22.000000f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "sgbg_z1e9_t1_yuka1", 2005160, 5652375, 4, { -1.683807f, -0.002888f, -0.074251f }, 1.000000f, 0.000000f ); 
+      // States -> d_def (id: 1) d_def_anim (id: 2) d_01 (id: 3) d_01_anim (id: 4) d_02 (id: 5) d_02_anim (id: 6) d_03 (id: 7) d_03_anim (id: 8) d_04 (id: 9) d_04_anim (id: 10) 
+    instance.registerEObj( "unknown_0", 2005158, 0, 4, { 220.000000f, -0.045776f, 0.000000f }, 0.991760f, 0.000048f ); 
+    instance.registerEObj( "unknown_1", 2005159, 0, 4, { 229.899994f, -0.013268f, 9.900000f }, 0.991760f, 0.000048f ); 
+    instance.registerEObj( "unknown_2", 2004550, 0, 4, { 0.068370f, -0.002887f, -0.230858f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "sgvf_z1e1_b0598", 2005161, 5652362, 4, { 219.837494f, -0.000000f, -20.737341f }, 1.000000f, 0.000000f ); 
+      // States -> crack_def (id: 5) crack_01 (id: 6) crack_01_anim (id: 7) crack_02 (id: 8) crack_02_anim (id: 9) crack_03 (id: 10) crack_03_anim (id: 11) crack_04 (id: 12) crack_04_anim (id: 13) 
+    instance.registerEObj( "sgvf_z1e1_b0598_1", 2005198, 5675943, 4, { 234.366592f, -0.000818f, -14.481080f }, 1.000000f, 0.000000f ); 
+      // States -> crack_def (id: 5) crack_01 (id: 6) crack_01_anim (id: 7) crack_02 (id: 8) crack_02_anim (id: 9) crack_03 (id: 10) crack_03_anim (id: 11) crack_04 (id: 12) crack_04_anim (id: 13) 
+    instance.registerEObj( "sgvf_z1e1_b0598_2", 2005199, 5675944, 4, { 238.872803f, -0.002887f, -0.791933f }, 1.000000f, 0.000000f ); 
+      // States -> crack_def (id: 5) crack_01 (id: 6) crack_01_anim (id: 7) crack_02 (id: 8) crack_02_anim (id: 9) crack_03 (id: 10) crack_03_anim (id: 11) crack_04 (id: 12) crack_04_anim (id: 13) 
+    instance.registerEObj( "sgvf_z1e1_b0598_3", 2005200, 5675945, 4, { 233.135101f, -0.002692f, 13.732260f }, 1.000000f, 0.000000f ); 
+      // States -> crack_def (id: 5) crack_01 (id: 6) crack_01_anim (id: 7) crack_02 (id: 8) crack_02_anim (id: 9) crack_03 (id: 10) crack_03_anim (id: 11) crack_04 (id: 12) crack_04_anim (id: 13) 
+    instance.registerEObj( "sgvf_z1e1_b0598_4", 2005201, 5675946, 4, { 220.264893f, -0.002887f, 18.895180f }, 1.000000f, 0.000000f ); 
+      // States -> crack_def (id: 5) crack_01 (id: 6) crack_01_anim (id: 7) crack_02 (id: 8) crack_02_anim (id: 9) crack_03 (id: 10) crack_03_anim (id: 11) crack_04 (id: 12) crack_04_anim (id: 13) 
+    instance.registerEObj( "sgvf_z1e1_b0598_5", 2005202, 5675947, 4, { 206.385605f, -0.002087f, 13.131840f }, 1.000000f, 0.000000f ); 
+      // States -> crack_def (id: 5) crack_01 (id: 6) crack_01_anim (id: 7) crack_02 (id: 8) crack_02_anim (id: 9) crack_03 (id: 10) crack_03_anim (id: 11) crack_04 (id: 12) crack_04_anim (id: 13) 
+    instance.registerEObj( "sgvf_z1e1_b0598_6", 2005203, 5675948, 4, { 201.101196f, -0.002887f, -0.591635f }, 1.000000f, 0.000000f ); 
+      // States -> crack_def (id: 5) crack_01 (id: 6) crack_01_anim (id: 7) crack_02 (id: 8) crack_02_anim (id: 9) crack_03 (id: 10) crack_03_anim (id: 11) crack_04 (id: 12) crack_04_anim (id: 13) 
+    instance.registerEObj( "sgvf_z1e1_b0598_7", 2005204, 5675951, 4, { 206.584305f, -0.002887f, -14.412730f }, 1.000000f, 0.000000f ); 
+      // States -> crack_def (id: 5) crack_01 (id: 6) crack_01_anim (id: 7) crack_02 (id: 8) crack_02_anim (id: 9) crack_03 (id: 10) crack_03_anim (id: 11) crack_04 (id: 12) crack_04_anim (id: 13) 
+    instance.registerEObj( "sgvf_z1e1_b0598_8", 2005205, 5675952, 4, { 227.781204f, -0.002888f, -8.587747f }, 1.000000f, 0.000000f ); 
+      // States -> crack_def (id: 5) crack_01 (id: 6) crack_01_anim (id: 7) crack_02 (id: 8) crack_02_anim (id: 9) crack_03 (id: 10) crack_03_anim (id: 11) crack_04 (id: 12) crack_04_anim (id: 13) 
+    instance.registerEObj( "sgvf_z1e1_b0598_9", 2005206, 5675953, 4, { 227.676605f, -0.002889f, 8.141966f }, 1.000000f, 0.000000f ); 
+      // States -> crack_def (id: 5) crack_01 (id: 6) crack_01_anim (id: 7) crack_02 (id: 8) crack_02_anim (id: 9) crack_03 (id: 10) crack_03_anim (id: 11) crack_04 (id: 12) crack_04_anim (id: 13) 
+    instance.registerEObj( "sgvf_z1e1_b0598_10", 2005207, 5675954, 4, { 211.709396f, -0.002890f, 7.657639f }, 1.000000f, 0.000000f ); 
+      // States -> crack_def (id: 5) crack_01 (id: 6) crack_01_anim (id: 7) crack_02 (id: 8) crack_02_anim (id: 9) crack_03 (id: 10) crack_03_anim (id: 11) crack_04 (id: 12) crack_04_anim (id: 13) 
+    instance.registerEObj( "sgvf_z1e1_b0598_11", 2005208, 5675955, 4, { 211.825500f, -0.001177f, -9.651319f }, 1.000000f, 0.000000f ); 
+      // States -> crack_def (id: 5) crack_01 (id: 6) crack_01_anim (id: 7) crack_02 (id: 8) crack_02_anim (id: 9) crack_03 (id: 10) crack_03_anim (id: 11) crack_04 (id: 12) crack_04_anim (id: 13) 
 
   }
 
-  void onUpdate( InstanceContentPtr instance, uint32_t currTime ) override
+  void onUpdate( InstanceContent& instance, uint32_t currTime ) override
   {
 
   }
 
-  void onEnterTerritory( InstanceContentPtr instance, Entity::Player& player, uint32_t eventId, uint16_t param1,
+  void onEnterTerritory( InstanceContent& instance, Entity::Player& player, uint32_t eventId, uint16_t param1,
                          uint16_t param2 ) override
   {
 
diff --git a/src/scripts/instances/trials/TheDragonsNeck.cpp b/src/scripts/instances/trials/TheDragonsNeck.cpp
index a404d5cd..674c609f 100644
--- a/src/scripts/instances/trials/TheDragonsNeck.cpp
+++ b/src/scripts/instances/trials/TheDragonsNeck.cpp
@@ -9,123 +9,75 @@ class TheDragonsNeck :
 public:
   TheDragonsNeck() :
     Sapphire::ScriptAPI::InstanceContentScript( 20026 )
-  {
-  }
+  { }
 
-  void onInit( InstanceContentPtr instance ) override
+  void onInit( InstanceContent& instance ) override
   {
-    instance->registerEObj( "Thalsscepter", 2003646, 0, 4, { -270.088409f, 17.593571f, 31.956100f }, 0.991760f,
-                            0.000048f );
-    instance->registerEObj( "unknown_0", 2003695, 4617495, 4, { -280.035614f, 17.622829f, 22.302071f }, 1.000000f,
-                            0.000000f );
-    instance->registerEObj( "unknown_1", 2003696, 4563389, 4, { -286.231689f, 17.622749f, 20.657721f }, 1.000000f,
-                            0.000000f );
-    instance->registerEObj( "Thalsscepter_1", 2003674, 0, 4, { -271.908386f, 17.593571f, 6.173567f }, 0.991760f,
-                            0.000048f );
-    instance->registerEObj( "Thalsscepter_2", 2003675, 0, 4, { -244.251801f, 17.593571f, 30.251480f }, 0.991760f,
-                            0.000048f );
-    instance->registerEObj( "Thalsscepter_3", 2003676, 0, 4, { -246.038696f, 17.593571f, 4.371015f }, 0.991760f,
-                            0.000048f );
-    instance->registerEObj( "Mammetactivator", 2003641, 4616318, 4, { -84.695412f, -10.178000f, -91.555862f },
-                            0.991760f, 0.000048f );
-    instance->registerEObj( "Shadowyorb", 2003642, 0, 4, { 163.469803f, 6.240906f, 219.745102f }, 0.991760f,
-                            0.000048f );
-    instance->registerEObj( "Shadowyorb_1", 2003643, 0, 4, { 154.283905f, 6.240900f, 239.520905f }, 0.991760f,
-                            0.000048f );
-    instance->registerEObj( "Shadowyorb_2", 2003644, 0, 4, { 143.742905f, 6.240900f, 210.525208f }, 1.000000f,
-                            0.000000f );
-    instance->registerEObj( "Shadowyorb_3", 2003645, 0, 4, { 134.607193f, 6.240900f, 230.328094f }, 1.000000f,
-                            0.000000f );
-    instance->registerEObj( "unknown_2", 2003569, 4603298, 4, { 148.951706f, 4.509544f, 224.628006f }, 1.000000f,
-                            0.000000f );
-    instance->registerEObj( "Exit", 2001610, 4569374, 4, { -278.262390f, 17.622650f, 19.181259f }, 0.991760f,
-                            0.000048f );
-    // States -> vf_htras1_on vf_htras1_of
-    instance->registerEObj( "Shortcut", 2000700, 0, 4, { 139.879395f, -0.228372f, -31.551029f }, 0.991760f, 0.000048f );
-    instance->registerEObj( "Entrance", 2000182, 4569369, 5, { 149.187393f, -0.228943f, -35.111019f }, 0.991760f,
-                            0.000048f );
-    // States -> vf_lock_on vf_lock_of
-    instance->registerEObj( "unknown_3", 2002575, 0, 4, { 160.775299f, -1.641945f, -10.606120f }, 0.991760f,
-                            -1.265160f );
-    instance->registerEObj( "unknown_4", 2002735, 0, 4, { -50.385818f, -10.178000f, -114.820198f }, 0.991760f,
-                            -1.005012f );
-    instance->registerEObj( "sgvf_w_lvd_b0118", 2002872, 4569384, 4, { -48.920971f, -10.792460f, -116.285103f },
-                            0.991760f, -1.062825f );
-    // States -> vf_bextwall_on vf_bextwall_of
-    instance->registerEObj( "unknown_5", 2002735, 0, 4, { 129.072403f, 4.509535f, 216.306305f }, 1.000000f, 1.129171f );
-    instance->registerEObj( "sgvf_w_lvd_b0118_1", 2002872, 4569379, 4, { 130.018494f, 4.509536f, 217.130295f },
-                            0.991760f, 0.000048f );
-    // States -> vf_bextwall_on vf_bextwall_of
-    instance->registerEObj( "unknown_6", 2002735, 0, 4, { -233.786301f, 17.622999f, 16.764700f }, 1.000000f,
-                            -1.486617f );
-    instance->registerEObj( "sgvf_w_lvd_b0118_2", 2002872, 4569389, 4, { -233.389206f, 17.622990f, 16.739140f },
-                            0.991760f, 0.000048f );
-    // States -> vf_bextwall_on vf_bextwall_of
-    instance->registerEObj( "unknown_7", 2003506, 4594991, 4, { 101.606300f, -4.171019f, -69.914146f }, 1.000000f,
-                            0.000000f );
-    instance->registerEObj( "unknown_8", 2003507, 4598981, 4, { -41.245178f, -10.879700f, -121.934898f }, 0.991760f,
-                            0.000048f );
-    instance->registerEObj( "unknown_9", 2003508, 4603945, 4, { -52.140079f, -10.696590f, -91.691528f }, 0.991760f,
-                            0.000048f );
-    instance->registerEObj( "unknown_10", 2003509, 4564172, 4, { 130.022095f, -0.534058f, 5.172791f }, 0.991760f,
-                            0.000048f );
-    instance->registerEObj( "unknown_11", 2003510, 4594992, 4, { 123.552200f, -2.731445f, 25.131590f }, 0.991760f,
-                            0.000048f );
-    instance->registerEObj( "unknown_12", 2003511, 4598084, 4, { 89.130997f, -3.711910f, 78.724213f }, 1.000000f,
-                            0.000000f );
-    instance->registerEObj( "unknown_13", 2003512, 4599477, 4, { 73.157578f, -3.335556f, 178.491302f }, 1.000000f,
-                            0.000000f );
-    instance->registerEObj( "unknown_14", 2003513, 4594999, 4, { 100.220802f, 0.477127f, 203.242798f }, 1.000000f,
-                            0.000000f );
-    instance->registerEObj( "unknown_15", 2003514, 4616527, 4, { 167.865707f, 4.509536f, 233.584396f }, 0.991760f,
-                            0.000048f );
-    instance->registerEObj( "unknown_16", 2003515, 4567234, 4, { -191.532196f, 4.456180f, 94.520203f }, 1.000000f,
-                            0.000000f );
-    instance->registerEObj( "unknown_17", 2003516, 4567237, 4, { -128.869400f, 12.073380f, 96.752960f }, 1.000000f,
-                            0.000000f );
-    instance->registerEObj( "unknown_18", 2003517, 4567232, 4, { -66.065460f, 14.565810f, 26.350080f }, 1.000000f,
-                            0.000000f );
-    instance->registerEObj( "unknown_19", 2003518, 4567230, 4, { -171.754501f, 12.467810f, 12.301850f }, 1.000000f,
-                            0.000000f );
-    instance->registerEObj( "unknown_20", 2003519, 4596306, 4, { -198.995102f, 11.315890f, 13.488570f }, 1.000000f,
-                            0.000000f );
-    instance->registerEObj( "unknown_21", 2003520, 4565306, 4, { 96.452271f, -3.738525f, 39.688599f }, 0.991760f,
-                            0.000048f );
-    instance->registerEObj( "unknown_22", 2003521, 4565309, 4, { 127.885902f, -3.738525f, 60.807129f }, 0.991760f,
-                            0.000048f );
-    instance->registerEObj( "unknown_23", 2003522, 4565307, 4, { 82.383423f, -3.646973f, 59.189701f }, 0.991760f,
-                            0.000048f );
-    instance->registerEObj( "unknown_24", 2003523, 4565308, 4, { 108.323700f, -3.738525f, 80.552368f }, 0.991760f,
-                            0.000048f );
-    instance->registerEObj( "unknown_25", 2003524, 4565302, 4, { -2.324507f, 0.927634f, 144.329300f }, 1.000000f,
-                            0.000000f );
-    instance->registerEObj( "unknown_26", 2003525, 4565303, 4, { 27.311819f, 0.927548f, 166.238098f }, 1.000000f,
-                            0.000000f );
-    instance->registerEObj( "unknown_27", 2003526, 4565305, 4, { 68.331223f, 0.927661f, 136.889404f }, 1.000000f,
-                            0.000000f );
-    instance->registerEObj( "unknown_28", 2003527, 4595900, 4, { 77.372299f, -10.608900f, -91.074203f }, 1.000000f,
-                            0.000000f );
-    instance->registerEObj( "unknown_29", 2003528, 4595901, 4, { 36.027271f, -9.635880f, -104.808601f }, 1.000000f,
-                            0.000000f );
-    instance->registerEObj( "unknown_30", 2003529, 4595903, 4, { 2.165477f, -11.282240f, -188.867599f }, 1.000000f,
-                            0.000000f );
-    instance->registerEObj( "unknown_31", 2003530, 4618276, 4, { -10.216280f, -11.049250f, -152.788300f }, 0.991760f,
-                            0.000048f );
-    instance->registerEObj( "unknown_32", 2003531, 4595904, 4, { -21.241859f, -11.023320f, -136.299393f }, 1.000000f,
-                            0.000000f );
-    instance->registerEObj( "Entrance_1", 2000182, 4970117, 5, { -243.015701f, 19.074579f, 10.923530f }, 1.000000f,
-                            0.000000f );
-    // States -> vf_lock_on vf_lock_of
-    instance->registerEObj( "Exit_1", 2000139, 0, 4, { -272.688904f, 19.074579f, 18.222231f }, 1.000000f, 0.000000f );
+    instance.registerEObj( "Thalsscepter", 2003646, 0, 4, { -270.088409f, 17.593571f, 31.956100f }, 0.991760f, 0.000048f ); 
+    instance.registerEObj( "unknown_0", 2003695, 4617495, 4, { -280.035614f, 17.622829f, 22.302071f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_1", 2003696, 4563389, 4, { -286.231689f, 17.622749f, 20.657721f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "Thalsscepter_1", 2003674, 0, 4, { -271.908386f, 17.593571f, 6.173567f }, 0.991760f, 0.000048f ); 
+    instance.registerEObj( "Thalsscepter_2", 2003675, 0, 4, { -244.251801f, 17.593571f, 30.251480f }, 0.991760f, 0.000048f ); 
+    instance.registerEObj( "Thalsscepter_3", 2003676, 0, 4, { -246.038696f, 17.593571f, 4.371015f }, 0.991760f, 0.000048f ); 
+    instance.registerEObj( "Mammetactivator", 2003641, 4616318, 4, { -84.695412f, -10.178000f, -91.555862f }, 0.991760f, 0.000048f ); 
+    instance.registerEObj( "Shadowyorb", 2003642, 0, 4, { 163.469803f, 6.240906f, 219.745102f }, 0.991760f, 0.000048f ); 
+    instance.registerEObj( "Shadowyorb_1", 2003643, 0, 4, { 154.283905f, 6.240900f, 239.520905f }, 0.991760f, 0.000048f ); 
+    instance.registerEObj( "Shadowyorb_2", 2003644, 0, 4, { 143.742905f, 6.240900f, 210.525208f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "Shadowyorb_3", 2003645, 0, 4, { 134.607193f, 6.240900f, 230.328094f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_2", 2003569, 4603298, 4, { 148.951706f, 4.509544f, 224.628006f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "Exit", 2001610, 4569374, 4, { -278.262390f, 17.622650f, 19.181259f }, 0.991760f, 0.000048f ); 
+      // States -> vf_htras1_on (id: 2) vf_htras1_of (id: 3) 
+    instance.registerEObj( "Shortcut", 2000700, 0, 4, { 139.879395f, -0.228372f, -31.551029f }, 0.991760f, 0.000048f ); 
+    instance.registerEObj( "Entrance", 2000182, 4569369, 5, { 149.187393f, -0.228943f, -35.111019f }, 0.991760f, 0.000048f ); 
+      // States -> vf_lock_on (id: 11) vf_lock_of (id: 12) 
+    instance.registerEObj( "unknown_3", 2002575, 0, 4, { 160.775299f, -1.641945f, -10.606120f }, 0.991760f, -1.265160f ); 
+    instance.registerEObj( "unknown_4", 2002735, 0, 4, { -50.385818f, -10.178000f, -114.820198f }, 0.991760f, -1.005012f ); 
+    instance.registerEObj( "sgvf_w_lvd_b0118", 2002872, 4569384, 4, { -48.920971f, -10.792460f, -116.285103f }, 0.991760f, -1.062825f ); 
+      // States -> vf_bextwall_on (id: 3) vf_bextwall_of (id: 4) 
+    instance.registerEObj( "unknown_5", 2002735, 0, 4, { 129.072403f, 4.509535f, 216.306305f }, 1.000000f, 1.129171f ); 
+    instance.registerEObj( "sgvf_w_lvd_b0118_1", 2002872, 4569379, 4, { 130.018494f, 4.509536f, 217.130295f }, 0.991760f, 0.000048f ); 
+      // States -> vf_bextwall_on (id: 3) vf_bextwall_of (id: 4) 
+    instance.registerEObj( "unknown_6", 2002735, 0, 4, { -233.786301f, 17.622999f, 16.764700f }, 1.000000f, -1.486617f ); 
+    instance.registerEObj( "sgvf_w_lvd_b0118_2", 2002872, 4569389, 4, { -233.389206f, 17.622990f, 16.739140f }, 0.991760f, 0.000048f ); 
+      // States -> vf_bextwall_on (id: 3) vf_bextwall_of (id: 4) 
+    instance.registerEObj( "unknown_7", 2003506, 4594991, 4, { 101.606300f, -4.171019f, -69.914146f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_8", 2003507, 4598981, 4, { -41.245178f, -10.879700f, -121.934898f }, 0.991760f, 0.000048f ); 
+    instance.registerEObj( "unknown_9", 2003508, 4603945, 4, { -52.140079f, -10.696590f, -91.691528f }, 0.991760f, 0.000048f ); 
+    instance.registerEObj( "unknown_10", 2003509, 4564172, 4, { 130.022095f, -0.534058f, 5.172791f }, 0.991760f, 0.000048f ); 
+    instance.registerEObj( "unknown_11", 2003510, 4594992, 4, { 123.552200f, -2.731445f, 25.131590f }, 0.991760f, 0.000048f ); 
+    instance.registerEObj( "unknown_12", 2003511, 4598084, 4, { 89.130997f, -3.711910f, 78.724213f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_13", 2003512, 4599477, 4, { 73.157578f, -3.335556f, 178.491302f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_14", 2003513, 4594999, 4, { 100.220802f, 0.477127f, 203.242798f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_15", 2003514, 4616527, 4, { 167.865707f, 4.509536f, 233.584396f }, 0.991760f, 0.000048f ); 
+    instance.registerEObj( "unknown_16", 2003515, 4567234, 4, { -191.532196f, 4.456180f, 94.520203f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_17", 2003516, 4567237, 4, { -128.869400f, 12.073380f, 96.752960f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_18", 2003517, 4567232, 4, { -66.065460f, 14.565810f, 26.350080f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_19", 2003518, 4567230, 4, { -171.754501f, 12.467810f, 12.301850f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_20", 2003519, 4596306, 4, { -198.995102f, 11.315890f, 13.488570f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_21", 2003520, 4565306, 4, { 96.452271f, -3.738525f, 39.688599f }, 0.991760f, 0.000048f ); 
+    instance.registerEObj( "unknown_22", 2003521, 4565309, 4, { 127.885902f, -3.738525f, 60.807129f }, 0.991760f, 0.000048f ); 
+    instance.registerEObj( "unknown_23", 2003522, 4565307, 4, { 82.383423f, -3.646973f, 59.189701f }, 0.991760f, 0.000048f ); 
+    instance.registerEObj( "unknown_24", 2003523, 4565308, 4, { 108.323700f, -3.738525f, 80.552368f }, 0.991760f, 0.000048f ); 
+    instance.registerEObj( "unknown_25", 2003524, 4565302, 4, { -2.324507f, 0.927634f, 144.329300f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_26", 2003525, 4565303, 4, { 27.311819f, 0.927548f, 166.238098f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_27", 2003526, 4565305, 4, { 68.331223f, 0.927661f, 136.889404f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_28", 2003527, 4595900, 4, { 77.372299f, -10.608900f, -91.074203f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_29", 2003528, 4595901, 4, { 36.027271f, -9.635880f, -104.808601f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_30", 2003529, 4595903, 4, { 2.165477f, -11.282240f, -188.867599f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_31", 2003530, 4618276, 4, { -10.216280f, -11.049250f, -152.788300f }, 0.991760f, 0.000048f ); 
+    instance.registerEObj( "unknown_32", 2003531, 4595904, 4, { -21.241859f, -11.023320f, -136.299393f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "Entrance_1", 2000182, 4970117, 5, { -243.015701f, 19.074579f, 10.923530f }, 1.000000f, 0.000000f ); 
+      // States -> vf_lock_on (id: 11) vf_lock_of (id: 12) 
+    instance.registerEObj( "Exit_1", 2000139, 0, 4, { -272.688904f, 19.074579f, 18.222231f }, 1.000000f, 0.000000f ); 
 
   }
 
-  void onUpdate( InstanceContentPtr instance, uint32_t currTime ) override
+  void onUpdate( InstanceContent& instance, uint32_t currTime ) override
   {
 
   }
 
-  void onEnterTerritory( InstanceContentPtr instance, Entity::Player& player, uint32_t eventId, uint16_t param1,
+  void onEnterTerritory( InstanceContent& instance, Entity::Player& player, uint32_t eventId, uint16_t param1,
                          uint16_t param2 ) override
   {
 
diff --git a/src/scripts/instances/trials/TheFinalStepsofFaith.cpp b/src/scripts/instances/trials/TheFinalStepsofFaith.cpp
index 64a4bcf1..7dc9083d 100644
--- a/src/scripts/instances/trials/TheFinalStepsofFaith.cpp
+++ b/src/scripts/instances/trials/TheFinalStepsofFaith.cpp
@@ -9,28 +9,25 @@ class TheFinalStepsofFaith :
 public:
   TheFinalStepsofFaith() :
     Sapphire::ScriptAPI::InstanceContentScript( 20039 )
-  {
-  }
+  { }
 
-  void onInit( InstanceContentPtr instance ) override
+  void onInit( InstanceContent& instance ) override
   {
-    instance->registerEObj( "unknown_0", 2007132, 0, 4, { 1.180504f, -0.000001f, -5.348264f }, 1.000000f, 0.000000f );
-    instance->registerEObj( "unknown_1", 2007360, 0, 4, { 0.893822f, -0.000029f, 9.867915f }, 1.000000f, 0.000000f );
-    instance->registerEObj( "Entrance", 2000182, 6243772, 5, { 5.791933f, 0.049998f, 17.147869f }, 1.000000f,
-                            0.000000f );
-    // States -> vf_lock_on vf_lock_of
-    instance->registerEObj( "Exit", 2000139, 0, 4, { -0.802442f, 0.050000f, -16.948071f }, 1.000000f, 0.000000f );
-    instance->registerEObj( "unknown_2", 2007393, 6279966, 4, { 0.867247f, -0.000024f, 9.141238f }, 1.000000f,
-                            0.000000f );
+    instance.registerEObj( "unknown_0", 2007132, 0, 4, { 1.180504f, -0.000001f, -5.348264f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_1", 2007360, 0, 4, { 0.893822f, -0.000029f, 9.867915f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "Entrance", 2000182, 6243772, 5, { 5.791933f, 0.049998f, 17.147869f }, 1.000000f, 0.000000f ); 
+      // States -> vf_lock_on (id: 11) vf_lock_of (id: 12) 
+    instance.registerEObj( "Exit", 2000139, 0, 4, { -0.802442f, 0.050000f, -16.948071f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_2", 2007393, 6279966, 4, { 0.867247f, -0.000024f, 9.141238f }, 1.000000f, 0.000000f ); 
 
   }
 
-  void onUpdate( InstanceContentPtr instance, uint32_t currTime ) override
+  void onUpdate( InstanceContent& instance, uint32_t currTime ) override
   {
 
   }
 
-  void onEnterTerritory( InstanceContentPtr instance, Entity::Player& player, uint32_t eventId, uint16_t param1,
+  void onEnterTerritory( InstanceContent& instance, Entity::Player& player, uint32_t eventId, uint16_t param1,
                          uint16_t param2 ) override
   {
 
diff --git a/src/scripts/instances/trials/TheGreatHunt.cpp b/src/scripts/instances/trials/TheGreatHunt.cpp
new file mode 100644
index 00000000..b4b0cdd6
--- /dev/null
+++ b/src/scripts/instances/trials/TheGreatHunt.cpp
@@ -0,0 +1,36 @@
+#include <ScriptObject.h>
+#include <Territory/InstanceContent.h>
+
+using namespace Sapphire;
+
+class TheGreatHunt :
+  public Sapphire::ScriptAPI::InstanceContentScript
+{
+public:
+  TheGreatHunt() :
+    Sapphire::ScriptAPI::InstanceContentScript( 20053 )
+  { }
+
+  void onInit( InstanceContent& instance ) override
+  {
+    instance.registerEObj( "Foothold", 2009423, 0, 4, { 100.000000f, -0.500001f, 110.000000f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "Entrance", 2000182, 7187910, 5, { 93.347504f, -0.503487f, 116.806297f }, 1.000000f, 0.000000f ); 
+      // States -> vf_lock_on (id: 11) vf_lock_of (id: 12) 
+    instance.registerEObj( "Exit", 2000139, 0, 4, { 100.000000f, -0.500096f, 78.000000f }, 1.000000f, 0.000000f ); 
+
+  }
+
+  void onUpdate( InstanceContent& instance, uint32_t currTime ) override
+  {
+
+  }
+
+  void onEnterTerritory( InstanceContent& instance, Entity::Player& player, uint32_t eventId, uint16_t param1,
+                         uint16_t param2 ) override
+  {
+
+  }
+
+};
+
+EXPOSE_SCRIPT( TheGreatHunt );
\ No newline at end of file
diff --git a/src/scripts/instances/trials/TheGreatHuntExtreme.cpp b/src/scripts/instances/trials/TheGreatHuntExtreme.cpp
new file mode 100644
index 00000000..f8c26635
--- /dev/null
+++ b/src/scripts/instances/trials/TheGreatHuntExtreme.cpp
@@ -0,0 +1,36 @@
+#include <ScriptObject.h>
+#include <Territory/InstanceContent.h>
+
+using namespace Sapphire;
+
+class TheGreatHuntExtreme :
+  public Sapphire::ScriptAPI::InstanceContentScript
+{
+public:
+  TheGreatHuntExtreme() :
+    Sapphire::ScriptAPI::InstanceContentScript( 20054 )
+  { }
+
+  void onInit( InstanceContent& instance ) override
+  {
+    instance.registerEObj( "Foothold", 2009423, 0, 4, { 100.000000f, -0.500001f, 110.000000f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "Entrance", 2000182, 7187910, 5, { 93.347504f, -0.503487f, 116.806297f }, 1.000000f, 0.000000f ); 
+      // States -> vf_lock_on (id: 11) vf_lock_of (id: 12) 
+    instance.registerEObj( "Exit", 2000139, 0, 4, { 100.000000f, -0.500096f, 78.000000f }, 1.000000f, 0.000000f ); 
+
+  }
+
+  void onUpdate( InstanceContent& instance, uint32_t currTime ) override
+  {
+
+  }
+
+  void onEnterTerritory( InstanceContent& instance, Entity::Player& player, uint32_t eventId, uint16_t param1,
+                         uint16_t param2 ) override
+  {
+
+  }
+
+};
+
+EXPOSE_SCRIPT( TheGreatHuntExtreme );
\ No newline at end of file
diff --git a/src/scripts/instances/trials/TheHowlingEye.cpp b/src/scripts/instances/trials/TheHowlingEye.cpp
index d045c0e8..f05766c2 100644
--- a/src/scripts/instances/trials/TheHowlingEye.cpp
+++ b/src/scripts/instances/trials/TheHowlingEye.cpp
@@ -9,40 +9,30 @@ class TheHowlingEye :
 public:
   TheHowlingEye() :
     Sapphire::ScriptAPI::InstanceContentScript( 20003 )
-  {
-  }
+  { }
 
-  void onInit( InstanceContentPtr instance ) override
+  void onInit( InstanceContent& instance ) override
   {
-    instance->registerEObj( "sgbg_r1fa_a_rockcol", 2000646, 4256721, 4, { -4.592406f, -1.261766f, 4.724565f },
-                            1.000000f, 0.000000f );
-    instance->registerEObj( "sgbg_r1fa_a_rockcol_1", 2000647, 4256725, 4, { 7.587256f, -1.233237f, 6.169516f },
-                            1.000000f, 0.000000f );
-    instance->registerEObj( "sgbg_r1fa_a_rockcol_2", 2000648, 4256726, 4, { -6.329784f, 3.332559f, -6.736721f },
-                            1.000000f, 0.000000f );
-    instance->registerEObj( "sgbg_r1fa_a_rockcol_3", 2000649, 4256727, 4, { 5.895649f, 3.275768f, -6.217119f },
-                            1.000000f, 0.000000f );
-    instance->registerEObj( "sgbg_r1fa_a_rockcol_4", 2000646, 4488538, 4, { -7.000000f, 0.000000f, 7.000000f },
-                            1.000000f, 0.000000f );
-    instance->registerEObj( "sgbg_r1fa_a_rockcol_5", 2000647, 4488545, 4, { 7.000000f, 0.000000f, 7.000000f },
-                            1.000000f, 0.000000f );
-    instance->registerEObj( "sgbg_r1fa_a_rockcol_6", 2000648, 4488546, 4, { -7.000000f, 0.000000f, -7.000000f },
-                            1.000000f, 0.000000f );
-    instance->registerEObj( "sgbg_r1fa_a_rockcol_7", 2000649, 4488548, 4, { 7.000000f, 0.000000f, -7.000000f },
-                            1.000000f, 0.000000f );
-    instance->registerEObj( "Entrance", 2000274, 4246117, 5, { 0.506547f, -1.935848f, 14.110570f }, 1.000000f,
-                            0.000000f );
-    // States -> vf_lock_on vf_lock_of
-    instance->registerEObj( "Exit", 2000275, 0, 4, { 1.078937f, -2.041544f, -18.363190f }, 1.000000f, 0.000000f );
+    instance.registerEObj( "sgbg_r1fa_a_rockcol", 2000646, 4256721, 4, { -4.592406f, -1.261766f, 4.724565f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "sgbg_r1fa_a_rockcol_1", 2000647, 4256725, 4, { 7.587256f, -1.233237f, 6.169516f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "sgbg_r1fa_a_rockcol_2", 2000648, 4256726, 4, { -6.329784f, 3.332559f, -6.736721f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "sgbg_r1fa_a_rockcol_3", 2000649, 4256727, 4, { 5.895649f, 3.275768f, -6.217119f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "sgbg_r1fa_a_rockcol_4", 2000646, 4488538, 4, { -7.000000f, 0.000000f, 7.000000f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "sgbg_r1fa_a_rockcol_5", 2000647, 4488545, 4, { 7.000000f, 0.000000f, 7.000000f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "sgbg_r1fa_a_rockcol_6", 2000648, 4488546, 4, { -7.000000f, 0.000000f, -7.000000f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "sgbg_r1fa_a_rockcol_7", 2000649, 4488548, 4, { 7.000000f, 0.000000f, -7.000000f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "Entrance", 2000274, 4246117, 5, { 0.506547f, -1.935848f, 14.110570f }, 1.000000f, 0.000000f ); 
+      // States -> vf_lock_on (id: 11) vf_lock_of (id: 12) 
+    instance.registerEObj( "Exit", 2000275, 0, 4, { 1.078937f, -2.041544f, -18.363190f }, 1.000000f, 0.000000f ); 
 
   }
 
-  void onUpdate( InstanceContentPtr instance, uint32_t currTime ) override
+  void onUpdate( InstanceContent& instance, uint32_t currTime ) override
   {
 
   }
 
-  void onEnterTerritory( InstanceContentPtr instance, Entity::Player& player, uint32_t eventId, uint16_t param1,
+  void onEnterTerritory( InstanceContent& instance, Entity::Player& player, uint32_t eventId, uint16_t param1,
                          uint16_t param2 ) override
   {
 
diff --git a/src/scripts/instances/trials/TheHowlingEyeExtreme.cpp b/src/scripts/instances/trials/TheHowlingEyeExtreme.cpp
index 208bc89d..b49afb69 100644
--- a/src/scripts/instances/trials/TheHowlingEyeExtreme.cpp
+++ b/src/scripts/instances/trials/TheHowlingEyeExtreme.cpp
@@ -9,40 +9,30 @@ class TheHowlingEyeExtreme :
 public:
   TheHowlingEyeExtreme() :
     Sapphire::ScriptAPI::InstanceContentScript( 20010 )
-  {
-  }
+  { }
 
-  void onInit( InstanceContentPtr instance ) override
+  void onInit( InstanceContent& instance ) override
   {
-    instance->registerEObj( "sgbg_r1fa_a_rockcol", 2000646, 4256721, 4, { -4.592406f, -1.261766f, 4.724565f },
-                            1.000000f, 0.000000f );
-    instance->registerEObj( "sgbg_r1fa_a_rockcol_1", 2000647, 4256725, 4, { 7.587256f, -1.233237f, 6.169516f },
-                            1.000000f, 0.000000f );
-    instance->registerEObj( "sgbg_r1fa_a_rockcol_2", 2000648, 4256726, 4, { -6.329784f, 3.332559f, -6.736721f },
-                            1.000000f, 0.000000f );
-    instance->registerEObj( "sgbg_r1fa_a_rockcol_3", 2000649, 4256727, 4, { 5.895649f, 3.275768f, -6.217119f },
-                            1.000000f, 0.000000f );
-    instance->registerEObj( "sgbg_r1fa_a_rockcol_4", 2000646, 4488538, 4, { -7.000000f, 0.000000f, 7.000000f },
-                            1.000000f, 0.000000f );
-    instance->registerEObj( "sgbg_r1fa_a_rockcol_5", 2000647, 4488545, 4, { 7.000000f, 0.000000f, 7.000000f },
-                            1.000000f, 0.000000f );
-    instance->registerEObj( "sgbg_r1fa_a_rockcol_6", 2000648, 4488546, 4, { -7.000000f, 0.000000f, -7.000000f },
-                            1.000000f, 0.000000f );
-    instance->registerEObj( "sgbg_r1fa_a_rockcol_7", 2000649, 4488548, 4, { 7.000000f, 0.000000f, -7.000000f },
-                            1.000000f, 0.000000f );
-    instance->registerEObj( "Entrance", 2000274, 4246117, 5, { 0.506547f, -1.935848f, 14.110570f }, 1.000000f,
-                            0.000000f );
-    // States -> vf_lock_on vf_lock_of
-    instance->registerEObj( "Exit", 2000275, 0, 4, { 1.078937f, -2.041544f, -18.363190f }, 1.000000f, 0.000000f );
+    instance.registerEObj( "sgbg_r1fa_a_rockcol", 2000646, 4256721, 4, { -4.592406f, -1.261766f, 4.724565f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "sgbg_r1fa_a_rockcol_1", 2000647, 4256725, 4, { 7.587256f, -1.233237f, 6.169516f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "sgbg_r1fa_a_rockcol_2", 2000648, 4256726, 4, { -6.329784f, 3.332559f, -6.736721f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "sgbg_r1fa_a_rockcol_3", 2000649, 4256727, 4, { 5.895649f, 3.275768f, -6.217119f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "sgbg_r1fa_a_rockcol_4", 2000646, 4488538, 4, { -7.000000f, 0.000000f, 7.000000f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "sgbg_r1fa_a_rockcol_5", 2000647, 4488545, 4, { 7.000000f, 0.000000f, 7.000000f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "sgbg_r1fa_a_rockcol_6", 2000648, 4488546, 4, { -7.000000f, 0.000000f, -7.000000f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "sgbg_r1fa_a_rockcol_7", 2000649, 4488548, 4, { 7.000000f, 0.000000f, -7.000000f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "Entrance", 2000274, 4246117, 5, { 0.506547f, -1.935848f, 14.110570f }, 1.000000f, 0.000000f ); 
+      // States -> vf_lock_on (id: 11) vf_lock_of (id: 12) 
+    instance.registerEObj( "Exit", 2000275, 0, 4, { 1.078937f, -2.041544f, -18.363190f }, 1.000000f, 0.000000f ); 
 
   }
 
-  void onUpdate( InstanceContentPtr instance, uint32_t currTime ) override
+  void onUpdate( InstanceContent& instance, uint32_t currTime ) override
   {
 
   }
 
-  void onEnterTerritory( InstanceContentPtr instance, Entity::Player& player, uint32_t eventId, uint16_t param1,
+  void onEnterTerritory( InstanceContent& instance, Entity::Player& player, uint32_t eventId, uint16_t param1,
                          uint16_t param2 ) override
   {
 
diff --git a/src/scripts/instances/trials/TheHowlingEyeHard.cpp b/src/scripts/instances/trials/TheHowlingEyeHard.cpp
index 53445c7d..ed1b0a46 100644
--- a/src/scripts/instances/trials/TheHowlingEyeHard.cpp
+++ b/src/scripts/instances/trials/TheHowlingEyeHard.cpp
@@ -9,40 +9,30 @@ class TheHowlingEyeHard :
 public:
   TheHowlingEyeHard() :
     Sapphire::ScriptAPI::InstanceContentScript( 20006 )
-  {
-  }
+  { }
 
-  void onInit( InstanceContentPtr instance ) override
+  void onInit( InstanceContent& instance ) override
   {
-    instance->registerEObj( "sgbg_r1fa_a_rockcol", 2000646, 4256721, 4, { -4.592406f, -1.261766f, 4.724565f },
-                            1.000000f, 0.000000f );
-    instance->registerEObj( "sgbg_r1fa_a_rockcol_1", 2000647, 4256725, 4, { 7.587256f, -1.233237f, 6.169516f },
-                            1.000000f, 0.000000f );
-    instance->registerEObj( "sgbg_r1fa_a_rockcol_2", 2000648, 4256726, 4, { -6.329784f, 3.332559f, -6.736721f },
-                            1.000000f, 0.000000f );
-    instance->registerEObj( "sgbg_r1fa_a_rockcol_3", 2000649, 4256727, 4, { 5.895649f, 3.275768f, -6.217119f },
-                            1.000000f, 0.000000f );
-    instance->registerEObj( "sgbg_r1fa_a_rockcol_4", 2000646, 4488538, 4, { -7.000000f, 0.000000f, 7.000000f },
-                            1.000000f, 0.000000f );
-    instance->registerEObj( "sgbg_r1fa_a_rockcol_5", 2000647, 4488545, 4, { 7.000000f, 0.000000f, 7.000000f },
-                            1.000000f, 0.000000f );
-    instance->registerEObj( "sgbg_r1fa_a_rockcol_6", 2000648, 4488546, 4, { -7.000000f, 0.000000f, -7.000000f },
-                            1.000000f, 0.000000f );
-    instance->registerEObj( "sgbg_r1fa_a_rockcol_7", 2000649, 4488548, 4, { 7.000000f, 0.000000f, -7.000000f },
-                            1.000000f, 0.000000f );
-    instance->registerEObj( "Entrance", 2000274, 4246117, 5, { 0.506547f, -1.935848f, 14.110570f }, 1.000000f,
-                            0.000000f );
-    // States -> vf_lock_on vf_lock_of
-    instance->registerEObj( "Exit", 2000275, 0, 4, { 1.078937f, -2.041544f, -18.363190f }, 1.000000f, 0.000000f );
+    instance.registerEObj( "sgbg_r1fa_a_rockcol", 2000646, 4256721, 4, { -4.592406f, -1.261766f, 4.724565f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "sgbg_r1fa_a_rockcol_1", 2000647, 4256725, 4, { 7.587256f, -1.233237f, 6.169516f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "sgbg_r1fa_a_rockcol_2", 2000648, 4256726, 4, { -6.329784f, 3.332559f, -6.736721f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "sgbg_r1fa_a_rockcol_3", 2000649, 4256727, 4, { 5.895649f, 3.275768f, -6.217119f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "sgbg_r1fa_a_rockcol_4", 2000646, 4488538, 4, { -7.000000f, 0.000000f, 7.000000f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "sgbg_r1fa_a_rockcol_5", 2000647, 4488545, 4, { 7.000000f, 0.000000f, 7.000000f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "sgbg_r1fa_a_rockcol_6", 2000648, 4488546, 4, { -7.000000f, 0.000000f, -7.000000f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "sgbg_r1fa_a_rockcol_7", 2000649, 4488548, 4, { 7.000000f, 0.000000f, -7.000000f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "Entrance", 2000274, 4246117, 5, { 0.506547f, -1.935848f, 14.110570f }, 1.000000f, 0.000000f ); 
+      // States -> vf_lock_on (id: 11) vf_lock_of (id: 12) 
+    instance.registerEObj( "Exit", 2000275, 0, 4, { 1.078937f, -2.041544f, -18.363190f }, 1.000000f, 0.000000f ); 
 
   }
 
-  void onUpdate( InstanceContentPtr instance, uint32_t currTime ) override
+  void onUpdate( InstanceContent& instance, uint32_t currTime ) override
   {
 
   }
 
-  void onEnterTerritory( InstanceContentPtr instance, Entity::Player& player, uint32_t eventId, uint16_t param1,
+  void onEnterTerritory( InstanceContent& instance, Entity::Player& player, uint32_t eventId, uint16_t param1,
                          uint16_t param2 ) override
   {
 
diff --git a/src/scripts/instances/trials/TheJadeStoa.cpp b/src/scripts/instances/trials/TheJadeStoa.cpp
index b5ca8bcb..a551df0d 100644
--- a/src/scripts/instances/trials/TheJadeStoa.cpp
+++ b/src/scripts/instances/trials/TheJadeStoa.cpp
@@ -9,20 +9,25 @@ class TheJadeStoa :
 public:
   TheJadeStoa() :
     Sapphire::ScriptAPI::InstanceContentScript( 20051 )
+  { }
+
+  void onInit( InstanceContent& instance ) override
   {
+    instance.registerEObj( "unknown_0", 2009431, 0, 4, { -2.722647f, -0.000001f, 7.311604f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "Entrance", 2000182, 7174720, 5, { 5.504887f, 0.000000f, 14.000000f }, 1.000000f, 0.000000f ); 
+      // States -> vf_lock_on (id: 11) vf_lock_of (id: 12) 
+    instance.registerEObj( "Exit", 2000139, 0, 4, { 0.000000f, 0.000000f, -14.500000f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_1", 2007457, 7181535, 4, { 0.000000f, 0.000000f, 0.000000f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_2", 2009214, 0, 4, { 2.987230f, 0.000000f, -2.908927f }, 1.000000f, 0.000000f ); 
+
   }
 
-  void onInit( InstanceContentPtr instance ) override
+  void onUpdate( InstanceContent& instance, uint32_t currTime ) override
   {
 
   }
 
-  void onUpdate( InstanceContentPtr instance, uint32_t currTime ) override
-  {
-
-  }
-
-  void onEnterTerritory( InstanceContentPtr instance, Entity::Player& player, uint32_t eventId, uint16_t param1,
+  void onEnterTerritory( InstanceContent& instance, Entity::Player& player, uint32_t eventId, uint16_t param1,
                          uint16_t param2 ) override
   {
 
diff --git a/src/scripts/instances/trials/TheJadeStoaExtreme.cpp b/src/scripts/instances/trials/TheJadeStoaExtreme.cpp
index 3b07df64..75861053 100644
--- a/src/scripts/instances/trials/TheJadeStoaExtreme.cpp
+++ b/src/scripts/instances/trials/TheJadeStoaExtreme.cpp
@@ -9,20 +9,25 @@ class TheJadeStoaExtreme :
 public:
   TheJadeStoaExtreme() :
     Sapphire::ScriptAPI::InstanceContentScript( 20052 )
+  { }
+
+  void onInit( InstanceContent& instance ) override
   {
+    instance.registerEObj( "unknown_0", 2009431, 0, 4, { -2.722647f, -0.000001f, 7.311604f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "Entrance", 2000182, 7174720, 5, { 5.504887f, 0.000000f, 14.000000f }, 1.000000f, 0.000000f ); 
+      // States -> vf_lock_on (id: 11) vf_lock_of (id: 12) 
+    instance.registerEObj( "Exit", 2000139, 0, 4, { 0.000000f, 0.000000f, -14.500000f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_1", 2007457, 7181535, 4, { 0.000000f, 0.000000f, 0.000000f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_2", 2009214, 0, 4, { 2.987230f, 0.000000f, -2.908927f }, 1.000000f, 0.000000f ); 
+
   }
 
-  void onInit( InstanceContentPtr instance ) override
+  void onUpdate( InstanceContent& instance, uint32_t currTime ) override
   {
 
   }
 
-  void onUpdate( InstanceContentPtr instance, uint32_t currTime ) override
-  {
-
-  }
-
-  void onEnterTerritory( InstanceContentPtr instance, Entity::Player& player, uint32_t eventId, uint16_t param1,
+  void onEnterTerritory( InstanceContent& instance, Entity::Player& player, uint32_t eventId, uint16_t param1,
                          uint16_t param2 ) override
   {
 
diff --git a/src/scripts/instances/trials/TheLimitlessBlueExtreme.cpp b/src/scripts/instances/trials/TheLimitlessBlueExtreme.cpp
index 7e98691c..0c1fb0ff 100644
--- a/src/scripts/instances/trials/TheLimitlessBlueExtreme.cpp
+++ b/src/scripts/instances/trials/TheLimitlessBlueExtreme.cpp
@@ -9,20 +9,30 @@ class TheLimitlessBlueExtreme :
 public:
   TheLimitlessBlueExtreme() :
     Sapphire::ScriptAPI::InstanceContentScript( 20034 )
+  { }
+
+  void onInit( InstanceContent& instance ) override
   {
+    instance.registerEObj( "Magitekfieldgenerator", 2005541, 0, 4, { -15.000000f, 0.000000f, 0.000000f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "Dragonkiller", 2005544, 0, 4, { -13.000000f, 0.182584f, -17.700001f }, 1.000000f, 0.261799f ); 
+    instance.registerEObj( "Dragonkiller_1", 2005545, 0, 4, { -14.150000f, 0.168036f, 19.500000f }, 1.000000f, -0.087266f ); 
+    instance.registerEObj( "sgbg_a2fa_a1_bsid2", 2005847, 5865535, 4, { -5.185479f, 0.084680f, 0.234906f }, 1.000000f, 0.000000f ); 
+      // States -> collision_on (id: 1) collision_off (id: 2) 
+    instance.registerEObj( "sgbg_a2fa_a1_bare1", 2005958, 5898723, 4, { -3.398252f, 0.016719f, -0.449336f }, 1.000000f, 0.000000f ); 
+      // States -> stage_ba_hide (id: 1) stage_ba_show (id: 2) stage_ba_anim1 (id: 3) stage_ba_anim2 (id: 4) 
+    instance.registerEObj( "unknown_0", 2005965, 5874950, 4, { -14.475140f, 0.010675f, 5.614964f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "Entrance", 2000182, 5778232, 5, { -26.139870f, 0.000001f, -0.197510f }, 1.000000f, 0.000000f ); 
+      // States -> vf_lock_on (id: 11) vf_lock_of (id: 12) 
+    instance.registerEObj( "Exit", 2000139, 0, 4, { -4.281307f, 0.000000f, 0.000000f }, 1.000000f, 0.000000f ); 
+
   }
 
-  void onInit( InstanceContentPtr instance ) override
+  void onUpdate( InstanceContent& instance, uint32_t currTime ) override
   {
 
   }
 
-  void onUpdate( InstanceContentPtr instance, uint32_t currTime ) override
-  {
-
-  }
-
-  void onEnterTerritory( InstanceContentPtr instance, Entity::Player& player, uint32_t eventId, uint16_t param1,
+  void onEnterTerritory( InstanceContent& instance, Entity::Player& player, uint32_t eventId, uint16_t param1,
                          uint16_t param2 ) override
   {
 
diff --git a/src/scripts/instances/trials/TheLimitlessBlueHard.cpp b/src/scripts/instances/trials/TheLimitlessBlueHard.cpp
index 70158d05..69541f2c 100644
--- a/src/scripts/instances/trials/TheLimitlessBlueHard.cpp
+++ b/src/scripts/instances/trials/TheLimitlessBlueHard.cpp
@@ -9,20 +9,30 @@ class TheLimitlessBlueHard :
 public:
   TheLimitlessBlueHard() :
     Sapphire::ScriptAPI::InstanceContentScript( 20033 )
+  { }
+
+  void onInit( InstanceContent& instance ) override
   {
+    instance.registerEObj( "Magitekfieldgenerator", 2005541, 0, 4, { -15.000000f, 0.000000f, 0.000000f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "Dragonkiller", 2005544, 0, 4, { -13.000000f, 0.182584f, -17.700001f }, 1.000000f, 0.261799f ); 
+    instance.registerEObj( "Dragonkiller_1", 2005545, 0, 4, { -14.150000f, 0.168036f, 19.500000f }, 1.000000f, -0.087266f ); 
+    instance.registerEObj( "sgbg_a2fa_a1_bsid2", 2005847, 5865535, 4, { -5.185479f, 0.084680f, 0.234906f }, 1.000000f, 0.000000f ); 
+      // States -> collision_on (id: 1) collision_off (id: 2) 
+    instance.registerEObj( "sgbg_a2fa_a1_bare1", 2005958, 5898723, 4, { -3.398252f, 0.016719f, -0.449336f }, 1.000000f, 0.000000f ); 
+      // States -> stage_ba_hide (id: 1) stage_ba_show (id: 2) stage_ba_anim1 (id: 3) stage_ba_anim2 (id: 4) 
+    instance.registerEObj( "unknown_0", 2005965, 5874950, 4, { -14.475140f, 0.010675f, 5.614964f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "Entrance", 2000182, 5778232, 5, { -26.139870f, 0.000001f, -0.197510f }, 1.000000f, 0.000000f ); 
+      // States -> vf_lock_on (id: 11) vf_lock_of (id: 12) 
+    instance.registerEObj( "Exit", 2000139, 0, 4, { -4.281307f, 0.000000f, 0.000000f }, 1.000000f, 0.000000f ); 
+
   }
 
-  void onInit( InstanceContentPtr instance ) override
+  void onUpdate( InstanceContent& instance, uint32_t currTime ) override
   {
 
   }
 
-  void onUpdate( InstanceContentPtr instance, uint32_t currTime ) override
-  {
-
-  }
-
-  void onEnterTerritory( InstanceContentPtr instance, Entity::Player& player, uint32_t eventId, uint16_t param1,
+  void onEnterTerritory( InstanceContent& instance, Entity::Player& player, uint32_t eventId, uint16_t param1,
                          uint16_t param2 ) override
   {
 
@@ -30,4 +40,4 @@ public:
 
 };
 
-EXPOSE_SCRIPT( TheLimitlessBlueHard )
\ No newline at end of file
+EXPOSE_SCRIPT( TheLimitlessBlueHard );
\ No newline at end of file
diff --git a/src/scripts/instances/trials/TheMinstrelsBalladNidhoggsRage.cpp b/src/scripts/instances/trials/TheMinstrelsBalladNidhoggsRage.cpp
index fd788279..33cbf194 100644
--- a/src/scripts/instances/trials/TheMinstrelsBalladNidhoggsRage.cpp
+++ b/src/scripts/instances/trials/TheMinstrelsBalladNidhoggsRage.cpp
@@ -9,28 +9,25 @@ class TheMinstrelsBalladNidhoggsRage :
 public:
   TheMinstrelsBalladNidhoggsRage() :
     Sapphire::ScriptAPI::InstanceContentScript( 20040 )
-  {
-  }
+  { }
 
-  void onInit( InstanceContentPtr instance ) override
+  void onInit( InstanceContent& instance ) override
   {
-    instance->registerEObj( "unknown_0", 2007132, 0, 4, { 1.180504f, -0.000001f, -5.348264f }, 1.000000f, 0.000000f );
-    instance->registerEObj( "unknown_1", 2007360, 0, 4, { 0.893822f, -0.000029f, 9.867915f }, 1.000000f, 0.000000f );
-    instance->registerEObj( "Entrance", 2000182, 6243772, 5, { 5.791933f, 0.049998f, 17.147869f }, 1.000000f,
-                            0.000000f );
-    // States -> vf_lock_on vf_lock_of
-    instance->registerEObj( "Exit", 2000139, 0, 4, { -0.802442f, 0.050000f, -16.948071f }, 1.000000f, 0.000000f );
-    instance->registerEObj( "unknown_2", 2007393, 6279966, 4, { 0.867247f, -0.000024f, 9.141238f }, 1.000000f,
-                            0.000000f );
+    instance.registerEObj( "unknown_0", 2007132, 0, 4, { 1.180504f, -0.000001f, -5.348264f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_1", 2007360, 0, 4, { 0.893822f, -0.000029f, 9.867915f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "Entrance", 2000182, 6243772, 5, { 5.791933f, 0.049998f, 17.147869f }, 1.000000f, 0.000000f ); 
+      // States -> vf_lock_on (id: 11) vf_lock_of (id: 12) 
+    instance.registerEObj( "Exit", 2000139, 0, 4, { -0.802442f, 0.050000f, -16.948071f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_2", 2007393, 6279966, 4, { 0.867247f, -0.000024f, 9.141238f }, 1.000000f, 0.000000f ); 
 
   }
 
-  void onUpdate( InstanceContentPtr instance, uint32_t currTime ) override
+  void onUpdate( InstanceContent& instance, uint32_t currTime ) override
   {
 
   }
 
-  void onEnterTerritory( InstanceContentPtr instance, Entity::Player& player, uint32_t eventId, uint16_t param1,
+  void onEnterTerritory( InstanceContent& instance, Entity::Player& player, uint32_t eventId, uint16_t param1,
                          uint16_t param2 ) override
   {
 
diff --git a/src/scripts/instances/trials/TheMinstrelsBalladShinryusDomain.cpp b/src/scripts/instances/trials/TheMinstrelsBalladShinryusDomain.cpp
index 0b764d9c..74888c3b 100644
--- a/src/scripts/instances/trials/TheMinstrelsBalladShinryusDomain.cpp
+++ b/src/scripts/instances/trials/TheMinstrelsBalladShinryusDomain.cpp
@@ -9,20 +9,39 @@ class TheMinstrelsBalladShinryusDomain :
 public:
   TheMinstrelsBalladShinryusDomain() :
     Sapphire::ScriptAPI::InstanceContentScript( 20050 )
+  { }
+
+  void onInit( InstanceContent& instance ) override
   {
+    instance.registerEObj( "Entrance", 2000182, 7034110, 5, { -21.048290f, -380.000092f, 1.297991f }, 1.000000f, 0.000000f ); 
+      // States -> vf_lock_on (id: 11) vf_lock_of (id: 12) 
+    instance.registerEObj( "Exit", 2000139, 0, 4, { 0.000000f, 620.000000f, 20.000000f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_0", 2007457, 7023869, 4, { -16.594919f, -380.000092f, -17.432211f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_1", 2007457, 7023871, 4, { -0.213646f, -380.000092f, -17.432211f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_2", 2007457, 7023870, 4, { 19.761841f, -380.000092f, -17.432211f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_3", 2007457, 7023865, 4, { -16.594919f, -380.000092f, 0.746161f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_4", 2007457, 7023864, 4, { 20.591261f, -380.000092f, 1.852063f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_5", 2007457, 7023866, 4, { -16.594919f, -380.000092f, 20.030439f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_6", 2007457, 7023868, 4, { 1.859938f, -380.000092f, 20.168671f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_7", 2007457, 7023867, 4, { 21.489799f, -380.000092f, 20.306919f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_8", 2007457, 7023863, 4, { 0.270193f, -380.000092f, 0.884399f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_9", 2007457, 7024624, 4, { -5.336151f, -380.000000f, 8.195240f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_10", 2007457, 7024837, 4, { 17.385090f, 620.000000f, -3.965453f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_11", 2007457, 7024899, 4, { 15.077030f, 620.000000f, -79.248016f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_12", 2007457, 7032157, 4, { 7.331779f, 620.000000f, 0.488136f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_13", 2007457, 7032193, 4, { 9.743866f, 620.000000f, -5.475266f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_14", 2009049, 0, 4, { 20.000000f, 620.000000f, 0.000000f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_15", 2009065, 0, 4, { -0.015030f, 619.988770f, -6.068220f }, 0.991760f, 0.000048f ); 
+    instance.registerEObj( "unknown_16", 2009073, 0, 4, { -20.000000f, 620.000000f, 0.000000f }, 1.000000f, 0.000000f ); 
+
   }
 
-  void onInit( InstanceContentPtr instance ) override
+  void onUpdate( InstanceContent& instance, uint32_t currTime ) override
   {
 
   }
 
-  void onUpdate( InstanceContentPtr instance, uint32_t currTime ) override
-  {
-
-  }
-
-  void onEnterTerritory( InstanceContentPtr instance, Entity::Player& player, uint32_t eventId, uint16_t param1,
+  void onEnterTerritory( InstanceContent& instance, Entity::Player& player, uint32_t eventId, uint16_t param1,
                          uint16_t param2 ) override
   {
 
diff --git a/src/scripts/instances/trials/TheMinstrelsBalladThordansReign.cpp b/src/scripts/instances/trials/TheMinstrelsBalladThordansReign.cpp
index a873a993..f0f04ecb 100644
--- a/src/scripts/instances/trials/TheMinstrelsBalladThordansReign.cpp
+++ b/src/scripts/instances/trials/TheMinstrelsBalladThordansReign.cpp
@@ -9,20 +9,75 @@ class TheMinstrelsBalladThordansReign :
 public:
   TheMinstrelsBalladThordansReign() :
     Sapphire::ScriptAPI::InstanceContentScript( 20036 )
+  { }
+
+  void onInit( InstanceContent& instance ) override
   {
+    instance.registerEObj( "sgbg_a2fb_a1_sod1a", 2006312, 5922953, 4, { -7.224293f, 0.039305f, -2.496346f }, 1.000000f, 0.000000f ); 
+      // States -> sword_hide (id: 2) sword_show (id: 3) sword_show_anim (id: 4) 
+    instance.registerEObj( "sgbg_a2fb_a1_mete2", 2005944, 5895686, 4, { 12.728000f, 0.012478f, -12.728000f }, 1.000000f, 0.000000f ); 
+      // States -> come_off_01 (id: 2) come_off_02 (id: 3) come_on_01 (id: 4) come_off_03 (id: 5) come_on_02 (id: 6) come_on_03 (id: 7) come_on_04 (id: 8) come_on_05 (id: 9) come_on_06 (id: 10) come_fdout (id: 15) 
+    instance.registerEObj( "sgbg_a2fb_a1_mete2_1", 2005945, 5895687, 4, { 12.728000f, 0.012478f, 12.728000f }, 1.000000f, 0.000000f ); 
+      // States -> come_off_01 (id: 2) come_off_02 (id: 3) come_on_01 (id: 4) come_off_03 (id: 5) come_on_02 (id: 6) come_on_03 (id: 7) come_on_04 (id: 8) come_on_05 (id: 9) come_on_06 (id: 10) come_fdout (id: 15) 
+    instance.registerEObj( "sgbg_a2fb_a1_mete2_2", 2005946, 5895690, 4, { -12.728000f, 0.012478f, 12.728000f }, 1.000000f, 0.000000f ); 
+      // States -> come_off_01 (id: 2) come_off_02 (id: 3) come_on_01 (id: 4) come_off_03 (id: 5) come_on_02 (id: 6) come_on_03 (id: 7) come_on_04 (id: 8) come_on_05 (id: 9) come_on_06 (id: 10) come_fdout (id: 15) 
+    instance.registerEObj( "sgbg_a2fb_a1_mete2_3", 2005947, 5895691, 4, { -12.728000f, 0.012478f, -12.728000f }, 1.000000f, 0.000000f ); 
+      // States -> come_off_01 (id: 2) come_off_02 (id: 3) come_on_01 (id: 4) come_off_03 (id: 5) come_on_02 (id: 6) come_on_03 (id: 7) come_on_04 (id: 8) come_on_05 (id: 9) come_on_06 (id: 10) come_fdout (id: 15) 
+    instance.registerEObj( "sgbg_a2fb_a1_mete2_4", 2005915, 5894863, 4, { 9.000000f, 0.012478f, -16.600000f }, 1.000000f, 0.000000f ); 
+      // States -> come_off_01 (id: 2) come_off_02 (id: 3) come_on_01 (id: 4) come_off_03 (id: 5) come_on_02 (id: 6) come_on_03 (id: 7) come_on_04 (id: 8) come_on_05 (id: 9) come_on_06 (id: 10) come_fdout (id: 15) 
+    instance.registerEObj( "sgbg_a2fb_a1_mete2_5", 2005916, 5894864, 4, { 18.000000f, 0.012478f, 0.000000f }, 1.000000f, 0.000000f ); 
+      // States -> come_off_01 (id: 2) come_off_02 (id: 3) come_on_01 (id: 4) come_off_03 (id: 5) come_on_02 (id: 6) come_on_03 (id: 7) come_on_04 (id: 8) come_on_05 (id: 9) come_on_06 (id: 10) come_fdout (id: 15) 
+    instance.registerEObj( "sgbg_a2fb_a1_mete2_6", 2005917, 5894866, 4, { 9.000000f, 0.012478f, 16.600000f }, 1.000000f, 0.000000f ); 
+      // States -> come_off_01 (id: 2) come_off_02 (id: 3) come_on_01 (id: 4) come_off_03 (id: 5) come_on_02 (id: 6) come_on_03 (id: 7) come_on_04 (id: 8) come_on_05 (id: 9) come_on_06 (id: 10) come_fdout (id: 15) 
+    instance.registerEObj( "sgbg_a2fb_a1_mete2_7", 2005918, 5894867, 4, { -9.000000f, 0.012478f, 16.600000f }, 1.000000f, 0.000000f ); 
+      // States -> come_off_01 (id: 2) come_off_02 (id: 3) come_on_01 (id: 4) come_off_03 (id: 5) come_on_02 (id: 6) come_on_03 (id: 7) come_on_04 (id: 8) come_on_05 (id: 9) come_on_06 (id: 10) come_fdout (id: 15) 
+    instance.registerEObj( "sgbg_a2fb_a1_mete2_8", 2005919, 5894868, 4, { -18.000000f, 0.012478f, 0.000000f }, 1.000000f, 0.000000f ); 
+      // States -> come_off_01 (id: 2) come_off_02 (id: 3) come_on_01 (id: 4) come_off_03 (id: 5) come_on_02 (id: 6) come_on_03 (id: 7) come_on_04 (id: 8) come_on_05 (id: 9) come_on_06 (id: 10) come_fdout (id: 15) 
+    instance.registerEObj( "sgbg_a2fb_a1_mete2_9", 2005920, 5894869, 4, { -9.000000f, 0.012478f, -16.600000f }, 1.000000f, 0.000000f ); 
+      // States -> come_off_01 (id: 2) come_off_02 (id: 3) come_on_01 (id: 4) come_off_03 (id: 5) come_on_02 (id: 6) come_on_03 (id: 7) come_on_04 (id: 8) come_on_05 (id: 9) come_on_06 (id: 10) come_fdout (id: 15) 
+    instance.registerEObj( "sgbg_a2fb_a1_mete1", 2005914, 5894871, 4, { 0.000000f, 0.012478f, 0.000000f }, 1.000000f, 0.000000f ); 
+      // States -> mete_off_01 (id: 1) mete_off_02 (id: 2) mete_on_01 (id: 3) mete_off_03 (id: 4) mete_on_02 (id: 5) mete_on_03 (id: 6) mete_on_04 (id: 7) mete_on_05 (id: 8) mete_on_06 (id: 9) mete_fdout (id: 18) 
+    instance.registerEObj( "sgbg_a2fb_a1_whit1", 2005913, 5894872, 4, { 0.000000f, 0.012478f, 0.000000f }, 1.000000f, 0.000000f ); 
+      // States -> wo_default (id: 2) wo_end (id: 3) wo_anim (id: 4) 
+    instance.registerEObj( "sgbg_a2fb_a1_mete1_1", 2006575, 6061720, 4, { 0.000000f, 0.039305f, 0.000000f }, 1.000000f, 0.000000f ); 
+      // States -> mete_off_01 (id: 1) mete_off_02 (id: 2) mete_on_01 (id: 3) mete_off_03 (id: 4) mete_on_02 (id: 5) mete_on_03 (id: 6) mete_on_04 (id: 7) mete_on_05 (id: 8) mete_on_06 (id: 9) mete_fdout (id: 18) 
+    instance.registerEObj( "sgbg_a2fb_a1_mete2_10", 2006576, 6061721, 4, { 0.000000f, 0.039305f, -19.000000f }, 1.000000f, 0.000000f ); 
+      // States -> come_off_01 (id: 2) come_off_02 (id: 3) come_on_01 (id: 4) come_off_03 (id: 5) come_on_02 (id: 6) come_on_03 (id: 7) come_on_04 (id: 8) come_on_05 (id: 9) come_on_06 (id: 10) come_fdout (id: 15) 
+    instance.registerEObj( "sgbg_a2fb_a1_mete2_11", 2006577, 6061722, 4, { 19.000000f, 0.039305f, 0.000000f }, 1.000000f, 0.000000f ); 
+      // States -> come_off_01 (id: 2) come_off_02 (id: 3) come_on_01 (id: 4) come_off_03 (id: 5) come_on_02 (id: 6) come_on_03 (id: 7) come_on_04 (id: 8) come_on_05 (id: 9) come_on_06 (id: 10) come_fdout (id: 15) 
+    instance.registerEObj( "sgbg_a2fb_a1_mete2_12", 2006578, 6061723, 4, { 0.000000f, 0.039305f, 19.000000f }, 1.000000f, 0.000000f ); 
+      // States -> come_off_01 (id: 2) come_off_02 (id: 3) come_on_01 (id: 4) come_off_03 (id: 5) come_on_02 (id: 6) come_on_03 (id: 7) come_on_04 (id: 8) come_on_05 (id: 9) come_on_06 (id: 10) come_fdout (id: 15) 
+    instance.registerEObj( "sgbg_a2fb_a1_mete2_13", 2006579, 6061724, 4, { -19.000000f, 0.039305f, 0.000000f }, 1.000000f, 0.000000f ); 
+      // States -> come_off_01 (id: 2) come_off_02 (id: 3) come_on_01 (id: 4) come_off_03 (id: 5) come_on_02 (id: 6) come_on_03 (id: 7) come_on_04 (id: 8) come_on_05 (id: 9) come_on_06 (id: 10) come_fdout (id: 15) 
+    instance.registerEObj( "sgbg_a2fb_a1_mete2_14", 2006580, 6061725, 4, { 8.485300f, 0.039305f, -8.485300f }, 1.000000f, 0.000000f ); 
+      // States -> come_off_01 (id: 2) come_off_02 (id: 3) come_on_01 (id: 4) come_off_03 (id: 5) come_on_02 (id: 6) come_on_03 (id: 7) come_on_04 (id: 8) come_on_05 (id: 9) come_on_06 (id: 10) come_fdout (id: 15) 
+    instance.registerEObj( "sgbg_a2fb_a1_mete2_15", 2006581, 6061727, 4, { 8.485300f, 0.039304f, 9.619522f }, 1.000000f, 0.000000f ); 
+      // States -> come_off_01 (id: 2) come_off_02 (id: 3) come_on_01 (id: 4) come_off_03 (id: 5) come_on_02 (id: 6) come_on_03 (id: 7) come_on_04 (id: 8) come_on_05 (id: 9) come_on_06 (id: 10) come_fdout (id: 15) 
+    instance.registerEObj( "sgbg_a2fb_a1_mete2_16", 2006582, 6061728, 4, { -8.499329f, 0.015198f, 9.174744f }, 0.991760f, 0.000048f ); 
+      // States -> come_off_01 (id: 2) come_off_02 (id: 3) come_on_01 (id: 4) come_off_03 (id: 5) come_on_02 (id: 6) come_on_03 (id: 7) come_on_04 (id: 8) come_on_05 (id: 9) come_on_06 (id: 10) come_fdout (id: 15) 
+    instance.registerEObj( "sgbg_a2fb_a1_mete2_17", 2006583, 6061730, 4, { -8.485300f, 0.039305f, -8.485300f }, 1.000000f, 0.000000f ); 
+      // States -> come_off_01 (id: 2) come_off_02 (id: 3) come_on_01 (id: 4) come_off_03 (id: 5) come_on_02 (id: 6) come_on_03 (id: 7) come_on_04 (id: 8) come_on_05 (id: 9) come_on_06 (id: 10) come_fdout (id: 15) 
+    instance.registerEObj( "unknown_0", 2006567, 6046991, 4, { 0.000000f, 0.039305f, 0.000000f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_1", 2006568, 6059913, 4, { 0.000000f, 0.039305f, 0.000000f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_2", 2006569, 6059911, 4, { 0.000000f, 0.039305f, 0.000000f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_3", 2006570, 6047214, 4, { 0.000000f, 0.039305f, 0.000000f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_4", 2006571, 6059909, 4, { 0.000000f, 0.039305f, 0.000000f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_5", 2006572, 6047213, 4, { 0.000000f, 0.039305f, 0.000000f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_6", 2006573, 6059910, 4, { 0.000000f, 0.039305f, 0.000000f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_7", 2006574, 6059912, 4, { 0.000000f, 0.039305f, 0.000000f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_8", 2006587, 6056540, 4, { -0.607457f, 0.039305f, -0.008893f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "Entrance", 2000182, 5854853, 5, { 0.035266f, 0.012478f, 11.380060f }, 1.000000f, 0.000000f ); 
+      // States -> vf_lock_on (id: 11) vf_lock_of (id: 12) 
+    instance.registerEObj( "Exit", 2000139, 0, 4, { 0.000000f, 0.012478f, -18.000000f }, 1.000000f, 0.000000f ); 
+
   }
 
-  void onInit( InstanceContentPtr instance ) override
+  void onUpdate( InstanceContent& instance, uint32_t currTime ) override
   {
 
   }
 
-  void onUpdate( InstanceContentPtr instance, uint32_t currTime ) override
-  {
-
-  }
-
-  void onEnterTerritory( InstanceContentPtr instance, Entity::Player& player, uint32_t eventId, uint16_t param1,
+  void onEnterTerritory( InstanceContent& instance, Entity::Player& player, uint32_t eventId, uint16_t param1,
                          uint16_t param2 ) override
   {
 
diff --git a/src/scripts/instances/trials/TheMinstrelsBalladTsukuyomisPain.cpp b/src/scripts/instances/trials/TheMinstrelsBalladTsukuyomisPain.cpp
new file mode 100644
index 00000000..3c324845
--- /dev/null
+++ b/src/scripts/instances/trials/TheMinstrelsBalladTsukuyomisPain.cpp
@@ -0,0 +1,48 @@
+#include <ScriptObject.h>
+#include <Territory/InstanceContent.h>
+
+using namespace Sapphire;
+
+class TheMinstrelsBalladTsukuyomisPain :
+  public Sapphire::ScriptAPI::InstanceContentScript
+{
+public:
+  TheMinstrelsBalladTsukuyomisPain() :
+    Sapphire::ScriptAPI::InstanceContentScript( 20056 )
+  { }
+
+  void onInit( InstanceContent& instance ) override
+  {
+    instance.registerEObj( "Entrance", 2000182, 7345082, 5, { 100.000000f, 0.000000f, 115.000000f }, 1.000000f, 0.000000f ); 
+      // States -> vf_lock_on (id: 11) vf_lock_of (id: 12) 
+    instance.registerEObj( "Exit", 2000139, 0, 4, { 100.000000f, 0.000000f, 87.000000f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "sgvf_e3fd_b1404", 2007457, 7391200, 4, { 100.000000f, 0.000001f, 84.000000f }, 1.000000f, -0.000000f ); 
+    instance.registerEObj( "sgvf_e3fd_b1404_1", 2007457, 7391209, 4, { 116.000000f, 0.000001f, 100.000000f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "sgvf_e3fd_b1404_2", 2007457, 7391210, 4, { 84.000000f, 0.000001f, 100.000000f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "sgvf_e3fd_b1404_3", 2007457, 7391212, 4, { 111.313698f, 0.000000f, 88.686287f }, 1.000000f, -0.000000f ); 
+    instance.registerEObj( "sgvf_e3fd_b1404_4", 2007457, 7391214, 4, { 88.686302f, 0.000000f, 111.313698f }, 1.000000f, -0.000000f ); 
+    instance.registerEObj( "sgvf_e3fd_b1404_5", 2007457, 7391215, 4, { 88.686287f, 0.000000f, 88.686287f }, 1.000000f, -0.000000f ); 
+    instance.registerEObj( "sgvf_e3fd_b1404_6", 2007457, 7391217, 4, { 100.000000f, 0.000001f, 109.000000f }, 1.000000f, -0.000000f ); 
+    instance.registerEObj( "sgvf_e3fd_b1404_7", 2007457, 7398352, 4, { 100.000000f, 0.000001f, 84.000000f }, 1.000000f, -0.000000f ); 
+    instance.registerEObj( "sgvf_e3fd_b1404_8", 2007457, 7398353, 4, { 116.000000f, 0.000001f, 100.000000f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "sgvf_e3fd_b1404_9", 2007457, 7398354, 4, { 111.313698f, 0.000000f, 88.686287f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "sgvf_e3fd_b1404_10", 2007457, 7398355, 4, { 88.686302f, 0.000000f, 111.313698f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "sgvf_e3fd_b1404_11", 2007457, 7398356, 4, { 100.000000f, 0.000001f, 109.000000f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_0", 2007457, 7393493, 4, { 100.000000f, 0.000000f, 100.000000f }, 1.000000f, 0.000000f ); 
+
+  }
+
+  void onUpdate( InstanceContent& instance, uint32_t currTime ) override
+  {
+
+  }
+
+  void onEnterTerritory( InstanceContent& instance, Entity::Player& player, uint32_t eventId, uint16_t param1,
+                         uint16_t param2 ) override
+  {
+
+  }
+
+};
+
+EXPOSE_SCRIPT( TheMinstrelsBalladTsukuyomisPain );
\ No newline at end of file
diff --git a/src/scripts/instances/trials/TheMinstrelsBalladUltimasBane.cpp b/src/scripts/instances/trials/TheMinstrelsBalladUltimasBane.cpp
index 0e47bd65..cac350fc 100644
--- a/src/scripts/instances/trials/TheMinstrelsBalladUltimasBane.cpp
+++ b/src/scripts/instances/trials/TheMinstrelsBalladUltimasBane.cpp
@@ -9,36 +9,28 @@ class TheMinstrelsBalladUltimasBane :
 public:
   TheMinstrelsBalladUltimasBane() :
     Sapphire::ScriptAPI::InstanceContentScript( 20013 )
-  {
-  }
+  { }
 
-  void onInit( InstanceContentPtr instance ) override
+  void onInit( InstanceContent& instance ) override
   {
-    instance->registerEObj( "unknown_0", 2002745, 4391076, 4, { 7.000000f, 0.000000f, 0.000000f }, 1.000000f,
-                            0.000000f );
-    instance->registerEObj( "unknown_1", 2002746, 4391074, 4, { -7.000000f, 0.000000f, 0.000000f }, 1.000000f,
-                            0.000000f );
-    instance->registerEObj( "unknown_2", 2002747, 4976890, 4, { 0.000000f, -0.131581f, -18.566719f }, 1.000000f,
-                            0.000000f );
-    instance->registerEObj( "unknown_3", 2002748, 4391072, 4, { 17.676531f, -0.144861f, 0.000000f }, 1.000000f,
-                            0.000000f );
-    instance->registerEObj( "unknown_4", 2002749, 4976892, 4, { 0.000000f, 0.000000f, 17.000000f }, 1.000000f,
-                            0.000000f );
-    instance->registerEObj( "unknown_5", 2002750, 4976891, 4, { -17.000000f, 0.000000f, 0.000000f }, 1.000000f,
-                            0.000000f );
-    instance->registerEObj( "Entrance", 2000182, 4391941, 5, { -6.677185f, 0.068419f, 12.835030f }, 1.000000f,
-                            0.000000f );
-    // States -> vf_lock_on vf_lock_of
-    instance->registerEObj( "Exit", 2000139, 0, 4, { 0.000000f, 0.000000f, -16.316700f }, 1.000000f, 0.000000f );
+    instance.registerEObj( "unknown_0", 2002745, 4391076, 4, { 7.000000f, 0.000000f, 0.000000f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_1", 2002746, 4391074, 4, { -7.000000f, 0.000000f, 0.000000f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_2", 2002747, 4976890, 4, { 0.000000f, -0.131581f, -18.566719f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_3", 2002748, 4391072, 4, { 17.676531f, -0.144861f, 0.000000f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_4", 2002749, 4976892, 4, { 0.000000f, 0.000000f, 17.000000f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_5", 2002750, 4976891, 4, { -17.000000f, 0.000000f, 0.000000f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "Entrance", 2000182, 4391941, 5, { -6.677185f, 0.068419f, 12.835030f }, 1.000000f, 0.000000f ); 
+      // States -> vf_lock_on (id: 11) vf_lock_of (id: 12) 
+    instance.registerEObj( "Exit", 2000139, 0, 4, { 0.000000f, 0.000000f, -16.316700f }, 1.000000f, 0.000000f ); 
 
   }
 
-  void onUpdate( InstanceContentPtr instance, uint32_t currTime ) override
+  void onUpdate( InstanceContent& instance, uint32_t currTime ) override
   {
 
   }
 
-  void onEnterTerritory( InstanceContentPtr instance, Entity::Player& player, uint32_t eventId, uint16_t param1,
+  void onEnterTerritory( InstanceContent& instance, Entity::Player& player, uint32_t eventId, uint16_t param1,
                          uint16_t param2 ) override
   {
 
diff --git a/src/scripts/instances/trials/TheNavel.cpp b/src/scripts/instances/trials/TheNavel.cpp
index 72e16937..6f84ce97 100644
--- a/src/scripts/instances/trials/TheNavel.cpp
+++ b/src/scripts/instances/trials/TheNavel.cpp
@@ -9,24 +9,22 @@ class TheNavel :
 public:
   TheNavel() :
     Sapphire::ScriptAPI::InstanceContentScript( 20002 )
-  {
-  }
+  { }
 
-  void onInit( InstanceContentPtr instance ) override
+  void onInit( InstanceContent& instance ) override
   {
-    instance->registerEObj( "Entrance", 2000182, 4236868, 5, { 0.000000f, 0.000000f, 24.000000f }, 1.000000f,
-                            0.000000f );
-    // States -> vf_lock_on vf_lock_of
-    instance->registerEObj( "Exit", 2000139, 0, 4, { 0.000000f, 0.000000f, -10.000000f }, 1.000000f, 0.000000f );
+    instance.registerEObj( "Entrance", 2000182, 4236868, 5, { 0.000000f, 0.000000f, 24.000000f }, 1.000000f, 0.000000f ); 
+      // States -> vf_lock_on (id: 11) vf_lock_of (id: 12) 
+    instance.registerEObj( "Exit", 2000139, 0, 4, { 0.000000f, 0.000000f, -10.000000f }, 1.000000f, 0.000000f ); 
 
   }
 
-  void onUpdate( InstanceContentPtr instance, uint32_t currTime ) override
+  void onUpdate( InstanceContent& instance, uint32_t currTime ) override
   {
 
   }
 
-  void onEnterTerritory( InstanceContentPtr instance, Entity::Player& player, uint32_t eventId, uint16_t param1,
+  void onEnterTerritory( InstanceContent& instance, Entity::Player& player, uint32_t eventId, uint16_t param1,
                          uint16_t param2 ) override
   {
 
diff --git a/src/scripts/instances/trials/TheNavelExtreme.cpp b/src/scripts/instances/trials/TheNavelExtreme.cpp
index bdd7891b..6131516f 100644
--- a/src/scripts/instances/trials/TheNavelExtreme.cpp
+++ b/src/scripts/instances/trials/TheNavelExtreme.cpp
@@ -9,24 +9,22 @@ class TheNavelExtreme :
 public:
   TheNavelExtreme() :
     Sapphire::ScriptAPI::InstanceContentScript( 20009 )
-  {
-  }
+  { }
 
-  void onInit( InstanceContentPtr instance ) override
+  void onInit( InstanceContent& instance ) override
   {
-    instance->registerEObj( "Entrance", 2000182, 4236868, 5, { 0.000000f, 0.000000f, 24.000000f }, 1.000000f,
-                            0.000000f );
-    // States -> vf_lock_on vf_lock_of
-    instance->registerEObj( "Exit", 2000139, 0, 4, { 0.000000f, 0.000000f, -10.000000f }, 1.000000f, 0.000000f );
+    instance.registerEObj( "Entrance", 2000182, 4236868, 5, { 0.000000f, 0.000000f, 24.000000f }, 1.000000f, 0.000000f ); 
+      // States -> vf_lock_on (id: 11) vf_lock_of (id: 12) 
+    instance.registerEObj( "Exit", 2000139, 0, 4, { 0.000000f, 0.000000f, -10.000000f }, 1.000000f, 0.000000f ); 
 
   }
 
-  void onUpdate( InstanceContentPtr instance, uint32_t currTime ) override
+  void onUpdate( InstanceContent& instance, uint32_t currTime ) override
   {
 
   }
 
-  void onEnterTerritory( InstanceContentPtr instance, Entity::Player& player, uint32_t eventId, uint16_t param1,
+  void onEnterTerritory( InstanceContent& instance, Entity::Player& player, uint32_t eventId, uint16_t param1,
                          uint16_t param2 ) override
   {
 
diff --git a/src/scripts/instances/trials/TheNavelHard.cpp b/src/scripts/instances/trials/TheNavelHard.cpp
index afe1c7f6..f1f85e96 100644
--- a/src/scripts/instances/trials/TheNavelHard.cpp
+++ b/src/scripts/instances/trials/TheNavelHard.cpp
@@ -9,24 +9,22 @@ class TheNavelHard :
 public:
   TheNavelHard() :
     Sapphire::ScriptAPI::InstanceContentScript( 20005 )
-  {
-  }
+  { }
 
-  void onInit( InstanceContentPtr instance ) override
+  void onInit( InstanceContent& instance ) override
   {
-    instance->registerEObj( "Entrance", 2000182, 4236868, 5, { 0.000000f, 0.000000f, 24.000000f }, 1.000000f,
-                            0.000000f );
-    // States -> vf_lock_on vf_lock_of
-    instance->registerEObj( "Exit", 2000139, 0, 4, { 0.000000f, 0.000000f, -10.000000f }, 1.000000f, 0.000000f );
+    instance.registerEObj( "Entrance", 2000182, 4236868, 5, { 0.000000f, 0.000000f, 24.000000f }, 1.000000f, 0.000000f ); 
+      // States -> vf_lock_on (id: 11) vf_lock_of (id: 12) 
+    instance.registerEObj( "Exit", 2000139, 0, 4, { 0.000000f, 0.000000f, -10.000000f }, 1.000000f, 0.000000f ); 
 
   }
 
-  void onUpdate( InstanceContentPtr instance, uint32_t currTime ) override
+  void onUpdate( InstanceContent& instance, uint32_t currTime ) override
   {
 
   }
 
-  void onEnterTerritory( InstanceContentPtr instance, Entity::Player& player, uint32_t eventId, uint16_t param1,
+  void onEnterTerritory( InstanceContent& instance, Entity::Player& player, uint32_t eventId, uint16_t param1,
                          uint16_t param2 ) override
   {
 
diff --git a/src/scripts/instances/trials/ThePoolofTribute.cpp b/src/scripts/instances/trials/ThePoolofTribute.cpp
index b22c299b..7c91446e 100644
--- a/src/scripts/instances/trials/ThePoolofTribute.cpp
+++ b/src/scripts/instances/trials/ThePoolofTribute.cpp
@@ -9,20 +9,24 @@ class ThePoolofTribute :
 public:
   ThePoolofTribute() :
     Sapphire::ScriptAPI::InstanceContentScript( 20046 )
+  { }
+
+  void onInit( InstanceContent& instance ) override
   {
+    instance.registerEObj( "Bladesshadow", 2008185, 6849163, 4, { -0.015320f, 0.206439f, -5.020264f }, 0.991760f, 0.000048f ); 
+    instance.registerEObj( "unknown_0", 2008184, 6843593, 4, { -4.501404f, 0.200000f, 8.957031f }, 0.991760f, 0.000048f ); 
+    instance.registerEObj( "Entrance", 2000182, 6847132, 5, { -3.489120f, 0.200000f, 16.024530f }, 1.000000f, 0.000000f ); 
+      // States -> vf_lock_on (id: 11) vf_lock_of (id: 12) 
+    instance.registerEObj( "Exit", 2000139, 0, 4, { 0.357571f, 0.200000f, -11.800290f }, 1.000000f, 0.000000f ); 
+
   }
 
-  void onInit( InstanceContentPtr instance ) override
+  void onUpdate( InstanceContent& instance, uint32_t currTime ) override
   {
 
   }
 
-  void onUpdate( InstanceContentPtr instance, uint32_t currTime ) override
-  {
-
-  }
-
-  void onEnterTerritory( InstanceContentPtr instance, Entity::Player& player, uint32_t eventId, uint16_t param1,
+  void onEnterTerritory( InstanceContent& instance, Entity::Player& player, uint32_t eventId, uint16_t param1,
                          uint16_t param2 ) override
   {
 
diff --git a/src/scripts/instances/trials/ThePoolofTributeExtreme.cpp b/src/scripts/instances/trials/ThePoolofTributeExtreme.cpp
index 512abfab..13d9a190 100644
--- a/src/scripts/instances/trials/ThePoolofTributeExtreme.cpp
+++ b/src/scripts/instances/trials/ThePoolofTributeExtreme.cpp
@@ -9,20 +9,24 @@ class ThePoolofTributeExtreme :
 public:
   ThePoolofTributeExtreme() :
     Sapphire::ScriptAPI::InstanceContentScript( 20047 )
+  { }
+
+  void onInit( InstanceContent& instance ) override
   {
+    instance.registerEObj( "Bladesshadow", 2008185, 6849163, 4, { -0.015320f, 0.206439f, -5.020264f }, 0.991760f, 0.000048f ); 
+    instance.registerEObj( "unknown_0", 2008184, 6843593, 4, { -4.501404f, 0.200000f, 8.957031f }, 0.991760f, 0.000048f ); 
+    instance.registerEObj( "Entrance", 2000182, 6847132, 5, { -3.489120f, 0.200000f, 16.024530f }, 1.000000f, 0.000000f ); 
+      // States -> vf_lock_on (id: 11) vf_lock_of (id: 12) 
+    instance.registerEObj( "Exit", 2000139, 0, 4, { 0.357571f, 0.200000f, -11.800290f }, 1.000000f, 0.000000f ); 
+
   }
 
-  void onInit( InstanceContentPtr instance ) override
+  void onUpdate( InstanceContent& instance, uint32_t currTime ) override
   {
 
   }
 
-  void onUpdate( InstanceContentPtr instance, uint32_t currTime ) override
-  {
-
-  }
-
-  void onEnterTerritory( InstanceContentPtr instance, Entity::Player& player, uint32_t eventId, uint16_t param1,
+  void onEnterTerritory( InstanceContent& instance, Entity::Player& player, uint32_t eventId, uint16_t param1,
                          uint16_t param2 ) override
   {
 
diff --git a/src/scripts/instances/trials/TheRoyalMenagerie.cpp b/src/scripts/instances/trials/TheRoyalMenagerie.cpp
index d7ecb7a1..2f8f2284 100644
--- a/src/scripts/instances/trials/TheRoyalMenagerie.cpp
+++ b/src/scripts/instances/trials/TheRoyalMenagerie.cpp
@@ -9,20 +9,35 @@ class TheRoyalMenagerie :
 public:
   TheRoyalMenagerie() :
     Sapphire::ScriptAPI::InstanceContentScript( 20045 )
+  { }
+
+  void onInit( InstanceContent& instance ) override
   {
+    instance.registerEObj( "Entrance", 2000182, 6842660, 5, { -12.652360f, -380.000000f, 1.417362f }, 1.000000f, 0.000000f ); 
+      // States -> vf_lock_on (id: 11) vf_lock_of (id: 12) 
+    instance.registerEObj( "Exit", 2000139, 0, 4, { -0.015320f, 620.000000f, -6.698792f }, 0.991760f, 0.000048f ); 
+    instance.registerEObj( "Barrelsoffiresand", 2003127, 0, 4, { -0.108200f, -380.000000f, 0.890151f }, 0.991760f, 0.000048f ); 
+    instance.registerEObj( "unknown_0", 2007457, 6858507, 4, { -0.819489f, -380.000000f, 1.685981f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_1", 2007457, 6953496, 4, { -1.111895f, -380.000000f, 11.857690f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_2", 2007457, 6797912, 4, { -13.550160f, 620.000000f, -23.367689f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_3", 2007457, 6797914, 4, { -6.156202f, 620.000000f, -24.638531f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_4", 2007457, 6797913, 4, { 14.468520f, 620.000000f, -17.925461f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_5", 2007457, 6797908, 4, { -13.109160f, 620.000000f, -3.235081f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_6", 2007457, 6797907, 4, { 14.608040f, 620.000000f, 0.876270f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_7", 2007457, 6797909, 4, { -13.849610f, 620.000000f, 15.100500f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_8", 2007457, 6797911, 4, { 7.597056f, 620.000000f, 16.291180f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_9", 2007457, 6797910, 4, { 14.168900f, 620.000000f, 15.941650f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_10", 2007457, 6797906, 4, { 6.113630f, 620.000000f, 5.558393f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_11", 2007457, 6925491, 4, { 8.519539f, 620.000000f, 7.842079f }, 1.000000f, 0.000000f ); 
+
   }
 
-  void onInit( InstanceContentPtr instance ) override
+  void onUpdate( InstanceContent& instance, uint32_t currTime ) override
   {
 
   }
 
-  void onUpdate( InstanceContentPtr instance, uint32_t currTime ) override
-  {
-
-  }
-
-  void onEnterTerritory( InstanceContentPtr instance, Entity::Player& player, uint32_t eventId, uint16_t param1,
+  void onEnterTerritory( InstanceContent& instance, Entity::Player& player, uint32_t eventId, uint16_t param1,
                          uint16_t param2 ) override
   {
 
diff --git a/src/scripts/instances/trials/TheSingularityReactor.cpp b/src/scripts/instances/trials/TheSingularityReactor.cpp
index 52c2298d..241b09ac 100644
--- a/src/scripts/instances/trials/TheSingularityReactor.cpp
+++ b/src/scripts/instances/trials/TheSingularityReactor.cpp
@@ -9,20 +9,75 @@ class TheSingularityReactor :
 public:
   TheSingularityReactor() :
     Sapphire::ScriptAPI::InstanceContentScript( 20035 )
+  { }
+
+  void onInit( InstanceContent& instance ) override
   {
+    instance.registerEObj( "sgbg_a2fb_a1_sod1a", 2006312, 5922953, 4, { -7.224293f, 0.039305f, -2.496346f }, 1.000000f, 0.000000f ); 
+      // States -> sword_hide (id: 2) sword_show (id: 3) sword_show_anim (id: 4) 
+    instance.registerEObj( "sgbg_a2fb_a1_mete2", 2005944, 5895686, 4, { 12.728000f, 0.012478f, -12.728000f }, 1.000000f, 0.000000f ); 
+      // States -> come_off_01 (id: 2) come_off_02 (id: 3) come_on_01 (id: 4) come_off_03 (id: 5) come_on_02 (id: 6) come_on_03 (id: 7) come_on_04 (id: 8) come_on_05 (id: 9) come_on_06 (id: 10) come_fdout (id: 15) 
+    instance.registerEObj( "sgbg_a2fb_a1_mete2_1", 2005945, 5895687, 4, { 12.728000f, 0.012478f, 12.728000f }, 1.000000f, 0.000000f ); 
+      // States -> come_off_01 (id: 2) come_off_02 (id: 3) come_on_01 (id: 4) come_off_03 (id: 5) come_on_02 (id: 6) come_on_03 (id: 7) come_on_04 (id: 8) come_on_05 (id: 9) come_on_06 (id: 10) come_fdout (id: 15) 
+    instance.registerEObj( "sgbg_a2fb_a1_mete2_2", 2005946, 5895690, 4, { -12.728000f, 0.012478f, 12.728000f }, 1.000000f, 0.000000f ); 
+      // States -> come_off_01 (id: 2) come_off_02 (id: 3) come_on_01 (id: 4) come_off_03 (id: 5) come_on_02 (id: 6) come_on_03 (id: 7) come_on_04 (id: 8) come_on_05 (id: 9) come_on_06 (id: 10) come_fdout (id: 15) 
+    instance.registerEObj( "sgbg_a2fb_a1_mete2_3", 2005947, 5895691, 4, { -12.728000f, 0.012478f, -12.728000f }, 1.000000f, 0.000000f ); 
+      // States -> come_off_01 (id: 2) come_off_02 (id: 3) come_on_01 (id: 4) come_off_03 (id: 5) come_on_02 (id: 6) come_on_03 (id: 7) come_on_04 (id: 8) come_on_05 (id: 9) come_on_06 (id: 10) come_fdout (id: 15) 
+    instance.registerEObj( "sgbg_a2fb_a1_mete2_4", 2005915, 5894863, 4, { 9.000000f, 0.012478f, -16.600000f }, 1.000000f, 0.000000f ); 
+      // States -> come_off_01 (id: 2) come_off_02 (id: 3) come_on_01 (id: 4) come_off_03 (id: 5) come_on_02 (id: 6) come_on_03 (id: 7) come_on_04 (id: 8) come_on_05 (id: 9) come_on_06 (id: 10) come_fdout (id: 15) 
+    instance.registerEObj( "sgbg_a2fb_a1_mete2_5", 2005916, 5894864, 4, { 18.000000f, 0.012478f, 0.000000f }, 1.000000f, 0.000000f ); 
+      // States -> come_off_01 (id: 2) come_off_02 (id: 3) come_on_01 (id: 4) come_off_03 (id: 5) come_on_02 (id: 6) come_on_03 (id: 7) come_on_04 (id: 8) come_on_05 (id: 9) come_on_06 (id: 10) come_fdout (id: 15) 
+    instance.registerEObj( "sgbg_a2fb_a1_mete2_6", 2005917, 5894866, 4, { 9.000000f, 0.012478f, 16.600000f }, 1.000000f, 0.000000f ); 
+      // States -> come_off_01 (id: 2) come_off_02 (id: 3) come_on_01 (id: 4) come_off_03 (id: 5) come_on_02 (id: 6) come_on_03 (id: 7) come_on_04 (id: 8) come_on_05 (id: 9) come_on_06 (id: 10) come_fdout (id: 15) 
+    instance.registerEObj( "sgbg_a2fb_a1_mete2_7", 2005918, 5894867, 4, { -9.000000f, 0.012478f, 16.600000f }, 1.000000f, 0.000000f ); 
+      // States -> come_off_01 (id: 2) come_off_02 (id: 3) come_on_01 (id: 4) come_off_03 (id: 5) come_on_02 (id: 6) come_on_03 (id: 7) come_on_04 (id: 8) come_on_05 (id: 9) come_on_06 (id: 10) come_fdout (id: 15) 
+    instance.registerEObj( "sgbg_a2fb_a1_mete2_8", 2005919, 5894868, 4, { -18.000000f, 0.012478f, 0.000000f }, 1.000000f, 0.000000f ); 
+      // States -> come_off_01 (id: 2) come_off_02 (id: 3) come_on_01 (id: 4) come_off_03 (id: 5) come_on_02 (id: 6) come_on_03 (id: 7) come_on_04 (id: 8) come_on_05 (id: 9) come_on_06 (id: 10) come_fdout (id: 15) 
+    instance.registerEObj( "sgbg_a2fb_a1_mete2_9", 2005920, 5894869, 4, { -9.000000f, 0.012478f, -16.600000f }, 1.000000f, 0.000000f ); 
+      // States -> come_off_01 (id: 2) come_off_02 (id: 3) come_on_01 (id: 4) come_off_03 (id: 5) come_on_02 (id: 6) come_on_03 (id: 7) come_on_04 (id: 8) come_on_05 (id: 9) come_on_06 (id: 10) come_fdout (id: 15) 
+    instance.registerEObj( "sgbg_a2fb_a1_mete1", 2005914, 5894871, 4, { 0.000000f, 0.012478f, 0.000000f }, 1.000000f, 0.000000f ); 
+      // States -> mete_off_01 (id: 1) mete_off_02 (id: 2) mete_on_01 (id: 3) mete_off_03 (id: 4) mete_on_02 (id: 5) mete_on_03 (id: 6) mete_on_04 (id: 7) mete_on_05 (id: 8) mete_on_06 (id: 9) mete_fdout (id: 18) 
+    instance.registerEObj( "sgbg_a2fb_a1_whit1", 2005913, 5894872, 4, { 0.000000f, 0.012478f, 0.000000f }, 1.000000f, 0.000000f ); 
+      // States -> wo_default (id: 2) wo_end (id: 3) wo_anim (id: 4) 
+    instance.registerEObj( "sgbg_a2fb_a1_mete1_1", 2006575, 6061720, 4, { 0.000000f, 0.039305f, 0.000000f }, 1.000000f, 0.000000f ); 
+      // States -> mete_off_01 (id: 1) mete_off_02 (id: 2) mete_on_01 (id: 3) mete_off_03 (id: 4) mete_on_02 (id: 5) mete_on_03 (id: 6) mete_on_04 (id: 7) mete_on_05 (id: 8) mete_on_06 (id: 9) mete_fdout (id: 18) 
+    instance.registerEObj( "sgbg_a2fb_a1_mete2_10", 2006576, 6061721, 4, { 0.000000f, 0.039305f, -19.000000f }, 1.000000f, 0.000000f ); 
+      // States -> come_off_01 (id: 2) come_off_02 (id: 3) come_on_01 (id: 4) come_off_03 (id: 5) come_on_02 (id: 6) come_on_03 (id: 7) come_on_04 (id: 8) come_on_05 (id: 9) come_on_06 (id: 10) come_fdout (id: 15) 
+    instance.registerEObj( "sgbg_a2fb_a1_mete2_11", 2006577, 6061722, 4, { 19.000000f, 0.039305f, 0.000000f }, 1.000000f, 0.000000f ); 
+      // States -> come_off_01 (id: 2) come_off_02 (id: 3) come_on_01 (id: 4) come_off_03 (id: 5) come_on_02 (id: 6) come_on_03 (id: 7) come_on_04 (id: 8) come_on_05 (id: 9) come_on_06 (id: 10) come_fdout (id: 15) 
+    instance.registerEObj( "sgbg_a2fb_a1_mete2_12", 2006578, 6061723, 4, { 0.000000f, 0.039305f, 19.000000f }, 1.000000f, 0.000000f ); 
+      // States -> come_off_01 (id: 2) come_off_02 (id: 3) come_on_01 (id: 4) come_off_03 (id: 5) come_on_02 (id: 6) come_on_03 (id: 7) come_on_04 (id: 8) come_on_05 (id: 9) come_on_06 (id: 10) come_fdout (id: 15) 
+    instance.registerEObj( "sgbg_a2fb_a1_mete2_13", 2006579, 6061724, 4, { -19.000000f, 0.039305f, 0.000000f }, 1.000000f, 0.000000f ); 
+      // States -> come_off_01 (id: 2) come_off_02 (id: 3) come_on_01 (id: 4) come_off_03 (id: 5) come_on_02 (id: 6) come_on_03 (id: 7) come_on_04 (id: 8) come_on_05 (id: 9) come_on_06 (id: 10) come_fdout (id: 15) 
+    instance.registerEObj( "sgbg_a2fb_a1_mete2_14", 2006580, 6061725, 4, { 8.485300f, 0.039305f, -8.485300f }, 1.000000f, 0.000000f ); 
+      // States -> come_off_01 (id: 2) come_off_02 (id: 3) come_on_01 (id: 4) come_off_03 (id: 5) come_on_02 (id: 6) come_on_03 (id: 7) come_on_04 (id: 8) come_on_05 (id: 9) come_on_06 (id: 10) come_fdout (id: 15) 
+    instance.registerEObj( "sgbg_a2fb_a1_mete2_15", 2006581, 6061727, 4, { 8.485300f, 0.039304f, 9.619522f }, 1.000000f, 0.000000f ); 
+      // States -> come_off_01 (id: 2) come_off_02 (id: 3) come_on_01 (id: 4) come_off_03 (id: 5) come_on_02 (id: 6) come_on_03 (id: 7) come_on_04 (id: 8) come_on_05 (id: 9) come_on_06 (id: 10) come_fdout (id: 15) 
+    instance.registerEObj( "sgbg_a2fb_a1_mete2_16", 2006582, 6061728, 4, { -8.499329f, 0.015198f, 9.174744f }, 0.991760f, 0.000048f ); 
+      // States -> come_off_01 (id: 2) come_off_02 (id: 3) come_on_01 (id: 4) come_off_03 (id: 5) come_on_02 (id: 6) come_on_03 (id: 7) come_on_04 (id: 8) come_on_05 (id: 9) come_on_06 (id: 10) come_fdout (id: 15) 
+    instance.registerEObj( "sgbg_a2fb_a1_mete2_17", 2006583, 6061730, 4, { -8.485300f, 0.039305f, -8.485300f }, 1.000000f, 0.000000f ); 
+      // States -> come_off_01 (id: 2) come_off_02 (id: 3) come_on_01 (id: 4) come_off_03 (id: 5) come_on_02 (id: 6) come_on_03 (id: 7) come_on_04 (id: 8) come_on_05 (id: 9) come_on_06 (id: 10) come_fdout (id: 15) 
+    instance.registerEObj( "unknown_0", 2006567, 6046991, 4, { 0.000000f, 0.039305f, 0.000000f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_1", 2006568, 6059913, 4, { 0.000000f, 0.039305f, 0.000000f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_2", 2006569, 6059911, 4, { 0.000000f, 0.039305f, 0.000000f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_3", 2006570, 6047214, 4, { 0.000000f, 0.039305f, 0.000000f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_4", 2006571, 6059909, 4, { 0.000000f, 0.039305f, 0.000000f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_5", 2006572, 6047213, 4, { 0.000000f, 0.039305f, 0.000000f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_6", 2006573, 6059910, 4, { 0.000000f, 0.039305f, 0.000000f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_7", 2006574, 6059912, 4, { 0.000000f, 0.039305f, 0.000000f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_8", 2006587, 6056540, 4, { -0.607457f, 0.039305f, -0.008893f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "Entrance", 2000182, 5854853, 5, { 0.035266f, 0.012478f, 11.380060f }, 1.000000f, 0.000000f ); 
+      // States -> vf_lock_on (id: 11) vf_lock_of (id: 12) 
+    instance.registerEObj( "Exit", 2000139, 0, 4, { 0.000000f, 0.012478f, -18.000000f }, 1.000000f, 0.000000f ); 
+
   }
 
-  void onInit( InstanceContentPtr instance ) override
+  void onUpdate( InstanceContent& instance, uint32_t currTime ) override
   {
 
   }
 
-  void onUpdate( InstanceContentPtr instance, uint32_t currTime ) override
-  {
-
-  }
-
-  void onEnterTerritory( InstanceContentPtr instance, Entity::Player& player, uint32_t eventId, uint16_t param1,
+  void onEnterTerritory( InstanceContent& instance, Entity::Player& player, uint32_t eventId, uint16_t param1,
                          uint16_t param2 ) override
   {
 
diff --git a/src/scripts/instances/trials/TheStepsofFaith.cpp b/src/scripts/instances/trials/TheStepsofFaith.cpp
index 02569c02..679ec3de 100644
--- a/src/scripts/instances/trials/TheStepsofFaith.cpp
+++ b/src/scripts/instances/trials/TheStepsofFaith.cpp
@@ -9,58 +9,46 @@ class TheStepsofFaith :
 public:
   TheStepsofFaith() :
     Sapphire::ScriptAPI::InstanceContentScript( 20028 )
-  {
-  }
+  { }
 
-  void onInit( InstanceContentPtr instance ) override
+  void onInit( InstanceContent& instance ) override
   {
-    instance->registerEObj( "Dragonkiller", 2004760, 4999878, 4, { 43.311161f, 37.600201f, 35.701099f }, 1.000000f,
-                            0.000000f );
-    instance->registerEObj( "Dragonkiller_1", 2004761, 4999884, 4, { -43.632969f, 37.582890f, -115.844101f }, 0.991760f,
-                            0.000048f );
-    instance->registerEObj( "Dragonkiller_2", 2004762, 4999881, 4, { 43.015141f, 37.582890f, -284.251709f }, 0.991760f,
-                            0.000048f );
-    instance->registerEObj( "unknown_0", 2004767, 4886787, 4, { -3.110714f, 0.000000f, -348.303711f }, 1.000000f,
-                            0.000000f );
-    instance->registerEObj( "unknown_1", 2004757, 0, 4, { 2.667883f, 0.324675f, 123.758301f }, 1.000000f, 0.000000f );
-    instance->registerEObj( "unknown_2", 2004758, 0, 4, { 4.085252f, 0.000000f, -28.159849f }, 1.000000f, 0.000000f );
-    instance->registerEObj( "unknown_3", 2004759, 0, 4, { 1.381998f, 0.000000f, -194.763107f }, 1.000000f, 0.000000f );
-    instance->registerEObj( "sgvf_r1fd_b0536", 2004763, 5038552, 4, { 0.000000f, -0.000000f, 45.788021f }, 1.000000f,
-                            0.000000f );
-    // States -> bal_t_def bal_t_def_anim bal_t_pop bal_t_pop_anim
-    instance->registerEObj( "sgvf_r1fd_b0536_1", 2004764, 5038553, 4, { -0.015320f, -0.015320f, -114.274803f },
-                            0.991760f, 0.000048f );
-    // States -> bal_t_def bal_t_def_anim bal_t_pop bal_t_pop_anim
-    instance->registerEObj( "sgvf_r1fd_b0536_2", 2004765, 5038554, 4, { -0.015320f, -0.000000f, -276.691895f },
-                            0.991760f, 0.000048f );
-    // States -> bal_t_def bal_t_def_anim bal_t_pop bal_t_pop_anim
-    instance->registerEObj( "Snare", 2005115, 0, 4, { -18.000000f, 0.045776f, -155.000000f }, 0.991760f, 0.000048f );
-    instance->registerEObj( "Snare_1", 2005116, 0, 4, { 18.000000f, 0.045776f, -155.016403f }, 0.991760f, 0.000048f );
-    instance->registerEObj( "Snare_2", 2005117, 0, 4, { -18.000000f, 0.045776f, -315.022491f }, 0.991760f, 0.000048f );
-    instance->registerEObj( "Snare_3", 2005118, 0, 4, { 18.000000f, 0.045776f, -315.022491f }, 0.991760f, 0.000048f );
-    instance->registerEObj( "unknown_4", 2005215, 5698814, 4, { 46.280449f, 37.600201f, 45.540260f }, 1.000000f,
-                            0.000000f );
-    instance->registerEObj( "unknown_5", 2005216, 5698815, 4, { -42.818661f, 37.600201f, -120.297798f }, 1.000000f,
-                            0.000000f );
-    instance->registerEObj( "unknown_6", 2005217, 5698817, 4, { 43.612808f, 37.600201f, -279.243195f }, 1.000000f,
-                            0.000000f );
-    instance->registerEObj( "Entrance", 2000182, 5035236, 5, { 5.791933f, 0.049998f, 253.589600f }, 1.000000f,
-                            0.000000f );
-    // States -> vf_lock_on vf_lock_of
-    instance->registerEObj( "Exit", 2000139, 0, 4, { 0.000000f, -0.000000f, -350.057312f }, 0.991760f, 0.000048f );
-    instance->registerEObj( "Shortcut", 2000700, 0, 4, { -5.264404f, 0.045776f, 248.188004f }, 0.991760f, 0.000048f );
-    instance->registerEObj( "Exit_1", 2000139, 0, 4, { 0.000000f, -0.000104f, 125.000000f }, 0.991760f, 0.000048f );
-    instance->registerEObj( "Exit_2", 2000139, 0, 4, { 0.000000f, -0.079958f, -35.000000f }, 0.991760f, 0.000048f );
-    instance->registerEObj( "Exit_3", 2000139, 0, 4, { 0.000000f, 0.000000f, -195.000000f }, 0.991760f, 0.000048f );
+    instance.registerEObj( "Dragonkiller", 2004760, 4999878, 4, { 43.311161f, 37.600201f, 35.701099f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "Dragonkiller_1", 2004761, 4999884, 4, { -43.632969f, 37.582890f, -115.844101f }, 0.991760f, 0.000048f ); 
+    instance.registerEObj( "Dragonkiller_2", 2004762, 4999881, 4, { 43.015141f, 37.582890f, -284.251709f }, 0.991760f, 0.000048f ); 
+    instance.registerEObj( "unknown_0", 2004767, 4886787, 4, { -3.110714f, 0.000000f, -348.303711f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_1", 2004757, 0, 4, { 2.667883f, 0.324675f, 123.758301f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_2", 2004758, 0, 4, { 4.085252f, 0.000000f, -28.159849f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_3", 2004759, 0, 4, { 1.381998f, 0.000000f, -194.763107f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "sgvf_r1fd_b0536", 2004763, 5038552, 4, { 0.000000f, -0.000000f, 45.788021f }, 1.000000f, 0.000000f ); 
+      // States -> bal_t_def (id: 2) bal_t_def_anim (id: 3) bal_t_pop (id: 4) bal_t_pop_anim (id: 5) 
+    instance.registerEObj( "sgvf_r1fd_b0536_1", 2004764, 5038553, 4, { -0.015320f, -0.015320f, -114.274803f }, 0.991760f, 0.000048f ); 
+      // States -> bal_t_def (id: 2) bal_t_def_anim (id: 3) bal_t_pop (id: 4) bal_t_pop_anim (id: 5) 
+    instance.registerEObj( "sgvf_r1fd_b0536_2", 2004765, 5038554, 4, { -0.015320f, -0.000000f, -276.691895f }, 0.991760f, 0.000048f ); 
+      // States -> bal_t_def (id: 2) bal_t_def_anim (id: 3) bal_t_pop (id: 4) bal_t_pop_anim (id: 5) 
+    instance.registerEObj( "Snare", 2005115, 0, 4, { -18.000000f, 0.045776f, -155.000000f }, 0.991760f, 0.000048f ); 
+    instance.registerEObj( "Snare_1", 2005116, 0, 4, { 18.000000f, 0.045776f, -155.016403f }, 0.991760f, 0.000048f ); 
+    instance.registerEObj( "Snare_2", 2005117, 0, 4, { -18.000000f, 0.045776f, -315.022491f }, 0.991760f, 0.000048f ); 
+    instance.registerEObj( "Snare_3", 2005118, 0, 4, { 18.000000f, 0.045776f, -315.022491f }, 0.991760f, 0.000048f ); 
+    instance.registerEObj( "unknown_4", 2005215, 5698814, 4, { 46.280449f, 37.600201f, 45.540260f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_5", 2005216, 5698815, 4, { -42.818661f, 37.600201f, -120.297798f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_6", 2005217, 5698817, 4, { 43.612808f, 37.600201f, -279.243195f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "Entrance", 2000182, 5035236, 5, { 5.791933f, 0.049998f, 253.589600f }, 1.000000f, 0.000000f ); 
+      // States -> vf_lock_on (id: 11) vf_lock_of (id: 12) 
+    instance.registerEObj( "Exit", 2000139, 0, 4, { 0.000000f, -0.000000f, -350.057312f }, 0.991760f, 0.000048f ); 
+    instance.registerEObj( "Shortcut", 2000700, 0, 4, { -5.264404f, 0.045776f, 248.188004f }, 0.991760f, 0.000048f ); 
+    instance.registerEObj( "Exit_1", 2000139, 0, 4, { 0.000000f, -0.000104f, 125.000000f }, 0.991760f, 0.000048f ); 
+    instance.registerEObj( "Exit_2", 2000139, 0, 4, { 0.000000f, -0.079958f, -35.000000f }, 0.991760f, 0.000048f ); 
+    instance.registerEObj( "Exit_3", 2000139, 0, 4, { 0.000000f, 0.000000f, -195.000000f }, 0.991760f, 0.000048f ); 
 
   }
 
-  void onUpdate( InstanceContentPtr instance, uint32_t currTime ) override
+  void onUpdate( InstanceContent& instance, uint32_t currTime ) override
   {
 
   }
 
-  void onEnterTerritory( InstanceContentPtr instance, Entity::Player& player, uint32_t eventId, uint16_t param1,
+  void onEnterTerritory( InstanceContent& instance, Entity::Player& player, uint32_t eventId, uint16_t param1,
                          uint16_t param2 ) override
   {
 
diff --git a/src/scripts/instances/trials/TheStrikingTreeExtreme.cpp b/src/scripts/instances/trials/TheStrikingTreeExtreme.cpp
index acded80b..ed767aae 100644
--- a/src/scripts/instances/trials/TheStrikingTreeExtreme.cpp
+++ b/src/scripts/instances/trials/TheStrikingTreeExtreme.cpp
@@ -9,24 +9,22 @@ class TheStrikingTreeExtreme :
 public:
   TheStrikingTreeExtreme() :
     Sapphire::ScriptAPI::InstanceContentScript( 20023 )
-  {
-  }
+  { }
 
-  void onInit( InstanceContentPtr instance ) override
+  void onInit( InstanceContent& instance ) override
   {
-    instance->registerEObj( "Entrance", 2000182, 4712008, 5, { 5.026201f, 74.994751f, 16.039301f }, 1.000000f,
-                            0.000000f );
-    // States -> vf_lock_on vf_lock_of
-    instance->registerEObj( "Exit", 2000139, 0, 4, { 0.000000f, 75.000000f, -7.671923f }, 1.000000f, 0.000000f );
+    instance.registerEObj( "Entrance", 2000182, 4712008, 5, { 5.026201f, 74.994751f, 16.039301f }, 1.000000f, 0.000000f ); 
+      // States -> vf_lock_on (id: 11) vf_lock_of (id: 12) 
+    instance.registerEObj( "Exit", 2000139, 0, 4, { 0.000000f, 75.000000f, -7.671923f }, 1.000000f, 0.000000f ); 
 
   }
 
-  void onUpdate( InstanceContentPtr instance, uint32_t currTime ) override
+  void onUpdate( InstanceContent& instance, uint32_t currTime ) override
   {
 
   }
 
-  void onEnterTerritory( InstanceContentPtr instance, Entity::Player& player, uint32_t eventId, uint16_t param1,
+  void onEnterTerritory( InstanceContent& instance, Entity::Player& player, uint32_t eventId, uint16_t param1,
                          uint16_t param2 ) override
   {
 
diff --git a/src/scripts/instances/trials/TheStrikingTreeHard.cpp b/src/scripts/instances/trials/TheStrikingTreeHard.cpp
index 76f7bb1d..e2e51b99 100644
--- a/src/scripts/instances/trials/TheStrikingTreeHard.cpp
+++ b/src/scripts/instances/trials/TheStrikingTreeHard.cpp
@@ -9,24 +9,22 @@ class TheStrikingTreeHard :
 public:
   TheStrikingTreeHard() :
     Sapphire::ScriptAPI::InstanceContentScript( 20022 )
-  {
-  }
+  { }
 
-  void onInit( InstanceContentPtr instance ) override
+  void onInit( InstanceContent& instance ) override
   {
-    instance->registerEObj( "Entrance", 2000182, 4712008, 5, { 5.026201f, 74.994751f, 16.039301f }, 1.000000f,
-                            0.000000f );
-    // States -> vf_lock_on vf_lock_of
-    instance->registerEObj( "Exit", 2000139, 0, 4, { 0.000000f, 75.000000f, -7.671923f }, 1.000000f, 0.000000f );
+    instance.registerEObj( "Entrance", 2000182, 4712008, 5, { 5.026201f, 74.994751f, 16.039301f }, 1.000000f, 0.000000f ); 
+      // States -> vf_lock_on (id: 11) vf_lock_of (id: 12) 
+    instance.registerEObj( "Exit", 2000139, 0, 4, { 0.000000f, 75.000000f, -7.671923f }, 1.000000f, 0.000000f ); 
 
   }
 
-  void onUpdate( InstanceContentPtr instance, uint32_t currTime ) override
+  void onUpdate( InstanceContent& instance, uint32_t currTime ) override
   {
 
   }
 
-  void onEnterTerritory( InstanceContentPtr instance, Entity::Player& player, uint32_t eventId, uint16_t param1,
+  void onEnterTerritory( InstanceContent& instance, Entity::Player& player, uint32_t eventId, uint16_t param1,
                          uint16_t param2 ) override
   {
 
diff --git a/src/scripts/instances/trials/TheWhorleaterExtreme.cpp b/src/scripts/instances/trials/TheWhorleaterExtreme.cpp
index 2ab1371f..10206129 100644
--- a/src/scripts/instances/trials/TheWhorleaterExtreme.cpp
+++ b/src/scripts/instances/trials/TheWhorleaterExtreme.cpp
@@ -9,34 +9,27 @@ class TheWhorleaterExtreme :
 public:
   TheWhorleaterExtreme() :
     Sapphire::ScriptAPI::InstanceContentScript( 20018 )
-  {
-  }
+  { }
 
-  void onInit( InstanceContentPtr instance ) override
+  void onInit( InstanceContent& instance ) override
   {
-    instance->registerEObj( "unknown_0", 2003496, 4600311, 4, { 4.240293f, 0.025694f, 2.306607f }, 1.000000f,
-                            0.000000f );
-    instance->registerEObj( "unknown_1", 2003497, 4600310, 4, { 0.072974f, 0.025694f, 3.729535f }, 1.000000f,
-                            0.000000f );
-    instance->registerEObj( "Elementalconverter", 2003498, 4600308, 4, { -0.068011f, 0.025694f, 18.829760f }, 1.000000f,
-                            0.000000f );
-    instance->registerEObj( "unknown_2", 2003499, 4600477, 4, { -0.427824f, 0.025694f, -1.602400f }, 1.000000f,
-                            0.000000f );
-    instance->registerEObj( "unknown_3", 2003503, 4536477, 4, { -4.721506f, 0.025694f, -0.558033f }, 1.000000f,
-                            0.000000f );
-    instance->registerEObj( "Entrance", 2000182, 4600244, 5, { 2.559847f, 0.025694f, 16.605810f }, 1.000000f,
-                            0.000000f );
-    // States -> vf_lock_on vf_lock_of
-    instance->registerEObj( "Exit", 2000139, 0, 4, { 0.000000f, 0.025694f, -15.000000f }, 1.000000f, 0.000000f );
+    instance.registerEObj( "unknown_0", 2003496, 4600311, 4, { 4.240293f, 0.025694f, 2.306607f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_1", 2003497, 4600310, 4, { 0.072974f, 0.025694f, 3.729535f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "Elementalconverter", 2003498, 4600308, 4, { -0.068011f, 0.025694f, 18.829760f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_2", 2003499, 4600477, 4, { -0.427824f, 0.025694f, -1.602400f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_3", 2003503, 4536477, 4, { -4.721506f, 0.025694f, -0.558033f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "Entrance", 2000182, 4600244, 5, { 2.559847f, 0.025694f, 16.605810f }, 1.000000f, 0.000000f ); 
+      // States -> vf_lock_on (id: 11) vf_lock_of (id: 12) 
+    instance.registerEObj( "Exit", 2000139, 0, 4, { 0.000000f, 0.025694f, -15.000000f }, 1.000000f, 0.000000f ); 
 
   }
 
-  void onUpdate( InstanceContentPtr instance, uint32_t currTime ) override
+  void onUpdate( InstanceContent& instance, uint32_t currTime ) override
   {
 
   }
 
-  void onEnterTerritory( InstanceContentPtr instance, Entity::Player& player, uint32_t eventId, uint16_t param1,
+  void onEnterTerritory( InstanceContent& instance, Entity::Player& player, uint32_t eventId, uint16_t param1,
                          uint16_t param2 ) override
   {
 
diff --git a/src/scripts/instances/trials/TheWhorleaterHard.cpp b/src/scripts/instances/trials/TheWhorleaterHard.cpp
index 764a5c47..e7047023 100644
--- a/src/scripts/instances/trials/TheWhorleaterHard.cpp
+++ b/src/scripts/instances/trials/TheWhorleaterHard.cpp
@@ -9,34 +9,27 @@ class TheWhorleaterHard :
 public:
   TheWhorleaterHard() :
     Sapphire::ScriptAPI::InstanceContentScript( 20017 )
-  {
-  }
+  { }
 
-  void onInit( InstanceContentPtr instance ) override
+  void onInit( InstanceContent& instance ) override
   {
-    instance->registerEObj( "unknown_0", 2003496, 4600311, 4, { 4.240293f, 0.025694f, 2.306607f }, 1.000000f,
-                            0.000000f );
-    instance->registerEObj( "unknown_1", 2003497, 4600310, 4, { 0.072974f, 0.025694f, 3.729535f }, 1.000000f,
-                            0.000000f );
-    instance->registerEObj( "Elementalconverter", 2003498, 4600308, 4, { -0.068011f, 0.025694f, 18.829760f }, 1.000000f,
-                            0.000000f );
-    instance->registerEObj( "unknown_2", 2003499, 4600477, 4, { -0.427824f, 0.025694f, -1.602400f }, 1.000000f,
-                            0.000000f );
-    instance->registerEObj( "unknown_3", 2003503, 4536477, 4, { -4.721506f, 0.025694f, -0.558033f }, 1.000000f,
-                            0.000000f );
-    instance->registerEObj( "Entrance", 2000182, 4600244, 5, { 2.559847f, 0.025694f, 16.605810f }, 1.000000f,
-                            0.000000f );
-    // States -> vf_lock_on vf_lock_of
-    instance->registerEObj( "Exit", 2000139, 0, 4, { 0.000000f, 0.025694f, -15.000000f }, 1.000000f, 0.000000f );
+    instance.registerEObj( "unknown_0", 2003496, 4600311, 4, { 4.240293f, 0.025694f, 2.306607f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_1", 2003497, 4600310, 4, { 0.072974f, 0.025694f, 3.729535f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "Elementalconverter", 2003498, 4600308, 4, { -0.068011f, 0.025694f, 18.829760f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_2", 2003499, 4600477, 4, { -0.427824f, 0.025694f, -1.602400f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_3", 2003503, 4536477, 4, { -4.721506f, 0.025694f, -0.558033f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "Entrance", 2000182, 4600244, 5, { 2.559847f, 0.025694f, 16.605810f }, 1.000000f, 0.000000f ); 
+      // States -> vf_lock_on (id: 11) vf_lock_of (id: 12) 
+    instance.registerEObj( "Exit", 2000139, 0, 4, { 0.000000f, 0.025694f, -15.000000f }, 1.000000f, 0.000000f ); 
 
   }
 
-  void onUpdate( InstanceContentPtr instance, uint32_t currTime ) override
+  void onUpdate( InstanceContent& instance, uint32_t currTime ) override
   {
 
   }
 
-  void onEnterTerritory( InstanceContentPtr instance, Entity::Player& player, uint32_t eventId, uint16_t param1,
+  void onEnterTerritory( InstanceContent& instance, Entity::Player& player, uint32_t eventId, uint16_t param1,
                          uint16_t param2 ) override
   {
 
diff --git a/src/scripts/instances/trials/TheWreathofSnakes.cpp b/src/scripts/instances/trials/TheWreathofSnakes.cpp
new file mode 100644
index 00000000..da515466
--- /dev/null
+++ b/src/scripts/instances/trials/TheWreathofSnakes.cpp
@@ -0,0 +1,36 @@
+#include <ScriptObject.h>
+#include <Territory/InstanceContent.h>
+
+using namespace Sapphire;
+
+class TheWreathofSnakes :
+  public Sapphire::ScriptAPI::InstanceContentScript
+{
+public:
+  TheWreathofSnakes() :
+    Sapphire::ScriptAPI::InstanceContentScript( 20060 )
+  { }
+
+  void onInit( InstanceContent& instance ) override
+  {
+    instance.registerEObj( "unknown_0", 2009660, 0, 4, { 112.312302f, 0.000000f, 94.229156f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "Entrance", 2007457, 7719011, 5, { 100.000000f, 0.000000f, 116.000000f }, 1.000000f, 0.000000f ); 
+      // States -> vf_lock_on (id: 11) vf_lock_of (id: 12) 
+    instance.registerEObj( "Exit", 2000139, 0, 4, { 100.000000f, -0.000007f, 85.000000f }, 1.000000f, 0.000000f ); 
+
+  }
+
+  void onUpdate( InstanceContent& instance, uint32_t currTime ) override
+  {
+
+  }
+
+  void onEnterTerritory( InstanceContent& instance, Entity::Player& player, uint32_t eventId, uint16_t param1,
+                         uint16_t param2 ) override
+  {
+
+  }
+
+};
+
+EXPOSE_SCRIPT( TheWreathofSnakes );
\ No newline at end of file
diff --git a/src/scripts/instances/trials/TheWreathofSnakesExtreme.cpp b/src/scripts/instances/trials/TheWreathofSnakesExtreme.cpp
new file mode 100644
index 00000000..da257bf2
--- /dev/null
+++ b/src/scripts/instances/trials/TheWreathofSnakesExtreme.cpp
@@ -0,0 +1,36 @@
+#include <ScriptObject.h>
+#include <Territory/InstanceContent.h>
+
+using namespace Sapphire;
+
+class TheWreathofSnakesExtreme :
+  public Sapphire::ScriptAPI::InstanceContentScript
+{
+public:
+  TheWreathofSnakesExtreme() :
+    Sapphire::ScriptAPI::InstanceContentScript( 20061 )
+  { }
+
+  void onInit( InstanceContent& instance ) override
+  {
+    instance.registerEObj( "unknown_0", 2009660, 0, 4, { 112.312302f, 0.000000f, 94.229156f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "Entrance", 2007457, 7719011, 5, { 100.000000f, 0.000000f, 116.000000f }, 1.000000f, 0.000000f ); 
+      // States -> vf_lock_on (id: 11) vf_lock_of (id: 12) 
+    instance.registerEObj( "Exit", 2000139, 0, 4, { 100.000000f, -0.000007f, 85.000000f }, 1.000000f, 0.000000f ); 
+
+  }
+
+  void onUpdate( InstanceContent& instance, uint32_t currTime ) override
+  {
+
+  }
+
+  void onEnterTerritory( InstanceContent& instance, Entity::Player& player, uint32_t eventId, uint16_t param1,
+                         uint16_t param2 ) override
+  {
+
+  }
+
+};
+
+EXPOSE_SCRIPT( TheWreathofSnakesExtreme );
\ No newline at end of file
diff --git a/src/scripts/instances/trials/ThokastThokExtreme.cpp b/src/scripts/instances/trials/ThokastThokExtreme.cpp
index bb08d4fc..7582785b 100644
--- a/src/scripts/instances/trials/ThokastThokExtreme.cpp
+++ b/src/scripts/instances/trials/ThokastThokExtreme.cpp
@@ -9,20 +9,42 @@ class ThokastThokExtreme :
 public:
   ThokastThokExtreme() :
     Sapphire::ScriptAPI::InstanceContentScript( 20032 )
+  { }
+
+  void onInit( InstanceContent& instance ) override
   {
+    instance.registerEObj( "unknown_0", 2005385, 5674976, 4, { -1.192890f, 0.000000f, 17.474220f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_1", 2005386, 5675419, 4, { -13.222250f, 0.000000f, 12.212180f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_2", 2005387, 5675420, 4, { -18.468269f, 0.000000f, 0.628434f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_3", 2005388, 5675421, 4, { -13.285940f, 0.000000f, -12.470450f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_4", 2005389, 5675422, 4, { 0.342176f, 0.000000f, -18.571230f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_5", 2005390, 5675423, 4, { 12.720200f, 0.000000f, -12.658900f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_6", 2005391, 5675424, 4, { 17.782970f, 0.000000f, -0.534297f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_7", 2005392, 5687664, 4, { 13.452240f, 0.000000f, 12.733450f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_8", 2005393, 5797622, 4, { -8.704693f, 0.000000f, 1.700043f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_9", 2005394, 5797549, 4, { -1.334651f, 0.000000f, -2.316425f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_10", 2005385, 5674976, 4, { 3.622319f, -0.000001f, 15.464100f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_11", 2005386, 5675419, 4, { -11.612120f, -0.015320f, 13.595760f }, 0.991760f, 0.000048f ); 
+    instance.registerEObj( "unknown_12", 2005387, 5675420, 4, { -17.196960f, -0.015320f, 2.304016f }, 0.991760f, 0.000048f ); 
+    instance.registerEObj( "unknown_13", 2005388, 5675421, 4, { -13.697780f, 0.000000f, -10.715490f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_14", 2005389, 5675422, 4, { -2.138674f, 0.000000f, -16.784149f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_15", 2005390, 5675423, 4, { 12.378810f, 0.000000f, -10.929330f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_16", 2005391, 5675424, 4, { 17.679670f, 0.000000f, 1.168503f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_17", 2005392, 5687664, 4, { 12.017570f, 0.000000f, 13.670370f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_18", 2005393, 5797622, 4, { -10.360960f, -0.015320f, 2.975464f }, 0.991760f, 0.000048f ); 
+    instance.registerEObj( "unknown_19", 2005394, 5797549, 4, { -9.475891f, -0.015320f, 4.837097f }, 0.991760f, 0.000048f ); 
+    instance.registerEObj( "Entrance", 2000182, 5774826, 5, { -4.440430f, -0.015320f, 14.846980f }, 0.991760f, 0.000048f ); 
+      // States -> vf_lock_on (id: 11) vf_lock_of (id: 12) 
+    instance.registerEObj( "Exit", 2000139, 0, 4, { -0.068703f, -0.000001f, -13.884950f }, 1.000000f, 0.000000f ); 
+
   }
 
-  void onInit( InstanceContentPtr instance ) override
+  void onUpdate( InstanceContent& instance, uint32_t currTime ) override
   {
 
   }
 
-  void onUpdate( InstanceContentPtr instance, uint32_t currTime ) override
-  {
-
-  }
-
-  void onEnterTerritory( InstanceContentPtr instance, Entity::Player& player, uint32_t eventId, uint16_t param1,
+  void onEnterTerritory( InstanceContent& instance, Entity::Player& player, uint32_t eventId, uint16_t param1,
                          uint16_t param2 ) override
   {
 
diff --git a/src/scripts/instances/trials/ThokastThokHard.cpp b/src/scripts/instances/trials/ThokastThokHard.cpp
index 62f9d22a..3e6b25ac 100644
--- a/src/scripts/instances/trials/ThokastThokHard.cpp
+++ b/src/scripts/instances/trials/ThokastThokHard.cpp
@@ -9,20 +9,42 @@ class ThokastThokHard :
 public:
   ThokastThokHard() :
     Sapphire::ScriptAPI::InstanceContentScript( 20031 )
+  { }
+
+  void onInit( InstanceContent& instance ) override
   {
+    instance.registerEObj( "unknown_0", 2005385, 5674976, 4, { -1.192890f, 0.000000f, 17.474220f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_1", 2005386, 5675419, 4, { -13.222250f, 0.000000f, 12.212180f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_2", 2005387, 5675420, 4, { -18.468269f, 0.000000f, 0.628434f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_3", 2005388, 5675421, 4, { -13.285940f, 0.000000f, -12.470450f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_4", 2005389, 5675422, 4, { 0.342176f, 0.000000f, -18.571230f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_5", 2005390, 5675423, 4, { 12.720200f, 0.000000f, -12.658900f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_6", 2005391, 5675424, 4, { 17.782970f, 0.000000f, -0.534297f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_7", 2005392, 5687664, 4, { 13.452240f, 0.000000f, 12.733450f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_8", 2005393, 5797622, 4, { -8.704693f, 0.000000f, 1.700043f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_9", 2005394, 5797549, 4, { -1.334651f, 0.000000f, -2.316425f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_10", 2005385, 5674976, 4, { 3.622319f, -0.000001f, 15.464100f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_11", 2005386, 5675419, 4, { -11.612120f, -0.015320f, 13.595760f }, 0.991760f, 0.000048f ); 
+    instance.registerEObj( "unknown_12", 2005387, 5675420, 4, { -17.196960f, -0.015320f, 2.304016f }, 0.991760f, 0.000048f ); 
+    instance.registerEObj( "unknown_13", 2005388, 5675421, 4, { -13.697780f, 0.000000f, -10.715490f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_14", 2005389, 5675422, 4, { -2.138674f, 0.000000f, -16.784149f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_15", 2005390, 5675423, 4, { 12.378810f, 0.000000f, -10.929330f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_16", 2005391, 5675424, 4, { 17.679670f, 0.000000f, 1.168503f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_17", 2005392, 5687664, 4, { 12.017570f, 0.000000f, 13.670370f }, 1.000000f, 0.000000f ); 
+    instance.registerEObj( "unknown_18", 2005393, 5797622, 4, { -10.360960f, -0.015320f, 2.975464f }, 0.991760f, 0.000048f ); 
+    instance.registerEObj( "unknown_19", 2005394, 5797549, 4, { -9.475891f, -0.015320f, 4.837097f }, 0.991760f, 0.000048f ); 
+    instance.registerEObj( "Entrance", 2000182, 5774826, 5, { -4.440430f, -0.015320f, 14.846980f }, 0.991760f, 0.000048f ); 
+      // States -> vf_lock_on (id: 11) vf_lock_of (id: 12) 
+    instance.registerEObj( "Exit", 2000139, 0, 4, { -0.068703f, -0.000001f, -13.884950f }, 1.000000f, 0.000000f ); 
+
   }
 
-  void onInit( InstanceContentPtr instance ) override
+  void onUpdate( InstanceContent& instance, uint32_t currTime ) override
   {
 
   }
 
-  void onUpdate( InstanceContentPtr instance, uint32_t currTime ) override
-  {
-
-  }
-
-  void onEnterTerritory( InstanceContentPtr instance, Entity::Player& player, uint32_t eventId, uint16_t param1,
+  void onEnterTerritory( InstanceContent& instance, Entity::Player& player, uint32_t eventId, uint16_t param1,
                          uint16_t param2 ) override
   {
 
diff --git a/src/scripts/instances/trials/ThornmarchExtreme.cpp b/src/scripts/instances/trials/ThornmarchExtreme.cpp
index 3232728a..3f647d9c 100644
--- a/src/scripts/instances/trials/ThornmarchExtreme.cpp
+++ b/src/scripts/instances/trials/ThornmarchExtreme.cpp
@@ -9,24 +9,22 @@ class ThornmarchExtreme :
 public:
   ThornmarchExtreme() :
     Sapphire::ScriptAPI::InstanceContentScript( 20012 )
-  {
-  }
+  { }
 
-  void onInit( InstanceContentPtr instance ) override
+  void onInit( InstanceContent& instance ) override
   {
-    instance->registerEObj( "Entrance", 2000182, 4377976, 5, { -5.269677f, 0.467326f, 14.257640f }, 1.000000f,
-                            0.000000f );
-    // States -> vf_lock_on vf_lock_of
-    instance->registerEObj( "Exit", 2000139, 0, 4, { 0.014298f, -0.000000f, -17.786249f }, 1.000000f, 0.000000f );
+    instance.registerEObj( "Entrance", 2000182, 4377976, 5, { -5.269677f, 0.467326f, 14.257640f }, 1.000000f, 0.000000f ); 
+      // States -> vf_lock_on (id: 11) vf_lock_of (id: 12) 
+    instance.registerEObj( "Exit", 2000139, 0, 4, { 0.014298f, -0.000000f, -17.786249f }, 1.000000f, 0.000000f ); 
 
   }
 
-  void onUpdate( InstanceContentPtr instance, uint32_t currTime ) override
+  void onUpdate( InstanceContent& instance, uint32_t currTime ) override
   {
 
   }
 
-  void onEnterTerritory( InstanceContentPtr instance, Entity::Player& player, uint32_t eventId, uint16_t param1,
+  void onEnterTerritory( InstanceContent& instance, Entity::Player& player, uint32_t eventId, uint16_t param1,
                          uint16_t param2 ) override
   {
 
diff --git a/src/scripts/instances/trials/ThornmarchHard.cpp b/src/scripts/instances/trials/ThornmarchHard.cpp
index b26501d6..5c651174 100644
--- a/src/scripts/instances/trials/ThornmarchHard.cpp
+++ b/src/scripts/instances/trials/ThornmarchHard.cpp
@@ -9,24 +9,22 @@ class ThornmarchHard :
 public:
   ThornmarchHard() :
     Sapphire::ScriptAPI::InstanceContentScript( 20011 )
-  {
-  }
+  { }
 
-  void onInit( InstanceContentPtr instance ) override
+  void onInit( InstanceContent& instance ) override
   {
-    instance->registerEObj( "Entrance", 2000182, 4377976, 5, { -5.269677f, 0.467326f, 14.257640f }, 1.000000f,
-                            0.000000f );
-    // States -> vf_lock_on vf_lock_of
-    instance->registerEObj( "Exit", 2000139, 0, 4, { 0.014298f, -0.000000f, -17.786249f }, 1.000000f, 0.000000f );
+    instance.registerEObj( "Entrance", 2000182, 4377976, 5, { -5.269677f, 0.467326f, 14.257640f }, 1.000000f, 0.000000f ); 
+      // States -> vf_lock_on (id: 11) vf_lock_of (id: 12) 
+    instance.registerEObj( "Exit", 2000139, 0, 4, { 0.014298f, -0.000000f, -17.786249f }, 1.000000f, 0.000000f ); 
 
   }
 
-  void onUpdate( InstanceContentPtr instance, uint32_t currTime ) override
+  void onUpdate( InstanceContent& instance, uint32_t currTime ) override
   {
 
   }
 
-  void onEnterTerritory( InstanceContentPtr instance, Entity::Player& player, uint32_t eventId, uint16_t param1,
+  void onEnterTerritory( InstanceContent& instance, Entity::Player& player, uint32_t eventId, uint16_t param1,
                          uint16_t param2 ) override
   {
 
diff --git a/src/scripts/instances/trials/UrthsFount.cpp b/src/scripts/instances/trials/UrthsFount.cpp
index 809af68b..0585168c 100644
--- a/src/scripts/instances/trials/UrthsFount.cpp
+++ b/src/scripts/instances/trials/UrthsFount.cpp
@@ -9,24 +9,22 @@ class UrthsFount :
 public:
   UrthsFount() :
     Sapphire::ScriptAPI::InstanceContentScript( 20027 )
-  {
-  }
+  { }
 
-  void onInit( InstanceContentPtr instance ) override
+  void onInit( InstanceContent& instance ) override
   {
-    instance->registerEObj( "Entrance", 2000182, 5021407, 5, { 623.000000f, 23.872311f, 94.505638f }, 1.000000f,
-                            0.000000f );
-    // States -> vf_lock_on vf_lock_of
-    instance->registerEObj( "Exit", 2000139, 0, 4, { 623.000000f, 23.656260f, 61.956181f }, 1.000000f, 0.000000f );
+    instance.registerEObj( "Entrance", 2000182, 5021407, 5, { 623.000000f, 23.872311f, 94.505638f }, 1.000000f, 0.000000f ); 
+      // States -> vf_lock_on (id: 11) vf_lock_of (id: 12) 
+    instance.registerEObj( "Exit", 2000139, 0, 4, { 623.000000f, 23.656260f, 61.956181f }, 1.000000f, 0.000000f ); 
 
   }
 
-  void onUpdate( InstanceContentPtr instance, uint32_t currTime ) override
+  void onUpdate( InstanceContent& instance, uint32_t currTime ) override
   {
 
   }
 
-  void onEnterTerritory( InstanceContentPtr instance, Entity::Player& player, uint32_t eventId, uint16_t param1,
+  void onEnterTerritory( InstanceContent& instance, Entity::Player& player, uint32_t eventId, uint16_t param1,
                          uint16_t param2 ) override
   {