From eed915b9dc573c3e49610f07548abfee80d6a361 Mon Sep 17 00:00:00 2001
From: MobiusDevelopment <8391001+MobiusDevelopment@users.noreply.github.com>
Date: Fri, 5 Apr 2019 04:14:32 +0000
Subject: [PATCH] Dropped IGameXmlReader. ScriptEngineManager class cleanup.
 Use of ThreadPool to decrease startup time.

---
 .../dist/game/config/Scripts.xml              |   5 +-
 .../FourSepulchers/FourSepulchers.java        |   4 +-
 .../data/scripts/ai/bosses/Tiat/Stage1.java   |   4 +-
 .../ai/others/ClassMaster/ClassMaster.java    |   4 +-
 .../ai/others/MentorGuide/MentorGuide.java    |   4 +-
 .../ai/others/NpcBuffers/NpcBuffersData.java  |   4 +-
 .../admincommandhandlers/AdminQuest.java      |   4 +-
 .../admincommandhandlers/AdminReload.java     |   4 +-
 .../telnethandlers/server/Reload.java         |   4 +-
 .../java/com/l2jmobius/Config.java            |   4 +-
 .../commons/util/IGameXmlReader.java          | 118 ------------
 .../l2jmobius/commons/util/IXmlReader.java    | 107 ++++++++++-
 .../com/l2jmobius/gameserver/GameServer.java  |   2 +-
 .../data/xml/impl/AbilityPointsData.java      |   4 +-
 .../gameserver/data/xml/impl/ActionData.java  |   4 +-
 .../gameserver/data/xml/impl/AdminData.java   |   4 +-
 .../gameserver/data/xml/impl/AlchemyData.java |   4 +-
 .../data/xml/impl/AppearanceItemData.java     |   4 +-
 .../data/xml/impl/ArmorSetsData.java          |  10 +-
 .../data/xml/impl/BeautyShopData.java         |   4 +-
 .../gameserver/data/xml/impl/BuyListData.java |   8 +-
 .../gameserver/data/xml/impl/CastleData.java  |  10 +-
 .../data/xml/impl/CategoryData.java           |   4 +-
 .../data/xml/impl/ClanHallData.java           |   8 +-
 .../data/xml/impl/ClanRewardData.java         |   3 +-
 .../data/xml/impl/ClassListData.java          |   8 +-
 .../data/xml/impl/CombinationItemsData.java   |   4 +-
 .../gameserver/data/xml/impl/CubicData.java   |   6 +-
 .../gameserver/data/xml/impl/DoorData.java    |   3 +-
 .../data/xml/impl/EnchantItemData.java        |   4 +-
 .../data/xml/impl/EnchantItemGroupsData.java  |   4 +-
 .../data/xml/impl/EnchantItemHPBonusData.java |   4 +-
 .../data/xml/impl/EnchantItemOptionsData.java |   4 +-
 .../data/xml/impl/EnchantSkillGroupsData.java |  11 +-
 .../data/xml/impl/EventEngineData.java        |   3 +-
 .../data/xml/impl/ExperienceData.java         |   4 +-
 .../data/xml/impl/ExtendDropData.java         |   4 +-
 .../data/xml/impl/FakePlayerData.java         |   4 +-
 .../gameserver/data/xml/impl/FenceData.java   |   4 +-
 .../gameserver/data/xml/impl/FishingData.java |   4 +-
 .../gameserver/data/xml/impl/HennaData.java   |   4 +-
 .../data/xml/impl/HitConditionBonusData.java  |   4 +-
 .../data/xml/impl/InitialEquipmentData.java   |   4 +-
 .../data/xml/impl/InitialShortcutData.java    |   4 +-
 .../xml/impl/ItemCrystallizationData.java     |   4 +-
 .../gameserver/data/xml/impl/KarmaData.java   |   4 +-
 .../data/xml/impl/LuckyGameData.java          |   4 +-
 .../data/xml/impl/MultisellData.java          |   8 +-
 .../gameserver/data/xml/impl/NpcData.java     |  12 +-
 .../gameserver/data/xml/impl/OptionData.java  |   7 +-
 .../data/xml/impl/PetDataTable.java           |   8 +-
 .../data/xml/impl/PetSkillData.java           |   4 +-
 .../data/xml/impl/PlayerTemplateData.java     |   8 +-
 .../xml/impl/PlayerXpPercentLostData.java     |   4 +-
 .../data/xml/impl/PrimeShopData.java          |   4 +-
 .../gameserver/data/xml/impl/RecipeData.java  |   4 +-
 .../data/xml/impl/ResidenceFunctionsData.java |   4 +-
 .../gameserver/data/xml/impl/SayuneData.java  |   4 +-
 .../data/xml/impl/SecondaryAuthData.java      |   4 +-
 .../gameserver/data/xml/impl/ShuttleData.java |   4 +-
 .../data/xml/impl/SiegeScheduleData.java      |   4 +-
 .../gameserver/data/xml/impl/SkillData.java   |   9 +-
 .../data/xml/impl/SkillTreesData.java         |  47 ++---
 .../gameserver/data/xml/impl/SpawnsData.java  |  34 +++-
 .../data/xml/impl/StaticObjectData.java       |   4 +-
 .../data/xml/impl/TeleportersData.java        |   7 +-
 .../data/xml/impl/TransformData.java          |   8 +-
 .../data/xml/impl/VariationData.java          |   9 +-
 .../gameserver/engines/DocumentEngine.java    |  55 ++++--
 .../engines/items/DocumentItem.java           |   8 +-
 .../gameserver/handler/ConditionHandler.java  |   2 +-
 .../gameserver/handler/EffectHandler.java     |   2 +-
 .../handler/SkillConditionHandler.java        |   2 +-
 .../instancemanager/CastleManorManager.java   |   4 +-
 .../instancemanager/CursedWeaponsManager.java |   4 +-
 .../FakePlayerChatManager.java                |   4 +-
 .../instancemanager/InstanceManager.java      |   3 +-
 .../instancemanager/ItemAuctionManager.java   |   4 +-
 .../instancemanager/MapRegionManager.java     |   4 +-
 .../instancemanager/SellBuffsManager.java     |   4 +-
 .../instancemanager/WalkingManager.java       |   4 +-
 .../instancemanager/ZoneManager.java          |  17 +-
 .../gameserver/model/quest/LongTimeEvent.java |   4 +-
 .../gameserver/model/stats/BaseStats.java     |   3 +-
 .../scripting/ScriptEngineManager.java        | 163 +++--------------
 .../loginserver/GameServerTable.java          |   4 +-
 .../dist/game/config/Scripts.xml              |   6 +-
 .../FourSepulchers/FourSepulchers.java        |   4 +-
 .../data/scripts/ai/bosses/Tiat/Stage1.java   |   4 +-
 .../ai/others/ClassMaster/ClassMaster.java    |   4 +-
 .../ai/others/MentorGuide/MentorGuide.java    |   4 +-
 .../ai/others/NpcBuffers/NpcBuffersData.java  |   4 +-
 .../admincommandhandlers/AdminQuest.java      |   4 +-
 .../admincommandhandlers/AdminReload.java     |   4 +-
 .../telnethandlers/server/Reload.java         |   4 +-
 .../java/com/l2jmobius/Config.java            |   4 +-
 .../commons/util/IGameXmlReader.java          | 118 ------------
 .../l2jmobius/commons/util/IXmlReader.java    | 107 ++++++++++-
 .../com/l2jmobius/gameserver/GameServer.java  |   2 +-
 .../data/xml/impl/AbilityPointsData.java      |   4 +-
 .../gameserver/data/xml/impl/ActionData.java  |   4 +-
 .../gameserver/data/xml/impl/AdminData.java   |   4 +-
 .../gameserver/data/xml/impl/AlchemyData.java |   4 +-
 .../data/xml/impl/AppearanceItemData.java     |   4 +-
 .../data/xml/impl/ArmorSetsData.java          |  10 +-
 .../data/xml/impl/AttendanceRewardData.java   |   4 +-
 .../data/xml/impl/BeautyShopData.java         |   4 +-
 .../gameserver/data/xml/impl/BuyListData.java |   8 +-
 .../gameserver/data/xml/impl/CastleData.java  |  10 +-
 .../data/xml/impl/CategoryData.java           |   4 +-
 .../data/xml/impl/ClanHallData.java           |   8 +-
 .../data/xml/impl/ClanRewardData.java         |   3 +-
 .../data/xml/impl/ClassListData.java          |   8 +-
 .../data/xml/impl/CombinationItemsData.java   |   4 +-
 .../gameserver/data/xml/impl/CubicData.java   |   6 +-
 .../data/xml/impl/DailyMissionData.java       |   4 +-
 .../gameserver/data/xml/impl/DoorData.java    |   3 +-
 .../data/xml/impl/EnchantItemData.java        |   4 +-
 .../data/xml/impl/EnchantItemGroupsData.java  |   4 +-
 .../data/xml/impl/EnchantItemHPBonusData.java |   4 +-
 .../data/xml/impl/EnchantItemOptionsData.java |   4 +-
 .../data/xml/impl/EnchantSkillGroupsData.java |  11 +-
 .../gameserver/data/xml/impl/EnsoulData.java  |  12 +-
 .../data/xml/impl/EventEngineData.java        |   3 +-
 .../data/xml/impl/ExperienceData.java         |   4 +-
 .../data/xml/impl/ExtendDropData.java         |   4 +-
 .../data/xml/impl/FakePlayerData.java         |   4 +-
 .../gameserver/data/xml/impl/FenceData.java   |   4 +-
 .../gameserver/data/xml/impl/FishingData.java |   4 +-
 .../gameserver/data/xml/impl/HennaData.java   |   4 +-
 .../data/xml/impl/HitConditionBonusData.java  |   4 +-
 .../data/xml/impl/InitialEquipmentData.java   |   4 +-
 .../data/xml/impl/InitialShortcutData.java    |   4 +-
 .../xml/impl/ItemCrystallizationData.java     |   4 +-
 .../gameserver/data/xml/impl/KarmaData.java   |   4 +-
 .../data/xml/impl/LuckyGameData.java          |   4 +-
 .../data/xml/impl/MultisellData.java          |   8 +-
 .../gameserver/data/xml/impl/NpcData.java     |  12 +-
 .../gameserver/data/xml/impl/OptionData.java  |   7 +-
 .../data/xml/impl/PetDataTable.java           |   8 +-
 .../data/xml/impl/PetSkillData.java           |   4 +-
 .../data/xml/impl/PlayerTemplateData.java     |   8 +-
 .../xml/impl/PlayerXpPercentLostData.java     |   4 +-
 .../data/xml/impl/PrimeShopData.java          |   4 +-
 .../gameserver/data/xml/impl/RecipeData.java  |   4 +-
 .../data/xml/impl/ResidenceFunctionsData.java |   4 +-
 .../gameserver/data/xml/impl/SayuneData.java  |   4 +-
 .../data/xml/impl/SecondaryAuthData.java      |   4 +-
 .../gameserver/data/xml/impl/ShuttleData.java |   4 +-
 .../data/xml/impl/SiegeScheduleData.java      |   4 +-
 .../gameserver/data/xml/impl/SkillData.java   |   9 +-
 .../data/xml/impl/SkillTreesData.java         |  47 ++---
 .../gameserver/data/xml/impl/SpawnsData.java  |  34 +++-
 .../data/xml/impl/StaticObjectData.java       |   4 +-
 .../data/xml/impl/TeleportersData.java        |   7 +-
 .../data/xml/impl/TransformData.java          |   8 +-
 .../data/xml/impl/VariationData.java          |   9 +-
 .../gameserver/engines/DocumentEngine.java    |  55 ++++--
 .../engines/items/DocumentItem.java           |   8 +-
 .../gameserver/handler/ConditionHandler.java  |   2 +-
 .../handler/DailyMissionHandler.java          |   2 +-
 .../gameserver/handler/EffectHandler.java     |   2 +-
 .../handler/SkillConditionHandler.java        |   2 +-
 .../instancemanager/CastleManorManager.java   |   4 +-
 .../instancemanager/CursedWeaponsManager.java |   4 +-
 .../FakePlayerChatManager.java                |   4 +-
 .../instancemanager/InstanceManager.java      |   3 +-
 .../instancemanager/ItemAuctionManager.java   |   4 +-
 .../instancemanager/MapRegionManager.java     |   4 +-
 .../instancemanager/SellBuffsManager.java     |   4 +-
 .../instancemanager/WalkingManager.java       |   4 +-
 .../instancemanager/ZoneManager.java          |  17 +-
 .../gameserver/model/quest/LongTimeEvent.java |   4 +-
 .../gameserver/model/stats/BaseStats.java     |   3 +-
 .../scripting/ScriptEngineManager.java        | 169 +++---------------
 .../loginserver/GameServerTable.java          |   4 +-
 .../dist/game/config/Scripts.xml              |   6 +-
 .../FourSepulchers/FourSepulchers.java        |   4 +-
 .../data/scripts/ai/bosses/Tiat/Stage1.java   |   4 +-
 .../ai/others/ClassMaster/ClassMaster.java    |   4 +-
 .../ai/others/MentorGuide/MentorGuide.java    |   4 +-
 .../ai/others/NpcBuffers/NpcBuffersData.java  |   4 +-
 .../admincommandhandlers/AdminQuest.java      |   4 +-
 .../admincommandhandlers/AdminReload.java     |   4 +-
 .../telnethandlers/server/Reload.java         |   4 +-
 .../java/com/l2jmobius/Config.java            |   4 +-
 .../commons/util/IGameXmlReader.java          | 118 ------------
 .../l2jmobius/commons/util/IXmlReader.java    | 107 ++++++++++-
 .../com/l2jmobius/gameserver/GameServer.java  |   2 +-
 .../data/xml/impl/AbilityPointsData.java      |   4 +-
 .../gameserver/data/xml/impl/ActionData.java  |   4 +-
 .../gameserver/data/xml/impl/AdminData.java   |   4 +-
 .../gameserver/data/xml/impl/AlchemyData.java |   4 +-
 .../data/xml/impl/AppearanceItemData.java     |   4 +-
 .../data/xml/impl/ArmorSetsData.java          |  10 +-
 .../data/xml/impl/AttendanceRewardData.java   |   4 +-
 .../data/xml/impl/BeautyShopData.java         |   4 +-
 .../gameserver/data/xml/impl/BuyListData.java |   8 +-
 .../gameserver/data/xml/impl/CastleData.java  |  10 +-
 .../data/xml/impl/CategoryData.java           |   4 +-
 .../data/xml/impl/ClanHallData.java           |   8 +-
 .../data/xml/impl/ClanRewardData.java         |   3 +-
 .../data/xml/impl/ClassListData.java          |   8 +-
 .../data/xml/impl/CombinationItemsData.java   |   4 +-
 .../gameserver/data/xml/impl/CubicData.java   |   6 +-
 .../data/xml/impl/DailyMissionData.java       |   4 +-
 .../gameserver/data/xml/impl/DoorData.java    |   3 +-
 .../data/xml/impl/EnchantItemData.java        |   4 +-
 .../data/xml/impl/EnchantItemGroupsData.java  |   4 +-
 .../data/xml/impl/EnchantItemHPBonusData.java |   4 +-
 .../data/xml/impl/EnchantItemOptionsData.java |   4 +-
 .../data/xml/impl/EnchantSkillGroupsData.java |  11 +-
 .../gameserver/data/xml/impl/EnsoulData.java  |  12 +-
 .../data/xml/impl/EventEngineData.java        |   3 +-
 .../data/xml/impl/ExperienceData.java         |   4 +-
 .../data/xml/impl/ExtendDropData.java         |   4 +-
 .../data/xml/impl/FakePlayerData.java         |   4 +-
 .../gameserver/data/xml/impl/FenceData.java   |   4 +-
 .../gameserver/data/xml/impl/FishingData.java |   4 +-
 .../gameserver/data/xml/impl/HennaData.java   |   4 +-
 .../data/xml/impl/HitConditionBonusData.java  |   4 +-
 .../data/xml/impl/InitialEquipmentData.java   |   4 +-
 .../data/xml/impl/InitialShortcutData.java    |   4 +-
 .../xml/impl/ItemCrystallizationData.java     |   4 +-
 .../gameserver/data/xml/impl/KarmaData.java   |   4 +-
 .../data/xml/impl/LuckyGameData.java          |   4 +-
 .../data/xml/impl/MultisellData.java          |   8 +-
 .../gameserver/data/xml/impl/NpcData.java     |  12 +-
 .../gameserver/data/xml/impl/OptionData.java  |   7 +-
 .../data/xml/impl/PetDataTable.java           |   8 +-
 .../data/xml/impl/PetSkillData.java           |   4 +-
 .../data/xml/impl/PlayerTemplateData.java     |   8 +-
 .../xml/impl/PlayerXpPercentLostData.java     |   4 +-
 .../data/xml/impl/PrimeShopData.java          |   4 +-
 .../gameserver/data/xml/impl/RecipeData.java  |   4 +-
 .../data/xml/impl/ResidenceFunctionsData.java |   4 +-
 .../gameserver/data/xml/impl/SayuneData.java  |   4 +-
 .../data/xml/impl/SecondaryAuthData.java      |   4 +-
 .../gameserver/data/xml/impl/ShuttleData.java |   4 +-
 .../data/xml/impl/SiegeScheduleData.java      |   4 +-
 .../gameserver/data/xml/impl/SkillData.java   |   9 +-
 .../data/xml/impl/SkillTreesData.java         |  47 ++---
 .../gameserver/data/xml/impl/SpawnsData.java  |  34 +++-
 .../data/xml/impl/StaticObjectData.java       |   4 +-
 .../data/xml/impl/TeleportersData.java        |   7 +-
 .../data/xml/impl/TransformData.java          |   8 +-
 .../data/xml/impl/VariationData.java          |   9 +-
 .../gameserver/engines/DocumentEngine.java    |  55 ++++--
 .../engines/items/DocumentItem.java           |   8 +-
 .../gameserver/handler/ConditionHandler.java  |   2 +-
 .../handler/DailyMissionHandler.java          |   2 +-
 .../gameserver/handler/EffectHandler.java     |   2 +-
 .../handler/SkillConditionHandler.java        |   2 +-
 .../instancemanager/CastleManorManager.java   |   4 +-
 .../instancemanager/CursedWeaponsManager.java |   4 +-
 .../FakePlayerChatManager.java                |   4 +-
 .../instancemanager/InstanceManager.java      |   3 +-
 .../instancemanager/ItemAuctionManager.java   |   4 +-
 .../instancemanager/MapRegionManager.java     |   4 +-
 .../instancemanager/SellBuffsManager.java     |   4 +-
 .../instancemanager/WalkingManager.java       |   4 +-
 .../instancemanager/ZoneManager.java          |  17 +-
 .../gameserver/model/quest/LongTimeEvent.java |   4 +-
 .../gameserver/model/stats/BaseStats.java     |   3 +-
 .../scripting/ScriptEngineManager.java        | 169 +++---------------
 .../loginserver/GameServerTable.java          |   4 +-
 .../dist/game/config/Scripts.xml              |   6 +-
 .../FourSepulchers/FourSepulchers.java        |   4 +-
 .../data/scripts/ai/bosses/Tiat/Stage1.java   |   4 +-
 .../ai/others/ClassMaster/ClassMaster.java    |   4 +-
 .../ai/others/MentorGuide/MentorGuide.java    |   4 +-
 .../ai/others/NpcBuffers/NpcBuffersData.java  |   4 +-
 .../admincommandhandlers/AdminQuest.java      |   4 +-
 .../admincommandhandlers/AdminReload.java     |   4 +-
 .../telnethandlers/server/Reload.java         |   4 +-
 .../java/com/l2jmobius/Config.java            |   4 +-
 .../commons/util/IGameXmlReader.java          | 118 ------------
 .../l2jmobius/commons/util/IXmlReader.java    | 107 ++++++++++-
 .../com/l2jmobius/gameserver/GameServer.java  |   2 +-
 .../gameserver/data/xml/impl/ActionData.java  |   4 +-
 .../gameserver/data/xml/impl/AdminData.java   |   4 +-
 .../gameserver/data/xml/impl/AlchemyData.java |   4 +-
 .../data/xml/impl/AppearanceItemData.java     |   4 +-
 .../data/xml/impl/ArmorSetsData.java          |  10 +-
 .../data/xml/impl/AttendanceRewardData.java   |   4 +-
 .../data/xml/impl/BeautyShopData.java         |   4 +-
 .../gameserver/data/xml/impl/BuyListData.java |   8 +-
 .../gameserver/data/xml/impl/CastleData.java  |  10 +-
 .../data/xml/impl/CategoryData.java           |   4 +-
 .../data/xml/impl/ClanHallData.java           |   8 +-
 .../data/xml/impl/ClanRewardData.java         |   3 +-
 .../data/xml/impl/ClassListData.java          |   8 +-
 .../data/xml/impl/CombinationItemsData.java   |   4 +-
 .../gameserver/data/xml/impl/CubicData.java   |   6 +-
 .../data/xml/impl/DailyMissionData.java       |   4 +-
 .../gameserver/data/xml/impl/DoorData.java    |   3 +-
 .../data/xml/impl/EnchantItemData.java        |   4 +-
 .../data/xml/impl/EnchantItemGroupsData.java  |   4 +-
 .../data/xml/impl/EnchantItemHPBonusData.java |   4 +-
 .../data/xml/impl/EnchantItemOptionsData.java |   4 +-
 .../data/xml/impl/EnchantSkillGroupsData.java |  11 +-
 .../gameserver/data/xml/impl/EnsoulData.java  |  12 +-
 .../data/xml/impl/EventEngineData.java        |   3 +-
 .../data/xml/impl/ExperienceData.java         |   4 +-
 .../data/xml/impl/ExtendDropData.java         |   4 +-
 .../data/xml/impl/FakePlayerData.java         |   4 +-
 .../gameserver/data/xml/impl/FenceData.java   |   4 +-
 .../gameserver/data/xml/impl/FishingData.java |   4 +-
 .../gameserver/data/xml/impl/HennaData.java   |   4 +-
 .../data/xml/impl/HitConditionBonusData.java  |   4 +-
 .../data/xml/impl/InitialEquipmentData.java   |   4 +-
 .../data/xml/impl/InitialShortcutData.java    |   4 +-
 .../xml/impl/ItemCrystallizationData.java     |   4 +-
 .../gameserver/data/xml/impl/KarmaData.java   |   4 +-
 .../data/xml/impl/LuckyGameData.java          |   4 +-
 .../data/xml/impl/MonsterBookData.java        |   4 +-
 .../data/xml/impl/MultisellData.java          |   8 +-
 .../gameserver/data/xml/impl/NpcData.java     |  12 +-
 .../gameserver/data/xml/impl/OptionData.java  |   7 +-
 .../data/xml/impl/PetDataTable.java           |   8 +-
 .../data/xml/impl/PetSkillData.java           |   4 +-
 .../data/xml/impl/PlayerTemplateData.java     |   8 +-
 .../xml/impl/PlayerXpPercentLostData.java     |   4 +-
 .../data/xml/impl/PrimeShopData.java          |   4 +-
 .../gameserver/data/xml/impl/RecipeData.java  |   4 +-
 .../data/xml/impl/ResidenceFunctionsData.java |   4 +-
 .../gameserver/data/xml/impl/SayuneData.java  |   4 +-
 .../data/xml/impl/SecondaryAuthData.java      |   4 +-
 .../gameserver/data/xml/impl/ShuttleData.java |   4 +-
 .../data/xml/impl/SiegeScheduleData.java      |   4 +-
 .../gameserver/data/xml/impl/SkillData.java   |   9 +-
 .../data/xml/impl/SkillTreesData.java         |  47 ++---
 .../gameserver/data/xml/impl/SpawnsData.java  |  34 +++-
 .../data/xml/impl/StaticObjectData.java       |   4 +-
 .../data/xml/impl/TeleportersData.java        |   7 +-
 .../data/xml/impl/TransformData.java          |   8 +-
 .../data/xml/impl/VariationData.java          |   9 +-
 .../gameserver/engines/DocumentEngine.java    |  55 ++++--
 .../engines/items/DocumentItem.java           |   8 +-
 .../gameserver/handler/ConditionHandler.java  |   2 +-
 .../handler/DailyMissionHandler.java          |   2 +-
 .../gameserver/handler/EffectHandler.java     |   2 +-
 .../handler/SkillConditionHandler.java        |   2 +-
 .../instancemanager/CastleManorManager.java   |   4 +-
 .../instancemanager/CursedWeaponsManager.java |   4 +-
 .../FakePlayerChatManager.java                |   4 +-
 .../instancemanager/InstanceManager.java      |   3 +-
 .../instancemanager/ItemAuctionManager.java   |   4 +-
 .../instancemanager/MapRegionManager.java     |   4 +-
 .../instancemanager/SellBuffsManager.java     |   4 +-
 .../instancemanager/WalkingManager.java       |   4 +-
 .../instancemanager/ZoneManager.java          |  17 +-
 .../gameserver/model/quest/LongTimeEvent.java |   4 +-
 .../gameserver/model/stats/BaseStats.java     |   3 +-
 .../scripting/ScriptEngineManager.java        | 169 +++---------------
 .../loginserver/GameServerTable.java          |   4 +-
 .../dist/game/config/Scripts.xml              |   6 +-
 .../FourSepulchers/FourSepulchers.java        |   4 +-
 .../data/scripts/ai/bosses/Tiat/Stage1.java   |   4 +-
 .../ai/others/ClassMaster/ClassMaster.java    |   4 +-
 .../ai/others/MentorGuide/MentorGuide.java    |   4 +-
 .../ai/others/NpcBuffers/NpcBuffersData.java  |   4 +-
 .../admincommandhandlers/AdminQuest.java      |   4 +-
 .../admincommandhandlers/AdminReload.java     |   4 +-
 .../telnethandlers/server/Reload.java         |   4 +-
 .../java/com/l2jmobius/Config.java            |   4 +-
 .../commons/util/IGameXmlReader.java          | 118 ------------
 .../l2jmobius/commons/util/IXmlReader.java    | 107 ++++++++++-
 .../com/l2jmobius/gameserver/GameServer.java  |   2 +-
 .../gameserver/data/xml/impl/ActionData.java  |   4 +-
 .../gameserver/data/xml/impl/AdminData.java   |   4 +-
 .../gameserver/data/xml/impl/AlchemyData.java |   4 +-
 .../data/xml/impl/AppearanceItemData.java     |   4 +-
 .../data/xml/impl/ArmorSetsData.java          |  10 +-
 .../data/xml/impl/AttendanceRewardData.java   |   4 +-
 .../data/xml/impl/BeautyShopData.java         |   4 +-
 .../gameserver/data/xml/impl/BuyListData.java |   8 +-
 .../gameserver/data/xml/impl/CastleData.java  |  10 +-
 .../data/xml/impl/CategoryData.java           |   4 +-
 .../data/xml/impl/ClanHallData.java           |   8 +-
 .../data/xml/impl/ClanMasteryData.java        |   4 +-
 .../data/xml/impl/ClanRewardData.java         |   3 +-
 .../data/xml/impl/ClanShopData.java           |   4 +-
 .../data/xml/impl/ClassListData.java          |   8 +-
 .../data/xml/impl/CombinationItemsData.java   |   4 +-
 .../gameserver/data/xml/impl/CubicData.java   |   6 +-
 .../data/xml/impl/DailyMissionData.java       |   4 +-
 .../gameserver/data/xml/impl/DoorData.java    |   3 +-
 .../data/xml/impl/EnchantItemData.java        |   4 +-
 .../data/xml/impl/EnchantItemGroupsData.java  |   4 +-
 .../data/xml/impl/EnchantItemHPBonusData.java |   4 +-
 .../data/xml/impl/EnchantItemOptionsData.java |   4 +-
 .../data/xml/impl/EnchantSkillGroupsData.java |  11 +-
 .../gameserver/data/xml/impl/EnsoulData.java  |  12 +-
 .../data/xml/impl/EventEngineData.java        |   3 +-
 .../data/xml/impl/ExperienceData.java         |   4 +-
 .../data/xml/impl/ExtendDropData.java         |   4 +-
 .../data/xml/impl/FakePlayerData.java         |   4 +-
 .../gameserver/data/xml/impl/FenceData.java   |   4 +-
 .../gameserver/data/xml/impl/FishingData.java |   4 +-
 .../gameserver/data/xml/impl/HennaData.java   |   4 +-
 .../data/xml/impl/HitConditionBonusData.java  |   4 +-
 .../data/xml/impl/InitialEquipmentData.java   |   4 +-
 .../data/xml/impl/InitialShortcutData.java    |   4 +-
 .../xml/impl/ItemCrystallizationData.java     |   4 +-
 .../gameserver/data/xml/impl/KarmaData.java   |   4 +-
 .../data/xml/impl/LuckyGameData.java          |   4 +-
 .../data/xml/impl/MonsterBookData.java        |   4 +-
 .../data/xml/impl/MultisellData.java          |   8 +-
 .../gameserver/data/xml/impl/NpcData.java     |  12 +-
 .../gameserver/data/xml/impl/OptionData.java  |   7 +-
 .../data/xml/impl/PetDataTable.java           |   8 +-
 .../data/xml/impl/PetSkillData.java           |   4 +-
 .../data/xml/impl/PlayerTemplateData.java     |   8 +-
 .../xml/impl/PlayerXpPercentLostData.java     |   4 +-
 .../data/xml/impl/PrimeShopData.java          |   4 +-
 .../gameserver/data/xml/impl/RecipeData.java  |   4 +-
 .../data/xml/impl/ResidenceFunctionsData.java |   4 +-
 .../gameserver/data/xml/impl/SayuneData.java  |   4 +-
 .../data/xml/impl/SecondaryAuthData.java      |   4 +-
 .../gameserver/data/xml/impl/ShuttleData.java |   4 +-
 .../data/xml/impl/SiegeScheduleData.java      |   4 +-
 .../gameserver/data/xml/impl/SkillData.java   |   9 +-
 .../data/xml/impl/SkillTreesData.java         |  47 ++---
 .../gameserver/data/xml/impl/SpawnsData.java  |  34 +++-
 .../data/xml/impl/StaticObjectData.java       |   4 +-
 .../data/xml/impl/TeleportersData.java        |   7 +-
 .../data/xml/impl/TransformData.java          |   8 +-
 .../data/xml/impl/VariationData.java          |   9 +-
 .../gameserver/engines/DocumentEngine.java    |  55 ++++--
 .../engines/items/DocumentItem.java           |   8 +-
 .../gameserver/handler/ConditionHandler.java  |   2 +-
 .../handler/DailyMissionHandler.java          |   2 +-
 .../gameserver/handler/EffectHandler.java     |   2 +-
 .../handler/SkillConditionHandler.java        |   2 +-
 .../instancemanager/CastleManorManager.java   |   4 +-
 .../instancemanager/CursedWeaponsManager.java |   4 +-
 .../FakePlayerChatManager.java                |   4 +-
 .../instancemanager/InstanceManager.java      |   3 +-
 .../instancemanager/ItemAuctionManager.java   |   4 +-
 .../instancemanager/MapRegionManager.java     |   4 +-
 .../instancemanager/SellBuffsManager.java     |   4 +-
 .../instancemanager/WalkingManager.java       |   4 +-
 .../instancemanager/ZoneManager.java          |  17 +-
 .../gameserver/model/quest/LongTimeEvent.java |   4 +-
 .../gameserver/model/stats/BaseStats.java     |   3 +-
 .../scripting/ScriptEngineManager.java        | 169 +++---------------
 .../loginserver/GameServerTable.java          |   4 +-
 .../dist/game/config/Scripts.xml              |   6 +-
 .../FourSepulchers/FourSepulchers.java        |   4 +-
 .../data/scripts/ai/bosses/Tiat/Stage1.java   |   4 +-
 .../ai/others/ClassMaster/ClassMaster.java    |   4 +-
 .../ai/others/MentorGuide/MentorGuide.java    |   4 +-
 .../ai/others/NpcBuffers/NpcBuffersData.java  |   4 +-
 .../admincommandhandlers/AdminQuest.java      |   4 +-
 .../admincommandhandlers/AdminReload.java     |   4 +-
 .../telnethandlers/server/Reload.java         |   4 +-
 .../java/com/l2jmobius/Config.java            |   4 +-
 .../commons/util/IGameXmlReader.java          | 118 ------------
 .../l2jmobius/commons/util/IXmlReader.java    | 107 ++++++++++-
 .../com/l2jmobius/gameserver/GameServer.java  |   2 +-
 .../gameserver/data/xml/impl/ActionData.java  |   4 +-
 .../gameserver/data/xml/impl/AdminData.java   |   4 +-
 .../gameserver/data/xml/impl/AlchemyData.java |   4 +-
 .../data/xml/impl/AppearanceItemData.java     |   4 +-
 .../data/xml/impl/ArmorSetsData.java          |  10 +-
 .../data/xml/impl/AttendanceRewardData.java   |   4 +-
 .../data/xml/impl/BeautyShopData.java         |   4 +-
 .../gameserver/data/xml/impl/BuyListData.java |   8 +-
 .../gameserver/data/xml/impl/CastleData.java  |  10 +-
 .../data/xml/impl/CategoryData.java           |   4 +-
 .../data/xml/impl/ClanHallData.java           |   8 +-
 .../data/xml/impl/ClanMasteryData.java        |   4 +-
 .../data/xml/impl/ClanRewardData.java         |   3 +-
 .../data/xml/impl/ClanShopData.java           |   4 +-
 .../data/xml/impl/ClassListData.java          |   8 +-
 .../data/xml/impl/CombinationItemsData.java   |   4 +-
 .../gameserver/data/xml/impl/CubicData.java   |   6 +-
 .../data/xml/impl/DailyMissionData.java       |   4 +-
 .../gameserver/data/xml/impl/DoorData.java    |   3 +-
 .../data/xml/impl/EnchantItemData.java        |   4 +-
 .../data/xml/impl/EnchantItemGroupsData.java  |   4 +-
 .../data/xml/impl/EnchantItemHPBonusData.java |   4 +-
 .../data/xml/impl/EnchantItemOptionsData.java |   4 +-
 .../data/xml/impl/EnchantSkillGroupsData.java |  11 +-
 .../gameserver/data/xml/impl/EnsoulData.java  |  12 +-
 .../data/xml/impl/EventEngineData.java        |   3 +-
 .../data/xml/impl/ExperienceData.java         |   4 +-
 .../data/xml/impl/ExtendDropData.java         |   4 +-
 .../data/xml/impl/FakePlayerData.java         |   4 +-
 .../gameserver/data/xml/impl/FenceData.java   |   4 +-
 .../gameserver/data/xml/impl/FishingData.java |   4 +-
 .../gameserver/data/xml/impl/HennaData.java   |   4 +-
 .../data/xml/impl/HitConditionBonusData.java  |   4 +-
 .../data/xml/impl/InitialEquipmentData.java   |   4 +-
 .../data/xml/impl/InitialShortcutData.java    |   4 +-
 .../xml/impl/ItemCrystallizationData.java     |   4 +-
 .../gameserver/data/xml/impl/KarmaData.java   |   4 +-
 .../data/xml/impl/LuckyGameData.java          |   4 +-
 .../data/xml/impl/MonsterBookData.java        |   4 +-
 .../data/xml/impl/MultisellData.java          |   8 +-
 .../gameserver/data/xml/impl/NpcData.java     |  12 +-
 .../gameserver/data/xml/impl/OptionData.java  |   7 +-
 .../data/xml/impl/PetDataTable.java           |   8 +-
 .../data/xml/impl/PetSkillData.java           |   4 +-
 .../data/xml/impl/PlayerTemplateData.java     |   8 +-
 .../xml/impl/PlayerXpPercentLostData.java     |   4 +-
 .../data/xml/impl/PrimeShopData.java          |   4 +-
 .../gameserver/data/xml/impl/RecipeData.java  |   4 +-
 .../data/xml/impl/ResidenceFunctionsData.java |   4 +-
 .../gameserver/data/xml/impl/SayuneData.java  |   4 +-
 .../data/xml/impl/SecondaryAuthData.java      |   4 +-
 .../gameserver/data/xml/impl/ShuttleData.java |   4 +-
 .../data/xml/impl/SiegeScheduleData.java      |   4 +-
 .../gameserver/data/xml/impl/SkillData.java   |   9 +-
 .../data/xml/impl/SkillTreesData.java         |  47 ++---
 .../gameserver/data/xml/impl/SpawnsData.java  |  34 +++-
 .../data/xml/impl/StaticObjectData.java       |   4 +-
 .../data/xml/impl/TeleportersData.java        |   7 +-
 .../data/xml/impl/TransformData.java          |   8 +-
 .../data/xml/impl/VariationData.java          |   9 +-
 .../gameserver/engines/DocumentEngine.java    |  55 ++++--
 .../engines/items/DocumentItem.java           |   8 +-
 .../gameserver/handler/ConditionHandler.java  |   2 +-
 .../handler/DailyMissionHandler.java          |   2 +-
 .../gameserver/handler/EffectHandler.java     |   2 +-
 .../handler/SkillConditionHandler.java        |   2 +-
 .../instancemanager/CastleManorManager.java   |   4 +-
 .../instancemanager/CursedWeaponsManager.java |   4 +-
 .../FakePlayerChatManager.java                |   4 +-
 .../instancemanager/InstanceManager.java      |   3 +-
 .../instancemanager/ItemAuctionManager.java   |   4 +-
 .../instancemanager/MapRegionManager.java     |   4 +-
 .../instancemanager/SellBuffsManager.java     |   4 +-
 .../instancemanager/WalkingManager.java       |   4 +-
 .../instancemanager/ZoneManager.java          |  17 +-
 .../gameserver/model/quest/LongTimeEvent.java |   4 +-
 .../gameserver/model/stats/BaseStats.java     |   3 +-
 .../scripting/ScriptEngineManager.java        | 169 +++---------------
 .../loginserver/GameServerTable.java          |   4 +-
 .../dist/game/config/Scripts.xml              |   6 +-
 .../FourSepulchers/FourSepulchers.java        |   4 +-
 .../data/scripts/ai/bosses/Tiat/Stage1.java   |   4 +-
 .../ai/others/ClassMaster/ClassMaster.java    |   4 +-
 .../ai/others/MentorGuide/MentorGuide.java    |   4 +-
 .../ai/others/NpcBuffers/NpcBuffersData.java  |   4 +-
 .../admincommandhandlers/AdminQuest.java      |   4 +-
 .../admincommandhandlers/AdminReload.java     |   4 +-
 .../telnethandlers/server/Reload.java         |   4 +-
 .../java/com/l2jmobius/Config.java            |   4 +-
 .../commons/util/IGameXmlReader.java          | 118 ------------
 .../l2jmobius/commons/util/IXmlReader.java    | 107 ++++++++++-
 .../com/l2jmobius/gameserver/GameServer.java  |   2 +-
 .../gameserver/data/xml/impl/ActionData.java  |   4 +-
 .../gameserver/data/xml/impl/AdminData.java   |   4 +-
 .../gameserver/data/xml/impl/AlchemyData.java |   4 +-
 .../data/xml/impl/AppearanceItemData.java     |   4 +-
 .../data/xml/impl/ArmorSetsData.java          |  10 +-
 .../data/xml/impl/AttendanceRewardData.java   |   4 +-
 .../data/xml/impl/BeautyShopData.java         |   4 +-
 .../gameserver/data/xml/impl/BuyListData.java |   8 +-
 .../gameserver/data/xml/impl/CastleData.java  |  10 +-
 .../data/xml/impl/CategoryData.java           |   4 +-
 .../data/xml/impl/ClanHallData.java           |   8 +-
 .../data/xml/impl/ClanMasteryData.java        |   4 +-
 .../data/xml/impl/ClanRewardData.java         |   3 +-
 .../data/xml/impl/ClanShopData.java           |   4 +-
 .../data/xml/impl/ClassListData.java          |   8 +-
 .../data/xml/impl/CombinationItemsData.java   |   4 +-
 .../gameserver/data/xml/impl/CubicData.java   |   6 +-
 .../data/xml/impl/DailyMissionData.java       |   4 +-
 .../gameserver/data/xml/impl/DoorData.java    |   3 +-
 .../data/xml/impl/EnchantItemData.java        |   4 +-
 .../data/xml/impl/EnchantItemGroupsData.java  |   4 +-
 .../data/xml/impl/EnchantItemHPBonusData.java |   4 +-
 .../data/xml/impl/EnchantItemOptionsData.java |   4 +-
 .../data/xml/impl/EnchantSkillGroupsData.java |  11 +-
 .../gameserver/data/xml/impl/EnsoulData.java  |  12 +-
 .../data/xml/impl/EventEngineData.java        |   3 +-
 .../data/xml/impl/ExperienceData.java         |   4 +-
 .../data/xml/impl/ExtendDropData.java         |   4 +-
 .../data/xml/impl/FakePlayerData.java         |   4 +-
 .../gameserver/data/xml/impl/FenceData.java   |   4 +-
 .../gameserver/data/xml/impl/FishingData.java |   4 +-
 .../gameserver/data/xml/impl/HennaData.java   |   4 +-
 .../data/xml/impl/HitConditionBonusData.java  |   4 +-
 .../data/xml/impl/InitialEquipmentData.java   |   4 +-
 .../data/xml/impl/InitialShortcutData.java    |   4 +-
 .../xml/impl/ItemCrystallizationData.java     |   4 +-
 .../gameserver/data/xml/impl/KarmaData.java   |   4 +-
 .../data/xml/impl/LuckyGameData.java          |   4 +-
 .../data/xml/impl/MonsterBookData.java        |   4 +-
 .../data/xml/impl/MultisellData.java          |   8 +-
 .../gameserver/data/xml/impl/NpcData.java     |  12 +-
 .../gameserver/data/xml/impl/OptionData.java  |   7 +-
 .../data/xml/impl/PetDataTable.java           |   8 +-
 .../data/xml/impl/PetSkillData.java           |   4 +-
 .../data/xml/impl/PlayerTemplateData.java     |   8 +-
 .../xml/impl/PlayerXpPercentLostData.java     |   4 +-
 .../data/xml/impl/PrimeShopData.java          |   4 +-
 .../gameserver/data/xml/impl/RecipeData.java  |   4 +-
 .../data/xml/impl/ResidenceFunctionsData.java |   4 +-
 .../gameserver/data/xml/impl/SayuneData.java  |   4 +-
 .../data/xml/impl/SecondaryAuthData.java      |   4 +-
 .../gameserver/data/xml/impl/ShuttleData.java |   4 +-
 .../data/xml/impl/SiegeScheduleData.java      |   4 +-
 .../gameserver/data/xml/impl/SkillData.java   |   9 +-
 .../data/xml/impl/SkillTreesData.java         |  47 ++---
 .../gameserver/data/xml/impl/SpawnsData.java  |  34 +++-
 .../data/xml/impl/StaticObjectData.java       |   4 +-
 .../data/xml/impl/TeleportersData.java        |   7 +-
 .../data/xml/impl/TransformData.java          |   8 +-
 .../data/xml/impl/VariationData.java          |   9 +-
 .../gameserver/engines/DocumentEngine.java    |  55 ++++--
 .../engines/items/DocumentItem.java           |   8 +-
 .../gameserver/handler/ConditionHandler.java  |   2 +-
 .../handler/DailyMissionHandler.java          |   2 +-
 .../gameserver/handler/EffectHandler.java     |   2 +-
 .../handler/SkillConditionHandler.java        |   2 +-
 .../instancemanager/CastleManorManager.java   |   4 +-
 .../instancemanager/CursedWeaponsManager.java |   4 +-
 .../FakePlayerChatManager.java                |   4 +-
 .../instancemanager/InstanceManager.java      |   3 +-
 .../instancemanager/ItemAuctionManager.java   |   4 +-
 .../instancemanager/MapRegionManager.java     |   4 +-
 .../instancemanager/SellBuffsManager.java     |   4 +-
 .../instancemanager/WalkingManager.java       |   4 +-
 .../instancemanager/ZoneManager.java          |  17 +-
 .../gameserver/model/quest/LongTimeEvent.java |   4 +-
 .../gameserver/model/stats/BaseStats.java     |   3 +-
 .../scripting/ScriptEngineManager.java        | 169 +++---------------
 .../loginserver/GameServerTable.java          |   4 +-
 .../dist/game/config/Scripts.xml              |   3 +-
 .../areas/ForgeOfTheGods/TarBeetleSpawn.java  |   4 +-
 .../areas/Hellbound/HellboundPointData.java   |   4 +-
 .../ai/areas/Hellbound/HellboundSpawns.java   |   4 +-
 .../ai/others/NpcBuffers/NpcBuffersData.java  |   4 +-
 .../admincommandhandlers/AdminReload.java     |   4 +-
 .../telnethandlers/server/Reload.java         |   4 +-
 .../FinalEmperialTomb/FinalEmperialTomb.java  |   4 +-
 .../java/com/l2jmobius/Config.java            |   4 +-
 .../commons/util/IGameXmlReader.java          | 118 ------------
 .../l2jmobius/commons/util/IXmlReader.java    | 107 ++++++++++-
 .../com/l2jmobius/gameserver/GameServer.java  |   2 +-
 .../gameserver/data/xml/impl/AdminData.java   |   4 +-
 .../data/xml/impl/ArmorSetsData.java          |   8 +-
 .../gameserver/data/xml/impl/BuyListData.java |   8 +-
 .../data/xml/impl/CategoryData.java           |   4 +-
 .../data/xml/impl/ClassListData.java          |   4 +-
 .../gameserver/data/xml/impl/DoorData.java    |   4 +-
 .../data/xml/impl/EnchantItemData.java        |   4 +-
 .../data/xml/impl/EnchantItemGroupsData.java  |   4 +-
 .../data/xml/impl/EnchantItemHPBonusData.java |   4 +-
 .../data/xml/impl/EnchantItemOptionsData.java |   4 +-
 .../data/xml/impl/EnchantSkillGroupsData.java |   4 +-
 .../data/xml/impl/ExperienceData.java         |   4 +-
 .../data/xml/impl/FakePlayerData.java         |   4 +-
 .../gameserver/data/xml/impl/FenceData.java   |   4 +-
 .../gameserver/data/xml/impl/FishData.java    |   4 +-
 .../data/xml/impl/FishingMonstersData.java    |   4 +-
 .../data/xml/impl/FishingRodsData.java        |   4 +-
 .../gameserver/data/xml/impl/HennaData.java   |   4 +-
 .../data/xml/impl/HitConditionBonusData.java  |   4 +-
 .../data/xml/impl/InitialEquipmentData.java   |   4 +-
 .../data/xml/impl/InitialShortcutData.java    |   4 +-
 .../gameserver/data/xml/impl/KarmaData.java   |   4 +-
 .../data/xml/impl/MultisellData.java          |   8 +-
 .../gameserver/data/xml/impl/NpcData.java     |  12 +-
 .../gameserver/data/xml/impl/OptionData.java  |   8 +-
 .../data/xml/impl/PetDataTable.java           |   8 +-
 .../data/xml/impl/PetSkillData.java           |   4 +-
 .../data/xml/impl/PlayerTemplateData.java     |   8 +-
 .../xml/impl/PlayerXpPercentLostData.java     |   4 +-
 .../data/xml/impl/PrimeShopData.java          |   4 +-
 .../gameserver/data/xml/impl/RecipeData.java  |   4 +-
 .../data/xml/impl/SecondaryAuthData.java      |   4 +-
 .../data/xml/impl/SiegeScheduleData.java      |   4 +-
 .../gameserver/data/xml/impl/SkillData.java   |  15 +-
 .../data/xml/impl/SkillLearnData.java         |   4 +-
 .../data/xml/impl/SkillTreesData.java         |  31 ++--
 .../data/xml/impl/StaticObjectData.java       |   4 +-
 .../data/xml/impl/TransformData.java          |   8 +-
 .../gameserver/data/xml/impl/UIData.java      |   4 +-
 .../gameserver/datatables/SpawnTable.java     |   6 +-
 .../gameserver/engines/DocumentEngine.java    |  91 ++++++----
 .../gameserver/handler/EffectHandler.java     |   2 +-
 .../instancemanager/CastleManorManager.java   |   4 +-
 .../FakePlayerChatManager.java                |   4 +-
 .../instancemanager/InstanceManager.java      |   6 +-
 .../instancemanager/MapRegionManager.java     |   8 +-
 .../instancemanager/SellBuffsManager.java     |   4 +-
 .../instancemanager/WalkingManager.java       |   4 +-
 .../instancemanager/ZoneManager.java          |  28 +--
 .../gameserver/model/zone/type/BossZone.java  |   6 +-
 .../model/zone/type/DamageZone.java           |   8 +-
 .../model/zone/type/EffectZone.java           |   8 +-
 .../model/zone/type/OlympiadStadiumZone.java  |   7 +-
 .../gameserver/model/zone/type/SiegeZone.java |   7 +-
 .../scripting/ScriptEngineManager.java        | 154 +++-------------
 .../loginserver/GameServerTable.java          |   4 +-
 .../dist/game/config/Scripts.xml              |   6 +-
 .../ai/others/ClassMaster/ClassMaster.java    |   4 +-
 .../admincommandhandlers/AdminQuest.java      |   4 +-
 .../admincommandhandlers/AdminReload.java     |   4 +-
 .../telnethandlers/server/Reload.java         |   4 +-
 .../java/com/l2jmobius/Config.java            |   4 +-
 .../commons/util/IGameXmlReader.java          | 118 ------------
 .../l2jmobius/commons/util/IXmlReader.java    | 107 ++++++++++-
 .../com/l2jmobius/gameserver/GameServer.java  |   2 +-
 .../gameserver/data/xml/impl/ActionData.java  |   4 +-
 .../gameserver/data/xml/impl/AdminData.java   |   4 +-
 .../data/xml/impl/AppearanceItemData.java     |   4 +-
 .../data/xml/impl/ArmorSetsData.java          |  10 +-
 .../data/xml/impl/AttendanceRewardData.java   |   4 +-
 .../data/xml/impl/BeautyShopData.java         |   4 +-
 .../gameserver/data/xml/impl/BuyListData.java |   8 +-
 .../gameserver/data/xml/impl/CastleData.java  |  10 +-
 .../data/xml/impl/CategoryData.java           |   4 +-
 .../data/xml/impl/ClanHallData.java           |   8 +-
 .../data/xml/impl/ClanRewardData.java         |   3 +-
 .../data/xml/impl/ClassListData.java          |   8 +-
 .../data/xml/impl/CombinationItemsData.java   |   4 +-
 .../gameserver/data/xml/impl/CubicData.java   |   6 +-
 .../data/xml/impl/DailyMissionData.java       |   4 +-
 .../gameserver/data/xml/impl/DoorData.java    |   3 +-
 .../data/xml/impl/EnchantItemData.java        |   4 +-
 .../data/xml/impl/EnchantItemGroupsData.java  |   4 +-
 .../data/xml/impl/EnchantItemHPBonusData.java |   4 +-
 .../data/xml/impl/EnchantItemOptionsData.java |   4 +-
 .../data/xml/impl/EnchantSkillGroupsData.java |  11 +-
 .../gameserver/data/xml/impl/EnsoulData.java  |  12 +-
 .../data/xml/impl/EventEngineData.java        |   3 +-
 .../data/xml/impl/ExperienceData.java         |   4 +-
 .../data/xml/impl/ExtendDropData.java         |   4 +-
 .../data/xml/impl/FakePlayerData.java         |   4 +-
 .../gameserver/data/xml/impl/FenceData.java   |   4 +-
 .../gameserver/data/xml/impl/FishingData.java |   4 +-
 .../gameserver/data/xml/impl/HennaData.java   |   4 +-
 .../data/xml/impl/HitConditionBonusData.java  |   4 +-
 .../data/xml/impl/InitialEquipmentData.java   |   4 +-
 .../data/xml/impl/InitialShortcutData.java    |   4 +-
 .../xml/impl/ItemCrystallizationData.java     |   4 +-
 .../gameserver/data/xml/impl/KarmaData.java   |   4 +-
 .../data/xml/impl/LuckyGameData.java          |   4 +-
 .../data/xml/impl/MultisellData.java          |   8 +-
 .../gameserver/data/xml/impl/NpcData.java     |  12 +-
 .../gameserver/data/xml/impl/OptionData.java  |   7 +-
 .../data/xml/impl/PetDataTable.java           |   8 +-
 .../data/xml/impl/PetSkillData.java           |   4 +-
 .../data/xml/impl/PlayerTemplateData.java     |   8 +-
 .../xml/impl/PlayerXpPercentLostData.java     |   4 +-
 .../data/xml/impl/PrimeShopData.java          |   4 +-
 .../gameserver/data/xml/impl/RecipeData.java  |   4 +-
 .../data/xml/impl/ResidenceFunctionsData.java |   4 +-
 .../gameserver/data/xml/impl/SayuneData.java  |   4 +-
 .../data/xml/impl/SecondaryAuthData.java      |   4 +-
 .../gameserver/data/xml/impl/ShuttleData.java |   4 +-
 .../data/xml/impl/SiegeScheduleData.java      |   4 +-
 .../gameserver/data/xml/impl/SkillData.java   |   9 +-
 .../data/xml/impl/SkillTreesData.java         |  47 ++---
 .../gameserver/data/xml/impl/SpawnsData.java  |  34 +++-
 .../data/xml/impl/StaticObjectData.java       |   4 +-
 .../data/xml/impl/TeleportersData.java        |   7 +-
 .../data/xml/impl/TransformData.java          |   8 +-
 .../data/xml/impl/VariationData.java          |   9 +-
 .../gameserver/engines/DocumentEngine.java    |  55 ++++--
 .../engines/items/DocumentItem.java           |   8 +-
 .../gameserver/handler/ConditionHandler.java  |   2 +-
 .../handler/DailyMissionHandler.java          |   2 +-
 .../gameserver/handler/EffectHandler.java     |   2 +-
 .../handler/SkillConditionHandler.java        |   2 +-
 .../instancemanager/CastleManorManager.java   |   4 +-
 .../instancemanager/CursedWeaponsManager.java |   4 +-
 .../FakePlayerChatManager.java                |   4 +-
 .../instancemanager/InstanceManager.java      |   3 +-
 .../instancemanager/ItemAuctionManager.java   |   4 +-
 .../instancemanager/MapRegionManager.java     |   4 +-
 .../instancemanager/SellBuffsManager.java     |   4 +-
 .../instancemanager/WalkingManager.java       |   4 +-
 .../instancemanager/ZoneManager.java          |  17 +-
 .../gameserver/model/quest/LongTimeEvent.java |   4 +-
 .../gameserver/model/stats/BaseStats.java     |   3 +-
 .../scripting/ScriptEngineManager.java        | 169 +++---------------
 .../loginserver/GameServerTable.java          |   4 +-
 .../dist/game/config/Scripts.xml              |   6 +-
 .../ai/others/ClassMaster/ClassMaster.java    |   4 +-
 .../admincommandhandlers/AdminQuest.java      |   4 +-
 .../admincommandhandlers/AdminReload.java     |   4 +-
 .../telnethandlers/server/Reload.java         |   4 +-
 .../java/com/l2jmobius/Config.java            |   4 +-
 .../commons/util/IGameXmlReader.java          | 118 ------------
 .../l2jmobius/commons/util/IXmlReader.java    | 107 ++++++++++-
 .../com/l2jmobius/gameserver/GameServer.java  |   2 +-
 .../gameserver/data/xml/impl/ActionData.java  |   4 +-
 .../gameserver/data/xml/impl/AdminData.java   |   4 +-
 .../data/xml/impl/AppearanceItemData.java     |   4 +-
 .../data/xml/impl/ArmorSetsData.java          |  10 +-
 .../data/xml/impl/AttendanceRewardData.java   |   4 +-
 .../data/xml/impl/BeautyShopData.java         |   4 +-
 .../gameserver/data/xml/impl/BuyListData.java |   8 +-
 .../gameserver/data/xml/impl/CastleData.java  |  10 +-
 .../data/xml/impl/CategoryData.java           |   4 +-
 .../data/xml/impl/ClanHallData.java           |   8 +-
 .../data/xml/impl/ClanRewardData.java         |   3 +-
 .../data/xml/impl/ClassListData.java          |   8 +-
 .../data/xml/impl/CombinationItemsData.java   |   4 +-
 .../gameserver/data/xml/impl/CubicData.java   |   6 +-
 .../data/xml/impl/DailyMissionData.java       |   4 +-
 .../gameserver/data/xml/impl/DoorData.java    |   3 +-
 .../data/xml/impl/EnchantItemData.java        |   4 +-
 .../data/xml/impl/EnchantItemGroupsData.java  |   4 +-
 .../data/xml/impl/EnchantItemHPBonusData.java |   4 +-
 .../data/xml/impl/EnchantItemOptionsData.java |   4 +-
 .../data/xml/impl/EnchantSkillGroupsData.java |  11 +-
 .../gameserver/data/xml/impl/EnsoulData.java  |  12 +-
 .../data/xml/impl/EventEngineData.java        |   3 +-
 .../data/xml/impl/ExperienceData.java         |   4 +-
 .../data/xml/impl/ExtendDropData.java         |   4 +-
 .../data/xml/impl/FakePlayerData.java         |   4 +-
 .../gameserver/data/xml/impl/FenceData.java   |   4 +-
 .../gameserver/data/xml/impl/FishingData.java |   4 +-
 .../gameserver/data/xml/impl/HennaData.java   |   4 +-
 .../data/xml/impl/HitConditionBonusData.java  |   4 +-
 .../data/xml/impl/InitialEquipmentData.java   |   4 +-
 .../data/xml/impl/InitialShortcutData.java    |   4 +-
 .../xml/impl/ItemCrystallizationData.java     |   4 +-
 .../gameserver/data/xml/impl/KarmaData.java   |   4 +-
 .../data/xml/impl/LuckyGameData.java          |   4 +-
 .../data/xml/impl/MultisellData.java          |   8 +-
 .../gameserver/data/xml/impl/NpcData.java     |  12 +-
 .../gameserver/data/xml/impl/OptionData.java  |   7 +-
 .../data/xml/impl/PetDataTable.java           |   8 +-
 .../data/xml/impl/PetSkillData.java           |   4 +-
 .../data/xml/impl/PlayerTemplateData.java     |   8 +-
 .../xml/impl/PlayerXpPercentLostData.java     |   4 +-
 .../data/xml/impl/PrimeShopData.java          |   4 +-
 .../gameserver/data/xml/impl/RecipeData.java  |   4 +-
 .../data/xml/impl/ResidenceFunctionsData.java |   4 +-
 .../gameserver/data/xml/impl/SayuneData.java  |   4 +-
 .../data/xml/impl/SecondaryAuthData.java      |   4 +-
 .../gameserver/data/xml/impl/ShuttleData.java |   4 +-
 .../data/xml/impl/SiegeScheduleData.java      |   4 +-
 .../gameserver/data/xml/impl/SkillData.java   |   9 +-
 .../data/xml/impl/SkillTreesData.java         |  47 ++---
 .../gameserver/data/xml/impl/SpawnsData.java  |  34 +++-
 .../data/xml/impl/StaticObjectData.java       |   4 +-
 .../data/xml/impl/TeleportersData.java        |   7 +-
 .../data/xml/impl/TransformData.java          |   8 +-
 .../data/xml/impl/VariationData.java          |   9 +-
 .../gameserver/engines/DocumentEngine.java    |  55 ++++--
 .../engines/items/DocumentItem.java           |   8 +-
 .../gameserver/handler/ConditionHandler.java  |   2 +-
 .../handler/DailyMissionHandler.java          |   2 +-
 .../gameserver/handler/EffectHandler.java     |   2 +-
 .../handler/SkillConditionHandler.java        |   2 +-
 .../instancemanager/CastleManorManager.java   |   4 +-
 .../instancemanager/CursedWeaponsManager.java |   4 +-
 .../FakePlayerChatManager.java                |   4 +-
 .../instancemanager/InstanceManager.java      |   3 +-
 .../instancemanager/ItemAuctionManager.java   |   4 +-
 .../instancemanager/MapRegionManager.java     |   4 +-
 .../instancemanager/SellBuffsManager.java     |   4 +-
 .../instancemanager/WalkingManager.java       |   4 +-
 .../instancemanager/ZoneManager.java          |  17 +-
 .../gameserver/model/quest/LongTimeEvent.java |   4 +-
 .../gameserver/model/stats/BaseStats.java     |   3 +-
 .../scripting/ScriptEngineManager.java        | 169 +++---------------
 .../loginserver/GameServerTable.java          |   4 +-
 .../dist/game/config/Scripts.xml              |   6 +-
 .../ai/others/ClassMaster/ClassMaster.java    |   4 +-
 .../admincommandhandlers/AdminQuest.java      |   4 +-
 .../admincommandhandlers/AdminReload.java     |   4 +-
 .../telnethandlers/server/Reload.java         |   4 +-
 .../java/com/l2jmobius/Config.java            |   4 +-
 .../commons/util/IGameXmlReader.java          | 118 ------------
 .../l2jmobius/commons/util/IXmlReader.java    | 107 ++++++++++-
 .../com/l2jmobius/gameserver/GameServer.java  |   2 +-
 .../gameserver/data/xml/impl/ActionData.java  |   4 +-
 .../gameserver/data/xml/impl/AdminData.java   |   4 +-
 .../data/xml/impl/AppearanceItemData.java     |   4 +-
 .../data/xml/impl/ArmorSetsData.java          |  10 +-
 .../data/xml/impl/AttendanceRewardData.java   |   4 +-
 .../data/xml/impl/BeautyShopData.java         |   4 +-
 .../gameserver/data/xml/impl/BuyListData.java |   8 +-
 .../gameserver/data/xml/impl/CastleData.java  |  10 +-
 .../data/xml/impl/CategoryData.java           |   4 +-
 .../data/xml/impl/ClanHallData.java           |   8 +-
 .../data/xml/impl/ClanRewardData.java         |   3 +-
 .../data/xml/impl/ClassListData.java          |   8 +-
 .../data/xml/impl/CombinationItemsData.java   |   4 +-
 .../gameserver/data/xml/impl/CubicData.java   |   6 +-
 .../data/xml/impl/DailyMissionData.java       |   4 +-
 .../gameserver/data/xml/impl/DoorData.java    |   3 +-
 .../data/xml/impl/EnchantItemData.java        |   4 +-
 .../data/xml/impl/EnchantItemGroupsData.java  |   4 +-
 .../data/xml/impl/EnchantItemHPBonusData.java |   4 +-
 .../data/xml/impl/EnchantItemOptionsData.java |   4 +-
 .../data/xml/impl/EnchantSkillGroupsData.java |  11 +-
 .../gameserver/data/xml/impl/EnsoulData.java  |  12 +-
 .../data/xml/impl/EventEngineData.java        |   3 +-
 .../data/xml/impl/ExperienceData.java         |   4 +-
 .../data/xml/impl/ExtendDropData.java         |   4 +-
 .../data/xml/impl/FakePlayerData.java         |   4 +-
 .../gameserver/data/xml/impl/FenceData.java   |   4 +-
 .../gameserver/data/xml/impl/FishingData.java |   4 +-
 .../gameserver/data/xml/impl/HennaData.java   |   4 +-
 .../data/xml/impl/HitConditionBonusData.java  |   4 +-
 .../data/xml/impl/InitialEquipmentData.java   |   4 +-
 .../data/xml/impl/InitialShortcutData.java    |   4 +-
 .../xml/impl/ItemCrystallizationData.java     |   4 +-
 .../gameserver/data/xml/impl/KarmaData.java   |   4 +-
 .../data/xml/impl/LuckyGameData.java          |   4 +-
 .../data/xml/impl/MultisellData.java          |   8 +-
 .../gameserver/data/xml/impl/NpcData.java     |  12 +-
 .../gameserver/data/xml/impl/OptionData.java  |   7 +-
 .../data/xml/impl/PetDataTable.java           |   8 +-
 .../data/xml/impl/PetSkillData.java           |   4 +-
 .../data/xml/impl/PlayerTemplateData.java     |   8 +-
 .../xml/impl/PlayerXpPercentLostData.java     |   4 +-
 .../data/xml/impl/PrimeShopData.java          |   4 +-
 .../gameserver/data/xml/impl/RecipeData.java  |   4 +-
 .../data/xml/impl/ResidenceFunctionsData.java |   4 +-
 .../gameserver/data/xml/impl/SayuneData.java  |   4 +-
 .../data/xml/impl/SecondaryAuthData.java      |   4 +-
 .../gameserver/data/xml/impl/ShuttleData.java |   4 +-
 .../data/xml/impl/SiegeScheduleData.java      |   4 +-
 .../gameserver/data/xml/impl/SkillData.java   |   9 +-
 .../data/xml/impl/SkillTreesData.java         |  47 ++---
 .../gameserver/data/xml/impl/SpawnsData.java  |  34 +++-
 .../data/xml/impl/StaticObjectData.java       |   4 +-
 .../data/xml/impl/TeleportersData.java        |   7 +-
 .../data/xml/impl/TransformData.java          |   8 +-
 .../data/xml/impl/VariationData.java          |   9 +-
 .../gameserver/engines/DocumentEngine.java    |  55 ++++--
 .../engines/items/DocumentItem.java           |   8 +-
 .../gameserver/handler/ConditionHandler.java  |   2 +-
 .../handler/DailyMissionHandler.java          |   2 +-
 .../gameserver/handler/EffectHandler.java     |   2 +-
 .../handler/SkillConditionHandler.java        |   2 +-
 .../instancemanager/CastleManorManager.java   |   4 +-
 .../instancemanager/CursedWeaponsManager.java |   4 +-
 .../FakePlayerChatManager.java                |   4 +-
 .../instancemanager/InstanceManager.java      |   3 +-
 .../instancemanager/ItemAuctionManager.java   |   4 +-
 .../instancemanager/MapRegionManager.java     |   4 +-
 .../instancemanager/SellBuffsManager.java     |   4 +-
 .../instancemanager/WalkingManager.java       |   4 +-
 .../instancemanager/ZoneManager.java          |  17 +-
 .../gameserver/model/quest/LongTimeEvent.java |   4 +-
 .../gameserver/model/stats/BaseStats.java     |   3 +-
 .../scripting/ScriptEngineManager.java        | 169 +++---------------
 .../loginserver/GameServerTable.java          |   4 +-
 .../dist/game/config/Scripts.xml              |   6 +-
 .../ai/others/ClassMaster/ClassMaster.java    |   4 +-
 .../admincommandhandlers/AdminQuest.java      |   4 +-
 .../admincommandhandlers/AdminReload.java     |   4 +-
 .../telnethandlers/server/Reload.java         |   4 +-
 .../java/com/l2jmobius/Config.java            |   4 +-
 .../commons/util/IGameXmlReader.java          | 118 ------------
 .../l2jmobius/commons/util/IXmlReader.java    | 107 ++++++++++-
 .../com/l2jmobius/gameserver/GameServer.java  |   2 +-
 .../gameserver/data/xml/impl/ActionData.java  |   4 +-
 .../gameserver/data/xml/impl/AdminData.java   |   4 +-
 .../data/xml/impl/AppearanceItemData.java     |   4 +-
 .../data/xml/impl/ArmorSetsData.java          |  10 +-
 .../data/xml/impl/AttendanceRewardData.java   |   4 +-
 .../data/xml/impl/BeautyShopData.java         |   4 +-
 .../gameserver/data/xml/impl/BuyListData.java |   8 +-
 .../gameserver/data/xml/impl/CastleData.java  |  10 +-
 .../data/xml/impl/CategoryData.java           |   4 +-
 .../data/xml/impl/ClanHallData.java           |   8 +-
 .../data/xml/impl/ClanRewardData.java         |   3 +-
 .../data/xml/impl/ClassListData.java          |   8 +-
 .../data/xml/impl/CombinationItemsData.java   |   4 +-
 .../gameserver/data/xml/impl/CubicData.java   |   6 +-
 .../data/xml/impl/DailyMissionData.java       |   4 +-
 .../gameserver/data/xml/impl/DoorData.java    |   3 +-
 .../data/xml/impl/EnchantItemData.java        |   4 +-
 .../data/xml/impl/EnchantItemGroupsData.java  |   4 +-
 .../data/xml/impl/EnchantItemHPBonusData.java |   4 +-
 .../data/xml/impl/EnchantItemOptionsData.java |   4 +-
 .../data/xml/impl/EnchantSkillGroupsData.java |  11 +-
 .../gameserver/data/xml/impl/EnsoulData.java  |  12 +-
 .../data/xml/impl/EventEngineData.java        |   3 +-
 .../data/xml/impl/ExperienceData.java         |   4 +-
 .../data/xml/impl/ExtendDropData.java         |   4 +-
 .../data/xml/impl/FakePlayerData.java         |   4 +-
 .../gameserver/data/xml/impl/FenceData.java   |   4 +-
 .../gameserver/data/xml/impl/FishingData.java |   4 +-
 .../gameserver/data/xml/impl/HennaData.java   |   4 +-
 .../data/xml/impl/HitConditionBonusData.java  |   4 +-
 .../data/xml/impl/InitialEquipmentData.java   |   4 +-
 .../data/xml/impl/InitialShortcutData.java    |   4 +-
 .../xml/impl/ItemCrystallizationData.java     |   4 +-
 .../gameserver/data/xml/impl/KarmaData.java   |   4 +-
 .../data/xml/impl/LuckyGameData.java          |   4 +-
 .../data/xml/impl/MultisellData.java          |   8 +-
 .../gameserver/data/xml/impl/NpcData.java     |  12 +-
 .../gameserver/data/xml/impl/OptionData.java  |   7 +-
 .../data/xml/impl/PetDataTable.java           |   8 +-
 .../data/xml/impl/PetSkillData.java           |   4 +-
 .../data/xml/impl/PlayerTemplateData.java     |   8 +-
 .../xml/impl/PlayerXpPercentLostData.java     |   4 +-
 .../data/xml/impl/PrimeShopData.java          |   4 +-
 .../gameserver/data/xml/impl/RecipeData.java  |   4 +-
 .../data/xml/impl/ResidenceFunctionsData.java |   4 +-
 .../gameserver/data/xml/impl/SayuneData.java  |   4 +-
 .../data/xml/impl/SecondaryAuthData.java      |   4 +-
 .../gameserver/data/xml/impl/ShuttleData.java |   4 +-
 .../data/xml/impl/SiegeScheduleData.java      |   4 +-
 .../gameserver/data/xml/impl/SkillData.java   |   9 +-
 .../data/xml/impl/SkillTreesData.java         |  47 ++---
 .../gameserver/data/xml/impl/SpawnsData.java  |  34 +++-
 .../data/xml/impl/StaticObjectData.java       |   4 +-
 .../data/xml/impl/TeleportersData.java        |   7 +-
 .../data/xml/impl/TransformData.java          |   8 +-
 .../data/xml/impl/VariationData.java          |   9 +-
 .../gameserver/engines/DocumentEngine.java    |  55 ++++--
 .../engines/items/DocumentItem.java           |   8 +-
 .../gameserver/handler/ConditionHandler.java  |   2 +-
 .../handler/DailyMissionHandler.java          |   2 +-
 .../gameserver/handler/EffectHandler.java     |   2 +-
 .../handler/SkillConditionHandler.java        |   2 +-
 .../instancemanager/CastleManorManager.java   |   4 +-
 .../instancemanager/CursedWeaponsManager.java |   4 +-
 .../FakePlayerChatManager.java                |   4 +-
 .../instancemanager/InstanceManager.java      |   3 +-
 .../instancemanager/ItemAuctionManager.java   |   4 +-
 .../instancemanager/MapRegionManager.java     |   4 +-
 .../instancemanager/SellBuffsManager.java     |   4 +-
 .../instancemanager/WalkingManager.java       |   4 +-
 .../instancemanager/ZoneManager.java          |  17 +-
 .../gameserver/model/quest/LongTimeEvent.java |   4 +-
 .../gameserver/model/stats/BaseStats.java     |   3 +-
 .../scripting/ScriptEngineManager.java        | 169 +++---------------
 .../loginserver/GameServerTable.java          |   4 +-
 1036 files changed, 4975 insertions(+), 6228 deletions(-)
 delete mode 100644 L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/commons/util/IGameXmlReader.java
 delete mode 100644 L2J_Mobius_2.5_Underground/java/com/l2jmobius/commons/util/IGameXmlReader.java
 delete mode 100644 L2J_Mobius_3.0_Helios/java/com/l2jmobius/commons/util/IGameXmlReader.java
 delete mode 100644 L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/commons/util/IGameXmlReader.java
 delete mode 100644 L2J_Mobius_5.0_Salvation/java/com/l2jmobius/commons/util/IGameXmlReader.java
 delete mode 100644 L2J_Mobius_5.5_EtinasFate/java/com/l2jmobius/commons/util/IGameXmlReader.java
 delete mode 100644 L2J_Mobius_6.0_Fafurion/java/com/l2jmobius/commons/util/IGameXmlReader.java
 delete mode 100644 L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/commons/util/IGameXmlReader.java
 delete mode 100644 L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/commons/util/IGameXmlReader.java
 delete mode 100644 L2J_Mobius_Classic_2.1_Zaken/java/com/l2jmobius/commons/util/IGameXmlReader.java
 delete mode 100644 L2J_Mobius_Classic_2.2_Antharas/java/com/l2jmobius/commons/util/IGameXmlReader.java
 delete mode 100644 L2J_Mobius_Classic_2.3_SevenSigns/java/com/l2jmobius/commons/util/IGameXmlReader.java

diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/config/Scripts.xml b/L2J_Mobius_1.0_Ertheia/dist/game/config/Scripts.xml
index d6db8c84db..54d05b241f 100644
--- a/L2J_Mobius_1.0_Ertheia/dist/game/config/Scripts.xml
+++ b/L2J_Mobius_1.0_Ertheia/dist/game/config/Scripts.xml
@@ -2,10 +2,7 @@
 <list xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../data/xsd/Scripts.xsd">
 	<!-- Skip these filenames from script loading, because they are already loaded using a different way. -->
 	<exclude file="package-info.java" />
-	<exclude file="MasterHandler.java" />
-	<exclude file="EffectMasterHandler.java" />
-	<exclude file="SkillConditionMasterHandler.java" />
-	<exclude file="ConditionMasterHandler.java" />
+	<exclude file="handlers" />
 	
 	<!--
 	With this file you can exclude/include specific folders/files from within the scripts directory.
diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/ai/areas/ImperialTomb/FourSepulchers/FourSepulchers.java b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/ai/areas/ImperialTomb/FourSepulchers/FourSepulchers.java
index 053e095ace..7a59593544 100644
--- a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/ai/areas/ImperialTomb/FourSepulchers/FourSepulchers.java
+++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/ai/areas/ImperialTomb/FourSepulchers/FourSepulchers.java
@@ -29,7 +29,7 @@ import org.w3c.dom.NamedNodeMap;
 import org.w3c.dom.Node;
 
 import com.l2jmobius.commons.concurrent.ThreadPool;
-import com.l2jmobius.commons.util.IGameXmlReader;
+import com.l2jmobius.commons.util.IXmlReader;
 import com.l2jmobius.gameserver.ai.CtrlIntention;
 import com.l2jmobius.gameserver.enums.ChatType;
 import com.l2jmobius.gameserver.geoengine.GeoEngine;
@@ -56,7 +56,7 @@ import quests.Q00620_FourGoblets.Q00620_FourGoblets;
  * Four Selpuchers AI
  * @author Mobius
  */
-public final class FourSepulchers extends AbstractNpcAI implements IGameXmlReader
+public final class FourSepulchers extends AbstractNpcAI implements IXmlReader
 {
 	Logger LOGGER = Logger.getLogger(FourSepulchers.class.getName());
 	
diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/ai/bosses/Tiat/Stage1.java b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/ai/bosses/Tiat/Stage1.java
index e1e54da1a8..1b350c946e 100644
--- a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/ai/bosses/Tiat/Stage1.java
+++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/ai/bosses/Tiat/Stage1.java
@@ -30,7 +30,7 @@ import org.w3c.dom.NamedNodeMap;
 import org.w3c.dom.Node;
 
 import com.l2jmobius.commons.util.CommonUtil;
-import com.l2jmobius.commons.util.IGameXmlReader;
+import com.l2jmobius.commons.util.IXmlReader;
 import com.l2jmobius.gameserver.ai.CtrlIntention;
 import com.l2jmobius.gameserver.enums.Movie;
 import com.l2jmobius.gameserver.enums.TrapAction;
@@ -66,7 +66,7 @@ import instances.AbstractInstance;
  * Please maintain consistency between the Seed scripts.
  * @author Gigiikun
  */
-public final class Stage1 extends AbstractInstance implements IGameXmlReader
+public final class Stage1 extends AbstractInstance implements IXmlReader
 {
 	Logger LOGGER = Logger.getLogger(Stage1.class.getName());
 	
diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/ai/others/ClassMaster/ClassMaster.java b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/ai/others/ClassMaster/ClassMaster.java
index 504755eee8..50cde6735a 100644
--- a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/ai/others/ClassMaster/ClassMaster.java
+++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/ai/others/ClassMaster/ClassMaster.java
@@ -30,7 +30,7 @@ import org.w3c.dom.NamedNodeMap;
 import org.w3c.dom.Node;
 
 import com.l2jmobius.Config;
-import com.l2jmobius.commons.util.IGameXmlReader;
+import com.l2jmobius.commons.util.IXmlReader;
 import com.l2jmobius.gameserver.data.xml.impl.CategoryData;
 import com.l2jmobius.gameserver.data.xml.impl.ClassListData;
 import com.l2jmobius.gameserver.data.xml.impl.SkillData;
@@ -63,7 +63,7 @@ import ai.AbstractNpcAI;
  * Class Master AI.
  * @author Nik
  */
-public final class ClassMaster extends AbstractNpcAI implements IGameXmlReader
+public final class ClassMaster extends AbstractNpcAI implements IXmlReader
 {
 	// NPCs
 	private static final List<Integer> CLASS_MASTERS = new ArrayList<>();
diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/ai/others/MentorGuide/MentorGuide.java b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/ai/others/MentorGuide/MentorGuide.java
index ce6e3bd57b..eeb6b34418 100644
--- a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/ai/others/MentorGuide/MentorGuide.java
+++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/ai/others/MentorGuide/MentorGuide.java
@@ -26,7 +26,7 @@ import org.w3c.dom.Document;
 import org.w3c.dom.Node;
 
 import com.l2jmobius.Config;
-import com.l2jmobius.commons.util.IGameXmlReader;
+import com.l2jmobius.commons.util.IXmlReader;
 import com.l2jmobius.gameserver.enums.CategoryType;
 import com.l2jmobius.gameserver.enums.MailType;
 import com.l2jmobius.gameserver.instancemanager.MailManager;
@@ -62,7 +62,7 @@ import ai.AbstractNpcAI;
  * Mentor Guide AI.
  * @author Gnacik, UnAfraid
  */
-public final class MentorGuide extends AbstractNpcAI implements IGameXmlReader
+public final class MentorGuide extends AbstractNpcAI implements IXmlReader
 {
 	private static final Logger LOGGER = Logger.getLogger(MentorGuide.class.getName());
 	
diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/ai/others/NpcBuffers/NpcBuffersData.java b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/ai/others/NpcBuffers/NpcBuffersData.java
index b0287e1df6..51708af4f8 100644
--- a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/ai/others/NpcBuffers/NpcBuffersData.java
+++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/ai/others/NpcBuffers/NpcBuffersData.java
@@ -27,13 +27,13 @@ import org.w3c.dom.Document;
 import org.w3c.dom.NamedNodeMap;
 import org.w3c.dom.Node;
 
-import com.l2jmobius.commons.util.IGameXmlReader;
+import com.l2jmobius.commons.util.IXmlReader;
 import com.l2jmobius.gameserver.model.StatsSet;
 
 /**
  * @author UnAfraid
  */
-class NpcBuffersData implements IGameXmlReader
+class NpcBuffersData implements IXmlReader
 {
 	private static final Logger LOGGER = Logger.getLogger(NpcBuffersData.class.getName());
 	
diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/admincommandhandlers/AdminQuest.java b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/admincommandhandlers/AdminQuest.java
index 228cc1668d..a771c4ab90 100644
--- a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/admincommandhandlers/AdminQuest.java
+++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/admincommandhandlers/AdminQuest.java
@@ -320,7 +320,7 @@ public class AdminQuest implements IAdminCommandHandler
 				{
 					sb.append("<a action=\"bypass -h admin_script_dir " + c + "\">" + c + "</a><br1>");
 				}
-				else if (c.endsWith(".java") || c.endsWith(".py"))
+				else if (c.endsWith(".java"))
 				{
 					sb.append("<a action=\"bypass -h admin_script_load " + c + "\"><font color=\"LEVEL\">" + c + "</font></a><br1>");
 				}
@@ -352,7 +352,7 @@ public class AdminQuest implements IAdminCommandHandler
 				{
 					sb.append("<a action=\"bypass -h admin_script_dir " + currentPath + "/" + c + "\">" + (questReducedNames ? getQuestName(c) : c) + "</a><br1>");
 				}
-				else if (c.endsWith(".java") || c.endsWith(".py"))
+				else if (c.endsWith(".java"))
 				{
 					sb.append("<a action=\"bypass -h admin_script_load " + currentPath + "/" + c + "\"><font color=\"LEVEL\">" + c + "</font></a><br1>");
 				}
diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/admincommandhandlers/AdminReload.java b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/admincommandhandlers/AdminReload.java
index 59096a6558..f97fc3d45c 100644
--- a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/admincommandhandlers/AdminReload.java
+++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/admincommandhandlers/AdminReload.java
@@ -221,7 +221,7 @@ public class AdminReload implements IAdminCommandHandler
 				{
 					try
 					{
-						ScriptEngineManager.getInstance().executeEffectMasterHandler();
+						ScriptEngineManager.getInstance().executeScript(ScriptEngineManager.EFFECT_MASTER_HANDLER_FILE);
 						AdminData.getInstance().broadcastMessageToGMs(activeChar.getName() + ": Reloaded effect master handler.");
 					}
 					catch (Exception e)
@@ -235,7 +235,7 @@ public class AdminReload implements IAdminCommandHandler
 				{
 					try
 					{
-						ScriptEngineManager.getInstance().executeMasterHandler();
+						ScriptEngineManager.getInstance().executeScript(ScriptEngineManager.MASTER_HANDLER_FILE);
 						AdminData.getInstance().broadcastMessageToGMs(activeChar.getName() + ": Reloaded master handler.");
 					}
 					catch (Exception e)
diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/telnethandlers/server/Reload.java b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/telnethandlers/server/Reload.java
index c47b82561d..90c21b1624 100644
--- a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/telnethandlers/server/Reload.java
+++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/telnethandlers/server/Reload.java
@@ -182,7 +182,7 @@ public class Reload implements ITelnetCommand
 			{
 				try
 				{
-					ScriptEngineManager.getInstance().executeEffectMasterHandler();
+					ScriptEngineManager.getInstance().executeScript(ScriptEngineManager.EFFECT_MASTER_HANDLER_FILE);
 					return AdminData.getInstance().broadcastMessageToGMs("Telnet Admin: Reloaded effect master handler.");
 				}
 				catch (Exception e)
@@ -195,7 +195,7 @@ public class Reload implements ITelnetCommand
 			{
 				try
 				{
-					ScriptEngineManager.getInstance().executeMasterHandler();
+					ScriptEngineManager.getInstance().executeScript(ScriptEngineManager.MASTER_HANDLER_FILE);
 					return AdminData.getInstance().broadcastMessageToGMs("Telnet Admin: Reloaded master handler.");
 				}
 				catch (Exception e)
diff --git a/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/Config.java b/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/Config.java
index 4a4633a183..d368554cf5 100644
--- a/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/Config.java
+++ b/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/Config.java
@@ -54,7 +54,7 @@ import org.w3c.dom.Document;
 import org.w3c.dom.NamedNodeMap;
 import org.w3c.dom.Node;
 
-import com.l2jmobius.commons.util.IGameXmlReader;
+import com.l2jmobius.commons.util.IXmlReader;
 import com.l2jmobius.commons.util.PropertiesParser;
 import com.l2jmobius.commons.util.StringUtil;
 import com.l2jmobius.gameserver.enums.ChatType;
@@ -3098,7 +3098,7 @@ public final class Config
 		return result;
 	}
 	
-	private static class IPConfigData implements IGameXmlReader
+	private static class IPConfigData implements IXmlReader
 	{
 		private static final List<String> _subnets = new ArrayList<>(5);
 		private static final List<String> _hosts = new ArrayList<>(5);
diff --git a/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/commons/util/IGameXmlReader.java b/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/commons/util/IGameXmlReader.java
deleted file mode 100644
index b29089db77..0000000000
--- a/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/commons/util/IGameXmlReader.java
+++ /dev/null
@@ -1,118 +0,0 @@
-/*
- * This file is part of the L2J Mobius project.
- * 
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- * 
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * General Public License for more details.
- * 
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- */
-package com.l2jmobius.commons.util;
-
-import java.io.File;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
-import org.w3c.dom.NamedNodeMap;
-import org.w3c.dom.Node;
-
-import com.l2jmobius.Config;
-import com.l2jmobius.gameserver.model.Location;
-import com.l2jmobius.gameserver.model.holders.MinionHolder;
-import com.l2jmobius.gameserver.model.holders.SkillHolder;
-
-/**
- * Interface for XML parsers.
- * @author Zoey76
- */
-public interface IGameXmlReader extends IXmlReader
-{
-	/**
-	 * Wrapper for {@link #parseFile(File)} method.
-	 * @param path the relative path to the datapack root of the XML file to parse.
-	 */
-	default void parseDatapackFile(String path)
-	{
-		parseFile(new File(Config.DATAPACK_ROOT, path));
-	}
-	
-	/**
-	 * Wrapper for {@link #parseDirectory(File, boolean)}.
-	 * @param path the path to the directory where the XML files are
-	 * @param recursive parses all sub folders if there is
-	 * @return {@code false} if it fails to find the directory, {@code true} otherwise
-	 */
-	default boolean parseDatapackDirectory(String path, boolean recursive)
-	{
-		return parseDirectory(new File(Config.DATAPACK_ROOT, path), recursive);
-	}
-	
-	/**
-	 * @param n
-	 * @return a map of parameters
-	 */
-	default Map<String, Object> parseParameters(Node n)
-	{
-		final Map<String, Object> parameters = new HashMap<>();
-		for (Node parameters_node = n.getFirstChild(); parameters_node != null; parameters_node = parameters_node.getNextSibling())
-		{
-			NamedNodeMap attrs = parameters_node.getAttributes();
-			switch (parameters_node.getNodeName().toLowerCase())
-			{
-				case "param":
-				{
-					parameters.put(parseString(attrs, "name"), parseString(attrs, "value"));
-					break;
-				}
-				case "skill":
-				{
-					parameters.put(parseString(attrs, "name"), new SkillHolder(parseInteger(attrs, "id"), parseInteger(attrs, "level")));
-					break;
-				}
-				case "location":
-				{
-					parameters.put(parseString(attrs, "name"), new Location(parseInteger(attrs, "x"), parseInteger(attrs, "y"), parseInteger(attrs, "z"), parseInteger(attrs, "heading", 0)));
-					break;
-				}
-				case "minions":
-				{
-					final List<MinionHolder> minions = new ArrayList<>(1);
-					for (Node minions_node = parameters_node.getFirstChild(); minions_node != null; minions_node = minions_node.getNextSibling())
-					{
-						if (minions_node.getNodeName().equalsIgnoreCase("npc"))
-						{
-							attrs = minions_node.getAttributes();
-							minions.add(new MinionHolder(parseInteger(attrs, "id"), parseInteger(attrs, "count"), parseInteger(attrs, "respawnTime"), parseInteger(attrs, "weightPoint")));
-						}
-					}
-					
-					if (!minions.isEmpty())
-					{
-						parameters.put(parseString(parameters_node.getAttributes(), "name"), minions);
-					}
-					break;
-				}
-			}
-		}
-		return parameters;
-	}
-	
-	default Location parseLocation(Node n)
-	{
-		final NamedNodeMap attrs = n.getAttributes();
-		final int x = parseInteger(attrs, "x");
-		final int y = parseInteger(attrs, "y");
-		final int z = parseInteger(attrs, "z");
-		final int heading = parseInteger(attrs, "heading", 0);
-		return new Location(x, y, z, heading);
-	}
-}
diff --git a/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/commons/util/IXmlReader.java b/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/commons/util/IXmlReader.java
index 0317816fd8..4bfed2396e 100644
--- a/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/commons/util/IXmlReader.java
+++ b/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/commons/util/IXmlReader.java
@@ -18,8 +18,13 @@ package com.l2jmobius.commons.util;
 
 import java.io.File;
 import java.io.FileFilter;
+import java.util.ArrayList;
+import java.util.HashMap;
 import java.util.LinkedHashMap;
+import java.util.List;
 import java.util.Map;
+import java.util.concurrent.CopyOnWriteArrayList;
+import java.util.concurrent.ScheduledFuture;
 import java.util.function.Consumer;
 import java.util.function.Predicate;
 import java.util.logging.Level;
@@ -35,7 +40,12 @@ import org.w3c.dom.NodeList;
 import org.xml.sax.ErrorHandler;
 import org.xml.sax.SAXParseException;
 
+import com.l2jmobius.Config;
+import com.l2jmobius.commons.concurrent.ThreadPool;
 import com.l2jmobius.commons.util.file.filter.XMLFilter;
+import com.l2jmobius.gameserver.model.Location;
+import com.l2jmobius.gameserver.model.holders.MinionHolder;
+import com.l2jmobius.gameserver.model.holders.SkillHolder;
 
 /**
  * Interface for XML parsers.
@@ -56,6 +66,15 @@ public interface IXmlReader
 	 */
 	void load();
 	
+	/**
+	 * Wrapper for {@link #parseFile(File)} method.
+	 * @param path the relative path to the datapack root of the XML file to parse.
+	 */
+	default void parseDatapackFile(String path)
+	{
+		parseFile(new File(Config.DATAPACK_ROOT, path));
+	}
+	
 	/**
 	 * Parses a single XML file.<br>
 	 * If the file was successfully parsed, call {@link #parseDocument(Document, File)} for the parsed document.<br>
@@ -121,6 +140,17 @@ public interface IXmlReader
 		return parseDirectory(file, false);
 	}
 	
+	/**
+	 * Wrapper for {@link #parseDirectory(File, boolean)}.
+	 * @param path the path to the directory where the XML files are
+	 * @param recursive parses all sub folders if there is
+	 * @return {@code false} if it fails to find the directory, {@code true} otherwise
+	 */
+	default boolean parseDatapackDirectory(String path, boolean recursive)
+	{
+		return parseDirectory(new File(Config.DATAPACK_ROOT, path), recursive);
+	}
+	
 	/**
 	 * Loads all XML files from {@code path} and calls {@link #parseFile(File)} for each one of them.
 	 * @param dir the directory object to scan.
@@ -135,6 +165,7 @@ public interface IXmlReader
 			return false;
 		}
 		
+		final List<ScheduledFuture<?>> jobs = new CopyOnWriteArrayList<>();
 		final File[] listOfFiles = dir.listFiles();
 		for (File f : listOfFiles)
 		{
@@ -144,9 +175,23 @@ public interface IXmlReader
 			}
 			else if (getCurrentFileFilter().accept(f))
 			{
-				parseFile(f);
+				jobs.add(ThreadPool.schedule(() ->
+				{
+					parseFile(f);
+				}, 0));
 			}
 		}
+		while (!jobs.isEmpty())
+		{
+			for (ScheduledFuture<?> job : jobs)
+			{
+				if ((job == null) || job.isDone() || job.isCancelled())
+				{
+					jobs.remove(job);
+				}
+			}
+		}
+		
 		return true;
 	}
 	
@@ -531,6 +576,16 @@ public interface IXmlReader
 		return parseString(attrs.getNamedItem(name), defaultValue);
 	}
 	
+	default Location parseLocation(Node n)
+	{
+		final NamedNodeMap attrs = n.getAttributes();
+		final int x = parseInteger(attrs, "x");
+		final int y = parseInteger(attrs, "y");
+		final int z = parseInteger(attrs, "z");
+		final int heading = parseInteger(attrs, "heading", 0);
+		return new Location(x, y, z, heading);
+	}
+	
 	/**
 	 * Parses an enumerated value.
 	 * @param <T> the enumerated type
@@ -612,6 +667,56 @@ public interface IXmlReader
 		return map;
 	}
 	
+	/**
+	 * @param n
+	 * @return a map of parameters
+	 */
+	default Map<String, Object> parseParameters(Node n)
+	{
+		final Map<String, Object> parameters = new HashMap<>();
+		for (Node parameters_node = n.getFirstChild(); parameters_node != null; parameters_node = parameters_node.getNextSibling())
+		{
+			NamedNodeMap attrs = parameters_node.getAttributes();
+			switch (parameters_node.getNodeName().toLowerCase())
+			{
+				case "param":
+				{
+					parameters.put(parseString(attrs, "name"), parseString(attrs, "value"));
+					break;
+				}
+				case "skill":
+				{
+					parameters.put(parseString(attrs, "name"), new SkillHolder(parseInteger(attrs, "id"), parseInteger(attrs, "level")));
+					break;
+				}
+				case "location":
+				{
+					parameters.put(parseString(attrs, "name"), new Location(parseInteger(attrs, "x"), parseInteger(attrs, "y"), parseInteger(attrs, "z"), parseInteger(attrs, "heading", 0)));
+					break;
+				}
+				case "minions":
+				{
+					final List<MinionHolder> minions = new ArrayList<>(1);
+					for (Node minions_node = parameters_node.getFirstChild(); minions_node != null; minions_node = minions_node.getNextSibling())
+					{
+						if (minions_node.getNodeName().equalsIgnoreCase("npc"))
+						{
+							attrs = minions_node.getAttributes();
+							minions.add(new MinionHolder(parseInteger(attrs, "id"), parseInteger(attrs, "count"), parseInteger(attrs, "respawnTime"), parseInteger(attrs, "weightPoint")));
+						}
+					}
+					
+					if (!minions.isEmpty())
+					{
+						parameters.put(parseString(parameters_node.getAttributes(), "name"), minions);
+					}
+					break;
+				}
+			}
+		}
+		return parameters;
+	}
+	
 	/**
 	 * Executes action for each child of node
 	 * @param node
diff --git a/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/GameServer.java b/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/GameServer.java
index 73f22ab36d..b67d3e7331 100644
--- a/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/GameServer.java
+++ b/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/GameServer.java
@@ -354,7 +354,7 @@ public class GameServer
 		try
 		{
 			LOGGER.info(getClass().getSimpleName() + ": Loading server scripts:");
-			ScriptEngineManager.getInstance().executeMasterHandler();
+			ScriptEngineManager.getInstance().executeScript(ScriptEngineManager.MASTER_HANDLER_FILE);
 			ScriptEngineManager.getInstance().executeScriptList();
 		}
 		catch (Exception e)
diff --git a/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/data/xml/impl/AbilityPointsData.java b/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/data/xml/impl/AbilityPointsData.java
index a8d5526d01..e26e8e2b53 100644
--- a/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/data/xml/impl/AbilityPointsData.java
+++ b/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/data/xml/impl/AbilityPointsData.java
@@ -25,13 +25,13 @@ import org.w3c.dom.Document;
 import org.w3c.dom.NamedNodeMap;
 import org.w3c.dom.Node;
 
-import com.l2jmobius.commons.util.IGameXmlReader;
+import com.l2jmobius.commons.util.IXmlReader;
 import com.l2jmobius.gameserver.model.holders.RangeAbilityPointsHolder;
 
 /**
  * @author UnAfraid
  */
-public final class AbilityPointsData implements IGameXmlReader
+public final class AbilityPointsData implements IXmlReader
 {
 	private static final Logger LOGGER = Logger.getLogger(AbilityPointsData.class.getName());
 	private final List<RangeAbilityPointsHolder> _points = new ArrayList<>();
diff --git a/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/data/xml/impl/ActionData.java b/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/data/xml/impl/ActionData.java
index 0bffdc5bb1..a322dad1d9 100644
--- a/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/data/xml/impl/ActionData.java
+++ b/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/data/xml/impl/ActionData.java
@@ -23,14 +23,14 @@ import java.util.logging.Logger;
 
 import org.w3c.dom.Document;
 
-import com.l2jmobius.commons.util.IGameXmlReader;
+import com.l2jmobius.commons.util.IXmlReader;
 import com.l2jmobius.gameserver.model.ActionDataHolder;
 import com.l2jmobius.gameserver.model.StatsSet;
 
 /**
  * @author UnAfraid
  */
-public class ActionData implements IGameXmlReader
+public class ActionData implements IXmlReader
 {
 	private static final Logger LOGGER = Logger.getLogger(ActionData.class.getName());
 	
diff --git a/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/data/xml/impl/AdminData.java b/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/data/xml/impl/AdminData.java
index 0b1d3e3245..9e359b1521 100644
--- a/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/data/xml/impl/AdminData.java
+++ b/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/data/xml/impl/AdminData.java
@@ -29,7 +29,7 @@ import org.w3c.dom.Document;
 import org.w3c.dom.NamedNodeMap;
 import org.w3c.dom.Node;
 
-import com.l2jmobius.commons.util.IGameXmlReader;
+import com.l2jmobius.commons.util.IXmlReader;
 import com.l2jmobius.gameserver.model.AccessLevel;
 import com.l2jmobius.gameserver.model.AdminCommandAccessRight;
 import com.l2jmobius.gameserver.model.StatsSet;
@@ -42,7 +42,7 @@ import com.l2jmobius.gameserver.network.serverpackets.SystemMessage;
  * Loads administrator access levels and commands.
  * @author UnAfraid
  */
-public final class AdminData implements IGameXmlReader
+public final class AdminData implements IXmlReader
 {
 	private static final Logger LOGGER = Logger.getLogger(AdminData.class.getName());
 	
diff --git a/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/data/xml/impl/AlchemyData.java b/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/data/xml/impl/AlchemyData.java
index a5d8153b82..76f7eb98b5 100644
--- a/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/data/xml/impl/AlchemyData.java
+++ b/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/data/xml/impl/AlchemyData.java
@@ -25,7 +25,7 @@ import org.w3c.dom.Document;
 import org.w3c.dom.NamedNodeMap;
 import org.w3c.dom.Node;
 
-import com.l2jmobius.commons.util.IGameXmlReader;
+import com.l2jmobius.commons.util.IXmlReader;
 import com.l2jmobius.gameserver.model.StatsSet;
 import com.l2jmobius.gameserver.model.alchemy.AlchemyCraftData;
 import com.l2jmobius.gameserver.model.holders.ItemHolder;
@@ -33,7 +33,7 @@ import com.l2jmobius.gameserver.model.holders.ItemHolder;
 /**
  * @author Sdw
  */
-public class AlchemyData implements IGameXmlReader
+public class AlchemyData implements IXmlReader
 {
 	private static final Logger LOGGER = Logger.getLogger(AlchemyData.class.getName());
 	
diff --git a/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/data/xml/impl/AppearanceItemData.java b/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/data/xml/impl/AppearanceItemData.java
index f7746d073d..468f35ffce 100644
--- a/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/data/xml/impl/AppearanceItemData.java
+++ b/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/data/xml/impl/AppearanceItemData.java
@@ -24,7 +24,7 @@ import java.util.logging.Logger;
 import org.w3c.dom.Document;
 import org.w3c.dom.Node;
 
-import com.l2jmobius.commons.util.IGameXmlReader;
+import com.l2jmobius.commons.util.IXmlReader;
 import com.l2jmobius.gameserver.datatables.ItemTable;
 import com.l2jmobius.gameserver.enums.Race;
 import com.l2jmobius.gameserver.model.StatsSet;
@@ -36,7 +36,7 @@ import com.l2jmobius.gameserver.model.items.type.CrystalType;
 /**
  * @author UnAfraid
  */
-public class AppearanceItemData implements IGameXmlReader
+public class AppearanceItemData implements IXmlReader
 {
 	private static final Logger LOGGER = Logger.getLogger(AppearanceItemData.class.getName());
 	
diff --git a/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/data/xml/impl/ArmorSetsData.java b/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/data/xml/impl/ArmorSetsData.java
index 0f1445c10a..d7582d8d5a 100644
--- a/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/data/xml/impl/ArmorSetsData.java
+++ b/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/data/xml/impl/ArmorSetsData.java
@@ -19,9 +19,9 @@ package com.l2jmobius.gameserver.data.xml.impl;
 import java.io.File;
 import java.util.ArrayList;
 import java.util.Collections;
-import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
+import java.util.concurrent.ConcurrentHashMap;
 import java.util.logging.Logger;
 import java.util.stream.Stream;
 
@@ -29,7 +29,7 @@ import org.w3c.dom.Document;
 import org.w3c.dom.NamedNodeMap;
 import org.w3c.dom.Node;
 
-import com.l2jmobius.commons.util.IGameXmlReader;
+import com.l2jmobius.commons.util.IXmlReader;
 import com.l2jmobius.gameserver.datatables.ItemTable;
 import com.l2jmobius.gameserver.model.ArmorSet;
 import com.l2jmobius.gameserver.model.holders.ArmorsetSkillHolder;
@@ -40,12 +40,12 @@ import com.l2jmobius.gameserver.model.stats.BaseStats;
  * Loads armor set bonuses.
  * @author godson, Luno, UnAfraid
  */
-public final class ArmorSetsData implements IGameXmlReader
+public final class ArmorSetsData implements IXmlReader
 {
 	private static final Logger LOGGER = Logger.getLogger(ArmorSetsData.class.getName());
 	
-	private final Map<Integer, ArmorSet> _armorSets = new HashMap<>();
-	private final Map<Integer, List<ArmorSet>> _armorSetItems = new HashMap<>();
+	private final Map<Integer, ArmorSet> _armorSets = new ConcurrentHashMap<>();
+	private final Map<Integer, List<ArmorSet>> _armorSetItems = new ConcurrentHashMap<>();
 	
 	protected ArmorSetsData()
 	{
diff --git a/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/data/xml/impl/BeautyShopData.java b/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/data/xml/impl/BeautyShopData.java
index 133f11d978..d88ccc7747 100644
--- a/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/data/xml/impl/BeautyShopData.java
+++ b/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/data/xml/impl/BeautyShopData.java
@@ -24,7 +24,7 @@ import org.w3c.dom.Document;
 import org.w3c.dom.NamedNodeMap;
 import org.w3c.dom.Node;
 
-import com.l2jmobius.commons.util.IGameXmlReader;
+import com.l2jmobius.commons.util.IXmlReader;
 import com.l2jmobius.gameserver.enums.Race;
 import com.l2jmobius.gameserver.enums.Sex;
 import com.l2jmobius.gameserver.model.StatsSet;
@@ -34,7 +34,7 @@ import com.l2jmobius.gameserver.model.beautyshop.BeautyItem;
 /**
  * @author Sdw
  */
-public final class BeautyShopData implements IGameXmlReader
+public final class BeautyShopData implements IXmlReader
 {
 	private final Map<Race, Map<Sex, BeautyData>> _beautyList = new HashMap<>();
 	private final Map<Sex, BeautyData> _beautyData = new HashMap<>();
diff --git a/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/data/xml/impl/BuyListData.java b/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/data/xml/impl/BuyListData.java
index de298ef358..8ab9ea8097 100644
--- a/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/data/xml/impl/BuyListData.java
+++ b/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/data/xml/impl/BuyListData.java
@@ -21,8 +21,8 @@ import java.io.FileFilter;
 import java.sql.Connection;
 import java.sql.ResultSet;
 import java.sql.Statement;
-import java.util.HashMap;
 import java.util.Map;
+import java.util.concurrent.ConcurrentHashMap;
 import java.util.logging.Level;
 import java.util.logging.Logger;
 
@@ -31,7 +31,7 @@ import org.w3c.dom.NamedNodeMap;
 
 import com.l2jmobius.Config;
 import com.l2jmobius.commons.database.DatabaseFactory;
-import com.l2jmobius.commons.util.IGameXmlReader;
+import com.l2jmobius.commons.util.IXmlReader;
 import com.l2jmobius.commons.util.file.filter.NumericNameFilter;
 import com.l2jmobius.gameserver.datatables.ItemTable;
 import com.l2jmobius.gameserver.model.buylist.Product;
@@ -42,11 +42,11 @@ import com.l2jmobius.gameserver.model.items.Item;
  * Loads buy lists for NPCs.
  * @author NosBit
  */
-public final class BuyListData implements IGameXmlReader
+public final class BuyListData implements IXmlReader
 {
 	private static final Logger LOGGER = Logger.getLogger(BuyListData.class.getName());
 	
-	private final Map<Integer, ProductList> _buyLists = new HashMap<>();
+	private final Map<Integer, ProductList> _buyLists = new ConcurrentHashMap<>();
 	private static final FileFilter NUMERIC_FILTER = new NumericNameFilter();
 	
 	protected BuyListData()
diff --git a/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/data/xml/impl/CastleData.java b/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/data/xml/impl/CastleData.java
index 6618dcdf1d..792afbfa0b 100644
--- a/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/data/xml/impl/CastleData.java
+++ b/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/data/xml/impl/CastleData.java
@@ -19,16 +19,16 @@ package com.l2jmobius.gameserver.data.xml.impl;
 import java.io.File;
 import java.util.ArrayList;
 import java.util.Collections;
-import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
+import java.util.concurrent.ConcurrentHashMap;
 import java.util.stream.Collectors;
 
 import org.w3c.dom.Document;
 import org.w3c.dom.NamedNodeMap;
 import org.w3c.dom.Node;
 
-import com.l2jmobius.commons.util.IGameXmlReader;
+import com.l2jmobius.commons.util.IXmlReader;
 import com.l2jmobius.gameserver.enums.CastleSide;
 import com.l2jmobius.gameserver.enums.SiegeGuardType;
 import com.l2jmobius.gameserver.model.holders.CastleSpawnHolder;
@@ -37,10 +37,10 @@ import com.l2jmobius.gameserver.model.holders.SiegeGuardHolder;
 /**
  * @author St3eT
  */
-public final class CastleData implements IGameXmlReader
+public final class CastleData implements IXmlReader
 {
-	private final Map<Integer, List<CastleSpawnHolder>> _spawns = new HashMap<>();
-	private static final Map<Integer, List<SiegeGuardHolder>> _siegeGuards = new HashMap<>();
+	private final Map<Integer, List<CastleSpawnHolder>> _spawns = new ConcurrentHashMap<>();
+	private static final Map<Integer, List<SiegeGuardHolder>> _siegeGuards = new ConcurrentHashMap<>();
 	
 	protected CastleData()
 	{
diff --git a/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/data/xml/impl/CategoryData.java b/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/data/xml/impl/CategoryData.java
index f851aa6703..df7d390dfb 100644
--- a/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/data/xml/impl/CategoryData.java
+++ b/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/data/xml/impl/CategoryData.java
@@ -27,14 +27,14 @@ import org.w3c.dom.Document;
 import org.w3c.dom.NamedNodeMap;
 import org.w3c.dom.Node;
 
-import com.l2jmobius.commons.util.IGameXmlReader;
+import com.l2jmobius.commons.util.IXmlReader;
 import com.l2jmobius.gameserver.enums.CategoryType;
 
 /**
  * Loads the category data with Class or NPC IDs.
  * @author NosBit, xban1x
  */
-public final class CategoryData implements IGameXmlReader
+public final class CategoryData implements IXmlReader
 {
 	private static final Logger LOGGER = Logger.getLogger(CategoryData.class.getName());
 	
diff --git a/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/data/xml/impl/ClanHallData.java b/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/data/xml/impl/ClanHallData.java
index 511cc7f4f7..90a1a51029 100644
--- a/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/data/xml/impl/ClanHallData.java
+++ b/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/data/xml/impl/ClanHallData.java
@@ -20,9 +20,9 @@ import java.io.File;
 import java.util.ArrayList;
 import java.util.Collection;
 import java.util.Comparator;
-import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
+import java.util.concurrent.ConcurrentHashMap;
 import java.util.logging.Logger;
 import java.util.stream.Collectors;
 
@@ -30,7 +30,7 @@ import org.w3c.dom.Document;
 import org.w3c.dom.NamedNodeMap;
 import org.w3c.dom.Node;
 
-import com.l2jmobius.commons.util.IGameXmlReader;
+import com.l2jmobius.commons.util.IXmlReader;
 import com.l2jmobius.gameserver.enums.ClanHallGrade;
 import com.l2jmobius.gameserver.enums.ClanHallType;
 import com.l2jmobius.gameserver.model.Location;
@@ -43,10 +43,10 @@ import com.l2jmobius.gameserver.model.holders.ClanHallTeleportHolder;
 /**
  * @author St3eT
  */
-public final class ClanHallData implements IGameXmlReader
+public final class ClanHallData implements IXmlReader
 {
 	private static final Logger LOGGER = Logger.getLogger(ClanHallData.class.getName());
-	private static final Map<Integer, ClanHall> _clanHalls = new HashMap<>();
+	private static final Map<Integer, ClanHall> _clanHalls = new ConcurrentHashMap<>();
 	
 	protected ClanHallData()
 	{
diff --git a/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/data/xml/impl/ClanRewardData.java b/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/data/xml/impl/ClanRewardData.java
index 252bba1c64..d5938ee964 100644
--- a/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/data/xml/impl/ClanRewardData.java
+++ b/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/data/xml/impl/ClanRewardData.java
@@ -28,7 +28,6 @@ import org.w3c.dom.Document;
 import org.w3c.dom.NamedNodeMap;
 import org.w3c.dom.Node;
 
-import com.l2jmobius.commons.util.IGameXmlReader;
 import com.l2jmobius.commons.util.IXmlReader;
 import com.l2jmobius.gameserver.enums.ClanRewardType;
 import com.l2jmobius.gameserver.model.clan.ClanRewardBonus;
@@ -38,7 +37,7 @@ import com.l2jmobius.gameserver.model.holders.SkillHolder;
 /**
  * @author UnAfraid
  */
-public class ClanRewardData implements IGameXmlReader
+public class ClanRewardData implements IXmlReader
 {
 	private static final Logger LOGGER = Logger.getLogger(ClanRewardData.class.getName());
 	private final Map<ClanRewardType, List<ClanRewardBonus>> _clanRewards = new ConcurrentHashMap<>();
diff --git a/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/data/xml/impl/ClassListData.java b/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/data/xml/impl/ClassListData.java
index a40f726d50..6e99aeabfa 100644
--- a/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/data/xml/impl/ClassListData.java
+++ b/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/data/xml/impl/ClassListData.java
@@ -17,15 +17,15 @@
 package com.l2jmobius.gameserver.data.xml.impl;
 
 import java.io.File;
-import java.util.HashMap;
 import java.util.Map;
+import java.util.concurrent.ConcurrentHashMap;
 import java.util.logging.Logger;
 
 import org.w3c.dom.Document;
 import org.w3c.dom.NamedNodeMap;
 import org.w3c.dom.Node;
 
-import com.l2jmobius.commons.util.IGameXmlReader;
+import com.l2jmobius.commons.util.IXmlReader;
 import com.l2jmobius.gameserver.model.base.ClassId;
 import com.l2jmobius.gameserver.model.base.ClassInfo;
 
@@ -33,11 +33,11 @@ import com.l2jmobius.gameserver.model.base.ClassInfo;
  * Loads the the list of classes and it's info.
  * @author Zoey76
  */
-public final class ClassListData implements IGameXmlReader
+public final class ClassListData implements IXmlReader
 {
 	private static final Logger LOGGER = Logger.getLogger(ClassListData.class.getName());
 	
-	private final Map<ClassId, ClassInfo> _classData = new HashMap<>();
+	private final Map<ClassId, ClassInfo> _classData = new ConcurrentHashMap<>();
 	
 	/**
 	 * Instantiates a new class list data.
diff --git a/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/data/xml/impl/CombinationItemsData.java b/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/data/xml/impl/CombinationItemsData.java
index a7e90d5f89..c2ce205300 100644
--- a/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/data/xml/impl/CombinationItemsData.java
+++ b/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/data/xml/impl/CombinationItemsData.java
@@ -24,7 +24,7 @@ import java.util.stream.Collectors;
 
 import org.w3c.dom.Document;
 
-import com.l2jmobius.commons.util.IGameXmlReader;
+import com.l2jmobius.commons.util.IXmlReader;
 import com.l2jmobius.gameserver.datatables.ItemTable;
 import com.l2jmobius.gameserver.model.StatsSet;
 import com.l2jmobius.gameserver.model.items.combination.CombinationItem;
@@ -34,7 +34,7 @@ import com.l2jmobius.gameserver.model.items.combination.CombinationItemType;
 /**
  * @author UnAfraid
  */
-public class CombinationItemsData implements IGameXmlReader
+public class CombinationItemsData implements IXmlReader
 {
 	private static final Logger LOGGER = Logger.getLogger(CombinationItemsData.class.getName());
 	private final List<CombinationItem> _items = new ArrayList<>();
diff --git a/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/data/xml/impl/CubicData.java b/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/data/xml/impl/CubicData.java
index f682509217..ef46a08a7f 100644
--- a/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/data/xml/impl/CubicData.java
+++ b/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/data/xml/impl/CubicData.java
@@ -20,12 +20,12 @@ import java.io.File;
 import java.util.Collections;
 import java.util.HashMap;
 import java.util.Map;
+import java.util.concurrent.ConcurrentHashMap;
 import java.util.logging.Logger;
 
 import org.w3c.dom.Document;
 import org.w3c.dom.Node;
 
-import com.l2jmobius.commons.util.IGameXmlReader;
 import com.l2jmobius.commons.util.IXmlReader;
 import com.l2jmobius.gameserver.model.StatsSet;
 import com.l2jmobius.gameserver.model.actor.templates.CubicTemplate;
@@ -39,11 +39,11 @@ import com.l2jmobius.gameserver.model.cubic.conditions.RangeCondition;
 /**
  * @author UnAfraid
  */
-public class CubicData implements IGameXmlReader
+public class CubicData implements IXmlReader
 {
 	private static final Logger LOGGER = Logger.getLogger(CubicData.class.getName());
 	
-	private final Map<Integer, Map<Integer, CubicTemplate>> _cubics = new HashMap<>();
+	private final Map<Integer, Map<Integer, CubicTemplate>> _cubics = new ConcurrentHashMap<>();
 	
 	protected CubicData()
 	{
diff --git a/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/data/xml/impl/DoorData.java b/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/data/xml/impl/DoorData.java
index e8b1ff7bfa..5dd43e98eb 100644
--- a/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/data/xml/impl/DoorData.java
+++ b/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/data/xml/impl/DoorData.java
@@ -32,7 +32,6 @@ import org.w3c.dom.Document;
 import org.w3c.dom.NamedNodeMap;
 import org.w3c.dom.Node;
 
-import com.l2jmobius.commons.util.IGameXmlReader;
 import com.l2jmobius.commons.util.IXmlReader;
 import com.l2jmobius.gameserver.instancemanager.MapRegionManager;
 import com.l2jmobius.gameserver.model.Location;
@@ -45,7 +44,7 @@ import com.l2jmobius.gameserver.model.instancezone.Instance;
  * This class loads and hold info about doors.
  * @author JIV, GodKratos, UnAfraid
  */
-public final class DoorData implements IGameXmlReader
+public final class DoorData implements IXmlReader
 {
 	private static final Logger LOGGER = Logger.getLogger(DoorData.class.getName());
 	
diff --git a/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/data/xml/impl/EnchantItemData.java b/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/data/xml/impl/EnchantItemData.java
index 24e12d1218..342b4cde07 100644
--- a/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/data/xml/impl/EnchantItemData.java
+++ b/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/data/xml/impl/EnchantItemData.java
@@ -25,7 +25,7 @@ import org.w3c.dom.Document;
 import org.w3c.dom.NamedNodeMap;
 import org.w3c.dom.Node;
 
-import com.l2jmobius.commons.util.IGameXmlReader;
+import com.l2jmobius.commons.util.IXmlReader;
 import com.l2jmobius.gameserver.model.StatsSet;
 import com.l2jmobius.gameserver.model.items.enchant.EnchantScroll;
 import com.l2jmobius.gameserver.model.items.enchant.EnchantSupportItem;
@@ -35,7 +35,7 @@ import com.l2jmobius.gameserver.model.items.instance.ItemInstance;
  * Loads item enchant data.
  * @author UnAfraid
  */
-public class EnchantItemData implements IGameXmlReader
+public class EnchantItemData implements IXmlReader
 {
 	private static final Logger LOGGER = Logger.getLogger(EnchantItemData.class.getName());
 	
diff --git a/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/data/xml/impl/EnchantItemGroupsData.java b/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/data/xml/impl/EnchantItemGroupsData.java
index 666d821e42..44582a7dd4 100644
--- a/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/data/xml/impl/EnchantItemGroupsData.java
+++ b/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/data/xml/impl/EnchantItemGroupsData.java
@@ -25,7 +25,7 @@ import org.w3c.dom.Document;
 import org.w3c.dom.NamedNodeMap;
 import org.w3c.dom.Node;
 
-import com.l2jmobius.commons.util.IGameXmlReader;
+import com.l2jmobius.commons.util.IXmlReader;
 import com.l2jmobius.gameserver.datatables.ItemTable;
 import com.l2jmobius.gameserver.model.holders.RangeChanceHolder;
 import com.l2jmobius.gameserver.model.items.Item;
@@ -37,7 +37,7 @@ import com.l2jmobius.gameserver.util.Util;
 /**
  * @author UnAfraid
  */
-public final class EnchantItemGroupsData implements IGameXmlReader
+public final class EnchantItemGroupsData implements IXmlReader
 {
 	private static final Logger LOGGER = Logger.getLogger(EnchantItemGroupsData.class.getName());
 	
diff --git a/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/data/xml/impl/EnchantItemHPBonusData.java b/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/data/xml/impl/EnchantItemHPBonusData.java
index d2ce1096b5..868b1f95f6 100644
--- a/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/data/xml/impl/EnchantItemHPBonusData.java
+++ b/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/data/xml/impl/EnchantItemHPBonusData.java
@@ -26,7 +26,7 @@ import java.util.logging.Logger;
 import org.w3c.dom.Document;
 import org.w3c.dom.Node;
 
-import com.l2jmobius.commons.util.IGameXmlReader;
+import com.l2jmobius.commons.util.IXmlReader;
 import com.l2jmobius.gameserver.model.items.Item;
 import com.l2jmobius.gameserver.model.items.instance.ItemInstance;
 import com.l2jmobius.gameserver.model.items.type.CrystalType;
@@ -35,7 +35,7 @@ import com.l2jmobius.gameserver.model.items.type.CrystalType;
  * This class holds the Enchant HP Bonus Data.
  * @author MrPoke, Zoey76
  */
-public class EnchantItemHPBonusData implements IGameXmlReader
+public class EnchantItemHPBonusData implements IXmlReader
 {
 	private static final Logger LOGGER = Logger.getLogger(EnchantItemHPBonusData.class.getName());
 	
diff --git a/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/data/xml/impl/EnchantItemOptionsData.java b/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/data/xml/impl/EnchantItemOptionsData.java
index f6e9946b94..b8d805132f 100644
--- a/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/data/xml/impl/EnchantItemOptionsData.java
+++ b/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/data/xml/impl/EnchantItemOptionsData.java
@@ -24,7 +24,7 @@ import java.util.logging.Logger;
 import org.w3c.dom.Document;
 import org.w3c.dom.Node;
 
-import com.l2jmobius.commons.util.IGameXmlReader;
+import com.l2jmobius.commons.util.IXmlReader;
 import com.l2jmobius.gameserver.model.items.instance.ItemInstance;
 import com.l2jmobius.gameserver.model.options.EnchantOptions;
 import com.l2jmobius.gameserver.util.Util;
@@ -32,7 +32,7 @@ import com.l2jmobius.gameserver.util.Util;
 /**
  * @author UnAfraid
  */
-public class EnchantItemOptionsData implements IGameXmlReader
+public class EnchantItemOptionsData implements IXmlReader
 {
 	private static final Logger LOGGER = Logger.getLogger(EnchantItemOptionsData.class.getName());
 	
diff --git a/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/data/xml/impl/EnchantSkillGroupsData.java b/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/data/xml/impl/EnchantSkillGroupsData.java
index 0b557ced04..45127fe5f6 100644
--- a/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/data/xml/impl/EnchantSkillGroupsData.java
+++ b/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/data/xml/impl/EnchantSkillGroupsData.java
@@ -18,16 +18,15 @@ package com.l2jmobius.gameserver.data.xml.impl;
 
 import java.io.File;
 import java.util.Collections;
-import java.util.HashMap;
 import java.util.HashSet;
-import java.util.LinkedHashMap;
 import java.util.Map;
 import java.util.Set;
+import java.util.concurrent.ConcurrentHashMap;
 import java.util.logging.Logger;
 
 import org.w3c.dom.Document;
 
-import com.l2jmobius.commons.util.IGameXmlReader;
+import com.l2jmobius.commons.util.IXmlReader;
 import com.l2jmobius.gameserver.enums.SkillEnchantType;
 import com.l2jmobius.gameserver.model.StatsSet;
 import com.l2jmobius.gameserver.model.holders.EnchantSkillHolder;
@@ -39,12 +38,12 @@ import com.l2jmobius.gameserver.model.skills.Skill;
  * This class holds the Enchant Groups information.
  * @author Micr0
  */
-public class EnchantSkillGroupsData implements IGameXmlReader
+public class EnchantSkillGroupsData implements IXmlReader
 {
 	private static final Logger LOGGER = Logger.getLogger(EnchantSkillGroupsData.class.getName());
 	
-	private final Map<Integer, EnchantSkillHolder> _enchantSkillHolders = new LinkedHashMap<>();
-	private final Map<SkillHolder, Set<Integer>> _enchantSkillTrees = new HashMap<>();
+	private final Map<Integer, EnchantSkillHolder> _enchantSkillHolders = new ConcurrentHashMap<>();
+	private final Map<SkillHolder, Set<Integer>> _enchantSkillTrees = new ConcurrentHashMap<>();
 	
 	public static int MAX_ENCHANT_LEVEL;
 	
diff --git a/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/data/xml/impl/EventEngineData.java b/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/data/xml/impl/EventEngineData.java
index c43970ea31..144e2d5599 100644
--- a/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/data/xml/impl/EventEngineData.java
+++ b/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/data/xml/impl/EventEngineData.java
@@ -32,7 +32,6 @@ import org.w3c.dom.Document;
 import org.w3c.dom.NamedNodeMap;
 import org.w3c.dom.Node;
 
-import com.l2jmobius.commons.util.IGameXmlReader;
 import com.l2jmobius.commons.util.IXmlReader;
 import com.l2jmobius.gameserver.model.Location;
 import com.l2jmobius.gameserver.model.StatsSet;
@@ -54,7 +53,7 @@ import com.l2jmobius.gameserver.model.holders.SkillHolder;
 /**
  * @author UnAfraid
  */
-public final class EventEngineData implements IGameXmlReader
+public final class EventEngineData implements IXmlReader
 {
 	private static final Logger LOGGER = Logger.getLogger(EventEngineData.class.getName());
 	
diff --git a/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/data/xml/impl/ExperienceData.java b/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/data/xml/impl/ExperienceData.java
index 2daaf16220..ea9d13c2aa 100644
--- a/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/data/xml/impl/ExperienceData.java
+++ b/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/data/xml/impl/ExperienceData.java
@@ -26,13 +26,13 @@ import org.w3c.dom.NamedNodeMap;
 import org.w3c.dom.Node;
 
 import com.l2jmobius.Config;
-import com.l2jmobius.commons.util.IGameXmlReader;
+import com.l2jmobius.commons.util.IXmlReader;
 
 /**
  * This class holds the Experience points for each level for players and pets.
  * @author mrTJO
  */
-public final class ExperienceData implements IGameXmlReader
+public final class ExperienceData implements IXmlReader
 {
 	private static final Logger LOGGER = Logger.getLogger(ExperienceData.class.getName());
 	
diff --git a/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/data/xml/impl/ExtendDropData.java b/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/data/xml/impl/ExtendDropData.java
index 00af3a4f77..09da39ad14 100644
--- a/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/data/xml/impl/ExtendDropData.java
+++ b/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/data/xml/impl/ExtendDropData.java
@@ -28,7 +28,7 @@ import java.util.logging.Logger;
 import org.w3c.dom.Document;
 import org.w3c.dom.Node;
 
-import com.l2jmobius.commons.util.IGameXmlReader;
+import com.l2jmobius.commons.util.IXmlReader;
 import com.l2jmobius.gameserver.handler.ConditionHandler;
 import com.l2jmobius.gameserver.model.StatsSet;
 import com.l2jmobius.gameserver.model.conditions.ICondition;
@@ -39,7 +39,7 @@ import com.l2jmobius.gameserver.network.SystemMessageId;
 /**
  * @author Sdw
  */
-public class ExtendDropData implements IGameXmlReader
+public class ExtendDropData implements IXmlReader
 {
 	private static final Logger LOGGER = Logger.getLogger(ExtendDropData.class.getName());
 	private final Map<Integer, ExtendDropDataHolder> _extendDrop = new HashMap<>();
diff --git a/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/data/xml/impl/FakePlayerData.java b/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/data/xml/impl/FakePlayerData.java
index afb92c06d5..74b7957fd9 100644
--- a/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/data/xml/impl/FakePlayerData.java
+++ b/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/data/xml/impl/FakePlayerData.java
@@ -26,7 +26,7 @@ import java.util.logging.Logger;
 import org.w3c.dom.Document;
 
 import com.l2jmobius.Config;
-import com.l2jmobius.commons.util.IGameXmlReader;
+import com.l2jmobius.commons.util.IXmlReader;
 import com.l2jmobius.gameserver.data.sql.impl.CharNameTable;
 import com.l2jmobius.gameserver.model.StatsSet;
 import com.l2jmobius.gameserver.model.actor.templates.NpcTemplate;
@@ -35,7 +35,7 @@ import com.l2jmobius.gameserver.model.holders.FakePlayerHolder;
 /**
  * @author Mobius
  */
-public class FakePlayerData implements IGameXmlReader
+public class FakePlayerData implements IXmlReader
 {
 	private static Logger LOGGER = Logger.getLogger(FakePlayerData.class.getName());
 	
diff --git a/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/data/xml/impl/FenceData.java b/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/data/xml/impl/FenceData.java
index f51175e5fa..d36ab2e16b 100644
--- a/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/data/xml/impl/FenceData.java
+++ b/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/data/xml/impl/FenceData.java
@@ -28,7 +28,7 @@ import java.util.logging.Logger;
 import org.w3c.dom.Document;
 import org.w3c.dom.Node;
 
-import com.l2jmobius.commons.util.IGameXmlReader;
+import com.l2jmobius.commons.util.IXmlReader;
 import com.l2jmobius.gameserver.enums.FenceState;
 import com.l2jmobius.gameserver.model.StatsSet;
 import com.l2jmobius.gameserver.model.World;
@@ -39,7 +39,7 @@ import com.l2jmobius.gameserver.model.instancezone.Instance;
 /**
  * @author HoridoJoho / FBIagent
  */
-public final class FenceData implements IGameXmlReader
+public final class FenceData implements IXmlReader
 {
 	private static final Logger LOGGER = Logger.getLogger(FenceData.class.getSimpleName());
 	
diff --git a/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/data/xml/impl/FishingData.java b/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/data/xml/impl/FishingData.java
index bacf1ed08c..16436a2f5c 100644
--- a/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/data/xml/impl/FishingData.java
+++ b/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/data/xml/impl/FishingData.java
@@ -26,7 +26,7 @@ import org.w3c.dom.NamedNodeMap;
 import org.w3c.dom.Node;
 
 import com.l2jmobius.Config;
-import com.l2jmobius.commons.util.IGameXmlReader;
+import com.l2jmobius.commons.util.IXmlReader;
 import com.l2jmobius.gameserver.datatables.ItemTable;
 import com.l2jmobius.gameserver.model.fishing.FishingBait;
 import com.l2jmobius.gameserver.model.fishing.FishingCatch;
@@ -36,7 +36,7 @@ import com.l2jmobius.gameserver.model.fishing.FishingRod;
  * This class holds the Fishing information.
  * @author bit
  */
-public final class FishingData implements IGameXmlReader
+public final class FishingData implements IXmlReader
 {
 	private static final Logger LOGGER = Logger.getLogger(FishingData.class.getName());
 	private final Map<Integer, FishingBait> _baitData = new HashMap<>();
diff --git a/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/data/xml/impl/HennaData.java b/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/data/xml/impl/HennaData.java
index e27e186193..d3ac163f3c 100644
--- a/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/data/xml/impl/HennaData.java
+++ b/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/data/xml/impl/HennaData.java
@@ -27,7 +27,7 @@ import org.w3c.dom.Document;
 import org.w3c.dom.NamedNodeMap;
 import org.w3c.dom.Node;
 
-import com.l2jmobius.commons.util.IGameXmlReader;
+import com.l2jmobius.commons.util.IXmlReader;
 import com.l2jmobius.gameserver.model.StatsSet;
 import com.l2jmobius.gameserver.model.base.ClassId;
 import com.l2jmobius.gameserver.model.items.Henna;
@@ -40,7 +40,7 @@ import com.l2jmobius.gameserver.model.skills.Skill;
  * Allowed classes to wear each henna.
  * @author Zoey76, Mobius
  */
-public final class HennaData implements IGameXmlReader
+public final class HennaData implements IXmlReader
 {
 	private static final Logger LOGGER = Logger.getLogger(HennaData.class.getName());
 	
diff --git a/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/data/xml/impl/HitConditionBonusData.java b/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/data/xml/impl/HitConditionBonusData.java
index e9f2f9a87d..2d6ccf0467 100644
--- a/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/data/xml/impl/HitConditionBonusData.java
+++ b/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/data/xml/impl/HitConditionBonusData.java
@@ -23,7 +23,7 @@ import org.w3c.dom.Document;
 import org.w3c.dom.NamedNodeMap;
 import org.w3c.dom.Node;
 
-import com.l2jmobius.commons.util.IGameXmlReader;
+import com.l2jmobius.commons.util.IXmlReader;
 import com.l2jmobius.gameserver.GameTimeController;
 import com.l2jmobius.gameserver.enums.Position;
 import com.l2jmobius.gameserver.model.actor.Creature;
@@ -32,7 +32,7 @@ import com.l2jmobius.gameserver.model.actor.Creature;
  * This class load, holds and calculates the hit condition bonuses.
  * @author Nik
  */
-public final class HitConditionBonusData implements IGameXmlReader
+public final class HitConditionBonusData implements IXmlReader
 {
 	private static final Logger LOGGER = Logger.getLogger(HitConditionBonusData.class.getName());
 	
diff --git a/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/data/xml/impl/InitialEquipmentData.java b/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/data/xml/impl/InitialEquipmentData.java
index 247ea4b46d..275a23f28f 100644
--- a/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/data/xml/impl/InitialEquipmentData.java
+++ b/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/data/xml/impl/InitialEquipmentData.java
@@ -28,7 +28,7 @@ import org.w3c.dom.NamedNodeMap;
 import org.w3c.dom.Node;
 
 import com.l2jmobius.Config;
-import com.l2jmobius.commons.util.IGameXmlReader;
+import com.l2jmobius.commons.util.IXmlReader;
 import com.l2jmobius.gameserver.model.StatsSet;
 import com.l2jmobius.gameserver.model.base.ClassId;
 import com.l2jmobius.gameserver.model.items.PlayerItemTemplate;
@@ -38,7 +38,7 @@ import com.l2jmobius.gameserver.model.items.PlayerItemTemplate;
  * What items get each newly created character and if this item is equipped upon creation (<b>Requires the item to be equippable</b>).
  * @author Zoey76
  */
-public final class InitialEquipmentData implements IGameXmlReader
+public final class InitialEquipmentData implements IXmlReader
 {
 	private static final Logger LOGGER = Logger.getLogger(InitialEquipmentData.class.getName());
 	
diff --git a/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/data/xml/impl/InitialShortcutData.java b/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/data/xml/impl/InitialShortcutData.java
index 5f886bafa8..3b9e976607 100644
--- a/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/data/xml/impl/InitialShortcutData.java
+++ b/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/data/xml/impl/InitialShortcutData.java
@@ -27,7 +27,7 @@ import org.w3c.dom.Document;
 import org.w3c.dom.NamedNodeMap;
 import org.w3c.dom.Node;
 
-import com.l2jmobius.commons.util.IGameXmlReader;
+import com.l2jmobius.commons.util.IXmlReader;
 import com.l2jmobius.gameserver.enums.MacroType;
 import com.l2jmobius.gameserver.enums.ShortcutType;
 import com.l2jmobius.gameserver.model.Macro;
@@ -43,7 +43,7 @@ import com.l2jmobius.gameserver.network.serverpackets.ShortCutRegister;
  * What shortcuts get each newly created character.
  * @author Zoey76
  */
-public final class InitialShortcutData implements IGameXmlReader
+public final class InitialShortcutData implements IXmlReader
 {
 	private static final Logger LOGGER = Logger.getLogger(InitialShortcutData.class.getName());
 	
diff --git a/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/data/xml/impl/ItemCrystallizationData.java b/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/data/xml/impl/ItemCrystallizationData.java
index 86454b2b71..aa7742afa1 100644
--- a/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/data/xml/impl/ItemCrystallizationData.java
+++ b/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/data/xml/impl/ItemCrystallizationData.java
@@ -28,7 +28,7 @@ import org.w3c.dom.Document;
 import org.w3c.dom.NamedNodeMap;
 import org.w3c.dom.Node;
 
-import com.l2jmobius.commons.util.IGameXmlReader;
+import com.l2jmobius.commons.util.IXmlReader;
 import com.l2jmobius.gameserver.datatables.ItemTable;
 import com.l2jmobius.gameserver.enums.CrystallizationType;
 import com.l2jmobius.gameserver.model.holders.CrystallizationDataHolder;
@@ -42,7 +42,7 @@ import com.l2jmobius.gameserver.model.items.type.CrystalType;
 /**
  * @author UnAfraid
  */
-public final class ItemCrystallizationData implements IGameXmlReader
+public final class ItemCrystallizationData implements IXmlReader
 {
 	private static final Logger LOGGER = Logger.getLogger(ItemCrystallizationData.class.getName());
 	
diff --git a/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/data/xml/impl/KarmaData.java b/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/data/xml/impl/KarmaData.java
index ca826eba2e..bd68c38748 100644
--- a/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/data/xml/impl/KarmaData.java
+++ b/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/data/xml/impl/KarmaData.java
@@ -26,12 +26,12 @@ import org.w3c.dom.NamedNodeMap;
 import org.w3c.dom.Node;
 
 import com.l2jmobius.Config;
-import com.l2jmobius.commons.util.IGameXmlReader;
+import com.l2jmobius.commons.util.IXmlReader;
 
 /**
  * @author UnAfraid
  */
-public class KarmaData implements IGameXmlReader
+public class KarmaData implements IXmlReader
 {
 	private static final Logger LOGGER = Logger.getLogger(KarmaData.class.getName());
 	
diff --git a/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/data/xml/impl/LuckyGameData.java b/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/data/xml/impl/LuckyGameData.java
index 6759bfec3f..41c0d0fc31 100644
--- a/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/data/xml/impl/LuckyGameData.java
+++ b/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/data/xml/impl/LuckyGameData.java
@@ -23,7 +23,7 @@ import java.util.concurrent.atomic.AtomicInteger;
 
 import org.w3c.dom.Document;
 
-import com.l2jmobius.commons.util.IGameXmlReader;
+import com.l2jmobius.commons.util.IXmlReader;
 import com.l2jmobius.gameserver.model.StatsSet;
 import com.l2jmobius.gameserver.model.holders.ItemChanceHolder;
 import com.l2jmobius.gameserver.model.holders.ItemPointHolder;
@@ -32,7 +32,7 @@ import com.l2jmobius.gameserver.model.holders.LuckyGameDataHolder;
 /**
  * @author Sdw
  */
-public class LuckyGameData implements IGameXmlReader
+public class LuckyGameData implements IXmlReader
 {
 	private final Map<Integer, LuckyGameDataHolder> _luckyGame = new HashMap<>();
 	private final AtomicInteger _serverPlay = new AtomicInteger();
diff --git a/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/data/xml/impl/MultisellData.java b/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/data/xml/impl/MultisellData.java
index 796cd9b6f1..e9c494b91e 100644
--- a/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/data/xml/impl/MultisellData.java
+++ b/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/data/xml/impl/MultisellData.java
@@ -19,11 +19,11 @@ package com.l2jmobius.gameserver.data.xml.impl;
 import java.io.File;
 import java.io.FileFilter;
 import java.util.ArrayList;
-import java.util.HashMap;
 import java.util.HashSet;
 import java.util.List;
 import java.util.Map;
 import java.util.Set;
+import java.util.concurrent.ConcurrentHashMap;
 import java.util.logging.Level;
 import java.util.logging.Logger;
 
@@ -31,7 +31,7 @@ import org.w3c.dom.Document;
 import org.w3c.dom.Node;
 
 import com.l2jmobius.Config;
-import com.l2jmobius.commons.util.IGameXmlReader;
+import com.l2jmobius.commons.util.IXmlReader;
 import com.l2jmobius.commons.util.file.filter.NumericNameFilter;
 import com.l2jmobius.gameserver.datatables.ItemTable;
 import com.l2jmobius.gameserver.enums.SpecialItemType;
@@ -46,14 +46,14 @@ import com.l2jmobius.gameserver.model.holders.PreparedMultisellListHolder;
 import com.l2jmobius.gameserver.model.items.Item;
 import com.l2jmobius.gameserver.network.serverpackets.MultiSellList;
 
-public final class MultisellData implements IGameXmlReader
+public final class MultisellData implements IXmlReader
 {
 	private static final Logger LOGGER = Logger.getLogger(MultisellData.class.getName());
 	
 	public static final int PAGE_SIZE = 40;
 	private static final FileFilter NUMERIC_FILTER = new NumericNameFilter();
 	
-	private final Map<Integer, MultisellListHolder> _multisells = new HashMap<>();
+	private final Map<Integer, MultisellListHolder> _multisells = new ConcurrentHashMap<>();
 	
 	protected MultisellData()
 	{
diff --git a/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/data/xml/impl/NpcData.java b/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/data/xml/impl/NpcData.java
index e43e5c5147..3e1adcb420 100644
--- a/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/data/xml/impl/NpcData.java
+++ b/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/data/xml/impl/NpcData.java
@@ -26,6 +26,8 @@ import java.util.List;
 import java.util.Map;
 import java.util.Map.Entry;
 import java.util.Set;
+import java.util.concurrent.ConcurrentHashMap;
+import java.util.concurrent.CopyOnWriteArrayList;
 import java.util.function.Predicate;
 import java.util.logging.Logger;
 import java.util.stream.Collectors;
@@ -36,7 +38,7 @@ import org.w3c.dom.Node;
 
 import com.l2jmobius.Config;
 import com.l2jmobius.commons.util.CommonUtil;
-import com.l2jmobius.commons.util.IGameXmlReader;
+import com.l2jmobius.commons.util.IXmlReader;
 import com.l2jmobius.gameserver.datatables.ItemTable;
 import com.l2jmobius.gameserver.enums.AISkillScope;
 import com.l2jmobius.gameserver.enums.DropType;
@@ -52,13 +54,13 @@ import com.l2jmobius.gameserver.model.skills.Skill;
  * NPC data parser.
  * @author NosBit
  */
-public class NpcData implements IGameXmlReader
+public class NpcData implements IXmlReader
 {
 	protected static final Logger LOGGER = Logger.getLogger(NpcData.class.getName());
 	
-	private final Map<Integer, NpcTemplate> _npcs = new HashMap<>();
-	private final Map<String, Integer> _clans = new HashMap<>();
-	private static final List<Integer> _masterMonsterIDs = new ArrayList<>();
+	private final Map<Integer, NpcTemplate> _npcs = new ConcurrentHashMap<>();
+	private final Map<String, Integer> _clans = new ConcurrentHashMap<>();
+	private static final List<Integer> _masterMonsterIDs = new CopyOnWriteArrayList<>();
 	
 	protected NpcData()
 	{
diff --git a/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/data/xml/impl/OptionData.java b/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/data/xml/impl/OptionData.java
index bffa2b107c..424e2b27ad 100644
--- a/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/data/xml/impl/OptionData.java
+++ b/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/data/xml/impl/OptionData.java
@@ -18,13 +18,12 @@ package com.l2jmobius.gameserver.data.xml.impl;
 
 import java.io.File;
 import java.util.Collections;
-import java.util.HashMap;
 import java.util.Map;
+import java.util.concurrent.ConcurrentHashMap;
 import java.util.logging.Logger;
 
 import org.w3c.dom.Document;
 
-import com.l2jmobius.commons.util.IGameXmlReader;
 import com.l2jmobius.commons.util.IXmlReader;
 import com.l2jmobius.gameserver.handler.EffectHandler;
 import com.l2jmobius.gameserver.model.StatsSet;
@@ -36,11 +35,11 @@ import com.l2jmobius.gameserver.model.options.OptionsSkillType;
 /**
  * @author UnAfraid
  */
-public class OptionData implements IGameXmlReader
+public class OptionData implements IXmlReader
 {
 	private static final Logger LOGGER = Logger.getLogger(OptionData.class.getName());
 	
-	private final Map<Integer, Options> _optionData = new HashMap<>();
+	private final Map<Integer, Options> _optionData = new ConcurrentHashMap<>();
 	
 	protected OptionData()
 	{
diff --git a/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/data/xml/impl/PetDataTable.java b/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/data/xml/impl/PetDataTable.java
index 65afb75d7d..aa6975cd72 100644
--- a/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/data/xml/impl/PetDataTable.java
+++ b/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/data/xml/impl/PetDataTable.java
@@ -17,15 +17,15 @@
 package com.l2jmobius.gameserver.data.xml.impl;
 
 import java.io.File;
-import java.util.HashMap;
 import java.util.Map;
+import java.util.concurrent.ConcurrentHashMap;
 import java.util.logging.Logger;
 
 import org.w3c.dom.Document;
 import org.w3c.dom.NamedNodeMap;
 import org.w3c.dom.Node;
 
-import com.l2jmobius.commons.util.IGameXmlReader;
+import com.l2jmobius.commons.util.IXmlReader;
 import com.l2jmobius.gameserver.enums.MountType;
 import com.l2jmobius.gameserver.model.PetData;
 import com.l2jmobius.gameserver.model.PetLevelData;
@@ -36,11 +36,11 @@ import com.l2jmobius.gameserver.model.StatsSet;
  * TODO: load and use all pet parameters.
  * @author Zoey76 (rework)
  */
-public final class PetDataTable implements IGameXmlReader
+public final class PetDataTable implements IXmlReader
 {
 	private static final Logger LOGGER = Logger.getLogger(PetDataTable.class.getName());
 	
-	private final Map<Integer, PetData> _pets = new HashMap<>();
+	private final Map<Integer, PetData> _pets = new ConcurrentHashMap<>();
 	
 	/**
 	 * Instantiates a new pet data table.
diff --git a/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/data/xml/impl/PetSkillData.java b/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/data/xml/impl/PetSkillData.java
index 4872dde773..5b2f9a4408 100644
--- a/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/data/xml/impl/PetSkillData.java
+++ b/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/data/xml/impl/PetSkillData.java
@@ -27,14 +27,14 @@ import org.w3c.dom.Document;
 import org.w3c.dom.NamedNodeMap;
 import org.w3c.dom.Node;
 
-import com.l2jmobius.commons.util.IGameXmlReader;
+import com.l2jmobius.commons.util.IXmlReader;
 import com.l2jmobius.gameserver.model.actor.Summon;
 import com.l2jmobius.gameserver.model.holders.SkillHolder;
 
 /**
  * @author Mobius
  */
-public class PetSkillData implements IGameXmlReader
+public class PetSkillData implements IXmlReader
 {
 	private static Logger LOGGER = Logger.getLogger(PetSkillData.class.getName());
 	private final Map<Integer, Map<Long, SkillHolder>> _skillTrees = new HashMap<>();
diff --git a/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/data/xml/impl/PlayerTemplateData.java b/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/data/xml/impl/PlayerTemplateData.java
index 031fab8027..7a7c230b72 100644
--- a/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/data/xml/impl/PlayerTemplateData.java
+++ b/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/data/xml/impl/PlayerTemplateData.java
@@ -18,9 +18,9 @@ package com.l2jmobius.gameserver.data.xml.impl;
 
 import java.io.File;
 import java.util.ArrayList;
-import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
+import java.util.concurrent.ConcurrentHashMap;
 import java.util.logging.Logger;
 
 import org.w3c.dom.Document;
@@ -28,7 +28,7 @@ import org.w3c.dom.NamedNodeMap;
 import org.w3c.dom.Node;
 
 import com.l2jmobius.Config;
-import com.l2jmobius.commons.util.IGameXmlReader;
+import com.l2jmobius.commons.util.IXmlReader;
 import com.l2jmobius.gameserver.model.Location;
 import com.l2jmobius.gameserver.model.StatsSet;
 import com.l2jmobius.gameserver.model.actor.templates.PlayerTemplate;
@@ -38,11 +38,11 @@ import com.l2jmobius.gameserver.model.base.ClassId;
  * Loads player's base stats.
  * @author Forsaiken, Zoey76, GKR
  */
-public final class PlayerTemplateData implements IGameXmlReader
+public final class PlayerTemplateData implements IXmlReader
 {
 	private static final Logger LOGGER = Logger.getLogger(PlayerTemplateData.class.getName());
 	
-	private final Map<ClassId, PlayerTemplate> _playerTemplates = new HashMap<>();
+	private final Map<ClassId, PlayerTemplate> _playerTemplates = new ConcurrentHashMap<>();
 	
 	private int _dataCount = 0;
 	private int _autoGeneratedCount = 0;
diff --git a/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/data/xml/impl/PlayerXpPercentLostData.java b/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/data/xml/impl/PlayerXpPercentLostData.java
index 2b867a18e4..816cb7aacf 100644
--- a/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/data/xml/impl/PlayerXpPercentLostData.java
+++ b/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/data/xml/impl/PlayerXpPercentLostData.java
@@ -24,13 +24,13 @@ import org.w3c.dom.Document;
 import org.w3c.dom.NamedNodeMap;
 import org.w3c.dom.Node;
 
-import com.l2jmobius.commons.util.IGameXmlReader;
+import com.l2jmobius.commons.util.IXmlReader;
 
 /**
  * This class holds the Player Xp Percent Lost Data for each level for players.
  * @author Zealar
  */
-public final class PlayerXpPercentLostData implements IGameXmlReader
+public final class PlayerXpPercentLostData implements IXmlReader
 {
 	private static final Logger LOGGER = Logger.getLogger(PlayerXpPercentLostData.class.getName());
 	
diff --git a/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/data/xml/impl/PrimeShopData.java b/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/data/xml/impl/PrimeShopData.java
index 82ddd51f26..650d156194 100644
--- a/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/data/xml/impl/PrimeShopData.java
+++ b/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/data/xml/impl/PrimeShopData.java
@@ -27,7 +27,7 @@ import org.w3c.dom.Document;
 import org.w3c.dom.NamedNodeMap;
 import org.w3c.dom.Node;
 
-import com.l2jmobius.commons.util.IGameXmlReader;
+import com.l2jmobius.commons.util.IXmlReader;
 import com.l2jmobius.gameserver.datatables.ItemTable;
 import com.l2jmobius.gameserver.model.StatsSet;
 import com.l2jmobius.gameserver.model.actor.instance.PlayerInstance;
@@ -39,7 +39,7 @@ import com.l2jmobius.gameserver.network.serverpackets.primeshop.ExBRProductInfo;
 /**
  * @author Gnacik, UnAfraid
  */
-public class PrimeShopData implements IGameXmlReader
+public class PrimeShopData implements IXmlReader
 {
 	private static final Logger LOGGER = Logger.getLogger(PrimeShopData.class.getName());
 	
diff --git a/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/data/xml/impl/RecipeData.java b/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/data/xml/impl/RecipeData.java
index 9c035c1fde..54ce272bd2 100644
--- a/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/data/xml/impl/RecipeData.java
+++ b/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/data/xml/impl/RecipeData.java
@@ -27,7 +27,7 @@ import org.w3c.dom.Document;
 import org.w3c.dom.NamedNodeMap;
 import org.w3c.dom.Node;
 
-import com.l2jmobius.commons.util.IGameXmlReader;
+import com.l2jmobius.commons.util.IXmlReader;
 import com.l2jmobius.gameserver.model.RecipeInstance;
 import com.l2jmobius.gameserver.model.RecipeList;
 import com.l2jmobius.gameserver.model.RecipeStatInstance;
@@ -38,7 +38,7 @@ import com.l2jmobius.gameserver.model.actor.instance.PlayerInstance;
  * The Class RecipeData.
  * @author Zoey76
  */
-public class RecipeData implements IGameXmlReader
+public class RecipeData implements IXmlReader
 {
 	private static final Logger LOGGER = Logger.getLogger(RecipeData.class.getName());
 	
diff --git a/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/data/xml/impl/ResidenceFunctionsData.java b/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/data/xml/impl/ResidenceFunctionsData.java
index 66951e9e59..094ef13149 100644
--- a/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/data/xml/impl/ResidenceFunctionsData.java
+++ b/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/data/xml/impl/ResidenceFunctionsData.java
@@ -28,7 +28,7 @@ import org.w3c.dom.Document;
 import org.w3c.dom.NamedNodeMap;
 import org.w3c.dom.Node;
 
-import com.l2jmobius.commons.util.IGameXmlReader;
+import com.l2jmobius.commons.util.IXmlReader;
 import com.l2jmobius.gameserver.model.StatsSet;
 import com.l2jmobius.gameserver.model.residences.ResidenceFunctionTemplate;
 
@@ -36,7 +36,7 @@ import com.l2jmobius.gameserver.model.residences.ResidenceFunctionTemplate;
  * The residence functions data
  * @author UnAfraid
  */
-public final class ResidenceFunctionsData implements IGameXmlReader
+public final class ResidenceFunctionsData implements IXmlReader
 {
 	private static final Logger LOGGER = Logger.getLogger(ResidenceFunctionsData.class.getName());
 	private final Map<Integer, List<ResidenceFunctionTemplate>> _functions = new HashMap<>();
diff --git a/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/data/xml/impl/SayuneData.java b/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/data/xml/impl/SayuneData.java
index 835bd96930..13b4d33b1e 100644
--- a/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/data/xml/impl/SayuneData.java
+++ b/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/data/xml/impl/SayuneData.java
@@ -26,13 +26,13 @@ import org.w3c.dom.Document;
 import org.w3c.dom.NamedNodeMap;
 import org.w3c.dom.Node;
 
-import com.l2jmobius.commons.util.IGameXmlReader;
+import com.l2jmobius.commons.util.IXmlReader;
 import com.l2jmobius.gameserver.model.SayuneEntry;
 
 /**
  * @author UnAfraid
  */
-public class SayuneData implements IGameXmlReader
+public class SayuneData implements IXmlReader
 {
 	private static final Logger LOGGER = Logger.getLogger(SayuneData.class.getName());
 	
diff --git a/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/data/xml/impl/SecondaryAuthData.java b/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/data/xml/impl/SecondaryAuthData.java
index c0ebd36146..ca85056b10 100644
--- a/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/data/xml/impl/SecondaryAuthData.java
+++ b/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/data/xml/impl/SecondaryAuthData.java
@@ -25,12 +25,12 @@ import java.util.logging.Logger;
 import org.w3c.dom.Document;
 import org.w3c.dom.Node;
 
-import com.l2jmobius.commons.util.IGameXmlReader;
+import com.l2jmobius.commons.util.IXmlReader;
 
 /**
  * @author NosBit
  */
-public class SecondaryAuthData implements IGameXmlReader
+public class SecondaryAuthData implements IXmlReader
 {
 	private static final Logger LOGGER = Logger.getLogger(SecondaryAuthData.class.getName());
 	
diff --git a/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/data/xml/impl/ShuttleData.java b/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/data/xml/impl/ShuttleData.java
index 9454d24d6b..ff26f4f409 100644
--- a/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/data/xml/impl/ShuttleData.java
+++ b/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/data/xml/impl/ShuttleData.java
@@ -27,7 +27,7 @@ import org.w3c.dom.Document;
 import org.w3c.dom.NamedNodeMap;
 import org.w3c.dom.Node;
 
-import com.l2jmobius.commons.util.IGameXmlReader;
+import com.l2jmobius.commons.util.IXmlReader;
 import com.l2jmobius.gameserver.model.Location;
 import com.l2jmobius.gameserver.model.StatsSet;
 import com.l2jmobius.gameserver.model.VehiclePathPoint;
@@ -40,7 +40,7 @@ import com.l2jmobius.gameserver.model.shuttle.ShuttleStop;
 /**
  * @author UnAfraid
  */
-public final class ShuttleData implements IGameXmlReader
+public final class ShuttleData implements IXmlReader
 {
 	private static final Logger LOGGER = Logger.getLogger(ShuttleData.class.getName());
 	
diff --git a/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/data/xml/impl/SiegeScheduleData.java b/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/data/xml/impl/SiegeScheduleData.java
index 265bf7c528..6bff09010b 100644
--- a/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/data/xml/impl/SiegeScheduleData.java
+++ b/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/data/xml/impl/SiegeScheduleData.java
@@ -27,7 +27,7 @@ import org.w3c.dom.Document;
 import org.w3c.dom.NamedNodeMap;
 import org.w3c.dom.Node;
 
-import com.l2jmobius.commons.util.IGameXmlReader;
+import com.l2jmobius.commons.util.IXmlReader;
 import com.l2jmobius.gameserver.model.SiegeScheduleDate;
 import com.l2jmobius.gameserver.model.StatsSet;
 import com.l2jmobius.gameserver.util.Util;
@@ -35,7 +35,7 @@ import com.l2jmobius.gameserver.util.Util;
 /**
  * @author UnAfraid
  */
-public class SiegeScheduleData implements IGameXmlReader
+public class SiegeScheduleData implements IXmlReader
 {
 	private static final Logger LOGGER = Logger.getLogger(SiegeScheduleData.class.getName());
 	
diff --git a/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/data/xml/impl/SkillData.java b/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/data/xml/impl/SkillData.java
index 7a1ae2e15b..64900d4d45 100644
--- a/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/data/xml/impl/SkillData.java
+++ b/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/data/xml/impl/SkillData.java
@@ -25,6 +25,7 @@ import java.util.List;
 import java.util.Map;
 import java.util.Optional;
 import java.util.Set;
+import java.util.concurrent.ConcurrentHashMap;
 import java.util.function.BiConsumer;
 import java.util.function.Function;
 import java.util.logging.Level;
@@ -35,7 +36,7 @@ import org.w3c.dom.Document;
 import org.w3c.dom.NamedNodeMap;
 import org.w3c.dom.Node;
 
-import com.l2jmobius.commons.util.IGameXmlReader;
+import com.l2jmobius.commons.util.IXmlReader;
 import com.l2jmobius.gameserver.handler.EffectHandler;
 import com.l2jmobius.gameserver.handler.SkillConditionHandler;
 import com.l2jmobius.gameserver.model.StatsSet;
@@ -51,12 +52,12 @@ import com.l2jmobius.gameserver.util.exp4j.ExpressionBuilder;
  * Skill data parser.
  * @author NosBit
  */
-public class SkillData implements IGameXmlReader
+public class SkillData implements IXmlReader
 {
 	private static final Logger LOGGER = Logger.getLogger(SkillData.class.getName());
 	
-	private final Map<Long, Skill> _skills = new HashMap<>();
-	private final Map<Integer, Integer> _skillsMaxLevel = new HashMap<>();
+	private final Map<Long, Skill> _skills = new ConcurrentHashMap<>();
+	private final Map<Integer, Integer> _skillsMaxLevel = new ConcurrentHashMap<>();
 	
 	private class NamedParamInfo
 	{
diff --git a/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/data/xml/impl/SkillTreesData.java b/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/data/xml/impl/SkillTreesData.java
index 7f667059db..780e0a1d1c 100644
--- a/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/data/xml/impl/SkillTreesData.java
+++ b/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/data/xml/impl/SkillTreesData.java
@@ -29,6 +29,7 @@ import java.util.List;
 import java.util.Map;
 import java.util.Map.Entry;
 import java.util.Set;
+import java.util.concurrent.ConcurrentHashMap;
 import java.util.concurrent.atomic.AtomicBoolean;
 import java.util.logging.Logger;
 import java.util.stream.Collectors;
@@ -38,7 +39,7 @@ import org.w3c.dom.NamedNodeMap;
 import org.w3c.dom.Node;
 
 import com.l2jmobius.Config;
-import com.l2jmobius.commons.util.IGameXmlReader;
+import com.l2jmobius.commons.util.IXmlReader;
 import com.l2jmobius.gameserver.enums.CategoryType;
 import com.l2jmobius.gameserver.enums.Race;
 import com.l2jmobius.gameserver.enums.SubclassType;
@@ -77,34 +78,34 @@ import com.l2jmobius.gameserver.model.skills.Skill;
  * For XML schema please refer to skillTrees.xsd in datapack in xsd folder and for parameters documentation refer to documentation.txt in skillTrees folder.<br>
  * @author Zoey76
  */
-public final class SkillTreesData implements IGameXmlReader
+public final class SkillTreesData implements IXmlReader
 {
 	private static final Logger LOGGER = Logger.getLogger(SkillTreesData.class.getName());
 	
 	// ClassId, Map of Skill Hash Code, SkillLearn
-	private static final Map<ClassId, Map<Long, SkillLearn>> _classSkillTrees = new HashMap<>();
-	private static final Map<ClassId, Map<Long, SkillLearn>> _transferSkillTrees = new HashMap<>();
-	private static final Map<Race, Map<Long, SkillLearn>> _raceSkillTree = new HashMap<>();
-	private static final Map<SubclassType, Map<Long, SkillLearn>> _revelationSkillTree = new HashMap<>();
-	private static final Map<ClassId, Set<Integer>> _awakeningSaveSkillTree = new HashMap<>();
+	private static final Map<ClassId, Map<Long, SkillLearn>> _classSkillTrees = new ConcurrentHashMap<>();
+	private static final Map<ClassId, Map<Long, SkillLearn>> _transferSkillTrees = new ConcurrentHashMap<>();
+	private static final Map<Race, Map<Long, SkillLearn>> _raceSkillTree = new ConcurrentHashMap<>();
+	private static final Map<SubclassType, Map<Long, SkillLearn>> _revelationSkillTree = new ConcurrentHashMap<>();
+	private static final Map<ClassId, Set<Integer>> _awakeningSaveSkillTree = new ConcurrentHashMap<>();
 	// Skill Hash Code, SkillLearn
-	private static final Map<Long, SkillLearn> _collectSkillTree = new HashMap<>();
-	private static final Map<Long, SkillLearn> _fishingSkillTree = new HashMap<>();
-	private static final Map<Long, SkillLearn> _pledgeSkillTree = new HashMap<>();
-	private static final Map<Long, SkillLearn> _subClassSkillTree = new HashMap<>();
-	private static final Map<Long, SkillLearn> _subPledgeSkillTree = new HashMap<>();
-	private static final Map<Long, SkillLearn> _transformSkillTree = new HashMap<>();
-	private static final Map<Long, SkillLearn> _commonSkillTree = new HashMap<>();
-	private static final Map<Long, SkillLearn> _abilitySkillTree = new HashMap<>();
-	private static final Map<Long, SkillLearn> _alchemySkillTree = new HashMap<>();
-	private static final Map<Long, SkillLearn> _dualClassSkillTree = new HashMap<>();
+	private static final Map<Long, SkillLearn> _collectSkillTree = new ConcurrentHashMap<>();
+	private static final Map<Long, SkillLearn> _fishingSkillTree = new ConcurrentHashMap<>();
+	private static final Map<Long, SkillLearn> _pledgeSkillTree = new ConcurrentHashMap<>();
+	private static final Map<Long, SkillLearn> _subClassSkillTree = new ConcurrentHashMap<>();
+	private static final Map<Long, SkillLearn> _subPledgeSkillTree = new ConcurrentHashMap<>();
+	private static final Map<Long, SkillLearn> _transformSkillTree = new ConcurrentHashMap<>();
+	private static final Map<Long, SkillLearn> _commonSkillTree = new ConcurrentHashMap<>();
+	private static final Map<Long, SkillLearn> _abilitySkillTree = new ConcurrentHashMap<>();
+	private static final Map<Long, SkillLearn> _alchemySkillTree = new ConcurrentHashMap<>();
+	private static final Map<Long, SkillLearn> _dualClassSkillTree = new ConcurrentHashMap<>();
 	// Other skill trees
-	private static final Map<Long, SkillLearn> _nobleSkillTree = new HashMap<>();
-	private static final Map<Long, SkillLearn> _heroSkillTree = new HashMap<>();
-	private static final Map<Long, SkillLearn> _gameMasterSkillTree = new HashMap<>();
-	private static final Map<Long, SkillLearn> _gameMasterAuraSkillTree = new HashMap<>();
+	private static final Map<Long, SkillLearn> _nobleSkillTree = new ConcurrentHashMap<>();
+	private static final Map<Long, SkillLearn> _heroSkillTree = new ConcurrentHashMap<>();
+	private static final Map<Long, SkillLearn> _gameMasterSkillTree = new ConcurrentHashMap<>();
+	private static final Map<Long, SkillLearn> _gameMasterAuraSkillTree = new ConcurrentHashMap<>();
 	// Remove skill tree
-	private static final Map<ClassId, Set<Integer>> _removeSkillCache = new HashMap<>();
+	private static final Map<ClassId, Set<Integer>> _removeSkillCache = new ConcurrentHashMap<>();
 	
 	// Checker, sorted arrays of hash codes
 	private Map<Integer, long[]> _skillsByClassIdHashCodes; // Occupation skills
@@ -112,7 +113,7 @@ public final class SkillTreesData implements IGameXmlReader
 	private long[] _allSkillsHashCodes; // Fishing, Collection, Transformations, Common Skills.
 	
 	/** Parent class Ids are read from XML and stored in this map, to allow easy customization. */
-	private static final Map<ClassId, ClassId> _parentClassMap = new HashMap<>();
+	private static final Map<ClassId, ClassId> _parentClassMap = new ConcurrentHashMap<>();
 	
 	private final AtomicBoolean _isLoading = new AtomicBoolean();
 	
diff --git a/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/data/xml/impl/SpawnsData.java b/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/data/xml/impl/SpawnsData.java
index dc41b02109..806d00902a 100644
--- a/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/data/xml/impl/SpawnsData.java
+++ b/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/data/xml/impl/SpawnsData.java
@@ -19,9 +19,10 @@ package com.l2jmobius.gameserver.data.xml.impl;
 import java.io.File;
 import java.util.ArrayList;
 import java.util.Collections;
-import java.util.LinkedList;
 import java.util.List;
 import java.util.Map;
+import java.util.concurrent.CopyOnWriteArrayList;
+import java.util.concurrent.ScheduledFuture;
 import java.util.function.Predicate;
 import java.util.logging.Level;
 import java.util.logging.Logger;
@@ -31,7 +32,7 @@ import org.w3c.dom.Document;
 import org.w3c.dom.Node;
 
 import com.l2jmobius.Config;
-import com.l2jmobius.commons.util.IGameXmlReader;
+import com.l2jmobius.commons.concurrent.ThreadPool;
 import com.l2jmobius.commons.util.IXmlReader;
 import com.l2jmobius.gameserver.model.ChanceLocation;
 import com.l2jmobius.gameserver.model.StatsSet;
@@ -49,11 +50,11 @@ import com.l2jmobius.gameserver.model.zone.type.SpawnTerritory;
 /**
  * @author UnAfraid
  */
-public class SpawnsData implements IGameXmlReader
+public class SpawnsData implements IXmlReader
 {
 	protected static final Logger LOGGER = Logger.getLogger(SpawnsData.class.getName());
 	
-	private final List<SpawnTemplate> _spawns = new LinkedList<>();
+	private final List<SpawnTemplate> _spawns = new CopyOnWriteArrayList<>();
 	
 	protected SpawnsData()
 	{
@@ -94,11 +95,28 @@ public class SpawnsData implements IGameXmlReader
 		}
 		
 		LOGGER.info(getClass().getSimpleName() + ": Initializing spawns...");
-		_spawns.stream().filter(SpawnTemplate::isSpawningByDefault).forEach(template ->
+		final List<ScheduledFuture<?>> jobs = new CopyOnWriteArrayList<>();
+		for (SpawnTemplate template : _spawns)
 		{
-			template.spawnAll(null);
-			template.notifyActivate();
-		});
+			if (template.isSpawningByDefault())
+			{
+				jobs.add(ThreadPool.schedule(() ->
+				{
+					template.spawnAll(null);
+					template.notifyActivate();
+				}, 0));
+			}
+		}
+		while (!jobs.isEmpty())
+		{
+			for (ScheduledFuture<?> job : jobs)
+			{
+				if ((job == null) || job.isDone() || job.isCancelled())
+				{
+					jobs.remove(job);
+				}
+			}
+		}
 		LOGGER.info(getClass().getSimpleName() + ": All spawns has been initialized!");
 	}
 	
diff --git a/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/data/xml/impl/StaticObjectData.java b/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/data/xml/impl/StaticObjectData.java
index 8af86bec88..5e88dd66fb 100644
--- a/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/data/xml/impl/StaticObjectData.java
+++ b/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/data/xml/impl/StaticObjectData.java
@@ -26,7 +26,7 @@ import org.w3c.dom.Document;
 import org.w3c.dom.NamedNodeMap;
 import org.w3c.dom.Node;
 
-import com.l2jmobius.commons.util.IGameXmlReader;
+import com.l2jmobius.commons.util.IXmlReader;
 import com.l2jmobius.gameserver.model.StatsSet;
 import com.l2jmobius.gameserver.model.actor.instance.StaticObjectInstance;
 import com.l2jmobius.gameserver.model.actor.templates.CreatureTemplate;
@@ -35,7 +35,7 @@ import com.l2jmobius.gameserver.model.actor.templates.CreatureTemplate;
  * This class loads and holds all static object data.
  * @author UnAfraid
  */
-public final class StaticObjectData implements IGameXmlReader
+public final class StaticObjectData implements IXmlReader
 {
 	private static final Logger LOGGER = Logger.getLogger(StaticObjectData.class.getName());
 	
diff --git a/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/data/xml/impl/TeleportersData.java b/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/data/xml/impl/TeleportersData.java
index 1d039725ad..5afec008f7 100644
--- a/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/data/xml/impl/TeleportersData.java
+++ b/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/data/xml/impl/TeleportersData.java
@@ -20,12 +20,13 @@ import java.io.File;
 import java.util.Collections;
 import java.util.HashMap;
 import java.util.Map;
+import java.util.concurrent.ConcurrentHashMap;
 import java.util.logging.Logger;
 
 import org.w3c.dom.Document;
 import org.w3c.dom.NamedNodeMap;
 
-import com.l2jmobius.commons.util.IGameXmlReader;
+import com.l2jmobius.commons.util.IXmlReader;
 import com.l2jmobius.gameserver.enums.TeleportType;
 import com.l2jmobius.gameserver.model.StatsSet;
 import com.l2jmobius.gameserver.model.teleporter.TeleportHolder;
@@ -33,12 +34,12 @@ import com.l2jmobius.gameserver.model.teleporter.TeleportHolder;
 /**
  * @author UnAfraid
  */
-public class TeleportersData implements IGameXmlReader
+public class TeleportersData implements IXmlReader
 {
 	// Logger instance
 	private static final Logger LOGGER = Logger.getLogger(TeleportersData.class.getName());
 	// Teleporter data
-	private final Map<Integer, Map<String, TeleportHolder>> _teleporters = new HashMap<>();
+	private final Map<Integer, Map<String, TeleportHolder>> _teleporters = new ConcurrentHashMap<>();
 	
 	protected TeleportersData()
 	{
diff --git a/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/data/xml/impl/TransformData.java b/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/data/xml/impl/TransformData.java
index 896111de87..d917c7e46f 100644
--- a/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/data/xml/impl/TransformData.java
+++ b/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/data/xml/impl/TransformData.java
@@ -17,15 +17,15 @@
 package com.l2jmobius.gameserver.data.xml.impl;
 
 import java.io.File;
-import java.util.HashMap;
 import java.util.Map;
+import java.util.concurrent.ConcurrentHashMap;
 import java.util.logging.Logger;
 
 import org.w3c.dom.Document;
 import org.w3c.dom.NamedNodeMap;
 import org.w3c.dom.Node;
 
-import com.l2jmobius.commons.util.IGameXmlReader;
+import com.l2jmobius.commons.util.IXmlReader;
 import com.l2jmobius.gameserver.model.StatsSet;
 import com.l2jmobius.gameserver.model.actor.transform.Transform;
 import com.l2jmobius.gameserver.model.actor.transform.TransformLevelData;
@@ -39,11 +39,11 @@ import com.l2jmobius.gameserver.network.serverpackets.ExBasicActionList;
  * Transformation data.
  * @author UnAfraid
  */
-public final class TransformData implements IGameXmlReader
+public final class TransformData implements IXmlReader
 {
 	private static final Logger LOGGER = Logger.getLogger(TransformData.class.getName());
 	
-	private final Map<Integer, Transform> _transformData = new HashMap<>();
+	private final Map<Integer, Transform> _transformData = new ConcurrentHashMap<>();
 	
 	protected TransformData()
 	{
diff --git a/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/data/xml/impl/VariationData.java b/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/data/xml/impl/VariationData.java
index 13b41c6359..542acc971b 100644
--- a/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/data/xml/impl/VariationData.java
+++ b/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/data/xml/impl/VariationData.java
@@ -22,11 +22,12 @@ import java.util.Collections;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
+import java.util.concurrent.ConcurrentHashMap;
 import java.util.logging.Logger;
 
 import org.w3c.dom.Document;
 
-import com.l2jmobius.commons.util.IGameXmlReader;
+import com.l2jmobius.commons.util.IXmlReader;
 import com.l2jmobius.gameserver.datatables.ItemTable;
 import com.l2jmobius.gameserver.model.VariationInstance;
 import com.l2jmobius.gameserver.model.items.instance.ItemInstance;
@@ -40,12 +41,12 @@ import com.l2jmobius.gameserver.model.options.VariationWeaponType;
 /**
  * @author Pere
  */
-public class VariationData implements IGameXmlReader
+public class VariationData implements IXmlReader
 {
 	private static final Logger LOGGER = Logger.getLogger(VariationData.class.getSimpleName());
 	
-	private final Map<Integer, Variation> _variations = new HashMap<>();
-	private final Map<Integer, Map<Integer, VariationFee>> _fees = new HashMap<>();
+	private final Map<Integer, Variation> _variations = new ConcurrentHashMap<>();
+	private final Map<Integer, Map<Integer, VariationFee>> _fees = new ConcurrentHashMap<>();
 	
 	protected VariationData()
 	{
diff --git a/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/engines/DocumentEngine.java b/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/engines/DocumentEngine.java
index d787488757..10f04f4fb3 100644
--- a/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/engines/DocumentEngine.java
+++ b/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/engines/DocumentEngine.java
@@ -17,11 +17,14 @@
 package com.l2jmobius.gameserver.engines;
 
 import java.io.File;
-import java.util.LinkedList;
+import java.util.ArrayList;
 import java.util.List;
+import java.util.concurrent.CopyOnWriteArrayList;
+import java.util.concurrent.ScheduledFuture;
 import java.util.logging.Logger;
 
 import com.l2jmobius.Config;
+import com.l2jmobius.commons.concurrent.ThreadPool;
 import com.l2jmobius.commons.util.file.filter.XMLFilter;
 import com.l2jmobius.gameserver.engines.items.DocumentItem;
 import com.l2jmobius.gameserver.model.items.Item;
@@ -33,34 +36,29 @@ public class DocumentEngine
 {
 	private static final Logger LOGGER = Logger.getLogger(DocumentEngine.class.getName());
 	
-	private final List<File> _itemFiles = new LinkedList<>();
-	
-	public static DocumentEngine getInstance()
-	{
-		return SingletonHolder._instance;
-	}
+	private final List<File> _itemFiles = new ArrayList<>();
 	
 	protected DocumentEngine()
 	{
-		hashFiles("data/stats/items", _itemFiles);
+		processDirectory("data/stats/items", _itemFiles);
 		if (Config.CUSTOM_ITEMS_LOAD)
 		{
-			hashFiles("data/stats/items/custom", _itemFiles);
+			processDirectory("data/stats/items/custom", _itemFiles);
 		}
 	}
 	
-	private void hashFiles(String dirname, List<File> hash)
+	private void processDirectory(String dirName, List<File> list)
 	{
-		final File dir = new File(Config.DATAPACK_ROOT, dirname);
+		final File dir = new File(Config.DATAPACK_ROOT, dirName);
 		if (!dir.exists())
 		{
-			LOGGER.warning("Dir " + dir.getAbsolutePath() + " not exists");
+			LOGGER.warning("Dir " + dir.getAbsolutePath() + " does not exist.");
 			return;
 		}
 		final File[] files = dir.listFiles(new XMLFilter());
-		for (File f : files)
+		for (File file : files)
 		{
-			hash.add(f);
+			list.add(file);
 		}
 	}
 	
@@ -70,12 +68,26 @@ public class DocumentEngine
 	 */
 	public List<Item> loadItems()
 	{
-		final List<Item> list = new LinkedList<>();
-		for (File f : _itemFiles)
+		final List<Item> list = new CopyOnWriteArrayList<>();
+		final List<ScheduledFuture<?>> jobs = new CopyOnWriteArrayList<>();
+		for (File file : _itemFiles)
 		{
-			final DocumentItem document = new DocumentItem(f);
-			document.parse();
-			list.addAll(document.getItemList());
+			jobs.add(ThreadPool.schedule(() ->
+			{
+				final DocumentItem document = new DocumentItem(file);
+				document.parse();
+				list.addAll(document.getItemList());
+			}, 0));
+		}
+		while (!jobs.isEmpty())
+		{
+			for (ScheduledFuture<?> job : jobs)
+			{
+				if ((job == null) || job.isDone() || job.isCancelled())
+				{
+					jobs.remove(job);
+				}
+			}
 		}
 		return list;
 	}
@@ -84,4 +96,9 @@ public class DocumentEngine
 	{
 		protected static final DocumentEngine _instance = new DocumentEngine();
 	}
+	
+	public static DocumentEngine getInstance()
+	{
+		return SingletonHolder._instance;
+	}
 }
diff --git a/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/engines/items/DocumentItem.java b/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/engines/items/DocumentItem.java
index 8aaaed2cb4..4ea960563d 100644
--- a/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/engines/items/DocumentItem.java
+++ b/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/engines/items/DocumentItem.java
@@ -19,7 +19,7 @@ package com.l2jmobius.gameserver.engines.items;
 import java.io.File;
 import java.lang.reflect.Constructor;
 import java.lang.reflect.InvocationTargetException;
-import java.util.LinkedList;
+import java.util.ArrayList;
 import java.util.List;
 import java.util.logging.Level;
 import java.util.logging.Logger;
@@ -27,7 +27,7 @@ import java.util.logging.Logger;
 import org.w3c.dom.Document;
 import org.w3c.dom.Node;
 
-import com.l2jmobius.commons.util.IGameXmlReader;
+import com.l2jmobius.commons.util.IXmlReader;
 import com.l2jmobius.gameserver.engines.DocumentBase;
 import com.l2jmobius.gameserver.enums.ItemSkillType;
 import com.l2jmobius.gameserver.model.ExtractableProduct;
@@ -41,12 +41,12 @@ import com.l2jmobius.gameserver.model.stats.functions.FuncTemplate;
 /**
  * @author mkizub, JIV
  */
-public final class DocumentItem extends DocumentBase implements IGameXmlReader
+public final class DocumentItem extends DocumentBase implements IXmlReader
 {
 	Logger LOGGER = Logger.getLogger(DocumentItem.class.getName());
 	
 	private ItemDataHolder _currentItem = null;
-	private final List<Item> _itemsInFile = new LinkedList<>();
+	private final List<Item> _itemsInFile = new ArrayList<>();
 	
 	/**
 	 * @param file
diff --git a/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/handler/ConditionHandler.java b/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/handler/ConditionHandler.java
index c92ef368b3..4e20d5e720 100644
--- a/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/handler/ConditionHandler.java
+++ b/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/handler/ConditionHandler.java
@@ -50,7 +50,7 @@ public final class ConditionHandler
 	{
 		try
 		{
-			ScriptEngineManager.getInstance().executeConditionMasterHandler();
+			ScriptEngineManager.getInstance().executeScript(ScriptEngineManager.CONDITION_HANDLER_FILE);
 		}
 		catch (Exception e)
 		{
diff --git a/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/handler/EffectHandler.java b/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/handler/EffectHandler.java
index 0bf5350cb8..cab6562421 100644
--- a/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/handler/EffectHandler.java
+++ b/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/handler/EffectHandler.java
@@ -50,7 +50,7 @@ public final class EffectHandler
 	{
 		try
 		{
-			ScriptEngineManager.getInstance().executeEffectMasterHandler();
+			ScriptEngineManager.getInstance().executeScript(ScriptEngineManager.EFFECT_MASTER_HANDLER_FILE);
 		}
 		catch (Exception e)
 		{
diff --git a/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/handler/SkillConditionHandler.java b/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/handler/SkillConditionHandler.java
index b764410ba1..8685b0279a 100644
--- a/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/handler/SkillConditionHandler.java
+++ b/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/handler/SkillConditionHandler.java
@@ -50,7 +50,7 @@ public final class SkillConditionHandler
 	{
 		try
 		{
-			ScriptEngineManager.getInstance().executeSkillConditionMasterHandler();
+			ScriptEngineManager.getInstance().executeScript(ScriptEngineManager.SKILL_CONDITION_HANDLER_FILE);
 		}
 		catch (Exception e)
 		{
diff --git a/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/instancemanager/CastleManorManager.java b/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/instancemanager/CastleManorManager.java
index 48d04d3f38..212d1a043c 100644
--- a/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/instancemanager/CastleManorManager.java
+++ b/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/instancemanager/CastleManorManager.java
@@ -40,7 +40,7 @@ import org.w3c.dom.Node;
 import com.l2jmobius.Config;
 import com.l2jmobius.commons.concurrent.ThreadPool;
 import com.l2jmobius.commons.database.DatabaseFactory;
-import com.l2jmobius.commons.util.IGameXmlReader;
+import com.l2jmobius.commons.util.IXmlReader;
 import com.l2jmobius.commons.util.Rnd;
 import com.l2jmobius.gameserver.enums.ManorMode;
 import com.l2jmobius.gameserver.model.CropProcure;
@@ -58,7 +58,7 @@ import com.l2jmobius.gameserver.network.SystemMessageId;
  * Castle manor system.
  * @author malyelfik
  */
-public final class CastleManorManager implements IGameXmlReader, IStorable
+public final class CastleManorManager implements IXmlReader, IStorable
 {
 	private static final Logger LOGGER = Logger.getLogger(CastleManorManager.class.getName());
 	
diff --git a/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/instancemanager/CursedWeaponsManager.java b/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/instancemanager/CursedWeaponsManager.java
index d123b41ef6..835d961c56 100644
--- a/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/instancemanager/CursedWeaponsManager.java
+++ b/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/instancemanager/CursedWeaponsManager.java
@@ -35,7 +35,7 @@ import org.w3c.dom.Node;
 
 import com.l2jmobius.Config;
 import com.l2jmobius.commons.database.DatabaseFactory;
-import com.l2jmobius.commons.util.IGameXmlReader;
+import com.l2jmobius.commons.util.IXmlReader;
 import com.l2jmobius.gameserver.model.CursedWeapon;
 import com.l2jmobius.gameserver.model.actor.Attackable;
 import com.l2jmobius.gameserver.model.actor.Creature;
@@ -54,7 +54,7 @@ import com.l2jmobius.gameserver.util.Broadcast;
  * UnAfraid: TODO: Rewrite with DocumentParser
  * @author Micht
  */
-public final class CursedWeaponsManager implements IGameXmlReader
+public final class CursedWeaponsManager implements IXmlReader
 {
 	private static final Logger LOGGER = Logger.getLogger(CursedWeaponsManager.class.getName());
 	
diff --git a/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/instancemanager/FakePlayerChatManager.java b/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/instancemanager/FakePlayerChatManager.java
index 7101927e48..39c239a762 100644
--- a/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/instancemanager/FakePlayerChatManager.java
+++ b/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/instancemanager/FakePlayerChatManager.java
@@ -25,7 +25,7 @@ import org.w3c.dom.Document;
 
 import com.l2jmobius.Config;
 import com.l2jmobius.commons.concurrent.ThreadPool;
-import com.l2jmobius.commons.util.IGameXmlReader;
+import com.l2jmobius.commons.util.IXmlReader;
 import com.l2jmobius.commons.util.Rnd;
 import com.l2jmobius.gameserver.data.xml.impl.FakePlayerData;
 import com.l2jmobius.gameserver.datatables.SpawnTable;
@@ -41,7 +41,7 @@ import com.l2jmobius.gameserver.network.serverpackets.CreatureSay;
 /**
  * @author Mobius
  */
-public final class FakePlayerChatManager implements IGameXmlReader
+public final class FakePlayerChatManager implements IXmlReader
 {
 	private static Logger LOGGER = Logger.getLogger(FakePlayerChatManager.class.getName());
 	final List<FakePlayerChatHolder> MESSAGES = new ArrayList<>();
diff --git a/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/instancemanager/InstanceManager.java b/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/instancemanager/InstanceManager.java
index f300213c49..5ea229cf1b 100644
--- a/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/instancemanager/InstanceManager.java
+++ b/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/instancemanager/InstanceManager.java
@@ -40,7 +40,6 @@ import org.w3c.dom.Node;
 
 import com.l2jmobius.Config;
 import com.l2jmobius.commons.database.DatabaseFactory;
-import com.l2jmobius.commons.util.IGameXmlReader;
 import com.l2jmobius.commons.util.IXmlReader;
 import com.l2jmobius.gameserver.data.xml.impl.DoorData;
 import com.l2jmobius.gameserver.data.xml.impl.SpawnsData;
@@ -61,7 +60,7 @@ import com.l2jmobius.gameserver.model.spawns.SpawnTemplate;
  * Instance manager.
  * @author evill33t, GodKratos, malyelfik
  */
-public final class InstanceManager implements IGameXmlReader
+public final class InstanceManager implements IXmlReader
 {
 	private static final Logger LOGGER = Logger.getLogger(InstanceManager.class.getName());
 	// Database query
diff --git a/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/instancemanager/ItemAuctionManager.java b/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/instancemanager/ItemAuctionManager.java
index f819adf93b..752bcfdd3f 100644
--- a/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/instancemanager/ItemAuctionManager.java
+++ b/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/instancemanager/ItemAuctionManager.java
@@ -34,13 +34,13 @@ import org.w3c.dom.Node;
 
 import com.l2jmobius.Config;
 import com.l2jmobius.commons.database.DatabaseFactory;
-import com.l2jmobius.commons.util.IGameXmlReader;
+import com.l2jmobius.commons.util.IXmlReader;
 import com.l2jmobius.gameserver.model.itemauction.ItemAuctionInstance;
 
 /**
  * @author Forsaiken
  */
-public final class ItemAuctionManager implements IGameXmlReader
+public final class ItemAuctionManager implements IXmlReader
 {
 	private static final Logger LOGGER = Logger.getLogger(ItemAuctionManager.class.getName());
 	
diff --git a/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/instancemanager/MapRegionManager.java b/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/instancemanager/MapRegionManager.java
index 255d4340ff..8f68a4bdf5 100644
--- a/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/instancemanager/MapRegionManager.java
+++ b/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/instancemanager/MapRegionManager.java
@@ -27,7 +27,7 @@ import org.w3c.dom.NamedNodeMap;
 import org.w3c.dom.Node;
 
 import com.l2jmobius.Config;
-import com.l2jmobius.commons.util.IGameXmlReader;
+import com.l2jmobius.commons.util.IXmlReader;
 import com.l2jmobius.gameserver.data.xml.impl.ClanHallData;
 import com.l2jmobius.gameserver.model.Location;
 import com.l2jmobius.gameserver.model.MapRegion;
@@ -47,7 +47,7 @@ import com.l2jmobius.gameserver.model.zone.type.RespawnZone;
  * Map Region Manager.
  * @author Nyaran
  */
-public final class MapRegionManager implements IGameXmlReader
+public final class MapRegionManager implements IXmlReader
 {
 	private static final Logger LOGGER = Logger.getLogger(MapRegionManager.class.getName());
 	
diff --git a/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/instancemanager/SellBuffsManager.java b/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/instancemanager/SellBuffsManager.java
index dcf1bae346..0c4e94f449 100644
--- a/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/instancemanager/SellBuffsManager.java
+++ b/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/instancemanager/SellBuffsManager.java
@@ -26,7 +26,7 @@ import org.w3c.dom.Element;
 import org.w3c.dom.NodeList;
 
 import com.l2jmobius.Config;
-import com.l2jmobius.commons.util.IGameXmlReader;
+import com.l2jmobius.commons.util.IXmlReader;
 import com.l2jmobius.gameserver.cache.HtmCache;
 import com.l2jmobius.gameserver.data.xml.impl.SkillData;
 import com.l2jmobius.gameserver.datatables.ItemTable;
@@ -46,7 +46,7 @@ import com.l2jmobius.gameserver.util.Util;
  * Sell Buffs Manager
  * @author St3eT
  */
-public final class SellBuffsManager implements IGameXmlReader
+public final class SellBuffsManager implements IXmlReader
 {
 	private static final Logger LOGGER = Logger.getLogger(SellBuffsManager.class.getName());
 	private static final List<Integer> ALLOWED_BUFFS = new ArrayList<>();
diff --git a/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/instancemanager/WalkingManager.java b/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/instancemanager/WalkingManager.java
index 4583519bc4..18c4814040 100644
--- a/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/instancemanager/WalkingManager.java
+++ b/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/instancemanager/WalkingManager.java
@@ -28,7 +28,7 @@ import org.w3c.dom.NamedNodeMap;
 import org.w3c.dom.Node;
 
 import com.l2jmobius.commons.concurrent.ThreadPool;
-import com.l2jmobius.commons.util.IGameXmlReader;
+import com.l2jmobius.commons.util.IXmlReader;
 import com.l2jmobius.gameserver.ai.CtrlIntention;
 import com.l2jmobius.gameserver.data.xml.impl.NpcData;
 import com.l2jmobius.gameserver.enums.ChatType;
@@ -49,7 +49,7 @@ import com.l2jmobius.gameserver.network.NpcStringId;
  * This class manages walking monsters.
  * @author GKR
  */
-public final class WalkingManager implements IGameXmlReader
+public final class WalkingManager implements IXmlReader
 {
 	private static final Logger LOGGER = Logger.getLogger(WalkingManager.class.getName());
 	
diff --git a/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/instancemanager/ZoneManager.java b/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/instancemanager/ZoneManager.java
index b698f51a03..9a0bd870f2 100644
--- a/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/instancemanager/ZoneManager.java
+++ b/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/instancemanager/ZoneManager.java
@@ -26,6 +26,7 @@ import java.util.List;
 import java.util.Map;
 import java.util.Optional;
 import java.util.OptionalInt;
+import java.util.concurrent.ConcurrentHashMap;
 import java.util.logging.Level;
 import java.util.logging.Logger;
 
@@ -33,7 +34,7 @@ import org.w3c.dom.Document;
 import org.w3c.dom.NamedNodeMap;
 import org.w3c.dom.Node;
 
-import com.l2jmobius.commons.util.IGameXmlReader;
+import com.l2jmobius.commons.util.IXmlReader;
 import com.l2jmobius.gameserver.model.World;
 import com.l2jmobius.gameserver.model.WorldObject;
 import com.l2jmobius.gameserver.model.actor.Creature;
@@ -55,7 +56,7 @@ import com.l2jmobius.gameserver.model.zone.type.SpawnTerritory;
  * This class manages the zones
  * @author durgus
  */
-public final class ZoneManager implements IGameXmlReader
+public final class ZoneManager implements IXmlReader
 {
 	private static final Logger LOGGER = Logger.getLogger(ZoneManager.class.getName());
 	
@@ -65,9 +66,9 @@ public final class ZoneManager implements IGameXmlReader
 	private static final int OFFSET_X = Math.abs(World.MAP_MIN_X >> SHIFT_BY);
 	private static final int OFFSET_Y = Math.abs(World.MAP_MIN_Y >> SHIFT_BY);
 	
-	private final Map<Class<? extends ZoneType>, Map<Integer, ? extends ZoneType>> _classZones = new HashMap<>();
-	private final Map<String, SpawnTerritory> _spawnTerritories = new HashMap<>();
-	private int _lastDynamicId = 300000;
+	private final Map<Class<? extends ZoneType>, ConcurrentHashMap<Integer, ? extends ZoneType>> _classZones = new ConcurrentHashMap<>();
+	private final Map<String, SpawnTerritory> _spawnTerritories = new ConcurrentHashMap<>();
+	private volatile int _lastDynamicId = 300000;
 	private List<ItemInstance> _debugItems;
 	
 	private final ZoneRegion[][] _zoneRegions = new ZoneRegion[(World.MAP_MAX_X >> SHIFT_BY) + OFFSET_X + 1][(World.MAP_MAX_Y >> SHIFT_BY) + OFFSET_Y + 1];
@@ -365,7 +366,7 @@ public final class ZoneManager implements IGameXmlReader
 						}
 						if (checkId(zoneId))
 						{
-							LOGGER.config(getClass().getSimpleName() + ": Caution: Zone (" + zoneId + ") from file: " + f.getName() + " overrides previos definition.");
+							LOGGER.config(getClass().getSimpleName() + ": Caution: Zone (" + zoneId + ") from file: " + f.getName() + " overrides previuos definition.");
 						}
 						
 						if ((zoneName != null) && !zoneName.isEmpty())
@@ -453,10 +454,10 @@ public final class ZoneManager implements IGameXmlReader
 	@SuppressWarnings("unchecked")
 	private <T extends ZoneType> void addZone(Integer id, T zone)
 	{
-		Map<Integer, T> map = (Map<Integer, T>) _classZones.get(zone.getClass());
+		ConcurrentHashMap<Integer, T> map = (ConcurrentHashMap<Integer, T>) _classZones.get(zone.getClass());
 		if (map == null)
 		{
-			map = new HashMap<>();
+			map = new ConcurrentHashMap<>();
 			map.put(id, zone);
 			_classZones.put(zone.getClass(), map);
 		}
diff --git a/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/model/quest/LongTimeEvent.java b/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/model/quest/LongTimeEvent.java
index cc71991407..0fa020eb5d 100644
--- a/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/model/quest/LongTimeEvent.java
+++ b/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/model/quest/LongTimeEvent.java
@@ -32,7 +32,7 @@ import org.w3c.dom.Node;
 
 import com.l2jmobius.commons.concurrent.ThreadPool;
 import com.l2jmobius.commons.database.DatabaseFactory;
-import com.l2jmobius.commons.util.IGameXmlReader;
+import com.l2jmobius.commons.util.IXmlReader;
 import com.l2jmobius.gameserver.data.sql.impl.AnnouncementsTable;
 import com.l2jmobius.gameserver.data.xml.impl.NpcData;
 import com.l2jmobius.gameserver.datatables.EventDroplist;
@@ -117,7 +117,7 @@ public class LongTimeEvent extends Quest
 	 */
 	private void loadConfig()
 	{
-		new IGameXmlReader()
+		new IXmlReader()
 		{
 			@Override
 			public void load()
diff --git a/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/model/stats/BaseStats.java b/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/model/stats/BaseStats.java
index daba0d3071..64af7961e9 100644
--- a/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/model/stats/BaseStats.java
+++ b/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/model/stats/BaseStats.java
@@ -23,7 +23,6 @@ import java.util.logging.Logger;
 import org.w3c.dom.Document;
 import org.w3c.dom.NamedNodeMap;
 
-import com.l2jmobius.commons.util.IGameXmlReader;
 import com.l2jmobius.commons.util.IXmlReader;
 import com.l2jmobius.gameserver.model.actor.Creature;
 
@@ -105,7 +104,7 @@ public enum BaseStats
 	
 	static
 	{
-		new IGameXmlReader()
+		new IXmlReader()
 		{
 			final Logger LOGGER = Logger.getLogger(BaseStats.class.getName());
 			
diff --git a/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/scripting/ScriptEngineManager.java b/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/scripting/ScriptEngineManager.java
index 4cd9af07b0..7c6f1f84c2 100644
--- a/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/scripting/ScriptEngineManager.java
+++ b/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/scripting/ScriptEngineManager.java
@@ -28,8 +28,6 @@ import java.nio.file.attribute.BasicFileAttributes;
 import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.Iterator;
-import java.util.LinkedHashMap;
-import java.util.LinkedList;
 import java.util.List;
 import java.util.Map;
 import java.util.Map.Entry;
@@ -42,14 +40,14 @@ import java.util.logging.Logger;
 import org.w3c.dom.Document;
 
 import com.l2jmobius.Config;
-import com.l2jmobius.commons.util.IGameXmlReader;
+import com.l2jmobius.commons.util.IXmlReader;
 import com.l2jmobius.gameserver.scripting.java.JavaScriptingEngine;
 
 /**
  * Caches script engines and provides functionality for executing and managing scripts.
  * @author KenM, HorridoJoho
  */
-public final class ScriptEngineManager implements IGameXmlReader
+public final class ScriptEngineManager implements IXmlReader
 {
 	private static final Logger LOGGER = Logger.getLogger(ScriptEngineManager.class.getName());
 	public static final Path SCRIPT_FOLDER = Paths.get(Config.DATAPACK_ROOT.getAbsolutePath(), "data", "scripts");
@@ -58,8 +56,7 @@ public final class ScriptEngineManager implements IGameXmlReader
 	public static final Path SKILL_CONDITION_HANDLER_FILE = Paths.get(SCRIPT_FOLDER.toString(), "handlers", "SkillConditionMasterHandler.java");
 	public static final Path CONDITION_HANDLER_FILE = Paths.get(SCRIPT_FOLDER.toString(), "handlers", "ConditionMasterHandler.java");
 	
-	private final Map<String, IExecutionContext> _extEngines = new HashMap<>();
-	private IExecutionContext _currentExecutionContext = null;
+	private IExecutionContext _javaExecutionContext = null;
 	static final List<String> _exclusions = new ArrayList<>();
 	
 	protected ScriptEngineManager()
@@ -165,11 +162,7 @@ public final class ScriptEngineManager implements IGameXmlReader
 	private void registerEngine(IScriptingEngine engine, Properties props)
 	{
 		maybeSetProperties("language." + engine.getLanguageName() + ".", props, engine);
-		final IExecutionContext context = engine.createExecutionContext();
-		for (String commonExtension : engine.getCommonFileExtensions())
-		{
-			_extEngines.put(commonExtension, context);
-		}
+		_javaExecutionContext = engine.createExecutionContext();
 		
 		LOGGER.info("ScriptEngine: " + engine.getEngineName() + " " + engine.getEngineVersion() + " (" + engine.getLanguageName() + " " + engine.getLanguageVersion() + ")");
 	}
@@ -199,61 +192,6 @@ public final class ScriptEngineManager implements IGameXmlReader
 		}
 	}
 	
-	private IExecutionContext getEngineByExtension(String ext)
-	{
-		return _extEngines.get(ext);
-	}
-	
-	private String getFileExtension(Path p)
-	{
-		final String name = p.getFileName().toString();
-		final int lastDotIdx = name.lastIndexOf('.');
-		if (lastDotIdx == -1)
-		{
-			return null;
-		}
-		
-		final String extension = name.substring(lastDotIdx + 1);
-		if (extension.isEmpty())
-		{
-			return null;
-		}
-		
-		return extension;
-	}
-	
-	private void checkExistingFile(String messagePre, Path filePath) throws Exception
-	{
-		if (!Files.exists(filePath))
-		{
-			throw new Exception(messagePre + ": " + filePath + " does not exists!");
-		}
-		else if (!Files.isRegularFile(filePath))
-		{
-			throw new Exception(messagePre + ": " + filePath + " is not a file!");
-		}
-	}
-	
-	public void executeMasterHandler() throws Exception
-	{
-		executeScript(MASTER_HANDLER_FILE);
-	}
-	
-	public void executeEffectMasterHandler() throws Exception
-	{
-		executeScript(EFFECT_MASTER_HANDLER_FILE);
-	}
-	
-	public void executeSkillConditionMasterHandler() throws Exception
-	{
-		executeScript(SKILL_CONDITION_HANDLER_FILE);
-	}
-	
-	public void executeConditionMasterHandler() throws Exception
-	{
-		executeScript(CONDITION_HANDLER_FILE);
-	}
-	
 	public void executeScriptList() throws Exception
 	{
 		if (Config.ALT_DEV_NO_QUESTS)
@@ -261,77 +199,35 @@ public final class ScriptEngineManager implements IGameXmlReader
 			return;
 		}
 		
-		final Map<IExecutionContext, List<Path>> files = new LinkedHashMap<>();
+		final List<Path> files = new ArrayList<>();
 		processDirectory(SCRIPT_FOLDER.toFile(), files);
 		
-		for (Entry<IExecutionContext, List<Path>> entry : files.entrySet())
+		final Map<Path, Throwable> invokationErrors = _javaExecutionContext.executeScripts(files);
+		for (Entry<Path, Throwable> entry : invokationErrors.entrySet())
 		{
-			_currentExecutionContext = entry.getKey();
-			try
-			{
-				final Map<Path, Throwable> invokationErrors = entry.getKey().executeScripts(entry.getValue());
-				for (Entry<Path, Throwable> entry2 : invokationErrors.entrySet())
-				{
-					LOGGER.log(Level.WARNING, "ScriptEngine: " + entry2.getKey() + " failed execution!", entry2.getValue());
-				}
-			}
-			finally
-			{
-				_currentExecutionContext = null;
-			}
+			LOGGER.log(Level.WARNING, "ScriptEngine: " + entry.getKey() + " failed execution!", entry.getValue());
 		}
 	}
 	
-	private void processDirectory(File dir, Map<IExecutionContext, List<Path>> files)
+	private void processDirectory(File dir, List<Path> files)
 	{
 		for (File file : dir.listFiles())
 		{
-			if (file.isDirectory())
+			if (file.isFile())
+			{
+				final String fileName = file.getName();
+				if (fileName.endsWith(".java") && !_exclusions.contains(fileName))
+				{
+					files.add(file.toPath().toAbsolutePath());
+				}
+			}
+			else if (file.isDirectory())
 			{
 				processDirectory(file, files);
 			}
-			else
-			{
-				processFile(file, files);
-			}
 		}
 	}
 	
-	private void processFile(File file, Map<IExecutionContext, List<Path>> files)
-	{
-		if (_exclusions.contains(file.getName()))
-		{
-			return;
-		}
-		
-		Path sourceFile = file.toPath();
-		try
-		{
-			checkExistingFile("ScriptFile", sourceFile);
-		}
-		catch (Exception e)
-		{
-			LOGGER.warning(e.getMessage());
-			return;
-		}
-		
-		sourceFile = sourceFile.toAbsolutePath();
-		final String ext = getFileExtension(sourceFile);
-		if (ext == null)
-		{
-			LOGGER.warning("ScriptFile: " + sourceFile + " does not have an extension to determine the script engine!");
-			return;
-		}
-		
-		final IExecutionContext engine = getEngineByExtension(ext);
-		if (engine == null)
-		{
-			return;
-		}
-		
-		files.computeIfAbsent(engine, k -> new LinkedList<>()).add(sourceFile);
-	}
-	
 	public void executeScript(Path sourceFile) throws Exception
 	{
 		Objects.requireNonNull(sourceFile);
@@ -341,34 +237,19 @@ public final class ScriptEngineManager implements IGameXmlReader
 			sourceFile = SCRIPT_FOLDER.resolve(sourceFile);
 		}
 		
-		// throws exception if not exists or not file
-		checkExistingFile("ScriptFile", sourceFile);
-		
 		sourceFile = sourceFile.toAbsolutePath();
-		final String ext = getFileExtension(sourceFile);
 		Objects.requireNonNull(sourceFile, "ScriptFile: " + sourceFile + " does not have an extension to determine the script engine!");
 		
-		final IExecutionContext engine = getEngineByExtension(ext);
-		Objects.requireNonNull(engine, "ScriptEngine: No engine registered for extension " + ext + "!");
-		
-		_currentExecutionContext = engine;
-		try
+		final Entry<Path, Throwable> error = _javaExecutionContext.executeScript(sourceFile);
+		if (error != null)
 		{
-			final Entry<Path, Throwable> error = engine.executeScript(sourceFile);
-			if (error != null)
-			{
-				throw new Exception("ScriptEngine: " + error.getKey() + " failed execution!", error.getValue());
-			}
-		}
-		finally
-		{
-			_currentExecutionContext = null;
+			throw new Exception("ScriptEngine: " + error.getKey() + " failed execution!", error.getValue());
 		}
 	}
 	
 	public Path getCurrentLoadingScript()
 	{
-		return _currentExecutionContext != null ? _currentExecutionContext.getCurrentExecutingScript() : null;
+		return _javaExecutionContext.getCurrentExecutingScript();
 	}
 	
 	public static ScriptEngineManager getInstance()
diff --git a/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/loginserver/GameServerTable.java b/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/loginserver/GameServerTable.java
index 456224d78c..4269e47969 100644
--- a/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/loginserver/GameServerTable.java
+++ b/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/loginserver/GameServerTable.java
@@ -36,8 +36,8 @@ import org.w3c.dom.Document;
 import org.w3c.dom.NodeList;
 
 import com.l2jmobius.commons.database.DatabaseFactory;
-import com.l2jmobius.commons.util.IGameXmlReader;
 import com.l2jmobius.commons.util.IPSubnet;
+import com.l2jmobius.commons.util.IXmlReader;
 import com.l2jmobius.commons.util.Rnd;
 import com.l2jmobius.loginserver.network.gameserverpackets.ServerStatus;
 
@@ -45,7 +45,7 @@ import com.l2jmobius.loginserver.network.gameserverpackets.ServerStatus;
  * The Class GameServerTable loads the game server names and initialize the game server tables.
  * @author KenM, Zoey76
  */
-public final class GameServerTable implements IGameXmlReader
+public final class GameServerTable implements IXmlReader
 {
 	private static final Logger LOGGER = Logger.getLogger(GameServerTable.class.getName());
 	
diff --git a/L2J_Mobius_2.5_Underground/dist/game/config/Scripts.xml b/L2J_Mobius_2.5_Underground/dist/game/config/Scripts.xml
index 284aa0a31f..54d05b241f 100644
--- a/L2J_Mobius_2.5_Underground/dist/game/config/Scripts.xml
+++ b/L2J_Mobius_2.5_Underground/dist/game/config/Scripts.xml
@@ -2,11 +2,7 @@
 <list xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../data/xsd/Scripts.xsd">
 	<!-- Skip these filenames from script loading, because they are already loaded using a different way. -->
 	<exclude file="package-info.java" />
-	<exclude file="MasterHandler.java" />
-	<exclude file="EffectMasterHandler.java" />
-	<exclude file="SkillConditionMasterHandler.java" />
-	<exclude file="ConditionMasterHandler.java" />
-	<exclude file="DailyMissionMasterHandler.java" />
+	<exclude file="handlers" />
 	
 	<!--
 	With this file you can exclude/include specific folders/files from within the scripts directory.
diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/ai/areas/ImperialTomb/FourSepulchers/FourSepulchers.java b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/ai/areas/ImperialTomb/FourSepulchers/FourSepulchers.java
index 053e095ace..7a59593544 100644
--- a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/ai/areas/ImperialTomb/FourSepulchers/FourSepulchers.java
+++ b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/ai/areas/ImperialTomb/FourSepulchers/FourSepulchers.java
@@ -29,7 +29,7 @@ import org.w3c.dom.NamedNodeMap;
 import org.w3c.dom.Node;
 
 import com.l2jmobius.commons.concurrent.ThreadPool;
-import com.l2jmobius.commons.util.IGameXmlReader;
+import com.l2jmobius.commons.util.IXmlReader;
 import com.l2jmobius.gameserver.ai.CtrlIntention;
 import com.l2jmobius.gameserver.enums.ChatType;
 import com.l2jmobius.gameserver.geoengine.GeoEngine;
@@ -56,7 +56,7 @@ import quests.Q00620_FourGoblets.Q00620_FourGoblets;
  * Four Selpuchers AI
  * @author Mobius
  */
-public final class FourSepulchers extends AbstractNpcAI implements IGameXmlReader
+public final class FourSepulchers extends AbstractNpcAI implements IXmlReader
 {
 	Logger LOGGER = Logger.getLogger(FourSepulchers.class.getName());
 	
diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/ai/bosses/Tiat/Stage1.java b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/ai/bosses/Tiat/Stage1.java
index e1e54da1a8..1b350c946e 100644
--- a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/ai/bosses/Tiat/Stage1.java
+++ b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/ai/bosses/Tiat/Stage1.java
@@ -30,7 +30,7 @@ import org.w3c.dom.NamedNodeMap;
 import org.w3c.dom.Node;
 
 import com.l2jmobius.commons.util.CommonUtil;
-import com.l2jmobius.commons.util.IGameXmlReader;
+import com.l2jmobius.commons.util.IXmlReader;
 import com.l2jmobius.gameserver.ai.CtrlIntention;
 import com.l2jmobius.gameserver.enums.Movie;
 import com.l2jmobius.gameserver.enums.TrapAction;
@@ -66,7 +66,7 @@ import instances.AbstractInstance;
  * Please maintain consistency between the Seed scripts.
  * @author Gigiikun
  */
-public final class Stage1 extends AbstractInstance implements IGameXmlReader
+public final class Stage1 extends AbstractInstance implements IXmlReader
 {
 	Logger LOGGER = Logger.getLogger(Stage1.class.getName());
 	
diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/ai/others/ClassMaster/ClassMaster.java b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/ai/others/ClassMaster/ClassMaster.java
index 8182363857..5a1d30c11d 100644
--- a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/ai/others/ClassMaster/ClassMaster.java
+++ b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/ai/others/ClassMaster/ClassMaster.java
@@ -30,7 +30,7 @@ import org.w3c.dom.NamedNodeMap;
 import org.w3c.dom.Node;
 
 import com.l2jmobius.Config;
-import com.l2jmobius.commons.util.IGameXmlReader;
+import com.l2jmobius.commons.util.IXmlReader;
 import com.l2jmobius.gameserver.data.xml.impl.CategoryData;
 import com.l2jmobius.gameserver.data.xml.impl.ClassListData;
 import com.l2jmobius.gameserver.data.xml.impl.SkillData;
@@ -63,7 +63,7 @@ import ai.AbstractNpcAI;
  * Class Master AI.
  * @author Nik
  */
-public final class ClassMaster extends AbstractNpcAI implements IGameXmlReader
+public final class ClassMaster extends AbstractNpcAI implements IXmlReader
 {
 	// NPCs
 	private static final List<Integer> CLASS_MASTERS = new ArrayList<>();
diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/ai/others/MentorGuide/MentorGuide.java b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/ai/others/MentorGuide/MentorGuide.java
index ce6e3bd57b..eeb6b34418 100644
--- a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/ai/others/MentorGuide/MentorGuide.java
+++ b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/ai/others/MentorGuide/MentorGuide.java
@@ -26,7 +26,7 @@ import org.w3c.dom.Document;
 import org.w3c.dom.Node;
 
 import com.l2jmobius.Config;
-import com.l2jmobius.commons.util.IGameXmlReader;
+import com.l2jmobius.commons.util.IXmlReader;
 import com.l2jmobius.gameserver.enums.CategoryType;
 import com.l2jmobius.gameserver.enums.MailType;
 import com.l2jmobius.gameserver.instancemanager.MailManager;
@@ -62,7 +62,7 @@ import ai.AbstractNpcAI;
  * Mentor Guide AI.
  * @author Gnacik, UnAfraid
  */
-public final class MentorGuide extends AbstractNpcAI implements IGameXmlReader
+public final class MentorGuide extends AbstractNpcAI implements IXmlReader
 {
 	private static final Logger LOGGER = Logger.getLogger(MentorGuide.class.getName());
 	
diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/ai/others/NpcBuffers/NpcBuffersData.java b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/ai/others/NpcBuffers/NpcBuffersData.java
index b0287e1df6..51708af4f8 100644
--- a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/ai/others/NpcBuffers/NpcBuffersData.java
+++ b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/ai/others/NpcBuffers/NpcBuffersData.java
@@ -27,13 +27,13 @@ import org.w3c.dom.Document;
 import org.w3c.dom.NamedNodeMap;
 import org.w3c.dom.Node;
 
-import com.l2jmobius.commons.util.IGameXmlReader;
+import com.l2jmobius.commons.util.IXmlReader;
 import com.l2jmobius.gameserver.model.StatsSet;
 
 /**
  * @author UnAfraid
  */
-class NpcBuffersData implements IGameXmlReader
+class NpcBuffersData implements IXmlReader
 {
 	private static final Logger LOGGER = Logger.getLogger(NpcBuffersData.class.getName());
 	
diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/admincommandhandlers/AdminQuest.java b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/admincommandhandlers/AdminQuest.java
index 228cc1668d..a771c4ab90 100644
--- a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/admincommandhandlers/AdminQuest.java
+++ b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/admincommandhandlers/AdminQuest.java
@@ -320,7 +320,7 @@ public class AdminQuest implements IAdminCommandHandler
 				{
 					sb.append("<a action=\"bypass -h admin_script_dir " + c + "\">" + c + "</a><br1>");
 				}
-				else if (c.endsWith(".java") || c.endsWith(".py"))
+				else if (c.endsWith(".java"))
 				{
 					sb.append("<a action=\"bypass -h admin_script_load " + c + "\"><font color=\"LEVEL\">" + c + "</font></a><br1>");
 				}
@@ -352,7 +352,7 @@ public class AdminQuest implements IAdminCommandHandler
 				{
 					sb.append("<a action=\"bypass -h admin_script_dir " + currentPath + "/" + c + "\">" + (questReducedNames ? getQuestName(c) : c) + "</a><br1>");
 				}
-				else if (c.endsWith(".java") || c.endsWith(".py"))
+				else if (c.endsWith(".java"))
 				{
 					sb.append("<a action=\"bypass -h admin_script_load " + currentPath + "/" + c + "\"><font color=\"LEVEL\">" + c + "</font></a><br1>");
 				}
diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/admincommandhandlers/AdminReload.java b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/admincommandhandlers/AdminReload.java
index 89a082fffa..bbcc2e4744 100644
--- a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/admincommandhandlers/AdminReload.java
+++ b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/admincommandhandlers/AdminReload.java
@@ -222,7 +222,7 @@ public class AdminReload implements IAdminCommandHandler
 				{
 					try
 					{
-						ScriptEngineManager.getInstance().executeEffectMasterHandler();
+						ScriptEngineManager.getInstance().executeScript(ScriptEngineManager.EFFECT_MASTER_HANDLER_FILE);
 						AdminData.getInstance().broadcastMessageToGMs(activeChar.getName() + ": Reloaded effect master handler.");
 					}
 					catch (Exception e)
@@ -236,7 +236,7 @@ public class AdminReload implements IAdminCommandHandler
 				{
 					try
 					{
-						ScriptEngineManager.getInstance().executeMasterHandler();
+						ScriptEngineManager.getInstance().executeScript(ScriptEngineManager.MASTER_HANDLER_FILE);
 						AdminData.getInstance().broadcastMessageToGMs(activeChar.getName() + ": Reloaded master handler.");
 					}
 					catch (Exception e)
diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/telnethandlers/server/Reload.java b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/telnethandlers/server/Reload.java
index c47b82561d..90c21b1624 100644
--- a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/telnethandlers/server/Reload.java
+++ b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/telnethandlers/server/Reload.java
@@ -182,7 +182,7 @@ public class Reload implements ITelnetCommand
 			{
 				try
 				{
-					ScriptEngineManager.getInstance().executeEffectMasterHandler();
+					ScriptEngineManager.getInstance().executeScript(ScriptEngineManager.EFFECT_MASTER_HANDLER_FILE);
 					return AdminData.getInstance().broadcastMessageToGMs("Telnet Admin: Reloaded effect master handler.");
 				}
 				catch (Exception e)
@@ -195,7 +195,7 @@ public class Reload implements ITelnetCommand
 			{
 				try
 				{
-					ScriptEngineManager.getInstance().executeMasterHandler();
+					ScriptEngineManager.getInstance().executeScript(ScriptEngineManager.MASTER_HANDLER_FILE);
 					return AdminData.getInstance().broadcastMessageToGMs("Telnet Admin: Reloaded master handler.");
 				}
 				catch (Exception e)
diff --git a/L2J_Mobius_2.5_Underground/java/com/l2jmobius/Config.java b/L2J_Mobius_2.5_Underground/java/com/l2jmobius/Config.java
index f344d492bf..dcea4128f1 100644
--- a/L2J_Mobius_2.5_Underground/java/com/l2jmobius/Config.java
+++ b/L2J_Mobius_2.5_Underground/java/com/l2jmobius/Config.java
@@ -54,7 +54,7 @@ import org.w3c.dom.Document;
 import org.w3c.dom.NamedNodeMap;
 import org.w3c.dom.Node;
 
-import com.l2jmobius.commons.util.IGameXmlReader;
+import com.l2jmobius.commons.util.IXmlReader;
 import com.l2jmobius.commons.util.PropertiesParser;
 import com.l2jmobius.commons.util.StringUtil;
 import com.l2jmobius.gameserver.enums.ChatType;
@@ -3114,7 +3114,7 @@ public final class Config
 		return result;
 	}
 	
-	private static class IPConfigData implements IGameXmlReader
+	private static class IPConfigData implements IXmlReader
 	{
 		private static final List<String> _subnets = new ArrayList<>(5);
 		private static final List<String> _hosts = new ArrayList<>(5);
diff --git a/L2J_Mobius_2.5_Underground/java/com/l2jmobius/commons/util/IGameXmlReader.java b/L2J_Mobius_2.5_Underground/java/com/l2jmobius/commons/util/IGameXmlReader.java
deleted file mode 100644
index b29089db77..0000000000
--- a/L2J_Mobius_2.5_Underground/java/com/l2jmobius/commons/util/IGameXmlReader.java
+++ /dev/null
@@ -1,118 +0,0 @@
-/*
- * This file is part of the L2J Mobius project.
- * 
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- * 
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * General Public License for more details.
- * 
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- */
-package com.l2jmobius.commons.util;
-
-import java.io.File;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
-import org.w3c.dom.NamedNodeMap;
-import org.w3c.dom.Node;
-
-import com.l2jmobius.Config;
-import com.l2jmobius.gameserver.model.Location;
-import com.l2jmobius.gameserver.model.holders.MinionHolder;
-import com.l2jmobius.gameserver.model.holders.SkillHolder;
-
-/**
- * Interface for XML parsers.
- * @author Zoey76
- */
-public interface IGameXmlReader extends IXmlReader
-{
-	/**
-	 * Wrapper for {@link #parseFile(File)} method.
-	 * @param path the relative path to the datapack root of the XML file to parse.
-	 */
-	default void parseDatapackFile(String path)
-	{
-		parseFile(new File(Config.DATAPACK_ROOT, path));
-	}
-	
-	/**
-	 * Wrapper for {@link #parseDirectory(File, boolean)}.
-	 * @param path the path to the directory where the XML files are
-	 * @param recursive parses all sub folders if there is
-	 * @return {@code false} if it fails to find the directory, {@code true} otherwise
-	 */
-	default boolean parseDatapackDirectory(String path, boolean recursive)
-	{
-		return parseDirectory(new File(Config.DATAPACK_ROOT, path), recursive);
-	}
-	
-	/**
-	 * @param n
-	 * @return a map of parameters
-	 */
-	default Map<String, Object> parseParameters(Node n)
-	{
-		final Map<String, Object> parameters = new HashMap<>();
-		for (Node parameters_node = n.getFirstChild(); parameters_node != null; parameters_node = parameters_node.getNextSibling())
-		{
-			NamedNodeMap attrs = parameters_node.getAttributes();
-			switch (parameters_node.getNodeName().toLowerCase())
-			{
-				case "param":
-				{
-					parameters.put(parseString(attrs, "name"), parseString(attrs, "value"));
-					break;
-				}
-				case "skill":
-				{
-					parameters.put(parseString(attrs, "name"), new SkillHolder(parseInteger(attrs, "id"), parseInteger(attrs, "level")));
-					break;
-				}
-				case "location":
-				{
-					parameters.put(parseString(attrs, "name"), new Location(parseInteger(attrs, "x"), parseInteger(attrs, "y"), parseInteger(attrs, "z"), parseInteger(attrs, "heading", 0)));
-					break;
-				}
-				case "minions":
-				{
-					final List<MinionHolder> minions = new ArrayList<>(1);
-					for (Node minions_node = parameters_node.getFirstChild(); minions_node != null; minions_node = minions_node.getNextSibling())
-					{
-						if (minions_node.getNodeName().equalsIgnoreCase("npc"))
-						{
-							attrs = minions_node.getAttributes();
-							minions.add(new MinionHolder(parseInteger(attrs, "id"), parseInteger(attrs, "count"), parseInteger(attrs, "respawnTime"), parseInteger(attrs, "weightPoint")));
-						}
-					}
-					
-					if (!minions.isEmpty())
-					{
-						parameters.put(parseString(parameters_node.getAttributes(), "name"), minions);
-					}
-					break;
-				}
-			}
-		}
-		return parameters;
-	}
-	
-	default Location parseLocation(Node n)
-	{
-		final NamedNodeMap attrs = n.getAttributes();
-		final int x = parseInteger(attrs, "x");
-		final int y = parseInteger(attrs, "y");
-		final int z = parseInteger(attrs, "z");
-		final int heading = parseInteger(attrs, "heading", 0);
-		return new Location(x, y, z, heading);
-	}
-}
diff --git a/L2J_Mobius_2.5_Underground/java/com/l2jmobius/commons/util/IXmlReader.java b/L2J_Mobius_2.5_Underground/java/com/l2jmobius/commons/util/IXmlReader.java
index 0317816fd8..4bfed2396e 100644
--- a/L2J_Mobius_2.5_Underground/java/com/l2jmobius/commons/util/IXmlReader.java
+++ b/L2J_Mobius_2.5_Underground/java/com/l2jmobius/commons/util/IXmlReader.java
@@ -18,8 +18,13 @@ package com.l2jmobius.commons.util;
 
 import java.io.File;
 import java.io.FileFilter;
+import java.util.ArrayList;
+import java.util.HashMap;
 import java.util.LinkedHashMap;
+import java.util.List;
 import java.util.Map;
+import java.util.concurrent.CopyOnWriteArrayList;
+import java.util.concurrent.ScheduledFuture;
 import java.util.function.Consumer;
 import java.util.function.Predicate;
 import java.util.logging.Level;
@@ -35,7 +40,12 @@ import org.w3c.dom.NodeList;
 import org.xml.sax.ErrorHandler;
 import org.xml.sax.SAXParseException;
 
+import com.l2jmobius.Config;
+import com.l2jmobius.commons.concurrent.ThreadPool;
 import com.l2jmobius.commons.util.file.filter.XMLFilter;
+import com.l2jmobius.gameserver.model.Location;
+import com.l2jmobius.gameserver.model.holders.MinionHolder;
+import com.l2jmobius.gameserver.model.holders.SkillHolder;
 
 /**
  * Interface for XML parsers.
@@ -56,6 +66,15 @@ public interface IXmlReader
 	 */
 	void load();
 	
+	/**
+	 * Wrapper for {@link #parseFile(File)} method.
+	 * @param path the relative path to the datapack root of the XML file to parse.
+	 */
+	default void parseDatapackFile(String path)
+	{
+		parseFile(new File(Config.DATAPACK_ROOT, path));
+	}
+	
 	/**
 	 * Parses a single XML file.<br>
 	 * If the file was successfully parsed, call {@link #parseDocument(Document, File)} for the parsed document.<br>
@@ -121,6 +140,17 @@ public interface IXmlReader
 		return parseDirectory(file, false);
 	}
 	
+	/**
+	 * Wrapper for {@link #parseDirectory(File, boolean)}.
+	 * @param path the path to the directory where the XML files are
+	 * @param recursive parses all sub folders if there is
+	 * @return {@code false} if it fails to find the directory, {@code true} otherwise
+	 */
+	default boolean parseDatapackDirectory(String path, boolean recursive)
+	{
+		return parseDirectory(new File(Config.DATAPACK_ROOT, path), recursive);
+	}
+	
 	/**
 	 * Loads all XML files from {@code path} and calls {@link #parseFile(File)} for each one of them.
 	 * @param dir the directory object to scan.
@@ -135,6 +165,7 @@ public interface IXmlReader
 			return false;
 		}
 		
+		final List<ScheduledFuture<?>> jobs = new CopyOnWriteArrayList<>();
 		final File[] listOfFiles = dir.listFiles();
 		for (File f : listOfFiles)
 		{
@@ -144,9 +175,23 @@ public interface IXmlReader
 			}
 			else if (getCurrentFileFilter().accept(f))
 			{
-				parseFile(f);
+				jobs.add(ThreadPool.schedule(() ->
+				{
+					parseFile(f);
+				}, 0));
 			}
 		}
+		while (!jobs.isEmpty())
+		{
+			for (ScheduledFuture<?> job : jobs)
+			{
+				if ((job == null) || job.isDone() || job.isCancelled())
+				{
+					jobs.remove(job);
+				}
+			}
+		}
+		
 		return true;
 	}
 	
@@ -531,6 +576,16 @@ public interface IXmlReader
 		return parseString(attrs.getNamedItem(name), defaultValue);
 	}
 	
+	default Location parseLocation(Node n)
+	{
+		final NamedNodeMap attrs = n.getAttributes();
+		final int x = parseInteger(attrs, "x");
+		final int y = parseInteger(attrs, "y");
+		final int z = parseInteger(attrs, "z");
+		final int heading = parseInteger(attrs, "heading", 0);
+		return new Location(x, y, z, heading);
+	}
+	
 	/**
 	 * Parses an enumerated value.
 	 * @param <T> the enumerated type
@@ -612,6 +667,56 @@ public interface IXmlReader
 		return map;
 	}
 	
+	/**
+	 * @param n
+	 * @return a map of parameters
+	 */
+	default Map<String, Object> parseParameters(Node n)
+	{
+		final Map<String, Object> parameters = new HashMap<>();
+		for (Node parameters_node = n.getFirstChild(); parameters_node != null; parameters_node = parameters_node.getNextSibling())
+		{
+			NamedNodeMap attrs = parameters_node.getAttributes();
+			switch (parameters_node.getNodeName().toLowerCase())
+			{
+				case "param":
+				{
+					parameters.put(parseString(attrs, "name"), parseString(attrs, "value"));
+					break;
+				}
+				case "skill":
+				{
+					parameters.put(parseString(attrs, "name"), new SkillHolder(parseInteger(attrs, "id"), parseInteger(attrs, "level")));
+					break;
+				}
+				case "location":
+				{
+					parameters.put(parseString(attrs, "name"), new Location(parseInteger(attrs, "x"), parseInteger(attrs, "y"), parseInteger(attrs, "z"), parseInteger(attrs, "heading", 0)));
+					break;
+				}
+				case "minions":
+				{
+					final List<MinionHolder> minions = new ArrayList<>(1);
+					for (Node minions_node = parameters_node.getFirstChild(); minions_node != null; minions_node = minions_node.getNextSibling())
+					{
+						if (minions_node.getNodeName().equalsIgnoreCase("npc"))
+						{
+							attrs = minions_node.getAttributes();
+							minions.add(new MinionHolder(parseInteger(attrs, "id"), parseInteger(attrs, "count"), parseInteger(attrs, "respawnTime"), parseInteger(attrs, "weightPoint")));
+						}
+					}
+					
+					if (!minions.isEmpty())
+					{
+						parameters.put(parseString(parameters_node.getAttributes(), "name"), minions);
+					}
+					break;
+				}
+			}
+		}
+		return parameters;
+	}
+	
 	/**
 	 * Executes action for each child of node
 	 * @param node
diff --git a/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/GameServer.java b/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/GameServer.java
index de4303b82a..7e5daf34af 100644
--- a/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/GameServer.java
+++ b/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/GameServer.java
@@ -362,7 +362,7 @@ public class GameServer
 		try
 		{
 			LOGGER.info(getClass().getSimpleName() + ": Loading server scripts:");
-			ScriptEngineManager.getInstance().executeMasterHandler();
+			ScriptEngineManager.getInstance().executeScript(ScriptEngineManager.MASTER_HANDLER_FILE);
 			ScriptEngineManager.getInstance().executeScriptList();
 		}
 		catch (Exception e)
diff --git a/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/data/xml/impl/AbilityPointsData.java b/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/data/xml/impl/AbilityPointsData.java
index a8d5526d01..e26e8e2b53 100644
--- a/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/data/xml/impl/AbilityPointsData.java
+++ b/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/data/xml/impl/AbilityPointsData.java
@@ -25,13 +25,13 @@ import org.w3c.dom.Document;
 import org.w3c.dom.NamedNodeMap;
 import org.w3c.dom.Node;
 
-import com.l2jmobius.commons.util.IGameXmlReader;
+import com.l2jmobius.commons.util.IXmlReader;
 import com.l2jmobius.gameserver.model.holders.RangeAbilityPointsHolder;
 
 /**
  * @author UnAfraid
  */
-public final class AbilityPointsData implements IGameXmlReader
+public final class AbilityPointsData implements IXmlReader
 {
 	private static final Logger LOGGER = Logger.getLogger(AbilityPointsData.class.getName());
 	private final List<RangeAbilityPointsHolder> _points = new ArrayList<>();
diff --git a/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/data/xml/impl/ActionData.java b/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/data/xml/impl/ActionData.java
index 0bffdc5bb1..a322dad1d9 100644
--- a/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/data/xml/impl/ActionData.java
+++ b/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/data/xml/impl/ActionData.java
@@ -23,14 +23,14 @@ import java.util.logging.Logger;
 
 import org.w3c.dom.Document;
 
-import com.l2jmobius.commons.util.IGameXmlReader;
+import com.l2jmobius.commons.util.IXmlReader;
 import com.l2jmobius.gameserver.model.ActionDataHolder;
 import com.l2jmobius.gameserver.model.StatsSet;
 
 /**
  * @author UnAfraid
  */
-public class ActionData implements IGameXmlReader
+public class ActionData implements IXmlReader
 {
 	private static final Logger LOGGER = Logger.getLogger(ActionData.class.getName());
 	
diff --git a/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/data/xml/impl/AdminData.java b/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/data/xml/impl/AdminData.java
index 0b1d3e3245..9e359b1521 100644
--- a/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/data/xml/impl/AdminData.java
+++ b/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/data/xml/impl/AdminData.java
@@ -29,7 +29,7 @@ import org.w3c.dom.Document;
 import org.w3c.dom.NamedNodeMap;
 import org.w3c.dom.Node;
 
-import com.l2jmobius.commons.util.IGameXmlReader;
+import com.l2jmobius.commons.util.IXmlReader;
 import com.l2jmobius.gameserver.model.AccessLevel;
 import com.l2jmobius.gameserver.model.AdminCommandAccessRight;
 import com.l2jmobius.gameserver.model.StatsSet;
@@ -42,7 +42,7 @@ import com.l2jmobius.gameserver.network.serverpackets.SystemMessage;
  * Loads administrator access levels and commands.
  * @author UnAfraid
  */
-public final class AdminData implements IGameXmlReader
+public final class AdminData implements IXmlReader
 {
 	private static final Logger LOGGER = Logger.getLogger(AdminData.class.getName());
 	
diff --git a/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/data/xml/impl/AlchemyData.java b/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/data/xml/impl/AlchemyData.java
index a5d8153b82..76f7eb98b5 100644
--- a/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/data/xml/impl/AlchemyData.java
+++ b/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/data/xml/impl/AlchemyData.java
@@ -25,7 +25,7 @@ import org.w3c.dom.Document;
 import org.w3c.dom.NamedNodeMap;
 import org.w3c.dom.Node;
 
-import com.l2jmobius.commons.util.IGameXmlReader;
+import com.l2jmobius.commons.util.IXmlReader;
 import com.l2jmobius.gameserver.model.StatsSet;
 import com.l2jmobius.gameserver.model.alchemy.AlchemyCraftData;
 import com.l2jmobius.gameserver.model.holders.ItemHolder;
@@ -33,7 +33,7 @@ import com.l2jmobius.gameserver.model.holders.ItemHolder;
 /**
  * @author Sdw
  */
-public class AlchemyData implements IGameXmlReader
+public class AlchemyData implements IXmlReader
 {
 	private static final Logger LOGGER = Logger.getLogger(AlchemyData.class.getName());
 	
diff --git a/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/data/xml/impl/AppearanceItemData.java b/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/data/xml/impl/AppearanceItemData.java
index f7746d073d..468f35ffce 100644
--- a/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/data/xml/impl/AppearanceItemData.java
+++ b/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/data/xml/impl/AppearanceItemData.java
@@ -24,7 +24,7 @@ import java.util.logging.Logger;
 import org.w3c.dom.Document;
 import org.w3c.dom.Node;
 
-import com.l2jmobius.commons.util.IGameXmlReader;
+import com.l2jmobius.commons.util.IXmlReader;
 import com.l2jmobius.gameserver.datatables.ItemTable;
 import com.l2jmobius.gameserver.enums.Race;
 import com.l2jmobius.gameserver.model.StatsSet;
@@ -36,7 +36,7 @@ import com.l2jmobius.gameserver.model.items.type.CrystalType;
 /**
  * @author UnAfraid
  */
-public class AppearanceItemData implements IGameXmlReader
+public class AppearanceItemData implements IXmlReader
 {
 	private static final Logger LOGGER = Logger.getLogger(AppearanceItemData.class.getName());
 	
diff --git a/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/data/xml/impl/ArmorSetsData.java b/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/data/xml/impl/ArmorSetsData.java
index 0f1445c10a..d7582d8d5a 100644
--- a/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/data/xml/impl/ArmorSetsData.java
+++ b/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/data/xml/impl/ArmorSetsData.java
@@ -19,9 +19,9 @@ package com.l2jmobius.gameserver.data.xml.impl;
 import java.io.File;
 import java.util.ArrayList;
 import java.util.Collections;
-import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
+import java.util.concurrent.ConcurrentHashMap;
 import java.util.logging.Logger;
 import java.util.stream.Stream;
 
@@ -29,7 +29,7 @@ import org.w3c.dom.Document;
 import org.w3c.dom.NamedNodeMap;
 import org.w3c.dom.Node;
 
-import com.l2jmobius.commons.util.IGameXmlReader;
+import com.l2jmobius.commons.util.IXmlReader;
 import com.l2jmobius.gameserver.datatables.ItemTable;
 import com.l2jmobius.gameserver.model.ArmorSet;
 import com.l2jmobius.gameserver.model.holders.ArmorsetSkillHolder;
@@ -40,12 +40,12 @@ import com.l2jmobius.gameserver.model.stats.BaseStats;
  * Loads armor set bonuses.
  * @author godson, Luno, UnAfraid
  */
-public final class ArmorSetsData implements IGameXmlReader
+public final class ArmorSetsData implements IXmlReader
 {
 	private static final Logger LOGGER = Logger.getLogger(ArmorSetsData.class.getName());
 	
-	private final Map<Integer, ArmorSet> _armorSets = new HashMap<>();
-	private final Map<Integer, List<ArmorSet>> _armorSetItems = new HashMap<>();
+	private final Map<Integer, ArmorSet> _armorSets = new ConcurrentHashMap<>();
+	private final Map<Integer, List<ArmorSet>> _armorSetItems = new ConcurrentHashMap<>();
 	
 	protected ArmorSetsData()
 	{
diff --git a/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/data/xml/impl/AttendanceRewardData.java b/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/data/xml/impl/AttendanceRewardData.java
index c60afbd78a..24e402e706 100644
--- a/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/data/xml/impl/AttendanceRewardData.java
+++ b/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/data/xml/impl/AttendanceRewardData.java
@@ -24,7 +24,7 @@ import java.util.logging.Logger;
 import org.w3c.dom.Document;
 
 import com.l2jmobius.Config;
-import com.l2jmobius.commons.util.IGameXmlReader;
+import com.l2jmobius.commons.util.IXmlReader;
 import com.l2jmobius.gameserver.datatables.ItemTable;
 import com.l2jmobius.gameserver.model.StatsSet;
 import com.l2jmobius.gameserver.model.holders.ItemHolder;
@@ -32,7 +32,7 @@ import com.l2jmobius.gameserver.model.holders.ItemHolder;
 /**
  * @author Mobius
  */
-public class AttendanceRewardData implements IGameXmlReader
+public class AttendanceRewardData implements IXmlReader
 {
 	private static Logger LOGGER = Logger.getLogger(AttendanceRewardData.class.getName());
 	private final List<ItemHolder> _rewards = new ArrayList<>();
diff --git a/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/data/xml/impl/BeautyShopData.java b/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/data/xml/impl/BeautyShopData.java
index 133f11d978..d88ccc7747 100644
--- a/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/data/xml/impl/BeautyShopData.java
+++ b/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/data/xml/impl/BeautyShopData.java
@@ -24,7 +24,7 @@ import org.w3c.dom.Document;
 import org.w3c.dom.NamedNodeMap;
 import org.w3c.dom.Node;
 
-import com.l2jmobius.commons.util.IGameXmlReader;
+import com.l2jmobius.commons.util.IXmlReader;
 import com.l2jmobius.gameserver.enums.Race;
 import com.l2jmobius.gameserver.enums.Sex;
 import com.l2jmobius.gameserver.model.StatsSet;
@@ -34,7 +34,7 @@ import com.l2jmobius.gameserver.model.beautyshop.BeautyItem;
 /**
  * @author Sdw
  */
-public final class BeautyShopData implements IGameXmlReader
+public final class BeautyShopData implements IXmlReader
 {
 	private final Map<Race, Map<Sex, BeautyData>> _beautyList = new HashMap<>();
 	private final Map<Sex, BeautyData> _beautyData = new HashMap<>();
diff --git a/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/data/xml/impl/BuyListData.java b/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/data/xml/impl/BuyListData.java
index de298ef358..8ab9ea8097 100644
--- a/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/data/xml/impl/BuyListData.java
+++ b/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/data/xml/impl/BuyListData.java
@@ -21,8 +21,8 @@ import java.io.FileFilter;
 import java.sql.Connection;
 import java.sql.ResultSet;
 import java.sql.Statement;
-import java.util.HashMap;
 import java.util.Map;
+import java.util.concurrent.ConcurrentHashMap;
 import java.util.logging.Level;
 import java.util.logging.Logger;
 
@@ -31,7 +31,7 @@ import org.w3c.dom.NamedNodeMap;
 
 import com.l2jmobius.Config;
 import com.l2jmobius.commons.database.DatabaseFactory;
-import com.l2jmobius.commons.util.IGameXmlReader;
+import com.l2jmobius.commons.util.IXmlReader;
 import com.l2jmobius.commons.util.file.filter.NumericNameFilter;
 import com.l2jmobius.gameserver.datatables.ItemTable;
 import com.l2jmobius.gameserver.model.buylist.Product;
@@ -42,11 +42,11 @@ import com.l2jmobius.gameserver.model.items.Item;
  * Loads buy lists for NPCs.
  * @author NosBit
  */
-public final class BuyListData implements IGameXmlReader
+public final class BuyListData implements IXmlReader
 {
 	private static final Logger LOGGER = Logger.getLogger(BuyListData.class.getName());
 	
-	private final Map<Integer, ProductList> _buyLists = new HashMap<>();
+	private final Map<Integer, ProductList> _buyLists = new ConcurrentHashMap<>();
 	private static final FileFilter NUMERIC_FILTER = new NumericNameFilter();
 	
 	protected BuyListData()
diff --git a/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/data/xml/impl/CastleData.java b/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/data/xml/impl/CastleData.java
index 6618dcdf1d..792afbfa0b 100644
--- a/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/data/xml/impl/CastleData.java
+++ b/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/data/xml/impl/CastleData.java
@@ -19,16 +19,16 @@ package com.l2jmobius.gameserver.data.xml.impl;
 import java.io.File;
 import java.util.ArrayList;
 import java.util.Collections;
-import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
+import java.util.concurrent.ConcurrentHashMap;
 import java.util.stream.Collectors;
 
 import org.w3c.dom.Document;
 import org.w3c.dom.NamedNodeMap;
 import org.w3c.dom.Node;
 
-import com.l2jmobius.commons.util.IGameXmlReader;
+import com.l2jmobius.commons.util.IXmlReader;
 import com.l2jmobius.gameserver.enums.CastleSide;
 import com.l2jmobius.gameserver.enums.SiegeGuardType;
 import com.l2jmobius.gameserver.model.holders.CastleSpawnHolder;
@@ -37,10 +37,10 @@ import com.l2jmobius.gameserver.model.holders.SiegeGuardHolder;
 /**
  * @author St3eT
  */
-public final class CastleData implements IGameXmlReader
+public final class CastleData implements IXmlReader
 {
-	private final Map<Integer, List<CastleSpawnHolder>> _spawns = new HashMap<>();
-	private static final Map<Integer, List<SiegeGuardHolder>> _siegeGuards = new HashMap<>();
+	private final Map<Integer, List<CastleSpawnHolder>> _spawns = new ConcurrentHashMap<>();
+	private static final Map<Integer, List<SiegeGuardHolder>> _siegeGuards = new ConcurrentHashMap<>();
 	
 	protected CastleData()
 	{
diff --git a/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/data/xml/impl/CategoryData.java b/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/data/xml/impl/CategoryData.java
index f851aa6703..df7d390dfb 100644
--- a/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/data/xml/impl/CategoryData.java
+++ b/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/data/xml/impl/CategoryData.java
@@ -27,14 +27,14 @@ import org.w3c.dom.Document;
 import org.w3c.dom.NamedNodeMap;
 import org.w3c.dom.Node;
 
-import com.l2jmobius.commons.util.IGameXmlReader;
+import com.l2jmobius.commons.util.IXmlReader;
 import com.l2jmobius.gameserver.enums.CategoryType;
 
 /**
  * Loads the category data with Class or NPC IDs.
  * @author NosBit, xban1x
  */
-public final class CategoryData implements IGameXmlReader
+public final class CategoryData implements IXmlReader
 {
 	private static final Logger LOGGER = Logger.getLogger(CategoryData.class.getName());
 	
diff --git a/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/data/xml/impl/ClanHallData.java b/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/data/xml/impl/ClanHallData.java
index 511cc7f4f7..90a1a51029 100644
--- a/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/data/xml/impl/ClanHallData.java
+++ b/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/data/xml/impl/ClanHallData.java
@@ -20,9 +20,9 @@ import java.io.File;
 import java.util.ArrayList;
 import java.util.Collection;
 import java.util.Comparator;
-import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
+import java.util.concurrent.ConcurrentHashMap;
 import java.util.logging.Logger;
 import java.util.stream.Collectors;
 
@@ -30,7 +30,7 @@ import org.w3c.dom.Document;
 import org.w3c.dom.NamedNodeMap;
 import org.w3c.dom.Node;
 
-import com.l2jmobius.commons.util.IGameXmlReader;
+import com.l2jmobius.commons.util.IXmlReader;
 import com.l2jmobius.gameserver.enums.ClanHallGrade;
 import com.l2jmobius.gameserver.enums.ClanHallType;
 import com.l2jmobius.gameserver.model.Location;
@@ -43,10 +43,10 @@ import com.l2jmobius.gameserver.model.holders.ClanHallTeleportHolder;
 /**
  * @author St3eT
  */
-public final class ClanHallData implements IGameXmlReader
+public final class ClanHallData implements IXmlReader
 {
 	private static final Logger LOGGER = Logger.getLogger(ClanHallData.class.getName());
-	private static final Map<Integer, ClanHall> _clanHalls = new HashMap<>();
+	private static final Map<Integer, ClanHall> _clanHalls = new ConcurrentHashMap<>();
 	
 	protected ClanHallData()
 	{
diff --git a/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/data/xml/impl/ClanRewardData.java b/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/data/xml/impl/ClanRewardData.java
index 252bba1c64..d5938ee964 100644
--- a/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/data/xml/impl/ClanRewardData.java
+++ b/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/data/xml/impl/ClanRewardData.java
@@ -28,7 +28,6 @@ import org.w3c.dom.Document;
 import org.w3c.dom.NamedNodeMap;
 import org.w3c.dom.Node;
 
-import com.l2jmobius.commons.util.IGameXmlReader;
 import com.l2jmobius.commons.util.IXmlReader;
 import com.l2jmobius.gameserver.enums.ClanRewardType;
 import com.l2jmobius.gameserver.model.clan.ClanRewardBonus;
@@ -38,7 +37,7 @@ import com.l2jmobius.gameserver.model.holders.SkillHolder;
 /**
  * @author UnAfraid
  */
-public class ClanRewardData implements IGameXmlReader
+public class ClanRewardData implements IXmlReader
 {
 	private static final Logger LOGGER = Logger.getLogger(ClanRewardData.class.getName());
 	private final Map<ClanRewardType, List<ClanRewardBonus>> _clanRewards = new ConcurrentHashMap<>();
diff --git a/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/data/xml/impl/ClassListData.java b/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/data/xml/impl/ClassListData.java
index a40f726d50..6e99aeabfa 100644
--- a/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/data/xml/impl/ClassListData.java
+++ b/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/data/xml/impl/ClassListData.java
@@ -17,15 +17,15 @@
 package com.l2jmobius.gameserver.data.xml.impl;
 
 import java.io.File;
-import java.util.HashMap;
 import java.util.Map;
+import java.util.concurrent.ConcurrentHashMap;
 import java.util.logging.Logger;
 
 import org.w3c.dom.Document;
 import org.w3c.dom.NamedNodeMap;
 import org.w3c.dom.Node;
 
-import com.l2jmobius.commons.util.IGameXmlReader;
+import com.l2jmobius.commons.util.IXmlReader;
 import com.l2jmobius.gameserver.model.base.ClassId;
 import com.l2jmobius.gameserver.model.base.ClassInfo;
 
@@ -33,11 +33,11 @@ import com.l2jmobius.gameserver.model.base.ClassInfo;
  * Loads the the list of classes and it's info.
  * @author Zoey76
  */
-public final class ClassListData implements IGameXmlReader
+public final class ClassListData implements IXmlReader
 {
 	private static final Logger LOGGER = Logger.getLogger(ClassListData.class.getName());
 	
-	private final Map<ClassId, ClassInfo> _classData = new HashMap<>();
+	private final Map<ClassId, ClassInfo> _classData = new ConcurrentHashMap<>();
 	
 	/**
 	 * Instantiates a new class list data.
diff --git a/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/data/xml/impl/CombinationItemsData.java b/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/data/xml/impl/CombinationItemsData.java
index a7e90d5f89..c2ce205300 100644
--- a/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/data/xml/impl/CombinationItemsData.java
+++ b/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/data/xml/impl/CombinationItemsData.java
@@ -24,7 +24,7 @@ import java.util.stream.Collectors;
 
 import org.w3c.dom.Document;
 
-import com.l2jmobius.commons.util.IGameXmlReader;
+import com.l2jmobius.commons.util.IXmlReader;
 import com.l2jmobius.gameserver.datatables.ItemTable;
 import com.l2jmobius.gameserver.model.StatsSet;
 import com.l2jmobius.gameserver.model.items.combination.CombinationItem;
@@ -34,7 +34,7 @@ import com.l2jmobius.gameserver.model.items.combination.CombinationItemType;
 /**
  * @author UnAfraid
  */
-public class CombinationItemsData implements IGameXmlReader
+public class CombinationItemsData implements IXmlReader
 {
 	private static final Logger LOGGER = Logger.getLogger(CombinationItemsData.class.getName());
 	private final List<CombinationItem> _items = new ArrayList<>();
diff --git a/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/data/xml/impl/CubicData.java b/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/data/xml/impl/CubicData.java
index f682509217..ef46a08a7f 100644
--- a/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/data/xml/impl/CubicData.java
+++ b/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/data/xml/impl/CubicData.java
@@ -20,12 +20,12 @@ import java.io.File;
 import java.util.Collections;
 import java.util.HashMap;
 import java.util.Map;
+import java.util.concurrent.ConcurrentHashMap;
 import java.util.logging.Logger;
 
 import org.w3c.dom.Document;
 import org.w3c.dom.Node;
 
-import com.l2jmobius.commons.util.IGameXmlReader;
 import com.l2jmobius.commons.util.IXmlReader;
 import com.l2jmobius.gameserver.model.StatsSet;
 import com.l2jmobius.gameserver.model.actor.templates.CubicTemplate;
@@ -39,11 +39,11 @@ import com.l2jmobius.gameserver.model.cubic.conditions.RangeCondition;
 /**
  * @author UnAfraid
  */
-public class CubicData implements IGameXmlReader
+public class CubicData implements IXmlReader
 {
 	private static final Logger LOGGER = Logger.getLogger(CubicData.class.getName());
 	
-	private final Map<Integer, Map<Integer, CubicTemplate>> _cubics = new HashMap<>();
+	private final Map<Integer, Map<Integer, CubicTemplate>> _cubics = new ConcurrentHashMap<>();
 	
 	protected CubicData()
 	{
diff --git a/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/data/xml/impl/DailyMissionData.java b/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/data/xml/impl/DailyMissionData.java
index 53519f2492..1e275049d9 100644
--- a/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/data/xml/impl/DailyMissionData.java
+++ b/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/data/xml/impl/DailyMissionData.java
@@ -27,7 +27,7 @@ import java.util.stream.Collectors;
 
 import org.w3c.dom.Document;
 
-import com.l2jmobius.commons.util.IGameXmlReader;
+import com.l2jmobius.commons.util.IXmlReader;
 import com.l2jmobius.gameserver.model.DailyMissionDataHolder;
 import com.l2jmobius.gameserver.model.StatsSet;
 import com.l2jmobius.gameserver.model.actor.instance.PlayerInstance;
@@ -37,7 +37,7 @@ import com.l2jmobius.gameserver.model.holders.ItemHolder;
 /**
  * @author Sdw
  */
-public class DailyMissionData implements IGameXmlReader
+public class DailyMissionData implements IXmlReader
 {
 	private static final Logger LOGGER = Logger.getLogger(DailyMissionData.class.getName());
 	private final Map<Integer, List<DailyMissionDataHolder>> _dailyMissionRewards = new LinkedHashMap<>();
diff --git a/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/data/xml/impl/DoorData.java b/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/data/xml/impl/DoorData.java
index e8b1ff7bfa..5dd43e98eb 100644
--- a/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/data/xml/impl/DoorData.java
+++ b/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/data/xml/impl/DoorData.java
@@ -32,7 +32,6 @@ import org.w3c.dom.Document;
 import org.w3c.dom.NamedNodeMap;
 import org.w3c.dom.Node;
 
-import com.l2jmobius.commons.util.IGameXmlReader;
 import com.l2jmobius.commons.util.IXmlReader;
 import com.l2jmobius.gameserver.instancemanager.MapRegionManager;
 import com.l2jmobius.gameserver.model.Location;
@@ -45,7 +44,7 @@ import com.l2jmobius.gameserver.model.instancezone.Instance;
  * This class loads and hold info about doors.
  * @author JIV, GodKratos, UnAfraid
  */
-public final class DoorData implements IGameXmlReader
+public final class DoorData implements IXmlReader
 {
 	private static final Logger LOGGER = Logger.getLogger(DoorData.class.getName());
 	
diff --git a/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/data/xml/impl/EnchantItemData.java b/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/data/xml/impl/EnchantItemData.java
index 24e12d1218..342b4cde07 100644
--- a/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/data/xml/impl/EnchantItemData.java
+++ b/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/data/xml/impl/EnchantItemData.java
@@ -25,7 +25,7 @@ import org.w3c.dom.Document;
 import org.w3c.dom.NamedNodeMap;
 import org.w3c.dom.Node;
 
-import com.l2jmobius.commons.util.IGameXmlReader;
+import com.l2jmobius.commons.util.IXmlReader;
 import com.l2jmobius.gameserver.model.StatsSet;
 import com.l2jmobius.gameserver.model.items.enchant.EnchantScroll;
 import com.l2jmobius.gameserver.model.items.enchant.EnchantSupportItem;
@@ -35,7 +35,7 @@ import com.l2jmobius.gameserver.model.items.instance.ItemInstance;
  * Loads item enchant data.
  * @author UnAfraid
  */
-public class EnchantItemData implements IGameXmlReader
+public class EnchantItemData implements IXmlReader
 {
 	private static final Logger LOGGER = Logger.getLogger(EnchantItemData.class.getName());
 	
diff --git a/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/data/xml/impl/EnchantItemGroupsData.java b/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/data/xml/impl/EnchantItemGroupsData.java
index 666d821e42..44582a7dd4 100644
--- a/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/data/xml/impl/EnchantItemGroupsData.java
+++ b/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/data/xml/impl/EnchantItemGroupsData.java
@@ -25,7 +25,7 @@ import org.w3c.dom.Document;
 import org.w3c.dom.NamedNodeMap;
 import org.w3c.dom.Node;
 
-import com.l2jmobius.commons.util.IGameXmlReader;
+import com.l2jmobius.commons.util.IXmlReader;
 import com.l2jmobius.gameserver.datatables.ItemTable;
 import com.l2jmobius.gameserver.model.holders.RangeChanceHolder;
 import com.l2jmobius.gameserver.model.items.Item;
@@ -37,7 +37,7 @@ import com.l2jmobius.gameserver.util.Util;
 /**
  * @author UnAfraid
  */
-public final class EnchantItemGroupsData implements IGameXmlReader
+public final class EnchantItemGroupsData implements IXmlReader
 {
 	private static final Logger LOGGER = Logger.getLogger(EnchantItemGroupsData.class.getName());
 	
diff --git a/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/data/xml/impl/EnchantItemHPBonusData.java b/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/data/xml/impl/EnchantItemHPBonusData.java
index d2ce1096b5..868b1f95f6 100644
--- a/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/data/xml/impl/EnchantItemHPBonusData.java
+++ b/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/data/xml/impl/EnchantItemHPBonusData.java
@@ -26,7 +26,7 @@ import java.util.logging.Logger;
 import org.w3c.dom.Document;
 import org.w3c.dom.Node;
 
-import com.l2jmobius.commons.util.IGameXmlReader;
+import com.l2jmobius.commons.util.IXmlReader;
 import com.l2jmobius.gameserver.model.items.Item;
 import com.l2jmobius.gameserver.model.items.instance.ItemInstance;
 import com.l2jmobius.gameserver.model.items.type.CrystalType;
@@ -35,7 +35,7 @@ import com.l2jmobius.gameserver.model.items.type.CrystalType;
  * This class holds the Enchant HP Bonus Data.
  * @author MrPoke, Zoey76
  */
-public class EnchantItemHPBonusData implements IGameXmlReader
+public class EnchantItemHPBonusData implements IXmlReader
 {
 	private static final Logger LOGGER = Logger.getLogger(EnchantItemHPBonusData.class.getName());
 	
diff --git a/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/data/xml/impl/EnchantItemOptionsData.java b/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/data/xml/impl/EnchantItemOptionsData.java
index f6e9946b94..b8d805132f 100644
--- a/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/data/xml/impl/EnchantItemOptionsData.java
+++ b/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/data/xml/impl/EnchantItemOptionsData.java
@@ -24,7 +24,7 @@ import java.util.logging.Logger;
 import org.w3c.dom.Document;
 import org.w3c.dom.Node;
 
-import com.l2jmobius.commons.util.IGameXmlReader;
+import com.l2jmobius.commons.util.IXmlReader;
 import com.l2jmobius.gameserver.model.items.instance.ItemInstance;
 import com.l2jmobius.gameserver.model.options.EnchantOptions;
 import com.l2jmobius.gameserver.util.Util;
@@ -32,7 +32,7 @@ import com.l2jmobius.gameserver.util.Util;
 /**
  * @author UnAfraid
  */
-public class EnchantItemOptionsData implements IGameXmlReader
+public class EnchantItemOptionsData implements IXmlReader
 {
 	private static final Logger LOGGER = Logger.getLogger(EnchantItemOptionsData.class.getName());
 	
diff --git a/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/data/xml/impl/EnchantSkillGroupsData.java b/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/data/xml/impl/EnchantSkillGroupsData.java
index 0b557ced04..45127fe5f6 100644
--- a/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/data/xml/impl/EnchantSkillGroupsData.java
+++ b/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/data/xml/impl/EnchantSkillGroupsData.java
@@ -18,16 +18,15 @@ package com.l2jmobius.gameserver.data.xml.impl;
 
 import java.io.File;
 import java.util.Collections;
-import java.util.HashMap;
 import java.util.HashSet;
-import java.util.LinkedHashMap;
 import java.util.Map;
 import java.util.Set;
+import java.util.concurrent.ConcurrentHashMap;
 import java.util.logging.Logger;
 
 import org.w3c.dom.Document;
 
-import com.l2jmobius.commons.util.IGameXmlReader;
+import com.l2jmobius.commons.util.IXmlReader;
 import com.l2jmobius.gameserver.enums.SkillEnchantType;
 import com.l2jmobius.gameserver.model.StatsSet;
 import com.l2jmobius.gameserver.model.holders.EnchantSkillHolder;
@@ -39,12 +38,12 @@ import com.l2jmobius.gameserver.model.skills.Skill;
  * This class holds the Enchant Groups information.
  * @author Micr0
  */
-public class EnchantSkillGroupsData implements IGameXmlReader
+public class EnchantSkillGroupsData implements IXmlReader
 {
 	private static final Logger LOGGER = Logger.getLogger(EnchantSkillGroupsData.class.getName());
 	
-	private final Map<Integer, EnchantSkillHolder> _enchantSkillHolders = new LinkedHashMap<>();
-	private final Map<SkillHolder, Set<Integer>> _enchantSkillTrees = new HashMap<>();
+	private final Map<Integer, EnchantSkillHolder> _enchantSkillHolders = new ConcurrentHashMap<>();
+	private final Map<SkillHolder, Set<Integer>> _enchantSkillTrees = new ConcurrentHashMap<>();
 	
 	public static int MAX_ENCHANT_LEVEL;
 	
diff --git a/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/data/xml/impl/EnsoulData.java b/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/data/xml/impl/EnsoulData.java
index 239b582894..64dcf428e3 100644
--- a/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/data/xml/impl/EnsoulData.java
+++ b/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/data/xml/impl/EnsoulData.java
@@ -17,16 +17,14 @@
 package com.l2jmobius.gameserver.data.xml.impl;
 
 import java.io.File;
-import java.util.EnumMap;
-import java.util.HashMap;
 import java.util.Map;
+import java.util.concurrent.ConcurrentHashMap;
 import java.util.logging.Logger;
 
 import org.w3c.dom.Document;
 import org.w3c.dom.NamedNodeMap;
 import org.w3c.dom.Node;
 
-import com.l2jmobius.commons.util.IGameXmlReader;
 import com.l2jmobius.commons.util.IXmlReader;
 import com.l2jmobius.gameserver.model.ensoul.EnsoulFee;
 import com.l2jmobius.gameserver.model.ensoul.EnsoulOption;
@@ -37,12 +35,12 @@ import com.l2jmobius.gameserver.model.items.type.CrystalType;
 /**
  * @author UnAfraid
  */
-public class EnsoulData implements IGameXmlReader
+public class EnsoulData implements IXmlReader
 {
 	private static final Logger LOGGER = Logger.getLogger(EnsoulData.class.getName());
-	private final Map<CrystalType, EnsoulFee> _ensoulFees = new EnumMap<>(CrystalType.class);
-	private final Map<Integer, EnsoulOption> _ensoulOptions = new HashMap<>();
-	private final Map<Integer, EnsoulStone> _ensoulStones = new HashMap<>();
+	private final Map<CrystalType, EnsoulFee> _ensoulFees = new ConcurrentHashMap<>();
+	private final Map<Integer, EnsoulOption> _ensoulOptions = new ConcurrentHashMap<>();
+	private final Map<Integer, EnsoulStone> _ensoulStones = new ConcurrentHashMap<>();
 	
 	protected EnsoulData()
 	{
diff --git a/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/data/xml/impl/EventEngineData.java b/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/data/xml/impl/EventEngineData.java
index c43970ea31..144e2d5599 100644
--- a/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/data/xml/impl/EventEngineData.java
+++ b/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/data/xml/impl/EventEngineData.java
@@ -32,7 +32,6 @@ import org.w3c.dom.Document;
 import org.w3c.dom.NamedNodeMap;
 import org.w3c.dom.Node;
 
-import com.l2jmobius.commons.util.IGameXmlReader;
 import com.l2jmobius.commons.util.IXmlReader;
 import com.l2jmobius.gameserver.model.Location;
 import com.l2jmobius.gameserver.model.StatsSet;
@@ -54,7 +53,7 @@ import com.l2jmobius.gameserver.model.holders.SkillHolder;
 /**
  * @author UnAfraid
  */
-public final class EventEngineData implements IGameXmlReader
+public final class EventEngineData implements IXmlReader
 {
 	private static final Logger LOGGER = Logger.getLogger(EventEngineData.class.getName());
 	
diff --git a/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/data/xml/impl/ExperienceData.java b/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/data/xml/impl/ExperienceData.java
index 2daaf16220..ea9d13c2aa 100644
--- a/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/data/xml/impl/ExperienceData.java
+++ b/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/data/xml/impl/ExperienceData.java
@@ -26,13 +26,13 @@ import org.w3c.dom.NamedNodeMap;
 import org.w3c.dom.Node;
 
 import com.l2jmobius.Config;
-import com.l2jmobius.commons.util.IGameXmlReader;
+import com.l2jmobius.commons.util.IXmlReader;
 
 /**
  * This class holds the Experience points for each level for players and pets.
  * @author mrTJO
  */
-public final class ExperienceData implements IGameXmlReader
+public final class ExperienceData implements IXmlReader
 {
 	private static final Logger LOGGER = Logger.getLogger(ExperienceData.class.getName());
 	
diff --git a/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/data/xml/impl/ExtendDropData.java b/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/data/xml/impl/ExtendDropData.java
index 00af3a4f77..09da39ad14 100644
--- a/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/data/xml/impl/ExtendDropData.java
+++ b/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/data/xml/impl/ExtendDropData.java
@@ -28,7 +28,7 @@ import java.util.logging.Logger;
 import org.w3c.dom.Document;
 import org.w3c.dom.Node;
 
-import com.l2jmobius.commons.util.IGameXmlReader;
+import com.l2jmobius.commons.util.IXmlReader;
 import com.l2jmobius.gameserver.handler.ConditionHandler;
 import com.l2jmobius.gameserver.model.StatsSet;
 import com.l2jmobius.gameserver.model.conditions.ICondition;
@@ -39,7 +39,7 @@ import com.l2jmobius.gameserver.network.SystemMessageId;
 /**
  * @author Sdw
  */
-public class ExtendDropData implements IGameXmlReader
+public class ExtendDropData implements IXmlReader
 {
 	private static final Logger LOGGER = Logger.getLogger(ExtendDropData.class.getName());
 	private final Map<Integer, ExtendDropDataHolder> _extendDrop = new HashMap<>();
diff --git a/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/data/xml/impl/FakePlayerData.java b/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/data/xml/impl/FakePlayerData.java
index afb92c06d5..74b7957fd9 100644
--- a/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/data/xml/impl/FakePlayerData.java
+++ b/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/data/xml/impl/FakePlayerData.java
@@ -26,7 +26,7 @@ import java.util.logging.Logger;
 import org.w3c.dom.Document;
 
 import com.l2jmobius.Config;
-import com.l2jmobius.commons.util.IGameXmlReader;
+import com.l2jmobius.commons.util.IXmlReader;
 import com.l2jmobius.gameserver.data.sql.impl.CharNameTable;
 import com.l2jmobius.gameserver.model.StatsSet;
 import com.l2jmobius.gameserver.model.actor.templates.NpcTemplate;
@@ -35,7 +35,7 @@ import com.l2jmobius.gameserver.model.holders.FakePlayerHolder;
 /**
  * @author Mobius
  */
-public class FakePlayerData implements IGameXmlReader
+public class FakePlayerData implements IXmlReader
 {
 	private static Logger LOGGER = Logger.getLogger(FakePlayerData.class.getName());
 	
diff --git a/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/data/xml/impl/FenceData.java b/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/data/xml/impl/FenceData.java
index f51175e5fa..d36ab2e16b 100644
--- a/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/data/xml/impl/FenceData.java
+++ b/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/data/xml/impl/FenceData.java
@@ -28,7 +28,7 @@ import java.util.logging.Logger;
 import org.w3c.dom.Document;
 import org.w3c.dom.Node;
 
-import com.l2jmobius.commons.util.IGameXmlReader;
+import com.l2jmobius.commons.util.IXmlReader;
 import com.l2jmobius.gameserver.enums.FenceState;
 import com.l2jmobius.gameserver.model.StatsSet;
 import com.l2jmobius.gameserver.model.World;
@@ -39,7 +39,7 @@ import com.l2jmobius.gameserver.model.instancezone.Instance;
 /**
  * @author HoridoJoho / FBIagent
  */
-public final class FenceData implements IGameXmlReader
+public final class FenceData implements IXmlReader
 {
 	private static final Logger LOGGER = Logger.getLogger(FenceData.class.getSimpleName());
 	
diff --git a/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/data/xml/impl/FishingData.java b/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/data/xml/impl/FishingData.java
index bacf1ed08c..16436a2f5c 100644
--- a/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/data/xml/impl/FishingData.java
+++ b/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/data/xml/impl/FishingData.java
@@ -26,7 +26,7 @@ import org.w3c.dom.NamedNodeMap;
 import org.w3c.dom.Node;
 
 import com.l2jmobius.Config;
-import com.l2jmobius.commons.util.IGameXmlReader;
+import com.l2jmobius.commons.util.IXmlReader;
 import com.l2jmobius.gameserver.datatables.ItemTable;
 import com.l2jmobius.gameserver.model.fishing.FishingBait;
 import com.l2jmobius.gameserver.model.fishing.FishingCatch;
@@ -36,7 +36,7 @@ import com.l2jmobius.gameserver.model.fishing.FishingRod;
  * This class holds the Fishing information.
  * @author bit
  */
-public final class FishingData implements IGameXmlReader
+public final class FishingData implements IXmlReader
 {
 	private static final Logger LOGGER = Logger.getLogger(FishingData.class.getName());
 	private final Map<Integer, FishingBait> _baitData = new HashMap<>();
diff --git a/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/data/xml/impl/HennaData.java b/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/data/xml/impl/HennaData.java
index e27e186193..d3ac163f3c 100644
--- a/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/data/xml/impl/HennaData.java
+++ b/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/data/xml/impl/HennaData.java
@@ -27,7 +27,7 @@ import org.w3c.dom.Document;
 import org.w3c.dom.NamedNodeMap;
 import org.w3c.dom.Node;
 
-import com.l2jmobius.commons.util.IGameXmlReader;
+import com.l2jmobius.commons.util.IXmlReader;
 import com.l2jmobius.gameserver.model.StatsSet;
 import com.l2jmobius.gameserver.model.base.ClassId;
 import com.l2jmobius.gameserver.model.items.Henna;
@@ -40,7 +40,7 @@ import com.l2jmobius.gameserver.model.skills.Skill;
  * Allowed classes to wear each henna.
  * @author Zoey76, Mobius
  */
-public final class HennaData implements IGameXmlReader
+public final class HennaData implements IXmlReader
 {
 	private static final Logger LOGGER = Logger.getLogger(HennaData.class.getName());
 	
diff --git a/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/data/xml/impl/HitConditionBonusData.java b/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/data/xml/impl/HitConditionBonusData.java
index e9f2f9a87d..2d6ccf0467 100644
--- a/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/data/xml/impl/HitConditionBonusData.java
+++ b/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/data/xml/impl/HitConditionBonusData.java
@@ -23,7 +23,7 @@ import org.w3c.dom.Document;
 import org.w3c.dom.NamedNodeMap;
 import org.w3c.dom.Node;
 
-import com.l2jmobius.commons.util.IGameXmlReader;
+import com.l2jmobius.commons.util.IXmlReader;
 import com.l2jmobius.gameserver.GameTimeController;
 import com.l2jmobius.gameserver.enums.Position;
 import com.l2jmobius.gameserver.model.actor.Creature;
@@ -32,7 +32,7 @@ import com.l2jmobius.gameserver.model.actor.Creature;
  * This class load, holds and calculates the hit condition bonuses.
  * @author Nik
  */
-public final class HitConditionBonusData implements IGameXmlReader
+public final class HitConditionBonusData implements IXmlReader
 {
 	private static final Logger LOGGER = Logger.getLogger(HitConditionBonusData.class.getName());
 	
diff --git a/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/data/xml/impl/InitialEquipmentData.java b/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/data/xml/impl/InitialEquipmentData.java
index 247ea4b46d..275a23f28f 100644
--- a/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/data/xml/impl/InitialEquipmentData.java
+++ b/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/data/xml/impl/InitialEquipmentData.java
@@ -28,7 +28,7 @@ import org.w3c.dom.NamedNodeMap;
 import org.w3c.dom.Node;
 
 import com.l2jmobius.Config;
-import com.l2jmobius.commons.util.IGameXmlReader;
+import com.l2jmobius.commons.util.IXmlReader;
 import com.l2jmobius.gameserver.model.StatsSet;
 import com.l2jmobius.gameserver.model.base.ClassId;
 import com.l2jmobius.gameserver.model.items.PlayerItemTemplate;
@@ -38,7 +38,7 @@ import com.l2jmobius.gameserver.model.items.PlayerItemTemplate;
  * What items get each newly created character and if this item is equipped upon creation (<b>Requires the item to be equippable</b>).
  * @author Zoey76
  */
-public final class InitialEquipmentData implements IGameXmlReader
+public final class InitialEquipmentData implements IXmlReader
 {
 	private static final Logger LOGGER = Logger.getLogger(InitialEquipmentData.class.getName());
 	
diff --git a/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/data/xml/impl/InitialShortcutData.java b/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/data/xml/impl/InitialShortcutData.java
index 5f886bafa8..3b9e976607 100644
--- a/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/data/xml/impl/InitialShortcutData.java
+++ b/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/data/xml/impl/InitialShortcutData.java
@@ -27,7 +27,7 @@ import org.w3c.dom.Document;
 import org.w3c.dom.NamedNodeMap;
 import org.w3c.dom.Node;
 
-import com.l2jmobius.commons.util.IGameXmlReader;
+import com.l2jmobius.commons.util.IXmlReader;
 import com.l2jmobius.gameserver.enums.MacroType;
 import com.l2jmobius.gameserver.enums.ShortcutType;
 import com.l2jmobius.gameserver.model.Macro;
@@ -43,7 +43,7 @@ import com.l2jmobius.gameserver.network.serverpackets.ShortCutRegister;
  * What shortcuts get each newly created character.
  * @author Zoey76
  */
-public final class InitialShortcutData implements IGameXmlReader
+public final class InitialShortcutData implements IXmlReader
 {
 	private static final Logger LOGGER = Logger.getLogger(InitialShortcutData.class.getName());
 	
diff --git a/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/data/xml/impl/ItemCrystallizationData.java b/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/data/xml/impl/ItemCrystallizationData.java
index 86454b2b71..aa7742afa1 100644
--- a/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/data/xml/impl/ItemCrystallizationData.java
+++ b/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/data/xml/impl/ItemCrystallizationData.java
@@ -28,7 +28,7 @@ import org.w3c.dom.Document;
 import org.w3c.dom.NamedNodeMap;
 import org.w3c.dom.Node;
 
-import com.l2jmobius.commons.util.IGameXmlReader;
+import com.l2jmobius.commons.util.IXmlReader;
 import com.l2jmobius.gameserver.datatables.ItemTable;
 import com.l2jmobius.gameserver.enums.CrystallizationType;
 import com.l2jmobius.gameserver.model.holders.CrystallizationDataHolder;
@@ -42,7 +42,7 @@ import com.l2jmobius.gameserver.model.items.type.CrystalType;
 /**
  * @author UnAfraid
  */
-public final class ItemCrystallizationData implements IGameXmlReader
+public final class ItemCrystallizationData implements IXmlReader
 {
 	private static final Logger LOGGER = Logger.getLogger(ItemCrystallizationData.class.getName());
 	
diff --git a/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/data/xml/impl/KarmaData.java b/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/data/xml/impl/KarmaData.java
index ca826eba2e..bd68c38748 100644
--- a/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/data/xml/impl/KarmaData.java
+++ b/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/data/xml/impl/KarmaData.java
@@ -26,12 +26,12 @@ import org.w3c.dom.NamedNodeMap;
 import org.w3c.dom.Node;
 
 import com.l2jmobius.Config;
-import com.l2jmobius.commons.util.IGameXmlReader;
+import com.l2jmobius.commons.util.IXmlReader;
 
 /**
  * @author UnAfraid
  */
-public class KarmaData implements IGameXmlReader
+public class KarmaData implements IXmlReader
 {
 	private static final Logger LOGGER = Logger.getLogger(KarmaData.class.getName());
 	
diff --git a/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/data/xml/impl/LuckyGameData.java b/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/data/xml/impl/LuckyGameData.java
index 6759bfec3f..41c0d0fc31 100644
--- a/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/data/xml/impl/LuckyGameData.java
+++ b/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/data/xml/impl/LuckyGameData.java
@@ -23,7 +23,7 @@ import java.util.concurrent.atomic.AtomicInteger;
 
 import org.w3c.dom.Document;
 
-import com.l2jmobius.commons.util.IGameXmlReader;
+import com.l2jmobius.commons.util.IXmlReader;
 import com.l2jmobius.gameserver.model.StatsSet;
 import com.l2jmobius.gameserver.model.holders.ItemChanceHolder;
 import com.l2jmobius.gameserver.model.holders.ItemPointHolder;
@@ -32,7 +32,7 @@ import com.l2jmobius.gameserver.model.holders.LuckyGameDataHolder;
 /**
  * @author Sdw
  */
-public class LuckyGameData implements IGameXmlReader
+public class LuckyGameData implements IXmlReader
 {
 	private final Map<Integer, LuckyGameDataHolder> _luckyGame = new HashMap<>();
 	private final AtomicInteger _serverPlay = new AtomicInteger();
diff --git a/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/data/xml/impl/MultisellData.java b/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/data/xml/impl/MultisellData.java
index 796cd9b6f1..e9c494b91e 100644
--- a/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/data/xml/impl/MultisellData.java
+++ b/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/data/xml/impl/MultisellData.java
@@ -19,11 +19,11 @@ package com.l2jmobius.gameserver.data.xml.impl;
 import java.io.File;
 import java.io.FileFilter;
 import java.util.ArrayList;
-import java.util.HashMap;
 import java.util.HashSet;
 import java.util.List;
 import java.util.Map;
 import java.util.Set;
+import java.util.concurrent.ConcurrentHashMap;
 import java.util.logging.Level;
 import java.util.logging.Logger;
 
@@ -31,7 +31,7 @@ import org.w3c.dom.Document;
 import org.w3c.dom.Node;
 
 import com.l2jmobius.Config;
-import com.l2jmobius.commons.util.IGameXmlReader;
+import com.l2jmobius.commons.util.IXmlReader;
 import com.l2jmobius.commons.util.file.filter.NumericNameFilter;
 import com.l2jmobius.gameserver.datatables.ItemTable;
 import com.l2jmobius.gameserver.enums.SpecialItemType;
@@ -46,14 +46,14 @@ import com.l2jmobius.gameserver.model.holders.PreparedMultisellListHolder;
 import com.l2jmobius.gameserver.model.items.Item;
 import com.l2jmobius.gameserver.network.serverpackets.MultiSellList;
 
-public final class MultisellData implements IGameXmlReader
+public final class MultisellData implements IXmlReader
 {
 	private static final Logger LOGGER = Logger.getLogger(MultisellData.class.getName());
 	
 	public static final int PAGE_SIZE = 40;
 	private static final FileFilter NUMERIC_FILTER = new NumericNameFilter();
 	
-	private final Map<Integer, MultisellListHolder> _multisells = new HashMap<>();
+	private final Map<Integer, MultisellListHolder> _multisells = new ConcurrentHashMap<>();
 	
 	protected MultisellData()
 	{
diff --git a/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/data/xml/impl/NpcData.java b/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/data/xml/impl/NpcData.java
index e43e5c5147..3e1adcb420 100644
--- a/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/data/xml/impl/NpcData.java
+++ b/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/data/xml/impl/NpcData.java
@@ -26,6 +26,8 @@ import java.util.List;
 import java.util.Map;
 import java.util.Map.Entry;
 import java.util.Set;
+import java.util.concurrent.ConcurrentHashMap;
+import java.util.concurrent.CopyOnWriteArrayList;
 import java.util.function.Predicate;
 import java.util.logging.Logger;
 import java.util.stream.Collectors;
@@ -36,7 +38,7 @@ import org.w3c.dom.Node;
 
 import com.l2jmobius.Config;
 import com.l2jmobius.commons.util.CommonUtil;
-import com.l2jmobius.commons.util.IGameXmlReader;
+import com.l2jmobius.commons.util.IXmlReader;
 import com.l2jmobius.gameserver.datatables.ItemTable;
 import com.l2jmobius.gameserver.enums.AISkillScope;
 import com.l2jmobius.gameserver.enums.DropType;
@@ -52,13 +54,13 @@ import com.l2jmobius.gameserver.model.skills.Skill;
  * NPC data parser.
  * @author NosBit
  */
-public class NpcData implements IGameXmlReader
+public class NpcData implements IXmlReader
 {
 	protected static final Logger LOGGER = Logger.getLogger(NpcData.class.getName());
 	
-	private final Map<Integer, NpcTemplate> _npcs = new HashMap<>();
-	private final Map<String, Integer> _clans = new HashMap<>();
-	private static final List<Integer> _masterMonsterIDs = new ArrayList<>();
+	private final Map<Integer, NpcTemplate> _npcs = new ConcurrentHashMap<>();
+	private final Map<String, Integer> _clans = new ConcurrentHashMap<>();
+	private static final List<Integer> _masterMonsterIDs = new CopyOnWriteArrayList<>();
 	
 	protected NpcData()
 	{
diff --git a/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/data/xml/impl/OptionData.java b/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/data/xml/impl/OptionData.java
index bffa2b107c..424e2b27ad 100644
--- a/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/data/xml/impl/OptionData.java
+++ b/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/data/xml/impl/OptionData.java
@@ -18,13 +18,12 @@ package com.l2jmobius.gameserver.data.xml.impl;
 
 import java.io.File;
 import java.util.Collections;
-import java.util.HashMap;
 import java.util.Map;
+import java.util.concurrent.ConcurrentHashMap;
 import java.util.logging.Logger;
 
 import org.w3c.dom.Document;
 
-import com.l2jmobius.commons.util.IGameXmlReader;
 import com.l2jmobius.commons.util.IXmlReader;
 import com.l2jmobius.gameserver.handler.EffectHandler;
 import com.l2jmobius.gameserver.model.StatsSet;
@@ -36,11 +35,11 @@ import com.l2jmobius.gameserver.model.options.OptionsSkillType;
 /**
  * @author UnAfraid
  */
-public class OptionData implements IGameXmlReader
+public class OptionData implements IXmlReader
 {
 	private static final Logger LOGGER = Logger.getLogger(OptionData.class.getName());
 	
-	private final Map<Integer, Options> _optionData = new HashMap<>();
+	private final Map<Integer, Options> _optionData = new ConcurrentHashMap<>();
 	
 	protected OptionData()
 	{
diff --git a/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/data/xml/impl/PetDataTable.java b/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/data/xml/impl/PetDataTable.java
index 65afb75d7d..aa6975cd72 100644
--- a/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/data/xml/impl/PetDataTable.java
+++ b/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/data/xml/impl/PetDataTable.java
@@ -17,15 +17,15 @@
 package com.l2jmobius.gameserver.data.xml.impl;
 
 import java.io.File;
-import java.util.HashMap;
 import java.util.Map;
+import java.util.concurrent.ConcurrentHashMap;
 import java.util.logging.Logger;
 
 import org.w3c.dom.Document;
 import org.w3c.dom.NamedNodeMap;
 import org.w3c.dom.Node;
 
-import com.l2jmobius.commons.util.IGameXmlReader;
+import com.l2jmobius.commons.util.IXmlReader;
 import com.l2jmobius.gameserver.enums.MountType;
 import com.l2jmobius.gameserver.model.PetData;
 import com.l2jmobius.gameserver.model.PetLevelData;
@@ -36,11 +36,11 @@ import com.l2jmobius.gameserver.model.StatsSet;
  * TODO: load and use all pet parameters.
  * @author Zoey76 (rework)
  */
-public final class PetDataTable implements IGameXmlReader
+public final class PetDataTable implements IXmlReader
 {
 	private static final Logger LOGGER = Logger.getLogger(PetDataTable.class.getName());
 	
-	private final Map<Integer, PetData> _pets = new HashMap<>();
+	private final Map<Integer, PetData> _pets = new ConcurrentHashMap<>();
 	
 	/**
 	 * Instantiates a new pet data table.
diff --git a/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/data/xml/impl/PetSkillData.java b/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/data/xml/impl/PetSkillData.java
index 4872dde773..5b2f9a4408 100644
--- a/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/data/xml/impl/PetSkillData.java
+++ b/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/data/xml/impl/PetSkillData.java
@@ -27,14 +27,14 @@ import org.w3c.dom.Document;
 import org.w3c.dom.NamedNodeMap;
 import org.w3c.dom.Node;
 
-import com.l2jmobius.commons.util.IGameXmlReader;
+import com.l2jmobius.commons.util.IXmlReader;
 import com.l2jmobius.gameserver.model.actor.Summon;
 import com.l2jmobius.gameserver.model.holders.SkillHolder;
 
 /**
  * @author Mobius
  */
-public class PetSkillData implements IGameXmlReader
+public class PetSkillData implements IXmlReader
 {
 	private static Logger LOGGER = Logger.getLogger(PetSkillData.class.getName());
 	private final Map<Integer, Map<Long, SkillHolder>> _skillTrees = new HashMap<>();
diff --git a/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/data/xml/impl/PlayerTemplateData.java b/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/data/xml/impl/PlayerTemplateData.java
index 031fab8027..7a7c230b72 100644
--- a/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/data/xml/impl/PlayerTemplateData.java
+++ b/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/data/xml/impl/PlayerTemplateData.java
@@ -18,9 +18,9 @@ package com.l2jmobius.gameserver.data.xml.impl;
 
 import java.io.File;
 import java.util.ArrayList;
-import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
+import java.util.concurrent.ConcurrentHashMap;
 import java.util.logging.Logger;
 
 import org.w3c.dom.Document;
@@ -28,7 +28,7 @@ import org.w3c.dom.NamedNodeMap;
 import org.w3c.dom.Node;
 
 import com.l2jmobius.Config;
-import com.l2jmobius.commons.util.IGameXmlReader;
+import com.l2jmobius.commons.util.IXmlReader;
 import com.l2jmobius.gameserver.model.Location;
 import com.l2jmobius.gameserver.model.StatsSet;
 import com.l2jmobius.gameserver.model.actor.templates.PlayerTemplate;
@@ -38,11 +38,11 @@ import com.l2jmobius.gameserver.model.base.ClassId;
  * Loads player's base stats.
  * @author Forsaiken, Zoey76, GKR
  */
-public final class PlayerTemplateData implements IGameXmlReader
+public final class PlayerTemplateData implements IXmlReader
 {
 	private static final Logger LOGGER = Logger.getLogger(PlayerTemplateData.class.getName());
 	
-	private final Map<ClassId, PlayerTemplate> _playerTemplates = new HashMap<>();
+	private final Map<ClassId, PlayerTemplate> _playerTemplates = new ConcurrentHashMap<>();
 	
 	private int _dataCount = 0;
 	private int _autoGeneratedCount = 0;
diff --git a/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/data/xml/impl/PlayerXpPercentLostData.java b/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/data/xml/impl/PlayerXpPercentLostData.java
index 2b867a18e4..816cb7aacf 100644
--- a/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/data/xml/impl/PlayerXpPercentLostData.java
+++ b/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/data/xml/impl/PlayerXpPercentLostData.java
@@ -24,13 +24,13 @@ import org.w3c.dom.Document;
 import org.w3c.dom.NamedNodeMap;
 import org.w3c.dom.Node;
 
-import com.l2jmobius.commons.util.IGameXmlReader;
+import com.l2jmobius.commons.util.IXmlReader;
 
 /**
  * This class holds the Player Xp Percent Lost Data for each level for players.
  * @author Zealar
  */
-public final class PlayerXpPercentLostData implements IGameXmlReader
+public final class PlayerXpPercentLostData implements IXmlReader
 {
 	private static final Logger LOGGER = Logger.getLogger(PlayerXpPercentLostData.class.getName());
 	
diff --git a/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/data/xml/impl/PrimeShopData.java b/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/data/xml/impl/PrimeShopData.java
index 82ddd51f26..650d156194 100644
--- a/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/data/xml/impl/PrimeShopData.java
+++ b/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/data/xml/impl/PrimeShopData.java
@@ -27,7 +27,7 @@ import org.w3c.dom.Document;
 import org.w3c.dom.NamedNodeMap;
 import org.w3c.dom.Node;
 
-import com.l2jmobius.commons.util.IGameXmlReader;
+import com.l2jmobius.commons.util.IXmlReader;
 import com.l2jmobius.gameserver.datatables.ItemTable;
 import com.l2jmobius.gameserver.model.StatsSet;
 import com.l2jmobius.gameserver.model.actor.instance.PlayerInstance;
@@ -39,7 +39,7 @@ import com.l2jmobius.gameserver.network.serverpackets.primeshop.ExBRProductInfo;
 /**
  * @author Gnacik, UnAfraid
  */
-public class PrimeShopData implements IGameXmlReader
+public class PrimeShopData implements IXmlReader
 {
 	private static final Logger LOGGER = Logger.getLogger(PrimeShopData.class.getName());
 	
diff --git a/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/data/xml/impl/RecipeData.java b/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/data/xml/impl/RecipeData.java
index 9c035c1fde..54ce272bd2 100644
--- a/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/data/xml/impl/RecipeData.java
+++ b/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/data/xml/impl/RecipeData.java
@@ -27,7 +27,7 @@ import org.w3c.dom.Document;
 import org.w3c.dom.NamedNodeMap;
 import org.w3c.dom.Node;
 
-import com.l2jmobius.commons.util.IGameXmlReader;
+import com.l2jmobius.commons.util.IXmlReader;
 import com.l2jmobius.gameserver.model.RecipeInstance;
 import com.l2jmobius.gameserver.model.RecipeList;
 import com.l2jmobius.gameserver.model.RecipeStatInstance;
@@ -38,7 +38,7 @@ import com.l2jmobius.gameserver.model.actor.instance.PlayerInstance;
  * The Class RecipeData.
  * @author Zoey76
  */
-public class RecipeData implements IGameXmlReader
+public class RecipeData implements IXmlReader
 {
 	private static final Logger LOGGER = Logger.getLogger(RecipeData.class.getName());
 	
diff --git a/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/data/xml/impl/ResidenceFunctionsData.java b/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/data/xml/impl/ResidenceFunctionsData.java
index 66951e9e59..094ef13149 100644
--- a/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/data/xml/impl/ResidenceFunctionsData.java
+++ b/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/data/xml/impl/ResidenceFunctionsData.java
@@ -28,7 +28,7 @@ import org.w3c.dom.Document;
 import org.w3c.dom.NamedNodeMap;
 import org.w3c.dom.Node;
 
-import com.l2jmobius.commons.util.IGameXmlReader;
+import com.l2jmobius.commons.util.IXmlReader;
 import com.l2jmobius.gameserver.model.StatsSet;
 import com.l2jmobius.gameserver.model.residences.ResidenceFunctionTemplate;
 
@@ -36,7 +36,7 @@ import com.l2jmobius.gameserver.model.residences.ResidenceFunctionTemplate;
  * The residence functions data
  * @author UnAfraid
  */
-public final class ResidenceFunctionsData implements IGameXmlReader
+public final class ResidenceFunctionsData implements IXmlReader
 {
 	private static final Logger LOGGER = Logger.getLogger(ResidenceFunctionsData.class.getName());
 	private final Map<Integer, List<ResidenceFunctionTemplate>> _functions = new HashMap<>();
diff --git a/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/data/xml/impl/SayuneData.java b/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/data/xml/impl/SayuneData.java
index 835bd96930..13b4d33b1e 100644
--- a/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/data/xml/impl/SayuneData.java
+++ b/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/data/xml/impl/SayuneData.java
@@ -26,13 +26,13 @@ import org.w3c.dom.Document;
 import org.w3c.dom.NamedNodeMap;
 import org.w3c.dom.Node;
 
-import com.l2jmobius.commons.util.IGameXmlReader;
+import com.l2jmobius.commons.util.IXmlReader;
 import com.l2jmobius.gameserver.model.SayuneEntry;
 
 /**
  * @author UnAfraid
  */
-public class SayuneData implements IGameXmlReader
+public class SayuneData implements IXmlReader
 {
 	private static final Logger LOGGER = Logger.getLogger(SayuneData.class.getName());
 	
diff --git a/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/data/xml/impl/SecondaryAuthData.java b/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/data/xml/impl/SecondaryAuthData.java
index c0ebd36146..ca85056b10 100644
--- a/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/data/xml/impl/SecondaryAuthData.java
+++ b/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/data/xml/impl/SecondaryAuthData.java
@@ -25,12 +25,12 @@ import java.util.logging.Logger;
 import org.w3c.dom.Document;
 import org.w3c.dom.Node;
 
-import com.l2jmobius.commons.util.IGameXmlReader;
+import com.l2jmobius.commons.util.IXmlReader;
 
 /**
  * @author NosBit
  */
-public class SecondaryAuthData implements IGameXmlReader
+public class SecondaryAuthData implements IXmlReader
 {
 	private static final Logger LOGGER = Logger.getLogger(SecondaryAuthData.class.getName());
 	
diff --git a/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/data/xml/impl/ShuttleData.java b/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/data/xml/impl/ShuttleData.java
index 9454d24d6b..ff26f4f409 100644
--- a/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/data/xml/impl/ShuttleData.java
+++ b/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/data/xml/impl/ShuttleData.java
@@ -27,7 +27,7 @@ import org.w3c.dom.Document;
 import org.w3c.dom.NamedNodeMap;
 import org.w3c.dom.Node;
 
-import com.l2jmobius.commons.util.IGameXmlReader;
+import com.l2jmobius.commons.util.IXmlReader;
 import com.l2jmobius.gameserver.model.Location;
 import com.l2jmobius.gameserver.model.StatsSet;
 import com.l2jmobius.gameserver.model.VehiclePathPoint;
@@ -40,7 +40,7 @@ import com.l2jmobius.gameserver.model.shuttle.ShuttleStop;
 /**
  * @author UnAfraid
  */
-public final class ShuttleData implements IGameXmlReader
+public final class ShuttleData implements IXmlReader
 {
 	private static final Logger LOGGER = Logger.getLogger(ShuttleData.class.getName());
 	
diff --git a/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/data/xml/impl/SiegeScheduleData.java b/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/data/xml/impl/SiegeScheduleData.java
index 265bf7c528..6bff09010b 100644
--- a/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/data/xml/impl/SiegeScheduleData.java
+++ b/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/data/xml/impl/SiegeScheduleData.java
@@ -27,7 +27,7 @@ import org.w3c.dom.Document;
 import org.w3c.dom.NamedNodeMap;
 import org.w3c.dom.Node;
 
-import com.l2jmobius.commons.util.IGameXmlReader;
+import com.l2jmobius.commons.util.IXmlReader;
 import com.l2jmobius.gameserver.model.SiegeScheduleDate;
 import com.l2jmobius.gameserver.model.StatsSet;
 import com.l2jmobius.gameserver.util.Util;
@@ -35,7 +35,7 @@ import com.l2jmobius.gameserver.util.Util;
 /**
  * @author UnAfraid
  */
-public class SiegeScheduleData implements IGameXmlReader
+public class SiegeScheduleData implements IXmlReader
 {
 	private static final Logger LOGGER = Logger.getLogger(SiegeScheduleData.class.getName());
 	
diff --git a/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/data/xml/impl/SkillData.java b/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/data/xml/impl/SkillData.java
index 7a1ae2e15b..64900d4d45 100644
--- a/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/data/xml/impl/SkillData.java
+++ b/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/data/xml/impl/SkillData.java
@@ -25,6 +25,7 @@ import java.util.List;
 import java.util.Map;
 import java.util.Optional;
 import java.util.Set;
+import java.util.concurrent.ConcurrentHashMap;
 import java.util.function.BiConsumer;
 import java.util.function.Function;
 import java.util.logging.Level;
@@ -35,7 +36,7 @@ import org.w3c.dom.Document;
 import org.w3c.dom.NamedNodeMap;
 import org.w3c.dom.Node;
 
-import com.l2jmobius.commons.util.IGameXmlReader;
+import com.l2jmobius.commons.util.IXmlReader;
 import com.l2jmobius.gameserver.handler.EffectHandler;
 import com.l2jmobius.gameserver.handler.SkillConditionHandler;
 import com.l2jmobius.gameserver.model.StatsSet;
@@ -51,12 +52,12 @@ import com.l2jmobius.gameserver.util.exp4j.ExpressionBuilder;
  * Skill data parser.
  * @author NosBit
  */
-public class SkillData implements IGameXmlReader
+public class SkillData implements IXmlReader
 {
 	private static final Logger LOGGER = Logger.getLogger(SkillData.class.getName());
 	
-	private final Map<Long, Skill> _skills = new HashMap<>();
-	private final Map<Integer, Integer> _skillsMaxLevel = new HashMap<>();
+	private final Map<Long, Skill> _skills = new ConcurrentHashMap<>();
+	private final Map<Integer, Integer> _skillsMaxLevel = new ConcurrentHashMap<>();
 	
 	private class NamedParamInfo
 	{
diff --git a/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/data/xml/impl/SkillTreesData.java b/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/data/xml/impl/SkillTreesData.java
index 7f667059db..780e0a1d1c 100644
--- a/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/data/xml/impl/SkillTreesData.java
+++ b/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/data/xml/impl/SkillTreesData.java
@@ -29,6 +29,7 @@ import java.util.List;
 import java.util.Map;
 import java.util.Map.Entry;
 import java.util.Set;
+import java.util.concurrent.ConcurrentHashMap;
 import java.util.concurrent.atomic.AtomicBoolean;
 import java.util.logging.Logger;
 import java.util.stream.Collectors;
@@ -38,7 +39,7 @@ import org.w3c.dom.NamedNodeMap;
 import org.w3c.dom.Node;
 
 import com.l2jmobius.Config;
-import com.l2jmobius.commons.util.IGameXmlReader;
+import com.l2jmobius.commons.util.IXmlReader;
 import com.l2jmobius.gameserver.enums.CategoryType;
 import com.l2jmobius.gameserver.enums.Race;
 import com.l2jmobius.gameserver.enums.SubclassType;
@@ -77,34 +78,34 @@ import com.l2jmobius.gameserver.model.skills.Skill;
  * For XML schema please refer to skillTrees.xsd in datapack in xsd folder and for parameters documentation refer to documentation.txt in skillTrees folder.<br>
  * @author Zoey76
  */
-public final class SkillTreesData implements IGameXmlReader
+public final class SkillTreesData implements IXmlReader
 {
 	private static final Logger LOGGER = Logger.getLogger(SkillTreesData.class.getName());
 	
 	// ClassId, Map of Skill Hash Code, SkillLearn
-	private static final Map<ClassId, Map<Long, SkillLearn>> _classSkillTrees = new HashMap<>();
-	private static final Map<ClassId, Map<Long, SkillLearn>> _transferSkillTrees = new HashMap<>();
-	private static final Map<Race, Map<Long, SkillLearn>> _raceSkillTree = new HashMap<>();
-	private static final Map<SubclassType, Map<Long, SkillLearn>> _revelationSkillTree = new HashMap<>();
-	private static final Map<ClassId, Set<Integer>> _awakeningSaveSkillTree = new HashMap<>();
+	private static final Map<ClassId, Map<Long, SkillLearn>> _classSkillTrees = new ConcurrentHashMap<>();
+	private static final Map<ClassId, Map<Long, SkillLearn>> _transferSkillTrees = new ConcurrentHashMap<>();
+	private static final Map<Race, Map<Long, SkillLearn>> _raceSkillTree = new ConcurrentHashMap<>();
+	private static final Map<SubclassType, Map<Long, SkillLearn>> _revelationSkillTree = new ConcurrentHashMap<>();
+	private static final Map<ClassId, Set<Integer>> _awakeningSaveSkillTree = new ConcurrentHashMap<>();
 	// Skill Hash Code, SkillLearn
-	private static final Map<Long, SkillLearn> _collectSkillTree = new HashMap<>();
-	private static final Map<Long, SkillLearn> _fishingSkillTree = new HashMap<>();
-	private static final Map<Long, SkillLearn> _pledgeSkillTree = new HashMap<>();
-	private static final Map<Long, SkillLearn> _subClassSkillTree = new HashMap<>();
-	private static final Map<Long, SkillLearn> _subPledgeSkillTree = new HashMap<>();
-	private static final Map<Long, SkillLearn> _transformSkillTree = new HashMap<>();
-	private static final Map<Long, SkillLearn> _commonSkillTree = new HashMap<>();
-	private static final Map<Long, SkillLearn> _abilitySkillTree = new HashMap<>();
-	private static final Map<Long, SkillLearn> _alchemySkillTree = new HashMap<>();
-	private static final Map<Long, SkillLearn> _dualClassSkillTree = new HashMap<>();
+	private static final Map<Long, SkillLearn> _collectSkillTree = new ConcurrentHashMap<>();
+	private static final Map<Long, SkillLearn> _fishingSkillTree = new ConcurrentHashMap<>();
+	private static final Map<Long, SkillLearn> _pledgeSkillTree = new ConcurrentHashMap<>();
+	private static final Map<Long, SkillLearn> _subClassSkillTree = new ConcurrentHashMap<>();
+	private static final Map<Long, SkillLearn> _subPledgeSkillTree = new ConcurrentHashMap<>();
+	private static final Map<Long, SkillLearn> _transformSkillTree = new ConcurrentHashMap<>();
+	private static final Map<Long, SkillLearn> _commonSkillTree = new ConcurrentHashMap<>();
+	private static final Map<Long, SkillLearn> _abilitySkillTree = new ConcurrentHashMap<>();
+	private static final Map<Long, SkillLearn> _alchemySkillTree = new ConcurrentHashMap<>();
+	private static final Map<Long, SkillLearn> _dualClassSkillTree = new ConcurrentHashMap<>();
 	// Other skill trees
-	private static final Map<Long, SkillLearn> _nobleSkillTree = new HashMap<>();
-	private static final Map<Long, SkillLearn> _heroSkillTree = new HashMap<>();
-	private static final Map<Long, SkillLearn> _gameMasterSkillTree = new HashMap<>();
-	private static final Map<Long, SkillLearn> _gameMasterAuraSkillTree = new HashMap<>();
+	private static final Map<Long, SkillLearn> _nobleSkillTree = new ConcurrentHashMap<>();
+	private static final Map<Long, SkillLearn> _heroSkillTree = new ConcurrentHashMap<>();
+	private static final Map<Long, SkillLearn> _gameMasterSkillTree = new ConcurrentHashMap<>();
+	private static final Map<Long, SkillLearn> _gameMasterAuraSkillTree = new ConcurrentHashMap<>();
 	// Remove skill tree
-	private static final Map<ClassId, Set<Integer>> _removeSkillCache = new HashMap<>();
+	private static final Map<ClassId, Set<Integer>> _removeSkillCache = new ConcurrentHashMap<>();
 	
 	// Checker, sorted arrays of hash codes
 	private Map<Integer, long[]> _skillsByClassIdHashCodes; // Occupation skills
@@ -112,7 +113,7 @@ public final class SkillTreesData implements IGameXmlReader
 	private long[] _allSkillsHashCodes; // Fishing, Collection, Transformations, Common Skills.
 	
 	/** Parent class Ids are read from XML and stored in this map, to allow easy customization. */
-	private static final Map<ClassId, ClassId> _parentClassMap = new HashMap<>();
+	private static final Map<ClassId, ClassId> _parentClassMap = new ConcurrentHashMap<>();
 	
 	private final AtomicBoolean _isLoading = new AtomicBoolean();
 	
diff --git a/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/data/xml/impl/SpawnsData.java b/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/data/xml/impl/SpawnsData.java
index dc41b02109..806d00902a 100644
--- a/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/data/xml/impl/SpawnsData.java
+++ b/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/data/xml/impl/SpawnsData.java
@@ -19,9 +19,10 @@ package com.l2jmobius.gameserver.data.xml.impl;
 import java.io.File;
 import java.util.ArrayList;
 import java.util.Collections;
-import java.util.LinkedList;
 import java.util.List;
 import java.util.Map;
+import java.util.concurrent.CopyOnWriteArrayList;
+import java.util.concurrent.ScheduledFuture;
 import java.util.function.Predicate;
 import java.util.logging.Level;
 import java.util.logging.Logger;
@@ -31,7 +32,7 @@ import org.w3c.dom.Document;
 import org.w3c.dom.Node;
 
 import com.l2jmobius.Config;
-import com.l2jmobius.commons.util.IGameXmlReader;
+import com.l2jmobius.commons.concurrent.ThreadPool;
 import com.l2jmobius.commons.util.IXmlReader;
 import com.l2jmobius.gameserver.model.ChanceLocation;
 import com.l2jmobius.gameserver.model.StatsSet;
@@ -49,11 +50,11 @@ import com.l2jmobius.gameserver.model.zone.type.SpawnTerritory;
 /**
  * @author UnAfraid
  */
-public class SpawnsData implements IGameXmlReader
+public class SpawnsData implements IXmlReader
 {
 	protected static final Logger LOGGER = Logger.getLogger(SpawnsData.class.getName());
 	
-	private final List<SpawnTemplate> _spawns = new LinkedList<>();
+	private final List<SpawnTemplate> _spawns = new CopyOnWriteArrayList<>();
 	
 	protected SpawnsData()
 	{
@@ -94,11 +95,28 @@ public class SpawnsData implements IGameXmlReader
 		}
 		
 		LOGGER.info(getClass().getSimpleName() + ": Initializing spawns...");
-		_spawns.stream().filter(SpawnTemplate::isSpawningByDefault).forEach(template ->
+		final List<ScheduledFuture<?>> jobs = new CopyOnWriteArrayList<>();
+		for (SpawnTemplate template : _spawns)
 		{
-			template.spawnAll(null);
-			template.notifyActivate();
-		});
+			if (template.isSpawningByDefault())
+			{
+				jobs.add(ThreadPool.schedule(() ->
+				{
+					template.spawnAll(null);
+					template.notifyActivate();
+				}, 0));
+			}
+		}
+		while (!jobs.isEmpty())
+		{
+			for (ScheduledFuture<?> job : jobs)
+			{
+				if ((job == null) || job.isDone() || job.isCancelled())
+				{
+					jobs.remove(job);
+				}
+			}
+		}
 		LOGGER.info(getClass().getSimpleName() + ": All spawns has been initialized!");
 	}
 	
diff --git a/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/data/xml/impl/StaticObjectData.java b/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/data/xml/impl/StaticObjectData.java
index 8af86bec88..5e88dd66fb 100644
--- a/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/data/xml/impl/StaticObjectData.java
+++ b/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/data/xml/impl/StaticObjectData.java
@@ -26,7 +26,7 @@ import org.w3c.dom.Document;
 import org.w3c.dom.NamedNodeMap;
 import org.w3c.dom.Node;
 
-import com.l2jmobius.commons.util.IGameXmlReader;
+import com.l2jmobius.commons.util.IXmlReader;
 import com.l2jmobius.gameserver.model.StatsSet;
 import com.l2jmobius.gameserver.model.actor.instance.StaticObjectInstance;
 import com.l2jmobius.gameserver.model.actor.templates.CreatureTemplate;
@@ -35,7 +35,7 @@ import com.l2jmobius.gameserver.model.actor.templates.CreatureTemplate;
  * This class loads and holds all static object data.
  * @author UnAfraid
  */
-public final class StaticObjectData implements IGameXmlReader
+public final class StaticObjectData implements IXmlReader
 {
 	private static final Logger LOGGER = Logger.getLogger(StaticObjectData.class.getName());
 	
diff --git a/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/data/xml/impl/TeleportersData.java b/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/data/xml/impl/TeleportersData.java
index 1d039725ad..5afec008f7 100644
--- a/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/data/xml/impl/TeleportersData.java
+++ b/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/data/xml/impl/TeleportersData.java
@@ -20,12 +20,13 @@ import java.io.File;
 import java.util.Collections;
 import java.util.HashMap;
 import java.util.Map;
+import java.util.concurrent.ConcurrentHashMap;
 import java.util.logging.Logger;
 
 import org.w3c.dom.Document;
 import org.w3c.dom.NamedNodeMap;
 
-import com.l2jmobius.commons.util.IGameXmlReader;
+import com.l2jmobius.commons.util.IXmlReader;
 import com.l2jmobius.gameserver.enums.TeleportType;
 import com.l2jmobius.gameserver.model.StatsSet;
 import com.l2jmobius.gameserver.model.teleporter.TeleportHolder;
@@ -33,12 +34,12 @@ import com.l2jmobius.gameserver.model.teleporter.TeleportHolder;
 /**
  * @author UnAfraid
  */
-public class TeleportersData implements IGameXmlReader
+public class TeleportersData implements IXmlReader
 {
 	// Logger instance
 	private static final Logger LOGGER = Logger.getLogger(TeleportersData.class.getName());
 	// Teleporter data
-	private final Map<Integer, Map<String, TeleportHolder>> _teleporters = new HashMap<>();
+	private final Map<Integer, Map<String, TeleportHolder>> _teleporters = new ConcurrentHashMap<>();
 	
 	protected TeleportersData()
 	{
diff --git a/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/data/xml/impl/TransformData.java b/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/data/xml/impl/TransformData.java
index 896111de87..d917c7e46f 100644
--- a/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/data/xml/impl/TransformData.java
+++ b/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/data/xml/impl/TransformData.java
@@ -17,15 +17,15 @@
 package com.l2jmobius.gameserver.data.xml.impl;
 
 import java.io.File;
-import java.util.HashMap;
 import java.util.Map;
+import java.util.concurrent.ConcurrentHashMap;
 import java.util.logging.Logger;
 
 import org.w3c.dom.Document;
 import org.w3c.dom.NamedNodeMap;
 import org.w3c.dom.Node;
 
-import com.l2jmobius.commons.util.IGameXmlReader;
+import com.l2jmobius.commons.util.IXmlReader;
 import com.l2jmobius.gameserver.model.StatsSet;
 import com.l2jmobius.gameserver.model.actor.transform.Transform;
 import com.l2jmobius.gameserver.model.actor.transform.TransformLevelData;
@@ -39,11 +39,11 @@ import com.l2jmobius.gameserver.network.serverpackets.ExBasicActionList;
  * Transformation data.
  * @author UnAfraid
  */
-public final class TransformData implements IGameXmlReader
+public final class TransformData implements IXmlReader
 {
 	private static final Logger LOGGER = Logger.getLogger(TransformData.class.getName());
 	
-	private final Map<Integer, Transform> _transformData = new HashMap<>();
+	private final Map<Integer, Transform> _transformData = new ConcurrentHashMap<>();
 	
 	protected TransformData()
 	{
diff --git a/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/data/xml/impl/VariationData.java b/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/data/xml/impl/VariationData.java
index 13b41c6359..542acc971b 100644
--- a/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/data/xml/impl/VariationData.java
+++ b/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/data/xml/impl/VariationData.java
@@ -22,11 +22,12 @@ import java.util.Collections;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
+import java.util.concurrent.ConcurrentHashMap;
 import java.util.logging.Logger;
 
 import org.w3c.dom.Document;
 
-import com.l2jmobius.commons.util.IGameXmlReader;
+import com.l2jmobius.commons.util.IXmlReader;
 import com.l2jmobius.gameserver.datatables.ItemTable;
 import com.l2jmobius.gameserver.model.VariationInstance;
 import com.l2jmobius.gameserver.model.items.instance.ItemInstance;
@@ -40,12 +41,12 @@ import com.l2jmobius.gameserver.model.options.VariationWeaponType;
 /**
  * @author Pere
  */
-public class VariationData implements IGameXmlReader
+public class VariationData implements IXmlReader
 {
 	private static final Logger LOGGER = Logger.getLogger(VariationData.class.getSimpleName());
 	
-	private final Map<Integer, Variation> _variations = new HashMap<>();
-	private final Map<Integer, Map<Integer, VariationFee>> _fees = new HashMap<>();
+	private final Map<Integer, Variation> _variations = new ConcurrentHashMap<>();
+	private final Map<Integer, Map<Integer, VariationFee>> _fees = new ConcurrentHashMap<>();
 	
 	protected VariationData()
 	{
diff --git a/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/engines/DocumentEngine.java b/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/engines/DocumentEngine.java
index d787488757..10f04f4fb3 100644
--- a/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/engines/DocumentEngine.java
+++ b/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/engines/DocumentEngine.java
@@ -17,11 +17,14 @@
 package com.l2jmobius.gameserver.engines;
 
 import java.io.File;
-import java.util.LinkedList;
+import java.util.ArrayList;
 import java.util.List;
+import java.util.concurrent.CopyOnWriteArrayList;
+import java.util.concurrent.ScheduledFuture;
 import java.util.logging.Logger;
 
 import com.l2jmobius.Config;
+import com.l2jmobius.commons.concurrent.ThreadPool;
 import com.l2jmobius.commons.util.file.filter.XMLFilter;
 import com.l2jmobius.gameserver.engines.items.DocumentItem;
 import com.l2jmobius.gameserver.model.items.Item;
@@ -33,34 +36,29 @@ public class DocumentEngine
 {
 	private static final Logger LOGGER = Logger.getLogger(DocumentEngine.class.getName());
 	
-	private final List<File> _itemFiles = new LinkedList<>();
-	
-	public static DocumentEngine getInstance()
-	{
-		return SingletonHolder._instance;
-	}
+	private final List<File> _itemFiles = new ArrayList<>();
 	
 	protected DocumentEngine()
 	{
-		hashFiles("data/stats/items", _itemFiles);
+		processDirectory("data/stats/items", _itemFiles);
 		if (Config.CUSTOM_ITEMS_LOAD)
 		{
-			hashFiles("data/stats/items/custom", _itemFiles);
+			processDirectory("data/stats/items/custom", _itemFiles);
 		}
 	}
 	
-	private void hashFiles(String dirname, List<File> hash)
+	private void processDirectory(String dirName, List<File> list)
 	{
-		final File dir = new File(Config.DATAPACK_ROOT, dirname);
+		final File dir = new File(Config.DATAPACK_ROOT, dirName);
 		if (!dir.exists())
 		{
-			LOGGER.warning("Dir " + dir.getAbsolutePath() + " not exists");
+			LOGGER.warning("Dir " + dir.getAbsolutePath() + " does not exist.");
 			return;
 		}
 		final File[] files = dir.listFiles(new XMLFilter());
-		for (File f : files)
+		for (File file : files)
 		{
-			hash.add(f);
+			list.add(file);
 		}
 	}
 	
@@ -70,12 +68,26 @@ public class DocumentEngine
 	 */
 	public List<Item> loadItems()
 	{
-		final List<Item> list = new LinkedList<>();
-		for (File f : _itemFiles)
+		final List<Item> list = new CopyOnWriteArrayList<>();
+		final List<ScheduledFuture<?>> jobs = new CopyOnWriteArrayList<>();
+		for (File file : _itemFiles)
 		{
-			final DocumentItem document = new DocumentItem(f);
-			document.parse();
-			list.addAll(document.getItemList());
+			jobs.add(ThreadPool.schedule(() ->
+			{
+				final DocumentItem document = new DocumentItem(file);
+				document.parse();
+				list.addAll(document.getItemList());
+			}, 0));
+		}
+		while (!jobs.isEmpty())
+		{
+			for (ScheduledFuture<?> job : jobs)
+			{
+				if ((job == null) || job.isDone() || job.isCancelled())
+				{
+					jobs.remove(job);
+				}
+			}
 		}
 		return list;
 	}
@@ -84,4 +96,9 @@ public class DocumentEngine
 	{
 		protected static final DocumentEngine _instance = new DocumentEngine();
 	}
+	
+	public static DocumentEngine getInstance()
+	{
+		return SingletonHolder._instance;
+	}
 }
diff --git a/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/engines/items/DocumentItem.java b/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/engines/items/DocumentItem.java
index 8aaaed2cb4..4ea960563d 100644
--- a/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/engines/items/DocumentItem.java
+++ b/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/engines/items/DocumentItem.java
@@ -19,7 +19,7 @@ package com.l2jmobius.gameserver.engines.items;
 import java.io.File;
 import java.lang.reflect.Constructor;
 import java.lang.reflect.InvocationTargetException;
-import java.util.LinkedList;
+import java.util.ArrayList;
 import java.util.List;
 import java.util.logging.Level;
 import java.util.logging.Logger;
@@ -27,7 +27,7 @@ import java.util.logging.Logger;
 import org.w3c.dom.Document;
 import org.w3c.dom.Node;
 
-import com.l2jmobius.commons.util.IGameXmlReader;
+import com.l2jmobius.commons.util.IXmlReader;
 import com.l2jmobius.gameserver.engines.DocumentBase;
 import com.l2jmobius.gameserver.enums.ItemSkillType;
 import com.l2jmobius.gameserver.model.ExtractableProduct;
@@ -41,12 +41,12 @@ import com.l2jmobius.gameserver.model.stats.functions.FuncTemplate;
 /**
  * @author mkizub, JIV
  */
-public final class DocumentItem extends DocumentBase implements IGameXmlReader
+public final class DocumentItem extends DocumentBase implements IXmlReader
 {
 	Logger LOGGER = Logger.getLogger(DocumentItem.class.getName());
 	
 	private ItemDataHolder _currentItem = null;
-	private final List<Item> _itemsInFile = new LinkedList<>();
+	private final List<Item> _itemsInFile = new ArrayList<>();
 	
 	/**
 	 * @param file
diff --git a/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/handler/ConditionHandler.java b/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/handler/ConditionHandler.java
index c92ef368b3..4e20d5e720 100644
--- a/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/handler/ConditionHandler.java
+++ b/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/handler/ConditionHandler.java
@@ -50,7 +50,7 @@ public final class ConditionHandler
 	{
 		try
 		{
-			ScriptEngineManager.getInstance().executeConditionMasterHandler();
+			ScriptEngineManager.getInstance().executeScript(ScriptEngineManager.CONDITION_HANDLER_FILE);
 		}
 		catch (Exception e)
 		{
diff --git a/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/handler/DailyMissionHandler.java b/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/handler/DailyMissionHandler.java
index 9a80c1db8f..6b6248da49 100644
--- a/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/handler/DailyMissionHandler.java
+++ b/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/handler/DailyMissionHandler.java
@@ -49,7 +49,7 @@ public class DailyMissionHandler
 	{
 		try
 		{
-			ScriptEngineManager.getInstance().executeDailyMissionMasterHandler();
+			ScriptEngineManager.getInstance().executeScript(ScriptEngineManager.ONE_DAY_REWARD_MASTER_HANDLER);
 		}
 		catch (Exception e)
 		{
diff --git a/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/handler/EffectHandler.java b/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/handler/EffectHandler.java
index 0bf5350cb8..cab6562421 100644
--- a/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/handler/EffectHandler.java
+++ b/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/handler/EffectHandler.java
@@ -50,7 +50,7 @@ public final class EffectHandler
 	{
 		try
 		{
-			ScriptEngineManager.getInstance().executeEffectMasterHandler();
+			ScriptEngineManager.getInstance().executeScript(ScriptEngineManager.EFFECT_MASTER_HANDLER_FILE);
 		}
 		catch (Exception e)
 		{
diff --git a/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/handler/SkillConditionHandler.java b/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/handler/SkillConditionHandler.java
index b764410ba1..8685b0279a 100644
--- a/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/handler/SkillConditionHandler.java
+++ b/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/handler/SkillConditionHandler.java
@@ -50,7 +50,7 @@ public final class SkillConditionHandler
 	{
 		try
 		{
-			ScriptEngineManager.getInstance().executeSkillConditionMasterHandler();
+			ScriptEngineManager.getInstance().executeScript(ScriptEngineManager.SKILL_CONDITION_HANDLER_FILE);
 		}
 		catch (Exception e)
 		{
diff --git a/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/instancemanager/CastleManorManager.java b/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/instancemanager/CastleManorManager.java
index 48d04d3f38..212d1a043c 100644
--- a/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/instancemanager/CastleManorManager.java
+++ b/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/instancemanager/CastleManorManager.java
@@ -40,7 +40,7 @@ import org.w3c.dom.Node;
 import com.l2jmobius.Config;
 import com.l2jmobius.commons.concurrent.ThreadPool;
 import com.l2jmobius.commons.database.DatabaseFactory;
-import com.l2jmobius.commons.util.IGameXmlReader;
+import com.l2jmobius.commons.util.IXmlReader;
 import com.l2jmobius.commons.util.Rnd;
 import com.l2jmobius.gameserver.enums.ManorMode;
 import com.l2jmobius.gameserver.model.CropProcure;
@@ -58,7 +58,7 @@ import com.l2jmobius.gameserver.network.SystemMessageId;
  * Castle manor system.
  * @author malyelfik
  */
-public final class CastleManorManager implements IGameXmlReader, IStorable
+public final class CastleManorManager implements IXmlReader, IStorable
 {
 	private static final Logger LOGGER = Logger.getLogger(CastleManorManager.class.getName());
 	
diff --git a/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/instancemanager/CursedWeaponsManager.java b/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/instancemanager/CursedWeaponsManager.java
index d123b41ef6..835d961c56 100644
--- a/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/instancemanager/CursedWeaponsManager.java
+++ b/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/instancemanager/CursedWeaponsManager.java
@@ -35,7 +35,7 @@ import org.w3c.dom.Node;
 
 import com.l2jmobius.Config;
 import com.l2jmobius.commons.database.DatabaseFactory;
-import com.l2jmobius.commons.util.IGameXmlReader;
+import com.l2jmobius.commons.util.IXmlReader;
 import com.l2jmobius.gameserver.model.CursedWeapon;
 import com.l2jmobius.gameserver.model.actor.Attackable;
 import com.l2jmobius.gameserver.model.actor.Creature;
@@ -54,7 +54,7 @@ import com.l2jmobius.gameserver.util.Broadcast;
  * UnAfraid: TODO: Rewrite with DocumentParser
  * @author Micht
  */
-public final class CursedWeaponsManager implements IGameXmlReader
+public final class CursedWeaponsManager implements IXmlReader
 {
 	private static final Logger LOGGER = Logger.getLogger(CursedWeaponsManager.class.getName());
 	
diff --git a/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/instancemanager/FakePlayerChatManager.java b/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/instancemanager/FakePlayerChatManager.java
index 7101927e48..39c239a762 100644
--- a/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/instancemanager/FakePlayerChatManager.java
+++ b/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/instancemanager/FakePlayerChatManager.java
@@ -25,7 +25,7 @@ import org.w3c.dom.Document;
 
 import com.l2jmobius.Config;
 import com.l2jmobius.commons.concurrent.ThreadPool;
-import com.l2jmobius.commons.util.IGameXmlReader;
+import com.l2jmobius.commons.util.IXmlReader;
 import com.l2jmobius.commons.util.Rnd;
 import com.l2jmobius.gameserver.data.xml.impl.FakePlayerData;
 import com.l2jmobius.gameserver.datatables.SpawnTable;
@@ -41,7 +41,7 @@ import com.l2jmobius.gameserver.network.serverpackets.CreatureSay;
 /**
  * @author Mobius
  */
-public final class FakePlayerChatManager implements IGameXmlReader
+public final class FakePlayerChatManager implements IXmlReader
 {
 	private static Logger LOGGER = Logger.getLogger(FakePlayerChatManager.class.getName());
 	final List<FakePlayerChatHolder> MESSAGES = new ArrayList<>();
diff --git a/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/instancemanager/InstanceManager.java b/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/instancemanager/InstanceManager.java
index f300213c49..5ea229cf1b 100644
--- a/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/instancemanager/InstanceManager.java
+++ b/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/instancemanager/InstanceManager.java
@@ -40,7 +40,6 @@ import org.w3c.dom.Node;
 
 import com.l2jmobius.Config;
 import com.l2jmobius.commons.database.DatabaseFactory;
-import com.l2jmobius.commons.util.IGameXmlReader;
 import com.l2jmobius.commons.util.IXmlReader;
 import com.l2jmobius.gameserver.data.xml.impl.DoorData;
 import com.l2jmobius.gameserver.data.xml.impl.SpawnsData;
@@ -61,7 +60,7 @@ import com.l2jmobius.gameserver.model.spawns.SpawnTemplate;
  * Instance manager.
  * @author evill33t, GodKratos, malyelfik
  */
-public final class InstanceManager implements IGameXmlReader
+public final class InstanceManager implements IXmlReader
 {
 	private static final Logger LOGGER = Logger.getLogger(InstanceManager.class.getName());
 	// Database query
diff --git a/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/instancemanager/ItemAuctionManager.java b/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/instancemanager/ItemAuctionManager.java
index f819adf93b..752bcfdd3f 100644
--- a/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/instancemanager/ItemAuctionManager.java
+++ b/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/instancemanager/ItemAuctionManager.java
@@ -34,13 +34,13 @@ import org.w3c.dom.Node;
 
 import com.l2jmobius.Config;
 import com.l2jmobius.commons.database.DatabaseFactory;
-import com.l2jmobius.commons.util.IGameXmlReader;
+import com.l2jmobius.commons.util.IXmlReader;
 import com.l2jmobius.gameserver.model.itemauction.ItemAuctionInstance;
 
 /**
  * @author Forsaiken
  */
-public final class ItemAuctionManager implements IGameXmlReader
+public final class ItemAuctionManager implements IXmlReader
 {
 	private static final Logger LOGGER = Logger.getLogger(ItemAuctionManager.class.getName());
 	
diff --git a/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/instancemanager/MapRegionManager.java b/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/instancemanager/MapRegionManager.java
index 255d4340ff..8f68a4bdf5 100644
--- a/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/instancemanager/MapRegionManager.java
+++ b/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/instancemanager/MapRegionManager.java
@@ -27,7 +27,7 @@ import org.w3c.dom.NamedNodeMap;
 import org.w3c.dom.Node;
 
 import com.l2jmobius.Config;
-import com.l2jmobius.commons.util.IGameXmlReader;
+import com.l2jmobius.commons.util.IXmlReader;
 import com.l2jmobius.gameserver.data.xml.impl.ClanHallData;
 import com.l2jmobius.gameserver.model.Location;
 import com.l2jmobius.gameserver.model.MapRegion;
@@ -47,7 +47,7 @@ import com.l2jmobius.gameserver.model.zone.type.RespawnZone;
  * Map Region Manager.
  * @author Nyaran
  */
-public final class MapRegionManager implements IGameXmlReader
+public final class MapRegionManager implements IXmlReader
 {
 	private static final Logger LOGGER = Logger.getLogger(MapRegionManager.class.getName());
 	
diff --git a/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/instancemanager/SellBuffsManager.java b/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/instancemanager/SellBuffsManager.java
index dcf1bae346..0c4e94f449 100644
--- a/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/instancemanager/SellBuffsManager.java
+++ b/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/instancemanager/SellBuffsManager.java
@@ -26,7 +26,7 @@ import org.w3c.dom.Element;
 import org.w3c.dom.NodeList;
 
 import com.l2jmobius.Config;
-import com.l2jmobius.commons.util.IGameXmlReader;
+import com.l2jmobius.commons.util.IXmlReader;
 import com.l2jmobius.gameserver.cache.HtmCache;
 import com.l2jmobius.gameserver.data.xml.impl.SkillData;
 import com.l2jmobius.gameserver.datatables.ItemTable;
@@ -46,7 +46,7 @@ import com.l2jmobius.gameserver.util.Util;
  * Sell Buffs Manager
  * @author St3eT
  */
-public final class SellBuffsManager implements IGameXmlReader
+public final class SellBuffsManager implements IXmlReader
 {
 	private static final Logger LOGGER = Logger.getLogger(SellBuffsManager.class.getName());
 	private static final List<Integer> ALLOWED_BUFFS = new ArrayList<>();
diff --git a/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/instancemanager/WalkingManager.java b/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/instancemanager/WalkingManager.java
index 4583519bc4..18c4814040 100644
--- a/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/instancemanager/WalkingManager.java
+++ b/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/instancemanager/WalkingManager.java
@@ -28,7 +28,7 @@ import org.w3c.dom.NamedNodeMap;
 import org.w3c.dom.Node;
 
 import com.l2jmobius.commons.concurrent.ThreadPool;
-import com.l2jmobius.commons.util.IGameXmlReader;
+import com.l2jmobius.commons.util.IXmlReader;
 import com.l2jmobius.gameserver.ai.CtrlIntention;
 import com.l2jmobius.gameserver.data.xml.impl.NpcData;
 import com.l2jmobius.gameserver.enums.ChatType;
@@ -49,7 +49,7 @@ import com.l2jmobius.gameserver.network.NpcStringId;
  * This class manages walking monsters.
  * @author GKR
  */
-public final class WalkingManager implements IGameXmlReader
+public final class WalkingManager implements IXmlReader
 {
 	private static final Logger LOGGER = Logger.getLogger(WalkingManager.class.getName());
 	
diff --git a/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/instancemanager/ZoneManager.java b/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/instancemanager/ZoneManager.java
index b698f51a03..9a0bd870f2 100644
--- a/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/instancemanager/ZoneManager.java
+++ b/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/instancemanager/ZoneManager.java
@@ -26,6 +26,7 @@ import java.util.List;
 import java.util.Map;
 import java.util.Optional;
 import java.util.OptionalInt;
+import java.util.concurrent.ConcurrentHashMap;
 import java.util.logging.Level;
 import java.util.logging.Logger;
 
@@ -33,7 +34,7 @@ import org.w3c.dom.Document;
 import org.w3c.dom.NamedNodeMap;
 import org.w3c.dom.Node;
 
-import com.l2jmobius.commons.util.IGameXmlReader;
+import com.l2jmobius.commons.util.IXmlReader;
 import com.l2jmobius.gameserver.model.World;
 import com.l2jmobius.gameserver.model.WorldObject;
 import com.l2jmobius.gameserver.model.actor.Creature;
@@ -55,7 +56,7 @@ import com.l2jmobius.gameserver.model.zone.type.SpawnTerritory;
  * This class manages the zones
  * @author durgus
  */
-public final class ZoneManager implements IGameXmlReader
+public final class ZoneManager implements IXmlReader
 {
 	private static final Logger LOGGER = Logger.getLogger(ZoneManager.class.getName());
 	
@@ -65,9 +66,9 @@ public final class ZoneManager implements IGameXmlReader
 	private static final int OFFSET_X = Math.abs(World.MAP_MIN_X >> SHIFT_BY);
 	private static final int OFFSET_Y = Math.abs(World.MAP_MIN_Y >> SHIFT_BY);
 	
-	private final Map<Class<? extends ZoneType>, Map<Integer, ? extends ZoneType>> _classZones = new HashMap<>();
-	private final Map<String, SpawnTerritory> _spawnTerritories = new HashMap<>();
-	private int _lastDynamicId = 300000;
+	private final Map<Class<? extends ZoneType>, ConcurrentHashMap<Integer, ? extends ZoneType>> _classZones = new ConcurrentHashMap<>();
+	private final Map<String, SpawnTerritory> _spawnTerritories = new ConcurrentHashMap<>();
+	private volatile int _lastDynamicId = 300000;
 	private List<ItemInstance> _debugItems;
 	
 	private final ZoneRegion[][] _zoneRegions = new ZoneRegion[(World.MAP_MAX_X >> SHIFT_BY) + OFFSET_X + 1][(World.MAP_MAX_Y >> SHIFT_BY) + OFFSET_Y + 1];
@@ -365,7 +366,7 @@ public final class ZoneManager implements IGameXmlReader
 						}
 						if (checkId(zoneId))
 						{
-							LOGGER.config(getClass().getSimpleName() + ": Caution: Zone (" + zoneId + ") from file: " + f.getName() + " overrides previos definition.");
+							LOGGER.config(getClass().getSimpleName() + ": Caution: Zone (" + zoneId + ") from file: " + f.getName() + " overrides previuos definition.");
 						}
 						
 						if ((zoneName != null) && !zoneName.isEmpty())
@@ -453,10 +454,10 @@ public final class ZoneManager implements IGameXmlReader
 	@SuppressWarnings("unchecked")
 	private <T extends ZoneType> void addZone(Integer id, T zone)
 	{
-		Map<Integer, T> map = (Map<Integer, T>) _classZones.get(zone.getClass());
+		ConcurrentHashMap<Integer, T> map = (ConcurrentHashMap<Integer, T>) _classZones.get(zone.getClass());
 		if (map == null)
 		{
-			map = new HashMap<>();
+			map = new ConcurrentHashMap<>();
 			map.put(id, zone);
 			_classZones.put(zone.getClass(), map);
 		}
diff --git a/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/model/quest/LongTimeEvent.java b/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/model/quest/LongTimeEvent.java
index cc71991407..0fa020eb5d 100644
--- a/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/model/quest/LongTimeEvent.java
+++ b/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/model/quest/LongTimeEvent.java
@@ -32,7 +32,7 @@ import org.w3c.dom.Node;
 
 import com.l2jmobius.commons.concurrent.ThreadPool;
 import com.l2jmobius.commons.database.DatabaseFactory;
-import com.l2jmobius.commons.util.IGameXmlReader;
+import com.l2jmobius.commons.util.IXmlReader;
 import com.l2jmobius.gameserver.data.sql.impl.AnnouncementsTable;
 import com.l2jmobius.gameserver.data.xml.impl.NpcData;
 import com.l2jmobius.gameserver.datatables.EventDroplist;
@@ -117,7 +117,7 @@ public class LongTimeEvent extends Quest
 	 */
 	private void loadConfig()
 	{
-		new IGameXmlReader()
+		new IXmlReader()
 		{
 			@Override
 			public void load()
diff --git a/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/model/stats/BaseStats.java b/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/model/stats/BaseStats.java
index daba0d3071..64af7961e9 100644
--- a/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/model/stats/BaseStats.java
+++ b/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/model/stats/BaseStats.java
@@ -23,7 +23,6 @@ import java.util.logging.Logger;
 import org.w3c.dom.Document;
 import org.w3c.dom.NamedNodeMap;
 
-import com.l2jmobius.commons.util.IGameXmlReader;
 import com.l2jmobius.commons.util.IXmlReader;
 import com.l2jmobius.gameserver.model.actor.Creature;
 
@@ -105,7 +104,7 @@ public enum BaseStats
 	
 	static
 	{
-		new IGameXmlReader()
+		new IXmlReader()
 		{
 			final Logger LOGGER = Logger.getLogger(BaseStats.class.getName());
 			
diff --git a/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/scripting/ScriptEngineManager.java b/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/scripting/ScriptEngineManager.java
index 9eb6d85b69..95409c567a 100644
--- a/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/scripting/ScriptEngineManager.java
+++ b/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/scripting/ScriptEngineManager.java
@@ -28,8 +28,6 @@ import java.nio.file.attribute.BasicFileAttributes;
 import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.Iterator;
-import java.util.LinkedHashMap;
-import java.util.LinkedList;
 import java.util.List;
 import java.util.Map;
 import java.util.Map.Entry;
@@ -42,14 +40,14 @@ import java.util.logging.Logger;
 import org.w3c.dom.Document;
 
 import com.l2jmobius.Config;
-import com.l2jmobius.commons.util.IGameXmlReader;
+import com.l2jmobius.commons.util.IXmlReader;
 import com.l2jmobius.gameserver.scripting.java.JavaScriptingEngine;
 
 /**
  * Caches script engines and provides functionality for executing and managing scripts.
  * @author KenM, HorridoJoho
  */
-public final class ScriptEngineManager implements IGameXmlReader
+public final class ScriptEngineManager implements IXmlReader
 {
 	private static final Logger LOGGER = Logger.getLogger(ScriptEngineManager.class.getName());
 	public static final Path SCRIPT_FOLDER = Paths.get(Config.DATAPACK_ROOT.getAbsolutePath(), "data", "scripts");
@@ -59,8 +57,7 @@ public final class ScriptEngineManager implements IGameXmlReader
 	public static final Path CONDITION_HANDLER_FILE = Paths.get(SCRIPT_FOLDER.toString(), "handlers", "ConditionMasterHandler.java");
 	public static final Path ONE_DAY_REWARD_MASTER_HANDLER = Paths.get(SCRIPT_FOLDER.toString(), "handlers", "DailyMissionMasterHandler.java");
 	
-	private final Map<String, IExecutionContext> _extEngines = new HashMap<>();
-	private IExecutionContext _currentExecutionContext = null;
+	private IExecutionContext _javaExecutionContext = null;
 	static final List<String> _exclusions = new ArrayList<>();
 	
 	protected ScriptEngineManager()
@@ -166,12 +163,7 @@ public final class ScriptEngineManager implements IGameXmlReader
 	private void registerEngine(IScriptingEngine engine, Properties props)
 	{
 		maybeSetProperties("language." + engine.getLanguageName() + ".", props, engine);
-		final IExecutionContext context = engine.createExecutionContext();
-		for (String commonExtension : engine.getCommonFileExtensions())
-		{
-			_extEngines.put(commonExtension, context);
-		}
-		
+		_javaExecutionContext = engine.createExecutionContext();
 		LOGGER.info("ScriptEngine: " + engine.getEngineName() + " " + engine.getEngineVersion() + " (" + engine.getLanguageName() + " " + engine.getLanguageVersion() + ")");
 	}
 	
@@ -200,66 +192,6 @@ public final class ScriptEngineManager implements IGameXmlReader
 		}
 	}
 	
-	private IExecutionContext getEngineByExtension(String ext)
-	{
-		return _extEngines.get(ext);
-	}
-	
-	private String getFileExtension(Path p)
-	{
-		final String name = p.getFileName().toString();
-		final int lastDotIdx = name.lastIndexOf('.');
-		if (lastDotIdx == -1)
-		{
-			return null;
-		}
-		
-		final String extension = name.substring(lastDotIdx + 1);
-		if (extension.isEmpty())
-		{
-			return null;
-		}
-		
-		return extension;
-	}
-	
-	private void checkExistingFile(String messagePre, Path filePath) throws Exception
-	{
-		if (!Files.exists(filePath))
-		{
-			throw new Exception(messagePre + ": " + filePath + " does not exists!");
-		}
-		else if (!Files.isRegularFile(filePath))
-		{
-			throw new Exception(messagePre + ": " + filePath + " is not a file!");
-		}
-	}
-	
-	public void executeMasterHandler() throws Exception
-	{
-		executeScript(MASTER_HANDLER_FILE);
-	}
-	
-	public void executeEffectMasterHandler() throws Exception
-	{
-		executeScript(EFFECT_MASTER_HANDLER_FILE);
-	}
-	
-	public void executeSkillConditionMasterHandler() throws Exception
-	{
-		executeScript(SKILL_CONDITION_HANDLER_FILE);
-	}
-	
-	public void executeConditionMasterHandler() throws Exception
-	{
-		executeScript(CONDITION_HANDLER_FILE);
-	}
-	
-	public void executeDailyMissionMasterHandler() throws Exception
-	{
-		executeScript(ONE_DAY_REWARD_MASTER_HANDLER);
-	}
-	
 	public void executeScriptList() throws Exception
 	{
 		if (Config.ALT_DEV_NO_QUESTS)
@@ -267,77 +199,35 @@ public final class ScriptEngineManager implements IGameXmlReader
 			return;
 		}
 		
-		final Map<IExecutionContext, List<Path>> files = new LinkedHashMap<>();
+		final List<Path> files = new ArrayList<>();
 		processDirectory(SCRIPT_FOLDER.toFile(), files);
 		
-		for (Entry<IExecutionContext, List<Path>> entry : files.entrySet())
+		final Map<Path, Throwable> invokationErrors = _javaExecutionContext.executeScripts(files);
+		for (Entry<Path, Throwable> entry : invokationErrors.entrySet())
 		{
-			_currentExecutionContext = entry.getKey();
-			try
-			{
-				final Map<Path, Throwable> invokationErrors = entry.getKey().executeScripts(entry.getValue());
-				for (Entry<Path, Throwable> entry2 : invokationErrors.entrySet())
-				{
-					LOGGER.log(Level.WARNING, "ScriptEngine: " + entry2.getKey() + " failed execution!", entry2.getValue());
-				}
-			}
-			finally
-			{
-				_currentExecutionContext = null;
-			}
+			LOGGER.log(Level.WARNING, "ScriptEngine: " + entry.getKey() + " failed execution!", entry.getValue());
 		}
 	}
 	
-	private void processDirectory(File dir, Map<IExecutionContext, List<Path>> files)
+	private void processDirectory(File dir, List<Path> files)
 	{
 		for (File file : dir.listFiles())
 		{
-			if (file.isDirectory())
+			if (file.isFile())
+			{
+				final String fileName = file.getName();
+				if (fileName.endsWith(".java") && !_exclusions.contains(fileName))
+				{
+					files.add(file.toPath().toAbsolutePath());
+				}
+			}
+			else if (file.isDirectory())
 			{
 				processDirectory(file, files);
 			}
-			else
-			{
-				processFile(file, files);
-			}
 		}
 	}
 	
-	private void processFile(File file, Map<IExecutionContext, List<Path>> files)
-	{
-		if (_exclusions.contains(file.getName()))
-		{
-			return;
-		}
-		
-		Path sourceFile = file.toPath();
-		try
-		{
-			checkExistingFile("ScriptFile", sourceFile);
-		}
-		catch (Exception e)
-		{
-			LOGGER.warning(e.getMessage());
-			return;
-		}
-		
-		sourceFile = sourceFile.toAbsolutePath();
-		final String ext = getFileExtension(sourceFile);
-		if (ext == null)
-		{
-			LOGGER.warning("ScriptFile: " + sourceFile + " does not have an extension to determine the script engine!");
-			return;
-		}
-		
-		final IExecutionContext engine = getEngineByExtension(ext);
-		if (engine == null)
-		{
-			return;
-		}
-		
-		files.computeIfAbsent(engine, k -> new LinkedList<>()).add(sourceFile);
-	}
-	
 	public void executeScript(Path sourceFile) throws Exception
 	{
 		Objects.requireNonNull(sourceFile);
@@ -347,34 +237,19 @@ public final class ScriptEngineManager implements IGameXmlReader
 			sourceFile = SCRIPT_FOLDER.resolve(sourceFile);
 		}
 		
-		// throws exception if not exists or not file
-		checkExistingFile("ScriptFile", sourceFile);
-		
 		sourceFile = sourceFile.toAbsolutePath();
-		final String ext = getFileExtension(sourceFile);
 		Objects.requireNonNull(sourceFile, "ScriptFile: " + sourceFile + " does not have an extension to determine the script engine!");
 		
-		final IExecutionContext engine = getEngineByExtension(ext);
-		Objects.requireNonNull(engine, "ScriptEngine: No engine registered for extension " + ext + "!");
-		
-		_currentExecutionContext = engine;
-		try
+		final Entry<Path, Throwable> error = _javaExecutionContext.executeScript(sourceFile);
+		if (error != null)
 		{
-			final Entry<Path, Throwable> error = engine.executeScript(sourceFile);
-			if (error != null)
-			{
-				throw new Exception("ScriptEngine: " + error.getKey() + " failed execution!", error.getValue());
-			}
-		}
-		finally
-		{
-			_currentExecutionContext = null;
+			throw new Exception("ScriptEngine: " + error.getKey() + " failed execution!", error.getValue());
 		}
 	}
 	
 	public Path getCurrentLoadingScript()
 	{
-		return _currentExecutionContext != null ? _currentExecutionContext.getCurrentExecutingScript() : null;
+		return _javaExecutionContext.getCurrentExecutingScript();
 	}
 	
 	public static ScriptEngineManager getInstance()
diff --git a/L2J_Mobius_2.5_Underground/java/com/l2jmobius/loginserver/GameServerTable.java b/L2J_Mobius_2.5_Underground/java/com/l2jmobius/loginserver/GameServerTable.java
index 456224d78c..4269e47969 100644
--- a/L2J_Mobius_2.5_Underground/java/com/l2jmobius/loginserver/GameServerTable.java
+++ b/L2J_Mobius_2.5_Underground/java/com/l2jmobius/loginserver/GameServerTable.java
@@ -36,8 +36,8 @@ import org.w3c.dom.Document;
 import org.w3c.dom.NodeList;
 
 import com.l2jmobius.commons.database.DatabaseFactory;
-import com.l2jmobius.commons.util.IGameXmlReader;
 import com.l2jmobius.commons.util.IPSubnet;
+import com.l2jmobius.commons.util.IXmlReader;
 import com.l2jmobius.commons.util.Rnd;
 import com.l2jmobius.loginserver.network.gameserverpackets.ServerStatus;
 
@@ -45,7 +45,7 @@ import com.l2jmobius.loginserver.network.gameserverpackets.ServerStatus;
  * The Class GameServerTable loads the game server names and initialize the game server tables.
  * @author KenM, Zoey76
  */
-public final class GameServerTable implements IGameXmlReader
+public final class GameServerTable implements IXmlReader
 {
 	private static final Logger LOGGER = Logger.getLogger(GameServerTable.class.getName());
 	
diff --git a/L2J_Mobius_3.0_Helios/dist/game/config/Scripts.xml b/L2J_Mobius_3.0_Helios/dist/game/config/Scripts.xml
index 284aa0a31f..54d05b241f 100644
--- a/L2J_Mobius_3.0_Helios/dist/game/config/Scripts.xml
+++ b/L2J_Mobius_3.0_Helios/dist/game/config/Scripts.xml
@@ -2,11 +2,7 @@
 <list xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../data/xsd/Scripts.xsd">
 	<!-- Skip these filenames from script loading, because they are already loaded using a different way. -->
 	<exclude file="package-info.java" />
-	<exclude file="MasterHandler.java" />
-	<exclude file="EffectMasterHandler.java" />
-	<exclude file="SkillConditionMasterHandler.java" />
-	<exclude file="ConditionMasterHandler.java" />
-	<exclude file="DailyMissionMasterHandler.java" />
+	<exclude file="handlers" />
 	
 	<!--
 	With this file you can exclude/include specific folders/files from within the scripts directory.
diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/ai/areas/ImperialTomb/FourSepulchers/FourSepulchers.java b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/ai/areas/ImperialTomb/FourSepulchers/FourSepulchers.java
index 053e095ace..7a59593544 100644
--- a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/ai/areas/ImperialTomb/FourSepulchers/FourSepulchers.java
+++ b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/ai/areas/ImperialTomb/FourSepulchers/FourSepulchers.java
@@ -29,7 +29,7 @@ import org.w3c.dom.NamedNodeMap;
 import org.w3c.dom.Node;
 
 import com.l2jmobius.commons.concurrent.ThreadPool;
-import com.l2jmobius.commons.util.IGameXmlReader;
+import com.l2jmobius.commons.util.IXmlReader;
 import com.l2jmobius.gameserver.ai.CtrlIntention;
 import com.l2jmobius.gameserver.enums.ChatType;
 import com.l2jmobius.gameserver.geoengine.GeoEngine;
@@ -56,7 +56,7 @@ import quests.Q00620_FourGoblets.Q00620_FourGoblets;
  * Four Selpuchers AI
  * @author Mobius
  */
-public final class FourSepulchers extends AbstractNpcAI implements IGameXmlReader
+public final class FourSepulchers extends AbstractNpcAI implements IXmlReader
 {
 	Logger LOGGER = Logger.getLogger(FourSepulchers.class.getName());
 	
diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/ai/bosses/Tiat/Stage1.java b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/ai/bosses/Tiat/Stage1.java
index e1e54da1a8..1b350c946e 100644
--- a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/ai/bosses/Tiat/Stage1.java
+++ b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/ai/bosses/Tiat/Stage1.java
@@ -30,7 +30,7 @@ import org.w3c.dom.NamedNodeMap;
 import org.w3c.dom.Node;
 
 import com.l2jmobius.commons.util.CommonUtil;
-import com.l2jmobius.commons.util.IGameXmlReader;
+import com.l2jmobius.commons.util.IXmlReader;
 import com.l2jmobius.gameserver.ai.CtrlIntention;
 import com.l2jmobius.gameserver.enums.Movie;
 import com.l2jmobius.gameserver.enums.TrapAction;
@@ -66,7 +66,7 @@ import instances.AbstractInstance;
  * Please maintain consistency between the Seed scripts.
  * @author Gigiikun
  */
-public final class Stage1 extends AbstractInstance implements IGameXmlReader
+public final class Stage1 extends AbstractInstance implements IXmlReader
 {
 	Logger LOGGER = Logger.getLogger(Stage1.class.getName());
 	
diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/ai/others/ClassMaster/ClassMaster.java b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/ai/others/ClassMaster/ClassMaster.java
index 63269e6e27..1abb859d66 100644
--- a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/ai/others/ClassMaster/ClassMaster.java
+++ b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/ai/others/ClassMaster/ClassMaster.java
@@ -30,7 +30,7 @@ import org.w3c.dom.NamedNodeMap;
 import org.w3c.dom.Node;
 
 import com.l2jmobius.Config;
-import com.l2jmobius.commons.util.IGameXmlReader;
+import com.l2jmobius.commons.util.IXmlReader;
 import com.l2jmobius.gameserver.data.xml.impl.CategoryData;
 import com.l2jmobius.gameserver.data.xml.impl.ClassListData;
 import com.l2jmobius.gameserver.data.xml.impl.SkillData;
@@ -63,7 +63,7 @@ import ai.AbstractNpcAI;
  * Class Master AI.
  * @author Nik
  */
-public final class ClassMaster extends AbstractNpcAI implements IGameXmlReader
+public final class ClassMaster extends AbstractNpcAI implements IXmlReader
 {
 	// NPCs
 	private static final List<Integer> CLASS_MASTERS = new ArrayList<>();
diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/ai/others/MentorGuide/MentorGuide.java b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/ai/others/MentorGuide/MentorGuide.java
index ce6e3bd57b..eeb6b34418 100644
--- a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/ai/others/MentorGuide/MentorGuide.java
+++ b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/ai/others/MentorGuide/MentorGuide.java
@@ -26,7 +26,7 @@ import org.w3c.dom.Document;
 import org.w3c.dom.Node;
 
 import com.l2jmobius.Config;
-import com.l2jmobius.commons.util.IGameXmlReader;
+import com.l2jmobius.commons.util.IXmlReader;
 import com.l2jmobius.gameserver.enums.CategoryType;
 import com.l2jmobius.gameserver.enums.MailType;
 import com.l2jmobius.gameserver.instancemanager.MailManager;
@@ -62,7 +62,7 @@ import ai.AbstractNpcAI;
  * Mentor Guide AI.
  * @author Gnacik, UnAfraid
  */
-public final class MentorGuide extends AbstractNpcAI implements IGameXmlReader
+public final class MentorGuide extends AbstractNpcAI implements IXmlReader
 {
 	private static final Logger LOGGER = Logger.getLogger(MentorGuide.class.getName());
 	
diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/ai/others/NpcBuffers/NpcBuffersData.java b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/ai/others/NpcBuffers/NpcBuffersData.java
index b0287e1df6..51708af4f8 100644
--- a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/ai/others/NpcBuffers/NpcBuffersData.java
+++ b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/ai/others/NpcBuffers/NpcBuffersData.java
@@ -27,13 +27,13 @@ import org.w3c.dom.Document;
 import org.w3c.dom.NamedNodeMap;
 import org.w3c.dom.Node;
 
-import com.l2jmobius.commons.util.IGameXmlReader;
+import com.l2jmobius.commons.util.IXmlReader;
 import com.l2jmobius.gameserver.model.StatsSet;
 
 /**
  * @author UnAfraid
  */
-class NpcBuffersData implements IGameXmlReader
+class NpcBuffersData implements IXmlReader
 {
 	private static final Logger LOGGER = Logger.getLogger(NpcBuffersData.class.getName());
 	
diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/admincommandhandlers/AdminQuest.java b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/admincommandhandlers/AdminQuest.java
index 228cc1668d..a771c4ab90 100644
--- a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/admincommandhandlers/AdminQuest.java
+++ b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/admincommandhandlers/AdminQuest.java
@@ -320,7 +320,7 @@ public class AdminQuest implements IAdminCommandHandler
 				{
 					sb.append("<a action=\"bypass -h admin_script_dir " + c + "\">" + c + "</a><br1>");
 				}
-				else if (c.endsWith(".java") || c.endsWith(".py"))
+				else if (c.endsWith(".java"))
 				{
 					sb.append("<a action=\"bypass -h admin_script_load " + c + "\"><font color=\"LEVEL\">" + c + "</font></a><br1>");
 				}
@@ -352,7 +352,7 @@ public class AdminQuest implements IAdminCommandHandler
 				{
 					sb.append("<a action=\"bypass -h admin_script_dir " + currentPath + "/" + c + "\">" + (questReducedNames ? getQuestName(c) : c) + "</a><br1>");
 				}
-				else if (c.endsWith(".java") || c.endsWith(".py"))
+				else if (c.endsWith(".java"))
 				{
 					sb.append("<a action=\"bypass -h admin_script_load " + currentPath + "/" + c + "\"><font color=\"LEVEL\">" + c + "</font></a><br1>");
 				}
diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/admincommandhandlers/AdminReload.java b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/admincommandhandlers/AdminReload.java
index 89a082fffa..bbcc2e4744 100644
--- a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/admincommandhandlers/AdminReload.java
+++ b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/admincommandhandlers/AdminReload.java
@@ -222,7 +222,7 @@ public class AdminReload implements IAdminCommandHandler
 				{
 					try
 					{
-						ScriptEngineManager.getInstance().executeEffectMasterHandler();
+						ScriptEngineManager.getInstance().executeScript(ScriptEngineManager.EFFECT_MASTER_HANDLER_FILE);
 						AdminData.getInstance().broadcastMessageToGMs(activeChar.getName() + ": Reloaded effect master handler.");
 					}
 					catch (Exception e)
@@ -236,7 +236,7 @@ public class AdminReload implements IAdminCommandHandler
 				{
 					try
 					{
-						ScriptEngineManager.getInstance().executeMasterHandler();
+						ScriptEngineManager.getInstance().executeScript(ScriptEngineManager.MASTER_HANDLER_FILE);
 						AdminData.getInstance().broadcastMessageToGMs(activeChar.getName() + ": Reloaded master handler.");
 					}
 					catch (Exception e)
diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/telnethandlers/server/Reload.java b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/telnethandlers/server/Reload.java
index c47b82561d..90c21b1624 100644
--- a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/telnethandlers/server/Reload.java
+++ b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/telnethandlers/server/Reload.java
@@ -182,7 +182,7 @@ public class Reload implements ITelnetCommand
 			{
 				try
 				{
-					ScriptEngineManager.getInstance().executeEffectMasterHandler();
+					ScriptEngineManager.getInstance().executeScript(ScriptEngineManager.EFFECT_MASTER_HANDLER_FILE);
 					return AdminData.getInstance().broadcastMessageToGMs("Telnet Admin: Reloaded effect master handler.");
 				}
 				catch (Exception e)
@@ -195,7 +195,7 @@ public class Reload implements ITelnetCommand
 			{
 				try
 				{
-					ScriptEngineManager.getInstance().executeMasterHandler();
+					ScriptEngineManager.getInstance().executeScript(ScriptEngineManager.MASTER_HANDLER_FILE);
 					return AdminData.getInstance().broadcastMessageToGMs("Telnet Admin: Reloaded master handler.");
 				}
 				catch (Exception e)
diff --git a/L2J_Mobius_3.0_Helios/java/com/l2jmobius/Config.java b/L2J_Mobius_3.0_Helios/java/com/l2jmobius/Config.java
index 38401022e9..4c846c4376 100644
--- a/L2J_Mobius_3.0_Helios/java/com/l2jmobius/Config.java
+++ b/L2J_Mobius_3.0_Helios/java/com/l2jmobius/Config.java
@@ -54,7 +54,7 @@ import org.w3c.dom.Document;
 import org.w3c.dom.NamedNodeMap;
 import org.w3c.dom.Node;
 
-import com.l2jmobius.commons.util.IGameXmlReader;
+import com.l2jmobius.commons.util.IXmlReader;
 import com.l2jmobius.commons.util.PropertiesParser;
 import com.l2jmobius.commons.util.StringUtil;
 import com.l2jmobius.gameserver.enums.ChatType;
@@ -3129,7 +3129,7 @@ public final class Config
 		return result;
 	}
 	
-	private static class IPConfigData implements IGameXmlReader
+	private static class IPConfigData implements IXmlReader
 	{
 		private static final List<String> _subnets = new ArrayList<>(5);
 		private static final List<String> _hosts = new ArrayList<>(5);
diff --git a/L2J_Mobius_3.0_Helios/java/com/l2jmobius/commons/util/IGameXmlReader.java b/L2J_Mobius_3.0_Helios/java/com/l2jmobius/commons/util/IGameXmlReader.java
deleted file mode 100644
index b29089db77..0000000000
--- a/L2J_Mobius_3.0_Helios/java/com/l2jmobius/commons/util/IGameXmlReader.java
+++ /dev/null
@@ -1,118 +0,0 @@
-/*
- * This file is part of the L2J Mobius project.
- * 
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- * 
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * General Public License for more details.
- * 
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- */
-package com.l2jmobius.commons.util;
-
-import java.io.File;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
-import org.w3c.dom.NamedNodeMap;
-import org.w3c.dom.Node;
-
-import com.l2jmobius.Config;
-import com.l2jmobius.gameserver.model.Location;
-import com.l2jmobius.gameserver.model.holders.MinionHolder;
-import com.l2jmobius.gameserver.model.holders.SkillHolder;
-
-/**
- * Interface for XML parsers.
- * @author Zoey76
- */
-public interface IGameXmlReader extends IXmlReader
-{
-	/**
-	 * Wrapper for {@link #parseFile(File)} method.
-	 * @param path the relative path to the datapack root of the XML file to parse.
-	 */
-	default void parseDatapackFile(String path)
-	{
-		parseFile(new File(Config.DATAPACK_ROOT, path));
-	}
-	
-	/**
-	 * Wrapper for {@link #parseDirectory(File, boolean)}.
-	 * @param path the path to the directory where the XML files are
-	 * @param recursive parses all sub folders if there is
-	 * @return {@code false} if it fails to find the directory, {@code true} otherwise
-	 */
-	default boolean parseDatapackDirectory(String path, boolean recursive)
-	{
-		return parseDirectory(new File(Config.DATAPACK_ROOT, path), recursive);
-	}
-	
-	/**
-	 * @param n
-	 * @return a map of parameters
-	 */
-	default Map<String, Object> parseParameters(Node n)
-	{
-		final Map<String, Object> parameters = new HashMap<>();
-		for (Node parameters_node = n.getFirstChild(); parameters_node != null; parameters_node = parameters_node.getNextSibling())
-		{
-			NamedNodeMap attrs = parameters_node.getAttributes();
-			switch (parameters_node.getNodeName().toLowerCase())
-			{
-				case "param":
-				{
-					parameters.put(parseString(attrs, "name"), parseString(attrs, "value"));
-					break;
-				}
-				case "skill":
-				{
-					parameters.put(parseString(attrs, "name"), new SkillHolder(parseInteger(attrs, "id"), parseInteger(attrs, "level")));
-					break;
-				}
-				case "location":
-				{
-					parameters.put(parseString(attrs, "name"), new Location(parseInteger(attrs, "x"), parseInteger(attrs, "y"), parseInteger(attrs, "z"), parseInteger(attrs, "heading", 0)));
-					break;
-				}
-				case "minions":
-				{
-					final List<MinionHolder> minions = new ArrayList<>(1);
-					for (Node minions_node = parameters_node.getFirstChild(); minions_node != null; minions_node = minions_node.getNextSibling())
-					{
-						if (minions_node.getNodeName().equalsIgnoreCase("npc"))
-						{
-							attrs = minions_node.getAttributes();
-							minions.add(new MinionHolder(parseInteger(attrs, "id"), parseInteger(attrs, "count"), parseInteger(attrs, "respawnTime"), parseInteger(attrs, "weightPoint")));
-						}
-					}
-					
-					if (!minions.isEmpty())
-					{
-						parameters.put(parseString(parameters_node.getAttributes(), "name"), minions);
-					}
-					break;
-				}
-			}
-		}
-		return parameters;
-	}
-	
-	default Location parseLocation(Node n)
-	{
-		final NamedNodeMap attrs = n.getAttributes();
-		final int x = parseInteger(attrs, "x");
-		final int y = parseInteger(attrs, "y");
-		final int z = parseInteger(attrs, "z");
-		final int heading = parseInteger(attrs, "heading", 0);
-		return new Location(x, y, z, heading);
-	}
-}
diff --git a/L2J_Mobius_3.0_Helios/java/com/l2jmobius/commons/util/IXmlReader.java b/L2J_Mobius_3.0_Helios/java/com/l2jmobius/commons/util/IXmlReader.java
index 0317816fd8..4bfed2396e 100644
--- a/L2J_Mobius_3.0_Helios/java/com/l2jmobius/commons/util/IXmlReader.java
+++ b/L2J_Mobius_3.0_Helios/java/com/l2jmobius/commons/util/IXmlReader.java
@@ -18,8 +18,13 @@ package com.l2jmobius.commons.util;
 
 import java.io.File;
 import java.io.FileFilter;
+import java.util.ArrayList;
+import java.util.HashMap;
 import java.util.LinkedHashMap;
+import java.util.List;
 import java.util.Map;
+import java.util.concurrent.CopyOnWriteArrayList;
+import java.util.concurrent.ScheduledFuture;
 import java.util.function.Consumer;
 import java.util.function.Predicate;
 import java.util.logging.Level;
@@ -35,7 +40,12 @@ import org.w3c.dom.NodeList;
 import org.xml.sax.ErrorHandler;
 import org.xml.sax.SAXParseException;
 
+import com.l2jmobius.Config;
+import com.l2jmobius.commons.concurrent.ThreadPool;
 import com.l2jmobius.commons.util.file.filter.XMLFilter;
+import com.l2jmobius.gameserver.model.Location;
+import com.l2jmobius.gameserver.model.holders.MinionHolder;
+import com.l2jmobius.gameserver.model.holders.SkillHolder;
 
 /**
  * Interface for XML parsers.
@@ -56,6 +66,15 @@ public interface IXmlReader
 	 */
 	void load();
 	
+	/**
+	 * Wrapper for {@link #parseFile(File)} method.
+	 * @param path the relative path to the datapack root of the XML file to parse.
+	 */
+	default void parseDatapackFile(String path)
+	{
+		parseFile(new File(Config.DATAPACK_ROOT, path));
+	}
+	
 	/**
 	 * Parses a single XML file.<br>
 	 * If the file was successfully parsed, call {@link #parseDocument(Document, File)} for the parsed document.<br>
@@ -121,6 +140,17 @@ public interface IXmlReader
 		return parseDirectory(file, false);
 	}
 	
+	/**
+	 * Wrapper for {@link #parseDirectory(File, boolean)}.
+	 * @param path the path to the directory where the XML files are
+	 * @param recursive parses all sub folders if there is
+	 * @return {@code false} if it fails to find the directory, {@code true} otherwise
+	 */
+	default boolean parseDatapackDirectory(String path, boolean recursive)
+	{
+		return parseDirectory(new File(Config.DATAPACK_ROOT, path), recursive);
+	}
+	
 	/**
 	 * Loads all XML files from {@code path} and calls {@link #parseFile(File)} for each one of them.
 	 * @param dir the directory object to scan.
@@ -135,6 +165,7 @@ public interface IXmlReader
 			return false;
 		}
 		
+		final List<ScheduledFuture<?>> jobs = new CopyOnWriteArrayList<>();
 		final File[] listOfFiles = dir.listFiles();
 		for (File f : listOfFiles)
 		{
@@ -144,9 +175,23 @@ public interface IXmlReader
 			}
 			else if (getCurrentFileFilter().accept(f))
 			{
-				parseFile(f);
+				jobs.add(ThreadPool.schedule(() ->
+				{
+					parseFile(f);
+				}, 0));
 			}
 		}
+		while (!jobs.isEmpty())
+		{
+			for (ScheduledFuture<?> job : jobs)
+			{
+				if ((job == null) || job.isDone() || job.isCancelled())
+				{
+					jobs.remove(job);
+				}
+			}
+		}
+		
 		return true;
 	}
 	
@@ -531,6 +576,16 @@ public interface IXmlReader
 		return parseString(attrs.getNamedItem(name), defaultValue);
 	}
 	
+	default Location parseLocation(Node n)
+	{
+		final NamedNodeMap attrs = n.getAttributes();
+		final int x = parseInteger(attrs, "x");
+		final int y = parseInteger(attrs, "y");
+		final int z = parseInteger(attrs, "z");
+		final int heading = parseInteger(attrs, "heading", 0);
+		return new Location(x, y, z, heading);
+	}
+	
 	/**
 	 * Parses an enumerated value.
 	 * @param <T> the enumerated type
@@ -612,6 +667,56 @@ public interface IXmlReader
 		return map;
 	}
 	
+	/**
+	 * @param n
+	 * @return a map of parameters
+	 */
+	default Map<String, Object> parseParameters(Node n)
+	{
+		final Map<String, Object> parameters = new HashMap<>();
+		for (Node parameters_node = n.getFirstChild(); parameters_node != null; parameters_node = parameters_node.getNextSibling())
+		{
+			NamedNodeMap attrs = parameters_node.getAttributes();
+			switch (parameters_node.getNodeName().toLowerCase())
+			{
+				case "param":
+				{
+					parameters.put(parseString(attrs, "name"), parseString(attrs, "value"));
+					break;
+				}
+				case "skill":
+				{
+					parameters.put(parseString(attrs, "name"), new SkillHolder(parseInteger(attrs, "id"), parseInteger(attrs, "level")));
+					break;
+				}
+				case "location":
+				{
+					parameters.put(parseString(attrs, "name"), new Location(parseInteger(attrs, "x"), parseInteger(attrs, "y"), parseInteger(attrs, "z"), parseInteger(attrs, "heading", 0)));
+					break;
+				}
+				case "minions":
+				{
+					final List<MinionHolder> minions = new ArrayList<>(1);
+					for (Node minions_node = parameters_node.getFirstChild(); minions_node != null; minions_node = minions_node.getNextSibling())
+					{
+						if (minions_node.getNodeName().equalsIgnoreCase("npc"))
+						{
+							attrs = minions_node.getAttributes();
+							minions.add(new MinionHolder(parseInteger(attrs, "id"), parseInteger(attrs, "count"), parseInteger(attrs, "respawnTime"), parseInteger(attrs, "weightPoint")));
+						}
+					}
+					
+					if (!minions.isEmpty())
+					{
+						parameters.put(parseString(parameters_node.getAttributes(), "name"), minions);
+					}
+					break;
+				}
+			}
+		}
+		return parameters;
+	}
+	
 	/**
 	 * Executes action for each child of node
 	 * @param node
diff --git a/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/GameServer.java b/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/GameServer.java
index de4303b82a..7e5daf34af 100644
--- a/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/GameServer.java
+++ b/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/GameServer.java
@@ -362,7 +362,7 @@ public class GameServer
 		try
 		{
 			LOGGER.info(getClass().getSimpleName() + ": Loading server scripts:");
-			ScriptEngineManager.getInstance().executeMasterHandler();
+			ScriptEngineManager.getInstance().executeScript(ScriptEngineManager.MASTER_HANDLER_FILE);
 			ScriptEngineManager.getInstance().executeScriptList();
 		}
 		catch (Exception e)
diff --git a/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/data/xml/impl/AbilityPointsData.java b/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/data/xml/impl/AbilityPointsData.java
index a8d5526d01..e26e8e2b53 100644
--- a/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/data/xml/impl/AbilityPointsData.java
+++ b/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/data/xml/impl/AbilityPointsData.java
@@ -25,13 +25,13 @@ import org.w3c.dom.Document;
 import org.w3c.dom.NamedNodeMap;
 import org.w3c.dom.Node;
 
-import com.l2jmobius.commons.util.IGameXmlReader;
+import com.l2jmobius.commons.util.IXmlReader;
 import com.l2jmobius.gameserver.model.holders.RangeAbilityPointsHolder;
 
 /**
  * @author UnAfraid
  */
-public final class AbilityPointsData implements IGameXmlReader
+public final class AbilityPointsData implements IXmlReader
 {
 	private static final Logger LOGGER = Logger.getLogger(AbilityPointsData.class.getName());
 	private final List<RangeAbilityPointsHolder> _points = new ArrayList<>();
diff --git a/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/data/xml/impl/ActionData.java b/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/data/xml/impl/ActionData.java
index 0bffdc5bb1..a322dad1d9 100644
--- a/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/data/xml/impl/ActionData.java
+++ b/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/data/xml/impl/ActionData.java
@@ -23,14 +23,14 @@ import java.util.logging.Logger;
 
 import org.w3c.dom.Document;
 
-import com.l2jmobius.commons.util.IGameXmlReader;
+import com.l2jmobius.commons.util.IXmlReader;
 import com.l2jmobius.gameserver.model.ActionDataHolder;
 import com.l2jmobius.gameserver.model.StatsSet;
 
 /**
  * @author UnAfraid
  */
-public class ActionData implements IGameXmlReader
+public class ActionData implements IXmlReader
 {
 	private static final Logger LOGGER = Logger.getLogger(ActionData.class.getName());
 	
diff --git a/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/data/xml/impl/AdminData.java b/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/data/xml/impl/AdminData.java
index 0b1d3e3245..9e359b1521 100644
--- a/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/data/xml/impl/AdminData.java
+++ b/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/data/xml/impl/AdminData.java
@@ -29,7 +29,7 @@ import org.w3c.dom.Document;
 import org.w3c.dom.NamedNodeMap;
 import org.w3c.dom.Node;
 
-import com.l2jmobius.commons.util.IGameXmlReader;
+import com.l2jmobius.commons.util.IXmlReader;
 import com.l2jmobius.gameserver.model.AccessLevel;
 import com.l2jmobius.gameserver.model.AdminCommandAccessRight;
 import com.l2jmobius.gameserver.model.StatsSet;
@@ -42,7 +42,7 @@ import com.l2jmobius.gameserver.network.serverpackets.SystemMessage;
  * Loads administrator access levels and commands.
  * @author UnAfraid
  */
-public final class AdminData implements IGameXmlReader
+public final class AdminData implements IXmlReader
 {
 	private static final Logger LOGGER = Logger.getLogger(AdminData.class.getName());
 	
diff --git a/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/data/xml/impl/AlchemyData.java b/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/data/xml/impl/AlchemyData.java
index a5d8153b82..76f7eb98b5 100644
--- a/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/data/xml/impl/AlchemyData.java
+++ b/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/data/xml/impl/AlchemyData.java
@@ -25,7 +25,7 @@ import org.w3c.dom.Document;
 import org.w3c.dom.NamedNodeMap;
 import org.w3c.dom.Node;
 
-import com.l2jmobius.commons.util.IGameXmlReader;
+import com.l2jmobius.commons.util.IXmlReader;
 import com.l2jmobius.gameserver.model.StatsSet;
 import com.l2jmobius.gameserver.model.alchemy.AlchemyCraftData;
 import com.l2jmobius.gameserver.model.holders.ItemHolder;
@@ -33,7 +33,7 @@ import com.l2jmobius.gameserver.model.holders.ItemHolder;
 /**
  * @author Sdw
  */
-public class AlchemyData implements IGameXmlReader
+public class AlchemyData implements IXmlReader
 {
 	private static final Logger LOGGER = Logger.getLogger(AlchemyData.class.getName());
 	
diff --git a/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/data/xml/impl/AppearanceItemData.java b/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/data/xml/impl/AppearanceItemData.java
index f7746d073d..468f35ffce 100644
--- a/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/data/xml/impl/AppearanceItemData.java
+++ b/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/data/xml/impl/AppearanceItemData.java
@@ -24,7 +24,7 @@ import java.util.logging.Logger;
 import org.w3c.dom.Document;
 import org.w3c.dom.Node;
 
-import com.l2jmobius.commons.util.IGameXmlReader;
+import com.l2jmobius.commons.util.IXmlReader;
 import com.l2jmobius.gameserver.datatables.ItemTable;
 import com.l2jmobius.gameserver.enums.Race;
 import com.l2jmobius.gameserver.model.StatsSet;
@@ -36,7 +36,7 @@ import com.l2jmobius.gameserver.model.items.type.CrystalType;
 /**
  * @author UnAfraid
  */
-public class AppearanceItemData implements IGameXmlReader
+public class AppearanceItemData implements IXmlReader
 {
 	private static final Logger LOGGER = Logger.getLogger(AppearanceItemData.class.getName());
 	
diff --git a/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/data/xml/impl/ArmorSetsData.java b/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/data/xml/impl/ArmorSetsData.java
index 0f1445c10a..d7582d8d5a 100644
--- a/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/data/xml/impl/ArmorSetsData.java
+++ b/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/data/xml/impl/ArmorSetsData.java
@@ -19,9 +19,9 @@ package com.l2jmobius.gameserver.data.xml.impl;
 import java.io.File;
 import java.util.ArrayList;
 import java.util.Collections;
-import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
+import java.util.concurrent.ConcurrentHashMap;
 import java.util.logging.Logger;
 import java.util.stream.Stream;
 
@@ -29,7 +29,7 @@ import org.w3c.dom.Document;
 import org.w3c.dom.NamedNodeMap;
 import org.w3c.dom.Node;
 
-import com.l2jmobius.commons.util.IGameXmlReader;
+import com.l2jmobius.commons.util.IXmlReader;
 import com.l2jmobius.gameserver.datatables.ItemTable;
 import com.l2jmobius.gameserver.model.ArmorSet;
 import com.l2jmobius.gameserver.model.holders.ArmorsetSkillHolder;
@@ -40,12 +40,12 @@ import com.l2jmobius.gameserver.model.stats.BaseStats;
  * Loads armor set bonuses.
  * @author godson, Luno, UnAfraid
  */
-public final class ArmorSetsData implements IGameXmlReader
+public final class ArmorSetsData implements IXmlReader
 {
 	private static final Logger LOGGER = Logger.getLogger(ArmorSetsData.class.getName());
 	
-	private final Map<Integer, ArmorSet> _armorSets = new HashMap<>();
-	private final Map<Integer, List<ArmorSet>> _armorSetItems = new HashMap<>();
+	private final Map<Integer, ArmorSet> _armorSets = new ConcurrentHashMap<>();
+	private final Map<Integer, List<ArmorSet>> _armorSetItems = new ConcurrentHashMap<>();
 	
 	protected ArmorSetsData()
 	{
diff --git a/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/data/xml/impl/AttendanceRewardData.java b/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/data/xml/impl/AttendanceRewardData.java
index c60afbd78a..24e402e706 100644
--- a/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/data/xml/impl/AttendanceRewardData.java
+++ b/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/data/xml/impl/AttendanceRewardData.java
@@ -24,7 +24,7 @@ import java.util.logging.Logger;
 import org.w3c.dom.Document;
 
 import com.l2jmobius.Config;
-import com.l2jmobius.commons.util.IGameXmlReader;
+import com.l2jmobius.commons.util.IXmlReader;
 import com.l2jmobius.gameserver.datatables.ItemTable;
 import com.l2jmobius.gameserver.model.StatsSet;
 import com.l2jmobius.gameserver.model.holders.ItemHolder;
@@ -32,7 +32,7 @@ import com.l2jmobius.gameserver.model.holders.ItemHolder;
 /**
  * @author Mobius
  */
-public class AttendanceRewardData implements IGameXmlReader
+public class AttendanceRewardData implements IXmlReader
 {
 	private static Logger LOGGER = Logger.getLogger(AttendanceRewardData.class.getName());
 	private final List<ItemHolder> _rewards = new ArrayList<>();
diff --git a/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/data/xml/impl/BeautyShopData.java b/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/data/xml/impl/BeautyShopData.java
index 133f11d978..d88ccc7747 100644
--- a/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/data/xml/impl/BeautyShopData.java
+++ b/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/data/xml/impl/BeautyShopData.java
@@ -24,7 +24,7 @@ import org.w3c.dom.Document;
 import org.w3c.dom.NamedNodeMap;
 import org.w3c.dom.Node;
 
-import com.l2jmobius.commons.util.IGameXmlReader;
+import com.l2jmobius.commons.util.IXmlReader;
 import com.l2jmobius.gameserver.enums.Race;
 import com.l2jmobius.gameserver.enums.Sex;
 import com.l2jmobius.gameserver.model.StatsSet;
@@ -34,7 +34,7 @@ import com.l2jmobius.gameserver.model.beautyshop.BeautyItem;
 /**
  * @author Sdw
  */
-public final class BeautyShopData implements IGameXmlReader
+public final class BeautyShopData implements IXmlReader
 {
 	private final Map<Race, Map<Sex, BeautyData>> _beautyList = new HashMap<>();
 	private final Map<Sex, BeautyData> _beautyData = new HashMap<>();
diff --git a/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/data/xml/impl/BuyListData.java b/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/data/xml/impl/BuyListData.java
index de298ef358..8ab9ea8097 100644
--- a/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/data/xml/impl/BuyListData.java
+++ b/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/data/xml/impl/BuyListData.java
@@ -21,8 +21,8 @@ import java.io.FileFilter;
 import java.sql.Connection;
 import java.sql.ResultSet;
 import java.sql.Statement;
-import java.util.HashMap;
 import java.util.Map;
+import java.util.concurrent.ConcurrentHashMap;
 import java.util.logging.Level;
 import java.util.logging.Logger;
 
@@ -31,7 +31,7 @@ import org.w3c.dom.NamedNodeMap;
 
 import com.l2jmobius.Config;
 import com.l2jmobius.commons.database.DatabaseFactory;
-import com.l2jmobius.commons.util.IGameXmlReader;
+import com.l2jmobius.commons.util.IXmlReader;
 import com.l2jmobius.commons.util.file.filter.NumericNameFilter;
 import com.l2jmobius.gameserver.datatables.ItemTable;
 import com.l2jmobius.gameserver.model.buylist.Product;
@@ -42,11 +42,11 @@ import com.l2jmobius.gameserver.model.items.Item;
  * Loads buy lists for NPCs.
  * @author NosBit
  */
-public final class BuyListData implements IGameXmlReader
+public final class BuyListData implements IXmlReader
 {
 	private static final Logger LOGGER = Logger.getLogger(BuyListData.class.getName());
 	
-	private final Map<Integer, ProductList> _buyLists = new HashMap<>();
+	private final Map<Integer, ProductList> _buyLists = new ConcurrentHashMap<>();
 	private static final FileFilter NUMERIC_FILTER = new NumericNameFilter();
 	
 	protected BuyListData()
diff --git a/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/data/xml/impl/CastleData.java b/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/data/xml/impl/CastleData.java
index 6618dcdf1d..792afbfa0b 100644
--- a/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/data/xml/impl/CastleData.java
+++ b/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/data/xml/impl/CastleData.java
@@ -19,16 +19,16 @@ package com.l2jmobius.gameserver.data.xml.impl;
 import java.io.File;
 import java.util.ArrayList;
 import java.util.Collections;
-import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
+import java.util.concurrent.ConcurrentHashMap;
 import java.util.stream.Collectors;
 
 import org.w3c.dom.Document;
 import org.w3c.dom.NamedNodeMap;
 import org.w3c.dom.Node;
 
-import com.l2jmobius.commons.util.IGameXmlReader;
+import com.l2jmobius.commons.util.IXmlReader;
 import com.l2jmobius.gameserver.enums.CastleSide;
 import com.l2jmobius.gameserver.enums.SiegeGuardType;
 import com.l2jmobius.gameserver.model.holders.CastleSpawnHolder;
@@ -37,10 +37,10 @@ import com.l2jmobius.gameserver.model.holders.SiegeGuardHolder;
 /**
  * @author St3eT
  */
-public final class CastleData implements IGameXmlReader
+public final class CastleData implements IXmlReader
 {
-	private final Map<Integer, List<CastleSpawnHolder>> _spawns = new HashMap<>();
-	private static final Map<Integer, List<SiegeGuardHolder>> _siegeGuards = new HashMap<>();
+	private final Map<Integer, List<CastleSpawnHolder>> _spawns = new ConcurrentHashMap<>();
+	private static final Map<Integer, List<SiegeGuardHolder>> _siegeGuards = new ConcurrentHashMap<>();
 	
 	protected CastleData()
 	{
diff --git a/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/data/xml/impl/CategoryData.java b/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/data/xml/impl/CategoryData.java
index f851aa6703..df7d390dfb 100644
--- a/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/data/xml/impl/CategoryData.java
+++ b/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/data/xml/impl/CategoryData.java
@@ -27,14 +27,14 @@ import org.w3c.dom.Document;
 import org.w3c.dom.NamedNodeMap;
 import org.w3c.dom.Node;
 
-import com.l2jmobius.commons.util.IGameXmlReader;
+import com.l2jmobius.commons.util.IXmlReader;
 import com.l2jmobius.gameserver.enums.CategoryType;
 
 /**
  * Loads the category data with Class or NPC IDs.
  * @author NosBit, xban1x
  */
-public final class CategoryData implements IGameXmlReader
+public final class CategoryData implements IXmlReader
 {
 	private static final Logger LOGGER = Logger.getLogger(CategoryData.class.getName());
 	
diff --git a/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/data/xml/impl/ClanHallData.java b/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/data/xml/impl/ClanHallData.java
index 511cc7f4f7..90a1a51029 100644
--- a/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/data/xml/impl/ClanHallData.java
+++ b/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/data/xml/impl/ClanHallData.java
@@ -20,9 +20,9 @@ import java.io.File;
 import java.util.ArrayList;
 import java.util.Collection;
 import java.util.Comparator;
-import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
+import java.util.concurrent.ConcurrentHashMap;
 import java.util.logging.Logger;
 import java.util.stream.Collectors;
 
@@ -30,7 +30,7 @@ import org.w3c.dom.Document;
 import org.w3c.dom.NamedNodeMap;
 import org.w3c.dom.Node;
 
-import com.l2jmobius.commons.util.IGameXmlReader;
+import com.l2jmobius.commons.util.IXmlReader;
 import com.l2jmobius.gameserver.enums.ClanHallGrade;
 import com.l2jmobius.gameserver.enums.ClanHallType;
 import com.l2jmobius.gameserver.model.Location;
@@ -43,10 +43,10 @@ import com.l2jmobius.gameserver.model.holders.ClanHallTeleportHolder;
 /**
  * @author St3eT
  */
-public final class ClanHallData implements IGameXmlReader
+public final class ClanHallData implements IXmlReader
 {
 	private static final Logger LOGGER = Logger.getLogger(ClanHallData.class.getName());
-	private static final Map<Integer, ClanHall> _clanHalls = new HashMap<>();
+	private static final Map<Integer, ClanHall> _clanHalls = new ConcurrentHashMap<>();
 	
 	protected ClanHallData()
 	{
diff --git a/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/data/xml/impl/ClanRewardData.java b/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/data/xml/impl/ClanRewardData.java
index 252bba1c64..d5938ee964 100644
--- a/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/data/xml/impl/ClanRewardData.java
+++ b/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/data/xml/impl/ClanRewardData.java
@@ -28,7 +28,6 @@ import org.w3c.dom.Document;
 import org.w3c.dom.NamedNodeMap;
 import org.w3c.dom.Node;
 
-import com.l2jmobius.commons.util.IGameXmlReader;
 import com.l2jmobius.commons.util.IXmlReader;
 import com.l2jmobius.gameserver.enums.ClanRewardType;
 import com.l2jmobius.gameserver.model.clan.ClanRewardBonus;
@@ -38,7 +37,7 @@ import com.l2jmobius.gameserver.model.holders.SkillHolder;
 /**
  * @author UnAfraid
  */
-public class ClanRewardData implements IGameXmlReader
+public class ClanRewardData implements IXmlReader
 {
 	private static final Logger LOGGER = Logger.getLogger(ClanRewardData.class.getName());
 	private final Map<ClanRewardType, List<ClanRewardBonus>> _clanRewards = new ConcurrentHashMap<>();
diff --git a/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/data/xml/impl/ClassListData.java b/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/data/xml/impl/ClassListData.java
index a40f726d50..6e99aeabfa 100644
--- a/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/data/xml/impl/ClassListData.java
+++ b/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/data/xml/impl/ClassListData.java
@@ -17,15 +17,15 @@
 package com.l2jmobius.gameserver.data.xml.impl;
 
 import java.io.File;
-import java.util.HashMap;
 import java.util.Map;
+import java.util.concurrent.ConcurrentHashMap;
 import java.util.logging.Logger;
 
 import org.w3c.dom.Document;
 import org.w3c.dom.NamedNodeMap;
 import org.w3c.dom.Node;
 
-import com.l2jmobius.commons.util.IGameXmlReader;
+import com.l2jmobius.commons.util.IXmlReader;
 import com.l2jmobius.gameserver.model.base.ClassId;
 import com.l2jmobius.gameserver.model.base.ClassInfo;
 
@@ -33,11 +33,11 @@ import com.l2jmobius.gameserver.model.base.ClassInfo;
  * Loads the the list of classes and it's info.
  * @author Zoey76
  */
-public final class ClassListData implements IGameXmlReader
+public final class ClassListData implements IXmlReader
 {
 	private static final Logger LOGGER = Logger.getLogger(ClassListData.class.getName());
 	
-	private final Map<ClassId, ClassInfo> _classData = new HashMap<>();
+	private final Map<ClassId, ClassInfo> _classData = new ConcurrentHashMap<>();
 	
 	/**
 	 * Instantiates a new class list data.
diff --git a/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/data/xml/impl/CombinationItemsData.java b/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/data/xml/impl/CombinationItemsData.java
index a7e90d5f89..c2ce205300 100644
--- a/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/data/xml/impl/CombinationItemsData.java
+++ b/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/data/xml/impl/CombinationItemsData.java
@@ -24,7 +24,7 @@ import java.util.stream.Collectors;
 
 import org.w3c.dom.Document;
 
-import com.l2jmobius.commons.util.IGameXmlReader;
+import com.l2jmobius.commons.util.IXmlReader;
 import com.l2jmobius.gameserver.datatables.ItemTable;
 import com.l2jmobius.gameserver.model.StatsSet;
 import com.l2jmobius.gameserver.model.items.combination.CombinationItem;
@@ -34,7 +34,7 @@ import com.l2jmobius.gameserver.model.items.combination.CombinationItemType;
 /**
  * @author UnAfraid
  */
-public class CombinationItemsData implements IGameXmlReader
+public class CombinationItemsData implements IXmlReader
 {
 	private static final Logger LOGGER = Logger.getLogger(CombinationItemsData.class.getName());
 	private final List<CombinationItem> _items = new ArrayList<>();
diff --git a/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/data/xml/impl/CubicData.java b/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/data/xml/impl/CubicData.java
index f682509217..ef46a08a7f 100644
--- a/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/data/xml/impl/CubicData.java
+++ b/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/data/xml/impl/CubicData.java
@@ -20,12 +20,12 @@ import java.io.File;
 import java.util.Collections;
 import java.util.HashMap;
 import java.util.Map;
+import java.util.concurrent.ConcurrentHashMap;
 import java.util.logging.Logger;
 
 import org.w3c.dom.Document;
 import org.w3c.dom.Node;
 
-import com.l2jmobius.commons.util.IGameXmlReader;
 import com.l2jmobius.commons.util.IXmlReader;
 import com.l2jmobius.gameserver.model.StatsSet;
 import com.l2jmobius.gameserver.model.actor.templates.CubicTemplate;
@@ -39,11 +39,11 @@ import com.l2jmobius.gameserver.model.cubic.conditions.RangeCondition;
 /**
  * @author UnAfraid
  */
-public class CubicData implements IGameXmlReader
+public class CubicData implements IXmlReader
 {
 	private static final Logger LOGGER = Logger.getLogger(CubicData.class.getName());
 	
-	private final Map<Integer, Map<Integer, CubicTemplate>> _cubics = new HashMap<>();
+	private final Map<Integer, Map<Integer, CubicTemplate>> _cubics = new ConcurrentHashMap<>();
 	
 	protected CubicData()
 	{
diff --git a/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/data/xml/impl/DailyMissionData.java b/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/data/xml/impl/DailyMissionData.java
index 53519f2492..1e275049d9 100644
--- a/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/data/xml/impl/DailyMissionData.java
+++ b/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/data/xml/impl/DailyMissionData.java
@@ -27,7 +27,7 @@ import java.util.stream.Collectors;
 
 import org.w3c.dom.Document;
 
-import com.l2jmobius.commons.util.IGameXmlReader;
+import com.l2jmobius.commons.util.IXmlReader;
 import com.l2jmobius.gameserver.model.DailyMissionDataHolder;
 import com.l2jmobius.gameserver.model.StatsSet;
 import com.l2jmobius.gameserver.model.actor.instance.PlayerInstance;
@@ -37,7 +37,7 @@ import com.l2jmobius.gameserver.model.holders.ItemHolder;
 /**
  * @author Sdw
  */
-public class DailyMissionData implements IGameXmlReader
+public class DailyMissionData implements IXmlReader
 {
 	private static final Logger LOGGER = Logger.getLogger(DailyMissionData.class.getName());
 	private final Map<Integer, List<DailyMissionDataHolder>> _dailyMissionRewards = new LinkedHashMap<>();
diff --git a/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/data/xml/impl/DoorData.java b/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/data/xml/impl/DoorData.java
index e8b1ff7bfa..5dd43e98eb 100644
--- a/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/data/xml/impl/DoorData.java
+++ b/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/data/xml/impl/DoorData.java
@@ -32,7 +32,6 @@ import org.w3c.dom.Document;
 import org.w3c.dom.NamedNodeMap;
 import org.w3c.dom.Node;
 
-import com.l2jmobius.commons.util.IGameXmlReader;
 import com.l2jmobius.commons.util.IXmlReader;
 import com.l2jmobius.gameserver.instancemanager.MapRegionManager;
 import com.l2jmobius.gameserver.model.Location;
@@ -45,7 +44,7 @@ import com.l2jmobius.gameserver.model.instancezone.Instance;
  * This class loads and hold info about doors.
  * @author JIV, GodKratos, UnAfraid
  */
-public final class DoorData implements IGameXmlReader
+public final class DoorData implements IXmlReader
 {
 	private static final Logger LOGGER = Logger.getLogger(DoorData.class.getName());
 	
diff --git a/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/data/xml/impl/EnchantItemData.java b/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/data/xml/impl/EnchantItemData.java
index 24e12d1218..342b4cde07 100644
--- a/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/data/xml/impl/EnchantItemData.java
+++ b/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/data/xml/impl/EnchantItemData.java
@@ -25,7 +25,7 @@ import org.w3c.dom.Document;
 import org.w3c.dom.NamedNodeMap;
 import org.w3c.dom.Node;
 
-import com.l2jmobius.commons.util.IGameXmlReader;
+import com.l2jmobius.commons.util.IXmlReader;
 import com.l2jmobius.gameserver.model.StatsSet;
 import com.l2jmobius.gameserver.model.items.enchant.EnchantScroll;
 import com.l2jmobius.gameserver.model.items.enchant.EnchantSupportItem;
@@ -35,7 +35,7 @@ import com.l2jmobius.gameserver.model.items.instance.ItemInstance;
  * Loads item enchant data.
  * @author UnAfraid
  */
-public class EnchantItemData implements IGameXmlReader
+public class EnchantItemData implements IXmlReader
 {
 	private static final Logger LOGGER = Logger.getLogger(EnchantItemData.class.getName());
 	
diff --git a/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/data/xml/impl/EnchantItemGroupsData.java b/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/data/xml/impl/EnchantItemGroupsData.java
index 666d821e42..44582a7dd4 100644
--- a/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/data/xml/impl/EnchantItemGroupsData.java
+++ b/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/data/xml/impl/EnchantItemGroupsData.java
@@ -25,7 +25,7 @@ import org.w3c.dom.Document;
 import org.w3c.dom.NamedNodeMap;
 import org.w3c.dom.Node;
 
-import com.l2jmobius.commons.util.IGameXmlReader;
+import com.l2jmobius.commons.util.IXmlReader;
 import com.l2jmobius.gameserver.datatables.ItemTable;
 import com.l2jmobius.gameserver.model.holders.RangeChanceHolder;
 import com.l2jmobius.gameserver.model.items.Item;
@@ -37,7 +37,7 @@ import com.l2jmobius.gameserver.util.Util;
 /**
  * @author UnAfraid
  */
-public final class EnchantItemGroupsData implements IGameXmlReader
+public final class EnchantItemGroupsData implements IXmlReader
 {
 	private static final Logger LOGGER = Logger.getLogger(EnchantItemGroupsData.class.getName());
 	
diff --git a/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/data/xml/impl/EnchantItemHPBonusData.java b/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/data/xml/impl/EnchantItemHPBonusData.java
index d2ce1096b5..868b1f95f6 100644
--- a/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/data/xml/impl/EnchantItemHPBonusData.java
+++ b/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/data/xml/impl/EnchantItemHPBonusData.java
@@ -26,7 +26,7 @@ import java.util.logging.Logger;
 import org.w3c.dom.Document;
 import org.w3c.dom.Node;
 
-import com.l2jmobius.commons.util.IGameXmlReader;
+import com.l2jmobius.commons.util.IXmlReader;
 import com.l2jmobius.gameserver.model.items.Item;
 import com.l2jmobius.gameserver.model.items.instance.ItemInstance;
 import com.l2jmobius.gameserver.model.items.type.CrystalType;
@@ -35,7 +35,7 @@ import com.l2jmobius.gameserver.model.items.type.CrystalType;
  * This class holds the Enchant HP Bonus Data.
  * @author MrPoke, Zoey76
  */
-public class EnchantItemHPBonusData implements IGameXmlReader
+public class EnchantItemHPBonusData implements IXmlReader
 {
 	private static final Logger LOGGER = Logger.getLogger(EnchantItemHPBonusData.class.getName());
 	
diff --git a/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/data/xml/impl/EnchantItemOptionsData.java b/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/data/xml/impl/EnchantItemOptionsData.java
index f6e9946b94..b8d805132f 100644
--- a/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/data/xml/impl/EnchantItemOptionsData.java
+++ b/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/data/xml/impl/EnchantItemOptionsData.java
@@ -24,7 +24,7 @@ import java.util.logging.Logger;
 import org.w3c.dom.Document;
 import org.w3c.dom.Node;
 
-import com.l2jmobius.commons.util.IGameXmlReader;
+import com.l2jmobius.commons.util.IXmlReader;
 import com.l2jmobius.gameserver.model.items.instance.ItemInstance;
 import com.l2jmobius.gameserver.model.options.EnchantOptions;
 import com.l2jmobius.gameserver.util.Util;
@@ -32,7 +32,7 @@ import com.l2jmobius.gameserver.util.Util;
 /**
  * @author UnAfraid
  */
-public class EnchantItemOptionsData implements IGameXmlReader
+public class EnchantItemOptionsData implements IXmlReader
 {
 	private static final Logger LOGGER = Logger.getLogger(EnchantItemOptionsData.class.getName());
 	
diff --git a/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/data/xml/impl/EnchantSkillGroupsData.java b/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/data/xml/impl/EnchantSkillGroupsData.java
index 0b557ced04..45127fe5f6 100644
--- a/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/data/xml/impl/EnchantSkillGroupsData.java
+++ b/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/data/xml/impl/EnchantSkillGroupsData.java
@@ -18,16 +18,15 @@ package com.l2jmobius.gameserver.data.xml.impl;
 
 import java.io.File;
 import java.util.Collections;
-import java.util.HashMap;
 import java.util.HashSet;
-import java.util.LinkedHashMap;
 import java.util.Map;
 import java.util.Set;
+import java.util.concurrent.ConcurrentHashMap;
 import java.util.logging.Logger;
 
 import org.w3c.dom.Document;
 
-import com.l2jmobius.commons.util.IGameXmlReader;
+import com.l2jmobius.commons.util.IXmlReader;
 import com.l2jmobius.gameserver.enums.SkillEnchantType;
 import com.l2jmobius.gameserver.model.StatsSet;
 import com.l2jmobius.gameserver.model.holders.EnchantSkillHolder;
@@ -39,12 +38,12 @@ import com.l2jmobius.gameserver.model.skills.Skill;
  * This class holds the Enchant Groups information.
  * @author Micr0
  */
-public class EnchantSkillGroupsData implements IGameXmlReader
+public class EnchantSkillGroupsData implements IXmlReader
 {
 	private static final Logger LOGGER = Logger.getLogger(EnchantSkillGroupsData.class.getName());
 	
-	private final Map<Integer, EnchantSkillHolder> _enchantSkillHolders = new LinkedHashMap<>();
-	private final Map<SkillHolder, Set<Integer>> _enchantSkillTrees = new HashMap<>();
+	private final Map<Integer, EnchantSkillHolder> _enchantSkillHolders = new ConcurrentHashMap<>();
+	private final Map<SkillHolder, Set<Integer>> _enchantSkillTrees = new ConcurrentHashMap<>();
 	
 	public static int MAX_ENCHANT_LEVEL;
 	
diff --git a/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/data/xml/impl/EnsoulData.java b/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/data/xml/impl/EnsoulData.java
index 239b582894..64dcf428e3 100644
--- a/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/data/xml/impl/EnsoulData.java
+++ b/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/data/xml/impl/EnsoulData.java
@@ -17,16 +17,14 @@
 package com.l2jmobius.gameserver.data.xml.impl;
 
 import java.io.File;
-import java.util.EnumMap;
-import java.util.HashMap;
 import java.util.Map;
+import java.util.concurrent.ConcurrentHashMap;
 import java.util.logging.Logger;
 
 import org.w3c.dom.Document;
 import org.w3c.dom.NamedNodeMap;
 import org.w3c.dom.Node;
 
-import com.l2jmobius.commons.util.IGameXmlReader;
 import com.l2jmobius.commons.util.IXmlReader;
 import com.l2jmobius.gameserver.model.ensoul.EnsoulFee;
 import com.l2jmobius.gameserver.model.ensoul.EnsoulOption;
@@ -37,12 +35,12 @@ import com.l2jmobius.gameserver.model.items.type.CrystalType;
 /**
  * @author UnAfraid
  */
-public class EnsoulData implements IGameXmlReader
+public class EnsoulData implements IXmlReader
 {
 	private static final Logger LOGGER = Logger.getLogger(EnsoulData.class.getName());
-	private final Map<CrystalType, EnsoulFee> _ensoulFees = new EnumMap<>(CrystalType.class);
-	private final Map<Integer, EnsoulOption> _ensoulOptions = new HashMap<>();
-	private final Map<Integer, EnsoulStone> _ensoulStones = new HashMap<>();
+	private final Map<CrystalType, EnsoulFee> _ensoulFees = new ConcurrentHashMap<>();
+	private final Map<Integer, EnsoulOption> _ensoulOptions = new ConcurrentHashMap<>();
+	private final Map<Integer, EnsoulStone> _ensoulStones = new ConcurrentHashMap<>();
 	
 	protected EnsoulData()
 	{
diff --git a/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/data/xml/impl/EventEngineData.java b/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/data/xml/impl/EventEngineData.java
index c43970ea31..144e2d5599 100644
--- a/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/data/xml/impl/EventEngineData.java
+++ b/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/data/xml/impl/EventEngineData.java
@@ -32,7 +32,6 @@ import org.w3c.dom.Document;
 import org.w3c.dom.NamedNodeMap;
 import org.w3c.dom.Node;
 
-import com.l2jmobius.commons.util.IGameXmlReader;
 import com.l2jmobius.commons.util.IXmlReader;
 import com.l2jmobius.gameserver.model.Location;
 import com.l2jmobius.gameserver.model.StatsSet;
@@ -54,7 +53,7 @@ import com.l2jmobius.gameserver.model.holders.SkillHolder;
 /**
  * @author UnAfraid
  */
-public final class EventEngineData implements IGameXmlReader
+public final class EventEngineData implements IXmlReader
 {
 	private static final Logger LOGGER = Logger.getLogger(EventEngineData.class.getName());
 	
diff --git a/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/data/xml/impl/ExperienceData.java b/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/data/xml/impl/ExperienceData.java
index 2daaf16220..ea9d13c2aa 100644
--- a/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/data/xml/impl/ExperienceData.java
+++ b/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/data/xml/impl/ExperienceData.java
@@ -26,13 +26,13 @@ import org.w3c.dom.NamedNodeMap;
 import org.w3c.dom.Node;
 
 import com.l2jmobius.Config;
-import com.l2jmobius.commons.util.IGameXmlReader;
+import com.l2jmobius.commons.util.IXmlReader;
 
 /**
  * This class holds the Experience points for each level for players and pets.
  * @author mrTJO
  */
-public final class ExperienceData implements IGameXmlReader
+public final class ExperienceData implements IXmlReader
 {
 	private static final Logger LOGGER = Logger.getLogger(ExperienceData.class.getName());
 	
diff --git a/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/data/xml/impl/ExtendDropData.java b/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/data/xml/impl/ExtendDropData.java
index 00af3a4f77..09da39ad14 100644
--- a/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/data/xml/impl/ExtendDropData.java
+++ b/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/data/xml/impl/ExtendDropData.java
@@ -28,7 +28,7 @@ import java.util.logging.Logger;
 import org.w3c.dom.Document;
 import org.w3c.dom.Node;
 
-import com.l2jmobius.commons.util.IGameXmlReader;
+import com.l2jmobius.commons.util.IXmlReader;
 import com.l2jmobius.gameserver.handler.ConditionHandler;
 import com.l2jmobius.gameserver.model.StatsSet;
 import com.l2jmobius.gameserver.model.conditions.ICondition;
@@ -39,7 +39,7 @@ import com.l2jmobius.gameserver.network.SystemMessageId;
 /**
  * @author Sdw
  */
-public class ExtendDropData implements IGameXmlReader
+public class ExtendDropData implements IXmlReader
 {
 	private static final Logger LOGGER = Logger.getLogger(ExtendDropData.class.getName());
 	private final Map<Integer, ExtendDropDataHolder> _extendDrop = new HashMap<>();
diff --git a/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/data/xml/impl/FakePlayerData.java b/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/data/xml/impl/FakePlayerData.java
index afb92c06d5..74b7957fd9 100644
--- a/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/data/xml/impl/FakePlayerData.java
+++ b/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/data/xml/impl/FakePlayerData.java
@@ -26,7 +26,7 @@ import java.util.logging.Logger;
 import org.w3c.dom.Document;
 
 import com.l2jmobius.Config;
-import com.l2jmobius.commons.util.IGameXmlReader;
+import com.l2jmobius.commons.util.IXmlReader;
 import com.l2jmobius.gameserver.data.sql.impl.CharNameTable;
 import com.l2jmobius.gameserver.model.StatsSet;
 import com.l2jmobius.gameserver.model.actor.templates.NpcTemplate;
@@ -35,7 +35,7 @@ import com.l2jmobius.gameserver.model.holders.FakePlayerHolder;
 /**
  * @author Mobius
  */
-public class FakePlayerData implements IGameXmlReader
+public class FakePlayerData implements IXmlReader
 {
 	private static Logger LOGGER = Logger.getLogger(FakePlayerData.class.getName());
 	
diff --git a/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/data/xml/impl/FenceData.java b/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/data/xml/impl/FenceData.java
index f51175e5fa..d36ab2e16b 100644
--- a/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/data/xml/impl/FenceData.java
+++ b/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/data/xml/impl/FenceData.java
@@ -28,7 +28,7 @@ import java.util.logging.Logger;
 import org.w3c.dom.Document;
 import org.w3c.dom.Node;
 
-import com.l2jmobius.commons.util.IGameXmlReader;
+import com.l2jmobius.commons.util.IXmlReader;
 import com.l2jmobius.gameserver.enums.FenceState;
 import com.l2jmobius.gameserver.model.StatsSet;
 import com.l2jmobius.gameserver.model.World;
@@ -39,7 +39,7 @@ import com.l2jmobius.gameserver.model.instancezone.Instance;
 /**
  * @author HoridoJoho / FBIagent
  */
-public final class FenceData implements IGameXmlReader
+public final class FenceData implements IXmlReader
 {
 	private static final Logger LOGGER = Logger.getLogger(FenceData.class.getSimpleName());
 	
diff --git a/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/data/xml/impl/FishingData.java b/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/data/xml/impl/FishingData.java
index bacf1ed08c..16436a2f5c 100644
--- a/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/data/xml/impl/FishingData.java
+++ b/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/data/xml/impl/FishingData.java
@@ -26,7 +26,7 @@ import org.w3c.dom.NamedNodeMap;
 import org.w3c.dom.Node;
 
 import com.l2jmobius.Config;
-import com.l2jmobius.commons.util.IGameXmlReader;
+import com.l2jmobius.commons.util.IXmlReader;
 import com.l2jmobius.gameserver.datatables.ItemTable;
 import com.l2jmobius.gameserver.model.fishing.FishingBait;
 import com.l2jmobius.gameserver.model.fishing.FishingCatch;
@@ -36,7 +36,7 @@ import com.l2jmobius.gameserver.model.fishing.FishingRod;
  * This class holds the Fishing information.
  * @author bit
  */
-public final class FishingData implements IGameXmlReader
+public final class FishingData implements IXmlReader
 {
 	private static final Logger LOGGER = Logger.getLogger(FishingData.class.getName());
 	private final Map<Integer, FishingBait> _baitData = new HashMap<>();
diff --git a/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/data/xml/impl/HennaData.java b/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/data/xml/impl/HennaData.java
index e27e186193..d3ac163f3c 100644
--- a/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/data/xml/impl/HennaData.java
+++ b/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/data/xml/impl/HennaData.java
@@ -27,7 +27,7 @@ import org.w3c.dom.Document;
 import org.w3c.dom.NamedNodeMap;
 import org.w3c.dom.Node;
 
-import com.l2jmobius.commons.util.IGameXmlReader;
+import com.l2jmobius.commons.util.IXmlReader;
 import com.l2jmobius.gameserver.model.StatsSet;
 import com.l2jmobius.gameserver.model.base.ClassId;
 import com.l2jmobius.gameserver.model.items.Henna;
@@ -40,7 +40,7 @@ import com.l2jmobius.gameserver.model.skills.Skill;
  * Allowed classes to wear each henna.
  * @author Zoey76, Mobius
  */
-public final class HennaData implements IGameXmlReader
+public final class HennaData implements IXmlReader
 {
 	private static final Logger LOGGER = Logger.getLogger(HennaData.class.getName());
 	
diff --git a/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/data/xml/impl/HitConditionBonusData.java b/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/data/xml/impl/HitConditionBonusData.java
index e9f2f9a87d..2d6ccf0467 100644
--- a/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/data/xml/impl/HitConditionBonusData.java
+++ b/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/data/xml/impl/HitConditionBonusData.java
@@ -23,7 +23,7 @@ import org.w3c.dom.Document;
 import org.w3c.dom.NamedNodeMap;
 import org.w3c.dom.Node;
 
-import com.l2jmobius.commons.util.IGameXmlReader;
+import com.l2jmobius.commons.util.IXmlReader;
 import com.l2jmobius.gameserver.GameTimeController;
 import com.l2jmobius.gameserver.enums.Position;
 import com.l2jmobius.gameserver.model.actor.Creature;
@@ -32,7 +32,7 @@ import com.l2jmobius.gameserver.model.actor.Creature;
  * This class load, holds and calculates the hit condition bonuses.
  * @author Nik
  */
-public final class HitConditionBonusData implements IGameXmlReader
+public final class HitConditionBonusData implements IXmlReader
 {
 	private static final Logger LOGGER = Logger.getLogger(HitConditionBonusData.class.getName());
 	
diff --git a/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/data/xml/impl/InitialEquipmentData.java b/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/data/xml/impl/InitialEquipmentData.java
index 247ea4b46d..275a23f28f 100644
--- a/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/data/xml/impl/InitialEquipmentData.java
+++ b/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/data/xml/impl/InitialEquipmentData.java
@@ -28,7 +28,7 @@ import org.w3c.dom.NamedNodeMap;
 import org.w3c.dom.Node;
 
 import com.l2jmobius.Config;
-import com.l2jmobius.commons.util.IGameXmlReader;
+import com.l2jmobius.commons.util.IXmlReader;
 import com.l2jmobius.gameserver.model.StatsSet;
 import com.l2jmobius.gameserver.model.base.ClassId;
 import com.l2jmobius.gameserver.model.items.PlayerItemTemplate;
@@ -38,7 +38,7 @@ import com.l2jmobius.gameserver.model.items.PlayerItemTemplate;
  * What items get each newly created character and if this item is equipped upon creation (<b>Requires the item to be equippable</b>).
  * @author Zoey76
  */
-public final class InitialEquipmentData implements IGameXmlReader
+public final class InitialEquipmentData implements IXmlReader
 {
 	private static final Logger LOGGER = Logger.getLogger(InitialEquipmentData.class.getName());
 	
diff --git a/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/data/xml/impl/InitialShortcutData.java b/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/data/xml/impl/InitialShortcutData.java
index 5f886bafa8..3b9e976607 100644
--- a/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/data/xml/impl/InitialShortcutData.java
+++ b/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/data/xml/impl/InitialShortcutData.java
@@ -27,7 +27,7 @@ import org.w3c.dom.Document;
 import org.w3c.dom.NamedNodeMap;
 import org.w3c.dom.Node;
 
-import com.l2jmobius.commons.util.IGameXmlReader;
+import com.l2jmobius.commons.util.IXmlReader;
 import com.l2jmobius.gameserver.enums.MacroType;
 import com.l2jmobius.gameserver.enums.ShortcutType;
 import com.l2jmobius.gameserver.model.Macro;
@@ -43,7 +43,7 @@ import com.l2jmobius.gameserver.network.serverpackets.ShortCutRegister;
  * What shortcuts get each newly created character.
  * @author Zoey76
  */
-public final class InitialShortcutData implements IGameXmlReader
+public final class InitialShortcutData implements IXmlReader
 {
 	private static final Logger LOGGER = Logger.getLogger(InitialShortcutData.class.getName());
 	
diff --git a/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/data/xml/impl/ItemCrystallizationData.java b/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/data/xml/impl/ItemCrystallizationData.java
index 86454b2b71..aa7742afa1 100644
--- a/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/data/xml/impl/ItemCrystallizationData.java
+++ b/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/data/xml/impl/ItemCrystallizationData.java
@@ -28,7 +28,7 @@ import org.w3c.dom.Document;
 import org.w3c.dom.NamedNodeMap;
 import org.w3c.dom.Node;
 
-import com.l2jmobius.commons.util.IGameXmlReader;
+import com.l2jmobius.commons.util.IXmlReader;
 import com.l2jmobius.gameserver.datatables.ItemTable;
 import com.l2jmobius.gameserver.enums.CrystallizationType;
 import com.l2jmobius.gameserver.model.holders.CrystallizationDataHolder;
@@ -42,7 +42,7 @@ import com.l2jmobius.gameserver.model.items.type.CrystalType;
 /**
  * @author UnAfraid
  */
-public final class ItemCrystallizationData implements IGameXmlReader
+public final class ItemCrystallizationData implements IXmlReader
 {
 	private static final Logger LOGGER = Logger.getLogger(ItemCrystallizationData.class.getName());
 	
diff --git a/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/data/xml/impl/KarmaData.java b/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/data/xml/impl/KarmaData.java
index ca826eba2e..bd68c38748 100644
--- a/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/data/xml/impl/KarmaData.java
+++ b/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/data/xml/impl/KarmaData.java
@@ -26,12 +26,12 @@ import org.w3c.dom.NamedNodeMap;
 import org.w3c.dom.Node;
 
 import com.l2jmobius.Config;
-import com.l2jmobius.commons.util.IGameXmlReader;
+import com.l2jmobius.commons.util.IXmlReader;
 
 /**
  * @author UnAfraid
  */
-public class KarmaData implements IGameXmlReader
+public class KarmaData implements IXmlReader
 {
 	private static final Logger LOGGER = Logger.getLogger(KarmaData.class.getName());
 	
diff --git a/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/data/xml/impl/LuckyGameData.java b/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/data/xml/impl/LuckyGameData.java
index 6759bfec3f..41c0d0fc31 100644
--- a/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/data/xml/impl/LuckyGameData.java
+++ b/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/data/xml/impl/LuckyGameData.java
@@ -23,7 +23,7 @@ import java.util.concurrent.atomic.AtomicInteger;
 
 import org.w3c.dom.Document;
 
-import com.l2jmobius.commons.util.IGameXmlReader;
+import com.l2jmobius.commons.util.IXmlReader;
 import com.l2jmobius.gameserver.model.StatsSet;
 import com.l2jmobius.gameserver.model.holders.ItemChanceHolder;
 import com.l2jmobius.gameserver.model.holders.ItemPointHolder;
@@ -32,7 +32,7 @@ import com.l2jmobius.gameserver.model.holders.LuckyGameDataHolder;
 /**
  * @author Sdw
  */
-public class LuckyGameData implements IGameXmlReader
+public class LuckyGameData implements IXmlReader
 {
 	private final Map<Integer, LuckyGameDataHolder> _luckyGame = new HashMap<>();
 	private final AtomicInteger _serverPlay = new AtomicInteger();
diff --git a/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/data/xml/impl/MultisellData.java b/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/data/xml/impl/MultisellData.java
index 796cd9b6f1..e9c494b91e 100644
--- a/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/data/xml/impl/MultisellData.java
+++ b/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/data/xml/impl/MultisellData.java
@@ -19,11 +19,11 @@ package com.l2jmobius.gameserver.data.xml.impl;
 import java.io.File;
 import java.io.FileFilter;
 import java.util.ArrayList;
-import java.util.HashMap;
 import java.util.HashSet;
 import java.util.List;
 import java.util.Map;
 import java.util.Set;
+import java.util.concurrent.ConcurrentHashMap;
 import java.util.logging.Level;
 import java.util.logging.Logger;
 
@@ -31,7 +31,7 @@ import org.w3c.dom.Document;
 import org.w3c.dom.Node;
 
 import com.l2jmobius.Config;
-import com.l2jmobius.commons.util.IGameXmlReader;
+import com.l2jmobius.commons.util.IXmlReader;
 import com.l2jmobius.commons.util.file.filter.NumericNameFilter;
 import com.l2jmobius.gameserver.datatables.ItemTable;
 import com.l2jmobius.gameserver.enums.SpecialItemType;
@@ -46,14 +46,14 @@ import com.l2jmobius.gameserver.model.holders.PreparedMultisellListHolder;
 import com.l2jmobius.gameserver.model.items.Item;
 import com.l2jmobius.gameserver.network.serverpackets.MultiSellList;
 
-public final class MultisellData implements IGameXmlReader
+public final class MultisellData implements IXmlReader
 {
 	private static final Logger LOGGER = Logger.getLogger(MultisellData.class.getName());
 	
 	public static final int PAGE_SIZE = 40;
 	private static final FileFilter NUMERIC_FILTER = new NumericNameFilter();
 	
-	private final Map<Integer, MultisellListHolder> _multisells = new HashMap<>();
+	private final Map<Integer, MultisellListHolder> _multisells = new ConcurrentHashMap<>();
 	
 	protected MultisellData()
 	{
diff --git a/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/data/xml/impl/NpcData.java b/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/data/xml/impl/NpcData.java
index e43e5c5147..3e1adcb420 100644
--- a/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/data/xml/impl/NpcData.java
+++ b/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/data/xml/impl/NpcData.java
@@ -26,6 +26,8 @@ import java.util.List;
 import java.util.Map;
 import java.util.Map.Entry;
 import java.util.Set;
+import java.util.concurrent.ConcurrentHashMap;
+import java.util.concurrent.CopyOnWriteArrayList;
 import java.util.function.Predicate;
 import java.util.logging.Logger;
 import java.util.stream.Collectors;
@@ -36,7 +38,7 @@ import org.w3c.dom.Node;
 
 import com.l2jmobius.Config;
 import com.l2jmobius.commons.util.CommonUtil;
-import com.l2jmobius.commons.util.IGameXmlReader;
+import com.l2jmobius.commons.util.IXmlReader;
 import com.l2jmobius.gameserver.datatables.ItemTable;
 import com.l2jmobius.gameserver.enums.AISkillScope;
 import com.l2jmobius.gameserver.enums.DropType;
@@ -52,13 +54,13 @@ import com.l2jmobius.gameserver.model.skills.Skill;
  * NPC data parser.
  * @author NosBit
  */
-public class NpcData implements IGameXmlReader
+public class NpcData implements IXmlReader
 {
 	protected static final Logger LOGGER = Logger.getLogger(NpcData.class.getName());
 	
-	private final Map<Integer, NpcTemplate> _npcs = new HashMap<>();
-	private final Map<String, Integer> _clans = new HashMap<>();
-	private static final List<Integer> _masterMonsterIDs = new ArrayList<>();
+	private final Map<Integer, NpcTemplate> _npcs = new ConcurrentHashMap<>();
+	private final Map<String, Integer> _clans = new ConcurrentHashMap<>();
+	private static final List<Integer> _masterMonsterIDs = new CopyOnWriteArrayList<>();
 	
 	protected NpcData()
 	{
diff --git a/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/data/xml/impl/OptionData.java b/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/data/xml/impl/OptionData.java
index bffa2b107c..424e2b27ad 100644
--- a/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/data/xml/impl/OptionData.java
+++ b/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/data/xml/impl/OptionData.java
@@ -18,13 +18,12 @@ package com.l2jmobius.gameserver.data.xml.impl;
 
 import java.io.File;
 import java.util.Collections;
-import java.util.HashMap;
 import java.util.Map;
+import java.util.concurrent.ConcurrentHashMap;
 import java.util.logging.Logger;
 
 import org.w3c.dom.Document;
 
-import com.l2jmobius.commons.util.IGameXmlReader;
 import com.l2jmobius.commons.util.IXmlReader;
 import com.l2jmobius.gameserver.handler.EffectHandler;
 import com.l2jmobius.gameserver.model.StatsSet;
@@ -36,11 +35,11 @@ import com.l2jmobius.gameserver.model.options.OptionsSkillType;
 /**
  * @author UnAfraid
  */
-public class OptionData implements IGameXmlReader
+public class OptionData implements IXmlReader
 {
 	private static final Logger LOGGER = Logger.getLogger(OptionData.class.getName());
 	
-	private final Map<Integer, Options> _optionData = new HashMap<>();
+	private final Map<Integer, Options> _optionData = new ConcurrentHashMap<>();
 	
 	protected OptionData()
 	{
diff --git a/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/data/xml/impl/PetDataTable.java b/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/data/xml/impl/PetDataTable.java
index 65afb75d7d..aa6975cd72 100644
--- a/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/data/xml/impl/PetDataTable.java
+++ b/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/data/xml/impl/PetDataTable.java
@@ -17,15 +17,15 @@
 package com.l2jmobius.gameserver.data.xml.impl;
 
 import java.io.File;
-import java.util.HashMap;
 import java.util.Map;
+import java.util.concurrent.ConcurrentHashMap;
 import java.util.logging.Logger;
 
 import org.w3c.dom.Document;
 import org.w3c.dom.NamedNodeMap;
 import org.w3c.dom.Node;
 
-import com.l2jmobius.commons.util.IGameXmlReader;
+import com.l2jmobius.commons.util.IXmlReader;
 import com.l2jmobius.gameserver.enums.MountType;
 import com.l2jmobius.gameserver.model.PetData;
 import com.l2jmobius.gameserver.model.PetLevelData;
@@ -36,11 +36,11 @@ import com.l2jmobius.gameserver.model.StatsSet;
  * TODO: load and use all pet parameters.
  * @author Zoey76 (rework)
  */
-public final class PetDataTable implements IGameXmlReader
+public final class PetDataTable implements IXmlReader
 {
 	private static final Logger LOGGER = Logger.getLogger(PetDataTable.class.getName());
 	
-	private final Map<Integer, PetData> _pets = new HashMap<>();
+	private final Map<Integer, PetData> _pets = new ConcurrentHashMap<>();
 	
 	/**
 	 * Instantiates a new pet data table.
diff --git a/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/data/xml/impl/PetSkillData.java b/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/data/xml/impl/PetSkillData.java
index 4872dde773..5b2f9a4408 100644
--- a/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/data/xml/impl/PetSkillData.java
+++ b/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/data/xml/impl/PetSkillData.java
@@ -27,14 +27,14 @@ import org.w3c.dom.Document;
 import org.w3c.dom.NamedNodeMap;
 import org.w3c.dom.Node;
 
-import com.l2jmobius.commons.util.IGameXmlReader;
+import com.l2jmobius.commons.util.IXmlReader;
 import com.l2jmobius.gameserver.model.actor.Summon;
 import com.l2jmobius.gameserver.model.holders.SkillHolder;
 
 /**
  * @author Mobius
  */
-public class PetSkillData implements IGameXmlReader
+public class PetSkillData implements IXmlReader
 {
 	private static Logger LOGGER = Logger.getLogger(PetSkillData.class.getName());
 	private final Map<Integer, Map<Long, SkillHolder>> _skillTrees = new HashMap<>();
diff --git a/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/data/xml/impl/PlayerTemplateData.java b/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/data/xml/impl/PlayerTemplateData.java
index 031fab8027..7a7c230b72 100644
--- a/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/data/xml/impl/PlayerTemplateData.java
+++ b/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/data/xml/impl/PlayerTemplateData.java
@@ -18,9 +18,9 @@ package com.l2jmobius.gameserver.data.xml.impl;
 
 import java.io.File;
 import java.util.ArrayList;
-import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
+import java.util.concurrent.ConcurrentHashMap;
 import java.util.logging.Logger;
 
 import org.w3c.dom.Document;
@@ -28,7 +28,7 @@ import org.w3c.dom.NamedNodeMap;
 import org.w3c.dom.Node;
 
 import com.l2jmobius.Config;
-import com.l2jmobius.commons.util.IGameXmlReader;
+import com.l2jmobius.commons.util.IXmlReader;
 import com.l2jmobius.gameserver.model.Location;
 import com.l2jmobius.gameserver.model.StatsSet;
 import com.l2jmobius.gameserver.model.actor.templates.PlayerTemplate;
@@ -38,11 +38,11 @@ import com.l2jmobius.gameserver.model.base.ClassId;
  * Loads player's base stats.
  * @author Forsaiken, Zoey76, GKR
  */
-public final class PlayerTemplateData implements IGameXmlReader
+public final class PlayerTemplateData implements IXmlReader
 {
 	private static final Logger LOGGER = Logger.getLogger(PlayerTemplateData.class.getName());
 	
-	private final Map<ClassId, PlayerTemplate> _playerTemplates = new HashMap<>();
+	private final Map<ClassId, PlayerTemplate> _playerTemplates = new ConcurrentHashMap<>();
 	
 	private int _dataCount = 0;
 	private int _autoGeneratedCount = 0;
diff --git a/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/data/xml/impl/PlayerXpPercentLostData.java b/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/data/xml/impl/PlayerXpPercentLostData.java
index 2b867a18e4..816cb7aacf 100644
--- a/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/data/xml/impl/PlayerXpPercentLostData.java
+++ b/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/data/xml/impl/PlayerXpPercentLostData.java
@@ -24,13 +24,13 @@ import org.w3c.dom.Document;
 import org.w3c.dom.NamedNodeMap;
 import org.w3c.dom.Node;
 
-import com.l2jmobius.commons.util.IGameXmlReader;
+import com.l2jmobius.commons.util.IXmlReader;
 
 /**
  * This class holds the Player Xp Percent Lost Data for each level for players.
  * @author Zealar
  */
-public final class PlayerXpPercentLostData implements IGameXmlReader
+public final class PlayerXpPercentLostData implements IXmlReader
 {
 	private static final Logger LOGGER = Logger.getLogger(PlayerXpPercentLostData.class.getName());
 	
diff --git a/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/data/xml/impl/PrimeShopData.java b/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/data/xml/impl/PrimeShopData.java
index 82ddd51f26..650d156194 100644
--- a/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/data/xml/impl/PrimeShopData.java
+++ b/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/data/xml/impl/PrimeShopData.java
@@ -27,7 +27,7 @@ import org.w3c.dom.Document;
 import org.w3c.dom.NamedNodeMap;
 import org.w3c.dom.Node;
 
-import com.l2jmobius.commons.util.IGameXmlReader;
+import com.l2jmobius.commons.util.IXmlReader;
 import com.l2jmobius.gameserver.datatables.ItemTable;
 import com.l2jmobius.gameserver.model.StatsSet;
 import com.l2jmobius.gameserver.model.actor.instance.PlayerInstance;
@@ -39,7 +39,7 @@ import com.l2jmobius.gameserver.network.serverpackets.primeshop.ExBRProductInfo;
 /**
  * @author Gnacik, UnAfraid
  */
-public class PrimeShopData implements IGameXmlReader
+public class PrimeShopData implements IXmlReader
 {
 	private static final Logger LOGGER = Logger.getLogger(PrimeShopData.class.getName());
 	
diff --git a/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/data/xml/impl/RecipeData.java b/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/data/xml/impl/RecipeData.java
index 9c035c1fde..54ce272bd2 100644
--- a/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/data/xml/impl/RecipeData.java
+++ b/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/data/xml/impl/RecipeData.java
@@ -27,7 +27,7 @@ import org.w3c.dom.Document;
 import org.w3c.dom.NamedNodeMap;
 import org.w3c.dom.Node;
 
-import com.l2jmobius.commons.util.IGameXmlReader;
+import com.l2jmobius.commons.util.IXmlReader;
 import com.l2jmobius.gameserver.model.RecipeInstance;
 import com.l2jmobius.gameserver.model.RecipeList;
 import com.l2jmobius.gameserver.model.RecipeStatInstance;
@@ -38,7 +38,7 @@ import com.l2jmobius.gameserver.model.actor.instance.PlayerInstance;
  * The Class RecipeData.
  * @author Zoey76
  */
-public class RecipeData implements IGameXmlReader
+public class RecipeData implements IXmlReader
 {
 	private static final Logger LOGGER = Logger.getLogger(RecipeData.class.getName());
 	
diff --git a/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/data/xml/impl/ResidenceFunctionsData.java b/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/data/xml/impl/ResidenceFunctionsData.java
index 66951e9e59..094ef13149 100644
--- a/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/data/xml/impl/ResidenceFunctionsData.java
+++ b/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/data/xml/impl/ResidenceFunctionsData.java
@@ -28,7 +28,7 @@ import org.w3c.dom.Document;
 import org.w3c.dom.NamedNodeMap;
 import org.w3c.dom.Node;
 
-import com.l2jmobius.commons.util.IGameXmlReader;
+import com.l2jmobius.commons.util.IXmlReader;
 import com.l2jmobius.gameserver.model.StatsSet;
 import com.l2jmobius.gameserver.model.residences.ResidenceFunctionTemplate;
 
@@ -36,7 +36,7 @@ import com.l2jmobius.gameserver.model.residences.ResidenceFunctionTemplate;
  * The residence functions data
  * @author UnAfraid
  */
-public final class ResidenceFunctionsData implements IGameXmlReader
+public final class ResidenceFunctionsData implements IXmlReader
 {
 	private static final Logger LOGGER = Logger.getLogger(ResidenceFunctionsData.class.getName());
 	private final Map<Integer, List<ResidenceFunctionTemplate>> _functions = new HashMap<>();
diff --git a/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/data/xml/impl/SayuneData.java b/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/data/xml/impl/SayuneData.java
index 835bd96930..13b4d33b1e 100644
--- a/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/data/xml/impl/SayuneData.java
+++ b/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/data/xml/impl/SayuneData.java
@@ -26,13 +26,13 @@ import org.w3c.dom.Document;
 import org.w3c.dom.NamedNodeMap;
 import org.w3c.dom.Node;
 
-import com.l2jmobius.commons.util.IGameXmlReader;
+import com.l2jmobius.commons.util.IXmlReader;
 import com.l2jmobius.gameserver.model.SayuneEntry;
 
 /**
  * @author UnAfraid
  */
-public class SayuneData implements IGameXmlReader
+public class SayuneData implements IXmlReader
 {
 	private static final Logger LOGGER = Logger.getLogger(SayuneData.class.getName());
 	
diff --git a/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/data/xml/impl/SecondaryAuthData.java b/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/data/xml/impl/SecondaryAuthData.java
index c0ebd36146..ca85056b10 100644
--- a/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/data/xml/impl/SecondaryAuthData.java
+++ b/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/data/xml/impl/SecondaryAuthData.java
@@ -25,12 +25,12 @@ import java.util.logging.Logger;
 import org.w3c.dom.Document;
 import org.w3c.dom.Node;
 
-import com.l2jmobius.commons.util.IGameXmlReader;
+import com.l2jmobius.commons.util.IXmlReader;
 
 /**
  * @author NosBit
  */
-public class SecondaryAuthData implements IGameXmlReader
+public class SecondaryAuthData implements IXmlReader
 {
 	private static final Logger LOGGER = Logger.getLogger(SecondaryAuthData.class.getName());
 	
diff --git a/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/data/xml/impl/ShuttleData.java b/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/data/xml/impl/ShuttleData.java
index 9454d24d6b..ff26f4f409 100644
--- a/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/data/xml/impl/ShuttleData.java
+++ b/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/data/xml/impl/ShuttleData.java
@@ -27,7 +27,7 @@ import org.w3c.dom.Document;
 import org.w3c.dom.NamedNodeMap;
 import org.w3c.dom.Node;
 
-import com.l2jmobius.commons.util.IGameXmlReader;
+import com.l2jmobius.commons.util.IXmlReader;
 import com.l2jmobius.gameserver.model.Location;
 import com.l2jmobius.gameserver.model.StatsSet;
 import com.l2jmobius.gameserver.model.VehiclePathPoint;
@@ -40,7 +40,7 @@ import com.l2jmobius.gameserver.model.shuttle.ShuttleStop;
 /**
  * @author UnAfraid
  */
-public final class ShuttleData implements IGameXmlReader
+public final class ShuttleData implements IXmlReader
 {
 	private static final Logger LOGGER = Logger.getLogger(ShuttleData.class.getName());
 	
diff --git a/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/data/xml/impl/SiegeScheduleData.java b/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/data/xml/impl/SiegeScheduleData.java
index 265bf7c528..6bff09010b 100644
--- a/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/data/xml/impl/SiegeScheduleData.java
+++ b/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/data/xml/impl/SiegeScheduleData.java
@@ -27,7 +27,7 @@ import org.w3c.dom.Document;
 import org.w3c.dom.NamedNodeMap;
 import org.w3c.dom.Node;
 
-import com.l2jmobius.commons.util.IGameXmlReader;
+import com.l2jmobius.commons.util.IXmlReader;
 import com.l2jmobius.gameserver.model.SiegeScheduleDate;
 import com.l2jmobius.gameserver.model.StatsSet;
 import com.l2jmobius.gameserver.util.Util;
@@ -35,7 +35,7 @@ import com.l2jmobius.gameserver.util.Util;
 /**
  * @author UnAfraid
  */
-public class SiegeScheduleData implements IGameXmlReader
+public class SiegeScheduleData implements IXmlReader
 {
 	private static final Logger LOGGER = Logger.getLogger(SiegeScheduleData.class.getName());
 	
diff --git a/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/data/xml/impl/SkillData.java b/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/data/xml/impl/SkillData.java
index 7a1ae2e15b..64900d4d45 100644
--- a/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/data/xml/impl/SkillData.java
+++ b/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/data/xml/impl/SkillData.java
@@ -25,6 +25,7 @@ import java.util.List;
 import java.util.Map;
 import java.util.Optional;
 import java.util.Set;
+import java.util.concurrent.ConcurrentHashMap;
 import java.util.function.BiConsumer;
 import java.util.function.Function;
 import java.util.logging.Level;
@@ -35,7 +36,7 @@ import org.w3c.dom.Document;
 import org.w3c.dom.NamedNodeMap;
 import org.w3c.dom.Node;
 
-import com.l2jmobius.commons.util.IGameXmlReader;
+import com.l2jmobius.commons.util.IXmlReader;
 import com.l2jmobius.gameserver.handler.EffectHandler;
 import com.l2jmobius.gameserver.handler.SkillConditionHandler;
 import com.l2jmobius.gameserver.model.StatsSet;
@@ -51,12 +52,12 @@ import com.l2jmobius.gameserver.util.exp4j.ExpressionBuilder;
  * Skill data parser.
  * @author NosBit
  */
-public class SkillData implements IGameXmlReader
+public class SkillData implements IXmlReader
 {
 	private static final Logger LOGGER = Logger.getLogger(SkillData.class.getName());
 	
-	private final Map<Long, Skill> _skills = new HashMap<>();
-	private final Map<Integer, Integer> _skillsMaxLevel = new HashMap<>();
+	private final Map<Long, Skill> _skills = new ConcurrentHashMap<>();
+	private final Map<Integer, Integer> _skillsMaxLevel = new ConcurrentHashMap<>();
 	
 	private class NamedParamInfo
 	{
diff --git a/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/data/xml/impl/SkillTreesData.java b/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/data/xml/impl/SkillTreesData.java
index 7f667059db..780e0a1d1c 100644
--- a/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/data/xml/impl/SkillTreesData.java
+++ b/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/data/xml/impl/SkillTreesData.java
@@ -29,6 +29,7 @@ import java.util.List;
 import java.util.Map;
 import java.util.Map.Entry;
 import java.util.Set;
+import java.util.concurrent.ConcurrentHashMap;
 import java.util.concurrent.atomic.AtomicBoolean;
 import java.util.logging.Logger;
 import java.util.stream.Collectors;
@@ -38,7 +39,7 @@ import org.w3c.dom.NamedNodeMap;
 import org.w3c.dom.Node;
 
 import com.l2jmobius.Config;
-import com.l2jmobius.commons.util.IGameXmlReader;
+import com.l2jmobius.commons.util.IXmlReader;
 import com.l2jmobius.gameserver.enums.CategoryType;
 import com.l2jmobius.gameserver.enums.Race;
 import com.l2jmobius.gameserver.enums.SubclassType;
@@ -77,34 +78,34 @@ import com.l2jmobius.gameserver.model.skills.Skill;
  * For XML schema please refer to skillTrees.xsd in datapack in xsd folder and for parameters documentation refer to documentation.txt in skillTrees folder.<br>
  * @author Zoey76
  */
-public final class SkillTreesData implements IGameXmlReader
+public final class SkillTreesData implements IXmlReader
 {
 	private static final Logger LOGGER = Logger.getLogger(SkillTreesData.class.getName());
 	
 	// ClassId, Map of Skill Hash Code, SkillLearn
-	private static final Map<ClassId, Map<Long, SkillLearn>> _classSkillTrees = new HashMap<>();
-	private static final Map<ClassId, Map<Long, SkillLearn>> _transferSkillTrees = new HashMap<>();
-	private static final Map<Race, Map<Long, SkillLearn>> _raceSkillTree = new HashMap<>();
-	private static final Map<SubclassType, Map<Long, SkillLearn>> _revelationSkillTree = new HashMap<>();
-	private static final Map<ClassId, Set<Integer>> _awakeningSaveSkillTree = new HashMap<>();
+	private static final Map<ClassId, Map<Long, SkillLearn>> _classSkillTrees = new ConcurrentHashMap<>();
+	private static final Map<ClassId, Map<Long, SkillLearn>> _transferSkillTrees = new ConcurrentHashMap<>();
+	private static final Map<Race, Map<Long, SkillLearn>> _raceSkillTree = new ConcurrentHashMap<>();
+	private static final Map<SubclassType, Map<Long, SkillLearn>> _revelationSkillTree = new ConcurrentHashMap<>();
+	private static final Map<ClassId, Set<Integer>> _awakeningSaveSkillTree = new ConcurrentHashMap<>();
 	// Skill Hash Code, SkillLearn
-	private static final Map<Long, SkillLearn> _collectSkillTree = new HashMap<>();
-	private static final Map<Long, SkillLearn> _fishingSkillTree = new HashMap<>();
-	private static final Map<Long, SkillLearn> _pledgeSkillTree = new HashMap<>();
-	private static final Map<Long, SkillLearn> _subClassSkillTree = new HashMap<>();
-	private static final Map<Long, SkillLearn> _subPledgeSkillTree = new HashMap<>();
-	private static final Map<Long, SkillLearn> _transformSkillTree = new HashMap<>();
-	private static final Map<Long, SkillLearn> _commonSkillTree = new HashMap<>();
-	private static final Map<Long, SkillLearn> _abilitySkillTree = new HashMap<>();
-	private static final Map<Long, SkillLearn> _alchemySkillTree = new HashMap<>();
-	private static final Map<Long, SkillLearn> _dualClassSkillTree = new HashMap<>();
+	private static final Map<Long, SkillLearn> _collectSkillTree = new ConcurrentHashMap<>();
+	private static final Map<Long, SkillLearn> _fishingSkillTree = new ConcurrentHashMap<>();
+	private static final Map<Long, SkillLearn> _pledgeSkillTree = new ConcurrentHashMap<>();
+	private static final Map<Long, SkillLearn> _subClassSkillTree = new ConcurrentHashMap<>();
+	private static final Map<Long, SkillLearn> _subPledgeSkillTree = new ConcurrentHashMap<>();
+	private static final Map<Long, SkillLearn> _transformSkillTree = new ConcurrentHashMap<>();
+	private static final Map<Long, SkillLearn> _commonSkillTree = new ConcurrentHashMap<>();
+	private static final Map<Long, SkillLearn> _abilitySkillTree = new ConcurrentHashMap<>();
+	private static final Map<Long, SkillLearn> _alchemySkillTree = new ConcurrentHashMap<>();
+	private static final Map<Long, SkillLearn> _dualClassSkillTree = new ConcurrentHashMap<>();
 	// Other skill trees
-	private static final Map<Long, SkillLearn> _nobleSkillTree = new HashMap<>();
-	private static final Map<Long, SkillLearn> _heroSkillTree = new HashMap<>();
-	private static final Map<Long, SkillLearn> _gameMasterSkillTree = new HashMap<>();
-	private static final Map<Long, SkillLearn> _gameMasterAuraSkillTree = new HashMap<>();
+	private static final Map<Long, SkillLearn> _nobleSkillTree = new ConcurrentHashMap<>();
+	private static final Map<Long, SkillLearn> _heroSkillTree = new ConcurrentHashMap<>();
+	private static final Map<Long, SkillLearn> _gameMasterSkillTree = new ConcurrentHashMap<>();
+	private static final Map<Long, SkillLearn> _gameMasterAuraSkillTree = new ConcurrentHashMap<>();
 	// Remove skill tree
-	private static final Map<ClassId, Set<Integer>> _removeSkillCache = new HashMap<>();
+	private static final Map<ClassId, Set<Integer>> _removeSkillCache = new ConcurrentHashMap<>();
 	
 	// Checker, sorted arrays of hash codes
 	private Map<Integer, long[]> _skillsByClassIdHashCodes; // Occupation skills
@@ -112,7 +113,7 @@ public final class SkillTreesData implements IGameXmlReader
 	private long[] _allSkillsHashCodes; // Fishing, Collection, Transformations, Common Skills.
 	
 	/** Parent class Ids are read from XML and stored in this map, to allow easy customization. */
-	private static final Map<ClassId, ClassId> _parentClassMap = new HashMap<>();
+	private static final Map<ClassId, ClassId> _parentClassMap = new ConcurrentHashMap<>();
 	
 	private final AtomicBoolean _isLoading = new AtomicBoolean();
 	
diff --git a/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/data/xml/impl/SpawnsData.java b/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/data/xml/impl/SpawnsData.java
index dc41b02109..806d00902a 100644
--- a/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/data/xml/impl/SpawnsData.java
+++ b/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/data/xml/impl/SpawnsData.java
@@ -19,9 +19,10 @@ package com.l2jmobius.gameserver.data.xml.impl;
 import java.io.File;
 import java.util.ArrayList;
 import java.util.Collections;
-import java.util.LinkedList;
 import java.util.List;
 import java.util.Map;
+import java.util.concurrent.CopyOnWriteArrayList;
+import java.util.concurrent.ScheduledFuture;
 import java.util.function.Predicate;
 import java.util.logging.Level;
 import java.util.logging.Logger;
@@ -31,7 +32,7 @@ import org.w3c.dom.Document;
 import org.w3c.dom.Node;
 
 import com.l2jmobius.Config;
-import com.l2jmobius.commons.util.IGameXmlReader;
+import com.l2jmobius.commons.concurrent.ThreadPool;
 import com.l2jmobius.commons.util.IXmlReader;
 import com.l2jmobius.gameserver.model.ChanceLocation;
 import com.l2jmobius.gameserver.model.StatsSet;
@@ -49,11 +50,11 @@ import com.l2jmobius.gameserver.model.zone.type.SpawnTerritory;
 /**
  * @author UnAfraid
  */
-public class SpawnsData implements IGameXmlReader
+public class SpawnsData implements IXmlReader
 {
 	protected static final Logger LOGGER = Logger.getLogger(SpawnsData.class.getName());
 	
-	private final List<SpawnTemplate> _spawns = new LinkedList<>();
+	private final List<SpawnTemplate> _spawns = new CopyOnWriteArrayList<>();
 	
 	protected SpawnsData()
 	{
@@ -94,11 +95,28 @@ public class SpawnsData implements IGameXmlReader
 		}
 		
 		LOGGER.info(getClass().getSimpleName() + ": Initializing spawns...");
-		_spawns.stream().filter(SpawnTemplate::isSpawningByDefault).forEach(template ->
+		final List<ScheduledFuture<?>> jobs = new CopyOnWriteArrayList<>();
+		for (SpawnTemplate template : _spawns)
 		{
-			template.spawnAll(null);
-			template.notifyActivate();
-		});
+			if (template.isSpawningByDefault())
+			{
+				jobs.add(ThreadPool.schedule(() ->
+				{
+					template.spawnAll(null);
+					template.notifyActivate();
+				}, 0));
+			}
+		}
+		while (!jobs.isEmpty())
+		{
+			for (ScheduledFuture<?> job : jobs)
+			{
+				if ((job == null) || job.isDone() || job.isCancelled())
+				{
+					jobs.remove(job);
+				}
+			}
+		}
 		LOGGER.info(getClass().getSimpleName() + ": All spawns has been initialized!");
 	}
 	
diff --git a/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/data/xml/impl/StaticObjectData.java b/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/data/xml/impl/StaticObjectData.java
index 8af86bec88..5e88dd66fb 100644
--- a/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/data/xml/impl/StaticObjectData.java
+++ b/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/data/xml/impl/StaticObjectData.java
@@ -26,7 +26,7 @@ import org.w3c.dom.Document;
 import org.w3c.dom.NamedNodeMap;
 import org.w3c.dom.Node;
 
-import com.l2jmobius.commons.util.IGameXmlReader;
+import com.l2jmobius.commons.util.IXmlReader;
 import com.l2jmobius.gameserver.model.StatsSet;
 import com.l2jmobius.gameserver.model.actor.instance.StaticObjectInstance;
 import com.l2jmobius.gameserver.model.actor.templates.CreatureTemplate;
@@ -35,7 +35,7 @@ import com.l2jmobius.gameserver.model.actor.templates.CreatureTemplate;
  * This class loads and holds all static object data.
  * @author UnAfraid
  */
-public final class StaticObjectData implements IGameXmlReader
+public final class StaticObjectData implements IXmlReader
 {
 	private static final Logger LOGGER = Logger.getLogger(StaticObjectData.class.getName());
 	
diff --git a/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/data/xml/impl/TeleportersData.java b/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/data/xml/impl/TeleportersData.java
index 1d039725ad..5afec008f7 100644
--- a/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/data/xml/impl/TeleportersData.java
+++ b/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/data/xml/impl/TeleportersData.java
@@ -20,12 +20,13 @@ import java.io.File;
 import java.util.Collections;
 import java.util.HashMap;
 import java.util.Map;
+import java.util.concurrent.ConcurrentHashMap;
 import java.util.logging.Logger;
 
 import org.w3c.dom.Document;
 import org.w3c.dom.NamedNodeMap;
 
-import com.l2jmobius.commons.util.IGameXmlReader;
+import com.l2jmobius.commons.util.IXmlReader;
 import com.l2jmobius.gameserver.enums.TeleportType;
 import com.l2jmobius.gameserver.model.StatsSet;
 import com.l2jmobius.gameserver.model.teleporter.TeleportHolder;
@@ -33,12 +34,12 @@ import com.l2jmobius.gameserver.model.teleporter.TeleportHolder;
 /**
  * @author UnAfraid
  */
-public class TeleportersData implements IGameXmlReader
+public class TeleportersData implements IXmlReader
 {
 	// Logger instance
 	private static final Logger LOGGER = Logger.getLogger(TeleportersData.class.getName());
 	// Teleporter data
-	private final Map<Integer, Map<String, TeleportHolder>> _teleporters = new HashMap<>();
+	private final Map<Integer, Map<String, TeleportHolder>> _teleporters = new ConcurrentHashMap<>();
 	
 	protected TeleportersData()
 	{
diff --git a/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/data/xml/impl/TransformData.java b/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/data/xml/impl/TransformData.java
index 896111de87..d917c7e46f 100644
--- a/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/data/xml/impl/TransformData.java
+++ b/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/data/xml/impl/TransformData.java
@@ -17,15 +17,15 @@
 package com.l2jmobius.gameserver.data.xml.impl;
 
 import java.io.File;
-import java.util.HashMap;
 import java.util.Map;
+import java.util.concurrent.ConcurrentHashMap;
 import java.util.logging.Logger;
 
 import org.w3c.dom.Document;
 import org.w3c.dom.NamedNodeMap;
 import org.w3c.dom.Node;
 
-import com.l2jmobius.commons.util.IGameXmlReader;
+import com.l2jmobius.commons.util.IXmlReader;
 import com.l2jmobius.gameserver.model.StatsSet;
 import com.l2jmobius.gameserver.model.actor.transform.Transform;
 import com.l2jmobius.gameserver.model.actor.transform.TransformLevelData;
@@ -39,11 +39,11 @@ import com.l2jmobius.gameserver.network.serverpackets.ExBasicActionList;
  * Transformation data.
  * @author UnAfraid
  */
-public final class TransformData implements IGameXmlReader
+public final class TransformData implements IXmlReader
 {
 	private static final Logger LOGGER = Logger.getLogger(TransformData.class.getName());
 	
-	private final Map<Integer, Transform> _transformData = new HashMap<>();
+	private final Map<Integer, Transform> _transformData = new ConcurrentHashMap<>();
 	
 	protected TransformData()
 	{
diff --git a/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/data/xml/impl/VariationData.java b/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/data/xml/impl/VariationData.java
index 13b41c6359..542acc971b 100644
--- a/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/data/xml/impl/VariationData.java
+++ b/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/data/xml/impl/VariationData.java
@@ -22,11 +22,12 @@ import java.util.Collections;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
+import java.util.concurrent.ConcurrentHashMap;
 import java.util.logging.Logger;
 
 import org.w3c.dom.Document;
 
-import com.l2jmobius.commons.util.IGameXmlReader;
+import com.l2jmobius.commons.util.IXmlReader;
 import com.l2jmobius.gameserver.datatables.ItemTable;
 import com.l2jmobius.gameserver.model.VariationInstance;
 import com.l2jmobius.gameserver.model.items.instance.ItemInstance;
@@ -40,12 +41,12 @@ import com.l2jmobius.gameserver.model.options.VariationWeaponType;
 /**
  * @author Pere
  */
-public class VariationData implements IGameXmlReader
+public class VariationData implements IXmlReader
 {
 	private static final Logger LOGGER = Logger.getLogger(VariationData.class.getSimpleName());
 	
-	private final Map<Integer, Variation> _variations = new HashMap<>();
-	private final Map<Integer, Map<Integer, VariationFee>> _fees = new HashMap<>();
+	private final Map<Integer, Variation> _variations = new ConcurrentHashMap<>();
+	private final Map<Integer, Map<Integer, VariationFee>> _fees = new ConcurrentHashMap<>();
 	
 	protected VariationData()
 	{
diff --git a/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/engines/DocumentEngine.java b/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/engines/DocumentEngine.java
index d787488757..10f04f4fb3 100644
--- a/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/engines/DocumentEngine.java
+++ b/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/engines/DocumentEngine.java
@@ -17,11 +17,14 @@
 package com.l2jmobius.gameserver.engines;
 
 import java.io.File;
-import java.util.LinkedList;
+import java.util.ArrayList;
 import java.util.List;
+import java.util.concurrent.CopyOnWriteArrayList;
+import java.util.concurrent.ScheduledFuture;
 import java.util.logging.Logger;
 
 import com.l2jmobius.Config;
+import com.l2jmobius.commons.concurrent.ThreadPool;
 import com.l2jmobius.commons.util.file.filter.XMLFilter;
 import com.l2jmobius.gameserver.engines.items.DocumentItem;
 import com.l2jmobius.gameserver.model.items.Item;
@@ -33,34 +36,29 @@ public class DocumentEngine
 {
 	private static final Logger LOGGER = Logger.getLogger(DocumentEngine.class.getName());
 	
-	private final List<File> _itemFiles = new LinkedList<>();
-	
-	public static DocumentEngine getInstance()
-	{
-		return SingletonHolder._instance;
-	}
+	private final List<File> _itemFiles = new ArrayList<>();
 	
 	protected DocumentEngine()
 	{
-		hashFiles("data/stats/items", _itemFiles);
+		processDirectory("data/stats/items", _itemFiles);
 		if (Config.CUSTOM_ITEMS_LOAD)
 		{
-			hashFiles("data/stats/items/custom", _itemFiles);
+			processDirectory("data/stats/items/custom", _itemFiles);
 		}
 	}
 	
-	private void hashFiles(String dirname, List<File> hash)
+	private void processDirectory(String dirName, List<File> list)
 	{
-		final File dir = new File(Config.DATAPACK_ROOT, dirname);
+		final File dir = new File(Config.DATAPACK_ROOT, dirName);
 		if (!dir.exists())
 		{
-			LOGGER.warning("Dir " + dir.getAbsolutePath() + " not exists");
+			LOGGER.warning("Dir " + dir.getAbsolutePath() + " does not exist.");
 			return;
 		}
 		final File[] files = dir.listFiles(new XMLFilter());
-		for (File f : files)
+		for (File file : files)
 		{
-			hash.add(f);
+			list.add(file);
 		}
 	}
 	
@@ -70,12 +68,26 @@ public class DocumentEngine
 	 */
 	public List<Item> loadItems()
 	{
-		final List<Item> list = new LinkedList<>();
-		for (File f : _itemFiles)
+		final List<Item> list = new CopyOnWriteArrayList<>();
+		final List<ScheduledFuture<?>> jobs = new CopyOnWriteArrayList<>();
+		for (File file : _itemFiles)
 		{
-			final DocumentItem document = new DocumentItem(f);
-			document.parse();
-			list.addAll(document.getItemList());
+			jobs.add(ThreadPool.schedule(() ->
+			{
+				final DocumentItem document = new DocumentItem(file);
+				document.parse();
+				list.addAll(document.getItemList());
+			}, 0));
+		}
+		while (!jobs.isEmpty())
+		{
+			for (ScheduledFuture<?> job : jobs)
+			{
+				if ((job == null) || job.isDone() || job.isCancelled())
+				{
+					jobs.remove(job);
+				}
+			}
 		}
 		return list;
 	}
@@ -84,4 +96,9 @@ public class DocumentEngine
 	{
 		protected static final DocumentEngine _instance = new DocumentEngine();
 	}
+	
+	public static DocumentEngine getInstance()
+	{
+		return SingletonHolder._instance;
+	}
 }
diff --git a/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/engines/items/DocumentItem.java b/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/engines/items/DocumentItem.java
index 8aaaed2cb4..4ea960563d 100644
--- a/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/engines/items/DocumentItem.java
+++ b/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/engines/items/DocumentItem.java
@@ -19,7 +19,7 @@ package com.l2jmobius.gameserver.engines.items;
 import java.io.File;
 import java.lang.reflect.Constructor;
 import java.lang.reflect.InvocationTargetException;
-import java.util.LinkedList;
+import java.util.ArrayList;
 import java.util.List;
 import java.util.logging.Level;
 import java.util.logging.Logger;
@@ -27,7 +27,7 @@ import java.util.logging.Logger;
 import org.w3c.dom.Document;
 import org.w3c.dom.Node;
 
-import com.l2jmobius.commons.util.IGameXmlReader;
+import com.l2jmobius.commons.util.IXmlReader;
 import com.l2jmobius.gameserver.engines.DocumentBase;
 import com.l2jmobius.gameserver.enums.ItemSkillType;
 import com.l2jmobius.gameserver.model.ExtractableProduct;
@@ -41,12 +41,12 @@ import com.l2jmobius.gameserver.model.stats.functions.FuncTemplate;
 /**
  * @author mkizub, JIV
  */
-public final class DocumentItem extends DocumentBase implements IGameXmlReader
+public final class DocumentItem extends DocumentBase implements IXmlReader
 {
 	Logger LOGGER = Logger.getLogger(DocumentItem.class.getName());
 	
 	private ItemDataHolder _currentItem = null;
-	private final List<Item> _itemsInFile = new LinkedList<>();
+	private final List<Item> _itemsInFile = new ArrayList<>();
 	
 	/**
 	 * @param file
diff --git a/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/handler/ConditionHandler.java b/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/handler/ConditionHandler.java
index c92ef368b3..4e20d5e720 100644
--- a/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/handler/ConditionHandler.java
+++ b/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/handler/ConditionHandler.java
@@ -50,7 +50,7 @@ public final class ConditionHandler
 	{
 		try
 		{
-			ScriptEngineManager.getInstance().executeConditionMasterHandler();
+			ScriptEngineManager.getInstance().executeScript(ScriptEngineManager.CONDITION_HANDLER_FILE);
 		}
 		catch (Exception e)
 		{
diff --git a/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/handler/DailyMissionHandler.java b/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/handler/DailyMissionHandler.java
index 9a80c1db8f..6b6248da49 100644
--- a/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/handler/DailyMissionHandler.java
+++ b/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/handler/DailyMissionHandler.java
@@ -49,7 +49,7 @@ public class DailyMissionHandler
 	{
 		try
 		{
-			ScriptEngineManager.getInstance().executeDailyMissionMasterHandler();
+			ScriptEngineManager.getInstance().executeScript(ScriptEngineManager.ONE_DAY_REWARD_MASTER_HANDLER);
 		}
 		catch (Exception e)
 		{
diff --git a/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/handler/EffectHandler.java b/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/handler/EffectHandler.java
index 0bf5350cb8..cab6562421 100644
--- a/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/handler/EffectHandler.java
+++ b/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/handler/EffectHandler.java
@@ -50,7 +50,7 @@ public final class EffectHandler
 	{
 		try
 		{
-			ScriptEngineManager.getInstance().executeEffectMasterHandler();
+			ScriptEngineManager.getInstance().executeScript(ScriptEngineManager.EFFECT_MASTER_HANDLER_FILE);
 		}
 		catch (Exception e)
 		{
diff --git a/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/handler/SkillConditionHandler.java b/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/handler/SkillConditionHandler.java
index b764410ba1..8685b0279a 100644
--- a/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/handler/SkillConditionHandler.java
+++ b/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/handler/SkillConditionHandler.java
@@ -50,7 +50,7 @@ public final class SkillConditionHandler
 	{
 		try
 		{
-			ScriptEngineManager.getInstance().executeSkillConditionMasterHandler();
+			ScriptEngineManager.getInstance().executeScript(ScriptEngineManager.SKILL_CONDITION_HANDLER_FILE);
 		}
 		catch (Exception e)
 		{
diff --git a/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/instancemanager/CastleManorManager.java b/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/instancemanager/CastleManorManager.java
index 48d04d3f38..212d1a043c 100644
--- a/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/instancemanager/CastleManorManager.java
+++ b/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/instancemanager/CastleManorManager.java
@@ -40,7 +40,7 @@ import org.w3c.dom.Node;
 import com.l2jmobius.Config;
 import com.l2jmobius.commons.concurrent.ThreadPool;
 import com.l2jmobius.commons.database.DatabaseFactory;
-import com.l2jmobius.commons.util.IGameXmlReader;
+import com.l2jmobius.commons.util.IXmlReader;
 import com.l2jmobius.commons.util.Rnd;
 import com.l2jmobius.gameserver.enums.ManorMode;
 import com.l2jmobius.gameserver.model.CropProcure;
@@ -58,7 +58,7 @@ import com.l2jmobius.gameserver.network.SystemMessageId;
  * Castle manor system.
  * @author malyelfik
  */
-public final class CastleManorManager implements IGameXmlReader, IStorable
+public final class CastleManorManager implements IXmlReader, IStorable
 {
 	private static final Logger LOGGER = Logger.getLogger(CastleManorManager.class.getName());
 	
diff --git a/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/instancemanager/CursedWeaponsManager.java b/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/instancemanager/CursedWeaponsManager.java
index d123b41ef6..835d961c56 100644
--- a/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/instancemanager/CursedWeaponsManager.java
+++ b/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/instancemanager/CursedWeaponsManager.java
@@ -35,7 +35,7 @@ import org.w3c.dom.Node;
 
 import com.l2jmobius.Config;
 import com.l2jmobius.commons.database.DatabaseFactory;
-import com.l2jmobius.commons.util.IGameXmlReader;
+import com.l2jmobius.commons.util.IXmlReader;
 import com.l2jmobius.gameserver.model.CursedWeapon;
 import com.l2jmobius.gameserver.model.actor.Attackable;
 import com.l2jmobius.gameserver.model.actor.Creature;
@@ -54,7 +54,7 @@ import com.l2jmobius.gameserver.util.Broadcast;
  * UnAfraid: TODO: Rewrite with DocumentParser
  * @author Micht
  */
-public final class CursedWeaponsManager implements IGameXmlReader
+public final class CursedWeaponsManager implements IXmlReader
 {
 	private static final Logger LOGGER = Logger.getLogger(CursedWeaponsManager.class.getName());
 	
diff --git a/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/instancemanager/FakePlayerChatManager.java b/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/instancemanager/FakePlayerChatManager.java
index 7101927e48..39c239a762 100644
--- a/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/instancemanager/FakePlayerChatManager.java
+++ b/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/instancemanager/FakePlayerChatManager.java
@@ -25,7 +25,7 @@ import org.w3c.dom.Document;
 
 import com.l2jmobius.Config;
 import com.l2jmobius.commons.concurrent.ThreadPool;
-import com.l2jmobius.commons.util.IGameXmlReader;
+import com.l2jmobius.commons.util.IXmlReader;
 import com.l2jmobius.commons.util.Rnd;
 import com.l2jmobius.gameserver.data.xml.impl.FakePlayerData;
 import com.l2jmobius.gameserver.datatables.SpawnTable;
@@ -41,7 +41,7 @@ import com.l2jmobius.gameserver.network.serverpackets.CreatureSay;
 /**
  * @author Mobius
  */
-public final class FakePlayerChatManager implements IGameXmlReader
+public final class FakePlayerChatManager implements IXmlReader
 {
 	private static Logger LOGGER = Logger.getLogger(FakePlayerChatManager.class.getName());
 	final List<FakePlayerChatHolder> MESSAGES = new ArrayList<>();
diff --git a/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/instancemanager/InstanceManager.java b/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/instancemanager/InstanceManager.java
index f300213c49..5ea229cf1b 100644
--- a/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/instancemanager/InstanceManager.java
+++ b/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/instancemanager/InstanceManager.java
@@ -40,7 +40,6 @@ import org.w3c.dom.Node;
 
 import com.l2jmobius.Config;
 import com.l2jmobius.commons.database.DatabaseFactory;
-import com.l2jmobius.commons.util.IGameXmlReader;
 import com.l2jmobius.commons.util.IXmlReader;
 import com.l2jmobius.gameserver.data.xml.impl.DoorData;
 import com.l2jmobius.gameserver.data.xml.impl.SpawnsData;
@@ -61,7 +60,7 @@ import com.l2jmobius.gameserver.model.spawns.SpawnTemplate;
  * Instance manager.
  * @author evill33t, GodKratos, malyelfik
  */
-public final class InstanceManager implements IGameXmlReader
+public final class InstanceManager implements IXmlReader
 {
 	private static final Logger LOGGER = Logger.getLogger(InstanceManager.class.getName());
 	// Database query
diff --git a/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/instancemanager/ItemAuctionManager.java b/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/instancemanager/ItemAuctionManager.java
index f819adf93b..752bcfdd3f 100644
--- a/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/instancemanager/ItemAuctionManager.java
+++ b/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/instancemanager/ItemAuctionManager.java
@@ -34,13 +34,13 @@ import org.w3c.dom.Node;
 
 import com.l2jmobius.Config;
 import com.l2jmobius.commons.database.DatabaseFactory;
-import com.l2jmobius.commons.util.IGameXmlReader;
+import com.l2jmobius.commons.util.IXmlReader;
 import com.l2jmobius.gameserver.model.itemauction.ItemAuctionInstance;
 
 /**
  * @author Forsaiken
  */
-public final class ItemAuctionManager implements IGameXmlReader
+public final class ItemAuctionManager implements IXmlReader
 {
 	private static final Logger LOGGER = Logger.getLogger(ItemAuctionManager.class.getName());
 	
diff --git a/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/instancemanager/MapRegionManager.java b/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/instancemanager/MapRegionManager.java
index 255d4340ff..8f68a4bdf5 100644
--- a/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/instancemanager/MapRegionManager.java
+++ b/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/instancemanager/MapRegionManager.java
@@ -27,7 +27,7 @@ import org.w3c.dom.NamedNodeMap;
 import org.w3c.dom.Node;
 
 import com.l2jmobius.Config;
-import com.l2jmobius.commons.util.IGameXmlReader;
+import com.l2jmobius.commons.util.IXmlReader;
 import com.l2jmobius.gameserver.data.xml.impl.ClanHallData;
 import com.l2jmobius.gameserver.model.Location;
 import com.l2jmobius.gameserver.model.MapRegion;
@@ -47,7 +47,7 @@ import com.l2jmobius.gameserver.model.zone.type.RespawnZone;
  * Map Region Manager.
  * @author Nyaran
  */
-public final class MapRegionManager implements IGameXmlReader
+public final class MapRegionManager implements IXmlReader
 {
 	private static final Logger LOGGER = Logger.getLogger(MapRegionManager.class.getName());
 	
diff --git a/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/instancemanager/SellBuffsManager.java b/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/instancemanager/SellBuffsManager.java
index dcf1bae346..0c4e94f449 100644
--- a/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/instancemanager/SellBuffsManager.java
+++ b/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/instancemanager/SellBuffsManager.java
@@ -26,7 +26,7 @@ import org.w3c.dom.Element;
 import org.w3c.dom.NodeList;
 
 import com.l2jmobius.Config;
-import com.l2jmobius.commons.util.IGameXmlReader;
+import com.l2jmobius.commons.util.IXmlReader;
 import com.l2jmobius.gameserver.cache.HtmCache;
 import com.l2jmobius.gameserver.data.xml.impl.SkillData;
 import com.l2jmobius.gameserver.datatables.ItemTable;
@@ -46,7 +46,7 @@ import com.l2jmobius.gameserver.util.Util;
  * Sell Buffs Manager
  * @author St3eT
  */
-public final class SellBuffsManager implements IGameXmlReader
+public final class SellBuffsManager implements IXmlReader
 {
 	private static final Logger LOGGER = Logger.getLogger(SellBuffsManager.class.getName());
 	private static final List<Integer> ALLOWED_BUFFS = new ArrayList<>();
diff --git a/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/instancemanager/WalkingManager.java b/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/instancemanager/WalkingManager.java
index 4583519bc4..18c4814040 100644
--- a/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/instancemanager/WalkingManager.java
+++ b/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/instancemanager/WalkingManager.java
@@ -28,7 +28,7 @@ import org.w3c.dom.NamedNodeMap;
 import org.w3c.dom.Node;
 
 import com.l2jmobius.commons.concurrent.ThreadPool;
-import com.l2jmobius.commons.util.IGameXmlReader;
+import com.l2jmobius.commons.util.IXmlReader;
 import com.l2jmobius.gameserver.ai.CtrlIntention;
 import com.l2jmobius.gameserver.data.xml.impl.NpcData;
 import com.l2jmobius.gameserver.enums.ChatType;
@@ -49,7 +49,7 @@ import com.l2jmobius.gameserver.network.NpcStringId;
  * This class manages walking monsters.
  * @author GKR
  */
-public final class WalkingManager implements IGameXmlReader
+public final class WalkingManager implements IXmlReader
 {
 	private static final Logger LOGGER = Logger.getLogger(WalkingManager.class.getName());
 	
diff --git a/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/instancemanager/ZoneManager.java b/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/instancemanager/ZoneManager.java
index b698f51a03..9a0bd870f2 100644
--- a/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/instancemanager/ZoneManager.java
+++ b/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/instancemanager/ZoneManager.java
@@ -26,6 +26,7 @@ import java.util.List;
 import java.util.Map;
 import java.util.Optional;
 import java.util.OptionalInt;
+import java.util.concurrent.ConcurrentHashMap;
 import java.util.logging.Level;
 import java.util.logging.Logger;
 
@@ -33,7 +34,7 @@ import org.w3c.dom.Document;
 import org.w3c.dom.NamedNodeMap;
 import org.w3c.dom.Node;
 
-import com.l2jmobius.commons.util.IGameXmlReader;
+import com.l2jmobius.commons.util.IXmlReader;
 import com.l2jmobius.gameserver.model.World;
 import com.l2jmobius.gameserver.model.WorldObject;
 import com.l2jmobius.gameserver.model.actor.Creature;
@@ -55,7 +56,7 @@ import com.l2jmobius.gameserver.model.zone.type.SpawnTerritory;
  * This class manages the zones
  * @author durgus
  */
-public final class ZoneManager implements IGameXmlReader
+public final class ZoneManager implements IXmlReader
 {
 	private static final Logger LOGGER = Logger.getLogger(ZoneManager.class.getName());
 	
@@ -65,9 +66,9 @@ public final class ZoneManager implements IGameXmlReader
 	private static final int OFFSET_X = Math.abs(World.MAP_MIN_X >> SHIFT_BY);
 	private static final int OFFSET_Y = Math.abs(World.MAP_MIN_Y >> SHIFT_BY);
 	
-	private final Map<Class<? extends ZoneType>, Map<Integer, ? extends ZoneType>> _classZones = new HashMap<>();
-	private final Map<String, SpawnTerritory> _spawnTerritories = new HashMap<>();
-	private int _lastDynamicId = 300000;
+	private final Map<Class<? extends ZoneType>, ConcurrentHashMap<Integer, ? extends ZoneType>> _classZones = new ConcurrentHashMap<>();
+	private final Map<String, SpawnTerritory> _spawnTerritories = new ConcurrentHashMap<>();
+	private volatile int _lastDynamicId = 300000;
 	private List<ItemInstance> _debugItems;
 	
 	private final ZoneRegion[][] _zoneRegions = new ZoneRegion[(World.MAP_MAX_X >> SHIFT_BY) + OFFSET_X + 1][(World.MAP_MAX_Y >> SHIFT_BY) + OFFSET_Y + 1];
@@ -365,7 +366,7 @@ public final class ZoneManager implements IGameXmlReader
 						}
 						if (checkId(zoneId))
 						{
-							LOGGER.config(getClass().getSimpleName() + ": Caution: Zone (" + zoneId + ") from file: " + f.getName() + " overrides previos definition.");
+							LOGGER.config(getClass().getSimpleName() + ": Caution: Zone (" + zoneId + ") from file: " + f.getName() + " overrides previuos definition.");
 						}
 						
 						if ((zoneName != null) && !zoneName.isEmpty())
@@ -453,10 +454,10 @@ public final class ZoneManager implements IGameXmlReader
 	@SuppressWarnings("unchecked")
 	private <T extends ZoneType> void addZone(Integer id, T zone)
 	{
-		Map<Integer, T> map = (Map<Integer, T>) _classZones.get(zone.getClass());
+		ConcurrentHashMap<Integer, T> map = (ConcurrentHashMap<Integer, T>) _classZones.get(zone.getClass());
 		if (map == null)
 		{
-			map = new HashMap<>();
+			map = new ConcurrentHashMap<>();
 			map.put(id, zone);
 			_classZones.put(zone.getClass(), map);
 		}
diff --git a/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/model/quest/LongTimeEvent.java b/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/model/quest/LongTimeEvent.java
index cc71991407..0fa020eb5d 100644
--- a/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/model/quest/LongTimeEvent.java
+++ b/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/model/quest/LongTimeEvent.java
@@ -32,7 +32,7 @@ import org.w3c.dom.Node;
 
 import com.l2jmobius.commons.concurrent.ThreadPool;
 import com.l2jmobius.commons.database.DatabaseFactory;
-import com.l2jmobius.commons.util.IGameXmlReader;
+import com.l2jmobius.commons.util.IXmlReader;
 import com.l2jmobius.gameserver.data.sql.impl.AnnouncementsTable;
 import com.l2jmobius.gameserver.data.xml.impl.NpcData;
 import com.l2jmobius.gameserver.datatables.EventDroplist;
@@ -117,7 +117,7 @@ public class LongTimeEvent extends Quest
 	 */
 	private void loadConfig()
 	{
-		new IGameXmlReader()
+		new IXmlReader()
 		{
 			@Override
 			public void load()
diff --git a/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/model/stats/BaseStats.java b/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/model/stats/BaseStats.java
index daba0d3071..64af7961e9 100644
--- a/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/model/stats/BaseStats.java
+++ b/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/model/stats/BaseStats.java
@@ -23,7 +23,6 @@ import java.util.logging.Logger;
 import org.w3c.dom.Document;
 import org.w3c.dom.NamedNodeMap;
 
-import com.l2jmobius.commons.util.IGameXmlReader;
 import com.l2jmobius.commons.util.IXmlReader;
 import com.l2jmobius.gameserver.model.actor.Creature;
 
@@ -105,7 +104,7 @@ public enum BaseStats
 	
 	static
 	{
-		new IGameXmlReader()
+		new IXmlReader()
 		{
 			final Logger LOGGER = Logger.getLogger(BaseStats.class.getName());
 			
diff --git a/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/scripting/ScriptEngineManager.java b/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/scripting/ScriptEngineManager.java
index 9eb6d85b69..95409c567a 100644
--- a/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/scripting/ScriptEngineManager.java
+++ b/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/scripting/ScriptEngineManager.java
@@ -28,8 +28,6 @@ import java.nio.file.attribute.BasicFileAttributes;
 import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.Iterator;
-import java.util.LinkedHashMap;
-import java.util.LinkedList;
 import java.util.List;
 import java.util.Map;
 import java.util.Map.Entry;
@@ -42,14 +40,14 @@ import java.util.logging.Logger;
 import org.w3c.dom.Document;
 
 import com.l2jmobius.Config;
-import com.l2jmobius.commons.util.IGameXmlReader;
+import com.l2jmobius.commons.util.IXmlReader;
 import com.l2jmobius.gameserver.scripting.java.JavaScriptingEngine;
 
 /**
  * Caches script engines and provides functionality for executing and managing scripts.
  * @author KenM, HorridoJoho
  */
-public final class ScriptEngineManager implements IGameXmlReader
+public final class ScriptEngineManager implements IXmlReader
 {
 	private static final Logger LOGGER = Logger.getLogger(ScriptEngineManager.class.getName());
 	public static final Path SCRIPT_FOLDER = Paths.get(Config.DATAPACK_ROOT.getAbsolutePath(), "data", "scripts");
@@ -59,8 +57,7 @@ public final class ScriptEngineManager implements IGameXmlReader
 	public static final Path CONDITION_HANDLER_FILE = Paths.get(SCRIPT_FOLDER.toString(), "handlers", "ConditionMasterHandler.java");
 	public static final Path ONE_DAY_REWARD_MASTER_HANDLER = Paths.get(SCRIPT_FOLDER.toString(), "handlers", "DailyMissionMasterHandler.java");
 	
-	private final Map<String, IExecutionContext> _extEngines = new HashMap<>();
-	private IExecutionContext _currentExecutionContext = null;
+	private IExecutionContext _javaExecutionContext = null;
 	static final List<String> _exclusions = new ArrayList<>();
 	
 	protected ScriptEngineManager()
@@ -166,12 +163,7 @@ public final class ScriptEngineManager implements IGameXmlReader
 	private void registerEngine(IScriptingEngine engine, Properties props)
 	{
 		maybeSetProperties("language." + engine.getLanguageName() + ".", props, engine);
-		final IExecutionContext context = engine.createExecutionContext();
-		for (String commonExtension : engine.getCommonFileExtensions())
-		{
-			_extEngines.put(commonExtension, context);
-		}
-		
+		_javaExecutionContext = engine.createExecutionContext();
 		LOGGER.info("ScriptEngine: " + engine.getEngineName() + " " + engine.getEngineVersion() + " (" + engine.getLanguageName() + " " + engine.getLanguageVersion() + ")");
 	}
 	
@@ -200,66 +192,6 @@ public final class ScriptEngineManager implements IGameXmlReader
 		}
 	}
 	
-	private IExecutionContext getEngineByExtension(String ext)
-	{
-		return _extEngines.get(ext);
-	}
-	
-	private String getFileExtension(Path p)
-	{
-		final String name = p.getFileName().toString();
-		final int lastDotIdx = name.lastIndexOf('.');
-		if (lastDotIdx == -1)
-		{
-			return null;
-		}
-		
-		final String extension = name.substring(lastDotIdx + 1);
-		if (extension.isEmpty())
-		{
-			return null;
-		}
-		
-		return extension;
-	}
-	
-	private void checkExistingFile(String messagePre, Path filePath) throws Exception
-	{
-		if (!Files.exists(filePath))
-		{
-			throw new Exception(messagePre + ": " + filePath + " does not exists!");
-		}
-		else if (!Files.isRegularFile(filePath))
-		{
-			throw new Exception(messagePre + ": " + filePath + " is not a file!");
-		}
-	}
-	
-	public void executeMasterHandler() throws Exception
-	{
-		executeScript(MASTER_HANDLER_FILE);
-	}
-	
-	public void executeEffectMasterHandler() throws Exception
-	{
-		executeScript(EFFECT_MASTER_HANDLER_FILE);
-	}
-	
-	public void executeSkillConditionMasterHandler() throws Exception
-	{
-		executeScript(SKILL_CONDITION_HANDLER_FILE);
-	}
-	
-	public void executeConditionMasterHandler() throws Exception
-	{
-		executeScript(CONDITION_HANDLER_FILE);
-	}
-	
-	public void executeDailyMissionMasterHandler() throws Exception
-	{
-		executeScript(ONE_DAY_REWARD_MASTER_HANDLER);
-	}
-	
 	public void executeScriptList() throws Exception
 	{
 		if (Config.ALT_DEV_NO_QUESTS)
@@ -267,77 +199,35 @@ public final class ScriptEngineManager implements IGameXmlReader
 			return;
 		}
 		
-		final Map<IExecutionContext, List<Path>> files = new LinkedHashMap<>();
+		final List<Path> files = new ArrayList<>();
 		processDirectory(SCRIPT_FOLDER.toFile(), files);
 		
-		for (Entry<IExecutionContext, List<Path>> entry : files.entrySet())
+		final Map<Path, Throwable> invokationErrors = _javaExecutionContext.executeScripts(files);
+		for (Entry<Path, Throwable> entry : invokationErrors.entrySet())
 		{
-			_currentExecutionContext = entry.getKey();
-			try
-			{
-				final Map<Path, Throwable> invokationErrors = entry.getKey().executeScripts(entry.getValue());
-				for (Entry<Path, Throwable> entry2 : invokationErrors.entrySet())
-				{
-					LOGGER.log(Level.WARNING, "ScriptEngine: " + entry2.getKey() + " failed execution!", entry2.getValue());
-				}
-			}
-			finally
-			{
-				_currentExecutionContext = null;
-			}
+			LOGGER.log(Level.WARNING, "ScriptEngine: " + entry.getKey() + " failed execution!", entry.getValue());
 		}
 	}
 	
-	private void processDirectory(File dir, Map<IExecutionContext, List<Path>> files)
+	private void processDirectory(File dir, List<Path> files)
 	{
 		for (File file : dir.listFiles())
 		{
-			if (file.isDirectory())
+			if (file.isFile())
+			{
+				final String fileName = file.getName();
+				if (fileName.endsWith(".java") && !_exclusions.contains(fileName))
+				{
+					files.add(file.toPath().toAbsolutePath());
+				}
+			}
+			else if (file.isDirectory())
 			{
 				processDirectory(file, files);
 			}
-			else
-			{
-				processFile(file, files);
-			}
 		}
 	}
 	
-	private void processFile(File file, Map<IExecutionContext, List<Path>> files)
-	{
-		if (_exclusions.contains(file.getName()))
-		{
-			return;
-		}
-		
-		Path sourceFile = file.toPath();
-		try
-		{
-			checkExistingFile("ScriptFile", sourceFile);
-		}
-		catch (Exception e)
-		{
-			LOGGER.warning(e.getMessage());
-			return;
-		}
-		
-		sourceFile = sourceFile.toAbsolutePath();
-		final String ext = getFileExtension(sourceFile);
-		if (ext == null)
-		{
-			LOGGER.warning("ScriptFile: " + sourceFile + " does not have an extension to determine the script engine!");
-			return;
-		}
-		
-		final IExecutionContext engine = getEngineByExtension(ext);
-		if (engine == null)
-		{
-			return;
-		}
-		
-		files.computeIfAbsent(engine, k -> new LinkedList<>()).add(sourceFile);
-	}
-	
 	public void executeScript(Path sourceFile) throws Exception
 	{
 		Objects.requireNonNull(sourceFile);
@@ -347,34 +237,19 @@ public final class ScriptEngineManager implements IGameXmlReader
 			sourceFile = SCRIPT_FOLDER.resolve(sourceFile);
 		}
 		
-		// throws exception if not exists or not file
-		checkExistingFile("ScriptFile", sourceFile);
-		
 		sourceFile = sourceFile.toAbsolutePath();
-		final String ext = getFileExtension(sourceFile);
 		Objects.requireNonNull(sourceFile, "ScriptFile: " + sourceFile + " does not have an extension to determine the script engine!");
 		
-		final IExecutionContext engine = getEngineByExtension(ext);
-		Objects.requireNonNull(engine, "ScriptEngine: No engine registered for extension " + ext + "!");
-		
-		_currentExecutionContext = engine;
-		try
+		final Entry<Path, Throwable> error = _javaExecutionContext.executeScript(sourceFile);
+		if (error != null)
 		{
-			final Entry<Path, Throwable> error = engine.executeScript(sourceFile);
-			if (error != null)
-			{
-				throw new Exception("ScriptEngine: " + error.getKey() + " failed execution!", error.getValue());
-			}
-		}
-		finally
-		{
-			_currentExecutionContext = null;
+			throw new Exception("ScriptEngine: " + error.getKey() + " failed execution!", error.getValue());
 		}
 	}
 	
 	public Path getCurrentLoadingScript()
 	{
-		return _currentExecutionContext != null ? _currentExecutionContext.getCurrentExecutingScript() : null;
+		return _javaExecutionContext.getCurrentExecutingScript();
 	}
 	
 	public static ScriptEngineManager getInstance()
diff --git a/L2J_Mobius_3.0_Helios/java/com/l2jmobius/loginserver/GameServerTable.java b/L2J_Mobius_3.0_Helios/java/com/l2jmobius/loginserver/GameServerTable.java
index 456224d78c..4269e47969 100644
--- a/L2J_Mobius_3.0_Helios/java/com/l2jmobius/loginserver/GameServerTable.java
+++ b/L2J_Mobius_3.0_Helios/java/com/l2jmobius/loginserver/GameServerTable.java
@@ -36,8 +36,8 @@ import org.w3c.dom.Document;
 import org.w3c.dom.NodeList;
 
 import com.l2jmobius.commons.database.DatabaseFactory;
-import com.l2jmobius.commons.util.IGameXmlReader;
 import com.l2jmobius.commons.util.IPSubnet;
+import com.l2jmobius.commons.util.IXmlReader;
 import com.l2jmobius.commons.util.Rnd;
 import com.l2jmobius.loginserver.network.gameserverpackets.ServerStatus;
 
@@ -45,7 +45,7 @@ import com.l2jmobius.loginserver.network.gameserverpackets.ServerStatus;
  * The Class GameServerTable loads the game server names and initialize the game server tables.
  * @author KenM, Zoey76
  */
-public final class GameServerTable implements IGameXmlReader
+public final class GameServerTable implements IXmlReader
 {
 	private static final Logger LOGGER = Logger.getLogger(GameServerTable.class.getName());
 	
diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/config/Scripts.xml b/L2J_Mobius_4.0_GrandCrusade/dist/game/config/Scripts.xml
index 284aa0a31f..54d05b241f 100644
--- a/L2J_Mobius_4.0_GrandCrusade/dist/game/config/Scripts.xml
+++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/config/Scripts.xml
@@ -2,11 +2,7 @@
 <list xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../data/xsd/Scripts.xsd">
 	<!-- Skip these filenames from script loading, because they are already loaded using a different way. -->
 	<exclude file="package-info.java" />
-	<exclude file="MasterHandler.java" />
-	<exclude file="EffectMasterHandler.java" />
-	<exclude file="SkillConditionMasterHandler.java" />
-	<exclude file="ConditionMasterHandler.java" />
-	<exclude file="DailyMissionMasterHandler.java" />
+	<exclude file="handlers" />
 	
 	<!--
 	With this file you can exclude/include specific folders/files from within the scripts directory.
diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/ai/areas/ImperialTomb/FourSepulchers/FourSepulchers.java b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/ai/areas/ImperialTomb/FourSepulchers/FourSepulchers.java
index 053e095ace..7a59593544 100644
--- a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/ai/areas/ImperialTomb/FourSepulchers/FourSepulchers.java
+++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/ai/areas/ImperialTomb/FourSepulchers/FourSepulchers.java
@@ -29,7 +29,7 @@ import org.w3c.dom.NamedNodeMap;
 import org.w3c.dom.Node;
 
 import com.l2jmobius.commons.concurrent.ThreadPool;
-import com.l2jmobius.commons.util.IGameXmlReader;
+import com.l2jmobius.commons.util.IXmlReader;
 import com.l2jmobius.gameserver.ai.CtrlIntention;
 import com.l2jmobius.gameserver.enums.ChatType;
 import com.l2jmobius.gameserver.geoengine.GeoEngine;
@@ -56,7 +56,7 @@ import quests.Q00620_FourGoblets.Q00620_FourGoblets;
  * Four Selpuchers AI
  * @author Mobius
  */
-public final class FourSepulchers extends AbstractNpcAI implements IGameXmlReader
+public final class FourSepulchers extends AbstractNpcAI implements IXmlReader
 {
 	Logger LOGGER = Logger.getLogger(FourSepulchers.class.getName());
 	
diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/ai/bosses/Tiat/Stage1.java b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/ai/bosses/Tiat/Stage1.java
index e1e54da1a8..1b350c946e 100644
--- a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/ai/bosses/Tiat/Stage1.java
+++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/ai/bosses/Tiat/Stage1.java
@@ -30,7 +30,7 @@ import org.w3c.dom.NamedNodeMap;
 import org.w3c.dom.Node;
 
 import com.l2jmobius.commons.util.CommonUtil;
-import com.l2jmobius.commons.util.IGameXmlReader;
+import com.l2jmobius.commons.util.IXmlReader;
 import com.l2jmobius.gameserver.ai.CtrlIntention;
 import com.l2jmobius.gameserver.enums.Movie;
 import com.l2jmobius.gameserver.enums.TrapAction;
@@ -66,7 +66,7 @@ import instances.AbstractInstance;
  * Please maintain consistency between the Seed scripts.
  * @author Gigiikun
  */
-public final class Stage1 extends AbstractInstance implements IGameXmlReader
+public final class Stage1 extends AbstractInstance implements IXmlReader
 {
 	Logger LOGGER = Logger.getLogger(Stage1.class.getName());
 	
diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/ai/others/ClassMaster/ClassMaster.java b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/ai/others/ClassMaster/ClassMaster.java
index 63269e6e27..1abb859d66 100644
--- a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/ai/others/ClassMaster/ClassMaster.java
+++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/ai/others/ClassMaster/ClassMaster.java
@@ -30,7 +30,7 @@ import org.w3c.dom.NamedNodeMap;
 import org.w3c.dom.Node;
 
 import com.l2jmobius.Config;
-import com.l2jmobius.commons.util.IGameXmlReader;
+import com.l2jmobius.commons.util.IXmlReader;
 import com.l2jmobius.gameserver.data.xml.impl.CategoryData;
 import com.l2jmobius.gameserver.data.xml.impl.ClassListData;
 import com.l2jmobius.gameserver.data.xml.impl.SkillData;
@@ -63,7 +63,7 @@ import ai.AbstractNpcAI;
  * Class Master AI.
  * @author Nik
  */
-public final class ClassMaster extends AbstractNpcAI implements IGameXmlReader
+public final class ClassMaster extends AbstractNpcAI implements IXmlReader
 {
 	// NPCs
 	private static final List<Integer> CLASS_MASTERS = new ArrayList<>();
diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/ai/others/MentorGuide/MentorGuide.java b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/ai/others/MentorGuide/MentorGuide.java
index ce6e3bd57b..eeb6b34418 100644
--- a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/ai/others/MentorGuide/MentorGuide.java
+++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/ai/others/MentorGuide/MentorGuide.java
@@ -26,7 +26,7 @@ import org.w3c.dom.Document;
 import org.w3c.dom.Node;
 
 import com.l2jmobius.Config;
-import com.l2jmobius.commons.util.IGameXmlReader;
+import com.l2jmobius.commons.util.IXmlReader;
 import com.l2jmobius.gameserver.enums.CategoryType;
 import com.l2jmobius.gameserver.enums.MailType;
 import com.l2jmobius.gameserver.instancemanager.MailManager;
@@ -62,7 +62,7 @@ import ai.AbstractNpcAI;
  * Mentor Guide AI.
  * @author Gnacik, UnAfraid
  */
-public final class MentorGuide extends AbstractNpcAI implements IGameXmlReader
+public final class MentorGuide extends AbstractNpcAI implements IXmlReader
 {
 	private static final Logger LOGGER = Logger.getLogger(MentorGuide.class.getName());
 	
diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/ai/others/NpcBuffers/NpcBuffersData.java b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/ai/others/NpcBuffers/NpcBuffersData.java
index b0287e1df6..51708af4f8 100644
--- a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/ai/others/NpcBuffers/NpcBuffersData.java
+++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/ai/others/NpcBuffers/NpcBuffersData.java
@@ -27,13 +27,13 @@ import org.w3c.dom.Document;
 import org.w3c.dom.NamedNodeMap;
 import org.w3c.dom.Node;
 
-import com.l2jmobius.commons.util.IGameXmlReader;
+import com.l2jmobius.commons.util.IXmlReader;
 import com.l2jmobius.gameserver.model.StatsSet;
 
 /**
  * @author UnAfraid
  */
-class NpcBuffersData implements IGameXmlReader
+class NpcBuffersData implements IXmlReader
 {
 	private static final Logger LOGGER = Logger.getLogger(NpcBuffersData.class.getName());
 	
diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/admincommandhandlers/AdminQuest.java b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/admincommandhandlers/AdminQuest.java
index 228cc1668d..a771c4ab90 100644
--- a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/admincommandhandlers/AdminQuest.java
+++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/admincommandhandlers/AdminQuest.java
@@ -320,7 +320,7 @@ public class AdminQuest implements IAdminCommandHandler
 				{
 					sb.append("<a action=\"bypass -h admin_script_dir " + c + "\">" + c + "</a><br1>");
 				}
-				else if (c.endsWith(".java") || c.endsWith(".py"))
+				else if (c.endsWith(".java"))
 				{
 					sb.append("<a action=\"bypass -h admin_script_load " + c + "\"><font color=\"LEVEL\">" + c + "</font></a><br1>");
 				}
@@ -352,7 +352,7 @@ public class AdminQuest implements IAdminCommandHandler
 				{
 					sb.append("<a action=\"bypass -h admin_script_dir " + currentPath + "/" + c + "\">" + (questReducedNames ? getQuestName(c) : c) + "</a><br1>");
 				}
-				else if (c.endsWith(".java") || c.endsWith(".py"))
+				else if (c.endsWith(".java"))
 				{
 					sb.append("<a action=\"bypass -h admin_script_load " + currentPath + "/" + c + "\"><font color=\"LEVEL\">" + c + "</font></a><br1>");
 				}
diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/admincommandhandlers/AdminReload.java b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/admincommandhandlers/AdminReload.java
index 466ed146cd..b89bd7cbcd 100644
--- a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/admincommandhandlers/AdminReload.java
+++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/admincommandhandlers/AdminReload.java
@@ -221,7 +221,7 @@ public class AdminReload implements IAdminCommandHandler
 				{
 					try
 					{
-						ScriptEngineManager.getInstance().executeEffectMasterHandler();
+						ScriptEngineManager.getInstance().executeScript(ScriptEngineManager.EFFECT_MASTER_HANDLER_FILE);
 						AdminData.getInstance().broadcastMessageToGMs(activeChar.getName() + ": Reloaded effect master handler.");
 					}
 					catch (Exception e)
@@ -235,7 +235,7 @@ public class AdminReload implements IAdminCommandHandler
 				{
 					try
 					{
-						ScriptEngineManager.getInstance().executeMasterHandler();
+						ScriptEngineManager.getInstance().executeScript(ScriptEngineManager.MASTER_HANDLER_FILE);
 						AdminData.getInstance().broadcastMessageToGMs(activeChar.getName() + ": Reloaded master handler.");
 					}
 					catch (Exception e)
diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/telnethandlers/server/Reload.java b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/telnethandlers/server/Reload.java
index d679ea1212..491b10cc62 100644
--- a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/telnethandlers/server/Reload.java
+++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/telnethandlers/server/Reload.java
@@ -181,7 +181,7 @@ public class Reload implements ITelnetCommand
 			{
 				try
 				{
-					ScriptEngineManager.getInstance().executeEffectMasterHandler();
+					ScriptEngineManager.getInstance().executeScript(ScriptEngineManager.EFFECT_MASTER_HANDLER_FILE);
 					return AdminData.getInstance().broadcastMessageToGMs("Telnet Admin: Reloaded effect master handler.");
 				}
 				catch (Exception e)
@@ -194,7 +194,7 @@ public class Reload implements ITelnetCommand
 			{
 				try
 				{
-					ScriptEngineManager.getInstance().executeMasterHandler();
+					ScriptEngineManager.getInstance().executeScript(ScriptEngineManager.MASTER_HANDLER_FILE);
 					return AdminData.getInstance().broadcastMessageToGMs("Telnet Admin: Reloaded master handler.");
 				}
 				catch (Exception e)
diff --git a/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/Config.java b/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/Config.java
index 21d6430699..93eb9751db 100644
--- a/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/Config.java
+++ b/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/Config.java
@@ -54,7 +54,7 @@ import org.w3c.dom.Document;
 import org.w3c.dom.NamedNodeMap;
 import org.w3c.dom.Node;
 
-import com.l2jmobius.commons.util.IGameXmlReader;
+import com.l2jmobius.commons.util.IXmlReader;
 import com.l2jmobius.commons.util.PropertiesParser;
 import com.l2jmobius.commons.util.StringUtil;
 import com.l2jmobius.gameserver.enums.ChatType;
@@ -3115,7 +3115,7 @@ public final class Config
 		return result;
 	}
 	
-	private static class IPConfigData implements IGameXmlReader
+	private static class IPConfigData implements IXmlReader
 	{
 		private static final List<String> _subnets = new ArrayList<>(5);
 		private static final List<String> _hosts = new ArrayList<>(5);
diff --git a/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/commons/util/IGameXmlReader.java b/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/commons/util/IGameXmlReader.java
deleted file mode 100644
index b29089db77..0000000000
--- a/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/commons/util/IGameXmlReader.java
+++ /dev/null
@@ -1,118 +0,0 @@
-/*
- * This file is part of the L2J Mobius project.
- * 
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- * 
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * General Public License for more details.
- * 
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- */
-package com.l2jmobius.commons.util;
-
-import java.io.File;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
-import org.w3c.dom.NamedNodeMap;
-import org.w3c.dom.Node;
-
-import com.l2jmobius.Config;
-import com.l2jmobius.gameserver.model.Location;
-import com.l2jmobius.gameserver.model.holders.MinionHolder;
-import com.l2jmobius.gameserver.model.holders.SkillHolder;
-
-/**
- * Interface for XML parsers.
- * @author Zoey76
- */
-public interface IGameXmlReader extends IXmlReader
-{
-	/**
-	 * Wrapper for {@link #parseFile(File)} method.
-	 * @param path the relative path to the datapack root of the XML file to parse.
-	 */
-	default void parseDatapackFile(String path)
-	{
-		parseFile(new File(Config.DATAPACK_ROOT, path));
-	}
-	
-	/**
-	 * Wrapper for {@link #parseDirectory(File, boolean)}.
-	 * @param path the path to the directory where the XML files are
-	 * @param recursive parses all sub folders if there is
-	 * @return {@code false} if it fails to find the directory, {@code true} otherwise
-	 */
-	default boolean parseDatapackDirectory(String path, boolean recursive)
-	{
-		return parseDirectory(new File(Config.DATAPACK_ROOT, path), recursive);
-	}
-	
-	/**
-	 * @param n
-	 * @return a map of parameters
-	 */
-	default Map<String, Object> parseParameters(Node n)
-	{
-		final Map<String, Object> parameters = new HashMap<>();
-		for (Node parameters_node = n.getFirstChild(); parameters_node != null; parameters_node = parameters_node.getNextSibling())
-		{
-			NamedNodeMap attrs = parameters_node.getAttributes();
-			switch (parameters_node.getNodeName().toLowerCase())
-			{
-				case "param":
-				{
-					parameters.put(parseString(attrs, "name"), parseString(attrs, "value"));
-					break;
-				}
-				case "skill":
-				{
-					parameters.put(parseString(attrs, "name"), new SkillHolder(parseInteger(attrs, "id"), parseInteger(attrs, "level")));
-					break;
-				}
-				case "location":
-				{
-					parameters.put(parseString(attrs, "name"), new Location(parseInteger(attrs, "x"), parseInteger(attrs, "y"), parseInteger(attrs, "z"), parseInteger(attrs, "heading", 0)));
-					break;
-				}
-				case "minions":
-				{
-					final List<MinionHolder> minions = new ArrayList<>(1);
-					for (Node minions_node = parameters_node.getFirstChild(); minions_node != null; minions_node = minions_node.getNextSibling())
-					{
-						if (minions_node.getNodeName().equalsIgnoreCase("npc"))
-						{
-							attrs = minions_node.getAttributes();
-							minions.add(new MinionHolder(parseInteger(attrs, "id"), parseInteger(attrs, "count"), parseInteger(attrs, "respawnTime"), parseInteger(attrs, "weightPoint")));
-						}
-					}
-					
-					if (!minions.isEmpty())
-					{
-						parameters.put(parseString(parameters_node.getAttributes(), "name"), minions);
-					}
-					break;
-				}
-			}
-		}
-		return parameters;
-	}
-	
-	default Location parseLocation(Node n)
-	{
-		final NamedNodeMap attrs = n.getAttributes();
-		final int x = parseInteger(attrs, "x");
-		final int y = parseInteger(attrs, "y");
-		final int z = parseInteger(attrs, "z");
-		final int heading = parseInteger(attrs, "heading", 0);
-		return new Location(x, y, z, heading);
-	}
-}
diff --git a/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/commons/util/IXmlReader.java b/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/commons/util/IXmlReader.java
index 0317816fd8..4bfed2396e 100644
--- a/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/commons/util/IXmlReader.java
+++ b/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/commons/util/IXmlReader.java
@@ -18,8 +18,13 @@ package com.l2jmobius.commons.util;
 
 import java.io.File;
 import java.io.FileFilter;
+import java.util.ArrayList;
+import java.util.HashMap;
 import java.util.LinkedHashMap;
+import java.util.List;
 import java.util.Map;
+import java.util.concurrent.CopyOnWriteArrayList;
+import java.util.concurrent.ScheduledFuture;
 import java.util.function.Consumer;
 import java.util.function.Predicate;
 import java.util.logging.Level;
@@ -35,7 +40,12 @@ import org.w3c.dom.NodeList;
 import org.xml.sax.ErrorHandler;
 import org.xml.sax.SAXParseException;
 
+import com.l2jmobius.Config;
+import com.l2jmobius.commons.concurrent.ThreadPool;
 import com.l2jmobius.commons.util.file.filter.XMLFilter;
+import com.l2jmobius.gameserver.model.Location;
+import com.l2jmobius.gameserver.model.holders.MinionHolder;
+import com.l2jmobius.gameserver.model.holders.SkillHolder;
 
 /**
  * Interface for XML parsers.
@@ -56,6 +66,15 @@ public interface IXmlReader
 	 */
 	void load();
 	
+	/**
+	 * Wrapper for {@link #parseFile(File)} method.
+	 * @param path the relative path to the datapack root of the XML file to parse.
+	 */
+	default void parseDatapackFile(String path)
+	{
+		parseFile(new File(Config.DATAPACK_ROOT, path));
+	}
+	
 	/**
 	 * Parses a single XML file.<br>
 	 * If the file was successfully parsed, call {@link #parseDocument(Document, File)} for the parsed document.<br>
@@ -121,6 +140,17 @@ public interface IXmlReader
 		return parseDirectory(file, false);
 	}
 	
+	/**
+	 * Wrapper for {@link #parseDirectory(File, boolean)}.
+	 * @param path the path to the directory where the XML files are
+	 * @param recursive parses all sub folders if there is
+	 * @return {@code false} if it fails to find the directory, {@code true} otherwise
+	 */
+	default boolean parseDatapackDirectory(String path, boolean recursive)
+	{
+		return parseDirectory(new File(Config.DATAPACK_ROOT, path), recursive);
+	}
+	
 	/**
 	 * Loads all XML files from {@code path} and calls {@link #parseFile(File)} for each one of them.
 	 * @param dir the directory object to scan.
@@ -135,6 +165,7 @@ public interface IXmlReader
 			return false;
 		}
 		
+		final List<ScheduledFuture<?>> jobs = new CopyOnWriteArrayList<>();
 		final File[] listOfFiles = dir.listFiles();
 		for (File f : listOfFiles)
 		{
@@ -144,9 +175,23 @@ public interface IXmlReader
 			}
 			else if (getCurrentFileFilter().accept(f))
 			{
-				parseFile(f);
+				jobs.add(ThreadPool.schedule(() ->
+				{
+					parseFile(f);
+				}, 0));
 			}
 		}
+		while (!jobs.isEmpty())
+		{
+			for (ScheduledFuture<?> job : jobs)
+			{
+				if ((job == null) || job.isDone() || job.isCancelled())
+				{
+					jobs.remove(job);
+				}
+			}
+		}
+		
 		return true;
 	}
 	
@@ -531,6 +576,16 @@ public interface IXmlReader
 		return parseString(attrs.getNamedItem(name), defaultValue);
 	}
 	
+	default Location parseLocation(Node n)
+	{
+		final NamedNodeMap attrs = n.getAttributes();
+		final int x = parseInteger(attrs, "x");
+		final int y = parseInteger(attrs, "y");
+		final int z = parseInteger(attrs, "z");
+		final int heading = parseInteger(attrs, "heading", 0);
+		return new Location(x, y, z, heading);
+	}
+	
 	/**
 	 * Parses an enumerated value.
 	 * @param <T> the enumerated type
@@ -612,6 +667,56 @@ public interface IXmlReader
 		return map;
 	}
 	
+	/**
+	 * @param n
+	 * @return a map of parameters
+	 */
+	default Map<String, Object> parseParameters(Node n)
+	{
+		final Map<String, Object> parameters = new HashMap<>();
+		for (Node parameters_node = n.getFirstChild(); parameters_node != null; parameters_node = parameters_node.getNextSibling())
+		{
+			NamedNodeMap attrs = parameters_node.getAttributes();
+			switch (parameters_node.getNodeName().toLowerCase())
+			{
+				case "param":
+				{
+					parameters.put(parseString(attrs, "name"), parseString(attrs, "value"));
+					break;
+				}
+				case "skill":
+				{
+					parameters.put(parseString(attrs, "name"), new SkillHolder(parseInteger(attrs, "id"), parseInteger(attrs, "level")));
+					break;
+				}
+				case "location":
+				{
+					parameters.put(parseString(attrs, "name"), new Location(parseInteger(attrs, "x"), parseInteger(attrs, "y"), parseInteger(attrs, "z"), parseInteger(attrs, "heading", 0)));
+					break;
+				}
+				case "minions":
+				{
+					final List<MinionHolder> minions = new ArrayList<>(1);
+					for (Node minions_node = parameters_node.getFirstChild(); minions_node != null; minions_node = minions_node.getNextSibling())
+					{
+						if (minions_node.getNodeName().equalsIgnoreCase("npc"))
+						{
+							attrs = minions_node.getAttributes();
+							minions.add(new MinionHolder(parseInteger(attrs, "id"), parseInteger(attrs, "count"), parseInteger(attrs, "respawnTime"), parseInteger(attrs, "weightPoint")));
+						}
+					}
+					
+					if (!minions.isEmpty())
+					{
+						parameters.put(parseString(parameters_node.getAttributes(), "name"), minions);
+					}
+					break;
+				}
+			}
+		}
+		return parameters;
+	}
+	
 	/**
 	 * Executes action for each child of node
 	 * @param node
diff --git a/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/GameServer.java b/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/GameServer.java
index b14af08832..ea4c8b6da1 100644
--- a/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/GameServer.java
+++ b/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/GameServer.java
@@ -362,7 +362,7 @@ public class GameServer
 		try
 		{
 			LOGGER.info(getClass().getSimpleName() + ": Loading server scripts:");
-			ScriptEngineManager.getInstance().executeMasterHandler();
+			ScriptEngineManager.getInstance().executeScript(ScriptEngineManager.MASTER_HANDLER_FILE);
 			ScriptEngineManager.getInstance().executeScriptList();
 		}
 		catch (Exception e)
diff --git a/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/data/xml/impl/ActionData.java b/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/data/xml/impl/ActionData.java
index 0bffdc5bb1..a322dad1d9 100644
--- a/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/data/xml/impl/ActionData.java
+++ b/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/data/xml/impl/ActionData.java
@@ -23,14 +23,14 @@ import java.util.logging.Logger;
 
 import org.w3c.dom.Document;
 
-import com.l2jmobius.commons.util.IGameXmlReader;
+import com.l2jmobius.commons.util.IXmlReader;
 import com.l2jmobius.gameserver.model.ActionDataHolder;
 import com.l2jmobius.gameserver.model.StatsSet;
 
 /**
  * @author UnAfraid
  */
-public class ActionData implements IGameXmlReader
+public class ActionData implements IXmlReader
 {
 	private static final Logger LOGGER = Logger.getLogger(ActionData.class.getName());
 	
diff --git a/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/data/xml/impl/AdminData.java b/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/data/xml/impl/AdminData.java
index 0b1d3e3245..9e359b1521 100644
--- a/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/data/xml/impl/AdminData.java
+++ b/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/data/xml/impl/AdminData.java
@@ -29,7 +29,7 @@ import org.w3c.dom.Document;
 import org.w3c.dom.NamedNodeMap;
 import org.w3c.dom.Node;
 
-import com.l2jmobius.commons.util.IGameXmlReader;
+import com.l2jmobius.commons.util.IXmlReader;
 import com.l2jmobius.gameserver.model.AccessLevel;
 import com.l2jmobius.gameserver.model.AdminCommandAccessRight;
 import com.l2jmobius.gameserver.model.StatsSet;
@@ -42,7 +42,7 @@ import com.l2jmobius.gameserver.network.serverpackets.SystemMessage;
  * Loads administrator access levels and commands.
  * @author UnAfraid
  */
-public final class AdminData implements IGameXmlReader
+public final class AdminData implements IXmlReader
 {
 	private static final Logger LOGGER = Logger.getLogger(AdminData.class.getName());
 	
diff --git a/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/data/xml/impl/AlchemyData.java b/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/data/xml/impl/AlchemyData.java
index a5d8153b82..76f7eb98b5 100644
--- a/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/data/xml/impl/AlchemyData.java
+++ b/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/data/xml/impl/AlchemyData.java
@@ -25,7 +25,7 @@ import org.w3c.dom.Document;
 import org.w3c.dom.NamedNodeMap;
 import org.w3c.dom.Node;
 
-import com.l2jmobius.commons.util.IGameXmlReader;
+import com.l2jmobius.commons.util.IXmlReader;
 import com.l2jmobius.gameserver.model.StatsSet;
 import com.l2jmobius.gameserver.model.alchemy.AlchemyCraftData;
 import com.l2jmobius.gameserver.model.holders.ItemHolder;
@@ -33,7 +33,7 @@ import com.l2jmobius.gameserver.model.holders.ItemHolder;
 /**
  * @author Sdw
  */
-public class AlchemyData implements IGameXmlReader
+public class AlchemyData implements IXmlReader
 {
 	private static final Logger LOGGER = Logger.getLogger(AlchemyData.class.getName());
 	
diff --git a/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/data/xml/impl/AppearanceItemData.java b/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/data/xml/impl/AppearanceItemData.java
index f7746d073d..468f35ffce 100644
--- a/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/data/xml/impl/AppearanceItemData.java
+++ b/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/data/xml/impl/AppearanceItemData.java
@@ -24,7 +24,7 @@ import java.util.logging.Logger;
 import org.w3c.dom.Document;
 import org.w3c.dom.Node;
 
-import com.l2jmobius.commons.util.IGameXmlReader;
+import com.l2jmobius.commons.util.IXmlReader;
 import com.l2jmobius.gameserver.datatables.ItemTable;
 import com.l2jmobius.gameserver.enums.Race;
 import com.l2jmobius.gameserver.model.StatsSet;
@@ -36,7 +36,7 @@ import com.l2jmobius.gameserver.model.items.type.CrystalType;
 /**
  * @author UnAfraid
  */
-public class AppearanceItemData implements IGameXmlReader
+public class AppearanceItemData implements IXmlReader
 {
 	private static final Logger LOGGER = Logger.getLogger(AppearanceItemData.class.getName());
 	
diff --git a/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/data/xml/impl/ArmorSetsData.java b/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/data/xml/impl/ArmorSetsData.java
index 0f1445c10a..d7582d8d5a 100644
--- a/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/data/xml/impl/ArmorSetsData.java
+++ b/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/data/xml/impl/ArmorSetsData.java
@@ -19,9 +19,9 @@ package com.l2jmobius.gameserver.data.xml.impl;
 import java.io.File;
 import java.util.ArrayList;
 import java.util.Collections;
-import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
+import java.util.concurrent.ConcurrentHashMap;
 import java.util.logging.Logger;
 import java.util.stream.Stream;
 
@@ -29,7 +29,7 @@ import org.w3c.dom.Document;
 import org.w3c.dom.NamedNodeMap;
 import org.w3c.dom.Node;
 
-import com.l2jmobius.commons.util.IGameXmlReader;
+import com.l2jmobius.commons.util.IXmlReader;
 import com.l2jmobius.gameserver.datatables.ItemTable;
 import com.l2jmobius.gameserver.model.ArmorSet;
 import com.l2jmobius.gameserver.model.holders.ArmorsetSkillHolder;
@@ -40,12 +40,12 @@ import com.l2jmobius.gameserver.model.stats.BaseStats;
  * Loads armor set bonuses.
  * @author godson, Luno, UnAfraid
  */
-public final class ArmorSetsData implements IGameXmlReader
+public final class ArmorSetsData implements IXmlReader
 {
 	private static final Logger LOGGER = Logger.getLogger(ArmorSetsData.class.getName());
 	
-	private final Map<Integer, ArmorSet> _armorSets = new HashMap<>();
-	private final Map<Integer, List<ArmorSet>> _armorSetItems = new HashMap<>();
+	private final Map<Integer, ArmorSet> _armorSets = new ConcurrentHashMap<>();
+	private final Map<Integer, List<ArmorSet>> _armorSetItems = new ConcurrentHashMap<>();
 	
 	protected ArmorSetsData()
 	{
diff --git a/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/data/xml/impl/AttendanceRewardData.java b/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/data/xml/impl/AttendanceRewardData.java
index c60afbd78a..24e402e706 100644
--- a/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/data/xml/impl/AttendanceRewardData.java
+++ b/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/data/xml/impl/AttendanceRewardData.java
@@ -24,7 +24,7 @@ import java.util.logging.Logger;
 import org.w3c.dom.Document;
 
 import com.l2jmobius.Config;
-import com.l2jmobius.commons.util.IGameXmlReader;
+import com.l2jmobius.commons.util.IXmlReader;
 import com.l2jmobius.gameserver.datatables.ItemTable;
 import com.l2jmobius.gameserver.model.StatsSet;
 import com.l2jmobius.gameserver.model.holders.ItemHolder;
@@ -32,7 +32,7 @@ import com.l2jmobius.gameserver.model.holders.ItemHolder;
 /**
  * @author Mobius
  */
-public class AttendanceRewardData implements IGameXmlReader
+public class AttendanceRewardData implements IXmlReader
 {
 	private static Logger LOGGER = Logger.getLogger(AttendanceRewardData.class.getName());
 	private final List<ItemHolder> _rewards = new ArrayList<>();
diff --git a/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/data/xml/impl/BeautyShopData.java b/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/data/xml/impl/BeautyShopData.java
index 133f11d978..d88ccc7747 100644
--- a/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/data/xml/impl/BeautyShopData.java
+++ b/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/data/xml/impl/BeautyShopData.java
@@ -24,7 +24,7 @@ import org.w3c.dom.Document;
 import org.w3c.dom.NamedNodeMap;
 import org.w3c.dom.Node;
 
-import com.l2jmobius.commons.util.IGameXmlReader;
+import com.l2jmobius.commons.util.IXmlReader;
 import com.l2jmobius.gameserver.enums.Race;
 import com.l2jmobius.gameserver.enums.Sex;
 import com.l2jmobius.gameserver.model.StatsSet;
@@ -34,7 +34,7 @@ import com.l2jmobius.gameserver.model.beautyshop.BeautyItem;
 /**
  * @author Sdw
  */
-public final class BeautyShopData implements IGameXmlReader
+public final class BeautyShopData implements IXmlReader
 {
 	private final Map<Race, Map<Sex, BeautyData>> _beautyList = new HashMap<>();
 	private final Map<Sex, BeautyData> _beautyData = new HashMap<>();
diff --git a/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/data/xml/impl/BuyListData.java b/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/data/xml/impl/BuyListData.java
index de298ef358..8ab9ea8097 100644
--- a/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/data/xml/impl/BuyListData.java
+++ b/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/data/xml/impl/BuyListData.java
@@ -21,8 +21,8 @@ import java.io.FileFilter;
 import java.sql.Connection;
 import java.sql.ResultSet;
 import java.sql.Statement;
-import java.util.HashMap;
 import java.util.Map;
+import java.util.concurrent.ConcurrentHashMap;
 import java.util.logging.Level;
 import java.util.logging.Logger;
 
@@ -31,7 +31,7 @@ import org.w3c.dom.NamedNodeMap;
 
 import com.l2jmobius.Config;
 import com.l2jmobius.commons.database.DatabaseFactory;
-import com.l2jmobius.commons.util.IGameXmlReader;
+import com.l2jmobius.commons.util.IXmlReader;
 import com.l2jmobius.commons.util.file.filter.NumericNameFilter;
 import com.l2jmobius.gameserver.datatables.ItemTable;
 import com.l2jmobius.gameserver.model.buylist.Product;
@@ -42,11 +42,11 @@ import com.l2jmobius.gameserver.model.items.Item;
  * Loads buy lists for NPCs.
  * @author NosBit
  */
-public final class BuyListData implements IGameXmlReader
+public final class BuyListData implements IXmlReader
 {
 	private static final Logger LOGGER = Logger.getLogger(BuyListData.class.getName());
 	
-	private final Map<Integer, ProductList> _buyLists = new HashMap<>();
+	private final Map<Integer, ProductList> _buyLists = new ConcurrentHashMap<>();
 	private static final FileFilter NUMERIC_FILTER = new NumericNameFilter();
 	
 	protected BuyListData()
diff --git a/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/data/xml/impl/CastleData.java b/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/data/xml/impl/CastleData.java
index 6618dcdf1d..792afbfa0b 100644
--- a/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/data/xml/impl/CastleData.java
+++ b/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/data/xml/impl/CastleData.java
@@ -19,16 +19,16 @@ package com.l2jmobius.gameserver.data.xml.impl;
 import java.io.File;
 import java.util.ArrayList;
 import java.util.Collections;
-import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
+import java.util.concurrent.ConcurrentHashMap;
 import java.util.stream.Collectors;
 
 import org.w3c.dom.Document;
 import org.w3c.dom.NamedNodeMap;
 import org.w3c.dom.Node;
 
-import com.l2jmobius.commons.util.IGameXmlReader;
+import com.l2jmobius.commons.util.IXmlReader;
 import com.l2jmobius.gameserver.enums.CastleSide;
 import com.l2jmobius.gameserver.enums.SiegeGuardType;
 import com.l2jmobius.gameserver.model.holders.CastleSpawnHolder;
@@ -37,10 +37,10 @@ import com.l2jmobius.gameserver.model.holders.SiegeGuardHolder;
 /**
  * @author St3eT
  */
-public final class CastleData implements IGameXmlReader
+public final class CastleData implements IXmlReader
 {
-	private final Map<Integer, List<CastleSpawnHolder>> _spawns = new HashMap<>();
-	private static final Map<Integer, List<SiegeGuardHolder>> _siegeGuards = new HashMap<>();
+	private final Map<Integer, List<CastleSpawnHolder>> _spawns = new ConcurrentHashMap<>();
+	private static final Map<Integer, List<SiegeGuardHolder>> _siegeGuards = new ConcurrentHashMap<>();
 	
 	protected CastleData()
 	{
diff --git a/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/data/xml/impl/CategoryData.java b/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/data/xml/impl/CategoryData.java
index f851aa6703..df7d390dfb 100644
--- a/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/data/xml/impl/CategoryData.java
+++ b/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/data/xml/impl/CategoryData.java
@@ -27,14 +27,14 @@ import org.w3c.dom.Document;
 import org.w3c.dom.NamedNodeMap;
 import org.w3c.dom.Node;
 
-import com.l2jmobius.commons.util.IGameXmlReader;
+import com.l2jmobius.commons.util.IXmlReader;
 import com.l2jmobius.gameserver.enums.CategoryType;
 
 /**
  * Loads the category data with Class or NPC IDs.
  * @author NosBit, xban1x
  */
-public final class CategoryData implements IGameXmlReader
+public final class CategoryData implements IXmlReader
 {
 	private static final Logger LOGGER = Logger.getLogger(CategoryData.class.getName());
 	
diff --git a/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/data/xml/impl/ClanHallData.java b/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/data/xml/impl/ClanHallData.java
index 511cc7f4f7..90a1a51029 100644
--- a/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/data/xml/impl/ClanHallData.java
+++ b/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/data/xml/impl/ClanHallData.java
@@ -20,9 +20,9 @@ import java.io.File;
 import java.util.ArrayList;
 import java.util.Collection;
 import java.util.Comparator;
-import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
+import java.util.concurrent.ConcurrentHashMap;
 import java.util.logging.Logger;
 import java.util.stream.Collectors;
 
@@ -30,7 +30,7 @@ import org.w3c.dom.Document;
 import org.w3c.dom.NamedNodeMap;
 import org.w3c.dom.Node;
 
-import com.l2jmobius.commons.util.IGameXmlReader;
+import com.l2jmobius.commons.util.IXmlReader;
 import com.l2jmobius.gameserver.enums.ClanHallGrade;
 import com.l2jmobius.gameserver.enums.ClanHallType;
 import com.l2jmobius.gameserver.model.Location;
@@ -43,10 +43,10 @@ import com.l2jmobius.gameserver.model.holders.ClanHallTeleportHolder;
 /**
  * @author St3eT
  */
-public final class ClanHallData implements IGameXmlReader
+public final class ClanHallData implements IXmlReader
 {
 	private static final Logger LOGGER = Logger.getLogger(ClanHallData.class.getName());
-	private static final Map<Integer, ClanHall> _clanHalls = new HashMap<>();
+	private static final Map<Integer, ClanHall> _clanHalls = new ConcurrentHashMap<>();
 	
 	protected ClanHallData()
 	{
diff --git a/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/data/xml/impl/ClanRewardData.java b/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/data/xml/impl/ClanRewardData.java
index 252bba1c64..d5938ee964 100644
--- a/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/data/xml/impl/ClanRewardData.java
+++ b/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/data/xml/impl/ClanRewardData.java
@@ -28,7 +28,6 @@ import org.w3c.dom.Document;
 import org.w3c.dom.NamedNodeMap;
 import org.w3c.dom.Node;
 
-import com.l2jmobius.commons.util.IGameXmlReader;
 import com.l2jmobius.commons.util.IXmlReader;
 import com.l2jmobius.gameserver.enums.ClanRewardType;
 import com.l2jmobius.gameserver.model.clan.ClanRewardBonus;
@@ -38,7 +37,7 @@ import com.l2jmobius.gameserver.model.holders.SkillHolder;
 /**
  * @author UnAfraid
  */
-public class ClanRewardData implements IGameXmlReader
+public class ClanRewardData implements IXmlReader
 {
 	private static final Logger LOGGER = Logger.getLogger(ClanRewardData.class.getName());
 	private final Map<ClanRewardType, List<ClanRewardBonus>> _clanRewards = new ConcurrentHashMap<>();
diff --git a/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/data/xml/impl/ClassListData.java b/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/data/xml/impl/ClassListData.java
index a40f726d50..6e99aeabfa 100644
--- a/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/data/xml/impl/ClassListData.java
+++ b/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/data/xml/impl/ClassListData.java
@@ -17,15 +17,15 @@
 package com.l2jmobius.gameserver.data.xml.impl;
 
 import java.io.File;
-import java.util.HashMap;
 import java.util.Map;
+import java.util.concurrent.ConcurrentHashMap;
 import java.util.logging.Logger;
 
 import org.w3c.dom.Document;
 import org.w3c.dom.NamedNodeMap;
 import org.w3c.dom.Node;
 
-import com.l2jmobius.commons.util.IGameXmlReader;
+import com.l2jmobius.commons.util.IXmlReader;
 import com.l2jmobius.gameserver.model.base.ClassId;
 import com.l2jmobius.gameserver.model.base.ClassInfo;
 
@@ -33,11 +33,11 @@ import com.l2jmobius.gameserver.model.base.ClassInfo;
  * Loads the the list of classes and it's info.
  * @author Zoey76
  */
-public final class ClassListData implements IGameXmlReader
+public final class ClassListData implements IXmlReader
 {
 	private static final Logger LOGGER = Logger.getLogger(ClassListData.class.getName());
 	
-	private final Map<ClassId, ClassInfo> _classData = new HashMap<>();
+	private final Map<ClassId, ClassInfo> _classData = new ConcurrentHashMap<>();
 	
 	/**
 	 * Instantiates a new class list data.
diff --git a/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/data/xml/impl/CombinationItemsData.java b/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/data/xml/impl/CombinationItemsData.java
index a7e90d5f89..c2ce205300 100644
--- a/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/data/xml/impl/CombinationItemsData.java
+++ b/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/data/xml/impl/CombinationItemsData.java
@@ -24,7 +24,7 @@ import java.util.stream.Collectors;
 
 import org.w3c.dom.Document;
 
-import com.l2jmobius.commons.util.IGameXmlReader;
+import com.l2jmobius.commons.util.IXmlReader;
 import com.l2jmobius.gameserver.datatables.ItemTable;
 import com.l2jmobius.gameserver.model.StatsSet;
 import com.l2jmobius.gameserver.model.items.combination.CombinationItem;
@@ -34,7 +34,7 @@ import com.l2jmobius.gameserver.model.items.combination.CombinationItemType;
 /**
  * @author UnAfraid
  */
-public class CombinationItemsData implements IGameXmlReader
+public class CombinationItemsData implements IXmlReader
 {
 	private static final Logger LOGGER = Logger.getLogger(CombinationItemsData.class.getName());
 	private final List<CombinationItem> _items = new ArrayList<>();
diff --git a/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/data/xml/impl/CubicData.java b/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/data/xml/impl/CubicData.java
index f682509217..ef46a08a7f 100644
--- a/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/data/xml/impl/CubicData.java
+++ b/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/data/xml/impl/CubicData.java
@@ -20,12 +20,12 @@ import java.io.File;
 import java.util.Collections;
 import java.util.HashMap;
 import java.util.Map;
+import java.util.concurrent.ConcurrentHashMap;
 import java.util.logging.Logger;
 
 import org.w3c.dom.Document;
 import org.w3c.dom.Node;
 
-import com.l2jmobius.commons.util.IGameXmlReader;
 import com.l2jmobius.commons.util.IXmlReader;
 import com.l2jmobius.gameserver.model.StatsSet;
 import com.l2jmobius.gameserver.model.actor.templates.CubicTemplate;
@@ -39,11 +39,11 @@ import com.l2jmobius.gameserver.model.cubic.conditions.RangeCondition;
 /**
  * @author UnAfraid
  */
-public class CubicData implements IGameXmlReader
+public class CubicData implements IXmlReader
 {
 	private static final Logger LOGGER = Logger.getLogger(CubicData.class.getName());
 	
-	private final Map<Integer, Map<Integer, CubicTemplate>> _cubics = new HashMap<>();
+	private final Map<Integer, Map<Integer, CubicTemplate>> _cubics = new ConcurrentHashMap<>();
 	
 	protected CubicData()
 	{
diff --git a/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/data/xml/impl/DailyMissionData.java b/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/data/xml/impl/DailyMissionData.java
index 53519f2492..1e275049d9 100644
--- a/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/data/xml/impl/DailyMissionData.java
+++ b/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/data/xml/impl/DailyMissionData.java
@@ -27,7 +27,7 @@ import java.util.stream.Collectors;
 
 import org.w3c.dom.Document;
 
-import com.l2jmobius.commons.util.IGameXmlReader;
+import com.l2jmobius.commons.util.IXmlReader;
 import com.l2jmobius.gameserver.model.DailyMissionDataHolder;
 import com.l2jmobius.gameserver.model.StatsSet;
 import com.l2jmobius.gameserver.model.actor.instance.PlayerInstance;
@@ -37,7 +37,7 @@ import com.l2jmobius.gameserver.model.holders.ItemHolder;
 /**
  * @author Sdw
  */
-public class DailyMissionData implements IGameXmlReader
+public class DailyMissionData implements IXmlReader
 {
 	private static final Logger LOGGER = Logger.getLogger(DailyMissionData.class.getName());
 	private final Map<Integer, List<DailyMissionDataHolder>> _dailyMissionRewards = new LinkedHashMap<>();
diff --git a/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/data/xml/impl/DoorData.java b/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/data/xml/impl/DoorData.java
index e8b1ff7bfa..5dd43e98eb 100644
--- a/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/data/xml/impl/DoorData.java
+++ b/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/data/xml/impl/DoorData.java
@@ -32,7 +32,6 @@ import org.w3c.dom.Document;
 import org.w3c.dom.NamedNodeMap;
 import org.w3c.dom.Node;
 
-import com.l2jmobius.commons.util.IGameXmlReader;
 import com.l2jmobius.commons.util.IXmlReader;
 import com.l2jmobius.gameserver.instancemanager.MapRegionManager;
 import com.l2jmobius.gameserver.model.Location;
@@ -45,7 +44,7 @@ import com.l2jmobius.gameserver.model.instancezone.Instance;
  * This class loads and hold info about doors.
  * @author JIV, GodKratos, UnAfraid
  */
-public final class DoorData implements IGameXmlReader
+public final class DoorData implements IXmlReader
 {
 	private static final Logger LOGGER = Logger.getLogger(DoorData.class.getName());
 	
diff --git a/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/data/xml/impl/EnchantItemData.java b/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/data/xml/impl/EnchantItemData.java
index 24e12d1218..342b4cde07 100644
--- a/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/data/xml/impl/EnchantItemData.java
+++ b/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/data/xml/impl/EnchantItemData.java
@@ -25,7 +25,7 @@ import org.w3c.dom.Document;
 import org.w3c.dom.NamedNodeMap;
 import org.w3c.dom.Node;
 
-import com.l2jmobius.commons.util.IGameXmlReader;
+import com.l2jmobius.commons.util.IXmlReader;
 import com.l2jmobius.gameserver.model.StatsSet;
 import com.l2jmobius.gameserver.model.items.enchant.EnchantScroll;
 import com.l2jmobius.gameserver.model.items.enchant.EnchantSupportItem;
@@ -35,7 +35,7 @@ import com.l2jmobius.gameserver.model.items.instance.ItemInstance;
  * Loads item enchant data.
  * @author UnAfraid
  */
-public class EnchantItemData implements IGameXmlReader
+public class EnchantItemData implements IXmlReader
 {
 	private static final Logger LOGGER = Logger.getLogger(EnchantItemData.class.getName());
 	
diff --git a/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/data/xml/impl/EnchantItemGroupsData.java b/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/data/xml/impl/EnchantItemGroupsData.java
index 666d821e42..44582a7dd4 100644
--- a/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/data/xml/impl/EnchantItemGroupsData.java
+++ b/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/data/xml/impl/EnchantItemGroupsData.java
@@ -25,7 +25,7 @@ import org.w3c.dom.Document;
 import org.w3c.dom.NamedNodeMap;
 import org.w3c.dom.Node;
 
-import com.l2jmobius.commons.util.IGameXmlReader;
+import com.l2jmobius.commons.util.IXmlReader;
 import com.l2jmobius.gameserver.datatables.ItemTable;
 import com.l2jmobius.gameserver.model.holders.RangeChanceHolder;
 import com.l2jmobius.gameserver.model.items.Item;
@@ -37,7 +37,7 @@ import com.l2jmobius.gameserver.util.Util;
 /**
  * @author UnAfraid
  */
-public final class EnchantItemGroupsData implements IGameXmlReader
+public final class EnchantItemGroupsData implements IXmlReader
 {
 	private static final Logger LOGGER = Logger.getLogger(EnchantItemGroupsData.class.getName());
 	
diff --git a/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/data/xml/impl/EnchantItemHPBonusData.java b/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/data/xml/impl/EnchantItemHPBonusData.java
index d2ce1096b5..868b1f95f6 100644
--- a/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/data/xml/impl/EnchantItemHPBonusData.java
+++ b/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/data/xml/impl/EnchantItemHPBonusData.java
@@ -26,7 +26,7 @@ import java.util.logging.Logger;
 import org.w3c.dom.Document;
 import org.w3c.dom.Node;
 
-import com.l2jmobius.commons.util.IGameXmlReader;
+import com.l2jmobius.commons.util.IXmlReader;
 import com.l2jmobius.gameserver.model.items.Item;
 import com.l2jmobius.gameserver.model.items.instance.ItemInstance;
 import com.l2jmobius.gameserver.model.items.type.CrystalType;
@@ -35,7 +35,7 @@ import com.l2jmobius.gameserver.model.items.type.CrystalType;
  * This class holds the Enchant HP Bonus Data.
  * @author MrPoke, Zoey76
  */
-public class EnchantItemHPBonusData implements IGameXmlReader
+public class EnchantItemHPBonusData implements IXmlReader
 {
 	private static final Logger LOGGER = Logger.getLogger(EnchantItemHPBonusData.class.getName());
 	
diff --git a/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/data/xml/impl/EnchantItemOptionsData.java b/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/data/xml/impl/EnchantItemOptionsData.java
index f6e9946b94..b8d805132f 100644
--- a/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/data/xml/impl/EnchantItemOptionsData.java
+++ b/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/data/xml/impl/EnchantItemOptionsData.java
@@ -24,7 +24,7 @@ import java.util.logging.Logger;
 import org.w3c.dom.Document;
 import org.w3c.dom.Node;
 
-import com.l2jmobius.commons.util.IGameXmlReader;
+import com.l2jmobius.commons.util.IXmlReader;
 import com.l2jmobius.gameserver.model.items.instance.ItemInstance;
 import com.l2jmobius.gameserver.model.options.EnchantOptions;
 import com.l2jmobius.gameserver.util.Util;
@@ -32,7 +32,7 @@ import com.l2jmobius.gameserver.util.Util;
 /**
  * @author UnAfraid
  */
-public class EnchantItemOptionsData implements IGameXmlReader
+public class EnchantItemOptionsData implements IXmlReader
 {
 	private static final Logger LOGGER = Logger.getLogger(EnchantItemOptionsData.class.getName());
 	
diff --git a/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/data/xml/impl/EnchantSkillGroupsData.java b/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/data/xml/impl/EnchantSkillGroupsData.java
index 0b557ced04..45127fe5f6 100644
--- a/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/data/xml/impl/EnchantSkillGroupsData.java
+++ b/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/data/xml/impl/EnchantSkillGroupsData.java
@@ -18,16 +18,15 @@ package com.l2jmobius.gameserver.data.xml.impl;
 
 import java.io.File;
 import java.util.Collections;
-import java.util.HashMap;
 import java.util.HashSet;
-import java.util.LinkedHashMap;
 import java.util.Map;
 import java.util.Set;
+import java.util.concurrent.ConcurrentHashMap;
 import java.util.logging.Logger;
 
 import org.w3c.dom.Document;
 
-import com.l2jmobius.commons.util.IGameXmlReader;
+import com.l2jmobius.commons.util.IXmlReader;
 import com.l2jmobius.gameserver.enums.SkillEnchantType;
 import com.l2jmobius.gameserver.model.StatsSet;
 import com.l2jmobius.gameserver.model.holders.EnchantSkillHolder;
@@ -39,12 +38,12 @@ import com.l2jmobius.gameserver.model.skills.Skill;
  * This class holds the Enchant Groups information.
  * @author Micr0
  */
-public class EnchantSkillGroupsData implements IGameXmlReader
+public class EnchantSkillGroupsData implements IXmlReader
 {
 	private static final Logger LOGGER = Logger.getLogger(EnchantSkillGroupsData.class.getName());
 	
-	private final Map<Integer, EnchantSkillHolder> _enchantSkillHolders = new LinkedHashMap<>();
-	private final Map<SkillHolder, Set<Integer>> _enchantSkillTrees = new HashMap<>();
+	private final Map<Integer, EnchantSkillHolder> _enchantSkillHolders = new ConcurrentHashMap<>();
+	private final Map<SkillHolder, Set<Integer>> _enchantSkillTrees = new ConcurrentHashMap<>();
 	
 	public static int MAX_ENCHANT_LEVEL;
 	
diff --git a/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/data/xml/impl/EnsoulData.java b/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/data/xml/impl/EnsoulData.java
index 0881f3aaec..bea9592527 100644
--- a/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/data/xml/impl/EnsoulData.java
+++ b/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/data/xml/impl/EnsoulData.java
@@ -19,16 +19,14 @@ package com.l2jmobius.gameserver.data.xml.impl;
 import java.io.File;
 import java.util.Collection;
 import java.util.Collections;
-import java.util.EnumMap;
-import java.util.HashMap;
 import java.util.Map;
+import java.util.concurrent.ConcurrentHashMap;
 import java.util.logging.Logger;
 
 import org.w3c.dom.Document;
 import org.w3c.dom.NamedNodeMap;
 import org.w3c.dom.Node;
 
-import com.l2jmobius.commons.util.IGameXmlReader;
 import com.l2jmobius.commons.util.IXmlReader;
 import com.l2jmobius.gameserver.model.ensoul.EnsoulFee;
 import com.l2jmobius.gameserver.model.ensoul.EnsoulOption;
@@ -39,12 +37,12 @@ import com.l2jmobius.gameserver.model.items.type.CrystalType;
 /**
  * @author UnAfraid
  */
-public class EnsoulData implements IGameXmlReader
+public class EnsoulData implements IXmlReader
 {
 	private static final Logger LOGGER = Logger.getLogger(EnsoulData.class.getName());
-	private final Map<CrystalType, EnsoulFee> _ensoulFees = new EnumMap<>(CrystalType.class);
-	private final Map<Integer, EnsoulOption> _ensoulOptions = new HashMap<>();
-	private final Map<Integer, EnsoulStone> _ensoulStones = new HashMap<>();
+	private final Map<CrystalType, EnsoulFee> _ensoulFees = new ConcurrentHashMap<>();
+	private final Map<Integer, EnsoulOption> _ensoulOptions = new ConcurrentHashMap<>();
+	private final Map<Integer, EnsoulStone> _ensoulStones = new ConcurrentHashMap<>();
 	
 	protected EnsoulData()
 	{
diff --git a/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/data/xml/impl/EventEngineData.java b/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/data/xml/impl/EventEngineData.java
index c43970ea31..144e2d5599 100644
--- a/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/data/xml/impl/EventEngineData.java
+++ b/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/data/xml/impl/EventEngineData.java
@@ -32,7 +32,6 @@ import org.w3c.dom.Document;
 import org.w3c.dom.NamedNodeMap;
 import org.w3c.dom.Node;
 
-import com.l2jmobius.commons.util.IGameXmlReader;
 import com.l2jmobius.commons.util.IXmlReader;
 import com.l2jmobius.gameserver.model.Location;
 import com.l2jmobius.gameserver.model.StatsSet;
@@ -54,7 +53,7 @@ import com.l2jmobius.gameserver.model.holders.SkillHolder;
 /**
  * @author UnAfraid
  */
-public final class EventEngineData implements IGameXmlReader
+public final class EventEngineData implements IXmlReader
 {
 	private static final Logger LOGGER = Logger.getLogger(EventEngineData.class.getName());
 	
diff --git a/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/data/xml/impl/ExperienceData.java b/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/data/xml/impl/ExperienceData.java
index 2daaf16220..ea9d13c2aa 100644
--- a/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/data/xml/impl/ExperienceData.java
+++ b/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/data/xml/impl/ExperienceData.java
@@ -26,13 +26,13 @@ import org.w3c.dom.NamedNodeMap;
 import org.w3c.dom.Node;
 
 import com.l2jmobius.Config;
-import com.l2jmobius.commons.util.IGameXmlReader;
+import com.l2jmobius.commons.util.IXmlReader;
 
 /**
  * This class holds the Experience points for each level for players and pets.
  * @author mrTJO
  */
-public final class ExperienceData implements IGameXmlReader
+public final class ExperienceData implements IXmlReader
 {
 	private static final Logger LOGGER = Logger.getLogger(ExperienceData.class.getName());
 	
diff --git a/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/data/xml/impl/ExtendDropData.java b/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/data/xml/impl/ExtendDropData.java
index 00af3a4f77..09da39ad14 100644
--- a/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/data/xml/impl/ExtendDropData.java
+++ b/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/data/xml/impl/ExtendDropData.java
@@ -28,7 +28,7 @@ import java.util.logging.Logger;
 import org.w3c.dom.Document;
 import org.w3c.dom.Node;
 
-import com.l2jmobius.commons.util.IGameXmlReader;
+import com.l2jmobius.commons.util.IXmlReader;
 import com.l2jmobius.gameserver.handler.ConditionHandler;
 import com.l2jmobius.gameserver.model.StatsSet;
 import com.l2jmobius.gameserver.model.conditions.ICondition;
@@ -39,7 +39,7 @@ import com.l2jmobius.gameserver.network.SystemMessageId;
 /**
  * @author Sdw
  */
-public class ExtendDropData implements IGameXmlReader
+public class ExtendDropData implements IXmlReader
 {
 	private static final Logger LOGGER = Logger.getLogger(ExtendDropData.class.getName());
 	private final Map<Integer, ExtendDropDataHolder> _extendDrop = new HashMap<>();
diff --git a/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/data/xml/impl/FakePlayerData.java b/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/data/xml/impl/FakePlayerData.java
index afb92c06d5..74b7957fd9 100644
--- a/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/data/xml/impl/FakePlayerData.java
+++ b/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/data/xml/impl/FakePlayerData.java
@@ -26,7 +26,7 @@ import java.util.logging.Logger;
 import org.w3c.dom.Document;
 
 import com.l2jmobius.Config;
-import com.l2jmobius.commons.util.IGameXmlReader;
+import com.l2jmobius.commons.util.IXmlReader;
 import com.l2jmobius.gameserver.data.sql.impl.CharNameTable;
 import com.l2jmobius.gameserver.model.StatsSet;
 import com.l2jmobius.gameserver.model.actor.templates.NpcTemplate;
@@ -35,7 +35,7 @@ import com.l2jmobius.gameserver.model.holders.FakePlayerHolder;
 /**
  * @author Mobius
  */
-public class FakePlayerData implements IGameXmlReader
+public class FakePlayerData implements IXmlReader
 {
 	private static Logger LOGGER = Logger.getLogger(FakePlayerData.class.getName());
 	
diff --git a/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/data/xml/impl/FenceData.java b/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/data/xml/impl/FenceData.java
index f51175e5fa..d36ab2e16b 100644
--- a/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/data/xml/impl/FenceData.java
+++ b/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/data/xml/impl/FenceData.java
@@ -28,7 +28,7 @@ import java.util.logging.Logger;
 import org.w3c.dom.Document;
 import org.w3c.dom.Node;
 
-import com.l2jmobius.commons.util.IGameXmlReader;
+import com.l2jmobius.commons.util.IXmlReader;
 import com.l2jmobius.gameserver.enums.FenceState;
 import com.l2jmobius.gameserver.model.StatsSet;
 import com.l2jmobius.gameserver.model.World;
@@ -39,7 +39,7 @@ import com.l2jmobius.gameserver.model.instancezone.Instance;
 /**
  * @author HoridoJoho / FBIagent
  */
-public final class FenceData implements IGameXmlReader
+public final class FenceData implements IXmlReader
 {
 	private static final Logger LOGGER = Logger.getLogger(FenceData.class.getSimpleName());
 	
diff --git a/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/data/xml/impl/FishingData.java b/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/data/xml/impl/FishingData.java
index bacf1ed08c..16436a2f5c 100644
--- a/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/data/xml/impl/FishingData.java
+++ b/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/data/xml/impl/FishingData.java
@@ -26,7 +26,7 @@ import org.w3c.dom.NamedNodeMap;
 import org.w3c.dom.Node;
 
 import com.l2jmobius.Config;
-import com.l2jmobius.commons.util.IGameXmlReader;
+import com.l2jmobius.commons.util.IXmlReader;
 import com.l2jmobius.gameserver.datatables.ItemTable;
 import com.l2jmobius.gameserver.model.fishing.FishingBait;
 import com.l2jmobius.gameserver.model.fishing.FishingCatch;
@@ -36,7 +36,7 @@ import com.l2jmobius.gameserver.model.fishing.FishingRod;
  * This class holds the Fishing information.
  * @author bit
  */
-public final class FishingData implements IGameXmlReader
+public final class FishingData implements IXmlReader
 {
 	private static final Logger LOGGER = Logger.getLogger(FishingData.class.getName());
 	private final Map<Integer, FishingBait> _baitData = new HashMap<>();
diff --git a/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/data/xml/impl/HennaData.java b/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/data/xml/impl/HennaData.java
index e27e186193..d3ac163f3c 100644
--- a/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/data/xml/impl/HennaData.java
+++ b/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/data/xml/impl/HennaData.java
@@ -27,7 +27,7 @@ import org.w3c.dom.Document;
 import org.w3c.dom.NamedNodeMap;
 import org.w3c.dom.Node;
 
-import com.l2jmobius.commons.util.IGameXmlReader;
+import com.l2jmobius.commons.util.IXmlReader;
 import com.l2jmobius.gameserver.model.StatsSet;
 import com.l2jmobius.gameserver.model.base.ClassId;
 import com.l2jmobius.gameserver.model.items.Henna;
@@ -40,7 +40,7 @@ import com.l2jmobius.gameserver.model.skills.Skill;
  * Allowed classes to wear each henna.
  * @author Zoey76, Mobius
  */
-public final class HennaData implements IGameXmlReader
+public final class HennaData implements IXmlReader
 {
 	private static final Logger LOGGER = Logger.getLogger(HennaData.class.getName());
 	
diff --git a/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/data/xml/impl/HitConditionBonusData.java b/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/data/xml/impl/HitConditionBonusData.java
index e9f2f9a87d..2d6ccf0467 100644
--- a/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/data/xml/impl/HitConditionBonusData.java
+++ b/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/data/xml/impl/HitConditionBonusData.java
@@ -23,7 +23,7 @@ import org.w3c.dom.Document;
 import org.w3c.dom.NamedNodeMap;
 import org.w3c.dom.Node;
 
-import com.l2jmobius.commons.util.IGameXmlReader;
+import com.l2jmobius.commons.util.IXmlReader;
 import com.l2jmobius.gameserver.GameTimeController;
 import com.l2jmobius.gameserver.enums.Position;
 import com.l2jmobius.gameserver.model.actor.Creature;
@@ -32,7 +32,7 @@ import com.l2jmobius.gameserver.model.actor.Creature;
  * This class load, holds and calculates the hit condition bonuses.
  * @author Nik
  */
-public final class HitConditionBonusData implements IGameXmlReader
+public final class HitConditionBonusData implements IXmlReader
 {
 	private static final Logger LOGGER = Logger.getLogger(HitConditionBonusData.class.getName());
 	
diff --git a/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/data/xml/impl/InitialEquipmentData.java b/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/data/xml/impl/InitialEquipmentData.java
index 247ea4b46d..275a23f28f 100644
--- a/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/data/xml/impl/InitialEquipmentData.java
+++ b/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/data/xml/impl/InitialEquipmentData.java
@@ -28,7 +28,7 @@ import org.w3c.dom.NamedNodeMap;
 import org.w3c.dom.Node;
 
 import com.l2jmobius.Config;
-import com.l2jmobius.commons.util.IGameXmlReader;
+import com.l2jmobius.commons.util.IXmlReader;
 import com.l2jmobius.gameserver.model.StatsSet;
 import com.l2jmobius.gameserver.model.base.ClassId;
 import com.l2jmobius.gameserver.model.items.PlayerItemTemplate;
@@ -38,7 +38,7 @@ import com.l2jmobius.gameserver.model.items.PlayerItemTemplate;
  * What items get each newly created character and if this item is equipped upon creation (<b>Requires the item to be equippable</b>).
  * @author Zoey76
  */
-public final class InitialEquipmentData implements IGameXmlReader
+public final class InitialEquipmentData implements IXmlReader
 {
 	private static final Logger LOGGER = Logger.getLogger(InitialEquipmentData.class.getName());
 	
diff --git a/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/data/xml/impl/InitialShortcutData.java b/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/data/xml/impl/InitialShortcutData.java
index 5f886bafa8..3b9e976607 100644
--- a/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/data/xml/impl/InitialShortcutData.java
+++ b/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/data/xml/impl/InitialShortcutData.java
@@ -27,7 +27,7 @@ import org.w3c.dom.Document;
 import org.w3c.dom.NamedNodeMap;
 import org.w3c.dom.Node;
 
-import com.l2jmobius.commons.util.IGameXmlReader;
+import com.l2jmobius.commons.util.IXmlReader;
 import com.l2jmobius.gameserver.enums.MacroType;
 import com.l2jmobius.gameserver.enums.ShortcutType;
 import com.l2jmobius.gameserver.model.Macro;
@@ -43,7 +43,7 @@ import com.l2jmobius.gameserver.network.serverpackets.ShortCutRegister;
  * What shortcuts get each newly created character.
  * @author Zoey76
  */
-public final class InitialShortcutData implements IGameXmlReader
+public final class InitialShortcutData implements IXmlReader
 {
 	private static final Logger LOGGER = Logger.getLogger(InitialShortcutData.class.getName());
 	
diff --git a/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/data/xml/impl/ItemCrystallizationData.java b/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/data/xml/impl/ItemCrystallizationData.java
index 86454b2b71..aa7742afa1 100644
--- a/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/data/xml/impl/ItemCrystallizationData.java
+++ b/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/data/xml/impl/ItemCrystallizationData.java
@@ -28,7 +28,7 @@ import org.w3c.dom.Document;
 import org.w3c.dom.NamedNodeMap;
 import org.w3c.dom.Node;
 
-import com.l2jmobius.commons.util.IGameXmlReader;
+import com.l2jmobius.commons.util.IXmlReader;
 import com.l2jmobius.gameserver.datatables.ItemTable;
 import com.l2jmobius.gameserver.enums.CrystallizationType;
 import com.l2jmobius.gameserver.model.holders.CrystallizationDataHolder;
@@ -42,7 +42,7 @@ import com.l2jmobius.gameserver.model.items.type.CrystalType;
 /**
  * @author UnAfraid
  */
-public final class ItemCrystallizationData implements IGameXmlReader
+public final class ItemCrystallizationData implements IXmlReader
 {
 	private static final Logger LOGGER = Logger.getLogger(ItemCrystallizationData.class.getName());
 	
diff --git a/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/data/xml/impl/KarmaData.java b/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/data/xml/impl/KarmaData.java
index ca826eba2e..bd68c38748 100644
--- a/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/data/xml/impl/KarmaData.java
+++ b/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/data/xml/impl/KarmaData.java
@@ -26,12 +26,12 @@ import org.w3c.dom.NamedNodeMap;
 import org.w3c.dom.Node;
 
 import com.l2jmobius.Config;
-import com.l2jmobius.commons.util.IGameXmlReader;
+import com.l2jmobius.commons.util.IXmlReader;
 
 /**
  * @author UnAfraid
  */
-public class KarmaData implements IGameXmlReader
+public class KarmaData implements IXmlReader
 {
 	private static final Logger LOGGER = Logger.getLogger(KarmaData.class.getName());
 	
diff --git a/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/data/xml/impl/LuckyGameData.java b/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/data/xml/impl/LuckyGameData.java
index 6759bfec3f..41c0d0fc31 100644
--- a/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/data/xml/impl/LuckyGameData.java
+++ b/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/data/xml/impl/LuckyGameData.java
@@ -23,7 +23,7 @@ import java.util.concurrent.atomic.AtomicInteger;
 
 import org.w3c.dom.Document;
 
-import com.l2jmobius.commons.util.IGameXmlReader;
+import com.l2jmobius.commons.util.IXmlReader;
 import com.l2jmobius.gameserver.model.StatsSet;
 import com.l2jmobius.gameserver.model.holders.ItemChanceHolder;
 import com.l2jmobius.gameserver.model.holders.ItemPointHolder;
@@ -32,7 +32,7 @@ import com.l2jmobius.gameserver.model.holders.LuckyGameDataHolder;
 /**
  * @author Sdw
  */
-public class LuckyGameData implements IGameXmlReader
+public class LuckyGameData implements IXmlReader
 {
 	private final Map<Integer, LuckyGameDataHolder> _luckyGame = new HashMap<>();
 	private final AtomicInteger _serverPlay = new AtomicInteger();
diff --git a/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/data/xml/impl/MonsterBookData.java b/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/data/xml/impl/MonsterBookData.java
index 50f2faefd5..9c69fe71fb 100644
--- a/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/data/xml/impl/MonsterBookData.java
+++ b/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/data/xml/impl/MonsterBookData.java
@@ -25,7 +25,7 @@ import org.w3c.dom.Document;
 import org.w3c.dom.NamedNodeMap;
 import org.w3c.dom.Node;
 
-import com.l2jmobius.commons.util.IGameXmlReader;
+import com.l2jmobius.commons.util.IXmlReader;
 import com.l2jmobius.gameserver.enums.Faction;
 import com.l2jmobius.gameserver.model.holders.MonsterBookCardHolder;
 import com.l2jmobius.gameserver.model.holders.MonsterBookRewardHolder;
@@ -33,7 +33,7 @@ import com.l2jmobius.gameserver.model.holders.MonsterBookRewardHolder;
 /**
  * @author Mobius
  */
-public class MonsterBookData implements IGameXmlReader
+public class MonsterBookData implements IXmlReader
 {
 	private static final Logger LOGGER = Logger.getLogger(MonsterBookData.class.getName());
 	private final List<MonsterBookCardHolder> _monsterBook = new ArrayList<>();
diff --git a/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/data/xml/impl/MultisellData.java b/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/data/xml/impl/MultisellData.java
index 796cd9b6f1..e9c494b91e 100644
--- a/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/data/xml/impl/MultisellData.java
+++ b/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/data/xml/impl/MultisellData.java
@@ -19,11 +19,11 @@ package com.l2jmobius.gameserver.data.xml.impl;
 import java.io.File;
 import java.io.FileFilter;
 import java.util.ArrayList;
-import java.util.HashMap;
 import java.util.HashSet;
 import java.util.List;
 import java.util.Map;
 import java.util.Set;
+import java.util.concurrent.ConcurrentHashMap;
 import java.util.logging.Level;
 import java.util.logging.Logger;
 
@@ -31,7 +31,7 @@ import org.w3c.dom.Document;
 import org.w3c.dom.Node;
 
 import com.l2jmobius.Config;
-import com.l2jmobius.commons.util.IGameXmlReader;
+import com.l2jmobius.commons.util.IXmlReader;
 import com.l2jmobius.commons.util.file.filter.NumericNameFilter;
 import com.l2jmobius.gameserver.datatables.ItemTable;
 import com.l2jmobius.gameserver.enums.SpecialItemType;
@@ -46,14 +46,14 @@ import com.l2jmobius.gameserver.model.holders.PreparedMultisellListHolder;
 import com.l2jmobius.gameserver.model.items.Item;
 import com.l2jmobius.gameserver.network.serverpackets.MultiSellList;
 
-public final class MultisellData implements IGameXmlReader
+public final class MultisellData implements IXmlReader
 {
 	private static final Logger LOGGER = Logger.getLogger(MultisellData.class.getName());
 	
 	public static final int PAGE_SIZE = 40;
 	private static final FileFilter NUMERIC_FILTER = new NumericNameFilter();
 	
-	private final Map<Integer, MultisellListHolder> _multisells = new HashMap<>();
+	private final Map<Integer, MultisellListHolder> _multisells = new ConcurrentHashMap<>();
 	
 	protected MultisellData()
 	{
diff --git a/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/data/xml/impl/NpcData.java b/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/data/xml/impl/NpcData.java
index e43e5c5147..3e1adcb420 100644
--- a/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/data/xml/impl/NpcData.java
+++ b/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/data/xml/impl/NpcData.java
@@ -26,6 +26,8 @@ import java.util.List;
 import java.util.Map;
 import java.util.Map.Entry;
 import java.util.Set;
+import java.util.concurrent.ConcurrentHashMap;
+import java.util.concurrent.CopyOnWriteArrayList;
 import java.util.function.Predicate;
 import java.util.logging.Logger;
 import java.util.stream.Collectors;
@@ -36,7 +38,7 @@ import org.w3c.dom.Node;
 
 import com.l2jmobius.Config;
 import com.l2jmobius.commons.util.CommonUtil;
-import com.l2jmobius.commons.util.IGameXmlReader;
+import com.l2jmobius.commons.util.IXmlReader;
 import com.l2jmobius.gameserver.datatables.ItemTable;
 import com.l2jmobius.gameserver.enums.AISkillScope;
 import com.l2jmobius.gameserver.enums.DropType;
@@ -52,13 +54,13 @@ import com.l2jmobius.gameserver.model.skills.Skill;
  * NPC data parser.
  * @author NosBit
  */
-public class NpcData implements IGameXmlReader
+public class NpcData implements IXmlReader
 {
 	protected static final Logger LOGGER = Logger.getLogger(NpcData.class.getName());
 	
-	private final Map<Integer, NpcTemplate> _npcs = new HashMap<>();
-	private final Map<String, Integer> _clans = new HashMap<>();
-	private static final List<Integer> _masterMonsterIDs = new ArrayList<>();
+	private final Map<Integer, NpcTemplate> _npcs = new ConcurrentHashMap<>();
+	private final Map<String, Integer> _clans = new ConcurrentHashMap<>();
+	private static final List<Integer> _masterMonsterIDs = new CopyOnWriteArrayList<>();
 	
 	protected NpcData()
 	{
diff --git a/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/data/xml/impl/OptionData.java b/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/data/xml/impl/OptionData.java
index bffa2b107c..424e2b27ad 100644
--- a/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/data/xml/impl/OptionData.java
+++ b/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/data/xml/impl/OptionData.java
@@ -18,13 +18,12 @@ package com.l2jmobius.gameserver.data.xml.impl;
 
 import java.io.File;
 import java.util.Collections;
-import java.util.HashMap;
 import java.util.Map;
+import java.util.concurrent.ConcurrentHashMap;
 import java.util.logging.Logger;
 
 import org.w3c.dom.Document;
 
-import com.l2jmobius.commons.util.IGameXmlReader;
 import com.l2jmobius.commons.util.IXmlReader;
 import com.l2jmobius.gameserver.handler.EffectHandler;
 import com.l2jmobius.gameserver.model.StatsSet;
@@ -36,11 +35,11 @@ import com.l2jmobius.gameserver.model.options.OptionsSkillType;
 /**
  * @author UnAfraid
  */
-public class OptionData implements IGameXmlReader
+public class OptionData implements IXmlReader
 {
 	private static final Logger LOGGER = Logger.getLogger(OptionData.class.getName());
 	
-	private final Map<Integer, Options> _optionData = new HashMap<>();
+	private final Map<Integer, Options> _optionData = new ConcurrentHashMap<>();
 	
 	protected OptionData()
 	{
diff --git a/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/data/xml/impl/PetDataTable.java b/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/data/xml/impl/PetDataTable.java
index 65afb75d7d..aa6975cd72 100644
--- a/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/data/xml/impl/PetDataTable.java
+++ b/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/data/xml/impl/PetDataTable.java
@@ -17,15 +17,15 @@
 package com.l2jmobius.gameserver.data.xml.impl;
 
 import java.io.File;
-import java.util.HashMap;
 import java.util.Map;
+import java.util.concurrent.ConcurrentHashMap;
 import java.util.logging.Logger;
 
 import org.w3c.dom.Document;
 import org.w3c.dom.NamedNodeMap;
 import org.w3c.dom.Node;
 
-import com.l2jmobius.commons.util.IGameXmlReader;
+import com.l2jmobius.commons.util.IXmlReader;
 import com.l2jmobius.gameserver.enums.MountType;
 import com.l2jmobius.gameserver.model.PetData;
 import com.l2jmobius.gameserver.model.PetLevelData;
@@ -36,11 +36,11 @@ import com.l2jmobius.gameserver.model.StatsSet;
  * TODO: load and use all pet parameters.
  * @author Zoey76 (rework)
  */
-public final class PetDataTable implements IGameXmlReader
+public final class PetDataTable implements IXmlReader
 {
 	private static final Logger LOGGER = Logger.getLogger(PetDataTable.class.getName());
 	
-	private final Map<Integer, PetData> _pets = new HashMap<>();
+	private final Map<Integer, PetData> _pets = new ConcurrentHashMap<>();
 	
 	/**
 	 * Instantiates a new pet data table.
diff --git a/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/data/xml/impl/PetSkillData.java b/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/data/xml/impl/PetSkillData.java
index 4872dde773..5b2f9a4408 100644
--- a/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/data/xml/impl/PetSkillData.java
+++ b/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/data/xml/impl/PetSkillData.java
@@ -27,14 +27,14 @@ import org.w3c.dom.Document;
 import org.w3c.dom.NamedNodeMap;
 import org.w3c.dom.Node;
 
-import com.l2jmobius.commons.util.IGameXmlReader;
+import com.l2jmobius.commons.util.IXmlReader;
 import com.l2jmobius.gameserver.model.actor.Summon;
 import com.l2jmobius.gameserver.model.holders.SkillHolder;
 
 /**
  * @author Mobius
  */
-public class PetSkillData implements IGameXmlReader
+public class PetSkillData implements IXmlReader
 {
 	private static Logger LOGGER = Logger.getLogger(PetSkillData.class.getName());
 	private final Map<Integer, Map<Long, SkillHolder>> _skillTrees = new HashMap<>();
diff --git a/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/data/xml/impl/PlayerTemplateData.java b/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/data/xml/impl/PlayerTemplateData.java
index 031fab8027..7a7c230b72 100644
--- a/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/data/xml/impl/PlayerTemplateData.java
+++ b/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/data/xml/impl/PlayerTemplateData.java
@@ -18,9 +18,9 @@ package com.l2jmobius.gameserver.data.xml.impl;
 
 import java.io.File;
 import java.util.ArrayList;
-import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
+import java.util.concurrent.ConcurrentHashMap;
 import java.util.logging.Logger;
 
 import org.w3c.dom.Document;
@@ -28,7 +28,7 @@ import org.w3c.dom.NamedNodeMap;
 import org.w3c.dom.Node;
 
 import com.l2jmobius.Config;
-import com.l2jmobius.commons.util.IGameXmlReader;
+import com.l2jmobius.commons.util.IXmlReader;
 import com.l2jmobius.gameserver.model.Location;
 import com.l2jmobius.gameserver.model.StatsSet;
 import com.l2jmobius.gameserver.model.actor.templates.PlayerTemplate;
@@ -38,11 +38,11 @@ import com.l2jmobius.gameserver.model.base.ClassId;
  * Loads player's base stats.
  * @author Forsaiken, Zoey76, GKR
  */
-public final class PlayerTemplateData implements IGameXmlReader
+public final class PlayerTemplateData implements IXmlReader
 {
 	private static final Logger LOGGER = Logger.getLogger(PlayerTemplateData.class.getName());
 	
-	private final Map<ClassId, PlayerTemplate> _playerTemplates = new HashMap<>();
+	private final Map<ClassId, PlayerTemplate> _playerTemplates = new ConcurrentHashMap<>();
 	
 	private int _dataCount = 0;
 	private int _autoGeneratedCount = 0;
diff --git a/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/data/xml/impl/PlayerXpPercentLostData.java b/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/data/xml/impl/PlayerXpPercentLostData.java
index 2b867a18e4..816cb7aacf 100644
--- a/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/data/xml/impl/PlayerXpPercentLostData.java
+++ b/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/data/xml/impl/PlayerXpPercentLostData.java
@@ -24,13 +24,13 @@ import org.w3c.dom.Document;
 import org.w3c.dom.NamedNodeMap;
 import org.w3c.dom.Node;
 
-import com.l2jmobius.commons.util.IGameXmlReader;
+import com.l2jmobius.commons.util.IXmlReader;
 
 /**
  * This class holds the Player Xp Percent Lost Data for each level for players.
  * @author Zealar
  */
-public final class PlayerXpPercentLostData implements IGameXmlReader
+public final class PlayerXpPercentLostData implements IXmlReader
 {
 	private static final Logger LOGGER = Logger.getLogger(PlayerXpPercentLostData.class.getName());
 	
diff --git a/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/data/xml/impl/PrimeShopData.java b/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/data/xml/impl/PrimeShopData.java
index 82ddd51f26..650d156194 100644
--- a/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/data/xml/impl/PrimeShopData.java
+++ b/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/data/xml/impl/PrimeShopData.java
@@ -27,7 +27,7 @@ import org.w3c.dom.Document;
 import org.w3c.dom.NamedNodeMap;
 import org.w3c.dom.Node;
 
-import com.l2jmobius.commons.util.IGameXmlReader;
+import com.l2jmobius.commons.util.IXmlReader;
 import com.l2jmobius.gameserver.datatables.ItemTable;
 import com.l2jmobius.gameserver.model.StatsSet;
 import com.l2jmobius.gameserver.model.actor.instance.PlayerInstance;
@@ -39,7 +39,7 @@ import com.l2jmobius.gameserver.network.serverpackets.primeshop.ExBRProductInfo;
 /**
  * @author Gnacik, UnAfraid
  */
-public class PrimeShopData implements IGameXmlReader
+public class PrimeShopData implements IXmlReader
 {
 	private static final Logger LOGGER = Logger.getLogger(PrimeShopData.class.getName());
 	
diff --git a/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/data/xml/impl/RecipeData.java b/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/data/xml/impl/RecipeData.java
index 80d9297e84..04794cd354 100644
--- a/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/data/xml/impl/RecipeData.java
+++ b/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/data/xml/impl/RecipeData.java
@@ -29,7 +29,7 @@ import org.w3c.dom.Document;
 import org.w3c.dom.NamedNodeMap;
 import org.w3c.dom.Node;
 
-import com.l2jmobius.commons.util.IGameXmlReader;
+import com.l2jmobius.commons.util.IXmlReader;
 import com.l2jmobius.gameserver.enums.StatusUpdateType;
 import com.l2jmobius.gameserver.model.StatsSet;
 import com.l2jmobius.gameserver.model.holders.ItemChanceHolder;
@@ -39,7 +39,7 @@ import com.l2jmobius.gameserver.model.holders.RecipeHolder;
 /**
  * @author Nik
  */
-public class RecipeData implements IGameXmlReader
+public class RecipeData implements IXmlReader
 {
 	private static final Logger LOGGER = Logger.getLogger(RecipeData.class.getName());
 	
diff --git a/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/data/xml/impl/ResidenceFunctionsData.java b/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/data/xml/impl/ResidenceFunctionsData.java
index 66951e9e59..094ef13149 100644
--- a/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/data/xml/impl/ResidenceFunctionsData.java
+++ b/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/data/xml/impl/ResidenceFunctionsData.java
@@ -28,7 +28,7 @@ import org.w3c.dom.Document;
 import org.w3c.dom.NamedNodeMap;
 import org.w3c.dom.Node;
 
-import com.l2jmobius.commons.util.IGameXmlReader;
+import com.l2jmobius.commons.util.IXmlReader;
 import com.l2jmobius.gameserver.model.StatsSet;
 import com.l2jmobius.gameserver.model.residences.ResidenceFunctionTemplate;
 
@@ -36,7 +36,7 @@ import com.l2jmobius.gameserver.model.residences.ResidenceFunctionTemplate;
  * The residence functions data
  * @author UnAfraid
  */
-public final class ResidenceFunctionsData implements IGameXmlReader
+public final class ResidenceFunctionsData implements IXmlReader
 {
 	private static final Logger LOGGER = Logger.getLogger(ResidenceFunctionsData.class.getName());
 	private final Map<Integer, List<ResidenceFunctionTemplate>> _functions = new HashMap<>();
diff --git a/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/data/xml/impl/SayuneData.java b/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/data/xml/impl/SayuneData.java
index 835bd96930..13b4d33b1e 100644
--- a/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/data/xml/impl/SayuneData.java
+++ b/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/data/xml/impl/SayuneData.java
@@ -26,13 +26,13 @@ import org.w3c.dom.Document;
 import org.w3c.dom.NamedNodeMap;
 import org.w3c.dom.Node;
 
-import com.l2jmobius.commons.util.IGameXmlReader;
+import com.l2jmobius.commons.util.IXmlReader;
 import com.l2jmobius.gameserver.model.SayuneEntry;
 
 /**
  * @author UnAfraid
  */
-public class SayuneData implements IGameXmlReader
+public class SayuneData implements IXmlReader
 {
 	private static final Logger LOGGER = Logger.getLogger(SayuneData.class.getName());
 	
diff --git a/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/data/xml/impl/SecondaryAuthData.java b/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/data/xml/impl/SecondaryAuthData.java
index c0ebd36146..ca85056b10 100644
--- a/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/data/xml/impl/SecondaryAuthData.java
+++ b/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/data/xml/impl/SecondaryAuthData.java
@@ -25,12 +25,12 @@ import java.util.logging.Logger;
 import org.w3c.dom.Document;
 import org.w3c.dom.Node;
 
-import com.l2jmobius.commons.util.IGameXmlReader;
+import com.l2jmobius.commons.util.IXmlReader;
 
 /**
  * @author NosBit
  */
-public class SecondaryAuthData implements IGameXmlReader
+public class SecondaryAuthData implements IXmlReader
 {
 	private static final Logger LOGGER = Logger.getLogger(SecondaryAuthData.class.getName());
 	
diff --git a/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/data/xml/impl/ShuttleData.java b/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/data/xml/impl/ShuttleData.java
index 9454d24d6b..ff26f4f409 100644
--- a/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/data/xml/impl/ShuttleData.java
+++ b/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/data/xml/impl/ShuttleData.java
@@ -27,7 +27,7 @@ import org.w3c.dom.Document;
 import org.w3c.dom.NamedNodeMap;
 import org.w3c.dom.Node;
 
-import com.l2jmobius.commons.util.IGameXmlReader;
+import com.l2jmobius.commons.util.IXmlReader;
 import com.l2jmobius.gameserver.model.Location;
 import com.l2jmobius.gameserver.model.StatsSet;
 import com.l2jmobius.gameserver.model.VehiclePathPoint;
@@ -40,7 +40,7 @@ import com.l2jmobius.gameserver.model.shuttle.ShuttleStop;
 /**
  * @author UnAfraid
  */
-public final class ShuttleData implements IGameXmlReader
+public final class ShuttleData implements IXmlReader
 {
 	private static final Logger LOGGER = Logger.getLogger(ShuttleData.class.getName());
 	
diff --git a/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/data/xml/impl/SiegeScheduleData.java b/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/data/xml/impl/SiegeScheduleData.java
index 265bf7c528..6bff09010b 100644
--- a/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/data/xml/impl/SiegeScheduleData.java
+++ b/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/data/xml/impl/SiegeScheduleData.java
@@ -27,7 +27,7 @@ import org.w3c.dom.Document;
 import org.w3c.dom.NamedNodeMap;
 import org.w3c.dom.Node;
 
-import com.l2jmobius.commons.util.IGameXmlReader;
+import com.l2jmobius.commons.util.IXmlReader;
 import com.l2jmobius.gameserver.model.SiegeScheduleDate;
 import com.l2jmobius.gameserver.model.StatsSet;
 import com.l2jmobius.gameserver.util.Util;
@@ -35,7 +35,7 @@ import com.l2jmobius.gameserver.util.Util;
 /**
  * @author UnAfraid
  */
-public class SiegeScheduleData implements IGameXmlReader
+public class SiegeScheduleData implements IXmlReader
 {
 	private static final Logger LOGGER = Logger.getLogger(SiegeScheduleData.class.getName());
 	
diff --git a/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/data/xml/impl/SkillData.java b/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/data/xml/impl/SkillData.java
index 7a1ae2e15b..64900d4d45 100644
--- a/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/data/xml/impl/SkillData.java
+++ b/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/data/xml/impl/SkillData.java
@@ -25,6 +25,7 @@ import java.util.List;
 import java.util.Map;
 import java.util.Optional;
 import java.util.Set;
+import java.util.concurrent.ConcurrentHashMap;
 import java.util.function.BiConsumer;
 import java.util.function.Function;
 import java.util.logging.Level;
@@ -35,7 +36,7 @@ import org.w3c.dom.Document;
 import org.w3c.dom.NamedNodeMap;
 import org.w3c.dom.Node;
 
-import com.l2jmobius.commons.util.IGameXmlReader;
+import com.l2jmobius.commons.util.IXmlReader;
 import com.l2jmobius.gameserver.handler.EffectHandler;
 import com.l2jmobius.gameserver.handler.SkillConditionHandler;
 import com.l2jmobius.gameserver.model.StatsSet;
@@ -51,12 +52,12 @@ import com.l2jmobius.gameserver.util.exp4j.ExpressionBuilder;
  * Skill data parser.
  * @author NosBit
  */
-public class SkillData implements IGameXmlReader
+public class SkillData implements IXmlReader
 {
 	private static final Logger LOGGER = Logger.getLogger(SkillData.class.getName());
 	
-	private final Map<Long, Skill> _skills = new HashMap<>();
-	private final Map<Integer, Integer> _skillsMaxLevel = new HashMap<>();
+	private final Map<Long, Skill> _skills = new ConcurrentHashMap<>();
+	private final Map<Integer, Integer> _skillsMaxLevel = new ConcurrentHashMap<>();
 	
 	private class NamedParamInfo
 	{
diff --git a/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/data/xml/impl/SkillTreesData.java b/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/data/xml/impl/SkillTreesData.java
index 7f667059db..780e0a1d1c 100644
--- a/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/data/xml/impl/SkillTreesData.java
+++ b/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/data/xml/impl/SkillTreesData.java
@@ -29,6 +29,7 @@ import java.util.List;
 import java.util.Map;
 import java.util.Map.Entry;
 import java.util.Set;
+import java.util.concurrent.ConcurrentHashMap;
 import java.util.concurrent.atomic.AtomicBoolean;
 import java.util.logging.Logger;
 import java.util.stream.Collectors;
@@ -38,7 +39,7 @@ import org.w3c.dom.NamedNodeMap;
 import org.w3c.dom.Node;
 
 import com.l2jmobius.Config;
-import com.l2jmobius.commons.util.IGameXmlReader;
+import com.l2jmobius.commons.util.IXmlReader;
 import com.l2jmobius.gameserver.enums.CategoryType;
 import com.l2jmobius.gameserver.enums.Race;
 import com.l2jmobius.gameserver.enums.SubclassType;
@@ -77,34 +78,34 @@ import com.l2jmobius.gameserver.model.skills.Skill;
  * For XML schema please refer to skillTrees.xsd in datapack in xsd folder and for parameters documentation refer to documentation.txt in skillTrees folder.<br>
  * @author Zoey76
  */
-public final class SkillTreesData implements IGameXmlReader
+public final class SkillTreesData implements IXmlReader
 {
 	private static final Logger LOGGER = Logger.getLogger(SkillTreesData.class.getName());
 	
 	// ClassId, Map of Skill Hash Code, SkillLearn
-	private static final Map<ClassId, Map<Long, SkillLearn>> _classSkillTrees = new HashMap<>();
-	private static final Map<ClassId, Map<Long, SkillLearn>> _transferSkillTrees = new HashMap<>();
-	private static final Map<Race, Map<Long, SkillLearn>> _raceSkillTree = new HashMap<>();
-	private static final Map<SubclassType, Map<Long, SkillLearn>> _revelationSkillTree = new HashMap<>();
-	private static final Map<ClassId, Set<Integer>> _awakeningSaveSkillTree = new HashMap<>();
+	private static final Map<ClassId, Map<Long, SkillLearn>> _classSkillTrees = new ConcurrentHashMap<>();
+	private static final Map<ClassId, Map<Long, SkillLearn>> _transferSkillTrees = new ConcurrentHashMap<>();
+	private static final Map<Race, Map<Long, SkillLearn>> _raceSkillTree = new ConcurrentHashMap<>();
+	private static final Map<SubclassType, Map<Long, SkillLearn>> _revelationSkillTree = new ConcurrentHashMap<>();
+	private static final Map<ClassId, Set<Integer>> _awakeningSaveSkillTree = new ConcurrentHashMap<>();
 	// Skill Hash Code, SkillLearn
-	private static final Map<Long, SkillLearn> _collectSkillTree = new HashMap<>();
-	private static final Map<Long, SkillLearn> _fishingSkillTree = new HashMap<>();
-	private static final Map<Long, SkillLearn> _pledgeSkillTree = new HashMap<>();
-	private static final Map<Long, SkillLearn> _subClassSkillTree = new HashMap<>();
-	private static final Map<Long, SkillLearn> _subPledgeSkillTree = new HashMap<>();
-	private static final Map<Long, SkillLearn> _transformSkillTree = new HashMap<>();
-	private static final Map<Long, SkillLearn> _commonSkillTree = new HashMap<>();
-	private static final Map<Long, SkillLearn> _abilitySkillTree = new HashMap<>();
-	private static final Map<Long, SkillLearn> _alchemySkillTree = new HashMap<>();
-	private static final Map<Long, SkillLearn> _dualClassSkillTree = new HashMap<>();
+	private static final Map<Long, SkillLearn> _collectSkillTree = new ConcurrentHashMap<>();
+	private static final Map<Long, SkillLearn> _fishingSkillTree = new ConcurrentHashMap<>();
+	private static final Map<Long, SkillLearn> _pledgeSkillTree = new ConcurrentHashMap<>();
+	private static final Map<Long, SkillLearn> _subClassSkillTree = new ConcurrentHashMap<>();
+	private static final Map<Long, SkillLearn> _subPledgeSkillTree = new ConcurrentHashMap<>();
+	private static final Map<Long, SkillLearn> _transformSkillTree = new ConcurrentHashMap<>();
+	private static final Map<Long, SkillLearn> _commonSkillTree = new ConcurrentHashMap<>();
+	private static final Map<Long, SkillLearn> _abilitySkillTree = new ConcurrentHashMap<>();
+	private static final Map<Long, SkillLearn> _alchemySkillTree = new ConcurrentHashMap<>();
+	private static final Map<Long, SkillLearn> _dualClassSkillTree = new ConcurrentHashMap<>();
 	// Other skill trees
-	private static final Map<Long, SkillLearn> _nobleSkillTree = new HashMap<>();
-	private static final Map<Long, SkillLearn> _heroSkillTree = new HashMap<>();
-	private static final Map<Long, SkillLearn> _gameMasterSkillTree = new HashMap<>();
-	private static final Map<Long, SkillLearn> _gameMasterAuraSkillTree = new HashMap<>();
+	private static final Map<Long, SkillLearn> _nobleSkillTree = new ConcurrentHashMap<>();
+	private static final Map<Long, SkillLearn> _heroSkillTree = new ConcurrentHashMap<>();
+	private static final Map<Long, SkillLearn> _gameMasterSkillTree = new ConcurrentHashMap<>();
+	private static final Map<Long, SkillLearn> _gameMasterAuraSkillTree = new ConcurrentHashMap<>();
 	// Remove skill tree
-	private static final Map<ClassId, Set<Integer>> _removeSkillCache = new HashMap<>();
+	private static final Map<ClassId, Set<Integer>> _removeSkillCache = new ConcurrentHashMap<>();
 	
 	// Checker, sorted arrays of hash codes
 	private Map<Integer, long[]> _skillsByClassIdHashCodes; // Occupation skills
@@ -112,7 +113,7 @@ public final class SkillTreesData implements IGameXmlReader
 	private long[] _allSkillsHashCodes; // Fishing, Collection, Transformations, Common Skills.
 	
 	/** Parent class Ids are read from XML and stored in this map, to allow easy customization. */
-	private static final Map<ClassId, ClassId> _parentClassMap = new HashMap<>();
+	private static final Map<ClassId, ClassId> _parentClassMap = new ConcurrentHashMap<>();
 	
 	private final AtomicBoolean _isLoading = new AtomicBoolean();
 	
diff --git a/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/data/xml/impl/SpawnsData.java b/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/data/xml/impl/SpawnsData.java
index dc41b02109..806d00902a 100644
--- a/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/data/xml/impl/SpawnsData.java
+++ b/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/data/xml/impl/SpawnsData.java
@@ -19,9 +19,10 @@ package com.l2jmobius.gameserver.data.xml.impl;
 import java.io.File;
 import java.util.ArrayList;
 import java.util.Collections;
-import java.util.LinkedList;
 import java.util.List;
 import java.util.Map;
+import java.util.concurrent.CopyOnWriteArrayList;
+import java.util.concurrent.ScheduledFuture;
 import java.util.function.Predicate;
 import java.util.logging.Level;
 import java.util.logging.Logger;
@@ -31,7 +32,7 @@ import org.w3c.dom.Document;
 import org.w3c.dom.Node;
 
 import com.l2jmobius.Config;
-import com.l2jmobius.commons.util.IGameXmlReader;
+import com.l2jmobius.commons.concurrent.ThreadPool;
 import com.l2jmobius.commons.util.IXmlReader;
 import com.l2jmobius.gameserver.model.ChanceLocation;
 import com.l2jmobius.gameserver.model.StatsSet;
@@ -49,11 +50,11 @@ import com.l2jmobius.gameserver.model.zone.type.SpawnTerritory;
 /**
  * @author UnAfraid
  */
-public class SpawnsData implements IGameXmlReader
+public class SpawnsData implements IXmlReader
 {
 	protected static final Logger LOGGER = Logger.getLogger(SpawnsData.class.getName());
 	
-	private final List<SpawnTemplate> _spawns = new LinkedList<>();
+	private final List<SpawnTemplate> _spawns = new CopyOnWriteArrayList<>();
 	
 	protected SpawnsData()
 	{
@@ -94,11 +95,28 @@ public class SpawnsData implements IGameXmlReader
 		}
 		
 		LOGGER.info(getClass().getSimpleName() + ": Initializing spawns...");
-		_spawns.stream().filter(SpawnTemplate::isSpawningByDefault).forEach(template ->
+		final List<ScheduledFuture<?>> jobs = new CopyOnWriteArrayList<>();
+		for (SpawnTemplate template : _spawns)
 		{
-			template.spawnAll(null);
-			template.notifyActivate();
-		});
+			if (template.isSpawningByDefault())
+			{
+				jobs.add(ThreadPool.schedule(() ->
+				{
+					template.spawnAll(null);
+					template.notifyActivate();
+				}, 0));
+			}
+		}
+		while (!jobs.isEmpty())
+		{
+			for (ScheduledFuture<?> job : jobs)
+			{
+				if ((job == null) || job.isDone() || job.isCancelled())
+				{
+					jobs.remove(job);
+				}
+			}
+		}
 		LOGGER.info(getClass().getSimpleName() + ": All spawns has been initialized!");
 	}
 	
diff --git a/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/data/xml/impl/StaticObjectData.java b/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/data/xml/impl/StaticObjectData.java
index 8af86bec88..5e88dd66fb 100644
--- a/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/data/xml/impl/StaticObjectData.java
+++ b/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/data/xml/impl/StaticObjectData.java
@@ -26,7 +26,7 @@ import org.w3c.dom.Document;
 import org.w3c.dom.NamedNodeMap;
 import org.w3c.dom.Node;
 
-import com.l2jmobius.commons.util.IGameXmlReader;
+import com.l2jmobius.commons.util.IXmlReader;
 import com.l2jmobius.gameserver.model.StatsSet;
 import com.l2jmobius.gameserver.model.actor.instance.StaticObjectInstance;
 import com.l2jmobius.gameserver.model.actor.templates.CreatureTemplate;
@@ -35,7 +35,7 @@ import com.l2jmobius.gameserver.model.actor.templates.CreatureTemplate;
  * This class loads and holds all static object data.
  * @author UnAfraid
  */
-public final class StaticObjectData implements IGameXmlReader
+public final class StaticObjectData implements IXmlReader
 {
 	private static final Logger LOGGER = Logger.getLogger(StaticObjectData.class.getName());
 	
diff --git a/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/data/xml/impl/TeleportersData.java b/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/data/xml/impl/TeleportersData.java
index 1d039725ad..5afec008f7 100644
--- a/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/data/xml/impl/TeleportersData.java
+++ b/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/data/xml/impl/TeleportersData.java
@@ -20,12 +20,13 @@ import java.io.File;
 import java.util.Collections;
 import java.util.HashMap;
 import java.util.Map;
+import java.util.concurrent.ConcurrentHashMap;
 import java.util.logging.Logger;
 
 import org.w3c.dom.Document;
 import org.w3c.dom.NamedNodeMap;
 
-import com.l2jmobius.commons.util.IGameXmlReader;
+import com.l2jmobius.commons.util.IXmlReader;
 import com.l2jmobius.gameserver.enums.TeleportType;
 import com.l2jmobius.gameserver.model.StatsSet;
 import com.l2jmobius.gameserver.model.teleporter.TeleportHolder;
@@ -33,12 +34,12 @@ import com.l2jmobius.gameserver.model.teleporter.TeleportHolder;
 /**
  * @author UnAfraid
  */
-public class TeleportersData implements IGameXmlReader
+public class TeleportersData implements IXmlReader
 {
 	// Logger instance
 	private static final Logger LOGGER = Logger.getLogger(TeleportersData.class.getName());
 	// Teleporter data
-	private final Map<Integer, Map<String, TeleportHolder>> _teleporters = new HashMap<>();
+	private final Map<Integer, Map<String, TeleportHolder>> _teleporters = new ConcurrentHashMap<>();
 	
 	protected TeleportersData()
 	{
diff --git a/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/data/xml/impl/TransformData.java b/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/data/xml/impl/TransformData.java
index 896111de87..d917c7e46f 100644
--- a/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/data/xml/impl/TransformData.java
+++ b/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/data/xml/impl/TransformData.java
@@ -17,15 +17,15 @@
 package com.l2jmobius.gameserver.data.xml.impl;
 
 import java.io.File;
-import java.util.HashMap;
 import java.util.Map;
+import java.util.concurrent.ConcurrentHashMap;
 import java.util.logging.Logger;
 
 import org.w3c.dom.Document;
 import org.w3c.dom.NamedNodeMap;
 import org.w3c.dom.Node;
 
-import com.l2jmobius.commons.util.IGameXmlReader;
+import com.l2jmobius.commons.util.IXmlReader;
 import com.l2jmobius.gameserver.model.StatsSet;
 import com.l2jmobius.gameserver.model.actor.transform.Transform;
 import com.l2jmobius.gameserver.model.actor.transform.TransformLevelData;
@@ -39,11 +39,11 @@ import com.l2jmobius.gameserver.network.serverpackets.ExBasicActionList;
  * Transformation data.
  * @author UnAfraid
  */
-public final class TransformData implements IGameXmlReader
+public final class TransformData implements IXmlReader
 {
 	private static final Logger LOGGER = Logger.getLogger(TransformData.class.getName());
 	
-	private final Map<Integer, Transform> _transformData = new HashMap<>();
+	private final Map<Integer, Transform> _transformData = new ConcurrentHashMap<>();
 	
 	protected TransformData()
 	{
diff --git a/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/data/xml/impl/VariationData.java b/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/data/xml/impl/VariationData.java
index 13b41c6359..542acc971b 100644
--- a/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/data/xml/impl/VariationData.java
+++ b/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/data/xml/impl/VariationData.java
@@ -22,11 +22,12 @@ import java.util.Collections;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
+import java.util.concurrent.ConcurrentHashMap;
 import java.util.logging.Logger;
 
 import org.w3c.dom.Document;
 
-import com.l2jmobius.commons.util.IGameXmlReader;
+import com.l2jmobius.commons.util.IXmlReader;
 import com.l2jmobius.gameserver.datatables.ItemTable;
 import com.l2jmobius.gameserver.model.VariationInstance;
 import com.l2jmobius.gameserver.model.items.instance.ItemInstance;
@@ -40,12 +41,12 @@ import com.l2jmobius.gameserver.model.options.VariationWeaponType;
 /**
  * @author Pere
  */
-public class VariationData implements IGameXmlReader
+public class VariationData implements IXmlReader
 {
 	private static final Logger LOGGER = Logger.getLogger(VariationData.class.getSimpleName());
 	
-	private final Map<Integer, Variation> _variations = new HashMap<>();
-	private final Map<Integer, Map<Integer, VariationFee>> _fees = new HashMap<>();
+	private final Map<Integer, Variation> _variations = new ConcurrentHashMap<>();
+	private final Map<Integer, Map<Integer, VariationFee>> _fees = new ConcurrentHashMap<>();
 	
 	protected VariationData()
 	{
diff --git a/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/engines/DocumentEngine.java b/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/engines/DocumentEngine.java
index d787488757..10f04f4fb3 100644
--- a/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/engines/DocumentEngine.java
+++ b/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/engines/DocumentEngine.java
@@ -17,11 +17,14 @@
 package com.l2jmobius.gameserver.engines;
 
 import java.io.File;
-import java.util.LinkedList;
+import java.util.ArrayList;
 import java.util.List;
+import java.util.concurrent.CopyOnWriteArrayList;
+import java.util.concurrent.ScheduledFuture;
 import java.util.logging.Logger;
 
 import com.l2jmobius.Config;
+import com.l2jmobius.commons.concurrent.ThreadPool;
 import com.l2jmobius.commons.util.file.filter.XMLFilter;
 import com.l2jmobius.gameserver.engines.items.DocumentItem;
 import com.l2jmobius.gameserver.model.items.Item;
@@ -33,34 +36,29 @@ public class DocumentEngine
 {
 	private static final Logger LOGGER = Logger.getLogger(DocumentEngine.class.getName());
 	
-	private final List<File> _itemFiles = new LinkedList<>();
-	
-	public static DocumentEngine getInstance()
-	{
-		return SingletonHolder._instance;
-	}
+	private final List<File> _itemFiles = new ArrayList<>();
 	
 	protected DocumentEngine()
 	{
-		hashFiles("data/stats/items", _itemFiles);
+		processDirectory("data/stats/items", _itemFiles);
 		if (Config.CUSTOM_ITEMS_LOAD)
 		{
-			hashFiles("data/stats/items/custom", _itemFiles);
+			processDirectory("data/stats/items/custom", _itemFiles);
 		}
 	}
 	
-	private void hashFiles(String dirname, List<File> hash)
+	private void processDirectory(String dirName, List<File> list)
 	{
-		final File dir = new File(Config.DATAPACK_ROOT, dirname);
+		final File dir = new File(Config.DATAPACK_ROOT, dirName);
 		if (!dir.exists())
 		{
-			LOGGER.warning("Dir " + dir.getAbsolutePath() + " not exists");
+			LOGGER.warning("Dir " + dir.getAbsolutePath() + " does not exist.");
 			return;
 		}
 		final File[] files = dir.listFiles(new XMLFilter());
-		for (File f : files)
+		for (File file : files)
 		{
-			hash.add(f);
+			list.add(file);
 		}
 	}
 	
@@ -70,12 +68,26 @@ public class DocumentEngine
 	 */
 	public List<Item> loadItems()
 	{
-		final List<Item> list = new LinkedList<>();
-		for (File f : _itemFiles)
+		final List<Item> list = new CopyOnWriteArrayList<>();
+		final List<ScheduledFuture<?>> jobs = new CopyOnWriteArrayList<>();
+		for (File file : _itemFiles)
 		{
-			final DocumentItem document = new DocumentItem(f);
-			document.parse();
-			list.addAll(document.getItemList());
+			jobs.add(ThreadPool.schedule(() ->
+			{
+				final DocumentItem document = new DocumentItem(file);
+				document.parse();
+				list.addAll(document.getItemList());
+			}, 0));
+		}
+		while (!jobs.isEmpty())
+		{
+			for (ScheduledFuture<?> job : jobs)
+			{
+				if ((job == null) || job.isDone() || job.isCancelled())
+				{
+					jobs.remove(job);
+				}
+			}
 		}
 		return list;
 	}
@@ -84,4 +96,9 @@ public class DocumentEngine
 	{
 		protected static final DocumentEngine _instance = new DocumentEngine();
 	}
+	
+	public static DocumentEngine getInstance()
+	{
+		return SingletonHolder._instance;
+	}
 }
diff --git a/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/engines/items/DocumentItem.java b/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/engines/items/DocumentItem.java
index 8aaaed2cb4..4ea960563d 100644
--- a/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/engines/items/DocumentItem.java
+++ b/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/engines/items/DocumentItem.java
@@ -19,7 +19,7 @@ package com.l2jmobius.gameserver.engines.items;
 import java.io.File;
 import java.lang.reflect.Constructor;
 import java.lang.reflect.InvocationTargetException;
-import java.util.LinkedList;
+import java.util.ArrayList;
 import java.util.List;
 import java.util.logging.Level;
 import java.util.logging.Logger;
@@ -27,7 +27,7 @@ import java.util.logging.Logger;
 import org.w3c.dom.Document;
 import org.w3c.dom.Node;
 
-import com.l2jmobius.commons.util.IGameXmlReader;
+import com.l2jmobius.commons.util.IXmlReader;
 import com.l2jmobius.gameserver.engines.DocumentBase;
 import com.l2jmobius.gameserver.enums.ItemSkillType;
 import com.l2jmobius.gameserver.model.ExtractableProduct;
@@ -41,12 +41,12 @@ import com.l2jmobius.gameserver.model.stats.functions.FuncTemplate;
 /**
  * @author mkizub, JIV
  */
-public final class DocumentItem extends DocumentBase implements IGameXmlReader
+public final class DocumentItem extends DocumentBase implements IXmlReader
 {
 	Logger LOGGER = Logger.getLogger(DocumentItem.class.getName());
 	
 	private ItemDataHolder _currentItem = null;
-	private final List<Item> _itemsInFile = new LinkedList<>();
+	private final List<Item> _itemsInFile = new ArrayList<>();
 	
 	/**
 	 * @param file
diff --git a/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/handler/ConditionHandler.java b/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/handler/ConditionHandler.java
index c92ef368b3..4e20d5e720 100644
--- a/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/handler/ConditionHandler.java
+++ b/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/handler/ConditionHandler.java
@@ -50,7 +50,7 @@ public final class ConditionHandler
 	{
 		try
 		{
-			ScriptEngineManager.getInstance().executeConditionMasterHandler();
+			ScriptEngineManager.getInstance().executeScript(ScriptEngineManager.CONDITION_HANDLER_FILE);
 		}
 		catch (Exception e)
 		{
diff --git a/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/handler/DailyMissionHandler.java b/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/handler/DailyMissionHandler.java
index 9a80c1db8f..6b6248da49 100644
--- a/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/handler/DailyMissionHandler.java
+++ b/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/handler/DailyMissionHandler.java
@@ -49,7 +49,7 @@ public class DailyMissionHandler
 	{
 		try
 		{
-			ScriptEngineManager.getInstance().executeDailyMissionMasterHandler();
+			ScriptEngineManager.getInstance().executeScript(ScriptEngineManager.ONE_DAY_REWARD_MASTER_HANDLER);
 		}
 		catch (Exception e)
 		{
diff --git a/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/handler/EffectHandler.java b/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/handler/EffectHandler.java
index 0bf5350cb8..cab6562421 100644
--- a/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/handler/EffectHandler.java
+++ b/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/handler/EffectHandler.java
@@ -50,7 +50,7 @@ public final class EffectHandler
 	{
 		try
 		{
-			ScriptEngineManager.getInstance().executeEffectMasterHandler();
+			ScriptEngineManager.getInstance().executeScript(ScriptEngineManager.EFFECT_MASTER_HANDLER_FILE);
 		}
 		catch (Exception e)
 		{
diff --git a/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/handler/SkillConditionHandler.java b/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/handler/SkillConditionHandler.java
index b764410ba1..8685b0279a 100644
--- a/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/handler/SkillConditionHandler.java
+++ b/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/handler/SkillConditionHandler.java
@@ -50,7 +50,7 @@ public final class SkillConditionHandler
 	{
 		try
 		{
-			ScriptEngineManager.getInstance().executeSkillConditionMasterHandler();
+			ScriptEngineManager.getInstance().executeScript(ScriptEngineManager.SKILL_CONDITION_HANDLER_FILE);
 		}
 		catch (Exception e)
 		{
diff --git a/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/instancemanager/CastleManorManager.java b/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/instancemanager/CastleManorManager.java
index 48d04d3f38..212d1a043c 100644
--- a/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/instancemanager/CastleManorManager.java
+++ b/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/instancemanager/CastleManorManager.java
@@ -40,7 +40,7 @@ import org.w3c.dom.Node;
 import com.l2jmobius.Config;
 import com.l2jmobius.commons.concurrent.ThreadPool;
 import com.l2jmobius.commons.database.DatabaseFactory;
-import com.l2jmobius.commons.util.IGameXmlReader;
+import com.l2jmobius.commons.util.IXmlReader;
 import com.l2jmobius.commons.util.Rnd;
 import com.l2jmobius.gameserver.enums.ManorMode;
 import com.l2jmobius.gameserver.model.CropProcure;
@@ -58,7 +58,7 @@ import com.l2jmobius.gameserver.network.SystemMessageId;
  * Castle manor system.
  * @author malyelfik
  */
-public final class CastleManorManager implements IGameXmlReader, IStorable
+public final class CastleManorManager implements IXmlReader, IStorable
 {
 	private static final Logger LOGGER = Logger.getLogger(CastleManorManager.class.getName());
 	
diff --git a/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/instancemanager/CursedWeaponsManager.java b/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/instancemanager/CursedWeaponsManager.java
index d123b41ef6..835d961c56 100644
--- a/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/instancemanager/CursedWeaponsManager.java
+++ b/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/instancemanager/CursedWeaponsManager.java
@@ -35,7 +35,7 @@ import org.w3c.dom.Node;
 
 import com.l2jmobius.Config;
 import com.l2jmobius.commons.database.DatabaseFactory;
-import com.l2jmobius.commons.util.IGameXmlReader;
+import com.l2jmobius.commons.util.IXmlReader;
 import com.l2jmobius.gameserver.model.CursedWeapon;
 import com.l2jmobius.gameserver.model.actor.Attackable;
 import com.l2jmobius.gameserver.model.actor.Creature;
@@ -54,7 +54,7 @@ import com.l2jmobius.gameserver.util.Broadcast;
  * UnAfraid: TODO: Rewrite with DocumentParser
  * @author Micht
  */
-public final class CursedWeaponsManager implements IGameXmlReader
+public final class CursedWeaponsManager implements IXmlReader
 {
 	private static final Logger LOGGER = Logger.getLogger(CursedWeaponsManager.class.getName());
 	
diff --git a/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/instancemanager/FakePlayerChatManager.java b/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/instancemanager/FakePlayerChatManager.java
index 7101927e48..39c239a762 100644
--- a/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/instancemanager/FakePlayerChatManager.java
+++ b/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/instancemanager/FakePlayerChatManager.java
@@ -25,7 +25,7 @@ import org.w3c.dom.Document;
 
 import com.l2jmobius.Config;
 import com.l2jmobius.commons.concurrent.ThreadPool;
-import com.l2jmobius.commons.util.IGameXmlReader;
+import com.l2jmobius.commons.util.IXmlReader;
 import com.l2jmobius.commons.util.Rnd;
 import com.l2jmobius.gameserver.data.xml.impl.FakePlayerData;
 import com.l2jmobius.gameserver.datatables.SpawnTable;
@@ -41,7 +41,7 @@ import com.l2jmobius.gameserver.network.serverpackets.CreatureSay;
 /**
  * @author Mobius
  */
-public final class FakePlayerChatManager implements IGameXmlReader
+public final class FakePlayerChatManager implements IXmlReader
 {
 	private static Logger LOGGER = Logger.getLogger(FakePlayerChatManager.class.getName());
 	final List<FakePlayerChatHolder> MESSAGES = new ArrayList<>();
diff --git a/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/instancemanager/InstanceManager.java b/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/instancemanager/InstanceManager.java
index f300213c49..5ea229cf1b 100644
--- a/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/instancemanager/InstanceManager.java
+++ b/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/instancemanager/InstanceManager.java
@@ -40,7 +40,6 @@ import org.w3c.dom.Node;
 
 import com.l2jmobius.Config;
 import com.l2jmobius.commons.database.DatabaseFactory;
-import com.l2jmobius.commons.util.IGameXmlReader;
 import com.l2jmobius.commons.util.IXmlReader;
 import com.l2jmobius.gameserver.data.xml.impl.DoorData;
 import com.l2jmobius.gameserver.data.xml.impl.SpawnsData;
@@ -61,7 +60,7 @@ import com.l2jmobius.gameserver.model.spawns.SpawnTemplate;
  * Instance manager.
  * @author evill33t, GodKratos, malyelfik
  */
-public final class InstanceManager implements IGameXmlReader
+public final class InstanceManager implements IXmlReader
 {
 	private static final Logger LOGGER = Logger.getLogger(InstanceManager.class.getName());
 	// Database query
diff --git a/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/instancemanager/ItemAuctionManager.java b/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/instancemanager/ItemAuctionManager.java
index f819adf93b..752bcfdd3f 100644
--- a/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/instancemanager/ItemAuctionManager.java
+++ b/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/instancemanager/ItemAuctionManager.java
@@ -34,13 +34,13 @@ import org.w3c.dom.Node;
 
 import com.l2jmobius.Config;
 import com.l2jmobius.commons.database.DatabaseFactory;
-import com.l2jmobius.commons.util.IGameXmlReader;
+import com.l2jmobius.commons.util.IXmlReader;
 import com.l2jmobius.gameserver.model.itemauction.ItemAuctionInstance;
 
 /**
  * @author Forsaiken
  */
-public final class ItemAuctionManager implements IGameXmlReader
+public final class ItemAuctionManager implements IXmlReader
 {
 	private static final Logger LOGGER = Logger.getLogger(ItemAuctionManager.class.getName());
 	
diff --git a/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/instancemanager/MapRegionManager.java b/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/instancemanager/MapRegionManager.java
index 255d4340ff..8f68a4bdf5 100644
--- a/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/instancemanager/MapRegionManager.java
+++ b/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/instancemanager/MapRegionManager.java
@@ -27,7 +27,7 @@ import org.w3c.dom.NamedNodeMap;
 import org.w3c.dom.Node;
 
 import com.l2jmobius.Config;
-import com.l2jmobius.commons.util.IGameXmlReader;
+import com.l2jmobius.commons.util.IXmlReader;
 import com.l2jmobius.gameserver.data.xml.impl.ClanHallData;
 import com.l2jmobius.gameserver.model.Location;
 import com.l2jmobius.gameserver.model.MapRegion;
@@ -47,7 +47,7 @@ import com.l2jmobius.gameserver.model.zone.type.RespawnZone;
  * Map Region Manager.
  * @author Nyaran
  */
-public final class MapRegionManager implements IGameXmlReader
+public final class MapRegionManager implements IXmlReader
 {
 	private static final Logger LOGGER = Logger.getLogger(MapRegionManager.class.getName());
 	
diff --git a/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/instancemanager/SellBuffsManager.java b/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/instancemanager/SellBuffsManager.java
index dcf1bae346..0c4e94f449 100644
--- a/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/instancemanager/SellBuffsManager.java
+++ b/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/instancemanager/SellBuffsManager.java
@@ -26,7 +26,7 @@ import org.w3c.dom.Element;
 import org.w3c.dom.NodeList;
 
 import com.l2jmobius.Config;
-import com.l2jmobius.commons.util.IGameXmlReader;
+import com.l2jmobius.commons.util.IXmlReader;
 import com.l2jmobius.gameserver.cache.HtmCache;
 import com.l2jmobius.gameserver.data.xml.impl.SkillData;
 import com.l2jmobius.gameserver.datatables.ItemTable;
@@ -46,7 +46,7 @@ import com.l2jmobius.gameserver.util.Util;
  * Sell Buffs Manager
  * @author St3eT
  */
-public final class SellBuffsManager implements IGameXmlReader
+public final class SellBuffsManager implements IXmlReader
 {
 	private static final Logger LOGGER = Logger.getLogger(SellBuffsManager.class.getName());
 	private static final List<Integer> ALLOWED_BUFFS = new ArrayList<>();
diff --git a/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/instancemanager/WalkingManager.java b/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/instancemanager/WalkingManager.java
index 4583519bc4..18c4814040 100644
--- a/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/instancemanager/WalkingManager.java
+++ b/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/instancemanager/WalkingManager.java
@@ -28,7 +28,7 @@ import org.w3c.dom.NamedNodeMap;
 import org.w3c.dom.Node;
 
 import com.l2jmobius.commons.concurrent.ThreadPool;
-import com.l2jmobius.commons.util.IGameXmlReader;
+import com.l2jmobius.commons.util.IXmlReader;
 import com.l2jmobius.gameserver.ai.CtrlIntention;
 import com.l2jmobius.gameserver.data.xml.impl.NpcData;
 import com.l2jmobius.gameserver.enums.ChatType;
@@ -49,7 +49,7 @@ import com.l2jmobius.gameserver.network.NpcStringId;
  * This class manages walking monsters.
  * @author GKR
  */
-public final class WalkingManager implements IGameXmlReader
+public final class WalkingManager implements IXmlReader
 {
 	private static final Logger LOGGER = Logger.getLogger(WalkingManager.class.getName());
 	
diff --git a/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/instancemanager/ZoneManager.java b/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/instancemanager/ZoneManager.java
index b698f51a03..9a0bd870f2 100644
--- a/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/instancemanager/ZoneManager.java
+++ b/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/instancemanager/ZoneManager.java
@@ -26,6 +26,7 @@ import java.util.List;
 import java.util.Map;
 import java.util.Optional;
 import java.util.OptionalInt;
+import java.util.concurrent.ConcurrentHashMap;
 import java.util.logging.Level;
 import java.util.logging.Logger;
 
@@ -33,7 +34,7 @@ import org.w3c.dom.Document;
 import org.w3c.dom.NamedNodeMap;
 import org.w3c.dom.Node;
 
-import com.l2jmobius.commons.util.IGameXmlReader;
+import com.l2jmobius.commons.util.IXmlReader;
 import com.l2jmobius.gameserver.model.World;
 import com.l2jmobius.gameserver.model.WorldObject;
 import com.l2jmobius.gameserver.model.actor.Creature;
@@ -55,7 +56,7 @@ import com.l2jmobius.gameserver.model.zone.type.SpawnTerritory;
  * This class manages the zones
  * @author durgus
  */
-public final class ZoneManager implements IGameXmlReader
+public final class ZoneManager implements IXmlReader
 {
 	private static final Logger LOGGER = Logger.getLogger(ZoneManager.class.getName());
 	
@@ -65,9 +66,9 @@ public final class ZoneManager implements IGameXmlReader
 	private static final int OFFSET_X = Math.abs(World.MAP_MIN_X >> SHIFT_BY);
 	private static final int OFFSET_Y = Math.abs(World.MAP_MIN_Y >> SHIFT_BY);
 	
-	private final Map<Class<? extends ZoneType>, Map<Integer, ? extends ZoneType>> _classZones = new HashMap<>();
-	private final Map<String, SpawnTerritory> _spawnTerritories = new HashMap<>();
-	private int _lastDynamicId = 300000;
+	private final Map<Class<? extends ZoneType>, ConcurrentHashMap<Integer, ? extends ZoneType>> _classZones = new ConcurrentHashMap<>();
+	private final Map<String, SpawnTerritory> _spawnTerritories = new ConcurrentHashMap<>();
+	private volatile int _lastDynamicId = 300000;
 	private List<ItemInstance> _debugItems;
 	
 	private final ZoneRegion[][] _zoneRegions = new ZoneRegion[(World.MAP_MAX_X >> SHIFT_BY) + OFFSET_X + 1][(World.MAP_MAX_Y >> SHIFT_BY) + OFFSET_Y + 1];
@@ -365,7 +366,7 @@ public final class ZoneManager implements IGameXmlReader
 						}
 						if (checkId(zoneId))
 						{
-							LOGGER.config(getClass().getSimpleName() + ": Caution: Zone (" + zoneId + ") from file: " + f.getName() + " overrides previos definition.");
+							LOGGER.config(getClass().getSimpleName() + ": Caution: Zone (" + zoneId + ") from file: " + f.getName() + " overrides previuos definition.");
 						}
 						
 						if ((zoneName != null) && !zoneName.isEmpty())
@@ -453,10 +454,10 @@ public final class ZoneManager implements IGameXmlReader
 	@SuppressWarnings("unchecked")
 	private <T extends ZoneType> void addZone(Integer id, T zone)
 	{
-		Map<Integer, T> map = (Map<Integer, T>) _classZones.get(zone.getClass());
+		ConcurrentHashMap<Integer, T> map = (ConcurrentHashMap<Integer, T>) _classZones.get(zone.getClass());
 		if (map == null)
 		{
-			map = new HashMap<>();
+			map = new ConcurrentHashMap<>();
 			map.put(id, zone);
 			_classZones.put(zone.getClass(), map);
 		}
diff --git a/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/model/quest/LongTimeEvent.java b/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/model/quest/LongTimeEvent.java
index cc71991407..0fa020eb5d 100644
--- a/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/model/quest/LongTimeEvent.java
+++ b/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/model/quest/LongTimeEvent.java
@@ -32,7 +32,7 @@ import org.w3c.dom.Node;
 
 import com.l2jmobius.commons.concurrent.ThreadPool;
 import com.l2jmobius.commons.database.DatabaseFactory;
-import com.l2jmobius.commons.util.IGameXmlReader;
+import com.l2jmobius.commons.util.IXmlReader;
 import com.l2jmobius.gameserver.data.sql.impl.AnnouncementsTable;
 import com.l2jmobius.gameserver.data.xml.impl.NpcData;
 import com.l2jmobius.gameserver.datatables.EventDroplist;
@@ -117,7 +117,7 @@ public class LongTimeEvent extends Quest
 	 */
 	private void loadConfig()
 	{
-		new IGameXmlReader()
+		new IXmlReader()
 		{
 			@Override
 			public void load()
diff --git a/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/model/stats/BaseStats.java b/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/model/stats/BaseStats.java
index daba0d3071..64af7961e9 100644
--- a/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/model/stats/BaseStats.java
+++ b/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/model/stats/BaseStats.java
@@ -23,7 +23,6 @@ import java.util.logging.Logger;
 import org.w3c.dom.Document;
 import org.w3c.dom.NamedNodeMap;
 
-import com.l2jmobius.commons.util.IGameXmlReader;
 import com.l2jmobius.commons.util.IXmlReader;
 import com.l2jmobius.gameserver.model.actor.Creature;
 
@@ -105,7 +104,7 @@ public enum BaseStats
 	
 	static
 	{
-		new IGameXmlReader()
+		new IXmlReader()
 		{
 			final Logger LOGGER = Logger.getLogger(BaseStats.class.getName());
 			
diff --git a/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/scripting/ScriptEngineManager.java b/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/scripting/ScriptEngineManager.java
index 9eb6d85b69..95409c567a 100644
--- a/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/scripting/ScriptEngineManager.java
+++ b/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/scripting/ScriptEngineManager.java
@@ -28,8 +28,6 @@ import java.nio.file.attribute.BasicFileAttributes;
 import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.Iterator;
-import java.util.LinkedHashMap;
-import java.util.LinkedList;
 import java.util.List;
 import java.util.Map;
 import java.util.Map.Entry;
@@ -42,14 +40,14 @@ import java.util.logging.Logger;
 import org.w3c.dom.Document;
 
 import com.l2jmobius.Config;
-import com.l2jmobius.commons.util.IGameXmlReader;
+import com.l2jmobius.commons.util.IXmlReader;
 import com.l2jmobius.gameserver.scripting.java.JavaScriptingEngine;
 
 /**
  * Caches script engines and provides functionality for executing and managing scripts.
  * @author KenM, HorridoJoho
  */
-public final class ScriptEngineManager implements IGameXmlReader
+public final class ScriptEngineManager implements IXmlReader
 {
 	private static final Logger LOGGER = Logger.getLogger(ScriptEngineManager.class.getName());
 	public static final Path SCRIPT_FOLDER = Paths.get(Config.DATAPACK_ROOT.getAbsolutePath(), "data", "scripts");
@@ -59,8 +57,7 @@ public final class ScriptEngineManager implements IGameXmlReader
 	public static final Path CONDITION_HANDLER_FILE = Paths.get(SCRIPT_FOLDER.toString(), "handlers", "ConditionMasterHandler.java");
 	public static final Path ONE_DAY_REWARD_MASTER_HANDLER = Paths.get(SCRIPT_FOLDER.toString(), "handlers", "DailyMissionMasterHandler.java");
 	
-	private final Map<String, IExecutionContext> _extEngines = new HashMap<>();
-	private IExecutionContext _currentExecutionContext = null;
+	private IExecutionContext _javaExecutionContext = null;
 	static final List<String> _exclusions = new ArrayList<>();
 	
 	protected ScriptEngineManager()
@@ -166,12 +163,7 @@ public final class ScriptEngineManager implements IGameXmlReader
 	private void registerEngine(IScriptingEngine engine, Properties props)
 	{
 		maybeSetProperties("language." + engine.getLanguageName() + ".", props, engine);
-		final IExecutionContext context = engine.createExecutionContext();
-		for (String commonExtension : engine.getCommonFileExtensions())
-		{
-			_extEngines.put(commonExtension, context);
-		}
-		
+		_javaExecutionContext = engine.createExecutionContext();
 		LOGGER.info("ScriptEngine: " + engine.getEngineName() + " " + engine.getEngineVersion() + " (" + engine.getLanguageName() + " " + engine.getLanguageVersion() + ")");
 	}
 	
@@ -200,66 +192,6 @@ public final class ScriptEngineManager implements IGameXmlReader
 		}
 	}
 	
-	private IExecutionContext getEngineByExtension(String ext)
-	{
-		return _extEngines.get(ext);
-	}
-	
-	private String getFileExtension(Path p)
-	{
-		final String name = p.getFileName().toString();
-		final int lastDotIdx = name.lastIndexOf('.');
-		if (lastDotIdx == -1)
-		{
-			return null;
-		}
-		
-		final String extension = name.substring(lastDotIdx + 1);
-		if (extension.isEmpty())
-		{
-			return null;
-		}
-		
-		return extension;
-	}
-	
-	private void checkExistingFile(String messagePre, Path filePath) throws Exception
-	{
-		if (!Files.exists(filePath))
-		{
-			throw new Exception(messagePre + ": " + filePath + " does not exists!");
-		}
-		else if (!Files.isRegularFile(filePath))
-		{
-			throw new Exception(messagePre + ": " + filePath + " is not a file!");
-		}
-	}
-	
-	public void executeMasterHandler() throws Exception
-	{
-		executeScript(MASTER_HANDLER_FILE);
-	}
-	
-	public void executeEffectMasterHandler() throws Exception
-	{
-		executeScript(EFFECT_MASTER_HANDLER_FILE);
-	}
-	
-	public void executeSkillConditionMasterHandler() throws Exception
-	{
-		executeScript(SKILL_CONDITION_HANDLER_FILE);
-	}
-	
-	public void executeConditionMasterHandler() throws Exception
-	{
-		executeScript(CONDITION_HANDLER_FILE);
-	}
-	
-	public void executeDailyMissionMasterHandler() throws Exception
-	{
-		executeScript(ONE_DAY_REWARD_MASTER_HANDLER);
-	}
-	
 	public void executeScriptList() throws Exception
 	{
 		if (Config.ALT_DEV_NO_QUESTS)
@@ -267,77 +199,35 @@ public final class ScriptEngineManager implements IGameXmlReader
 			return;
 		}
 		
-		final Map<IExecutionContext, List<Path>> files = new LinkedHashMap<>();
+		final List<Path> files = new ArrayList<>();
 		processDirectory(SCRIPT_FOLDER.toFile(), files);
 		
-		for (Entry<IExecutionContext, List<Path>> entry : files.entrySet())
+		final Map<Path, Throwable> invokationErrors = _javaExecutionContext.executeScripts(files);
+		for (Entry<Path, Throwable> entry : invokationErrors.entrySet())
 		{
-			_currentExecutionContext = entry.getKey();
-			try
-			{
-				final Map<Path, Throwable> invokationErrors = entry.getKey().executeScripts(entry.getValue());
-				for (Entry<Path, Throwable> entry2 : invokationErrors.entrySet())
-				{
-					LOGGER.log(Level.WARNING, "ScriptEngine: " + entry2.getKey() + " failed execution!", entry2.getValue());
-				}
-			}
-			finally
-			{
-				_currentExecutionContext = null;
-			}
+			LOGGER.log(Level.WARNING, "ScriptEngine: " + entry.getKey() + " failed execution!", entry.getValue());
 		}
 	}
 	
-	private void processDirectory(File dir, Map<IExecutionContext, List<Path>> files)
+	private void processDirectory(File dir, List<Path> files)
 	{
 		for (File file : dir.listFiles())
 		{
-			if (file.isDirectory())
+			if (file.isFile())
+			{
+				final String fileName = file.getName();
+				if (fileName.endsWith(".java") && !_exclusions.contains(fileName))
+				{
+					files.add(file.toPath().toAbsolutePath());
+				}
+			}
+			else if (file.isDirectory())
 			{
 				processDirectory(file, files);
 			}
-			else
-			{
-				processFile(file, files);
-			}
 		}
 	}
 	
-	private void processFile(File file, Map<IExecutionContext, List<Path>> files)
-	{
-		if (_exclusions.contains(file.getName()))
-		{
-			return;
-		}
-		
-		Path sourceFile = file.toPath();
-		try
-		{
-			checkExistingFile("ScriptFile", sourceFile);
-		}
-		catch (Exception e)
-		{
-			LOGGER.warning(e.getMessage());
-			return;
-		}
-		
-		sourceFile = sourceFile.toAbsolutePath();
-		final String ext = getFileExtension(sourceFile);
-		if (ext == null)
-		{
-			LOGGER.warning("ScriptFile: " + sourceFile + " does not have an extension to determine the script engine!");
-			return;
-		}
-		
-		final IExecutionContext engine = getEngineByExtension(ext);
-		if (engine == null)
-		{
-			return;
-		}
-		
-		files.computeIfAbsent(engine, k -> new LinkedList<>()).add(sourceFile);
-	}
-	
 	public void executeScript(Path sourceFile) throws Exception
 	{
 		Objects.requireNonNull(sourceFile);
@@ -347,34 +237,19 @@ public final class ScriptEngineManager implements IGameXmlReader
 			sourceFile = SCRIPT_FOLDER.resolve(sourceFile);
 		}
 		
-		// throws exception if not exists or not file
-		checkExistingFile("ScriptFile", sourceFile);
-		
 		sourceFile = sourceFile.toAbsolutePath();
-		final String ext = getFileExtension(sourceFile);
 		Objects.requireNonNull(sourceFile, "ScriptFile: " + sourceFile + " does not have an extension to determine the script engine!");
 		
-		final IExecutionContext engine = getEngineByExtension(ext);
-		Objects.requireNonNull(engine, "ScriptEngine: No engine registered for extension " + ext + "!");
-		
-		_currentExecutionContext = engine;
-		try
+		final Entry<Path, Throwable> error = _javaExecutionContext.executeScript(sourceFile);
+		if (error != null)
 		{
-			final Entry<Path, Throwable> error = engine.executeScript(sourceFile);
-			if (error != null)
-			{
-				throw new Exception("ScriptEngine: " + error.getKey() + " failed execution!", error.getValue());
-			}
-		}
-		finally
-		{
-			_currentExecutionContext = null;
+			throw new Exception("ScriptEngine: " + error.getKey() + " failed execution!", error.getValue());
 		}
 	}
 	
 	public Path getCurrentLoadingScript()
 	{
-		return _currentExecutionContext != null ? _currentExecutionContext.getCurrentExecutingScript() : null;
+		return _javaExecutionContext.getCurrentExecutingScript();
 	}
 	
 	public static ScriptEngineManager getInstance()
diff --git a/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/loginserver/GameServerTable.java b/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/loginserver/GameServerTable.java
index 456224d78c..4269e47969 100644
--- a/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/loginserver/GameServerTable.java
+++ b/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/loginserver/GameServerTable.java
@@ -36,8 +36,8 @@ import org.w3c.dom.Document;
 import org.w3c.dom.NodeList;
 
 import com.l2jmobius.commons.database.DatabaseFactory;
-import com.l2jmobius.commons.util.IGameXmlReader;
 import com.l2jmobius.commons.util.IPSubnet;
+import com.l2jmobius.commons.util.IXmlReader;
 import com.l2jmobius.commons.util.Rnd;
 import com.l2jmobius.loginserver.network.gameserverpackets.ServerStatus;
 
@@ -45,7 +45,7 @@ import com.l2jmobius.loginserver.network.gameserverpackets.ServerStatus;
  * The Class GameServerTable loads the game server names and initialize the game server tables.
  * @author KenM, Zoey76
  */
-public final class GameServerTable implements IGameXmlReader
+public final class GameServerTable implements IXmlReader
 {
 	private static final Logger LOGGER = Logger.getLogger(GameServerTable.class.getName());
 	
diff --git a/L2J_Mobius_5.0_Salvation/dist/game/config/Scripts.xml b/L2J_Mobius_5.0_Salvation/dist/game/config/Scripts.xml
index 284aa0a31f..54d05b241f 100644
--- a/L2J_Mobius_5.0_Salvation/dist/game/config/Scripts.xml
+++ b/L2J_Mobius_5.0_Salvation/dist/game/config/Scripts.xml
@@ -2,11 +2,7 @@
 <list xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../data/xsd/Scripts.xsd">
 	<!-- Skip these filenames from script loading, because they are already loaded using a different way. -->
 	<exclude file="package-info.java" />
-	<exclude file="MasterHandler.java" />
-	<exclude file="EffectMasterHandler.java" />
-	<exclude file="SkillConditionMasterHandler.java" />
-	<exclude file="ConditionMasterHandler.java" />
-	<exclude file="DailyMissionMasterHandler.java" />
+	<exclude file="handlers" />
 	
 	<!--
 	With this file you can exclude/include specific folders/files from within the scripts directory.
diff --git a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/ai/areas/ImperialTomb/FourSepulchers/FourSepulchers.java b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/ai/areas/ImperialTomb/FourSepulchers/FourSepulchers.java
index 053e095ace..7a59593544 100644
--- a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/ai/areas/ImperialTomb/FourSepulchers/FourSepulchers.java
+++ b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/ai/areas/ImperialTomb/FourSepulchers/FourSepulchers.java
@@ -29,7 +29,7 @@ import org.w3c.dom.NamedNodeMap;
 import org.w3c.dom.Node;
 
 import com.l2jmobius.commons.concurrent.ThreadPool;
-import com.l2jmobius.commons.util.IGameXmlReader;
+import com.l2jmobius.commons.util.IXmlReader;
 import com.l2jmobius.gameserver.ai.CtrlIntention;
 import com.l2jmobius.gameserver.enums.ChatType;
 import com.l2jmobius.gameserver.geoengine.GeoEngine;
@@ -56,7 +56,7 @@ import quests.Q00620_FourGoblets.Q00620_FourGoblets;
  * Four Selpuchers AI
  * @author Mobius
  */
-public final class FourSepulchers extends AbstractNpcAI implements IGameXmlReader
+public final class FourSepulchers extends AbstractNpcAI implements IXmlReader
 {
 	Logger LOGGER = Logger.getLogger(FourSepulchers.class.getName());
 	
diff --git a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/ai/bosses/Tiat/Stage1.java b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/ai/bosses/Tiat/Stage1.java
index e1e54da1a8..1b350c946e 100644
--- a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/ai/bosses/Tiat/Stage1.java
+++ b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/ai/bosses/Tiat/Stage1.java
@@ -30,7 +30,7 @@ import org.w3c.dom.NamedNodeMap;
 import org.w3c.dom.Node;
 
 import com.l2jmobius.commons.util.CommonUtil;
-import com.l2jmobius.commons.util.IGameXmlReader;
+import com.l2jmobius.commons.util.IXmlReader;
 import com.l2jmobius.gameserver.ai.CtrlIntention;
 import com.l2jmobius.gameserver.enums.Movie;
 import com.l2jmobius.gameserver.enums.TrapAction;
@@ -66,7 +66,7 @@ import instances.AbstractInstance;
  * Please maintain consistency between the Seed scripts.
  * @author Gigiikun
  */
-public final class Stage1 extends AbstractInstance implements IGameXmlReader
+public final class Stage1 extends AbstractInstance implements IXmlReader
 {
 	Logger LOGGER = Logger.getLogger(Stage1.class.getName());
 	
diff --git a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/ai/others/ClassMaster/ClassMaster.java b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/ai/others/ClassMaster/ClassMaster.java
index 63269e6e27..1abb859d66 100644
--- a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/ai/others/ClassMaster/ClassMaster.java
+++ b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/ai/others/ClassMaster/ClassMaster.java
@@ -30,7 +30,7 @@ import org.w3c.dom.NamedNodeMap;
 import org.w3c.dom.Node;
 
 import com.l2jmobius.Config;
-import com.l2jmobius.commons.util.IGameXmlReader;
+import com.l2jmobius.commons.util.IXmlReader;
 import com.l2jmobius.gameserver.data.xml.impl.CategoryData;
 import com.l2jmobius.gameserver.data.xml.impl.ClassListData;
 import com.l2jmobius.gameserver.data.xml.impl.SkillData;
@@ -63,7 +63,7 @@ import ai.AbstractNpcAI;
  * Class Master AI.
  * @author Nik
  */
-public final class ClassMaster extends AbstractNpcAI implements IGameXmlReader
+public final class ClassMaster extends AbstractNpcAI implements IXmlReader
 {
 	// NPCs
 	private static final List<Integer> CLASS_MASTERS = new ArrayList<>();
diff --git a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/ai/others/MentorGuide/MentorGuide.java b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/ai/others/MentorGuide/MentorGuide.java
index 9ddcd66a0f..65322b7a01 100644
--- a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/ai/others/MentorGuide/MentorGuide.java
+++ b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/ai/others/MentorGuide/MentorGuide.java
@@ -26,7 +26,7 @@ import org.w3c.dom.Document;
 import org.w3c.dom.Node;
 
 import com.l2jmobius.Config;
-import com.l2jmobius.commons.util.IGameXmlReader;
+import com.l2jmobius.commons.util.IXmlReader;
 import com.l2jmobius.gameserver.enums.CategoryType;
 import com.l2jmobius.gameserver.enums.MailType;
 import com.l2jmobius.gameserver.instancemanager.MailManager;
@@ -61,7 +61,7 @@ import ai.AbstractNpcAI;
  * Mentor Guide AI.
  * @author Gnacik, UnAfraid
  */
-public final class MentorGuide extends AbstractNpcAI implements IGameXmlReader
+public final class MentorGuide extends AbstractNpcAI implements IXmlReader
 {
 	private static final Logger LOGGER = Logger.getLogger(MentorGuide.class.getName());
 	
diff --git a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/ai/others/NpcBuffers/NpcBuffersData.java b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/ai/others/NpcBuffers/NpcBuffersData.java
index b0287e1df6..51708af4f8 100644
--- a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/ai/others/NpcBuffers/NpcBuffersData.java
+++ b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/ai/others/NpcBuffers/NpcBuffersData.java
@@ -27,13 +27,13 @@ import org.w3c.dom.Document;
 import org.w3c.dom.NamedNodeMap;
 import org.w3c.dom.Node;
 
-import com.l2jmobius.commons.util.IGameXmlReader;
+import com.l2jmobius.commons.util.IXmlReader;
 import com.l2jmobius.gameserver.model.StatsSet;
 
 /**
  * @author UnAfraid
  */
-class NpcBuffersData implements IGameXmlReader
+class NpcBuffersData implements IXmlReader
 {
 	private static final Logger LOGGER = Logger.getLogger(NpcBuffersData.class.getName());
 	
diff --git a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/admincommandhandlers/AdminQuest.java b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/admincommandhandlers/AdminQuest.java
index 228cc1668d..a771c4ab90 100644
--- a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/admincommandhandlers/AdminQuest.java
+++ b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/admincommandhandlers/AdminQuest.java
@@ -320,7 +320,7 @@ public class AdminQuest implements IAdminCommandHandler
 				{
 					sb.append("<a action=\"bypass -h admin_script_dir " + c + "\">" + c + "</a><br1>");
 				}
-				else if (c.endsWith(".java") || c.endsWith(".py"))
+				else if (c.endsWith(".java"))
 				{
 					sb.append("<a action=\"bypass -h admin_script_load " + c + "\"><font color=\"LEVEL\">" + c + "</font></a><br1>");
 				}
@@ -352,7 +352,7 @@ public class AdminQuest implements IAdminCommandHandler
 				{
 					sb.append("<a action=\"bypass -h admin_script_dir " + currentPath + "/" + c + "\">" + (questReducedNames ? getQuestName(c) : c) + "</a><br1>");
 				}
-				else if (c.endsWith(".java") || c.endsWith(".py"))
+				else if (c.endsWith(".java"))
 				{
 					sb.append("<a action=\"bypass -h admin_script_load " + currentPath + "/" + c + "\"><font color=\"LEVEL\">" + c + "</font></a><br1>");
 				}
diff --git a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/admincommandhandlers/AdminReload.java b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/admincommandhandlers/AdminReload.java
index c1d29b87fb..df9c268b60 100644
--- a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/admincommandhandlers/AdminReload.java
+++ b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/admincommandhandlers/AdminReload.java
@@ -222,7 +222,7 @@ public class AdminReload implements IAdminCommandHandler
 				{
 					try
 					{
-						ScriptEngineManager.getInstance().executeEffectMasterHandler();
+						ScriptEngineManager.getInstance().executeScript(ScriptEngineManager.EFFECT_MASTER_HANDLER_FILE);
 						AdminData.getInstance().broadcastMessageToGMs(activeChar.getName() + ": Reloaded effect master handler.");
 					}
 					catch (Exception e)
@@ -236,7 +236,7 @@ public class AdminReload implements IAdminCommandHandler
 				{
 					try
 					{
-						ScriptEngineManager.getInstance().executeMasterHandler();
+						ScriptEngineManager.getInstance().executeScript(ScriptEngineManager.MASTER_HANDLER_FILE);
 						AdminData.getInstance().broadcastMessageToGMs(activeChar.getName() + ": Reloaded master handler.");
 					}
 					catch (Exception e)
diff --git a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/telnethandlers/server/Reload.java b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/telnethandlers/server/Reload.java
index d679ea1212..491b10cc62 100644
--- a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/telnethandlers/server/Reload.java
+++ b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/telnethandlers/server/Reload.java
@@ -181,7 +181,7 @@ public class Reload implements ITelnetCommand
 			{
 				try
 				{
-					ScriptEngineManager.getInstance().executeEffectMasterHandler();
+					ScriptEngineManager.getInstance().executeScript(ScriptEngineManager.EFFECT_MASTER_HANDLER_FILE);
 					return AdminData.getInstance().broadcastMessageToGMs("Telnet Admin: Reloaded effect master handler.");
 				}
 				catch (Exception e)
@@ -194,7 +194,7 @@ public class Reload implements ITelnetCommand
 			{
 				try
 				{
-					ScriptEngineManager.getInstance().executeMasterHandler();
+					ScriptEngineManager.getInstance().executeScript(ScriptEngineManager.MASTER_HANDLER_FILE);
 					return AdminData.getInstance().broadcastMessageToGMs("Telnet Admin: Reloaded master handler.");
 				}
 				catch (Exception e)
diff --git a/L2J_Mobius_5.0_Salvation/java/com/l2jmobius/Config.java b/L2J_Mobius_5.0_Salvation/java/com/l2jmobius/Config.java
index 416ac80919..053bf6cfba 100644
--- a/L2J_Mobius_5.0_Salvation/java/com/l2jmobius/Config.java
+++ b/L2J_Mobius_5.0_Salvation/java/com/l2jmobius/Config.java
@@ -54,7 +54,7 @@ import org.w3c.dom.Document;
 import org.w3c.dom.NamedNodeMap;
 import org.w3c.dom.Node;
 
-import com.l2jmobius.commons.util.IGameXmlReader;
+import com.l2jmobius.commons.util.IXmlReader;
 import com.l2jmobius.commons.util.PropertiesParser;
 import com.l2jmobius.commons.util.StringUtil;
 import com.l2jmobius.gameserver.enums.ChatType;
@@ -3118,7 +3118,7 @@ public final class Config
 		return result;
 	}
 	
-	private static class IPConfigData implements IGameXmlReader
+	private static class IPConfigData implements IXmlReader
 	{
 		private static final List<String> _subnets = new ArrayList<>(5);
 		private static final List<String> _hosts = new ArrayList<>(5);
diff --git a/L2J_Mobius_5.0_Salvation/java/com/l2jmobius/commons/util/IGameXmlReader.java b/L2J_Mobius_5.0_Salvation/java/com/l2jmobius/commons/util/IGameXmlReader.java
deleted file mode 100644
index b29089db77..0000000000
--- a/L2J_Mobius_5.0_Salvation/java/com/l2jmobius/commons/util/IGameXmlReader.java
+++ /dev/null
@@ -1,118 +0,0 @@
-/*
- * This file is part of the L2J Mobius project.
- * 
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- * 
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * General Public License for more details.
- * 
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- */
-package com.l2jmobius.commons.util;
-
-import java.io.File;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
-import org.w3c.dom.NamedNodeMap;
-import org.w3c.dom.Node;
-
-import com.l2jmobius.Config;
-import com.l2jmobius.gameserver.model.Location;
-import com.l2jmobius.gameserver.model.holders.MinionHolder;
-import com.l2jmobius.gameserver.model.holders.SkillHolder;
-
-/**
- * Interface for XML parsers.
- * @author Zoey76
- */
-public interface IGameXmlReader extends IXmlReader
-{
-	/**
-	 * Wrapper for {@link #parseFile(File)} method.
-	 * @param path the relative path to the datapack root of the XML file to parse.
-	 */
-	default void parseDatapackFile(String path)
-	{
-		parseFile(new File(Config.DATAPACK_ROOT, path));
-	}
-	
-	/**
-	 * Wrapper for {@link #parseDirectory(File, boolean)}.
-	 * @param path the path to the directory where the XML files are
-	 * @param recursive parses all sub folders if there is
-	 * @return {@code false} if it fails to find the directory, {@code true} otherwise
-	 */
-	default boolean parseDatapackDirectory(String path, boolean recursive)
-	{
-		return parseDirectory(new File(Config.DATAPACK_ROOT, path), recursive);
-	}
-	
-	/**
-	 * @param n
-	 * @return a map of parameters
-	 */
-	default Map<String, Object> parseParameters(Node n)
-	{
-		final Map<String, Object> parameters = new HashMap<>();
-		for (Node parameters_node = n.getFirstChild(); parameters_node != null; parameters_node = parameters_node.getNextSibling())
-		{
-			NamedNodeMap attrs = parameters_node.getAttributes();
-			switch (parameters_node.getNodeName().toLowerCase())
-			{
-				case "param":
-				{
-					parameters.put(parseString(attrs, "name"), parseString(attrs, "value"));
-					break;
-				}
-				case "skill":
-				{
-					parameters.put(parseString(attrs, "name"), new SkillHolder(parseInteger(attrs, "id"), parseInteger(attrs, "level")));
-					break;
-				}
-				case "location":
-				{
-					parameters.put(parseString(attrs, "name"), new Location(parseInteger(attrs, "x"), parseInteger(attrs, "y"), parseInteger(attrs, "z"), parseInteger(attrs, "heading", 0)));
-					break;
-				}
-				case "minions":
-				{
-					final List<MinionHolder> minions = new ArrayList<>(1);
-					for (Node minions_node = parameters_node.getFirstChild(); minions_node != null; minions_node = minions_node.getNextSibling())
-					{
-						if (minions_node.getNodeName().equalsIgnoreCase("npc"))
-						{
-							attrs = minions_node.getAttributes();
-							minions.add(new MinionHolder(parseInteger(attrs, "id"), parseInteger(attrs, "count"), parseInteger(attrs, "respawnTime"), parseInteger(attrs, "weightPoint")));
-						}
-					}
-					
-					if (!minions.isEmpty())
-					{
-						parameters.put(parseString(parameters_node.getAttributes(), "name"), minions);
-					}
-					break;
-				}
-			}
-		}
-		return parameters;
-	}
-	
-	default Location parseLocation(Node n)
-	{
-		final NamedNodeMap attrs = n.getAttributes();
-		final int x = parseInteger(attrs, "x");
-		final int y = parseInteger(attrs, "y");
-		final int z = parseInteger(attrs, "z");
-		final int heading = parseInteger(attrs, "heading", 0);
-		return new Location(x, y, z, heading);
-	}
-}
diff --git a/L2J_Mobius_5.0_Salvation/java/com/l2jmobius/commons/util/IXmlReader.java b/L2J_Mobius_5.0_Salvation/java/com/l2jmobius/commons/util/IXmlReader.java
index 0317816fd8..4bfed2396e 100644
--- a/L2J_Mobius_5.0_Salvation/java/com/l2jmobius/commons/util/IXmlReader.java
+++ b/L2J_Mobius_5.0_Salvation/java/com/l2jmobius/commons/util/IXmlReader.java
@@ -18,8 +18,13 @@ package com.l2jmobius.commons.util;
 
 import java.io.File;
 import java.io.FileFilter;
+import java.util.ArrayList;
+import java.util.HashMap;
 import java.util.LinkedHashMap;
+import java.util.List;
 import java.util.Map;
+import java.util.concurrent.CopyOnWriteArrayList;
+import java.util.concurrent.ScheduledFuture;
 import java.util.function.Consumer;
 import java.util.function.Predicate;
 import java.util.logging.Level;
@@ -35,7 +40,12 @@ import org.w3c.dom.NodeList;
 import org.xml.sax.ErrorHandler;
 import org.xml.sax.SAXParseException;
 
+import com.l2jmobius.Config;
+import com.l2jmobius.commons.concurrent.ThreadPool;
 import com.l2jmobius.commons.util.file.filter.XMLFilter;
+import com.l2jmobius.gameserver.model.Location;
+import com.l2jmobius.gameserver.model.holders.MinionHolder;
+import com.l2jmobius.gameserver.model.holders.SkillHolder;
 
 /**
  * Interface for XML parsers.
@@ -56,6 +66,15 @@ public interface IXmlReader
 	 */
 	void load();
 	
+	/**
+	 * Wrapper for {@link #parseFile(File)} method.
+	 * @param path the relative path to the datapack root of the XML file to parse.
+	 */
+	default void parseDatapackFile(String path)
+	{
+		parseFile(new File(Config.DATAPACK_ROOT, path));
+	}
+	
 	/**
 	 * Parses a single XML file.<br>
 	 * If the file was successfully parsed, call {@link #parseDocument(Document, File)} for the parsed document.<br>
@@ -121,6 +140,17 @@ public interface IXmlReader
 		return parseDirectory(file, false);
 	}
 	
+	/**
+	 * Wrapper for {@link #parseDirectory(File, boolean)}.
+	 * @param path the path to the directory where the XML files are
+	 * @param recursive parses all sub folders if there is
+	 * @return {@code false} if it fails to find the directory, {@code true} otherwise
+	 */
+	default boolean parseDatapackDirectory(String path, boolean recursive)
+	{
+		return parseDirectory(new File(Config.DATAPACK_ROOT, path), recursive);
+	}
+	
 	/**
 	 * Loads all XML files from {@code path} and calls {@link #parseFile(File)} for each one of them.
 	 * @param dir the directory object to scan.
@@ -135,6 +165,7 @@ public interface IXmlReader
 			return false;
 		}
 		
+		final List<ScheduledFuture<?>> jobs = new CopyOnWriteArrayList<>();
 		final File[] listOfFiles = dir.listFiles();
 		for (File f : listOfFiles)
 		{
@@ -144,9 +175,23 @@ public interface IXmlReader
 			}
 			else if (getCurrentFileFilter().accept(f))
 			{
-				parseFile(f);
+				jobs.add(ThreadPool.schedule(() ->
+				{
+					parseFile(f);
+				}, 0));
 			}
 		}
+		while (!jobs.isEmpty())
+		{
+			for (ScheduledFuture<?> job : jobs)
+			{
+				if ((job == null) || job.isDone() || job.isCancelled())
+				{
+					jobs.remove(job);
+				}
+			}
+		}
+		
 		return true;
 	}
 	
@@ -531,6 +576,16 @@ public interface IXmlReader
 		return parseString(attrs.getNamedItem(name), defaultValue);
 	}
 	
+	default Location parseLocation(Node n)
+	{
+		final NamedNodeMap attrs = n.getAttributes();
+		final int x = parseInteger(attrs, "x");
+		final int y = parseInteger(attrs, "y");
+		final int z = parseInteger(attrs, "z");
+		final int heading = parseInteger(attrs, "heading", 0);
+		return new Location(x, y, z, heading);
+	}
+	
 	/**
 	 * Parses an enumerated value.
 	 * @param <T> the enumerated type
@@ -612,6 +667,56 @@ public interface IXmlReader
 		return map;
 	}
 	
+	/**
+	 * @param n
+	 * @return a map of parameters
+	 */
+	default Map<String, Object> parseParameters(Node n)
+	{
+		final Map<String, Object> parameters = new HashMap<>();
+		for (Node parameters_node = n.getFirstChild(); parameters_node != null; parameters_node = parameters_node.getNextSibling())
+		{
+			NamedNodeMap attrs = parameters_node.getAttributes();
+			switch (parameters_node.getNodeName().toLowerCase())
+			{
+				case "param":
+				{
+					parameters.put(parseString(attrs, "name"), parseString(attrs, "value"));
+					break;
+				}
+				case "skill":
+				{
+					parameters.put(parseString(attrs, "name"), new SkillHolder(parseInteger(attrs, "id"), parseInteger(attrs, "level")));
+					break;
+				}
+				case "location":
+				{
+					parameters.put(parseString(attrs, "name"), new Location(parseInteger(attrs, "x"), parseInteger(attrs, "y"), parseInteger(attrs, "z"), parseInteger(attrs, "heading", 0)));
+					break;
+				}
+				case "minions":
+				{
+					final List<MinionHolder> minions = new ArrayList<>(1);
+					for (Node minions_node = parameters_node.getFirstChild(); minions_node != null; minions_node = minions_node.getNextSibling())
+					{
+						if (minions_node.getNodeName().equalsIgnoreCase("npc"))
+						{
+							attrs = minions_node.getAttributes();
+							minions.add(new MinionHolder(parseInteger(attrs, "id"), parseInteger(attrs, "count"), parseInteger(attrs, "respawnTime"), parseInteger(attrs, "weightPoint")));
+						}
+					}
+					
+					if (!minions.isEmpty())
+					{
+						parameters.put(parseString(parameters_node.getAttributes(), "name"), minions);
+					}
+					break;
+				}
+			}
+		}
+		return parameters;
+	}
+	
 	/**
 	 * Executes action for each child of node
 	 * @param node
diff --git a/L2J_Mobius_5.0_Salvation/java/com/l2jmobius/gameserver/GameServer.java b/L2J_Mobius_5.0_Salvation/java/com/l2jmobius/gameserver/GameServer.java
index d3c858dad8..ffd419f087 100644
--- a/L2J_Mobius_5.0_Salvation/java/com/l2jmobius/gameserver/GameServer.java
+++ b/L2J_Mobius_5.0_Salvation/java/com/l2jmobius/gameserver/GameServer.java
@@ -366,7 +366,7 @@ public class GameServer
 		try
 		{
 			LOGGER.info(getClass().getSimpleName() + ": Loading server scripts:");
-			ScriptEngineManager.getInstance().executeMasterHandler();
+			ScriptEngineManager.getInstance().executeScript(ScriptEngineManager.MASTER_HANDLER_FILE);
 			ScriptEngineManager.getInstance().executeScriptList();
 		}
 		catch (Exception e)
diff --git a/L2J_Mobius_5.0_Salvation/java/com/l2jmobius/gameserver/data/xml/impl/ActionData.java b/L2J_Mobius_5.0_Salvation/java/com/l2jmobius/gameserver/data/xml/impl/ActionData.java
index 0bffdc5bb1..a322dad1d9 100644
--- a/L2J_Mobius_5.0_Salvation/java/com/l2jmobius/gameserver/data/xml/impl/ActionData.java
+++ b/L2J_Mobius_5.0_Salvation/java/com/l2jmobius/gameserver/data/xml/impl/ActionData.java
@@ -23,14 +23,14 @@ import java.util.logging.Logger;
 
 import org.w3c.dom.Document;
 
-import com.l2jmobius.commons.util.IGameXmlReader;
+import com.l2jmobius.commons.util.IXmlReader;
 import com.l2jmobius.gameserver.model.ActionDataHolder;
 import com.l2jmobius.gameserver.model.StatsSet;
 
 /**
  * @author UnAfraid
  */
-public class ActionData implements IGameXmlReader
+public class ActionData implements IXmlReader
 {
 	private static final Logger LOGGER = Logger.getLogger(ActionData.class.getName());
 	
diff --git a/L2J_Mobius_5.0_Salvation/java/com/l2jmobius/gameserver/data/xml/impl/AdminData.java b/L2J_Mobius_5.0_Salvation/java/com/l2jmobius/gameserver/data/xml/impl/AdminData.java
index 0b1d3e3245..9e359b1521 100644
--- a/L2J_Mobius_5.0_Salvation/java/com/l2jmobius/gameserver/data/xml/impl/AdminData.java
+++ b/L2J_Mobius_5.0_Salvation/java/com/l2jmobius/gameserver/data/xml/impl/AdminData.java
@@ -29,7 +29,7 @@ import org.w3c.dom.Document;
 import org.w3c.dom.NamedNodeMap;
 import org.w3c.dom.Node;
 
-import com.l2jmobius.commons.util.IGameXmlReader;
+import com.l2jmobius.commons.util.IXmlReader;
 import com.l2jmobius.gameserver.model.AccessLevel;
 import com.l2jmobius.gameserver.model.AdminCommandAccessRight;
 import com.l2jmobius.gameserver.model.StatsSet;
@@ -42,7 +42,7 @@ import com.l2jmobius.gameserver.network.serverpackets.SystemMessage;
  * Loads administrator access levels and commands.
  * @author UnAfraid
  */
-public final class AdminData implements IGameXmlReader
+public final class AdminData implements IXmlReader
 {
 	private static final Logger LOGGER = Logger.getLogger(AdminData.class.getName());
 	
diff --git a/L2J_Mobius_5.0_Salvation/java/com/l2jmobius/gameserver/data/xml/impl/AlchemyData.java b/L2J_Mobius_5.0_Salvation/java/com/l2jmobius/gameserver/data/xml/impl/AlchemyData.java
index a5d8153b82..76f7eb98b5 100644
--- a/L2J_Mobius_5.0_Salvation/java/com/l2jmobius/gameserver/data/xml/impl/AlchemyData.java
+++ b/L2J_Mobius_5.0_Salvation/java/com/l2jmobius/gameserver/data/xml/impl/AlchemyData.java
@@ -25,7 +25,7 @@ import org.w3c.dom.Document;
 import org.w3c.dom.NamedNodeMap;
 import org.w3c.dom.Node;
 
-import com.l2jmobius.commons.util.IGameXmlReader;
+import com.l2jmobius.commons.util.IXmlReader;
 import com.l2jmobius.gameserver.model.StatsSet;
 import com.l2jmobius.gameserver.model.alchemy.AlchemyCraftData;
 import com.l2jmobius.gameserver.model.holders.ItemHolder;
@@ -33,7 +33,7 @@ import com.l2jmobius.gameserver.model.holders.ItemHolder;
 /**
  * @author Sdw
  */
-public class AlchemyData implements IGameXmlReader
+public class AlchemyData implements IXmlReader
 {
 	private static final Logger LOGGER = Logger.getLogger(AlchemyData.class.getName());
 	
diff --git a/L2J_Mobius_5.0_Salvation/java/com/l2jmobius/gameserver/data/xml/impl/AppearanceItemData.java b/L2J_Mobius_5.0_Salvation/java/com/l2jmobius/gameserver/data/xml/impl/AppearanceItemData.java
index 089004322a..801c66340d 100644
--- a/L2J_Mobius_5.0_Salvation/java/com/l2jmobius/gameserver/data/xml/impl/AppearanceItemData.java
+++ b/L2J_Mobius_5.0_Salvation/java/com/l2jmobius/gameserver/data/xml/impl/AppearanceItemData.java
@@ -24,7 +24,7 @@ import java.util.logging.Logger;
 import org.w3c.dom.Document;
 import org.w3c.dom.Node;
 
-import com.l2jmobius.commons.util.IGameXmlReader;
+import com.l2jmobius.commons.util.IXmlReader;
 import com.l2jmobius.gameserver.datatables.ItemTable;
 import com.l2jmobius.gameserver.enums.Race;
 import com.l2jmobius.gameserver.model.StatsSet;
@@ -36,7 +36,7 @@ import com.l2jmobius.gameserver.model.items.type.CrystalType;
 /**
  * @author UnAfraid
  */
-public class AppearanceItemData implements IGameXmlReader
+public class AppearanceItemData implements IXmlReader
 {
 	private static final Logger LOGGER = Logger.getLogger(AppearanceItemData.class.getName());
 	
diff --git a/L2J_Mobius_5.0_Salvation/java/com/l2jmobius/gameserver/data/xml/impl/ArmorSetsData.java b/L2J_Mobius_5.0_Salvation/java/com/l2jmobius/gameserver/data/xml/impl/ArmorSetsData.java
index 0f1445c10a..d7582d8d5a 100644
--- a/L2J_Mobius_5.0_Salvation/java/com/l2jmobius/gameserver/data/xml/impl/ArmorSetsData.java
+++ b/L2J_Mobius_5.0_Salvation/java/com/l2jmobius/gameserver/data/xml/impl/ArmorSetsData.java
@@ -19,9 +19,9 @@ package com.l2jmobius.gameserver.data.xml.impl;
 import java.io.File;
 import java.util.ArrayList;
 import java.util.Collections;
-import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
+import java.util.concurrent.ConcurrentHashMap;
 import java.util.logging.Logger;
 import java.util.stream.Stream;
 
@@ -29,7 +29,7 @@ import org.w3c.dom.Document;
 import org.w3c.dom.NamedNodeMap;
 import org.w3c.dom.Node;
 
-import com.l2jmobius.commons.util.IGameXmlReader;
+import com.l2jmobius.commons.util.IXmlReader;
 import com.l2jmobius.gameserver.datatables.ItemTable;
 import com.l2jmobius.gameserver.model.ArmorSet;
 import com.l2jmobius.gameserver.model.holders.ArmorsetSkillHolder;
@@ -40,12 +40,12 @@ import com.l2jmobius.gameserver.model.stats.BaseStats;
  * Loads armor set bonuses.
  * @author godson, Luno, UnAfraid
  */
-public final class ArmorSetsData implements IGameXmlReader
+public final class ArmorSetsData implements IXmlReader
 {
 	private static final Logger LOGGER = Logger.getLogger(ArmorSetsData.class.getName());
 	
-	private final Map<Integer, ArmorSet> _armorSets = new HashMap<>();
-	private final Map<Integer, List<ArmorSet>> _armorSetItems = new HashMap<>();
+	private final Map<Integer, ArmorSet> _armorSets = new ConcurrentHashMap<>();
+	private final Map<Integer, List<ArmorSet>> _armorSetItems = new ConcurrentHashMap<>();
 	
 	protected ArmorSetsData()
 	{
diff --git a/L2J_Mobius_5.0_Salvation/java/com/l2jmobius/gameserver/data/xml/impl/AttendanceRewardData.java b/L2J_Mobius_5.0_Salvation/java/com/l2jmobius/gameserver/data/xml/impl/AttendanceRewardData.java
index c60afbd78a..24e402e706 100644
--- a/L2J_Mobius_5.0_Salvation/java/com/l2jmobius/gameserver/data/xml/impl/AttendanceRewardData.java
+++ b/L2J_Mobius_5.0_Salvation/java/com/l2jmobius/gameserver/data/xml/impl/AttendanceRewardData.java
@@ -24,7 +24,7 @@ import java.util.logging.Logger;
 import org.w3c.dom.Document;
 
 import com.l2jmobius.Config;
-import com.l2jmobius.commons.util.IGameXmlReader;
+import com.l2jmobius.commons.util.IXmlReader;
 import com.l2jmobius.gameserver.datatables.ItemTable;
 import com.l2jmobius.gameserver.model.StatsSet;
 import com.l2jmobius.gameserver.model.holders.ItemHolder;
@@ -32,7 +32,7 @@ import com.l2jmobius.gameserver.model.holders.ItemHolder;
 /**
  * @author Mobius
  */
-public class AttendanceRewardData implements IGameXmlReader
+public class AttendanceRewardData implements IXmlReader
 {
 	private static Logger LOGGER = Logger.getLogger(AttendanceRewardData.class.getName());
 	private final List<ItemHolder> _rewards = new ArrayList<>();
diff --git a/L2J_Mobius_5.0_Salvation/java/com/l2jmobius/gameserver/data/xml/impl/BeautyShopData.java b/L2J_Mobius_5.0_Salvation/java/com/l2jmobius/gameserver/data/xml/impl/BeautyShopData.java
index 133f11d978..d88ccc7747 100644
--- a/L2J_Mobius_5.0_Salvation/java/com/l2jmobius/gameserver/data/xml/impl/BeautyShopData.java
+++ b/L2J_Mobius_5.0_Salvation/java/com/l2jmobius/gameserver/data/xml/impl/BeautyShopData.java
@@ -24,7 +24,7 @@ import org.w3c.dom.Document;
 import org.w3c.dom.NamedNodeMap;
 import org.w3c.dom.Node;
 
-import com.l2jmobius.commons.util.IGameXmlReader;
+import com.l2jmobius.commons.util.IXmlReader;
 import com.l2jmobius.gameserver.enums.Race;
 import com.l2jmobius.gameserver.enums.Sex;
 import com.l2jmobius.gameserver.model.StatsSet;
@@ -34,7 +34,7 @@ import com.l2jmobius.gameserver.model.beautyshop.BeautyItem;
 /**
  * @author Sdw
  */
-public final class BeautyShopData implements IGameXmlReader
+public final class BeautyShopData implements IXmlReader
 {
 	private final Map<Race, Map<Sex, BeautyData>> _beautyList = new HashMap<>();
 	private final Map<Sex, BeautyData> _beautyData = new HashMap<>();
diff --git a/L2J_Mobius_5.0_Salvation/java/com/l2jmobius/gameserver/data/xml/impl/BuyListData.java b/L2J_Mobius_5.0_Salvation/java/com/l2jmobius/gameserver/data/xml/impl/BuyListData.java
index de298ef358..8ab9ea8097 100644
--- a/L2J_Mobius_5.0_Salvation/java/com/l2jmobius/gameserver/data/xml/impl/BuyListData.java
+++ b/L2J_Mobius_5.0_Salvation/java/com/l2jmobius/gameserver/data/xml/impl/BuyListData.java
@@ -21,8 +21,8 @@ import java.io.FileFilter;
 import java.sql.Connection;
 import java.sql.ResultSet;
 import java.sql.Statement;
-import java.util.HashMap;
 import java.util.Map;
+import java.util.concurrent.ConcurrentHashMap;
 import java.util.logging.Level;
 import java.util.logging.Logger;
 
@@ -31,7 +31,7 @@ import org.w3c.dom.NamedNodeMap;
 
 import com.l2jmobius.Config;
 import com.l2jmobius.commons.database.DatabaseFactory;
-import com.l2jmobius.commons.util.IGameXmlReader;
+import com.l2jmobius.commons.util.IXmlReader;
 import com.l2jmobius.commons.util.file.filter.NumericNameFilter;
 import com.l2jmobius.gameserver.datatables.ItemTable;
 import com.l2jmobius.gameserver.model.buylist.Product;
@@ -42,11 +42,11 @@ import com.l2jmobius.gameserver.model.items.Item;
  * Loads buy lists for NPCs.
  * @author NosBit
  */
-public final class BuyListData implements IGameXmlReader
+public final class BuyListData implements IXmlReader
 {
 	private static final Logger LOGGER = Logger.getLogger(BuyListData.class.getName());
 	
-	private final Map<Integer, ProductList> _buyLists = new HashMap<>();
+	private final Map<Integer, ProductList> _buyLists = new ConcurrentHashMap<>();
 	private static final FileFilter NUMERIC_FILTER = new NumericNameFilter();
 	
 	protected BuyListData()
diff --git a/L2J_Mobius_5.0_Salvation/java/com/l2jmobius/gameserver/data/xml/impl/CastleData.java b/L2J_Mobius_5.0_Salvation/java/com/l2jmobius/gameserver/data/xml/impl/CastleData.java
index 6618dcdf1d..792afbfa0b 100644
--- a/L2J_Mobius_5.0_Salvation/java/com/l2jmobius/gameserver/data/xml/impl/CastleData.java
+++ b/L2J_Mobius_5.0_Salvation/java/com/l2jmobius/gameserver/data/xml/impl/CastleData.java
@@ -19,16 +19,16 @@ package com.l2jmobius.gameserver.data.xml.impl;
 import java.io.File;
 import java.util.ArrayList;
 import java.util.Collections;
-import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
+import java.util.concurrent.ConcurrentHashMap;
 import java.util.stream.Collectors;
 
 import org.w3c.dom.Document;
 import org.w3c.dom.NamedNodeMap;
 import org.w3c.dom.Node;
 
-import com.l2jmobius.commons.util.IGameXmlReader;
+import com.l2jmobius.commons.util.IXmlReader;
 import com.l2jmobius.gameserver.enums.CastleSide;
 import com.l2jmobius.gameserver.enums.SiegeGuardType;
 import com.l2jmobius.gameserver.model.holders.CastleSpawnHolder;
@@ -37,10 +37,10 @@ import com.l2jmobius.gameserver.model.holders.SiegeGuardHolder;
 /**
  * @author St3eT
  */
-public final class CastleData implements IGameXmlReader
+public final class CastleData implements IXmlReader
 {
-	private final Map<Integer, List<CastleSpawnHolder>> _spawns = new HashMap<>();
-	private static final Map<Integer, List<SiegeGuardHolder>> _siegeGuards = new HashMap<>();
+	private final Map<Integer, List<CastleSpawnHolder>> _spawns = new ConcurrentHashMap<>();
+	private static final Map<Integer, List<SiegeGuardHolder>> _siegeGuards = new ConcurrentHashMap<>();
 	
 	protected CastleData()
 	{
diff --git a/L2J_Mobius_5.0_Salvation/java/com/l2jmobius/gameserver/data/xml/impl/CategoryData.java b/L2J_Mobius_5.0_Salvation/java/com/l2jmobius/gameserver/data/xml/impl/CategoryData.java
index f851aa6703..df7d390dfb 100644
--- a/L2J_Mobius_5.0_Salvation/java/com/l2jmobius/gameserver/data/xml/impl/CategoryData.java
+++ b/L2J_Mobius_5.0_Salvation/java/com/l2jmobius/gameserver/data/xml/impl/CategoryData.java
@@ -27,14 +27,14 @@ import org.w3c.dom.Document;
 import org.w3c.dom.NamedNodeMap;
 import org.w3c.dom.Node;
 
-import com.l2jmobius.commons.util.IGameXmlReader;
+import com.l2jmobius.commons.util.IXmlReader;
 import com.l2jmobius.gameserver.enums.CategoryType;
 
 /**
  * Loads the category data with Class or NPC IDs.
  * @author NosBit, xban1x
  */
-public final class CategoryData implements IGameXmlReader
+public final class CategoryData implements IXmlReader
 {
 	private static final Logger LOGGER = Logger.getLogger(CategoryData.class.getName());
 	
diff --git a/L2J_Mobius_5.0_Salvation/java/com/l2jmobius/gameserver/data/xml/impl/ClanHallData.java b/L2J_Mobius_5.0_Salvation/java/com/l2jmobius/gameserver/data/xml/impl/ClanHallData.java
index 511cc7f4f7..90a1a51029 100644
--- a/L2J_Mobius_5.0_Salvation/java/com/l2jmobius/gameserver/data/xml/impl/ClanHallData.java
+++ b/L2J_Mobius_5.0_Salvation/java/com/l2jmobius/gameserver/data/xml/impl/ClanHallData.java
@@ -20,9 +20,9 @@ import java.io.File;
 import java.util.ArrayList;
 import java.util.Collection;
 import java.util.Comparator;
-import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
+import java.util.concurrent.ConcurrentHashMap;
 import java.util.logging.Logger;
 import java.util.stream.Collectors;
 
@@ -30,7 +30,7 @@ import org.w3c.dom.Document;
 import org.w3c.dom.NamedNodeMap;
 import org.w3c.dom.Node;
 
-import com.l2jmobius.commons.util.IGameXmlReader;
+import com.l2jmobius.commons.util.IXmlReader;
 import com.l2jmobius.gameserver.enums.ClanHallGrade;
 import com.l2jmobius.gameserver.enums.ClanHallType;
 import com.l2jmobius.gameserver.model.Location;
@@ -43,10 +43,10 @@ import com.l2jmobius.gameserver.model.holders.ClanHallTeleportHolder;
 /**
  * @author St3eT
  */
-public final class ClanHallData implements IGameXmlReader
+public final class ClanHallData implements IXmlReader
 {
 	private static final Logger LOGGER = Logger.getLogger(ClanHallData.class.getName());
-	private static final Map<Integer, ClanHall> _clanHalls = new HashMap<>();
+	private static final Map<Integer, ClanHall> _clanHalls = new ConcurrentHashMap<>();
 	
 	protected ClanHallData()
 	{
diff --git a/L2J_Mobius_5.0_Salvation/java/com/l2jmobius/gameserver/data/xml/impl/ClanMasteryData.java b/L2J_Mobius_5.0_Salvation/java/com/l2jmobius/gameserver/data/xml/impl/ClanMasteryData.java
index 2b4c575d33..1c3b0f7a9f 100644
--- a/L2J_Mobius_5.0_Salvation/java/com/l2jmobius/gameserver/data/xml/impl/ClanMasteryData.java
+++ b/L2J_Mobius_5.0_Salvation/java/com/l2jmobius/gameserver/data/xml/impl/ClanMasteryData.java
@@ -23,7 +23,7 @@ import java.util.logging.Logger;
 
 import org.w3c.dom.Document;
 
-import com.l2jmobius.commons.util.IGameXmlReader;
+import com.l2jmobius.commons.util.IXmlReader;
 import com.l2jmobius.gameserver.model.StatsSet;
 import com.l2jmobius.gameserver.model.holders.ClanMasteryHolder;
 import com.l2jmobius.gameserver.model.skills.Skill;
@@ -31,7 +31,7 @@ import com.l2jmobius.gameserver.model.skills.Skill;
 /**
  * @author Mobius
  */
-public class ClanMasteryData implements IGameXmlReader
+public class ClanMasteryData implements IXmlReader
 {
 	private static Logger LOGGER = Logger.getLogger(ClanMasteryData.class.getName());
 	
diff --git a/L2J_Mobius_5.0_Salvation/java/com/l2jmobius/gameserver/data/xml/impl/ClanRewardData.java b/L2J_Mobius_5.0_Salvation/java/com/l2jmobius/gameserver/data/xml/impl/ClanRewardData.java
index 252bba1c64..d5938ee964 100644
--- a/L2J_Mobius_5.0_Salvation/java/com/l2jmobius/gameserver/data/xml/impl/ClanRewardData.java
+++ b/L2J_Mobius_5.0_Salvation/java/com/l2jmobius/gameserver/data/xml/impl/ClanRewardData.java
@@ -28,7 +28,6 @@ import org.w3c.dom.Document;
 import org.w3c.dom.NamedNodeMap;
 import org.w3c.dom.Node;
 
-import com.l2jmobius.commons.util.IGameXmlReader;
 import com.l2jmobius.commons.util.IXmlReader;
 import com.l2jmobius.gameserver.enums.ClanRewardType;
 import com.l2jmobius.gameserver.model.clan.ClanRewardBonus;
@@ -38,7 +37,7 @@ import com.l2jmobius.gameserver.model.holders.SkillHolder;
 /**
  * @author UnAfraid
  */
-public class ClanRewardData implements IGameXmlReader
+public class ClanRewardData implements IXmlReader
 {
 	private static final Logger LOGGER = Logger.getLogger(ClanRewardData.class.getName());
 	private final Map<ClanRewardType, List<ClanRewardBonus>> _clanRewards = new ConcurrentHashMap<>();
diff --git a/L2J_Mobius_5.0_Salvation/java/com/l2jmobius/gameserver/data/xml/impl/ClanShopData.java b/L2J_Mobius_5.0_Salvation/java/com/l2jmobius/gameserver/data/xml/impl/ClanShopData.java
index 2ed49eee9f..006d51a7ea 100644
--- a/L2J_Mobius_5.0_Salvation/java/com/l2jmobius/gameserver/data/xml/impl/ClanShopData.java
+++ b/L2J_Mobius_5.0_Salvation/java/com/l2jmobius/gameserver/data/xml/impl/ClanShopData.java
@@ -23,7 +23,7 @@ import java.util.logging.Logger;
 
 import org.w3c.dom.Document;
 
-import com.l2jmobius.commons.util.IGameXmlReader;
+import com.l2jmobius.commons.util.IXmlReader;
 import com.l2jmobius.gameserver.datatables.ItemTable;
 import com.l2jmobius.gameserver.model.StatsSet;
 import com.l2jmobius.gameserver.model.holders.ClanShopProductHolder;
@@ -32,7 +32,7 @@ import com.l2jmobius.gameserver.model.items.Item;
 /**
  * @author Mobius
  */
-public class ClanShopData implements IGameXmlReader
+public class ClanShopData implements IXmlReader
 {
 	private static Logger LOGGER = Logger.getLogger(ClanShopData.class.getName());
 	
diff --git a/L2J_Mobius_5.0_Salvation/java/com/l2jmobius/gameserver/data/xml/impl/ClassListData.java b/L2J_Mobius_5.0_Salvation/java/com/l2jmobius/gameserver/data/xml/impl/ClassListData.java
index a40f726d50..6e99aeabfa 100644
--- a/L2J_Mobius_5.0_Salvation/java/com/l2jmobius/gameserver/data/xml/impl/ClassListData.java
+++ b/L2J_Mobius_5.0_Salvation/java/com/l2jmobius/gameserver/data/xml/impl/ClassListData.java
@@ -17,15 +17,15 @@
 package com.l2jmobius.gameserver.data.xml.impl;
 
 import java.io.File;
-import java.util.HashMap;
 import java.util.Map;
+import java.util.concurrent.ConcurrentHashMap;
 import java.util.logging.Logger;
 
 import org.w3c.dom.Document;
 import org.w3c.dom.NamedNodeMap;
 import org.w3c.dom.Node;
 
-import com.l2jmobius.commons.util.IGameXmlReader;
+import com.l2jmobius.commons.util.IXmlReader;
 import com.l2jmobius.gameserver.model.base.ClassId;
 import com.l2jmobius.gameserver.model.base.ClassInfo;
 
@@ -33,11 +33,11 @@ import com.l2jmobius.gameserver.model.base.ClassInfo;
  * Loads the the list of classes and it's info.
  * @author Zoey76
  */
-public final class ClassListData implements IGameXmlReader
+public final class ClassListData implements IXmlReader
 {
 	private static final Logger LOGGER = Logger.getLogger(ClassListData.class.getName());
 	
-	private final Map<ClassId, ClassInfo> _classData = new HashMap<>();
+	private final Map<ClassId, ClassInfo> _classData = new ConcurrentHashMap<>();
 	
 	/**
 	 * Instantiates a new class list data.
diff --git a/L2J_Mobius_5.0_Salvation/java/com/l2jmobius/gameserver/data/xml/impl/CombinationItemsData.java b/L2J_Mobius_5.0_Salvation/java/com/l2jmobius/gameserver/data/xml/impl/CombinationItemsData.java
index a7e90d5f89..c2ce205300 100644
--- a/L2J_Mobius_5.0_Salvation/java/com/l2jmobius/gameserver/data/xml/impl/CombinationItemsData.java
+++ b/L2J_Mobius_5.0_Salvation/java/com/l2jmobius/gameserver/data/xml/impl/CombinationItemsData.java
@@ -24,7 +24,7 @@ import java.util.stream.Collectors;
 
 import org.w3c.dom.Document;
 
-import com.l2jmobius.commons.util.IGameXmlReader;
+import com.l2jmobius.commons.util.IXmlReader;
 import com.l2jmobius.gameserver.datatables.ItemTable;
 import com.l2jmobius.gameserver.model.StatsSet;
 import com.l2jmobius.gameserver.model.items.combination.CombinationItem;
@@ -34,7 +34,7 @@ import com.l2jmobius.gameserver.model.items.combination.CombinationItemType;
 /**
  * @author UnAfraid
  */
-public class CombinationItemsData implements IGameXmlReader
+public class CombinationItemsData implements IXmlReader
 {
 	private static final Logger LOGGER = Logger.getLogger(CombinationItemsData.class.getName());
 	private final List<CombinationItem> _items = new ArrayList<>();
diff --git a/L2J_Mobius_5.0_Salvation/java/com/l2jmobius/gameserver/data/xml/impl/CubicData.java b/L2J_Mobius_5.0_Salvation/java/com/l2jmobius/gameserver/data/xml/impl/CubicData.java
index f682509217..ef46a08a7f 100644
--- a/L2J_Mobius_5.0_Salvation/java/com/l2jmobius/gameserver/data/xml/impl/CubicData.java
+++ b/L2J_Mobius_5.0_Salvation/java/com/l2jmobius/gameserver/data/xml/impl/CubicData.java
@@ -20,12 +20,12 @@ import java.io.File;
 import java.util.Collections;
 import java.util.HashMap;
 import java.util.Map;
+import java.util.concurrent.ConcurrentHashMap;
 import java.util.logging.Logger;
 
 import org.w3c.dom.Document;
 import org.w3c.dom.Node;
 
-import com.l2jmobius.commons.util.IGameXmlReader;
 import com.l2jmobius.commons.util.IXmlReader;
 import com.l2jmobius.gameserver.model.StatsSet;
 import com.l2jmobius.gameserver.model.actor.templates.CubicTemplate;
@@ -39,11 +39,11 @@ import com.l2jmobius.gameserver.model.cubic.conditions.RangeCondition;
 /**
  * @author UnAfraid
  */
-public class CubicData implements IGameXmlReader
+public class CubicData implements IXmlReader
 {
 	private static final Logger LOGGER = Logger.getLogger(CubicData.class.getName());
 	
-	private final Map<Integer, Map<Integer, CubicTemplate>> _cubics = new HashMap<>();
+	private final Map<Integer, Map<Integer, CubicTemplate>> _cubics = new ConcurrentHashMap<>();
 	
 	protected CubicData()
 	{
diff --git a/L2J_Mobius_5.0_Salvation/java/com/l2jmobius/gameserver/data/xml/impl/DailyMissionData.java b/L2J_Mobius_5.0_Salvation/java/com/l2jmobius/gameserver/data/xml/impl/DailyMissionData.java
index 53519f2492..1e275049d9 100644
--- a/L2J_Mobius_5.0_Salvation/java/com/l2jmobius/gameserver/data/xml/impl/DailyMissionData.java
+++ b/L2J_Mobius_5.0_Salvation/java/com/l2jmobius/gameserver/data/xml/impl/DailyMissionData.java
@@ -27,7 +27,7 @@ import java.util.stream.Collectors;
 
 import org.w3c.dom.Document;
 
-import com.l2jmobius.commons.util.IGameXmlReader;
+import com.l2jmobius.commons.util.IXmlReader;
 import com.l2jmobius.gameserver.model.DailyMissionDataHolder;
 import com.l2jmobius.gameserver.model.StatsSet;
 import com.l2jmobius.gameserver.model.actor.instance.PlayerInstance;
@@ -37,7 +37,7 @@ import com.l2jmobius.gameserver.model.holders.ItemHolder;
 /**
  * @author Sdw
  */
-public class DailyMissionData implements IGameXmlReader
+public class DailyMissionData implements IXmlReader
 {
 	private static final Logger LOGGER = Logger.getLogger(DailyMissionData.class.getName());
 	private final Map<Integer, List<DailyMissionDataHolder>> _dailyMissionRewards = new LinkedHashMap<>();
diff --git a/L2J_Mobius_5.0_Salvation/java/com/l2jmobius/gameserver/data/xml/impl/DoorData.java b/L2J_Mobius_5.0_Salvation/java/com/l2jmobius/gameserver/data/xml/impl/DoorData.java
index e8b1ff7bfa..5dd43e98eb 100644
--- a/L2J_Mobius_5.0_Salvation/java/com/l2jmobius/gameserver/data/xml/impl/DoorData.java
+++ b/L2J_Mobius_5.0_Salvation/java/com/l2jmobius/gameserver/data/xml/impl/DoorData.java
@@ -32,7 +32,6 @@ import org.w3c.dom.Document;
 import org.w3c.dom.NamedNodeMap;
 import org.w3c.dom.Node;
 
-import com.l2jmobius.commons.util.IGameXmlReader;
 import com.l2jmobius.commons.util.IXmlReader;
 import com.l2jmobius.gameserver.instancemanager.MapRegionManager;
 import com.l2jmobius.gameserver.model.Location;
@@ -45,7 +44,7 @@ import com.l2jmobius.gameserver.model.instancezone.Instance;
  * This class loads and hold info about doors.
  * @author JIV, GodKratos, UnAfraid
  */
-public final class DoorData implements IGameXmlReader
+public final class DoorData implements IXmlReader
 {
 	private static final Logger LOGGER = Logger.getLogger(DoorData.class.getName());
 	
diff --git a/L2J_Mobius_5.0_Salvation/java/com/l2jmobius/gameserver/data/xml/impl/EnchantItemData.java b/L2J_Mobius_5.0_Salvation/java/com/l2jmobius/gameserver/data/xml/impl/EnchantItemData.java
index 24e12d1218..342b4cde07 100644
--- a/L2J_Mobius_5.0_Salvation/java/com/l2jmobius/gameserver/data/xml/impl/EnchantItemData.java
+++ b/L2J_Mobius_5.0_Salvation/java/com/l2jmobius/gameserver/data/xml/impl/EnchantItemData.java
@@ -25,7 +25,7 @@ import org.w3c.dom.Document;
 import org.w3c.dom.NamedNodeMap;
 import org.w3c.dom.Node;
 
-import com.l2jmobius.commons.util.IGameXmlReader;
+import com.l2jmobius.commons.util.IXmlReader;
 import com.l2jmobius.gameserver.model.StatsSet;
 import com.l2jmobius.gameserver.model.items.enchant.EnchantScroll;
 import com.l2jmobius.gameserver.model.items.enchant.EnchantSupportItem;
@@ -35,7 +35,7 @@ import com.l2jmobius.gameserver.model.items.instance.ItemInstance;
  * Loads item enchant data.
  * @author UnAfraid
  */
-public class EnchantItemData implements IGameXmlReader
+public class EnchantItemData implements IXmlReader
 {
 	private static final Logger LOGGER = Logger.getLogger(EnchantItemData.class.getName());
 	
diff --git a/L2J_Mobius_5.0_Salvation/java/com/l2jmobius/gameserver/data/xml/impl/EnchantItemGroupsData.java b/L2J_Mobius_5.0_Salvation/java/com/l2jmobius/gameserver/data/xml/impl/EnchantItemGroupsData.java
index 666d821e42..44582a7dd4 100644
--- a/L2J_Mobius_5.0_Salvation/java/com/l2jmobius/gameserver/data/xml/impl/EnchantItemGroupsData.java
+++ b/L2J_Mobius_5.0_Salvation/java/com/l2jmobius/gameserver/data/xml/impl/EnchantItemGroupsData.java
@@ -25,7 +25,7 @@ import org.w3c.dom.Document;
 import org.w3c.dom.NamedNodeMap;
 import org.w3c.dom.Node;
 
-import com.l2jmobius.commons.util.IGameXmlReader;
+import com.l2jmobius.commons.util.IXmlReader;
 import com.l2jmobius.gameserver.datatables.ItemTable;
 import com.l2jmobius.gameserver.model.holders.RangeChanceHolder;
 import com.l2jmobius.gameserver.model.items.Item;
@@ -37,7 +37,7 @@ import com.l2jmobius.gameserver.util.Util;
 /**
  * @author UnAfraid
  */
-public final class EnchantItemGroupsData implements IGameXmlReader
+public final class EnchantItemGroupsData implements IXmlReader
 {
 	private static final Logger LOGGER = Logger.getLogger(EnchantItemGroupsData.class.getName());
 	
diff --git a/L2J_Mobius_5.0_Salvation/java/com/l2jmobius/gameserver/data/xml/impl/EnchantItemHPBonusData.java b/L2J_Mobius_5.0_Salvation/java/com/l2jmobius/gameserver/data/xml/impl/EnchantItemHPBonusData.java
index d2ce1096b5..868b1f95f6 100644
--- a/L2J_Mobius_5.0_Salvation/java/com/l2jmobius/gameserver/data/xml/impl/EnchantItemHPBonusData.java
+++ b/L2J_Mobius_5.0_Salvation/java/com/l2jmobius/gameserver/data/xml/impl/EnchantItemHPBonusData.java
@@ -26,7 +26,7 @@ import java.util.logging.Logger;
 import org.w3c.dom.Document;
 import org.w3c.dom.Node;
 
-import com.l2jmobius.commons.util.IGameXmlReader;
+import com.l2jmobius.commons.util.IXmlReader;
 import com.l2jmobius.gameserver.model.items.Item;
 import com.l2jmobius.gameserver.model.items.instance.ItemInstance;
 import com.l2jmobius.gameserver.model.items.type.CrystalType;
@@ -35,7 +35,7 @@ import com.l2jmobius.gameserver.model.items.type.CrystalType;
  * This class holds the Enchant HP Bonus Data.
  * @author MrPoke, Zoey76
  */
-public class EnchantItemHPBonusData implements IGameXmlReader
+public class EnchantItemHPBonusData implements IXmlReader
 {
 	private static final Logger LOGGER = Logger.getLogger(EnchantItemHPBonusData.class.getName());
 	
diff --git a/L2J_Mobius_5.0_Salvation/java/com/l2jmobius/gameserver/data/xml/impl/EnchantItemOptionsData.java b/L2J_Mobius_5.0_Salvation/java/com/l2jmobius/gameserver/data/xml/impl/EnchantItemOptionsData.java
index f6e9946b94..b8d805132f 100644
--- a/L2J_Mobius_5.0_Salvation/java/com/l2jmobius/gameserver/data/xml/impl/EnchantItemOptionsData.java
+++ b/L2J_Mobius_5.0_Salvation/java/com/l2jmobius/gameserver/data/xml/impl/EnchantItemOptionsData.java
@@ -24,7 +24,7 @@ import java.util.logging.Logger;
 import org.w3c.dom.Document;
 import org.w3c.dom.Node;
 
-import com.l2jmobius.commons.util.IGameXmlReader;
+import com.l2jmobius.commons.util.IXmlReader;
 import com.l2jmobius.gameserver.model.items.instance.ItemInstance;
 import com.l2jmobius.gameserver.model.options.EnchantOptions;
 import com.l2jmobius.gameserver.util.Util;
@@ -32,7 +32,7 @@ import com.l2jmobius.gameserver.util.Util;
 /**
  * @author UnAfraid
  */
-public class EnchantItemOptionsData implements IGameXmlReader
+public class EnchantItemOptionsData implements IXmlReader
 {
 	private static final Logger LOGGER = Logger.getLogger(EnchantItemOptionsData.class.getName());
 	
diff --git a/L2J_Mobius_5.0_Salvation/java/com/l2jmobius/gameserver/data/xml/impl/EnchantSkillGroupsData.java b/L2J_Mobius_5.0_Salvation/java/com/l2jmobius/gameserver/data/xml/impl/EnchantSkillGroupsData.java
index 0b557ced04..45127fe5f6 100644
--- a/L2J_Mobius_5.0_Salvation/java/com/l2jmobius/gameserver/data/xml/impl/EnchantSkillGroupsData.java
+++ b/L2J_Mobius_5.0_Salvation/java/com/l2jmobius/gameserver/data/xml/impl/EnchantSkillGroupsData.java
@@ -18,16 +18,15 @@ package com.l2jmobius.gameserver.data.xml.impl;
 
 import java.io.File;
 import java.util.Collections;
-import java.util.HashMap;
 import java.util.HashSet;
-import java.util.LinkedHashMap;
 import java.util.Map;
 import java.util.Set;
+import java.util.concurrent.ConcurrentHashMap;
 import java.util.logging.Logger;
 
 import org.w3c.dom.Document;
 
-import com.l2jmobius.commons.util.IGameXmlReader;
+import com.l2jmobius.commons.util.IXmlReader;
 import com.l2jmobius.gameserver.enums.SkillEnchantType;
 import com.l2jmobius.gameserver.model.StatsSet;
 import com.l2jmobius.gameserver.model.holders.EnchantSkillHolder;
@@ -39,12 +38,12 @@ import com.l2jmobius.gameserver.model.skills.Skill;
  * This class holds the Enchant Groups information.
  * @author Micr0
  */
-public class EnchantSkillGroupsData implements IGameXmlReader
+public class EnchantSkillGroupsData implements IXmlReader
 {
 	private static final Logger LOGGER = Logger.getLogger(EnchantSkillGroupsData.class.getName());
 	
-	private final Map<Integer, EnchantSkillHolder> _enchantSkillHolders = new LinkedHashMap<>();
-	private final Map<SkillHolder, Set<Integer>> _enchantSkillTrees = new HashMap<>();
+	private final Map<Integer, EnchantSkillHolder> _enchantSkillHolders = new ConcurrentHashMap<>();
+	private final Map<SkillHolder, Set<Integer>> _enchantSkillTrees = new ConcurrentHashMap<>();
 	
 	public static int MAX_ENCHANT_LEVEL;
 	
diff --git a/L2J_Mobius_5.0_Salvation/java/com/l2jmobius/gameserver/data/xml/impl/EnsoulData.java b/L2J_Mobius_5.0_Salvation/java/com/l2jmobius/gameserver/data/xml/impl/EnsoulData.java
index 0881f3aaec..bea9592527 100644
--- a/L2J_Mobius_5.0_Salvation/java/com/l2jmobius/gameserver/data/xml/impl/EnsoulData.java
+++ b/L2J_Mobius_5.0_Salvation/java/com/l2jmobius/gameserver/data/xml/impl/EnsoulData.java
@@ -19,16 +19,14 @@ package com.l2jmobius.gameserver.data.xml.impl;
 import java.io.File;
 import java.util.Collection;
 import java.util.Collections;
-import java.util.EnumMap;
-import java.util.HashMap;
 import java.util.Map;
+import java.util.concurrent.ConcurrentHashMap;
 import java.util.logging.Logger;
 
 import org.w3c.dom.Document;
 import org.w3c.dom.NamedNodeMap;
 import org.w3c.dom.Node;
 
-import com.l2jmobius.commons.util.IGameXmlReader;
 import com.l2jmobius.commons.util.IXmlReader;
 import com.l2jmobius.gameserver.model.ensoul.EnsoulFee;
 import com.l2jmobius.gameserver.model.ensoul.EnsoulOption;
@@ -39,12 +37,12 @@ import com.l2jmobius.gameserver.model.items.type.CrystalType;
 /**
  * @author UnAfraid
  */
-public class EnsoulData implements IGameXmlReader
+public class EnsoulData implements IXmlReader
 {
 	private static final Logger LOGGER = Logger.getLogger(EnsoulData.class.getName());
-	private final Map<CrystalType, EnsoulFee> _ensoulFees = new EnumMap<>(CrystalType.class);
-	private final Map<Integer, EnsoulOption> _ensoulOptions = new HashMap<>();
-	private final Map<Integer, EnsoulStone> _ensoulStones = new HashMap<>();
+	private final Map<CrystalType, EnsoulFee> _ensoulFees = new ConcurrentHashMap<>();
+	private final Map<Integer, EnsoulOption> _ensoulOptions = new ConcurrentHashMap<>();
+	private final Map<Integer, EnsoulStone> _ensoulStones = new ConcurrentHashMap<>();
 	
 	protected EnsoulData()
 	{
diff --git a/L2J_Mobius_5.0_Salvation/java/com/l2jmobius/gameserver/data/xml/impl/EventEngineData.java b/L2J_Mobius_5.0_Salvation/java/com/l2jmobius/gameserver/data/xml/impl/EventEngineData.java
index c43970ea31..144e2d5599 100644
--- a/L2J_Mobius_5.0_Salvation/java/com/l2jmobius/gameserver/data/xml/impl/EventEngineData.java
+++ b/L2J_Mobius_5.0_Salvation/java/com/l2jmobius/gameserver/data/xml/impl/EventEngineData.java
@@ -32,7 +32,6 @@ import org.w3c.dom.Document;
 import org.w3c.dom.NamedNodeMap;
 import org.w3c.dom.Node;
 
-import com.l2jmobius.commons.util.IGameXmlReader;
 import com.l2jmobius.commons.util.IXmlReader;
 import com.l2jmobius.gameserver.model.Location;
 import com.l2jmobius.gameserver.model.StatsSet;
@@ -54,7 +53,7 @@ import com.l2jmobius.gameserver.model.holders.SkillHolder;
 /**
  * @author UnAfraid
  */
-public final class EventEngineData implements IGameXmlReader
+public final class EventEngineData implements IXmlReader
 {
 	private static final Logger LOGGER = Logger.getLogger(EventEngineData.class.getName());
 	
diff --git a/L2J_Mobius_5.0_Salvation/java/com/l2jmobius/gameserver/data/xml/impl/ExperienceData.java b/L2J_Mobius_5.0_Salvation/java/com/l2jmobius/gameserver/data/xml/impl/ExperienceData.java
index 2daaf16220..ea9d13c2aa 100644
--- a/L2J_Mobius_5.0_Salvation/java/com/l2jmobius/gameserver/data/xml/impl/ExperienceData.java
+++ b/L2J_Mobius_5.0_Salvation/java/com/l2jmobius/gameserver/data/xml/impl/ExperienceData.java
@@ -26,13 +26,13 @@ import org.w3c.dom.NamedNodeMap;
 import org.w3c.dom.Node;
 
 import com.l2jmobius.Config;
-import com.l2jmobius.commons.util.IGameXmlReader;
+import com.l2jmobius.commons.util.IXmlReader;
 
 /**
  * This class holds the Experience points for each level for players and pets.
  * @author mrTJO
  */
-public final class ExperienceData implements IGameXmlReader
+public final class ExperienceData implements IXmlReader
 {
 	private static final Logger LOGGER = Logger.getLogger(ExperienceData.class.getName());
 	
diff --git a/L2J_Mobius_5.0_Salvation/java/com/l2jmobius/gameserver/data/xml/impl/ExtendDropData.java b/L2J_Mobius_5.0_Salvation/java/com/l2jmobius/gameserver/data/xml/impl/ExtendDropData.java
index 00af3a4f77..09da39ad14 100644
--- a/L2J_Mobius_5.0_Salvation/java/com/l2jmobius/gameserver/data/xml/impl/ExtendDropData.java
+++ b/L2J_Mobius_5.0_Salvation/java/com/l2jmobius/gameserver/data/xml/impl/ExtendDropData.java
@@ -28,7 +28,7 @@ import java.util.logging.Logger;
 import org.w3c.dom.Document;
 import org.w3c.dom.Node;
 
-import com.l2jmobius.commons.util.IGameXmlReader;
+import com.l2jmobius.commons.util.IXmlReader;
 import com.l2jmobius.gameserver.handler.ConditionHandler;
 import com.l2jmobius.gameserver.model.StatsSet;
 import com.l2jmobius.gameserver.model.conditions.ICondition;
@@ -39,7 +39,7 @@ import com.l2jmobius.gameserver.network.SystemMessageId;
 /**
  * @author Sdw
  */
-public class ExtendDropData implements IGameXmlReader
+public class ExtendDropData implements IXmlReader
 {
 	private static final Logger LOGGER = Logger.getLogger(ExtendDropData.class.getName());
 	private final Map<Integer, ExtendDropDataHolder> _extendDrop = new HashMap<>();
diff --git a/L2J_Mobius_5.0_Salvation/java/com/l2jmobius/gameserver/data/xml/impl/FakePlayerData.java b/L2J_Mobius_5.0_Salvation/java/com/l2jmobius/gameserver/data/xml/impl/FakePlayerData.java
index afb92c06d5..74b7957fd9 100644
--- a/L2J_Mobius_5.0_Salvation/java/com/l2jmobius/gameserver/data/xml/impl/FakePlayerData.java
+++ b/L2J_Mobius_5.0_Salvation/java/com/l2jmobius/gameserver/data/xml/impl/FakePlayerData.java
@@ -26,7 +26,7 @@ import java.util.logging.Logger;
 import org.w3c.dom.Document;
 
 import com.l2jmobius.Config;
-import com.l2jmobius.commons.util.IGameXmlReader;
+import com.l2jmobius.commons.util.IXmlReader;
 import com.l2jmobius.gameserver.data.sql.impl.CharNameTable;
 import com.l2jmobius.gameserver.model.StatsSet;
 import com.l2jmobius.gameserver.model.actor.templates.NpcTemplate;
@@ -35,7 +35,7 @@ import com.l2jmobius.gameserver.model.holders.FakePlayerHolder;
 /**
  * @author Mobius
  */
-public class FakePlayerData implements IGameXmlReader
+public class FakePlayerData implements IXmlReader
 {
 	private static Logger LOGGER = Logger.getLogger(FakePlayerData.class.getName());
 	
diff --git a/L2J_Mobius_5.0_Salvation/java/com/l2jmobius/gameserver/data/xml/impl/FenceData.java b/L2J_Mobius_5.0_Salvation/java/com/l2jmobius/gameserver/data/xml/impl/FenceData.java
index f51175e5fa..d36ab2e16b 100644
--- a/L2J_Mobius_5.0_Salvation/java/com/l2jmobius/gameserver/data/xml/impl/FenceData.java
+++ b/L2J_Mobius_5.0_Salvation/java/com/l2jmobius/gameserver/data/xml/impl/FenceData.java
@@ -28,7 +28,7 @@ import java.util.logging.Logger;
 import org.w3c.dom.Document;
 import org.w3c.dom.Node;
 
-import com.l2jmobius.commons.util.IGameXmlReader;
+import com.l2jmobius.commons.util.IXmlReader;
 import com.l2jmobius.gameserver.enums.FenceState;
 import com.l2jmobius.gameserver.model.StatsSet;
 import com.l2jmobius.gameserver.model.World;
@@ -39,7 +39,7 @@ import com.l2jmobius.gameserver.model.instancezone.Instance;
 /**
  * @author HoridoJoho / FBIagent
  */
-public final class FenceData implements IGameXmlReader
+public final class FenceData implements IXmlReader
 {
 	private static final Logger LOGGER = Logger.getLogger(FenceData.class.getSimpleName());
 	
diff --git a/L2J_Mobius_5.0_Salvation/java/com/l2jmobius/gameserver/data/xml/impl/FishingData.java b/L2J_Mobius_5.0_Salvation/java/com/l2jmobius/gameserver/data/xml/impl/FishingData.java
index bacf1ed08c..16436a2f5c 100644
--- a/L2J_Mobius_5.0_Salvation/java/com/l2jmobius/gameserver/data/xml/impl/FishingData.java
+++ b/L2J_Mobius_5.0_Salvation/java/com/l2jmobius/gameserver/data/xml/impl/FishingData.java
@@ -26,7 +26,7 @@ import org.w3c.dom.NamedNodeMap;
 import org.w3c.dom.Node;
 
 import com.l2jmobius.Config;
-import com.l2jmobius.commons.util.IGameXmlReader;
+import com.l2jmobius.commons.util.IXmlReader;
 import com.l2jmobius.gameserver.datatables.ItemTable;
 import com.l2jmobius.gameserver.model.fishing.FishingBait;
 import com.l2jmobius.gameserver.model.fishing.FishingCatch;
@@ -36,7 +36,7 @@ import com.l2jmobius.gameserver.model.fishing.FishingRod;
  * This class holds the Fishing information.
  * @author bit
  */
-public final class FishingData implements IGameXmlReader
+public final class FishingData implements IXmlReader
 {
 	private static final Logger LOGGER = Logger.getLogger(FishingData.class.getName());
 	private final Map<Integer, FishingBait> _baitData = new HashMap<>();
diff --git a/L2J_Mobius_5.0_Salvation/java/com/l2jmobius/gameserver/data/xml/impl/HennaData.java b/L2J_Mobius_5.0_Salvation/java/com/l2jmobius/gameserver/data/xml/impl/HennaData.java
index e27e186193..d3ac163f3c 100644
--- a/L2J_Mobius_5.0_Salvation/java/com/l2jmobius/gameserver/data/xml/impl/HennaData.java
+++ b/L2J_Mobius_5.0_Salvation/java/com/l2jmobius/gameserver/data/xml/impl/HennaData.java
@@ -27,7 +27,7 @@ import org.w3c.dom.Document;
 import org.w3c.dom.NamedNodeMap;
 import org.w3c.dom.Node;
 
-import com.l2jmobius.commons.util.IGameXmlReader;
+import com.l2jmobius.commons.util.IXmlReader;
 import com.l2jmobius.gameserver.model.StatsSet;
 import com.l2jmobius.gameserver.model.base.ClassId;
 import com.l2jmobius.gameserver.model.items.Henna;
@@ -40,7 +40,7 @@ import com.l2jmobius.gameserver.model.skills.Skill;
  * Allowed classes to wear each henna.
  * @author Zoey76, Mobius
  */
-public final class HennaData implements IGameXmlReader
+public final class HennaData implements IXmlReader
 {
 	private static final Logger LOGGER = Logger.getLogger(HennaData.class.getName());
 	
diff --git a/L2J_Mobius_5.0_Salvation/java/com/l2jmobius/gameserver/data/xml/impl/HitConditionBonusData.java b/L2J_Mobius_5.0_Salvation/java/com/l2jmobius/gameserver/data/xml/impl/HitConditionBonusData.java
index e9f2f9a87d..2d6ccf0467 100644
--- a/L2J_Mobius_5.0_Salvation/java/com/l2jmobius/gameserver/data/xml/impl/HitConditionBonusData.java
+++ b/L2J_Mobius_5.0_Salvation/java/com/l2jmobius/gameserver/data/xml/impl/HitConditionBonusData.java
@@ -23,7 +23,7 @@ import org.w3c.dom.Document;
 import org.w3c.dom.NamedNodeMap;
 import org.w3c.dom.Node;
 
-import com.l2jmobius.commons.util.IGameXmlReader;
+import com.l2jmobius.commons.util.IXmlReader;
 import com.l2jmobius.gameserver.GameTimeController;
 import com.l2jmobius.gameserver.enums.Position;
 import com.l2jmobius.gameserver.model.actor.Creature;
@@ -32,7 +32,7 @@ import com.l2jmobius.gameserver.model.actor.Creature;
  * This class load, holds and calculates the hit condition bonuses.
  * @author Nik
  */
-public final class HitConditionBonusData implements IGameXmlReader
+public final class HitConditionBonusData implements IXmlReader
 {
 	private static final Logger LOGGER = Logger.getLogger(HitConditionBonusData.class.getName());
 	
diff --git a/L2J_Mobius_5.0_Salvation/java/com/l2jmobius/gameserver/data/xml/impl/InitialEquipmentData.java b/L2J_Mobius_5.0_Salvation/java/com/l2jmobius/gameserver/data/xml/impl/InitialEquipmentData.java
index 247ea4b46d..275a23f28f 100644
--- a/L2J_Mobius_5.0_Salvation/java/com/l2jmobius/gameserver/data/xml/impl/InitialEquipmentData.java
+++ b/L2J_Mobius_5.0_Salvation/java/com/l2jmobius/gameserver/data/xml/impl/InitialEquipmentData.java
@@ -28,7 +28,7 @@ import org.w3c.dom.NamedNodeMap;
 import org.w3c.dom.Node;
 
 import com.l2jmobius.Config;
-import com.l2jmobius.commons.util.IGameXmlReader;
+import com.l2jmobius.commons.util.IXmlReader;
 import com.l2jmobius.gameserver.model.StatsSet;
 import com.l2jmobius.gameserver.model.base.ClassId;
 import com.l2jmobius.gameserver.model.items.PlayerItemTemplate;
@@ -38,7 +38,7 @@ import com.l2jmobius.gameserver.model.items.PlayerItemTemplate;
  * What items get each newly created character and if this item is equipped upon creation (<b>Requires the item to be equippable</b>).
  * @author Zoey76
  */
-public final class InitialEquipmentData implements IGameXmlReader
+public final class InitialEquipmentData implements IXmlReader
 {
 	private static final Logger LOGGER = Logger.getLogger(InitialEquipmentData.class.getName());
 	
diff --git a/L2J_Mobius_5.0_Salvation/java/com/l2jmobius/gameserver/data/xml/impl/InitialShortcutData.java b/L2J_Mobius_5.0_Salvation/java/com/l2jmobius/gameserver/data/xml/impl/InitialShortcutData.java
index 5f886bafa8..3b9e976607 100644
--- a/L2J_Mobius_5.0_Salvation/java/com/l2jmobius/gameserver/data/xml/impl/InitialShortcutData.java
+++ b/L2J_Mobius_5.0_Salvation/java/com/l2jmobius/gameserver/data/xml/impl/InitialShortcutData.java
@@ -27,7 +27,7 @@ import org.w3c.dom.Document;
 import org.w3c.dom.NamedNodeMap;
 import org.w3c.dom.Node;
 
-import com.l2jmobius.commons.util.IGameXmlReader;
+import com.l2jmobius.commons.util.IXmlReader;
 import com.l2jmobius.gameserver.enums.MacroType;
 import com.l2jmobius.gameserver.enums.ShortcutType;
 import com.l2jmobius.gameserver.model.Macro;
@@ -43,7 +43,7 @@ import com.l2jmobius.gameserver.network.serverpackets.ShortCutRegister;
  * What shortcuts get each newly created character.
  * @author Zoey76
  */
-public final class InitialShortcutData implements IGameXmlReader
+public final class InitialShortcutData implements IXmlReader
 {
 	private static final Logger LOGGER = Logger.getLogger(InitialShortcutData.class.getName());
 	
diff --git a/L2J_Mobius_5.0_Salvation/java/com/l2jmobius/gameserver/data/xml/impl/ItemCrystallizationData.java b/L2J_Mobius_5.0_Salvation/java/com/l2jmobius/gameserver/data/xml/impl/ItemCrystallizationData.java
index 86454b2b71..aa7742afa1 100644
--- a/L2J_Mobius_5.0_Salvation/java/com/l2jmobius/gameserver/data/xml/impl/ItemCrystallizationData.java
+++ b/L2J_Mobius_5.0_Salvation/java/com/l2jmobius/gameserver/data/xml/impl/ItemCrystallizationData.java
@@ -28,7 +28,7 @@ import org.w3c.dom.Document;
 import org.w3c.dom.NamedNodeMap;
 import org.w3c.dom.Node;
 
-import com.l2jmobius.commons.util.IGameXmlReader;
+import com.l2jmobius.commons.util.IXmlReader;
 import com.l2jmobius.gameserver.datatables.ItemTable;
 import com.l2jmobius.gameserver.enums.CrystallizationType;
 import com.l2jmobius.gameserver.model.holders.CrystallizationDataHolder;
@@ -42,7 +42,7 @@ import com.l2jmobius.gameserver.model.items.type.CrystalType;
 /**
  * @author UnAfraid
  */
-public final class ItemCrystallizationData implements IGameXmlReader
+public final class ItemCrystallizationData implements IXmlReader
 {
 	private static final Logger LOGGER = Logger.getLogger(ItemCrystallizationData.class.getName());
 	
diff --git a/L2J_Mobius_5.0_Salvation/java/com/l2jmobius/gameserver/data/xml/impl/KarmaData.java b/L2J_Mobius_5.0_Salvation/java/com/l2jmobius/gameserver/data/xml/impl/KarmaData.java
index ca826eba2e..bd68c38748 100644
--- a/L2J_Mobius_5.0_Salvation/java/com/l2jmobius/gameserver/data/xml/impl/KarmaData.java
+++ b/L2J_Mobius_5.0_Salvation/java/com/l2jmobius/gameserver/data/xml/impl/KarmaData.java
@@ -26,12 +26,12 @@ import org.w3c.dom.NamedNodeMap;
 import org.w3c.dom.Node;
 
 import com.l2jmobius.Config;
-import com.l2jmobius.commons.util.IGameXmlReader;
+import com.l2jmobius.commons.util.IXmlReader;
 
 /**
  * @author UnAfraid
  */
-public class KarmaData implements IGameXmlReader
+public class KarmaData implements IXmlReader
 {
 	private static final Logger LOGGER = Logger.getLogger(KarmaData.class.getName());
 	
diff --git a/L2J_Mobius_5.0_Salvation/java/com/l2jmobius/gameserver/data/xml/impl/LuckyGameData.java b/L2J_Mobius_5.0_Salvation/java/com/l2jmobius/gameserver/data/xml/impl/LuckyGameData.java
index 6759bfec3f..41c0d0fc31 100644
--- a/L2J_Mobius_5.0_Salvation/java/com/l2jmobius/gameserver/data/xml/impl/LuckyGameData.java
+++ b/L2J_Mobius_5.0_Salvation/java/com/l2jmobius/gameserver/data/xml/impl/LuckyGameData.java
@@ -23,7 +23,7 @@ import java.util.concurrent.atomic.AtomicInteger;
 
 import org.w3c.dom.Document;
 
-import com.l2jmobius.commons.util.IGameXmlReader;
+import com.l2jmobius.commons.util.IXmlReader;
 import com.l2jmobius.gameserver.model.StatsSet;
 import com.l2jmobius.gameserver.model.holders.ItemChanceHolder;
 import com.l2jmobius.gameserver.model.holders.ItemPointHolder;
@@ -32,7 +32,7 @@ import com.l2jmobius.gameserver.model.holders.LuckyGameDataHolder;
 /**
  * @author Sdw
  */
-public class LuckyGameData implements IGameXmlReader
+public class LuckyGameData implements IXmlReader
 {
 	private final Map<Integer, LuckyGameDataHolder> _luckyGame = new HashMap<>();
 	private final AtomicInteger _serverPlay = new AtomicInteger();
diff --git a/L2J_Mobius_5.0_Salvation/java/com/l2jmobius/gameserver/data/xml/impl/MonsterBookData.java b/L2J_Mobius_5.0_Salvation/java/com/l2jmobius/gameserver/data/xml/impl/MonsterBookData.java
index 50f2faefd5..9c69fe71fb 100644
--- a/L2J_Mobius_5.0_Salvation/java/com/l2jmobius/gameserver/data/xml/impl/MonsterBookData.java
+++ b/L2J_Mobius_5.0_Salvation/java/com/l2jmobius/gameserver/data/xml/impl/MonsterBookData.java
@@ -25,7 +25,7 @@ import org.w3c.dom.Document;
 import org.w3c.dom.NamedNodeMap;
 import org.w3c.dom.Node;
 
-import com.l2jmobius.commons.util.IGameXmlReader;
+import com.l2jmobius.commons.util.IXmlReader;
 import com.l2jmobius.gameserver.enums.Faction;
 import com.l2jmobius.gameserver.model.holders.MonsterBookCardHolder;
 import com.l2jmobius.gameserver.model.holders.MonsterBookRewardHolder;
@@ -33,7 +33,7 @@ import com.l2jmobius.gameserver.model.holders.MonsterBookRewardHolder;
 /**
  * @author Mobius
  */
-public class MonsterBookData implements IGameXmlReader
+public class MonsterBookData implements IXmlReader
 {
 	private static final Logger LOGGER = Logger.getLogger(MonsterBookData.class.getName());
 	private final List<MonsterBookCardHolder> _monsterBook = new ArrayList<>();
diff --git a/L2J_Mobius_5.0_Salvation/java/com/l2jmobius/gameserver/data/xml/impl/MultisellData.java b/L2J_Mobius_5.0_Salvation/java/com/l2jmobius/gameserver/data/xml/impl/MultisellData.java
index 796cd9b6f1..e9c494b91e 100644
--- a/L2J_Mobius_5.0_Salvation/java/com/l2jmobius/gameserver/data/xml/impl/MultisellData.java
+++ b/L2J_Mobius_5.0_Salvation/java/com/l2jmobius/gameserver/data/xml/impl/MultisellData.java
@@ -19,11 +19,11 @@ package com.l2jmobius.gameserver.data.xml.impl;
 import java.io.File;
 import java.io.FileFilter;
 import java.util.ArrayList;
-import java.util.HashMap;
 import java.util.HashSet;
 import java.util.List;
 import java.util.Map;
 import java.util.Set;
+import java.util.concurrent.ConcurrentHashMap;
 import java.util.logging.Level;
 import java.util.logging.Logger;
 
@@ -31,7 +31,7 @@ import org.w3c.dom.Document;
 import org.w3c.dom.Node;
 
 import com.l2jmobius.Config;
-import com.l2jmobius.commons.util.IGameXmlReader;
+import com.l2jmobius.commons.util.IXmlReader;
 import com.l2jmobius.commons.util.file.filter.NumericNameFilter;
 import com.l2jmobius.gameserver.datatables.ItemTable;
 import com.l2jmobius.gameserver.enums.SpecialItemType;
@@ -46,14 +46,14 @@ import com.l2jmobius.gameserver.model.holders.PreparedMultisellListHolder;
 import com.l2jmobius.gameserver.model.items.Item;
 import com.l2jmobius.gameserver.network.serverpackets.MultiSellList;
 
-public final class MultisellData implements IGameXmlReader
+public final class MultisellData implements IXmlReader
 {
 	private static final Logger LOGGER = Logger.getLogger(MultisellData.class.getName());
 	
 	public static final int PAGE_SIZE = 40;
 	private static final FileFilter NUMERIC_FILTER = new NumericNameFilter();
 	
-	private final Map<Integer, MultisellListHolder> _multisells = new HashMap<>();
+	private final Map<Integer, MultisellListHolder> _multisells = new ConcurrentHashMap<>();
 	
 	protected MultisellData()
 	{
diff --git a/L2J_Mobius_5.0_Salvation/java/com/l2jmobius/gameserver/data/xml/impl/NpcData.java b/L2J_Mobius_5.0_Salvation/java/com/l2jmobius/gameserver/data/xml/impl/NpcData.java
index e43e5c5147..3e1adcb420 100644
--- a/L2J_Mobius_5.0_Salvation/java/com/l2jmobius/gameserver/data/xml/impl/NpcData.java
+++ b/L2J_Mobius_5.0_Salvation/java/com/l2jmobius/gameserver/data/xml/impl/NpcData.java
@@ -26,6 +26,8 @@ import java.util.List;
 import java.util.Map;
 import java.util.Map.Entry;
 import java.util.Set;
+import java.util.concurrent.ConcurrentHashMap;
+import java.util.concurrent.CopyOnWriteArrayList;
 import java.util.function.Predicate;
 import java.util.logging.Logger;
 import java.util.stream.Collectors;
@@ -36,7 +38,7 @@ import org.w3c.dom.Node;
 
 import com.l2jmobius.Config;
 import com.l2jmobius.commons.util.CommonUtil;
-import com.l2jmobius.commons.util.IGameXmlReader;
+import com.l2jmobius.commons.util.IXmlReader;
 import com.l2jmobius.gameserver.datatables.ItemTable;
 import com.l2jmobius.gameserver.enums.AISkillScope;
 import com.l2jmobius.gameserver.enums.DropType;
@@ -52,13 +54,13 @@ import com.l2jmobius.gameserver.model.skills.Skill;
  * NPC data parser.
  * @author NosBit
  */
-public class NpcData implements IGameXmlReader
+public class NpcData implements IXmlReader
 {
 	protected static final Logger LOGGER = Logger.getLogger(NpcData.class.getName());
 	
-	private final Map<Integer, NpcTemplate> _npcs = new HashMap<>();
-	private final Map<String, Integer> _clans = new HashMap<>();
-	private static final List<Integer> _masterMonsterIDs = new ArrayList<>();
+	private final Map<Integer, NpcTemplate> _npcs = new ConcurrentHashMap<>();
+	private final Map<String, Integer> _clans = new ConcurrentHashMap<>();
+	private static final List<Integer> _masterMonsterIDs = new CopyOnWriteArrayList<>();
 	
 	protected NpcData()
 	{
diff --git a/L2J_Mobius_5.0_Salvation/java/com/l2jmobius/gameserver/data/xml/impl/OptionData.java b/L2J_Mobius_5.0_Salvation/java/com/l2jmobius/gameserver/data/xml/impl/OptionData.java
index bffa2b107c..424e2b27ad 100644
--- a/L2J_Mobius_5.0_Salvation/java/com/l2jmobius/gameserver/data/xml/impl/OptionData.java
+++ b/L2J_Mobius_5.0_Salvation/java/com/l2jmobius/gameserver/data/xml/impl/OptionData.java
@@ -18,13 +18,12 @@ package com.l2jmobius.gameserver.data.xml.impl;
 
 import java.io.File;
 import java.util.Collections;
-import java.util.HashMap;
 import java.util.Map;
+import java.util.concurrent.ConcurrentHashMap;
 import java.util.logging.Logger;
 
 import org.w3c.dom.Document;
 
-import com.l2jmobius.commons.util.IGameXmlReader;
 import com.l2jmobius.commons.util.IXmlReader;
 import com.l2jmobius.gameserver.handler.EffectHandler;
 import com.l2jmobius.gameserver.model.StatsSet;
@@ -36,11 +35,11 @@ import com.l2jmobius.gameserver.model.options.OptionsSkillType;
 /**
  * @author UnAfraid
  */
-public class OptionData implements IGameXmlReader
+public class OptionData implements IXmlReader
 {
 	private static final Logger LOGGER = Logger.getLogger(OptionData.class.getName());
 	
-	private final Map<Integer, Options> _optionData = new HashMap<>();
+	private final Map<Integer, Options> _optionData = new ConcurrentHashMap<>();
 	
 	protected OptionData()
 	{
diff --git a/L2J_Mobius_5.0_Salvation/java/com/l2jmobius/gameserver/data/xml/impl/PetDataTable.java b/L2J_Mobius_5.0_Salvation/java/com/l2jmobius/gameserver/data/xml/impl/PetDataTable.java
index 65afb75d7d..aa6975cd72 100644
--- a/L2J_Mobius_5.0_Salvation/java/com/l2jmobius/gameserver/data/xml/impl/PetDataTable.java
+++ b/L2J_Mobius_5.0_Salvation/java/com/l2jmobius/gameserver/data/xml/impl/PetDataTable.java
@@ -17,15 +17,15 @@
 package com.l2jmobius.gameserver.data.xml.impl;
 
 import java.io.File;
-import java.util.HashMap;
 import java.util.Map;
+import java.util.concurrent.ConcurrentHashMap;
 import java.util.logging.Logger;
 
 import org.w3c.dom.Document;
 import org.w3c.dom.NamedNodeMap;
 import org.w3c.dom.Node;
 
-import com.l2jmobius.commons.util.IGameXmlReader;
+import com.l2jmobius.commons.util.IXmlReader;
 import com.l2jmobius.gameserver.enums.MountType;
 import com.l2jmobius.gameserver.model.PetData;
 import com.l2jmobius.gameserver.model.PetLevelData;
@@ -36,11 +36,11 @@ import com.l2jmobius.gameserver.model.StatsSet;
  * TODO: load and use all pet parameters.
  * @author Zoey76 (rework)
  */
-public final class PetDataTable implements IGameXmlReader
+public final class PetDataTable implements IXmlReader
 {
 	private static final Logger LOGGER = Logger.getLogger(PetDataTable.class.getName());
 	
-	private final Map<Integer, PetData> _pets = new HashMap<>();
+	private final Map<Integer, PetData> _pets = new ConcurrentHashMap<>();
 	
 	/**
 	 * Instantiates a new pet data table.
diff --git a/L2J_Mobius_5.0_Salvation/java/com/l2jmobius/gameserver/data/xml/impl/PetSkillData.java b/L2J_Mobius_5.0_Salvation/java/com/l2jmobius/gameserver/data/xml/impl/PetSkillData.java
index 4872dde773..5b2f9a4408 100644
--- a/L2J_Mobius_5.0_Salvation/java/com/l2jmobius/gameserver/data/xml/impl/PetSkillData.java
+++ b/L2J_Mobius_5.0_Salvation/java/com/l2jmobius/gameserver/data/xml/impl/PetSkillData.java
@@ -27,14 +27,14 @@ import org.w3c.dom.Document;
 import org.w3c.dom.NamedNodeMap;
 import org.w3c.dom.Node;
 
-import com.l2jmobius.commons.util.IGameXmlReader;
+import com.l2jmobius.commons.util.IXmlReader;
 import com.l2jmobius.gameserver.model.actor.Summon;
 import com.l2jmobius.gameserver.model.holders.SkillHolder;
 
 /**
  * @author Mobius
  */
-public class PetSkillData implements IGameXmlReader
+public class PetSkillData implements IXmlReader
 {
 	private static Logger LOGGER = Logger.getLogger(PetSkillData.class.getName());
 	private final Map<Integer, Map<Long, SkillHolder>> _skillTrees = new HashMap<>();
diff --git a/L2J_Mobius_5.0_Salvation/java/com/l2jmobius/gameserver/data/xml/impl/PlayerTemplateData.java b/L2J_Mobius_5.0_Salvation/java/com/l2jmobius/gameserver/data/xml/impl/PlayerTemplateData.java
index 031fab8027..7a7c230b72 100644
--- a/L2J_Mobius_5.0_Salvation/java/com/l2jmobius/gameserver/data/xml/impl/PlayerTemplateData.java
+++ b/L2J_Mobius_5.0_Salvation/java/com/l2jmobius/gameserver/data/xml/impl/PlayerTemplateData.java
@@ -18,9 +18,9 @@ package com.l2jmobius.gameserver.data.xml.impl;
 
 import java.io.File;
 import java.util.ArrayList;
-import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
+import java.util.concurrent.ConcurrentHashMap;
 import java.util.logging.Logger;
 
 import org.w3c.dom.Document;
@@ -28,7 +28,7 @@ import org.w3c.dom.NamedNodeMap;
 import org.w3c.dom.Node;
 
 import com.l2jmobius.Config;
-import com.l2jmobius.commons.util.IGameXmlReader;
+import com.l2jmobius.commons.util.IXmlReader;
 import com.l2jmobius.gameserver.model.Location;
 import com.l2jmobius.gameserver.model.StatsSet;
 import com.l2jmobius.gameserver.model.actor.templates.PlayerTemplate;
@@ -38,11 +38,11 @@ import com.l2jmobius.gameserver.model.base.ClassId;
  * Loads player's base stats.
  * @author Forsaiken, Zoey76, GKR
  */
-public final class PlayerTemplateData implements IGameXmlReader
+public final class PlayerTemplateData implements IXmlReader
 {
 	private static final Logger LOGGER = Logger.getLogger(PlayerTemplateData.class.getName());
 	
-	private final Map<ClassId, PlayerTemplate> _playerTemplates = new HashMap<>();
+	private final Map<ClassId, PlayerTemplate> _playerTemplates = new ConcurrentHashMap<>();
 	
 	private int _dataCount = 0;
 	private int _autoGeneratedCount = 0;
diff --git a/L2J_Mobius_5.0_Salvation/java/com/l2jmobius/gameserver/data/xml/impl/PlayerXpPercentLostData.java b/L2J_Mobius_5.0_Salvation/java/com/l2jmobius/gameserver/data/xml/impl/PlayerXpPercentLostData.java
index 2b867a18e4..816cb7aacf 100644
--- a/L2J_Mobius_5.0_Salvation/java/com/l2jmobius/gameserver/data/xml/impl/PlayerXpPercentLostData.java
+++ b/L2J_Mobius_5.0_Salvation/java/com/l2jmobius/gameserver/data/xml/impl/PlayerXpPercentLostData.java
@@ -24,13 +24,13 @@ import org.w3c.dom.Document;
 import org.w3c.dom.NamedNodeMap;
 import org.w3c.dom.Node;
 
-import com.l2jmobius.commons.util.IGameXmlReader;
+import com.l2jmobius.commons.util.IXmlReader;
 
 /**
  * This class holds the Player Xp Percent Lost Data for each level for players.
  * @author Zealar
  */
-public final class PlayerXpPercentLostData implements IGameXmlReader
+public final class PlayerXpPercentLostData implements IXmlReader
 {
 	private static final Logger LOGGER = Logger.getLogger(PlayerXpPercentLostData.class.getName());
 	
diff --git a/L2J_Mobius_5.0_Salvation/java/com/l2jmobius/gameserver/data/xml/impl/PrimeShopData.java b/L2J_Mobius_5.0_Salvation/java/com/l2jmobius/gameserver/data/xml/impl/PrimeShopData.java
index 82ddd51f26..650d156194 100644
--- a/L2J_Mobius_5.0_Salvation/java/com/l2jmobius/gameserver/data/xml/impl/PrimeShopData.java
+++ b/L2J_Mobius_5.0_Salvation/java/com/l2jmobius/gameserver/data/xml/impl/PrimeShopData.java
@@ -27,7 +27,7 @@ import org.w3c.dom.Document;
 import org.w3c.dom.NamedNodeMap;
 import org.w3c.dom.Node;
 
-import com.l2jmobius.commons.util.IGameXmlReader;
+import com.l2jmobius.commons.util.IXmlReader;
 import com.l2jmobius.gameserver.datatables.ItemTable;
 import com.l2jmobius.gameserver.model.StatsSet;
 import com.l2jmobius.gameserver.model.actor.instance.PlayerInstance;
@@ -39,7 +39,7 @@ import com.l2jmobius.gameserver.network.serverpackets.primeshop.ExBRProductInfo;
 /**
  * @author Gnacik, UnAfraid
  */
-public class PrimeShopData implements IGameXmlReader
+public class PrimeShopData implements IXmlReader
 {
 	private static final Logger LOGGER = Logger.getLogger(PrimeShopData.class.getName());
 	
diff --git a/L2J_Mobius_5.0_Salvation/java/com/l2jmobius/gameserver/data/xml/impl/RecipeData.java b/L2J_Mobius_5.0_Salvation/java/com/l2jmobius/gameserver/data/xml/impl/RecipeData.java
index 80d9297e84..04794cd354 100644
--- a/L2J_Mobius_5.0_Salvation/java/com/l2jmobius/gameserver/data/xml/impl/RecipeData.java
+++ b/L2J_Mobius_5.0_Salvation/java/com/l2jmobius/gameserver/data/xml/impl/RecipeData.java
@@ -29,7 +29,7 @@ import org.w3c.dom.Document;
 import org.w3c.dom.NamedNodeMap;
 import org.w3c.dom.Node;
 
-import com.l2jmobius.commons.util.IGameXmlReader;
+import com.l2jmobius.commons.util.IXmlReader;
 import com.l2jmobius.gameserver.enums.StatusUpdateType;
 import com.l2jmobius.gameserver.model.StatsSet;
 import com.l2jmobius.gameserver.model.holders.ItemChanceHolder;
@@ -39,7 +39,7 @@ import com.l2jmobius.gameserver.model.holders.RecipeHolder;
 /**
  * @author Nik
  */
-public class RecipeData implements IGameXmlReader
+public class RecipeData implements IXmlReader
 {
 	private static final Logger LOGGER = Logger.getLogger(RecipeData.class.getName());
 	
diff --git a/L2J_Mobius_5.0_Salvation/java/com/l2jmobius/gameserver/data/xml/impl/ResidenceFunctionsData.java b/L2J_Mobius_5.0_Salvation/java/com/l2jmobius/gameserver/data/xml/impl/ResidenceFunctionsData.java
index 66951e9e59..094ef13149 100644
--- a/L2J_Mobius_5.0_Salvation/java/com/l2jmobius/gameserver/data/xml/impl/ResidenceFunctionsData.java
+++ b/L2J_Mobius_5.0_Salvation/java/com/l2jmobius/gameserver/data/xml/impl/ResidenceFunctionsData.java
@@ -28,7 +28,7 @@ import org.w3c.dom.Document;
 import org.w3c.dom.NamedNodeMap;
 import org.w3c.dom.Node;
 
-import com.l2jmobius.commons.util.IGameXmlReader;
+import com.l2jmobius.commons.util.IXmlReader;
 import com.l2jmobius.gameserver.model.StatsSet;
 import com.l2jmobius.gameserver.model.residences.ResidenceFunctionTemplate;
 
@@ -36,7 +36,7 @@ import com.l2jmobius.gameserver.model.residences.ResidenceFunctionTemplate;
  * The residence functions data
  * @author UnAfraid
  */
-public final class ResidenceFunctionsData implements IGameXmlReader
+public final class ResidenceFunctionsData implements IXmlReader
 {
 	private static final Logger LOGGER = Logger.getLogger(ResidenceFunctionsData.class.getName());
 	private final Map<Integer, List<ResidenceFunctionTemplate>> _functions = new HashMap<>();
diff --git a/L2J_Mobius_5.0_Salvation/java/com/l2jmobius/gameserver/data/xml/impl/SayuneData.java b/L2J_Mobius_5.0_Salvation/java/com/l2jmobius/gameserver/data/xml/impl/SayuneData.java
index 835bd96930..13b4d33b1e 100644
--- a/L2J_Mobius_5.0_Salvation/java/com/l2jmobius/gameserver/data/xml/impl/SayuneData.java
+++ b/L2J_Mobius_5.0_Salvation/java/com/l2jmobius/gameserver/data/xml/impl/SayuneData.java
@@ -26,13 +26,13 @@ import org.w3c.dom.Document;
 import org.w3c.dom.NamedNodeMap;
 import org.w3c.dom.Node;
 
-import com.l2jmobius.commons.util.IGameXmlReader;
+import com.l2jmobius.commons.util.IXmlReader;
 import com.l2jmobius.gameserver.model.SayuneEntry;
 
 /**
  * @author UnAfraid
  */
-public class SayuneData implements IGameXmlReader
+public class SayuneData implements IXmlReader
 {
 	private static final Logger LOGGER = Logger.getLogger(SayuneData.class.getName());
 	
diff --git a/L2J_Mobius_5.0_Salvation/java/com/l2jmobius/gameserver/data/xml/impl/SecondaryAuthData.java b/L2J_Mobius_5.0_Salvation/java/com/l2jmobius/gameserver/data/xml/impl/SecondaryAuthData.java
index c0ebd36146..ca85056b10 100644
--- a/L2J_Mobius_5.0_Salvation/java/com/l2jmobius/gameserver/data/xml/impl/SecondaryAuthData.java
+++ b/L2J_Mobius_5.0_Salvation/java/com/l2jmobius/gameserver/data/xml/impl/SecondaryAuthData.java
@@ -25,12 +25,12 @@ import java.util.logging.Logger;
 import org.w3c.dom.Document;
 import org.w3c.dom.Node;
 
-import com.l2jmobius.commons.util.IGameXmlReader;
+import com.l2jmobius.commons.util.IXmlReader;
 
 /**
  * @author NosBit
  */
-public class SecondaryAuthData implements IGameXmlReader
+public class SecondaryAuthData implements IXmlReader
 {
 	private static final Logger LOGGER = Logger.getLogger(SecondaryAuthData.class.getName());
 	
diff --git a/L2J_Mobius_5.0_Salvation/java/com/l2jmobius/gameserver/data/xml/impl/ShuttleData.java b/L2J_Mobius_5.0_Salvation/java/com/l2jmobius/gameserver/data/xml/impl/ShuttleData.java
index 9454d24d6b..ff26f4f409 100644
--- a/L2J_Mobius_5.0_Salvation/java/com/l2jmobius/gameserver/data/xml/impl/ShuttleData.java
+++ b/L2J_Mobius_5.0_Salvation/java/com/l2jmobius/gameserver/data/xml/impl/ShuttleData.java
@@ -27,7 +27,7 @@ import org.w3c.dom.Document;
 import org.w3c.dom.NamedNodeMap;
 import org.w3c.dom.Node;
 
-import com.l2jmobius.commons.util.IGameXmlReader;
+import com.l2jmobius.commons.util.IXmlReader;
 import com.l2jmobius.gameserver.model.Location;
 import com.l2jmobius.gameserver.model.StatsSet;
 import com.l2jmobius.gameserver.model.VehiclePathPoint;
@@ -40,7 +40,7 @@ import com.l2jmobius.gameserver.model.shuttle.ShuttleStop;
 /**
  * @author UnAfraid
  */
-public final class ShuttleData implements IGameXmlReader
+public final class ShuttleData implements IXmlReader
 {
 	private static final Logger LOGGER = Logger.getLogger(ShuttleData.class.getName());
 	
diff --git a/L2J_Mobius_5.0_Salvation/java/com/l2jmobius/gameserver/data/xml/impl/SiegeScheduleData.java b/L2J_Mobius_5.0_Salvation/java/com/l2jmobius/gameserver/data/xml/impl/SiegeScheduleData.java
index 265bf7c528..6bff09010b 100644
--- a/L2J_Mobius_5.0_Salvation/java/com/l2jmobius/gameserver/data/xml/impl/SiegeScheduleData.java
+++ b/L2J_Mobius_5.0_Salvation/java/com/l2jmobius/gameserver/data/xml/impl/SiegeScheduleData.java
@@ -27,7 +27,7 @@ import org.w3c.dom.Document;
 import org.w3c.dom.NamedNodeMap;
 import org.w3c.dom.Node;
 
-import com.l2jmobius.commons.util.IGameXmlReader;
+import com.l2jmobius.commons.util.IXmlReader;
 import com.l2jmobius.gameserver.model.SiegeScheduleDate;
 import com.l2jmobius.gameserver.model.StatsSet;
 import com.l2jmobius.gameserver.util.Util;
@@ -35,7 +35,7 @@ import com.l2jmobius.gameserver.util.Util;
 /**
  * @author UnAfraid
  */
-public class SiegeScheduleData implements IGameXmlReader
+public class SiegeScheduleData implements IXmlReader
 {
 	private static final Logger LOGGER = Logger.getLogger(SiegeScheduleData.class.getName());
 	
diff --git a/L2J_Mobius_5.0_Salvation/java/com/l2jmobius/gameserver/data/xml/impl/SkillData.java b/L2J_Mobius_5.0_Salvation/java/com/l2jmobius/gameserver/data/xml/impl/SkillData.java
index 7a1ae2e15b..64900d4d45 100644
--- a/L2J_Mobius_5.0_Salvation/java/com/l2jmobius/gameserver/data/xml/impl/SkillData.java
+++ b/L2J_Mobius_5.0_Salvation/java/com/l2jmobius/gameserver/data/xml/impl/SkillData.java
@@ -25,6 +25,7 @@ import java.util.List;
 import java.util.Map;
 import java.util.Optional;
 import java.util.Set;
+import java.util.concurrent.ConcurrentHashMap;
 import java.util.function.BiConsumer;
 import java.util.function.Function;
 import java.util.logging.Level;
@@ -35,7 +36,7 @@ import org.w3c.dom.Document;
 import org.w3c.dom.NamedNodeMap;
 import org.w3c.dom.Node;
 
-import com.l2jmobius.commons.util.IGameXmlReader;
+import com.l2jmobius.commons.util.IXmlReader;
 import com.l2jmobius.gameserver.handler.EffectHandler;
 import com.l2jmobius.gameserver.handler.SkillConditionHandler;
 import com.l2jmobius.gameserver.model.StatsSet;
@@ -51,12 +52,12 @@ import com.l2jmobius.gameserver.util.exp4j.ExpressionBuilder;
  * Skill data parser.
  * @author NosBit
  */
-public class SkillData implements IGameXmlReader
+public class SkillData implements IXmlReader
 {
 	private static final Logger LOGGER = Logger.getLogger(SkillData.class.getName());
 	
-	private final Map<Long, Skill> _skills = new HashMap<>();
-	private final Map<Integer, Integer> _skillsMaxLevel = new HashMap<>();
+	private final Map<Long, Skill> _skills = new ConcurrentHashMap<>();
+	private final Map<Integer, Integer> _skillsMaxLevel = new ConcurrentHashMap<>();
 	
 	private class NamedParamInfo
 	{
diff --git a/L2J_Mobius_5.0_Salvation/java/com/l2jmobius/gameserver/data/xml/impl/SkillTreesData.java b/L2J_Mobius_5.0_Salvation/java/com/l2jmobius/gameserver/data/xml/impl/SkillTreesData.java
index 7f667059db..780e0a1d1c 100644
--- a/L2J_Mobius_5.0_Salvation/java/com/l2jmobius/gameserver/data/xml/impl/SkillTreesData.java
+++ b/L2J_Mobius_5.0_Salvation/java/com/l2jmobius/gameserver/data/xml/impl/SkillTreesData.java
@@ -29,6 +29,7 @@ import java.util.List;
 import java.util.Map;
 import java.util.Map.Entry;
 import java.util.Set;
+import java.util.concurrent.ConcurrentHashMap;
 import java.util.concurrent.atomic.AtomicBoolean;
 import java.util.logging.Logger;
 import java.util.stream.Collectors;
@@ -38,7 +39,7 @@ import org.w3c.dom.NamedNodeMap;
 import org.w3c.dom.Node;
 
 import com.l2jmobius.Config;
-import com.l2jmobius.commons.util.IGameXmlReader;
+import com.l2jmobius.commons.util.IXmlReader;
 import com.l2jmobius.gameserver.enums.CategoryType;
 import com.l2jmobius.gameserver.enums.Race;
 import com.l2jmobius.gameserver.enums.SubclassType;
@@ -77,34 +78,34 @@ import com.l2jmobius.gameserver.model.skills.Skill;
  * For XML schema please refer to skillTrees.xsd in datapack in xsd folder and for parameters documentation refer to documentation.txt in skillTrees folder.<br>
  * @author Zoey76
  */
-public final class SkillTreesData implements IGameXmlReader
+public final class SkillTreesData implements IXmlReader
 {
 	private static final Logger LOGGER = Logger.getLogger(SkillTreesData.class.getName());
 	
 	// ClassId, Map of Skill Hash Code, SkillLearn
-	private static final Map<ClassId, Map<Long, SkillLearn>> _classSkillTrees = new HashMap<>();
-	private static final Map<ClassId, Map<Long, SkillLearn>> _transferSkillTrees = new HashMap<>();
-	private static final Map<Race, Map<Long, SkillLearn>> _raceSkillTree = new HashMap<>();
-	private static final Map<SubclassType, Map<Long, SkillLearn>> _revelationSkillTree = new HashMap<>();
-	private static final Map<ClassId, Set<Integer>> _awakeningSaveSkillTree = new HashMap<>();
+	private static final Map<ClassId, Map<Long, SkillLearn>> _classSkillTrees = new ConcurrentHashMap<>();
+	private static final Map<ClassId, Map<Long, SkillLearn>> _transferSkillTrees = new ConcurrentHashMap<>();
+	private static final Map<Race, Map<Long, SkillLearn>> _raceSkillTree = new ConcurrentHashMap<>();
+	private static final Map<SubclassType, Map<Long, SkillLearn>> _revelationSkillTree = new ConcurrentHashMap<>();
+	private static final Map<ClassId, Set<Integer>> _awakeningSaveSkillTree = new ConcurrentHashMap<>();
 	// Skill Hash Code, SkillLearn
-	private static final Map<Long, SkillLearn> _collectSkillTree = new HashMap<>();
-	private static final Map<Long, SkillLearn> _fishingSkillTree = new HashMap<>();
-	private static final Map<Long, SkillLearn> _pledgeSkillTree = new HashMap<>();
-	private static final Map<Long, SkillLearn> _subClassSkillTree = new HashMap<>();
-	private static final Map<Long, SkillLearn> _subPledgeSkillTree = new HashMap<>();
-	private static final Map<Long, SkillLearn> _transformSkillTree = new HashMap<>();
-	private static final Map<Long, SkillLearn> _commonSkillTree = new HashMap<>();
-	private static final Map<Long, SkillLearn> _abilitySkillTree = new HashMap<>();
-	private static final Map<Long, SkillLearn> _alchemySkillTree = new HashMap<>();
-	private static final Map<Long, SkillLearn> _dualClassSkillTree = new HashMap<>();
+	private static final Map<Long, SkillLearn> _collectSkillTree = new ConcurrentHashMap<>();
+	private static final Map<Long, SkillLearn> _fishingSkillTree = new ConcurrentHashMap<>();
+	private static final Map<Long, SkillLearn> _pledgeSkillTree = new ConcurrentHashMap<>();
+	private static final Map<Long, SkillLearn> _subClassSkillTree = new ConcurrentHashMap<>();
+	private static final Map<Long, SkillLearn> _subPledgeSkillTree = new ConcurrentHashMap<>();
+	private static final Map<Long, SkillLearn> _transformSkillTree = new ConcurrentHashMap<>();
+	private static final Map<Long, SkillLearn> _commonSkillTree = new ConcurrentHashMap<>();
+	private static final Map<Long, SkillLearn> _abilitySkillTree = new ConcurrentHashMap<>();
+	private static final Map<Long, SkillLearn> _alchemySkillTree = new ConcurrentHashMap<>();
+	private static final Map<Long, SkillLearn> _dualClassSkillTree = new ConcurrentHashMap<>();
 	// Other skill trees
-	private static final Map<Long, SkillLearn> _nobleSkillTree = new HashMap<>();
-	private static final Map<Long, SkillLearn> _heroSkillTree = new HashMap<>();
-	private static final Map<Long, SkillLearn> _gameMasterSkillTree = new HashMap<>();
-	private static final Map<Long, SkillLearn> _gameMasterAuraSkillTree = new HashMap<>();
+	private static final Map<Long, SkillLearn> _nobleSkillTree = new ConcurrentHashMap<>();
+	private static final Map<Long, SkillLearn> _heroSkillTree = new ConcurrentHashMap<>();
+	private static final Map<Long, SkillLearn> _gameMasterSkillTree = new ConcurrentHashMap<>();
+	private static final Map<Long, SkillLearn> _gameMasterAuraSkillTree = new ConcurrentHashMap<>();
 	// Remove skill tree
-	private static final Map<ClassId, Set<Integer>> _removeSkillCache = new HashMap<>();
+	private static final Map<ClassId, Set<Integer>> _removeSkillCache = new ConcurrentHashMap<>();
 	
 	// Checker, sorted arrays of hash codes
 	private Map<Integer, long[]> _skillsByClassIdHashCodes; // Occupation skills
@@ -112,7 +113,7 @@ public final class SkillTreesData implements IGameXmlReader
 	private long[] _allSkillsHashCodes; // Fishing, Collection, Transformations, Common Skills.
 	
 	/** Parent class Ids are read from XML and stored in this map, to allow easy customization. */
-	private static final Map<ClassId, ClassId> _parentClassMap = new HashMap<>();
+	private static final Map<ClassId, ClassId> _parentClassMap = new ConcurrentHashMap<>();
 	
 	private final AtomicBoolean _isLoading = new AtomicBoolean();
 	
diff --git a/L2J_Mobius_5.0_Salvation/java/com/l2jmobius/gameserver/data/xml/impl/SpawnsData.java b/L2J_Mobius_5.0_Salvation/java/com/l2jmobius/gameserver/data/xml/impl/SpawnsData.java
index dc41b02109..806d00902a 100644
--- a/L2J_Mobius_5.0_Salvation/java/com/l2jmobius/gameserver/data/xml/impl/SpawnsData.java
+++ b/L2J_Mobius_5.0_Salvation/java/com/l2jmobius/gameserver/data/xml/impl/SpawnsData.java
@@ -19,9 +19,10 @@ package com.l2jmobius.gameserver.data.xml.impl;
 import java.io.File;
 import java.util.ArrayList;
 import java.util.Collections;
-import java.util.LinkedList;
 import java.util.List;
 import java.util.Map;
+import java.util.concurrent.CopyOnWriteArrayList;
+import java.util.concurrent.ScheduledFuture;
 import java.util.function.Predicate;
 import java.util.logging.Level;
 import java.util.logging.Logger;
@@ -31,7 +32,7 @@ import org.w3c.dom.Document;
 import org.w3c.dom.Node;
 
 import com.l2jmobius.Config;
-import com.l2jmobius.commons.util.IGameXmlReader;
+import com.l2jmobius.commons.concurrent.ThreadPool;
 import com.l2jmobius.commons.util.IXmlReader;
 import com.l2jmobius.gameserver.model.ChanceLocation;
 import com.l2jmobius.gameserver.model.StatsSet;
@@ -49,11 +50,11 @@ import com.l2jmobius.gameserver.model.zone.type.SpawnTerritory;
 /**
  * @author UnAfraid
  */
-public class SpawnsData implements IGameXmlReader
+public class SpawnsData implements IXmlReader
 {
 	protected static final Logger LOGGER = Logger.getLogger(SpawnsData.class.getName());
 	
-	private final List<SpawnTemplate> _spawns = new LinkedList<>();
+	private final List<SpawnTemplate> _spawns = new CopyOnWriteArrayList<>();
 	
 	protected SpawnsData()
 	{
@@ -94,11 +95,28 @@ public class SpawnsData implements IGameXmlReader
 		}
 		
 		LOGGER.info(getClass().getSimpleName() + ": Initializing spawns...");
-		_spawns.stream().filter(SpawnTemplate::isSpawningByDefault).forEach(template ->
+		final List<ScheduledFuture<?>> jobs = new CopyOnWriteArrayList<>();
+		for (SpawnTemplate template : _spawns)
 		{
-			template.spawnAll(null);
-			template.notifyActivate();
-		});
+			if (template.isSpawningByDefault())
+			{
+				jobs.add(ThreadPool.schedule(() ->
+				{
+					template.spawnAll(null);
+					template.notifyActivate();
+				}, 0));
+			}
+		}
+		while (!jobs.isEmpty())
+		{
+			for (ScheduledFuture<?> job : jobs)
+			{
+				if ((job == null) || job.isDone() || job.isCancelled())
+				{
+					jobs.remove(job);
+				}
+			}
+		}
 		LOGGER.info(getClass().getSimpleName() + ": All spawns has been initialized!");
 	}
 	
diff --git a/L2J_Mobius_5.0_Salvation/java/com/l2jmobius/gameserver/data/xml/impl/StaticObjectData.java b/L2J_Mobius_5.0_Salvation/java/com/l2jmobius/gameserver/data/xml/impl/StaticObjectData.java
index 8af86bec88..5e88dd66fb 100644
--- a/L2J_Mobius_5.0_Salvation/java/com/l2jmobius/gameserver/data/xml/impl/StaticObjectData.java
+++ b/L2J_Mobius_5.0_Salvation/java/com/l2jmobius/gameserver/data/xml/impl/StaticObjectData.java
@@ -26,7 +26,7 @@ import org.w3c.dom.Document;
 import org.w3c.dom.NamedNodeMap;
 import org.w3c.dom.Node;
 
-import com.l2jmobius.commons.util.IGameXmlReader;
+import com.l2jmobius.commons.util.IXmlReader;
 import com.l2jmobius.gameserver.model.StatsSet;
 import com.l2jmobius.gameserver.model.actor.instance.StaticObjectInstance;
 import com.l2jmobius.gameserver.model.actor.templates.CreatureTemplate;
@@ -35,7 +35,7 @@ import com.l2jmobius.gameserver.model.actor.templates.CreatureTemplate;
  * This class loads and holds all static object data.
  * @author UnAfraid
  */
-public final class StaticObjectData implements IGameXmlReader
+public final class StaticObjectData implements IXmlReader
 {
 	private static final Logger LOGGER = Logger.getLogger(StaticObjectData.class.getName());
 	
diff --git a/L2J_Mobius_5.0_Salvation/java/com/l2jmobius/gameserver/data/xml/impl/TeleportersData.java b/L2J_Mobius_5.0_Salvation/java/com/l2jmobius/gameserver/data/xml/impl/TeleportersData.java
index 1d039725ad..5afec008f7 100644
--- a/L2J_Mobius_5.0_Salvation/java/com/l2jmobius/gameserver/data/xml/impl/TeleportersData.java
+++ b/L2J_Mobius_5.0_Salvation/java/com/l2jmobius/gameserver/data/xml/impl/TeleportersData.java
@@ -20,12 +20,13 @@ import java.io.File;
 import java.util.Collections;
 import java.util.HashMap;
 import java.util.Map;
+import java.util.concurrent.ConcurrentHashMap;
 import java.util.logging.Logger;
 
 import org.w3c.dom.Document;
 import org.w3c.dom.NamedNodeMap;
 
-import com.l2jmobius.commons.util.IGameXmlReader;
+import com.l2jmobius.commons.util.IXmlReader;
 import com.l2jmobius.gameserver.enums.TeleportType;
 import com.l2jmobius.gameserver.model.StatsSet;
 import com.l2jmobius.gameserver.model.teleporter.TeleportHolder;
@@ -33,12 +34,12 @@ import com.l2jmobius.gameserver.model.teleporter.TeleportHolder;
 /**
  * @author UnAfraid
  */
-public class TeleportersData implements IGameXmlReader
+public class TeleportersData implements IXmlReader
 {
 	// Logger instance
 	private static final Logger LOGGER = Logger.getLogger(TeleportersData.class.getName());
 	// Teleporter data
-	private final Map<Integer, Map<String, TeleportHolder>> _teleporters = new HashMap<>();
+	private final Map<Integer, Map<String, TeleportHolder>> _teleporters = new ConcurrentHashMap<>();
 	
 	protected TeleportersData()
 	{
diff --git a/L2J_Mobius_5.0_Salvation/java/com/l2jmobius/gameserver/data/xml/impl/TransformData.java b/L2J_Mobius_5.0_Salvation/java/com/l2jmobius/gameserver/data/xml/impl/TransformData.java
index 896111de87..d917c7e46f 100644
--- a/L2J_Mobius_5.0_Salvation/java/com/l2jmobius/gameserver/data/xml/impl/TransformData.java
+++ b/L2J_Mobius_5.0_Salvation/java/com/l2jmobius/gameserver/data/xml/impl/TransformData.java
@@ -17,15 +17,15 @@
 package com.l2jmobius.gameserver.data.xml.impl;
 
 import java.io.File;
-import java.util.HashMap;
 import java.util.Map;
+import java.util.concurrent.ConcurrentHashMap;
 import java.util.logging.Logger;
 
 import org.w3c.dom.Document;
 import org.w3c.dom.NamedNodeMap;
 import org.w3c.dom.Node;
 
-import com.l2jmobius.commons.util.IGameXmlReader;
+import com.l2jmobius.commons.util.IXmlReader;
 import com.l2jmobius.gameserver.model.StatsSet;
 import com.l2jmobius.gameserver.model.actor.transform.Transform;
 import com.l2jmobius.gameserver.model.actor.transform.TransformLevelData;
@@ -39,11 +39,11 @@ import com.l2jmobius.gameserver.network.serverpackets.ExBasicActionList;
  * Transformation data.
  * @author UnAfraid
  */
-public final class TransformData implements IGameXmlReader
+public final class TransformData implements IXmlReader
 {
 	private static final Logger LOGGER = Logger.getLogger(TransformData.class.getName());
 	
-	private final Map<Integer, Transform> _transformData = new HashMap<>();
+	private final Map<Integer, Transform> _transformData = new ConcurrentHashMap<>();
 	
 	protected TransformData()
 	{
diff --git a/L2J_Mobius_5.0_Salvation/java/com/l2jmobius/gameserver/data/xml/impl/VariationData.java b/L2J_Mobius_5.0_Salvation/java/com/l2jmobius/gameserver/data/xml/impl/VariationData.java
index 13b41c6359..542acc971b 100644
--- a/L2J_Mobius_5.0_Salvation/java/com/l2jmobius/gameserver/data/xml/impl/VariationData.java
+++ b/L2J_Mobius_5.0_Salvation/java/com/l2jmobius/gameserver/data/xml/impl/VariationData.java
@@ -22,11 +22,12 @@ import java.util.Collections;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
+import java.util.concurrent.ConcurrentHashMap;
 import java.util.logging.Logger;
 
 import org.w3c.dom.Document;
 
-import com.l2jmobius.commons.util.IGameXmlReader;
+import com.l2jmobius.commons.util.IXmlReader;
 import com.l2jmobius.gameserver.datatables.ItemTable;
 import com.l2jmobius.gameserver.model.VariationInstance;
 import com.l2jmobius.gameserver.model.items.instance.ItemInstance;
@@ -40,12 +41,12 @@ import com.l2jmobius.gameserver.model.options.VariationWeaponType;
 /**
  * @author Pere
  */
-public class VariationData implements IGameXmlReader
+public class VariationData implements IXmlReader
 {
 	private static final Logger LOGGER = Logger.getLogger(VariationData.class.getSimpleName());
 	
-	private final Map<Integer, Variation> _variations = new HashMap<>();
-	private final Map<Integer, Map<Integer, VariationFee>> _fees = new HashMap<>();
+	private final Map<Integer, Variation> _variations = new ConcurrentHashMap<>();
+	private final Map<Integer, Map<Integer, VariationFee>> _fees = new ConcurrentHashMap<>();
 	
 	protected VariationData()
 	{
diff --git a/L2J_Mobius_5.0_Salvation/java/com/l2jmobius/gameserver/engines/DocumentEngine.java b/L2J_Mobius_5.0_Salvation/java/com/l2jmobius/gameserver/engines/DocumentEngine.java
index d787488757..10f04f4fb3 100644
--- a/L2J_Mobius_5.0_Salvation/java/com/l2jmobius/gameserver/engines/DocumentEngine.java
+++ b/L2J_Mobius_5.0_Salvation/java/com/l2jmobius/gameserver/engines/DocumentEngine.java
@@ -17,11 +17,14 @@
 package com.l2jmobius.gameserver.engines;
 
 import java.io.File;
-import java.util.LinkedList;
+import java.util.ArrayList;
 import java.util.List;
+import java.util.concurrent.CopyOnWriteArrayList;
+import java.util.concurrent.ScheduledFuture;
 import java.util.logging.Logger;
 
 import com.l2jmobius.Config;
+import com.l2jmobius.commons.concurrent.ThreadPool;
 import com.l2jmobius.commons.util.file.filter.XMLFilter;
 import com.l2jmobius.gameserver.engines.items.DocumentItem;
 import com.l2jmobius.gameserver.model.items.Item;
@@ -33,34 +36,29 @@ public class DocumentEngine
 {
 	private static final Logger LOGGER = Logger.getLogger(DocumentEngine.class.getName());
 	
-	private final List<File> _itemFiles = new LinkedList<>();
-	
-	public static DocumentEngine getInstance()
-	{
-		return SingletonHolder._instance;
-	}
+	private final List<File> _itemFiles = new ArrayList<>();
 	
 	protected DocumentEngine()
 	{
-		hashFiles("data/stats/items", _itemFiles);
+		processDirectory("data/stats/items", _itemFiles);
 		if (Config.CUSTOM_ITEMS_LOAD)
 		{
-			hashFiles("data/stats/items/custom", _itemFiles);
+			processDirectory("data/stats/items/custom", _itemFiles);
 		}
 	}
 	
-	private void hashFiles(String dirname, List<File> hash)
+	private void processDirectory(String dirName, List<File> list)
 	{
-		final File dir = new File(Config.DATAPACK_ROOT, dirname);
+		final File dir = new File(Config.DATAPACK_ROOT, dirName);
 		if (!dir.exists())
 		{
-			LOGGER.warning("Dir " + dir.getAbsolutePath() + " not exists");
+			LOGGER.warning("Dir " + dir.getAbsolutePath() + " does not exist.");
 			return;
 		}
 		final File[] files = dir.listFiles(new XMLFilter());
-		for (File f : files)
+		for (File file : files)
 		{
-			hash.add(f);
+			list.add(file);
 		}
 	}
 	
@@ -70,12 +68,26 @@ public class DocumentEngine
 	 */
 	public List<Item> loadItems()
 	{
-		final List<Item> list = new LinkedList<>();
-		for (File f : _itemFiles)
+		final List<Item> list = new CopyOnWriteArrayList<>();
+		final List<ScheduledFuture<?>> jobs = new CopyOnWriteArrayList<>();
+		for (File file : _itemFiles)
 		{
-			final DocumentItem document = new DocumentItem(f);
-			document.parse();
-			list.addAll(document.getItemList());
+			jobs.add(ThreadPool.schedule(() ->
+			{
+				final DocumentItem document = new DocumentItem(file);
+				document.parse();
+				list.addAll(document.getItemList());
+			}, 0));
+		}
+		while (!jobs.isEmpty())
+		{
+			for (ScheduledFuture<?> job : jobs)
+			{
+				if ((job == null) || job.isDone() || job.isCancelled())
+				{
+					jobs.remove(job);
+				}
+			}
 		}
 		return list;
 	}
@@ -84,4 +96,9 @@ public class DocumentEngine
 	{
 		protected static final DocumentEngine _instance = new DocumentEngine();
 	}
+	
+	public static DocumentEngine getInstance()
+	{
+		return SingletonHolder._instance;
+	}
 }
diff --git a/L2J_Mobius_5.0_Salvation/java/com/l2jmobius/gameserver/engines/items/DocumentItem.java b/L2J_Mobius_5.0_Salvation/java/com/l2jmobius/gameserver/engines/items/DocumentItem.java
index 8aaaed2cb4..4ea960563d 100644
--- a/L2J_Mobius_5.0_Salvation/java/com/l2jmobius/gameserver/engines/items/DocumentItem.java
+++ b/L2J_Mobius_5.0_Salvation/java/com/l2jmobius/gameserver/engines/items/DocumentItem.java
@@ -19,7 +19,7 @@ package com.l2jmobius.gameserver.engines.items;
 import java.io.File;
 import java.lang.reflect.Constructor;
 import java.lang.reflect.InvocationTargetException;
-import java.util.LinkedList;
+import java.util.ArrayList;
 import java.util.List;
 import java.util.logging.Level;
 import java.util.logging.Logger;
@@ -27,7 +27,7 @@ import java.util.logging.Logger;
 import org.w3c.dom.Document;
 import org.w3c.dom.Node;
 
-import com.l2jmobius.commons.util.IGameXmlReader;
+import com.l2jmobius.commons.util.IXmlReader;
 import com.l2jmobius.gameserver.engines.DocumentBase;
 import com.l2jmobius.gameserver.enums.ItemSkillType;
 import com.l2jmobius.gameserver.model.ExtractableProduct;
@@ -41,12 +41,12 @@ import com.l2jmobius.gameserver.model.stats.functions.FuncTemplate;
 /**
  * @author mkizub, JIV
  */
-public final class DocumentItem extends DocumentBase implements IGameXmlReader
+public final class DocumentItem extends DocumentBase implements IXmlReader
 {
 	Logger LOGGER = Logger.getLogger(DocumentItem.class.getName());
 	
 	private ItemDataHolder _currentItem = null;
-	private final List<Item> _itemsInFile = new LinkedList<>();
+	private final List<Item> _itemsInFile = new ArrayList<>();
 	
 	/**
 	 * @param file
diff --git a/L2J_Mobius_5.0_Salvation/java/com/l2jmobius/gameserver/handler/ConditionHandler.java b/L2J_Mobius_5.0_Salvation/java/com/l2jmobius/gameserver/handler/ConditionHandler.java
index c92ef368b3..4e20d5e720 100644
--- a/L2J_Mobius_5.0_Salvation/java/com/l2jmobius/gameserver/handler/ConditionHandler.java
+++ b/L2J_Mobius_5.0_Salvation/java/com/l2jmobius/gameserver/handler/ConditionHandler.java
@@ -50,7 +50,7 @@ public final class ConditionHandler
 	{
 		try
 		{
-			ScriptEngineManager.getInstance().executeConditionMasterHandler();
+			ScriptEngineManager.getInstance().executeScript(ScriptEngineManager.CONDITION_HANDLER_FILE);
 		}
 		catch (Exception e)
 		{
diff --git a/L2J_Mobius_5.0_Salvation/java/com/l2jmobius/gameserver/handler/DailyMissionHandler.java b/L2J_Mobius_5.0_Salvation/java/com/l2jmobius/gameserver/handler/DailyMissionHandler.java
index 9a80c1db8f..6b6248da49 100644
--- a/L2J_Mobius_5.0_Salvation/java/com/l2jmobius/gameserver/handler/DailyMissionHandler.java
+++ b/L2J_Mobius_5.0_Salvation/java/com/l2jmobius/gameserver/handler/DailyMissionHandler.java
@@ -49,7 +49,7 @@ public class DailyMissionHandler
 	{
 		try
 		{
-			ScriptEngineManager.getInstance().executeDailyMissionMasterHandler();
+			ScriptEngineManager.getInstance().executeScript(ScriptEngineManager.ONE_DAY_REWARD_MASTER_HANDLER);
 		}
 		catch (Exception e)
 		{
diff --git a/L2J_Mobius_5.0_Salvation/java/com/l2jmobius/gameserver/handler/EffectHandler.java b/L2J_Mobius_5.0_Salvation/java/com/l2jmobius/gameserver/handler/EffectHandler.java
index 0bf5350cb8..cab6562421 100644
--- a/L2J_Mobius_5.0_Salvation/java/com/l2jmobius/gameserver/handler/EffectHandler.java
+++ b/L2J_Mobius_5.0_Salvation/java/com/l2jmobius/gameserver/handler/EffectHandler.java
@@ -50,7 +50,7 @@ public final class EffectHandler
 	{
 		try
 		{
-			ScriptEngineManager.getInstance().executeEffectMasterHandler();
+			ScriptEngineManager.getInstance().executeScript(ScriptEngineManager.EFFECT_MASTER_HANDLER_FILE);
 		}
 		catch (Exception e)
 		{
diff --git a/L2J_Mobius_5.0_Salvation/java/com/l2jmobius/gameserver/handler/SkillConditionHandler.java b/L2J_Mobius_5.0_Salvation/java/com/l2jmobius/gameserver/handler/SkillConditionHandler.java
index b764410ba1..8685b0279a 100644
--- a/L2J_Mobius_5.0_Salvation/java/com/l2jmobius/gameserver/handler/SkillConditionHandler.java
+++ b/L2J_Mobius_5.0_Salvation/java/com/l2jmobius/gameserver/handler/SkillConditionHandler.java
@@ -50,7 +50,7 @@ public final class SkillConditionHandler
 	{
 		try
 		{
-			ScriptEngineManager.getInstance().executeSkillConditionMasterHandler();
+			ScriptEngineManager.getInstance().executeScript(ScriptEngineManager.SKILL_CONDITION_HANDLER_FILE);
 		}
 		catch (Exception e)
 		{
diff --git a/L2J_Mobius_5.0_Salvation/java/com/l2jmobius/gameserver/instancemanager/CastleManorManager.java b/L2J_Mobius_5.0_Salvation/java/com/l2jmobius/gameserver/instancemanager/CastleManorManager.java
index 48d04d3f38..212d1a043c 100644
--- a/L2J_Mobius_5.0_Salvation/java/com/l2jmobius/gameserver/instancemanager/CastleManorManager.java
+++ b/L2J_Mobius_5.0_Salvation/java/com/l2jmobius/gameserver/instancemanager/CastleManorManager.java
@@ -40,7 +40,7 @@ import org.w3c.dom.Node;
 import com.l2jmobius.Config;
 import com.l2jmobius.commons.concurrent.ThreadPool;
 import com.l2jmobius.commons.database.DatabaseFactory;
-import com.l2jmobius.commons.util.IGameXmlReader;
+import com.l2jmobius.commons.util.IXmlReader;
 import com.l2jmobius.commons.util.Rnd;
 import com.l2jmobius.gameserver.enums.ManorMode;
 import com.l2jmobius.gameserver.model.CropProcure;
@@ -58,7 +58,7 @@ import com.l2jmobius.gameserver.network.SystemMessageId;
  * Castle manor system.
  * @author malyelfik
  */
-public final class CastleManorManager implements IGameXmlReader, IStorable
+public final class CastleManorManager implements IXmlReader, IStorable
 {
 	private static final Logger LOGGER = Logger.getLogger(CastleManorManager.class.getName());
 	
diff --git a/L2J_Mobius_5.0_Salvation/java/com/l2jmobius/gameserver/instancemanager/CursedWeaponsManager.java b/L2J_Mobius_5.0_Salvation/java/com/l2jmobius/gameserver/instancemanager/CursedWeaponsManager.java
index 66880b88c8..01db7dce9e 100644
--- a/L2J_Mobius_5.0_Salvation/java/com/l2jmobius/gameserver/instancemanager/CursedWeaponsManager.java
+++ b/L2J_Mobius_5.0_Salvation/java/com/l2jmobius/gameserver/instancemanager/CursedWeaponsManager.java
@@ -35,7 +35,7 @@ import org.w3c.dom.Node;
 
 import com.l2jmobius.Config;
 import com.l2jmobius.commons.database.DatabaseFactory;
-import com.l2jmobius.commons.util.IGameXmlReader;
+import com.l2jmobius.commons.util.IXmlReader;
 import com.l2jmobius.gameserver.model.CursedWeapon;
 import com.l2jmobius.gameserver.model.actor.Attackable;
 import com.l2jmobius.gameserver.model.actor.Creature;
@@ -54,7 +54,7 @@ import com.l2jmobius.gameserver.util.Broadcast;
  * UnAfraid: TODO: Rewrite with DocumentParser
  * @author Micht
  */
-public final class CursedWeaponsManager implements IGameXmlReader
+public final class CursedWeaponsManager implements IXmlReader
 {
 	private static final Logger LOGGER = Logger.getLogger(CursedWeaponsManager.class.getName());
 	
diff --git a/L2J_Mobius_5.0_Salvation/java/com/l2jmobius/gameserver/instancemanager/FakePlayerChatManager.java b/L2J_Mobius_5.0_Salvation/java/com/l2jmobius/gameserver/instancemanager/FakePlayerChatManager.java
index 7101927e48..39c239a762 100644
--- a/L2J_Mobius_5.0_Salvation/java/com/l2jmobius/gameserver/instancemanager/FakePlayerChatManager.java
+++ b/L2J_Mobius_5.0_Salvation/java/com/l2jmobius/gameserver/instancemanager/FakePlayerChatManager.java
@@ -25,7 +25,7 @@ import org.w3c.dom.Document;
 
 import com.l2jmobius.Config;
 import com.l2jmobius.commons.concurrent.ThreadPool;
-import com.l2jmobius.commons.util.IGameXmlReader;
+import com.l2jmobius.commons.util.IXmlReader;
 import com.l2jmobius.commons.util.Rnd;
 import com.l2jmobius.gameserver.data.xml.impl.FakePlayerData;
 import com.l2jmobius.gameserver.datatables.SpawnTable;
@@ -41,7 +41,7 @@ import com.l2jmobius.gameserver.network.serverpackets.CreatureSay;
 /**
  * @author Mobius
  */
-public final class FakePlayerChatManager implements IGameXmlReader
+public final class FakePlayerChatManager implements IXmlReader
 {
 	private static Logger LOGGER = Logger.getLogger(FakePlayerChatManager.class.getName());
 	final List<FakePlayerChatHolder> MESSAGES = new ArrayList<>();
diff --git a/L2J_Mobius_5.0_Salvation/java/com/l2jmobius/gameserver/instancemanager/InstanceManager.java b/L2J_Mobius_5.0_Salvation/java/com/l2jmobius/gameserver/instancemanager/InstanceManager.java
index f300213c49..5ea229cf1b 100644
--- a/L2J_Mobius_5.0_Salvation/java/com/l2jmobius/gameserver/instancemanager/InstanceManager.java
+++ b/L2J_Mobius_5.0_Salvation/java/com/l2jmobius/gameserver/instancemanager/InstanceManager.java
@@ -40,7 +40,6 @@ import org.w3c.dom.Node;
 
 import com.l2jmobius.Config;
 import com.l2jmobius.commons.database.DatabaseFactory;
-import com.l2jmobius.commons.util.IGameXmlReader;
 import com.l2jmobius.commons.util.IXmlReader;
 import com.l2jmobius.gameserver.data.xml.impl.DoorData;
 import com.l2jmobius.gameserver.data.xml.impl.SpawnsData;
@@ -61,7 +60,7 @@ import com.l2jmobius.gameserver.model.spawns.SpawnTemplate;
  * Instance manager.
  * @author evill33t, GodKratos, malyelfik
  */
-public final class InstanceManager implements IGameXmlReader
+public final class InstanceManager implements IXmlReader
 {
 	private static final Logger LOGGER = Logger.getLogger(InstanceManager.class.getName());
 	// Database query
diff --git a/L2J_Mobius_5.0_Salvation/java/com/l2jmobius/gameserver/instancemanager/ItemAuctionManager.java b/L2J_Mobius_5.0_Salvation/java/com/l2jmobius/gameserver/instancemanager/ItemAuctionManager.java
index f819adf93b..752bcfdd3f 100644
--- a/L2J_Mobius_5.0_Salvation/java/com/l2jmobius/gameserver/instancemanager/ItemAuctionManager.java
+++ b/L2J_Mobius_5.0_Salvation/java/com/l2jmobius/gameserver/instancemanager/ItemAuctionManager.java
@@ -34,13 +34,13 @@ import org.w3c.dom.Node;
 
 import com.l2jmobius.Config;
 import com.l2jmobius.commons.database.DatabaseFactory;
-import com.l2jmobius.commons.util.IGameXmlReader;
+import com.l2jmobius.commons.util.IXmlReader;
 import com.l2jmobius.gameserver.model.itemauction.ItemAuctionInstance;
 
 /**
  * @author Forsaiken
  */
-public final class ItemAuctionManager implements IGameXmlReader
+public final class ItemAuctionManager implements IXmlReader
 {
 	private static final Logger LOGGER = Logger.getLogger(ItemAuctionManager.class.getName());
 	
diff --git a/L2J_Mobius_5.0_Salvation/java/com/l2jmobius/gameserver/instancemanager/MapRegionManager.java b/L2J_Mobius_5.0_Salvation/java/com/l2jmobius/gameserver/instancemanager/MapRegionManager.java
index 255d4340ff..8f68a4bdf5 100644
--- a/L2J_Mobius_5.0_Salvation/java/com/l2jmobius/gameserver/instancemanager/MapRegionManager.java
+++ b/L2J_Mobius_5.0_Salvation/java/com/l2jmobius/gameserver/instancemanager/MapRegionManager.java
@@ -27,7 +27,7 @@ import org.w3c.dom.NamedNodeMap;
 import org.w3c.dom.Node;
 
 import com.l2jmobius.Config;
-import com.l2jmobius.commons.util.IGameXmlReader;
+import com.l2jmobius.commons.util.IXmlReader;
 import com.l2jmobius.gameserver.data.xml.impl.ClanHallData;
 import com.l2jmobius.gameserver.model.Location;
 import com.l2jmobius.gameserver.model.MapRegion;
@@ -47,7 +47,7 @@ import com.l2jmobius.gameserver.model.zone.type.RespawnZone;
  * Map Region Manager.
  * @author Nyaran
  */
-public final class MapRegionManager implements IGameXmlReader
+public final class MapRegionManager implements IXmlReader
 {
 	private static final Logger LOGGER = Logger.getLogger(MapRegionManager.class.getName());
 	
diff --git a/L2J_Mobius_5.0_Salvation/java/com/l2jmobius/gameserver/instancemanager/SellBuffsManager.java b/L2J_Mobius_5.0_Salvation/java/com/l2jmobius/gameserver/instancemanager/SellBuffsManager.java
index dcf1bae346..0c4e94f449 100644
--- a/L2J_Mobius_5.0_Salvation/java/com/l2jmobius/gameserver/instancemanager/SellBuffsManager.java
+++ b/L2J_Mobius_5.0_Salvation/java/com/l2jmobius/gameserver/instancemanager/SellBuffsManager.java
@@ -26,7 +26,7 @@ import org.w3c.dom.Element;
 import org.w3c.dom.NodeList;
 
 import com.l2jmobius.Config;
-import com.l2jmobius.commons.util.IGameXmlReader;
+import com.l2jmobius.commons.util.IXmlReader;
 import com.l2jmobius.gameserver.cache.HtmCache;
 import com.l2jmobius.gameserver.data.xml.impl.SkillData;
 import com.l2jmobius.gameserver.datatables.ItemTable;
@@ -46,7 +46,7 @@ import com.l2jmobius.gameserver.util.Util;
  * Sell Buffs Manager
  * @author St3eT
  */
-public final class SellBuffsManager implements IGameXmlReader
+public final class SellBuffsManager implements IXmlReader
 {
 	private static final Logger LOGGER = Logger.getLogger(SellBuffsManager.class.getName());
 	private static final List<Integer> ALLOWED_BUFFS = new ArrayList<>();
diff --git a/L2J_Mobius_5.0_Salvation/java/com/l2jmobius/gameserver/instancemanager/WalkingManager.java b/L2J_Mobius_5.0_Salvation/java/com/l2jmobius/gameserver/instancemanager/WalkingManager.java
index 4583519bc4..18c4814040 100644
--- a/L2J_Mobius_5.0_Salvation/java/com/l2jmobius/gameserver/instancemanager/WalkingManager.java
+++ b/L2J_Mobius_5.0_Salvation/java/com/l2jmobius/gameserver/instancemanager/WalkingManager.java
@@ -28,7 +28,7 @@ import org.w3c.dom.NamedNodeMap;
 import org.w3c.dom.Node;
 
 import com.l2jmobius.commons.concurrent.ThreadPool;
-import com.l2jmobius.commons.util.IGameXmlReader;
+import com.l2jmobius.commons.util.IXmlReader;
 import com.l2jmobius.gameserver.ai.CtrlIntention;
 import com.l2jmobius.gameserver.data.xml.impl.NpcData;
 import com.l2jmobius.gameserver.enums.ChatType;
@@ -49,7 +49,7 @@ import com.l2jmobius.gameserver.network.NpcStringId;
  * This class manages walking monsters.
  * @author GKR
  */
-public final class WalkingManager implements IGameXmlReader
+public final class WalkingManager implements IXmlReader
 {
 	private static final Logger LOGGER = Logger.getLogger(WalkingManager.class.getName());
 	
diff --git a/L2J_Mobius_5.0_Salvation/java/com/l2jmobius/gameserver/instancemanager/ZoneManager.java b/L2J_Mobius_5.0_Salvation/java/com/l2jmobius/gameserver/instancemanager/ZoneManager.java
index b698f51a03..9a0bd870f2 100644
--- a/L2J_Mobius_5.0_Salvation/java/com/l2jmobius/gameserver/instancemanager/ZoneManager.java
+++ b/L2J_Mobius_5.0_Salvation/java/com/l2jmobius/gameserver/instancemanager/ZoneManager.java
@@ -26,6 +26,7 @@ import java.util.List;
 import java.util.Map;
 import java.util.Optional;
 import java.util.OptionalInt;
+import java.util.concurrent.ConcurrentHashMap;
 import java.util.logging.Level;
 import java.util.logging.Logger;
 
@@ -33,7 +34,7 @@ import org.w3c.dom.Document;
 import org.w3c.dom.NamedNodeMap;
 import org.w3c.dom.Node;
 
-import com.l2jmobius.commons.util.IGameXmlReader;
+import com.l2jmobius.commons.util.IXmlReader;
 import com.l2jmobius.gameserver.model.World;
 import com.l2jmobius.gameserver.model.WorldObject;
 import com.l2jmobius.gameserver.model.actor.Creature;
@@ -55,7 +56,7 @@ import com.l2jmobius.gameserver.model.zone.type.SpawnTerritory;
  * This class manages the zones
  * @author durgus
  */
-public final class ZoneManager implements IGameXmlReader
+public final class ZoneManager implements IXmlReader
 {
 	private static final Logger LOGGER = Logger.getLogger(ZoneManager.class.getName());
 	
@@ -65,9 +66,9 @@ public final class ZoneManager implements IGameXmlReader
 	private static final int OFFSET_X = Math.abs(World.MAP_MIN_X >> SHIFT_BY);
 	private static final int OFFSET_Y = Math.abs(World.MAP_MIN_Y >> SHIFT_BY);
 	
-	private final Map<Class<? extends ZoneType>, Map<Integer, ? extends ZoneType>> _classZones = new HashMap<>();
-	private final Map<String, SpawnTerritory> _spawnTerritories = new HashMap<>();
-	private int _lastDynamicId = 300000;
+	private final Map<Class<? extends ZoneType>, ConcurrentHashMap<Integer, ? extends ZoneType>> _classZones = new ConcurrentHashMap<>();
+	private final Map<String, SpawnTerritory> _spawnTerritories = new ConcurrentHashMap<>();
+	private volatile int _lastDynamicId = 300000;
 	private List<ItemInstance> _debugItems;
 	
 	private final ZoneRegion[][] _zoneRegions = new ZoneRegion[(World.MAP_MAX_X >> SHIFT_BY) + OFFSET_X + 1][(World.MAP_MAX_Y >> SHIFT_BY) + OFFSET_Y + 1];
@@ -365,7 +366,7 @@ public final class ZoneManager implements IGameXmlReader
 						}
 						if (checkId(zoneId))
 						{
-							LOGGER.config(getClass().getSimpleName() + ": Caution: Zone (" + zoneId + ") from file: " + f.getName() + " overrides previos definition.");
+							LOGGER.config(getClass().getSimpleName() + ": Caution: Zone (" + zoneId + ") from file: " + f.getName() + " overrides previuos definition.");
 						}
 						
 						if ((zoneName != null) && !zoneName.isEmpty())
@@ -453,10 +454,10 @@ public final class ZoneManager implements IGameXmlReader
 	@SuppressWarnings("unchecked")
 	private <T extends ZoneType> void addZone(Integer id, T zone)
 	{
-		Map<Integer, T> map = (Map<Integer, T>) _classZones.get(zone.getClass());
+		ConcurrentHashMap<Integer, T> map = (ConcurrentHashMap<Integer, T>) _classZones.get(zone.getClass());
 		if (map == null)
 		{
-			map = new HashMap<>();
+			map = new ConcurrentHashMap<>();
 			map.put(id, zone);
 			_classZones.put(zone.getClass(), map);
 		}
diff --git a/L2J_Mobius_5.0_Salvation/java/com/l2jmobius/gameserver/model/quest/LongTimeEvent.java b/L2J_Mobius_5.0_Salvation/java/com/l2jmobius/gameserver/model/quest/LongTimeEvent.java
index cc71991407..0fa020eb5d 100644
--- a/L2J_Mobius_5.0_Salvation/java/com/l2jmobius/gameserver/model/quest/LongTimeEvent.java
+++ b/L2J_Mobius_5.0_Salvation/java/com/l2jmobius/gameserver/model/quest/LongTimeEvent.java
@@ -32,7 +32,7 @@ import org.w3c.dom.Node;
 
 import com.l2jmobius.commons.concurrent.ThreadPool;
 import com.l2jmobius.commons.database.DatabaseFactory;
-import com.l2jmobius.commons.util.IGameXmlReader;
+import com.l2jmobius.commons.util.IXmlReader;
 import com.l2jmobius.gameserver.data.sql.impl.AnnouncementsTable;
 import com.l2jmobius.gameserver.data.xml.impl.NpcData;
 import com.l2jmobius.gameserver.datatables.EventDroplist;
@@ -117,7 +117,7 @@ public class LongTimeEvent extends Quest
 	 */
 	private void loadConfig()
 	{
-		new IGameXmlReader()
+		new IXmlReader()
 		{
 			@Override
 			public void load()
diff --git a/L2J_Mobius_5.0_Salvation/java/com/l2jmobius/gameserver/model/stats/BaseStats.java b/L2J_Mobius_5.0_Salvation/java/com/l2jmobius/gameserver/model/stats/BaseStats.java
index daba0d3071..64af7961e9 100644
--- a/L2J_Mobius_5.0_Salvation/java/com/l2jmobius/gameserver/model/stats/BaseStats.java
+++ b/L2J_Mobius_5.0_Salvation/java/com/l2jmobius/gameserver/model/stats/BaseStats.java
@@ -23,7 +23,6 @@ import java.util.logging.Logger;
 import org.w3c.dom.Document;
 import org.w3c.dom.NamedNodeMap;
 
-import com.l2jmobius.commons.util.IGameXmlReader;
 import com.l2jmobius.commons.util.IXmlReader;
 import com.l2jmobius.gameserver.model.actor.Creature;
 
@@ -105,7 +104,7 @@ public enum BaseStats
 	
 	static
 	{
-		new IGameXmlReader()
+		new IXmlReader()
 		{
 			final Logger LOGGER = Logger.getLogger(BaseStats.class.getName());
 			
diff --git a/L2J_Mobius_5.0_Salvation/java/com/l2jmobius/gameserver/scripting/ScriptEngineManager.java b/L2J_Mobius_5.0_Salvation/java/com/l2jmobius/gameserver/scripting/ScriptEngineManager.java
index 9eb6d85b69..95409c567a 100644
--- a/L2J_Mobius_5.0_Salvation/java/com/l2jmobius/gameserver/scripting/ScriptEngineManager.java
+++ b/L2J_Mobius_5.0_Salvation/java/com/l2jmobius/gameserver/scripting/ScriptEngineManager.java
@@ -28,8 +28,6 @@ import java.nio.file.attribute.BasicFileAttributes;
 import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.Iterator;
-import java.util.LinkedHashMap;
-import java.util.LinkedList;
 import java.util.List;
 import java.util.Map;
 import java.util.Map.Entry;
@@ -42,14 +40,14 @@ import java.util.logging.Logger;
 import org.w3c.dom.Document;
 
 import com.l2jmobius.Config;
-import com.l2jmobius.commons.util.IGameXmlReader;
+import com.l2jmobius.commons.util.IXmlReader;
 import com.l2jmobius.gameserver.scripting.java.JavaScriptingEngine;
 
 /**
  * Caches script engines and provides functionality for executing and managing scripts.
  * @author KenM, HorridoJoho
  */
-public final class ScriptEngineManager implements IGameXmlReader
+public final class ScriptEngineManager implements IXmlReader
 {
 	private static final Logger LOGGER = Logger.getLogger(ScriptEngineManager.class.getName());
 	public static final Path SCRIPT_FOLDER = Paths.get(Config.DATAPACK_ROOT.getAbsolutePath(), "data", "scripts");
@@ -59,8 +57,7 @@ public final class ScriptEngineManager implements IGameXmlReader
 	public static final Path CONDITION_HANDLER_FILE = Paths.get(SCRIPT_FOLDER.toString(), "handlers", "ConditionMasterHandler.java");
 	public static final Path ONE_DAY_REWARD_MASTER_HANDLER = Paths.get(SCRIPT_FOLDER.toString(), "handlers", "DailyMissionMasterHandler.java");
 	
-	private final Map<String, IExecutionContext> _extEngines = new HashMap<>();
-	private IExecutionContext _currentExecutionContext = null;
+	private IExecutionContext _javaExecutionContext = null;
 	static final List<String> _exclusions = new ArrayList<>();
 	
 	protected ScriptEngineManager()
@@ -166,12 +163,7 @@ public final class ScriptEngineManager implements IGameXmlReader
 	private void registerEngine(IScriptingEngine engine, Properties props)
 	{
 		maybeSetProperties("language." + engine.getLanguageName() + ".", props, engine);
-		final IExecutionContext context = engine.createExecutionContext();
-		for (String commonExtension : engine.getCommonFileExtensions())
-		{
-			_extEngines.put(commonExtension, context);
-		}
-		
+		_javaExecutionContext = engine.createExecutionContext();
 		LOGGER.info("ScriptEngine: " + engine.getEngineName() + " " + engine.getEngineVersion() + " (" + engine.getLanguageName() + " " + engine.getLanguageVersion() + ")");
 	}
 	
@@ -200,66 +192,6 @@ public final class ScriptEngineManager implements IGameXmlReader
 		}
 	}
 	
-	private IExecutionContext getEngineByExtension(String ext)
-	{
-		return _extEngines.get(ext);
-	}
-	
-	private String getFileExtension(Path p)
-	{
-		final String name = p.getFileName().toString();
-		final int lastDotIdx = name.lastIndexOf('.');
-		if (lastDotIdx == -1)
-		{
-			return null;
-		}
-		
-		final String extension = name.substring(lastDotIdx + 1);
-		if (extension.isEmpty())
-		{
-			return null;
-		}
-		
-		return extension;
-	}
-	
-	private void checkExistingFile(String messagePre, Path filePath) throws Exception
-	{
-		if (!Files.exists(filePath))
-		{
-			throw new Exception(messagePre + ": " + filePath + " does not exists!");
-		}
-		else if (!Files.isRegularFile(filePath))
-		{
-			throw new Exception(messagePre + ": " + filePath + " is not a file!");
-		}
-	}
-	
-	public void executeMasterHandler() throws Exception
-	{
-		executeScript(MASTER_HANDLER_FILE);
-	}
-	
-	public void executeEffectMasterHandler() throws Exception
-	{
-		executeScript(EFFECT_MASTER_HANDLER_FILE);
-	}
-	
-	public void executeSkillConditionMasterHandler() throws Exception
-	{
-		executeScript(SKILL_CONDITION_HANDLER_FILE);
-	}
-	
-	public void executeConditionMasterHandler() throws Exception
-	{
-		executeScript(CONDITION_HANDLER_FILE);
-	}
-	
-	public void executeDailyMissionMasterHandler() throws Exception
-	{
-		executeScript(ONE_DAY_REWARD_MASTER_HANDLER);
-	}
-	
 	public void executeScriptList() throws Exception
 	{
 		if (Config.ALT_DEV_NO_QUESTS)
@@ -267,77 +199,35 @@ public final class ScriptEngineManager implements IGameXmlReader
 			return;
 		}
 		
-		final Map<IExecutionContext, List<Path>> files = new LinkedHashMap<>();
+		final List<Path> files = new ArrayList<>();
 		processDirectory(SCRIPT_FOLDER.toFile(), files);
 		
-		for (Entry<IExecutionContext, List<Path>> entry : files.entrySet())
+		final Map<Path, Throwable> invokationErrors = _javaExecutionContext.executeScripts(files);
+		for (Entry<Path, Throwable> entry : invokationErrors.entrySet())
 		{
-			_currentExecutionContext = entry.getKey();
-			try
-			{
-				final Map<Path, Throwable> invokationErrors = entry.getKey().executeScripts(entry.getValue());
-				for (Entry<Path, Throwable> entry2 : invokationErrors.entrySet())
-				{
-					LOGGER.log(Level.WARNING, "ScriptEngine: " + entry2.getKey() + " failed execution!", entry2.getValue());
-				}
-			}
-			finally
-			{
-				_currentExecutionContext = null;
-			}
+			LOGGER.log(Level.WARNING, "ScriptEngine: " + entry.getKey() + " failed execution!", entry.getValue());
 		}
 	}
 	
-	private void processDirectory(File dir, Map<IExecutionContext, List<Path>> files)
+	private void processDirectory(File dir, List<Path> files)
 	{
 		for (File file : dir.listFiles())
 		{
-			if (file.isDirectory())
+			if (file.isFile())
+			{
+				final String fileName = file.getName();
+				if (fileName.endsWith(".java") && !_exclusions.contains(fileName))
+				{
+					files.add(file.toPath().toAbsolutePath());
+				}
+			}
+			else if (file.isDirectory())
 			{
 				processDirectory(file, files);
 			}
-			else
-			{
-				processFile(file, files);
-			}
 		}
 	}
 	
-	private void processFile(File file, Map<IExecutionContext, List<Path>> files)
-	{
-		if (_exclusions.contains(file.getName()))
-		{
-			return;
-		}
-		
-		Path sourceFile = file.toPath();
-		try
-		{
-			checkExistingFile("ScriptFile", sourceFile);
-		}
-		catch (Exception e)
-		{
-			LOGGER.warning(e.getMessage());
-			return;
-		}
-		
-		sourceFile = sourceFile.toAbsolutePath();
-		final String ext = getFileExtension(sourceFile);
-		if (ext == null)
-		{
-			LOGGER.warning("ScriptFile: " + sourceFile + " does not have an extension to determine the script engine!");
-			return;
-		}
-		
-		final IExecutionContext engine = getEngineByExtension(ext);
-		if (engine == null)
-		{
-			return;
-		}
-		
-		files.computeIfAbsent(engine, k -> new LinkedList<>()).add(sourceFile);
-	}
-	
 	public void executeScript(Path sourceFile) throws Exception
 	{
 		Objects.requireNonNull(sourceFile);
@@ -347,34 +237,19 @@ public final class ScriptEngineManager implements IGameXmlReader
 			sourceFile = SCRIPT_FOLDER.resolve(sourceFile);
 		}
 		
-		// throws exception if not exists or not file
-		checkExistingFile("ScriptFile", sourceFile);
-		
 		sourceFile = sourceFile.toAbsolutePath();
-		final String ext = getFileExtension(sourceFile);
 		Objects.requireNonNull(sourceFile, "ScriptFile: " + sourceFile + " does not have an extension to determine the script engine!");
 		
-		final IExecutionContext engine = getEngineByExtension(ext);
-		Objects.requireNonNull(engine, "ScriptEngine: No engine registered for extension " + ext + "!");
-		
-		_currentExecutionContext = engine;
-		try
+		final Entry<Path, Throwable> error = _javaExecutionContext.executeScript(sourceFile);
+		if (error != null)
 		{
-			final Entry<Path, Throwable> error = engine.executeScript(sourceFile);
-			if (error != null)
-			{
-				throw new Exception("ScriptEngine: " + error.getKey() + " failed execution!", error.getValue());
-			}
-		}
-		finally
-		{
-			_currentExecutionContext = null;
+			throw new Exception("ScriptEngine: " + error.getKey() + " failed execution!", error.getValue());
 		}
 	}
 	
 	public Path getCurrentLoadingScript()
 	{
-		return _currentExecutionContext != null ? _currentExecutionContext.getCurrentExecutingScript() : null;
+		return _javaExecutionContext.getCurrentExecutingScript();
 	}
 	
 	public static ScriptEngineManager getInstance()
diff --git a/L2J_Mobius_5.0_Salvation/java/com/l2jmobius/loginserver/GameServerTable.java b/L2J_Mobius_5.0_Salvation/java/com/l2jmobius/loginserver/GameServerTable.java
index 456224d78c..4269e47969 100644
--- a/L2J_Mobius_5.0_Salvation/java/com/l2jmobius/loginserver/GameServerTable.java
+++ b/L2J_Mobius_5.0_Salvation/java/com/l2jmobius/loginserver/GameServerTable.java
@@ -36,8 +36,8 @@ import org.w3c.dom.Document;
 import org.w3c.dom.NodeList;
 
 import com.l2jmobius.commons.database.DatabaseFactory;
-import com.l2jmobius.commons.util.IGameXmlReader;
 import com.l2jmobius.commons.util.IPSubnet;
+import com.l2jmobius.commons.util.IXmlReader;
 import com.l2jmobius.commons.util.Rnd;
 import com.l2jmobius.loginserver.network.gameserverpackets.ServerStatus;
 
@@ -45,7 +45,7 @@ import com.l2jmobius.loginserver.network.gameserverpackets.ServerStatus;
  * The Class GameServerTable loads the game server names and initialize the game server tables.
  * @author KenM, Zoey76
  */
-public final class GameServerTable implements IGameXmlReader
+public final class GameServerTable implements IXmlReader
 {
 	private static final Logger LOGGER = Logger.getLogger(GameServerTable.class.getName());
 	
diff --git a/L2J_Mobius_5.5_EtinasFate/dist/game/config/Scripts.xml b/L2J_Mobius_5.5_EtinasFate/dist/game/config/Scripts.xml
index 284aa0a31f..54d05b241f 100644
--- a/L2J_Mobius_5.5_EtinasFate/dist/game/config/Scripts.xml
+++ b/L2J_Mobius_5.5_EtinasFate/dist/game/config/Scripts.xml
@@ -2,11 +2,7 @@
 <list xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../data/xsd/Scripts.xsd">
 	<!-- Skip these filenames from script loading, because they are already loaded using a different way. -->
 	<exclude file="package-info.java" />
-	<exclude file="MasterHandler.java" />
-	<exclude file="EffectMasterHandler.java" />
-	<exclude file="SkillConditionMasterHandler.java" />
-	<exclude file="ConditionMasterHandler.java" />
-	<exclude file="DailyMissionMasterHandler.java" />
+	<exclude file="handlers" />
 	
 	<!--
 	With this file you can exclude/include specific folders/files from within the scripts directory.
diff --git a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/ai/areas/ImperialTomb/FourSepulchers/FourSepulchers.java b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/ai/areas/ImperialTomb/FourSepulchers/FourSepulchers.java
index ceda5a638a..638fbd00ad 100644
--- a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/ai/areas/ImperialTomb/FourSepulchers/FourSepulchers.java
+++ b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/ai/areas/ImperialTomb/FourSepulchers/FourSepulchers.java
@@ -29,7 +29,7 @@ import org.w3c.dom.NamedNodeMap;
 import org.w3c.dom.Node;
 
 import com.l2jmobius.commons.concurrent.ThreadPool;
-import com.l2jmobius.commons.util.IGameXmlReader;
+import com.l2jmobius.commons.util.IXmlReader;
 import com.l2jmobius.gameserver.ai.CtrlIntention;
 import com.l2jmobius.gameserver.enums.ChatType;
 import com.l2jmobius.gameserver.geoengine.GeoEngine;
@@ -56,7 +56,7 @@ import quests.Q00620_FourGoblets.Q00620_FourGoblets;
  * Four Selpuchers AI
  * @author Mobius
  */
-public final class FourSepulchers extends AbstractNpcAI implements IGameXmlReader
+public final class FourSepulchers extends AbstractNpcAI implements IXmlReader
 {
 	Logger LOGGER = Logger.getLogger(FourSepulchers.class.getName());
 	
diff --git a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/ai/bosses/Tiat/Stage1.java b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/ai/bosses/Tiat/Stage1.java
index e1e54da1a8..1b350c946e 100644
--- a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/ai/bosses/Tiat/Stage1.java
+++ b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/ai/bosses/Tiat/Stage1.java
@@ -30,7 +30,7 @@ import org.w3c.dom.NamedNodeMap;
 import org.w3c.dom.Node;
 
 import com.l2jmobius.commons.util.CommonUtil;
-import com.l2jmobius.commons.util.IGameXmlReader;
+import com.l2jmobius.commons.util.IXmlReader;
 import com.l2jmobius.gameserver.ai.CtrlIntention;
 import com.l2jmobius.gameserver.enums.Movie;
 import com.l2jmobius.gameserver.enums.TrapAction;
@@ -66,7 +66,7 @@ import instances.AbstractInstance;
  * Please maintain consistency between the Seed scripts.
  * @author Gigiikun
  */
-public final class Stage1 extends AbstractInstance implements IGameXmlReader
+public final class Stage1 extends AbstractInstance implements IXmlReader
 {
 	Logger LOGGER = Logger.getLogger(Stage1.class.getName());
 	
diff --git a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/ai/others/ClassMaster/ClassMaster.java b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/ai/others/ClassMaster/ClassMaster.java
index 63269e6e27..1abb859d66 100644
--- a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/ai/others/ClassMaster/ClassMaster.java
+++ b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/ai/others/ClassMaster/ClassMaster.java
@@ -30,7 +30,7 @@ import org.w3c.dom.NamedNodeMap;
 import org.w3c.dom.Node;
 
 import com.l2jmobius.Config;
-import com.l2jmobius.commons.util.IGameXmlReader;
+import com.l2jmobius.commons.util.IXmlReader;
 import com.l2jmobius.gameserver.data.xml.impl.CategoryData;
 import com.l2jmobius.gameserver.data.xml.impl.ClassListData;
 import com.l2jmobius.gameserver.data.xml.impl.SkillData;
@@ -63,7 +63,7 @@ import ai.AbstractNpcAI;
  * Class Master AI.
  * @author Nik
  */
-public final class ClassMaster extends AbstractNpcAI implements IGameXmlReader
+public final class ClassMaster extends AbstractNpcAI implements IXmlReader
 {
 	// NPCs
 	private static final List<Integer> CLASS_MASTERS = new ArrayList<>();
diff --git a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/ai/others/MentorGuide/MentorGuide.java b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/ai/others/MentorGuide/MentorGuide.java
index 9ddcd66a0f..65322b7a01 100644
--- a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/ai/others/MentorGuide/MentorGuide.java
+++ b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/ai/others/MentorGuide/MentorGuide.java
@@ -26,7 +26,7 @@ import org.w3c.dom.Document;
 import org.w3c.dom.Node;
 
 import com.l2jmobius.Config;
-import com.l2jmobius.commons.util.IGameXmlReader;
+import com.l2jmobius.commons.util.IXmlReader;
 import com.l2jmobius.gameserver.enums.CategoryType;
 import com.l2jmobius.gameserver.enums.MailType;
 import com.l2jmobius.gameserver.instancemanager.MailManager;
@@ -61,7 +61,7 @@ import ai.AbstractNpcAI;
  * Mentor Guide AI.
  * @author Gnacik, UnAfraid
  */
-public final class MentorGuide extends AbstractNpcAI implements IGameXmlReader
+public final class MentorGuide extends AbstractNpcAI implements IXmlReader
 {
 	private static final Logger LOGGER = Logger.getLogger(MentorGuide.class.getName());
 	
diff --git a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/ai/others/NpcBuffers/NpcBuffersData.java b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/ai/others/NpcBuffers/NpcBuffersData.java
index b0287e1df6..51708af4f8 100644
--- a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/ai/others/NpcBuffers/NpcBuffersData.java
+++ b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/ai/others/NpcBuffers/NpcBuffersData.java
@@ -27,13 +27,13 @@ import org.w3c.dom.Document;
 import org.w3c.dom.NamedNodeMap;
 import org.w3c.dom.Node;
 
-import com.l2jmobius.commons.util.IGameXmlReader;
+import com.l2jmobius.commons.util.IXmlReader;
 import com.l2jmobius.gameserver.model.StatsSet;
 
 /**
  * @author UnAfraid
  */
-class NpcBuffersData implements IGameXmlReader
+class NpcBuffersData implements IXmlReader
 {
 	private static final Logger LOGGER = Logger.getLogger(NpcBuffersData.class.getName());
 	
diff --git a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/admincommandhandlers/AdminQuest.java b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/admincommandhandlers/AdminQuest.java
index 228cc1668d..a771c4ab90 100644
--- a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/admincommandhandlers/AdminQuest.java
+++ b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/admincommandhandlers/AdminQuest.java
@@ -320,7 +320,7 @@ public class AdminQuest implements IAdminCommandHandler
 				{
 					sb.append("<a action=\"bypass -h admin_script_dir " + c + "\">" + c + "</a><br1>");
 				}
-				else if (c.endsWith(".java") || c.endsWith(".py"))
+				else if (c.endsWith(".java"))
 				{
 					sb.append("<a action=\"bypass -h admin_script_load " + c + "\"><font color=\"LEVEL\">" + c + "</font></a><br1>");
 				}
@@ -352,7 +352,7 @@ public class AdminQuest implements IAdminCommandHandler
 				{
 					sb.append("<a action=\"bypass -h admin_script_dir " + currentPath + "/" + c + "\">" + (questReducedNames ? getQuestName(c) : c) + "</a><br1>");
 				}
-				else if (c.endsWith(".java") || c.endsWith(".py"))
+				else if (c.endsWith(".java"))
 				{
 					sb.append("<a action=\"bypass -h admin_script_load " + currentPath + "/" + c + "\"><font color=\"LEVEL\">" + c + "</font></a><br1>");
 				}
diff --git a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/admincommandhandlers/AdminReload.java b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/admincommandhandlers/AdminReload.java
index c1d29b87fb..df9c268b60 100644
--- a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/admincommandhandlers/AdminReload.java
+++ b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/admincommandhandlers/AdminReload.java
@@ -222,7 +222,7 @@ public class AdminReload implements IAdminCommandHandler
 				{
 					try
 					{
-						ScriptEngineManager.getInstance().executeEffectMasterHandler();
+						ScriptEngineManager.getInstance().executeScript(ScriptEngineManager.EFFECT_MASTER_HANDLER_FILE);
 						AdminData.getInstance().broadcastMessageToGMs(activeChar.getName() + ": Reloaded effect master handler.");
 					}
 					catch (Exception e)
@@ -236,7 +236,7 @@ public class AdminReload implements IAdminCommandHandler
 				{
 					try
 					{
-						ScriptEngineManager.getInstance().executeMasterHandler();
+						ScriptEngineManager.getInstance().executeScript(ScriptEngineManager.MASTER_HANDLER_FILE);
 						AdminData.getInstance().broadcastMessageToGMs(activeChar.getName() + ": Reloaded master handler.");
 					}
 					catch (Exception e)
diff --git a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/telnethandlers/server/Reload.java b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/telnethandlers/server/Reload.java
index d679ea1212..491b10cc62 100644
--- a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/telnethandlers/server/Reload.java
+++ b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/telnethandlers/server/Reload.java
@@ -181,7 +181,7 @@ public class Reload implements ITelnetCommand
 			{
 				try
 				{
-					ScriptEngineManager.getInstance().executeEffectMasterHandler();
+					ScriptEngineManager.getInstance().executeScript(ScriptEngineManager.EFFECT_MASTER_HANDLER_FILE);
 					return AdminData.getInstance().broadcastMessageToGMs("Telnet Admin: Reloaded effect master handler.");
 				}
 				catch (Exception e)
@@ -194,7 +194,7 @@ public class Reload implements ITelnetCommand
 			{
 				try
 				{
-					ScriptEngineManager.getInstance().executeMasterHandler();
+					ScriptEngineManager.getInstance().executeScript(ScriptEngineManager.MASTER_HANDLER_FILE);
 					return AdminData.getInstance().broadcastMessageToGMs("Telnet Admin: Reloaded master handler.");
 				}
 				catch (Exception e)
diff --git a/L2J_Mobius_5.5_EtinasFate/java/com/l2jmobius/Config.java b/L2J_Mobius_5.5_EtinasFate/java/com/l2jmobius/Config.java
index 416ac80919..053bf6cfba 100644
--- a/L2J_Mobius_5.5_EtinasFate/java/com/l2jmobius/Config.java
+++ b/L2J_Mobius_5.5_EtinasFate/java/com/l2jmobius/Config.java
@@ -54,7 +54,7 @@ import org.w3c.dom.Document;
 import org.w3c.dom.NamedNodeMap;
 import org.w3c.dom.Node;
 
-import com.l2jmobius.commons.util.IGameXmlReader;
+import com.l2jmobius.commons.util.IXmlReader;
 import com.l2jmobius.commons.util.PropertiesParser;
 import com.l2jmobius.commons.util.StringUtil;
 import com.l2jmobius.gameserver.enums.ChatType;
@@ -3118,7 +3118,7 @@ public final class Config
 		return result;
 	}
 	
-	private static class IPConfigData implements IGameXmlReader
+	private static class IPConfigData implements IXmlReader
 	{
 		private static final List<String> _subnets = new ArrayList<>(5);
 		private static final List<String> _hosts = new ArrayList<>(5);
diff --git a/L2J_Mobius_5.5_EtinasFate/java/com/l2jmobius/commons/util/IGameXmlReader.java b/L2J_Mobius_5.5_EtinasFate/java/com/l2jmobius/commons/util/IGameXmlReader.java
deleted file mode 100644
index b29089db77..0000000000
--- a/L2J_Mobius_5.5_EtinasFate/java/com/l2jmobius/commons/util/IGameXmlReader.java
+++ /dev/null
@@ -1,118 +0,0 @@
-/*
- * This file is part of the L2J Mobius project.
- * 
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- * 
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * General Public License for more details.
- * 
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- */
-package com.l2jmobius.commons.util;
-
-import java.io.File;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
-import org.w3c.dom.NamedNodeMap;
-import org.w3c.dom.Node;
-
-import com.l2jmobius.Config;
-import com.l2jmobius.gameserver.model.Location;
-import com.l2jmobius.gameserver.model.holders.MinionHolder;
-import com.l2jmobius.gameserver.model.holders.SkillHolder;
-
-/**
- * Interface for XML parsers.
- * @author Zoey76
- */
-public interface IGameXmlReader extends IXmlReader
-{
-	/**
-	 * Wrapper for {@link #parseFile(File)} method.
-	 * @param path the relative path to the datapack root of the XML file to parse.
-	 */
-	default void parseDatapackFile(String path)
-	{
-		parseFile(new File(Config.DATAPACK_ROOT, path));
-	}
-	
-	/**
-	 * Wrapper for {@link #parseDirectory(File, boolean)}.
-	 * @param path the path to the directory where the XML files are
-	 * @param recursive parses all sub folders if there is
-	 * @return {@code false} if it fails to find the directory, {@code true} otherwise
-	 */
-	default boolean parseDatapackDirectory(String path, boolean recursive)
-	{
-		return parseDirectory(new File(Config.DATAPACK_ROOT, path), recursive);
-	}
-	
-	/**
-	 * @param n
-	 * @return a map of parameters
-	 */
-	default Map<String, Object> parseParameters(Node n)
-	{
-		final Map<String, Object> parameters = new HashMap<>();
-		for (Node parameters_node = n.getFirstChild(); parameters_node != null; parameters_node = parameters_node.getNextSibling())
-		{
-			NamedNodeMap attrs = parameters_node.getAttributes();
-			switch (parameters_node.getNodeName().toLowerCase())
-			{
-				case "param":
-				{
-					parameters.put(parseString(attrs, "name"), parseString(attrs, "value"));
-					break;
-				}
-				case "skill":
-				{
-					parameters.put(parseString(attrs, "name"), new SkillHolder(parseInteger(attrs, "id"), parseInteger(attrs, "level")));
-					break;
-				}
-				case "location":
-				{
-					parameters.put(parseString(attrs, "name"), new Location(parseInteger(attrs, "x"), parseInteger(attrs, "y"), parseInteger(attrs, "z"), parseInteger(attrs, "heading", 0)));
-					break;
-				}
-				case "minions":
-				{
-					final List<MinionHolder> minions = new ArrayList<>(1);
-					for (Node minions_node = parameters_node.getFirstChild(); minions_node != null; minions_node = minions_node.getNextSibling())
-					{
-						if (minions_node.getNodeName().equalsIgnoreCase("npc"))
-						{
-							attrs = minions_node.getAttributes();
-							minions.add(new MinionHolder(parseInteger(attrs, "id"), parseInteger(attrs, "count"), parseInteger(attrs, "respawnTime"), parseInteger(attrs, "weightPoint")));
-						}
-					}
-					
-					if (!minions.isEmpty())
-					{
-						parameters.put(parseString(parameters_node.getAttributes(), "name"), minions);
-					}
-					break;
-				}
-			}
-		}
-		return parameters;
-	}
-	
-	default Location parseLocation(Node n)
-	{
-		final NamedNodeMap attrs = n.getAttributes();
-		final int x = parseInteger(attrs, "x");
-		final int y = parseInteger(attrs, "y");
-		final int z = parseInteger(attrs, "z");
-		final int heading = parseInteger(attrs, "heading", 0);
-		return new Location(x, y, z, heading);
-	}
-}
diff --git a/L2J_Mobius_5.5_EtinasFate/java/com/l2jmobius/commons/util/IXmlReader.java b/L2J_Mobius_5.5_EtinasFate/java/com/l2jmobius/commons/util/IXmlReader.java
index 0317816fd8..4bfed2396e 100644
--- a/L2J_Mobius_5.5_EtinasFate/java/com/l2jmobius/commons/util/IXmlReader.java
+++ b/L2J_Mobius_5.5_EtinasFate/java/com/l2jmobius/commons/util/IXmlReader.java
@@ -18,8 +18,13 @@ package com.l2jmobius.commons.util;
 
 import java.io.File;
 import java.io.FileFilter;
+import java.util.ArrayList;
+import java.util.HashMap;
 import java.util.LinkedHashMap;
+import java.util.List;
 import java.util.Map;
+import java.util.concurrent.CopyOnWriteArrayList;
+import java.util.concurrent.ScheduledFuture;
 import java.util.function.Consumer;
 import java.util.function.Predicate;
 import java.util.logging.Level;
@@ -35,7 +40,12 @@ import org.w3c.dom.NodeList;
 import org.xml.sax.ErrorHandler;
 import org.xml.sax.SAXParseException;
 
+import com.l2jmobius.Config;
+import com.l2jmobius.commons.concurrent.ThreadPool;
 import com.l2jmobius.commons.util.file.filter.XMLFilter;
+import com.l2jmobius.gameserver.model.Location;
+import com.l2jmobius.gameserver.model.holders.MinionHolder;
+import com.l2jmobius.gameserver.model.holders.SkillHolder;
 
 /**
  * Interface for XML parsers.
@@ -56,6 +66,15 @@ public interface IXmlReader
 	 */
 	void load();
 	
+	/**
+	 * Wrapper for {@link #parseFile(File)} method.
+	 * @param path the relative path to the datapack root of the XML file to parse.
+	 */
+	default void parseDatapackFile(String path)
+	{
+		parseFile(new File(Config.DATAPACK_ROOT, path));
+	}
+	
 	/**
 	 * Parses a single XML file.<br>
 	 * If the file was successfully parsed, call {@link #parseDocument(Document, File)} for the parsed document.<br>
@@ -121,6 +140,17 @@ public interface IXmlReader
 		return parseDirectory(file, false);
 	}
 	
+	/**
+	 * Wrapper for {@link #parseDirectory(File, boolean)}.
+	 * @param path the path to the directory where the XML files are
+	 * @param recursive parses all sub folders if there is
+	 * @return {@code false} if it fails to find the directory, {@code true} otherwise
+	 */
+	default boolean parseDatapackDirectory(String path, boolean recursive)
+	{
+		return parseDirectory(new File(Config.DATAPACK_ROOT, path), recursive);
+	}
+	
 	/**
 	 * Loads all XML files from {@code path} and calls {@link #parseFile(File)} for each one of them.
 	 * @param dir the directory object to scan.
@@ -135,6 +165,7 @@ public interface IXmlReader
 			return false;
 		}
 		
+		final List<ScheduledFuture<?>> jobs = new CopyOnWriteArrayList<>();
 		final File[] listOfFiles = dir.listFiles();
 		for (File f : listOfFiles)
 		{
@@ -144,9 +175,23 @@ public interface IXmlReader
 			}
 			else if (getCurrentFileFilter().accept(f))
 			{
-				parseFile(f);
+				jobs.add(ThreadPool.schedule(() ->
+				{
+					parseFile(f);
+				}, 0));
 			}
 		}
+		while (!jobs.isEmpty())
+		{
+			for (ScheduledFuture<?> job : jobs)
+			{
+				if ((job == null) || job.isDone() || job.isCancelled())
+				{
+					jobs.remove(job);
+				}
+			}
+		}
+		
 		return true;
 	}
 	
@@ -531,6 +576,16 @@ public interface IXmlReader
 		return parseString(attrs.getNamedItem(name), defaultValue);
 	}
 	
+	default Location parseLocation(Node n)
+	{
+		final NamedNodeMap attrs = n.getAttributes();
+		final int x = parseInteger(attrs, "x");
+		final int y = parseInteger(attrs, "y");
+		final int z = parseInteger(attrs, "z");
+		final int heading = parseInteger(attrs, "heading", 0);
+		return new Location(x, y, z, heading);
+	}
+	
 	/**
 	 * Parses an enumerated value.
 	 * @param <T> the enumerated type
@@ -612,6 +667,56 @@ public interface IXmlReader
 		return map;
 	}
 	
+	/**
+	 * @param n
+	 * @return a map of parameters
+	 */
+	default Map<String, Object> parseParameters(Node n)
+	{
+		final Map<String, Object> parameters = new HashMap<>();
+		for (Node parameters_node = n.getFirstChild(); parameters_node != null; parameters_node = parameters_node.getNextSibling())
+		{
+			NamedNodeMap attrs = parameters_node.getAttributes();
+			switch (parameters_node.getNodeName().toLowerCase())
+			{
+				case "param":
+				{
+					parameters.put(parseString(attrs, "name"), parseString(attrs, "value"));
+					break;
+				}
+				case "skill":
+				{
+					parameters.put(parseString(attrs, "name"), new SkillHolder(parseInteger(attrs, "id"), parseInteger(attrs, "level")));
+					break;
+				}
+				case "location":
+				{
+					parameters.put(parseString(attrs, "name"), new Location(parseInteger(attrs, "x"), parseInteger(attrs, "y"), parseInteger(attrs, "z"), parseInteger(attrs, "heading", 0)));
+					break;
+				}
+				case "minions":
+				{
+					final List<MinionHolder> minions = new ArrayList<>(1);
+					for (Node minions_node = parameters_node.getFirstChild(); minions_node != null; minions_node = minions_node.getNextSibling())
+					{
+						if (minions_node.getNodeName().equalsIgnoreCase("npc"))
+						{
+							attrs = minions_node.getAttributes();
+							minions.add(new MinionHolder(parseInteger(attrs, "id"), parseInteger(attrs, "count"), parseInteger(attrs, "respawnTime"), parseInteger(attrs, "weightPoint")));
+						}
+					}
+					
+					if (!minions.isEmpty())
+					{
+						parameters.put(parseString(parameters_node.getAttributes(), "name"), minions);
+					}
+					break;
+				}
+			}
+		}
+		return parameters;
+	}
+	
 	/**
 	 * Executes action for each child of node
 	 * @param node
diff --git a/L2J_Mobius_5.5_EtinasFate/java/com/l2jmobius/gameserver/GameServer.java b/L2J_Mobius_5.5_EtinasFate/java/com/l2jmobius/gameserver/GameServer.java
index d3c858dad8..ffd419f087 100644
--- a/L2J_Mobius_5.5_EtinasFate/java/com/l2jmobius/gameserver/GameServer.java
+++ b/L2J_Mobius_5.5_EtinasFate/java/com/l2jmobius/gameserver/GameServer.java
@@ -366,7 +366,7 @@ public class GameServer
 		try
 		{
 			LOGGER.info(getClass().getSimpleName() + ": Loading server scripts:");
-			ScriptEngineManager.getInstance().executeMasterHandler();
+			ScriptEngineManager.getInstance().executeScript(ScriptEngineManager.MASTER_HANDLER_FILE);
 			ScriptEngineManager.getInstance().executeScriptList();
 		}
 		catch (Exception e)
diff --git a/L2J_Mobius_5.5_EtinasFate/java/com/l2jmobius/gameserver/data/xml/impl/ActionData.java b/L2J_Mobius_5.5_EtinasFate/java/com/l2jmobius/gameserver/data/xml/impl/ActionData.java
index 0bffdc5bb1..a322dad1d9 100644
--- a/L2J_Mobius_5.5_EtinasFate/java/com/l2jmobius/gameserver/data/xml/impl/ActionData.java
+++ b/L2J_Mobius_5.5_EtinasFate/java/com/l2jmobius/gameserver/data/xml/impl/ActionData.java
@@ -23,14 +23,14 @@ import java.util.logging.Logger;
 
 import org.w3c.dom.Document;
 
-import com.l2jmobius.commons.util.IGameXmlReader;
+import com.l2jmobius.commons.util.IXmlReader;
 import com.l2jmobius.gameserver.model.ActionDataHolder;
 import com.l2jmobius.gameserver.model.StatsSet;
 
 /**
  * @author UnAfraid
  */
-public class ActionData implements IGameXmlReader
+public class ActionData implements IXmlReader
 {
 	private static final Logger LOGGER = Logger.getLogger(ActionData.class.getName());
 	
diff --git a/L2J_Mobius_5.5_EtinasFate/java/com/l2jmobius/gameserver/data/xml/impl/AdminData.java b/L2J_Mobius_5.5_EtinasFate/java/com/l2jmobius/gameserver/data/xml/impl/AdminData.java
index 0b1d3e3245..9e359b1521 100644
--- a/L2J_Mobius_5.5_EtinasFate/java/com/l2jmobius/gameserver/data/xml/impl/AdminData.java
+++ b/L2J_Mobius_5.5_EtinasFate/java/com/l2jmobius/gameserver/data/xml/impl/AdminData.java
@@ -29,7 +29,7 @@ import org.w3c.dom.Document;
 import org.w3c.dom.NamedNodeMap;
 import org.w3c.dom.Node;
 
-import com.l2jmobius.commons.util.IGameXmlReader;
+import com.l2jmobius.commons.util.IXmlReader;
 import com.l2jmobius.gameserver.model.AccessLevel;
 import com.l2jmobius.gameserver.model.AdminCommandAccessRight;
 import com.l2jmobius.gameserver.model.StatsSet;
@@ -42,7 +42,7 @@ import com.l2jmobius.gameserver.network.serverpackets.SystemMessage;
  * Loads administrator access levels and commands.
  * @author UnAfraid
  */
-public final class AdminData implements IGameXmlReader
+public final class AdminData implements IXmlReader
 {
 	private static final Logger LOGGER = Logger.getLogger(AdminData.class.getName());
 	
diff --git a/L2J_Mobius_5.5_EtinasFate/java/com/l2jmobius/gameserver/data/xml/impl/AlchemyData.java b/L2J_Mobius_5.5_EtinasFate/java/com/l2jmobius/gameserver/data/xml/impl/AlchemyData.java
index a5d8153b82..76f7eb98b5 100644
--- a/L2J_Mobius_5.5_EtinasFate/java/com/l2jmobius/gameserver/data/xml/impl/AlchemyData.java
+++ b/L2J_Mobius_5.5_EtinasFate/java/com/l2jmobius/gameserver/data/xml/impl/AlchemyData.java
@@ -25,7 +25,7 @@ import org.w3c.dom.Document;
 import org.w3c.dom.NamedNodeMap;
 import org.w3c.dom.Node;
 
-import com.l2jmobius.commons.util.IGameXmlReader;
+import com.l2jmobius.commons.util.IXmlReader;
 import com.l2jmobius.gameserver.model.StatsSet;
 import com.l2jmobius.gameserver.model.alchemy.AlchemyCraftData;
 import com.l2jmobius.gameserver.model.holders.ItemHolder;
@@ -33,7 +33,7 @@ import com.l2jmobius.gameserver.model.holders.ItemHolder;
 /**
  * @author Sdw
  */
-public class AlchemyData implements IGameXmlReader
+public class AlchemyData implements IXmlReader
 {
 	private static final Logger LOGGER = Logger.getLogger(AlchemyData.class.getName());
 	
diff --git a/L2J_Mobius_5.5_EtinasFate/java/com/l2jmobius/gameserver/data/xml/impl/AppearanceItemData.java b/L2J_Mobius_5.5_EtinasFate/java/com/l2jmobius/gameserver/data/xml/impl/AppearanceItemData.java
index 089004322a..801c66340d 100644
--- a/L2J_Mobius_5.5_EtinasFate/java/com/l2jmobius/gameserver/data/xml/impl/AppearanceItemData.java
+++ b/L2J_Mobius_5.5_EtinasFate/java/com/l2jmobius/gameserver/data/xml/impl/AppearanceItemData.java
@@ -24,7 +24,7 @@ import java.util.logging.Logger;
 import org.w3c.dom.Document;
 import org.w3c.dom.Node;
 
-import com.l2jmobius.commons.util.IGameXmlReader;
+import com.l2jmobius.commons.util.IXmlReader;
 import com.l2jmobius.gameserver.datatables.ItemTable;
 import com.l2jmobius.gameserver.enums.Race;
 import com.l2jmobius.gameserver.model.StatsSet;
@@ -36,7 +36,7 @@ import com.l2jmobius.gameserver.model.items.type.CrystalType;
 /**
  * @author UnAfraid
  */
-public class AppearanceItemData implements IGameXmlReader
+public class AppearanceItemData implements IXmlReader
 {
 	private static final Logger LOGGER = Logger.getLogger(AppearanceItemData.class.getName());
 	
diff --git a/L2J_Mobius_5.5_EtinasFate/java/com/l2jmobius/gameserver/data/xml/impl/ArmorSetsData.java b/L2J_Mobius_5.5_EtinasFate/java/com/l2jmobius/gameserver/data/xml/impl/ArmorSetsData.java
index 54e8f6b82e..b0475692fd 100644
--- a/L2J_Mobius_5.5_EtinasFate/java/com/l2jmobius/gameserver/data/xml/impl/ArmorSetsData.java
+++ b/L2J_Mobius_5.5_EtinasFate/java/com/l2jmobius/gameserver/data/xml/impl/ArmorSetsData.java
@@ -19,9 +19,9 @@ package com.l2jmobius.gameserver.data.xml.impl;
 import java.io.File;
 import java.util.ArrayList;
 import java.util.Collections;
-import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
+import java.util.concurrent.ConcurrentHashMap;
 import java.util.logging.Logger;
 import java.util.stream.Stream;
 
@@ -29,7 +29,7 @@ import org.w3c.dom.Document;
 import org.w3c.dom.NamedNodeMap;
 import org.w3c.dom.Node;
 
-import com.l2jmobius.commons.util.IGameXmlReader;
+import com.l2jmobius.commons.util.IXmlReader;
 import com.l2jmobius.gameserver.datatables.ItemTable;
 import com.l2jmobius.gameserver.model.ArmorSet;
 import com.l2jmobius.gameserver.model.holders.ArmorsetSkillHolder;
@@ -40,12 +40,12 @@ import com.l2jmobius.gameserver.model.stats.BaseStats;
  * Loads armor set bonuses.
  * @author godson, Luno, UnAfraid
  */
-public final class ArmorSetsData implements IGameXmlReader
+public final class ArmorSetsData implements IXmlReader
 {
 	private static final Logger LOGGER = Logger.getLogger(ArmorSetsData.class.getName());
 	
-	private final Map<Integer, ArmorSet> _armorSets = new HashMap<>();
-	private final Map<Integer, List<ArmorSet>> _armorSetItems = new HashMap<>();
+	private final Map<Integer, ArmorSet> _armorSets = new ConcurrentHashMap<>();
+	private final Map<Integer, List<ArmorSet>> _armorSetItems = new ConcurrentHashMap<>();
 	
 	protected ArmorSetsData()
 	{
diff --git a/L2J_Mobius_5.5_EtinasFate/java/com/l2jmobius/gameserver/data/xml/impl/AttendanceRewardData.java b/L2J_Mobius_5.5_EtinasFate/java/com/l2jmobius/gameserver/data/xml/impl/AttendanceRewardData.java
index c60afbd78a..24e402e706 100644
--- a/L2J_Mobius_5.5_EtinasFate/java/com/l2jmobius/gameserver/data/xml/impl/AttendanceRewardData.java
+++ b/L2J_Mobius_5.5_EtinasFate/java/com/l2jmobius/gameserver/data/xml/impl/AttendanceRewardData.java
@@ -24,7 +24,7 @@ import java.util.logging.Logger;
 import org.w3c.dom.Document;
 
 import com.l2jmobius.Config;
-import com.l2jmobius.commons.util.IGameXmlReader;
+import com.l2jmobius.commons.util.IXmlReader;
 import com.l2jmobius.gameserver.datatables.ItemTable;
 import com.l2jmobius.gameserver.model.StatsSet;
 import com.l2jmobius.gameserver.model.holders.ItemHolder;
@@ -32,7 +32,7 @@ import com.l2jmobius.gameserver.model.holders.ItemHolder;
 /**
  * @author Mobius
  */
-public class AttendanceRewardData implements IGameXmlReader
+public class AttendanceRewardData implements IXmlReader
 {
 	private static Logger LOGGER = Logger.getLogger(AttendanceRewardData.class.getName());
 	private final List<ItemHolder> _rewards = new ArrayList<>();
diff --git a/L2J_Mobius_5.5_EtinasFate/java/com/l2jmobius/gameserver/data/xml/impl/BeautyShopData.java b/L2J_Mobius_5.5_EtinasFate/java/com/l2jmobius/gameserver/data/xml/impl/BeautyShopData.java
index 133f11d978..d88ccc7747 100644
--- a/L2J_Mobius_5.5_EtinasFate/java/com/l2jmobius/gameserver/data/xml/impl/BeautyShopData.java
+++ b/L2J_Mobius_5.5_EtinasFate/java/com/l2jmobius/gameserver/data/xml/impl/BeautyShopData.java
@@ -24,7 +24,7 @@ import org.w3c.dom.Document;
 import org.w3c.dom.NamedNodeMap;
 import org.w3c.dom.Node;
 
-import com.l2jmobius.commons.util.IGameXmlReader;
+import com.l2jmobius.commons.util.IXmlReader;
 import com.l2jmobius.gameserver.enums.Race;
 import com.l2jmobius.gameserver.enums.Sex;
 import com.l2jmobius.gameserver.model.StatsSet;
@@ -34,7 +34,7 @@ import com.l2jmobius.gameserver.model.beautyshop.BeautyItem;
 /**
  * @author Sdw
  */
-public final class BeautyShopData implements IGameXmlReader
+public final class BeautyShopData implements IXmlReader
 {
 	private final Map<Race, Map<Sex, BeautyData>> _beautyList = new HashMap<>();
 	private final Map<Sex, BeautyData> _beautyData = new HashMap<>();
diff --git a/L2J_Mobius_5.5_EtinasFate/java/com/l2jmobius/gameserver/data/xml/impl/BuyListData.java b/L2J_Mobius_5.5_EtinasFate/java/com/l2jmobius/gameserver/data/xml/impl/BuyListData.java
index de298ef358..8ab9ea8097 100644
--- a/L2J_Mobius_5.5_EtinasFate/java/com/l2jmobius/gameserver/data/xml/impl/BuyListData.java
+++ b/L2J_Mobius_5.5_EtinasFate/java/com/l2jmobius/gameserver/data/xml/impl/BuyListData.java
@@ -21,8 +21,8 @@ import java.io.FileFilter;
 import java.sql.Connection;
 import java.sql.ResultSet;
 import java.sql.Statement;
-import java.util.HashMap;
 import java.util.Map;
+import java.util.concurrent.ConcurrentHashMap;
 import java.util.logging.Level;
 import java.util.logging.Logger;
 
@@ -31,7 +31,7 @@ import org.w3c.dom.NamedNodeMap;
 
 import com.l2jmobius.Config;
 import com.l2jmobius.commons.database.DatabaseFactory;
-import com.l2jmobius.commons.util.IGameXmlReader;
+import com.l2jmobius.commons.util.IXmlReader;
 import com.l2jmobius.commons.util.file.filter.NumericNameFilter;
 import com.l2jmobius.gameserver.datatables.ItemTable;
 import com.l2jmobius.gameserver.model.buylist.Product;
@@ -42,11 +42,11 @@ import com.l2jmobius.gameserver.model.items.Item;
  * Loads buy lists for NPCs.
  * @author NosBit
  */
-public final class BuyListData implements IGameXmlReader
+public final class BuyListData implements IXmlReader
 {
 	private static final Logger LOGGER = Logger.getLogger(BuyListData.class.getName());
 	
-	private final Map<Integer, ProductList> _buyLists = new HashMap<>();
+	private final Map<Integer, ProductList> _buyLists = new ConcurrentHashMap<>();
 	private static final FileFilter NUMERIC_FILTER = new NumericNameFilter();
 	
 	protected BuyListData()
diff --git a/L2J_Mobius_5.5_EtinasFate/java/com/l2jmobius/gameserver/data/xml/impl/CastleData.java b/L2J_Mobius_5.5_EtinasFate/java/com/l2jmobius/gameserver/data/xml/impl/CastleData.java
index 6618dcdf1d..792afbfa0b 100644
--- a/L2J_Mobius_5.5_EtinasFate/java/com/l2jmobius/gameserver/data/xml/impl/CastleData.java
+++ b/L2J_Mobius_5.5_EtinasFate/java/com/l2jmobius/gameserver/data/xml/impl/CastleData.java
@@ -19,16 +19,16 @@ package com.l2jmobius.gameserver.data.xml.impl;
 import java.io.File;
 import java.util.ArrayList;
 import java.util.Collections;
-import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
+import java.util.concurrent.ConcurrentHashMap;
 import java.util.stream.Collectors;
 
 import org.w3c.dom.Document;
 import org.w3c.dom.NamedNodeMap;
 import org.w3c.dom.Node;
 
-import com.l2jmobius.commons.util.IGameXmlReader;
+import com.l2jmobius.commons.util.IXmlReader;
 import com.l2jmobius.gameserver.enums.CastleSide;
 import com.l2jmobius.gameserver.enums.SiegeGuardType;
 import com.l2jmobius.gameserver.model.holders.CastleSpawnHolder;
@@ -37,10 +37,10 @@ import com.l2jmobius.gameserver.model.holders.SiegeGuardHolder;
 /**
  * @author St3eT
  */
-public final class CastleData implements IGameXmlReader
+public final class CastleData implements IXmlReader
 {
-	private final Map<Integer, List<CastleSpawnHolder>> _spawns = new HashMap<>();
-	private static final Map<Integer, List<SiegeGuardHolder>> _siegeGuards = new HashMap<>();
+	private final Map<Integer, List<CastleSpawnHolder>> _spawns = new ConcurrentHashMap<>();
+	private static final Map<Integer, List<SiegeGuardHolder>> _siegeGuards = new ConcurrentHashMap<>();
 	
 	protected CastleData()
 	{
diff --git a/L2J_Mobius_5.5_EtinasFate/java/com/l2jmobius/gameserver/data/xml/impl/CategoryData.java b/L2J_Mobius_5.5_EtinasFate/java/com/l2jmobius/gameserver/data/xml/impl/CategoryData.java
index f851aa6703..df7d390dfb 100644
--- a/L2J_Mobius_5.5_EtinasFate/java/com/l2jmobius/gameserver/data/xml/impl/CategoryData.java
+++ b/L2J_Mobius_5.5_EtinasFate/java/com/l2jmobius/gameserver/data/xml/impl/CategoryData.java
@@ -27,14 +27,14 @@ import org.w3c.dom.Document;
 import org.w3c.dom.NamedNodeMap;
 import org.w3c.dom.Node;
 
-import com.l2jmobius.commons.util.IGameXmlReader;
+import com.l2jmobius.commons.util.IXmlReader;
 import com.l2jmobius.gameserver.enums.CategoryType;
 
 /**
  * Loads the category data with Class or NPC IDs.
  * @author NosBit, xban1x
  */
-public final class CategoryData implements IGameXmlReader
+public final class CategoryData implements IXmlReader
 {
 	private static final Logger LOGGER = Logger.getLogger(CategoryData.class.getName());
 	
diff --git a/L2J_Mobius_5.5_EtinasFate/java/com/l2jmobius/gameserver/data/xml/impl/ClanHallData.java b/L2J_Mobius_5.5_EtinasFate/java/com/l2jmobius/gameserver/data/xml/impl/ClanHallData.java
index 511cc7f4f7..90a1a51029 100644
--- a/L2J_Mobius_5.5_EtinasFate/java/com/l2jmobius/gameserver/data/xml/impl/ClanHallData.java
+++ b/L2J_Mobius_5.5_EtinasFate/java/com/l2jmobius/gameserver/data/xml/impl/ClanHallData.java
@@ -20,9 +20,9 @@ import java.io.File;
 import java.util.ArrayList;
 import java.util.Collection;
 import java.util.Comparator;
-import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
+import java.util.concurrent.ConcurrentHashMap;
 import java.util.logging.Logger;
 import java.util.stream.Collectors;
 
@@ -30,7 +30,7 @@ import org.w3c.dom.Document;
 import org.w3c.dom.NamedNodeMap;
 import org.w3c.dom.Node;
 
-import com.l2jmobius.commons.util.IGameXmlReader;
+import com.l2jmobius.commons.util.IXmlReader;
 import com.l2jmobius.gameserver.enums.ClanHallGrade;
 import com.l2jmobius.gameserver.enums.ClanHallType;
 import com.l2jmobius.gameserver.model.Location;
@@ -43,10 +43,10 @@ import com.l2jmobius.gameserver.model.holders.ClanHallTeleportHolder;
 /**
  * @author St3eT
  */
-public final class ClanHallData implements IGameXmlReader
+public final class ClanHallData implements IXmlReader
 {
 	private static final Logger LOGGER = Logger.getLogger(ClanHallData.class.getName());
-	private static final Map<Integer, ClanHall> _clanHalls = new HashMap<>();
+	private static final Map<Integer, ClanHall> _clanHalls = new ConcurrentHashMap<>();
 	
 	protected ClanHallData()
 	{
diff --git a/L2J_Mobius_5.5_EtinasFate/java/com/l2jmobius/gameserver/data/xml/impl/ClanMasteryData.java b/L2J_Mobius_5.5_EtinasFate/java/com/l2jmobius/gameserver/data/xml/impl/ClanMasteryData.java
index 2b4c575d33..1c3b0f7a9f 100644
--- a/L2J_Mobius_5.5_EtinasFate/java/com/l2jmobius/gameserver/data/xml/impl/ClanMasteryData.java
+++ b/L2J_Mobius_5.5_EtinasFate/java/com/l2jmobius/gameserver/data/xml/impl/ClanMasteryData.java
@@ -23,7 +23,7 @@ import java.util.logging.Logger;
 
 import org.w3c.dom.Document;
 
-import com.l2jmobius.commons.util.IGameXmlReader;
+import com.l2jmobius.commons.util.IXmlReader;
 import com.l2jmobius.gameserver.model.StatsSet;
 import com.l2jmobius.gameserver.model.holders.ClanMasteryHolder;
 import com.l2jmobius.gameserver.model.skills.Skill;
@@ -31,7 +31,7 @@ import com.l2jmobius.gameserver.model.skills.Skill;
 /**
  * @author Mobius
  */
-public class ClanMasteryData implements IGameXmlReader
+public class ClanMasteryData implements IXmlReader
 {
 	private static Logger LOGGER = Logger.getLogger(ClanMasteryData.class.getName());
 	
diff --git a/L2J_Mobius_5.5_EtinasFate/java/com/l2jmobius/gameserver/data/xml/impl/ClanRewardData.java b/L2J_Mobius_5.5_EtinasFate/java/com/l2jmobius/gameserver/data/xml/impl/ClanRewardData.java
index 252bba1c64..d5938ee964 100644
--- a/L2J_Mobius_5.5_EtinasFate/java/com/l2jmobius/gameserver/data/xml/impl/ClanRewardData.java
+++ b/L2J_Mobius_5.5_EtinasFate/java/com/l2jmobius/gameserver/data/xml/impl/ClanRewardData.java
@@ -28,7 +28,6 @@ import org.w3c.dom.Document;
 import org.w3c.dom.NamedNodeMap;
 import org.w3c.dom.Node;
 
-import com.l2jmobius.commons.util.IGameXmlReader;
 import com.l2jmobius.commons.util.IXmlReader;
 import com.l2jmobius.gameserver.enums.ClanRewardType;
 import com.l2jmobius.gameserver.model.clan.ClanRewardBonus;
@@ -38,7 +37,7 @@ import com.l2jmobius.gameserver.model.holders.SkillHolder;
 /**
  * @author UnAfraid
  */
-public class ClanRewardData implements IGameXmlReader
+public class ClanRewardData implements IXmlReader
 {
 	private static final Logger LOGGER = Logger.getLogger(ClanRewardData.class.getName());
 	private final Map<ClanRewardType, List<ClanRewardBonus>> _clanRewards = new ConcurrentHashMap<>();
diff --git a/L2J_Mobius_5.5_EtinasFate/java/com/l2jmobius/gameserver/data/xml/impl/ClanShopData.java b/L2J_Mobius_5.5_EtinasFate/java/com/l2jmobius/gameserver/data/xml/impl/ClanShopData.java
index 2ed49eee9f..006d51a7ea 100644
--- a/L2J_Mobius_5.5_EtinasFate/java/com/l2jmobius/gameserver/data/xml/impl/ClanShopData.java
+++ b/L2J_Mobius_5.5_EtinasFate/java/com/l2jmobius/gameserver/data/xml/impl/ClanShopData.java
@@ -23,7 +23,7 @@ import java.util.logging.Logger;
 
 import org.w3c.dom.Document;
 
-import com.l2jmobius.commons.util.IGameXmlReader;
+import com.l2jmobius.commons.util.IXmlReader;
 import com.l2jmobius.gameserver.datatables.ItemTable;
 import com.l2jmobius.gameserver.model.StatsSet;
 import com.l2jmobius.gameserver.model.holders.ClanShopProductHolder;
@@ -32,7 +32,7 @@ import com.l2jmobius.gameserver.model.items.Item;
 /**
  * @author Mobius
  */
-public class ClanShopData implements IGameXmlReader
+public class ClanShopData implements IXmlReader
 {
 	private static Logger LOGGER = Logger.getLogger(ClanShopData.class.getName());
 	
diff --git a/L2J_Mobius_5.5_EtinasFate/java/com/l2jmobius/gameserver/data/xml/impl/ClassListData.java b/L2J_Mobius_5.5_EtinasFate/java/com/l2jmobius/gameserver/data/xml/impl/ClassListData.java
index a40f726d50..6e99aeabfa 100644
--- a/L2J_Mobius_5.5_EtinasFate/java/com/l2jmobius/gameserver/data/xml/impl/ClassListData.java
+++ b/L2J_Mobius_5.5_EtinasFate/java/com/l2jmobius/gameserver/data/xml/impl/ClassListData.java
@@ -17,15 +17,15 @@
 package com.l2jmobius.gameserver.data.xml.impl;
 
 import java.io.File;
-import java.util.HashMap;
 import java.util.Map;
+import java.util.concurrent.ConcurrentHashMap;
 import java.util.logging.Logger;
 
 import org.w3c.dom.Document;
 import org.w3c.dom.NamedNodeMap;
 import org.w3c.dom.Node;
 
-import com.l2jmobius.commons.util.IGameXmlReader;
+import com.l2jmobius.commons.util.IXmlReader;
 import com.l2jmobius.gameserver.model.base.ClassId;
 import com.l2jmobius.gameserver.model.base.ClassInfo;
 
@@ -33,11 +33,11 @@ import com.l2jmobius.gameserver.model.base.ClassInfo;
  * Loads the the list of classes and it's info.
  * @author Zoey76
  */
-public final class ClassListData implements IGameXmlReader
+public final class ClassListData implements IXmlReader
 {
 	private static final Logger LOGGER = Logger.getLogger(ClassListData.class.getName());
 	
-	private final Map<ClassId, ClassInfo> _classData = new HashMap<>();
+	private final Map<ClassId, ClassInfo> _classData = new ConcurrentHashMap<>();
 	
 	/**
 	 * Instantiates a new class list data.
diff --git a/L2J_Mobius_5.5_EtinasFate/java/com/l2jmobius/gameserver/data/xml/impl/CombinationItemsData.java b/L2J_Mobius_5.5_EtinasFate/java/com/l2jmobius/gameserver/data/xml/impl/CombinationItemsData.java
index a7e90d5f89..c2ce205300 100644
--- a/L2J_Mobius_5.5_EtinasFate/java/com/l2jmobius/gameserver/data/xml/impl/CombinationItemsData.java
+++ b/L2J_Mobius_5.5_EtinasFate/java/com/l2jmobius/gameserver/data/xml/impl/CombinationItemsData.java
@@ -24,7 +24,7 @@ import java.util.stream.Collectors;
 
 import org.w3c.dom.Document;
 
-import com.l2jmobius.commons.util.IGameXmlReader;
+import com.l2jmobius.commons.util.IXmlReader;
 import com.l2jmobius.gameserver.datatables.ItemTable;
 import com.l2jmobius.gameserver.model.StatsSet;
 import com.l2jmobius.gameserver.model.items.combination.CombinationItem;
@@ -34,7 +34,7 @@ import com.l2jmobius.gameserver.model.items.combination.CombinationItemType;
 /**
  * @author UnAfraid
  */
-public class CombinationItemsData implements IGameXmlReader
+public class CombinationItemsData implements IXmlReader
 {
 	private static final Logger LOGGER = Logger.getLogger(CombinationItemsData.class.getName());
 	private final List<CombinationItem> _items = new ArrayList<>();
diff --git a/L2J_Mobius_5.5_EtinasFate/java/com/l2jmobius/gameserver/data/xml/impl/CubicData.java b/L2J_Mobius_5.5_EtinasFate/java/com/l2jmobius/gameserver/data/xml/impl/CubicData.java
index f682509217..ef46a08a7f 100644
--- a/L2J_Mobius_5.5_EtinasFate/java/com/l2jmobius/gameserver/data/xml/impl/CubicData.java
+++ b/L2J_Mobius_5.5_EtinasFate/java/com/l2jmobius/gameserver/data/xml/impl/CubicData.java
@@ -20,12 +20,12 @@ import java.io.File;
 import java.util.Collections;
 import java.util.HashMap;
 import java.util.Map;
+import java.util.concurrent.ConcurrentHashMap;
 import java.util.logging.Logger;
 
 import org.w3c.dom.Document;
 import org.w3c.dom.Node;
 
-import com.l2jmobius.commons.util.IGameXmlReader;
 import com.l2jmobius.commons.util.IXmlReader;
 import com.l2jmobius.gameserver.model.StatsSet;
 import com.l2jmobius.gameserver.model.actor.templates.CubicTemplate;
@@ -39,11 +39,11 @@ import com.l2jmobius.gameserver.model.cubic.conditions.RangeCondition;
 /**
  * @author UnAfraid
  */
-public class CubicData implements IGameXmlReader
+public class CubicData implements IXmlReader
 {
 	private static final Logger LOGGER = Logger.getLogger(CubicData.class.getName());
 	
-	private final Map<Integer, Map<Integer, CubicTemplate>> _cubics = new HashMap<>();
+	private final Map<Integer, Map<Integer, CubicTemplate>> _cubics = new ConcurrentHashMap<>();
 	
 	protected CubicData()
 	{
diff --git a/L2J_Mobius_5.5_EtinasFate/java/com/l2jmobius/gameserver/data/xml/impl/DailyMissionData.java b/L2J_Mobius_5.5_EtinasFate/java/com/l2jmobius/gameserver/data/xml/impl/DailyMissionData.java
index 53519f2492..1e275049d9 100644
--- a/L2J_Mobius_5.5_EtinasFate/java/com/l2jmobius/gameserver/data/xml/impl/DailyMissionData.java
+++ b/L2J_Mobius_5.5_EtinasFate/java/com/l2jmobius/gameserver/data/xml/impl/DailyMissionData.java
@@ -27,7 +27,7 @@ import java.util.stream.Collectors;
 
 import org.w3c.dom.Document;
 
-import com.l2jmobius.commons.util.IGameXmlReader;
+import com.l2jmobius.commons.util.IXmlReader;
 import com.l2jmobius.gameserver.model.DailyMissionDataHolder;
 import com.l2jmobius.gameserver.model.StatsSet;
 import com.l2jmobius.gameserver.model.actor.instance.PlayerInstance;
@@ -37,7 +37,7 @@ import com.l2jmobius.gameserver.model.holders.ItemHolder;
 /**
  * @author Sdw
  */
-public class DailyMissionData implements IGameXmlReader
+public class DailyMissionData implements IXmlReader
 {
 	private static final Logger LOGGER = Logger.getLogger(DailyMissionData.class.getName());
 	private final Map<Integer, List<DailyMissionDataHolder>> _dailyMissionRewards = new LinkedHashMap<>();
diff --git a/L2J_Mobius_5.5_EtinasFate/java/com/l2jmobius/gameserver/data/xml/impl/DoorData.java b/L2J_Mobius_5.5_EtinasFate/java/com/l2jmobius/gameserver/data/xml/impl/DoorData.java
index e8b1ff7bfa..5dd43e98eb 100644
--- a/L2J_Mobius_5.5_EtinasFate/java/com/l2jmobius/gameserver/data/xml/impl/DoorData.java
+++ b/L2J_Mobius_5.5_EtinasFate/java/com/l2jmobius/gameserver/data/xml/impl/DoorData.java
@@ -32,7 +32,6 @@ import org.w3c.dom.Document;
 import org.w3c.dom.NamedNodeMap;
 import org.w3c.dom.Node;
 
-import com.l2jmobius.commons.util.IGameXmlReader;
 import com.l2jmobius.commons.util.IXmlReader;
 import com.l2jmobius.gameserver.instancemanager.MapRegionManager;
 import com.l2jmobius.gameserver.model.Location;
@@ -45,7 +44,7 @@ import com.l2jmobius.gameserver.model.instancezone.Instance;
  * This class loads and hold info about doors.
  * @author JIV, GodKratos, UnAfraid
  */
-public final class DoorData implements IGameXmlReader
+public final class DoorData implements IXmlReader
 {
 	private static final Logger LOGGER = Logger.getLogger(DoorData.class.getName());
 	
diff --git a/L2J_Mobius_5.5_EtinasFate/java/com/l2jmobius/gameserver/data/xml/impl/EnchantItemData.java b/L2J_Mobius_5.5_EtinasFate/java/com/l2jmobius/gameserver/data/xml/impl/EnchantItemData.java
index 24e12d1218..342b4cde07 100644
--- a/L2J_Mobius_5.5_EtinasFate/java/com/l2jmobius/gameserver/data/xml/impl/EnchantItemData.java
+++ b/L2J_Mobius_5.5_EtinasFate/java/com/l2jmobius/gameserver/data/xml/impl/EnchantItemData.java
@@ -25,7 +25,7 @@ import org.w3c.dom.Document;
 import org.w3c.dom.NamedNodeMap;
 import org.w3c.dom.Node;
 
-import com.l2jmobius.commons.util.IGameXmlReader;
+import com.l2jmobius.commons.util.IXmlReader;
 import com.l2jmobius.gameserver.model.StatsSet;
 import com.l2jmobius.gameserver.model.items.enchant.EnchantScroll;
 import com.l2jmobius.gameserver.model.items.enchant.EnchantSupportItem;
@@ -35,7 +35,7 @@ import com.l2jmobius.gameserver.model.items.instance.ItemInstance;
  * Loads item enchant data.
  * @author UnAfraid
  */
-public class EnchantItemData implements IGameXmlReader
+public class EnchantItemData implements IXmlReader
 {
 	private static final Logger LOGGER = Logger.getLogger(EnchantItemData.class.getName());
 	
diff --git a/L2J_Mobius_5.5_EtinasFate/java/com/l2jmobius/gameserver/data/xml/impl/EnchantItemGroupsData.java b/L2J_Mobius_5.5_EtinasFate/java/com/l2jmobius/gameserver/data/xml/impl/EnchantItemGroupsData.java
index 666d821e42..44582a7dd4 100644
--- a/L2J_Mobius_5.5_EtinasFate/java/com/l2jmobius/gameserver/data/xml/impl/EnchantItemGroupsData.java
+++ b/L2J_Mobius_5.5_EtinasFate/java/com/l2jmobius/gameserver/data/xml/impl/EnchantItemGroupsData.java
@@ -25,7 +25,7 @@ import org.w3c.dom.Document;
 import org.w3c.dom.NamedNodeMap;
 import org.w3c.dom.Node;
 
-import com.l2jmobius.commons.util.IGameXmlReader;
+import com.l2jmobius.commons.util.IXmlReader;
 import com.l2jmobius.gameserver.datatables.ItemTable;
 import com.l2jmobius.gameserver.model.holders.RangeChanceHolder;
 import com.l2jmobius.gameserver.model.items.Item;
@@ -37,7 +37,7 @@ import com.l2jmobius.gameserver.util.Util;
 /**
  * @author UnAfraid
  */
-public final class EnchantItemGroupsData implements IGameXmlReader
+public final class EnchantItemGroupsData implements IXmlReader
 {
 	private static final Logger LOGGER = Logger.getLogger(EnchantItemGroupsData.class.getName());
 	
diff --git a/L2J_Mobius_5.5_EtinasFate/java/com/l2jmobius/gameserver/data/xml/impl/EnchantItemHPBonusData.java b/L2J_Mobius_5.5_EtinasFate/java/com/l2jmobius/gameserver/data/xml/impl/EnchantItemHPBonusData.java
index d2ce1096b5..868b1f95f6 100644
--- a/L2J_Mobius_5.5_EtinasFate/java/com/l2jmobius/gameserver/data/xml/impl/EnchantItemHPBonusData.java
+++ b/L2J_Mobius_5.5_EtinasFate/java/com/l2jmobius/gameserver/data/xml/impl/EnchantItemHPBonusData.java
@@ -26,7 +26,7 @@ import java.util.logging.Logger;
 import org.w3c.dom.Document;
 import org.w3c.dom.Node;
 
-import com.l2jmobius.commons.util.IGameXmlReader;
+import com.l2jmobius.commons.util.IXmlReader;
 import com.l2jmobius.gameserver.model.items.Item;
 import com.l2jmobius.gameserver.model.items.instance.ItemInstance;
 import com.l2jmobius.gameserver.model.items.type.CrystalType;
@@ -35,7 +35,7 @@ import com.l2jmobius.gameserver.model.items.type.CrystalType;
  * This class holds the Enchant HP Bonus Data.
  * @author MrPoke, Zoey76
  */
-public class EnchantItemHPBonusData implements IGameXmlReader
+public class EnchantItemHPBonusData implements IXmlReader
 {
 	private static final Logger LOGGER = Logger.getLogger(EnchantItemHPBonusData.class.getName());
 	
diff --git a/L2J_Mobius_5.5_EtinasFate/java/com/l2jmobius/gameserver/data/xml/impl/EnchantItemOptionsData.java b/L2J_Mobius_5.5_EtinasFate/java/com/l2jmobius/gameserver/data/xml/impl/EnchantItemOptionsData.java
index f6e9946b94..b8d805132f 100644
--- a/L2J_Mobius_5.5_EtinasFate/java/com/l2jmobius/gameserver/data/xml/impl/EnchantItemOptionsData.java
+++ b/L2J_Mobius_5.5_EtinasFate/java/com/l2jmobius/gameserver/data/xml/impl/EnchantItemOptionsData.java
@@ -24,7 +24,7 @@ import java.util.logging.Logger;
 import org.w3c.dom.Document;
 import org.w3c.dom.Node;
 
-import com.l2jmobius.commons.util.IGameXmlReader;
+import com.l2jmobius.commons.util.IXmlReader;
 import com.l2jmobius.gameserver.model.items.instance.ItemInstance;
 import com.l2jmobius.gameserver.model.options.EnchantOptions;
 import com.l2jmobius.gameserver.util.Util;
@@ -32,7 +32,7 @@ import com.l2jmobius.gameserver.util.Util;
 /**
  * @author UnAfraid
  */
-public class EnchantItemOptionsData implements IGameXmlReader
+public class EnchantItemOptionsData implements IXmlReader
 {
 	private static final Logger LOGGER = Logger.getLogger(EnchantItemOptionsData.class.getName());
 	
diff --git a/L2J_Mobius_5.5_EtinasFate/java/com/l2jmobius/gameserver/data/xml/impl/EnchantSkillGroupsData.java b/L2J_Mobius_5.5_EtinasFate/java/com/l2jmobius/gameserver/data/xml/impl/EnchantSkillGroupsData.java
index 0b557ced04..45127fe5f6 100644
--- a/L2J_Mobius_5.5_EtinasFate/java/com/l2jmobius/gameserver/data/xml/impl/EnchantSkillGroupsData.java
+++ b/L2J_Mobius_5.5_EtinasFate/java/com/l2jmobius/gameserver/data/xml/impl/EnchantSkillGroupsData.java
@@ -18,16 +18,15 @@ package com.l2jmobius.gameserver.data.xml.impl;
 
 import java.io.File;
 import java.util.Collections;
-import java.util.HashMap;
 import java.util.HashSet;
-import java.util.LinkedHashMap;
 import java.util.Map;
 import java.util.Set;
+import java.util.concurrent.ConcurrentHashMap;
 import java.util.logging.Logger;
 
 import org.w3c.dom.Document;
 
-import com.l2jmobius.commons.util.IGameXmlReader;
+import com.l2jmobius.commons.util.IXmlReader;
 import com.l2jmobius.gameserver.enums.SkillEnchantType;
 import com.l2jmobius.gameserver.model.StatsSet;
 import com.l2jmobius.gameserver.model.holders.EnchantSkillHolder;
@@ -39,12 +38,12 @@ import com.l2jmobius.gameserver.model.skills.Skill;
  * This class holds the Enchant Groups information.
  * @author Micr0
  */
-public class EnchantSkillGroupsData implements IGameXmlReader
+public class EnchantSkillGroupsData implements IXmlReader
 {
 	private static final Logger LOGGER = Logger.getLogger(EnchantSkillGroupsData.class.getName());
 	
-	private final Map<Integer, EnchantSkillHolder> _enchantSkillHolders = new LinkedHashMap<>();
-	private final Map<SkillHolder, Set<Integer>> _enchantSkillTrees = new HashMap<>();
+	private final Map<Integer, EnchantSkillHolder> _enchantSkillHolders = new ConcurrentHashMap<>();
+	private final Map<SkillHolder, Set<Integer>> _enchantSkillTrees = new ConcurrentHashMap<>();
 	
 	public static int MAX_ENCHANT_LEVEL;
 	
diff --git a/L2J_Mobius_5.5_EtinasFate/java/com/l2jmobius/gameserver/data/xml/impl/EnsoulData.java b/L2J_Mobius_5.5_EtinasFate/java/com/l2jmobius/gameserver/data/xml/impl/EnsoulData.java
index 0881f3aaec..bea9592527 100644
--- a/L2J_Mobius_5.5_EtinasFate/java/com/l2jmobius/gameserver/data/xml/impl/EnsoulData.java
+++ b/L2J_Mobius_5.5_EtinasFate/java/com/l2jmobius/gameserver/data/xml/impl/EnsoulData.java
@@ -19,16 +19,14 @@ package com.l2jmobius.gameserver.data.xml.impl;
 import java.io.File;
 import java.util.Collection;
 import java.util.Collections;
-import java.util.EnumMap;
-import java.util.HashMap;
 import java.util.Map;
+import java.util.concurrent.ConcurrentHashMap;
 import java.util.logging.Logger;
 
 import org.w3c.dom.Document;
 import org.w3c.dom.NamedNodeMap;
 import org.w3c.dom.Node;
 
-import com.l2jmobius.commons.util.IGameXmlReader;
 import com.l2jmobius.commons.util.IXmlReader;
 import com.l2jmobius.gameserver.model.ensoul.EnsoulFee;
 import com.l2jmobius.gameserver.model.ensoul.EnsoulOption;
@@ -39,12 +37,12 @@ import com.l2jmobius.gameserver.model.items.type.CrystalType;
 /**
  * @author UnAfraid
  */
-public class EnsoulData implements IGameXmlReader
+public class EnsoulData implements IXmlReader
 {
 	private static final Logger LOGGER = Logger.getLogger(EnsoulData.class.getName());
-	private final Map<CrystalType, EnsoulFee> _ensoulFees = new EnumMap<>(CrystalType.class);
-	private final Map<Integer, EnsoulOption> _ensoulOptions = new HashMap<>();
-	private final Map<Integer, EnsoulStone> _ensoulStones = new HashMap<>();
+	private final Map<CrystalType, EnsoulFee> _ensoulFees = new ConcurrentHashMap<>();
+	private final Map<Integer, EnsoulOption> _ensoulOptions = new ConcurrentHashMap<>();
+	private final Map<Integer, EnsoulStone> _ensoulStones = new ConcurrentHashMap<>();
 	
 	protected EnsoulData()
 	{
diff --git a/L2J_Mobius_5.5_EtinasFate/java/com/l2jmobius/gameserver/data/xml/impl/EventEngineData.java b/L2J_Mobius_5.5_EtinasFate/java/com/l2jmobius/gameserver/data/xml/impl/EventEngineData.java
index c43970ea31..144e2d5599 100644
--- a/L2J_Mobius_5.5_EtinasFate/java/com/l2jmobius/gameserver/data/xml/impl/EventEngineData.java
+++ b/L2J_Mobius_5.5_EtinasFate/java/com/l2jmobius/gameserver/data/xml/impl/EventEngineData.java
@@ -32,7 +32,6 @@ import org.w3c.dom.Document;
 import org.w3c.dom.NamedNodeMap;
 import org.w3c.dom.Node;
 
-import com.l2jmobius.commons.util.IGameXmlReader;
 import com.l2jmobius.commons.util.IXmlReader;
 import com.l2jmobius.gameserver.model.Location;
 import com.l2jmobius.gameserver.model.StatsSet;
@@ -54,7 +53,7 @@ import com.l2jmobius.gameserver.model.holders.SkillHolder;
 /**
  * @author UnAfraid
  */
-public final class EventEngineData implements IGameXmlReader
+public final class EventEngineData implements IXmlReader
 {
 	private static final Logger LOGGER = Logger.getLogger(EventEngineData.class.getName());
 	
diff --git a/L2J_Mobius_5.5_EtinasFate/java/com/l2jmobius/gameserver/data/xml/impl/ExperienceData.java b/L2J_Mobius_5.5_EtinasFate/java/com/l2jmobius/gameserver/data/xml/impl/ExperienceData.java
index 2daaf16220..ea9d13c2aa 100644
--- a/L2J_Mobius_5.5_EtinasFate/java/com/l2jmobius/gameserver/data/xml/impl/ExperienceData.java
+++ b/L2J_Mobius_5.5_EtinasFate/java/com/l2jmobius/gameserver/data/xml/impl/ExperienceData.java
@@ -26,13 +26,13 @@ import org.w3c.dom.NamedNodeMap;
 import org.w3c.dom.Node;
 
 import com.l2jmobius.Config;
-import com.l2jmobius.commons.util.IGameXmlReader;
+import com.l2jmobius.commons.util.IXmlReader;
 
 /**
  * This class holds the Experience points for each level for players and pets.
  * @author mrTJO
  */
-public final class ExperienceData implements IGameXmlReader
+public final class ExperienceData implements IXmlReader
 {
 	private static final Logger LOGGER = Logger.getLogger(ExperienceData.class.getName());
 	
diff --git a/L2J_Mobius_5.5_EtinasFate/java/com/l2jmobius/gameserver/data/xml/impl/ExtendDropData.java b/L2J_Mobius_5.5_EtinasFate/java/com/l2jmobius/gameserver/data/xml/impl/ExtendDropData.java
index 00af3a4f77..09da39ad14 100644
--- a/L2J_Mobius_5.5_EtinasFate/java/com/l2jmobius/gameserver/data/xml/impl/ExtendDropData.java
+++ b/L2J_Mobius_5.5_EtinasFate/java/com/l2jmobius/gameserver/data/xml/impl/ExtendDropData.java
@@ -28,7 +28,7 @@ import java.util.logging.Logger;
 import org.w3c.dom.Document;
 import org.w3c.dom.Node;
 
-import com.l2jmobius.commons.util.IGameXmlReader;
+import com.l2jmobius.commons.util.IXmlReader;
 import com.l2jmobius.gameserver.handler.ConditionHandler;
 import com.l2jmobius.gameserver.model.StatsSet;
 import com.l2jmobius.gameserver.model.conditions.ICondition;
@@ -39,7 +39,7 @@ import com.l2jmobius.gameserver.network.SystemMessageId;
 /**
  * @author Sdw
  */
-public class ExtendDropData implements IGameXmlReader
+public class ExtendDropData implements IXmlReader
 {
 	private static final Logger LOGGER = Logger.getLogger(ExtendDropData.class.getName());
 	private final Map<Integer, ExtendDropDataHolder> _extendDrop = new HashMap<>();
diff --git a/L2J_Mobius_5.5_EtinasFate/java/com/l2jmobius/gameserver/data/xml/impl/FakePlayerData.java b/L2J_Mobius_5.5_EtinasFate/java/com/l2jmobius/gameserver/data/xml/impl/FakePlayerData.java
index afb92c06d5..74b7957fd9 100644
--- a/L2J_Mobius_5.5_EtinasFate/java/com/l2jmobius/gameserver/data/xml/impl/FakePlayerData.java
+++ b/L2J_Mobius_5.5_EtinasFate/java/com/l2jmobius/gameserver/data/xml/impl/FakePlayerData.java
@@ -26,7 +26,7 @@ import java.util.logging.Logger;
 import org.w3c.dom.Document;
 
 import com.l2jmobius.Config;
-import com.l2jmobius.commons.util.IGameXmlReader;
+import com.l2jmobius.commons.util.IXmlReader;
 import com.l2jmobius.gameserver.data.sql.impl.CharNameTable;
 import com.l2jmobius.gameserver.model.StatsSet;
 import com.l2jmobius.gameserver.model.actor.templates.NpcTemplate;
@@ -35,7 +35,7 @@ import com.l2jmobius.gameserver.model.holders.FakePlayerHolder;
 /**
  * @author Mobius
  */
-public class FakePlayerData implements IGameXmlReader
+public class FakePlayerData implements IXmlReader
 {
 	private static Logger LOGGER = Logger.getLogger(FakePlayerData.class.getName());
 	
diff --git a/L2J_Mobius_5.5_EtinasFate/java/com/l2jmobius/gameserver/data/xml/impl/FenceData.java b/L2J_Mobius_5.5_EtinasFate/java/com/l2jmobius/gameserver/data/xml/impl/FenceData.java
index f51175e5fa..d36ab2e16b 100644
--- a/L2J_Mobius_5.5_EtinasFate/java/com/l2jmobius/gameserver/data/xml/impl/FenceData.java
+++ b/L2J_Mobius_5.5_EtinasFate/java/com/l2jmobius/gameserver/data/xml/impl/FenceData.java
@@ -28,7 +28,7 @@ import java.util.logging.Logger;
 import org.w3c.dom.Document;
 import org.w3c.dom.Node;
 
-import com.l2jmobius.commons.util.IGameXmlReader;
+import com.l2jmobius.commons.util.IXmlReader;
 import com.l2jmobius.gameserver.enums.FenceState;
 import com.l2jmobius.gameserver.model.StatsSet;
 import com.l2jmobius.gameserver.model.World;
@@ -39,7 +39,7 @@ import com.l2jmobius.gameserver.model.instancezone.Instance;
 /**
  * @author HoridoJoho / FBIagent
  */
-public final class FenceData implements IGameXmlReader
+public final class FenceData implements IXmlReader
 {
 	private static final Logger LOGGER = Logger.getLogger(FenceData.class.getSimpleName());
 	
diff --git a/L2J_Mobius_5.5_EtinasFate/java/com/l2jmobius/gameserver/data/xml/impl/FishingData.java b/L2J_Mobius_5.5_EtinasFate/java/com/l2jmobius/gameserver/data/xml/impl/FishingData.java
index bacf1ed08c..16436a2f5c 100644
--- a/L2J_Mobius_5.5_EtinasFate/java/com/l2jmobius/gameserver/data/xml/impl/FishingData.java
+++ b/L2J_Mobius_5.5_EtinasFate/java/com/l2jmobius/gameserver/data/xml/impl/FishingData.java
@@ -26,7 +26,7 @@ import org.w3c.dom.NamedNodeMap;
 import org.w3c.dom.Node;
 
 import com.l2jmobius.Config;
-import com.l2jmobius.commons.util.IGameXmlReader;
+import com.l2jmobius.commons.util.IXmlReader;
 import com.l2jmobius.gameserver.datatables.ItemTable;
 import com.l2jmobius.gameserver.model.fishing.FishingBait;
 import com.l2jmobius.gameserver.model.fishing.FishingCatch;
@@ -36,7 +36,7 @@ import com.l2jmobius.gameserver.model.fishing.FishingRod;
  * This class holds the Fishing information.
  * @author bit
  */
-public final class FishingData implements IGameXmlReader
+public final class FishingData implements IXmlReader
 {
 	private static final Logger LOGGER = Logger.getLogger(FishingData.class.getName());
 	private final Map<Integer, FishingBait> _baitData = new HashMap<>();
diff --git a/L2J_Mobius_5.5_EtinasFate/java/com/l2jmobius/gameserver/data/xml/impl/HennaData.java b/L2J_Mobius_5.5_EtinasFate/java/com/l2jmobius/gameserver/data/xml/impl/HennaData.java
index e27e186193..d3ac163f3c 100644
--- a/L2J_Mobius_5.5_EtinasFate/java/com/l2jmobius/gameserver/data/xml/impl/HennaData.java
+++ b/L2J_Mobius_5.5_EtinasFate/java/com/l2jmobius/gameserver/data/xml/impl/HennaData.java
@@ -27,7 +27,7 @@ import org.w3c.dom.Document;
 import org.w3c.dom.NamedNodeMap;
 import org.w3c.dom.Node;
 
-import com.l2jmobius.commons.util.IGameXmlReader;
+import com.l2jmobius.commons.util.IXmlReader;
 import com.l2jmobius.gameserver.model.StatsSet;
 import com.l2jmobius.gameserver.model.base.ClassId;
 import com.l2jmobius.gameserver.model.items.Henna;
@@ -40,7 +40,7 @@ import com.l2jmobius.gameserver.model.skills.Skill;
  * Allowed classes to wear each henna.
  * @author Zoey76, Mobius
  */
-public final class HennaData implements IGameXmlReader
+public final class HennaData implements IXmlReader
 {
 	private static final Logger LOGGER = Logger.getLogger(HennaData.class.getName());
 	
diff --git a/L2J_Mobius_5.5_EtinasFate/java/com/l2jmobius/gameserver/data/xml/impl/HitConditionBonusData.java b/L2J_Mobius_5.5_EtinasFate/java/com/l2jmobius/gameserver/data/xml/impl/HitConditionBonusData.java
index e9f2f9a87d..2d6ccf0467 100644
--- a/L2J_Mobius_5.5_EtinasFate/java/com/l2jmobius/gameserver/data/xml/impl/HitConditionBonusData.java
+++ b/L2J_Mobius_5.5_EtinasFate/java/com/l2jmobius/gameserver/data/xml/impl/HitConditionBonusData.java
@@ -23,7 +23,7 @@ import org.w3c.dom.Document;
 import org.w3c.dom.NamedNodeMap;
 import org.w3c.dom.Node;
 
-import com.l2jmobius.commons.util.IGameXmlReader;
+import com.l2jmobius.commons.util.IXmlReader;
 import com.l2jmobius.gameserver.GameTimeController;
 import com.l2jmobius.gameserver.enums.Position;
 import com.l2jmobius.gameserver.model.actor.Creature;
@@ -32,7 +32,7 @@ import com.l2jmobius.gameserver.model.actor.Creature;
  * This class load, holds and calculates the hit condition bonuses.
  * @author Nik
  */
-public final class HitConditionBonusData implements IGameXmlReader
+public final class HitConditionBonusData implements IXmlReader
 {
 	private static final Logger LOGGER = Logger.getLogger(HitConditionBonusData.class.getName());
 	
diff --git a/L2J_Mobius_5.5_EtinasFate/java/com/l2jmobius/gameserver/data/xml/impl/InitialEquipmentData.java b/L2J_Mobius_5.5_EtinasFate/java/com/l2jmobius/gameserver/data/xml/impl/InitialEquipmentData.java
index 247ea4b46d..275a23f28f 100644
--- a/L2J_Mobius_5.5_EtinasFate/java/com/l2jmobius/gameserver/data/xml/impl/InitialEquipmentData.java
+++ b/L2J_Mobius_5.5_EtinasFate/java/com/l2jmobius/gameserver/data/xml/impl/InitialEquipmentData.java
@@ -28,7 +28,7 @@ import org.w3c.dom.NamedNodeMap;
 import org.w3c.dom.Node;
 
 import com.l2jmobius.Config;
-import com.l2jmobius.commons.util.IGameXmlReader;
+import com.l2jmobius.commons.util.IXmlReader;
 import com.l2jmobius.gameserver.model.StatsSet;
 import com.l2jmobius.gameserver.model.base.ClassId;
 import com.l2jmobius.gameserver.model.items.PlayerItemTemplate;
@@ -38,7 +38,7 @@ import com.l2jmobius.gameserver.model.items.PlayerItemTemplate;
  * What items get each newly created character and if this item is equipped upon creation (<b>Requires the item to be equippable</b>).
  * @author Zoey76
  */
-public final class InitialEquipmentData implements IGameXmlReader
+public final class InitialEquipmentData implements IXmlReader
 {
 	private static final Logger LOGGER = Logger.getLogger(InitialEquipmentData.class.getName());
 	
diff --git a/L2J_Mobius_5.5_EtinasFate/java/com/l2jmobius/gameserver/data/xml/impl/InitialShortcutData.java b/L2J_Mobius_5.5_EtinasFate/java/com/l2jmobius/gameserver/data/xml/impl/InitialShortcutData.java
index 5f886bafa8..3b9e976607 100644
--- a/L2J_Mobius_5.5_EtinasFate/java/com/l2jmobius/gameserver/data/xml/impl/InitialShortcutData.java
+++ b/L2J_Mobius_5.5_EtinasFate/java/com/l2jmobius/gameserver/data/xml/impl/InitialShortcutData.java
@@ -27,7 +27,7 @@ import org.w3c.dom.Document;
 import org.w3c.dom.NamedNodeMap;
 import org.w3c.dom.Node;
 
-import com.l2jmobius.commons.util.IGameXmlReader;
+import com.l2jmobius.commons.util.IXmlReader;
 import com.l2jmobius.gameserver.enums.MacroType;
 import com.l2jmobius.gameserver.enums.ShortcutType;
 import com.l2jmobius.gameserver.model.Macro;
@@ -43,7 +43,7 @@ import com.l2jmobius.gameserver.network.serverpackets.ShortCutRegister;
  * What shortcuts get each newly created character.
  * @author Zoey76
  */
-public final class InitialShortcutData implements IGameXmlReader
+public final class InitialShortcutData implements IXmlReader
 {
 	private static final Logger LOGGER = Logger.getLogger(InitialShortcutData.class.getName());
 	
diff --git a/L2J_Mobius_5.5_EtinasFate/java/com/l2jmobius/gameserver/data/xml/impl/ItemCrystallizationData.java b/L2J_Mobius_5.5_EtinasFate/java/com/l2jmobius/gameserver/data/xml/impl/ItemCrystallizationData.java
index 86454b2b71..aa7742afa1 100644
--- a/L2J_Mobius_5.5_EtinasFate/java/com/l2jmobius/gameserver/data/xml/impl/ItemCrystallizationData.java
+++ b/L2J_Mobius_5.5_EtinasFate/java/com/l2jmobius/gameserver/data/xml/impl/ItemCrystallizationData.java
@@ -28,7 +28,7 @@ import org.w3c.dom.Document;
 import org.w3c.dom.NamedNodeMap;
 import org.w3c.dom.Node;
 
-import com.l2jmobius.commons.util.IGameXmlReader;
+import com.l2jmobius.commons.util.IXmlReader;
 import com.l2jmobius.gameserver.datatables.ItemTable;
 import com.l2jmobius.gameserver.enums.CrystallizationType;
 import com.l2jmobius.gameserver.model.holders.CrystallizationDataHolder;
@@ -42,7 +42,7 @@ import com.l2jmobius.gameserver.model.items.type.CrystalType;
 /**
  * @author UnAfraid
  */
-public final class ItemCrystallizationData implements IGameXmlReader
+public final class ItemCrystallizationData implements IXmlReader
 {
 	private static final Logger LOGGER = Logger.getLogger(ItemCrystallizationData.class.getName());
 	
diff --git a/L2J_Mobius_5.5_EtinasFate/java/com/l2jmobius/gameserver/data/xml/impl/KarmaData.java b/L2J_Mobius_5.5_EtinasFate/java/com/l2jmobius/gameserver/data/xml/impl/KarmaData.java
index ca826eba2e..bd68c38748 100644
--- a/L2J_Mobius_5.5_EtinasFate/java/com/l2jmobius/gameserver/data/xml/impl/KarmaData.java
+++ b/L2J_Mobius_5.5_EtinasFate/java/com/l2jmobius/gameserver/data/xml/impl/KarmaData.java
@@ -26,12 +26,12 @@ import org.w3c.dom.NamedNodeMap;
 import org.w3c.dom.Node;
 
 import com.l2jmobius.Config;
-import com.l2jmobius.commons.util.IGameXmlReader;
+import com.l2jmobius.commons.util.IXmlReader;
 
 /**
  * @author UnAfraid
  */
-public class KarmaData implements IGameXmlReader
+public class KarmaData implements IXmlReader
 {
 	private static final Logger LOGGER = Logger.getLogger(KarmaData.class.getName());
 	
diff --git a/L2J_Mobius_5.5_EtinasFate/java/com/l2jmobius/gameserver/data/xml/impl/LuckyGameData.java b/L2J_Mobius_5.5_EtinasFate/java/com/l2jmobius/gameserver/data/xml/impl/LuckyGameData.java
index 6759bfec3f..41c0d0fc31 100644
--- a/L2J_Mobius_5.5_EtinasFate/java/com/l2jmobius/gameserver/data/xml/impl/LuckyGameData.java
+++ b/L2J_Mobius_5.5_EtinasFate/java/com/l2jmobius/gameserver/data/xml/impl/LuckyGameData.java
@@ -23,7 +23,7 @@ import java.util.concurrent.atomic.AtomicInteger;
 
 import org.w3c.dom.Document;
 
-import com.l2jmobius.commons.util.IGameXmlReader;
+import com.l2jmobius.commons.util.IXmlReader;
 import com.l2jmobius.gameserver.model.StatsSet;
 import com.l2jmobius.gameserver.model.holders.ItemChanceHolder;
 import com.l2jmobius.gameserver.model.holders.ItemPointHolder;
@@ -32,7 +32,7 @@ import com.l2jmobius.gameserver.model.holders.LuckyGameDataHolder;
 /**
  * @author Sdw
  */
-public class LuckyGameData implements IGameXmlReader
+public class LuckyGameData implements IXmlReader
 {
 	private final Map<Integer, LuckyGameDataHolder> _luckyGame = new HashMap<>();
 	private final AtomicInteger _serverPlay = new AtomicInteger();
diff --git a/L2J_Mobius_5.5_EtinasFate/java/com/l2jmobius/gameserver/data/xml/impl/MonsterBookData.java b/L2J_Mobius_5.5_EtinasFate/java/com/l2jmobius/gameserver/data/xml/impl/MonsterBookData.java
index 50f2faefd5..9c69fe71fb 100644
--- a/L2J_Mobius_5.5_EtinasFate/java/com/l2jmobius/gameserver/data/xml/impl/MonsterBookData.java
+++ b/L2J_Mobius_5.5_EtinasFate/java/com/l2jmobius/gameserver/data/xml/impl/MonsterBookData.java
@@ -25,7 +25,7 @@ import org.w3c.dom.Document;
 import org.w3c.dom.NamedNodeMap;
 import org.w3c.dom.Node;
 
-import com.l2jmobius.commons.util.IGameXmlReader;
+import com.l2jmobius.commons.util.IXmlReader;
 import com.l2jmobius.gameserver.enums.Faction;
 import com.l2jmobius.gameserver.model.holders.MonsterBookCardHolder;
 import com.l2jmobius.gameserver.model.holders.MonsterBookRewardHolder;
@@ -33,7 +33,7 @@ import com.l2jmobius.gameserver.model.holders.MonsterBookRewardHolder;
 /**
  * @author Mobius
  */
-public class MonsterBookData implements IGameXmlReader
+public class MonsterBookData implements IXmlReader
 {
 	private static final Logger LOGGER = Logger.getLogger(MonsterBookData.class.getName());
 	private final List<MonsterBookCardHolder> _monsterBook = new ArrayList<>();
diff --git a/L2J_Mobius_5.5_EtinasFate/java/com/l2jmobius/gameserver/data/xml/impl/MultisellData.java b/L2J_Mobius_5.5_EtinasFate/java/com/l2jmobius/gameserver/data/xml/impl/MultisellData.java
index 796cd9b6f1..e9c494b91e 100644
--- a/L2J_Mobius_5.5_EtinasFate/java/com/l2jmobius/gameserver/data/xml/impl/MultisellData.java
+++ b/L2J_Mobius_5.5_EtinasFate/java/com/l2jmobius/gameserver/data/xml/impl/MultisellData.java
@@ -19,11 +19,11 @@ package com.l2jmobius.gameserver.data.xml.impl;
 import java.io.File;
 import java.io.FileFilter;
 import java.util.ArrayList;
-import java.util.HashMap;
 import java.util.HashSet;
 import java.util.List;
 import java.util.Map;
 import java.util.Set;
+import java.util.concurrent.ConcurrentHashMap;
 import java.util.logging.Level;
 import java.util.logging.Logger;
 
@@ -31,7 +31,7 @@ import org.w3c.dom.Document;
 import org.w3c.dom.Node;
 
 import com.l2jmobius.Config;
-import com.l2jmobius.commons.util.IGameXmlReader;
+import com.l2jmobius.commons.util.IXmlReader;
 import com.l2jmobius.commons.util.file.filter.NumericNameFilter;
 import com.l2jmobius.gameserver.datatables.ItemTable;
 import com.l2jmobius.gameserver.enums.SpecialItemType;
@@ -46,14 +46,14 @@ import com.l2jmobius.gameserver.model.holders.PreparedMultisellListHolder;
 import com.l2jmobius.gameserver.model.items.Item;
 import com.l2jmobius.gameserver.network.serverpackets.MultiSellList;
 
-public final class MultisellData implements IGameXmlReader
+public final class MultisellData implements IXmlReader
 {
 	private static final Logger LOGGER = Logger.getLogger(MultisellData.class.getName());
 	
 	public static final int PAGE_SIZE = 40;
 	private static final FileFilter NUMERIC_FILTER = new NumericNameFilter();
 	
-	private final Map<Integer, MultisellListHolder> _multisells = new HashMap<>();
+	private final Map<Integer, MultisellListHolder> _multisells = new ConcurrentHashMap<>();
 	
 	protected MultisellData()
 	{
diff --git a/L2J_Mobius_5.5_EtinasFate/java/com/l2jmobius/gameserver/data/xml/impl/NpcData.java b/L2J_Mobius_5.5_EtinasFate/java/com/l2jmobius/gameserver/data/xml/impl/NpcData.java
index e43e5c5147..3e1adcb420 100644
--- a/L2J_Mobius_5.5_EtinasFate/java/com/l2jmobius/gameserver/data/xml/impl/NpcData.java
+++ b/L2J_Mobius_5.5_EtinasFate/java/com/l2jmobius/gameserver/data/xml/impl/NpcData.java
@@ -26,6 +26,8 @@ import java.util.List;
 import java.util.Map;
 import java.util.Map.Entry;
 import java.util.Set;
+import java.util.concurrent.ConcurrentHashMap;
+import java.util.concurrent.CopyOnWriteArrayList;
 import java.util.function.Predicate;
 import java.util.logging.Logger;
 import java.util.stream.Collectors;
@@ -36,7 +38,7 @@ import org.w3c.dom.Node;
 
 import com.l2jmobius.Config;
 import com.l2jmobius.commons.util.CommonUtil;
-import com.l2jmobius.commons.util.IGameXmlReader;
+import com.l2jmobius.commons.util.IXmlReader;
 import com.l2jmobius.gameserver.datatables.ItemTable;
 import com.l2jmobius.gameserver.enums.AISkillScope;
 import com.l2jmobius.gameserver.enums.DropType;
@@ -52,13 +54,13 @@ import com.l2jmobius.gameserver.model.skills.Skill;
  * NPC data parser.
  * @author NosBit
  */
-public class NpcData implements IGameXmlReader
+public class NpcData implements IXmlReader
 {
 	protected static final Logger LOGGER = Logger.getLogger(NpcData.class.getName());
 	
-	private final Map<Integer, NpcTemplate> _npcs = new HashMap<>();
-	private final Map<String, Integer> _clans = new HashMap<>();
-	private static final List<Integer> _masterMonsterIDs = new ArrayList<>();
+	private final Map<Integer, NpcTemplate> _npcs = new ConcurrentHashMap<>();
+	private final Map<String, Integer> _clans = new ConcurrentHashMap<>();
+	private static final List<Integer> _masterMonsterIDs = new CopyOnWriteArrayList<>();
 	
 	protected NpcData()
 	{
diff --git a/L2J_Mobius_5.5_EtinasFate/java/com/l2jmobius/gameserver/data/xml/impl/OptionData.java b/L2J_Mobius_5.5_EtinasFate/java/com/l2jmobius/gameserver/data/xml/impl/OptionData.java
index bffa2b107c..424e2b27ad 100644
--- a/L2J_Mobius_5.5_EtinasFate/java/com/l2jmobius/gameserver/data/xml/impl/OptionData.java
+++ b/L2J_Mobius_5.5_EtinasFate/java/com/l2jmobius/gameserver/data/xml/impl/OptionData.java
@@ -18,13 +18,12 @@ package com.l2jmobius.gameserver.data.xml.impl;
 
 import java.io.File;
 import java.util.Collections;
-import java.util.HashMap;
 import java.util.Map;
+import java.util.concurrent.ConcurrentHashMap;
 import java.util.logging.Logger;
 
 import org.w3c.dom.Document;
 
-import com.l2jmobius.commons.util.IGameXmlReader;
 import com.l2jmobius.commons.util.IXmlReader;
 import com.l2jmobius.gameserver.handler.EffectHandler;
 import com.l2jmobius.gameserver.model.StatsSet;
@@ -36,11 +35,11 @@ import com.l2jmobius.gameserver.model.options.OptionsSkillType;
 /**
  * @author UnAfraid
  */
-public class OptionData implements IGameXmlReader
+public class OptionData implements IXmlReader
 {
 	private static final Logger LOGGER = Logger.getLogger(OptionData.class.getName());
 	
-	private final Map<Integer, Options> _optionData = new HashMap<>();
+	private final Map<Integer, Options> _optionData = new ConcurrentHashMap<>();
 	
 	protected OptionData()
 	{
diff --git a/L2J_Mobius_5.5_EtinasFate/java/com/l2jmobius/gameserver/data/xml/impl/PetDataTable.java b/L2J_Mobius_5.5_EtinasFate/java/com/l2jmobius/gameserver/data/xml/impl/PetDataTable.java
index 65afb75d7d..aa6975cd72 100644
--- a/L2J_Mobius_5.5_EtinasFate/java/com/l2jmobius/gameserver/data/xml/impl/PetDataTable.java
+++ b/L2J_Mobius_5.5_EtinasFate/java/com/l2jmobius/gameserver/data/xml/impl/PetDataTable.java
@@ -17,15 +17,15 @@
 package com.l2jmobius.gameserver.data.xml.impl;
 
 import java.io.File;
-import java.util.HashMap;
 import java.util.Map;
+import java.util.concurrent.ConcurrentHashMap;
 import java.util.logging.Logger;
 
 import org.w3c.dom.Document;
 import org.w3c.dom.NamedNodeMap;
 import org.w3c.dom.Node;
 
-import com.l2jmobius.commons.util.IGameXmlReader;
+import com.l2jmobius.commons.util.IXmlReader;
 import com.l2jmobius.gameserver.enums.MountType;
 import com.l2jmobius.gameserver.model.PetData;
 import com.l2jmobius.gameserver.model.PetLevelData;
@@ -36,11 +36,11 @@ import com.l2jmobius.gameserver.model.StatsSet;
  * TODO: load and use all pet parameters.
  * @author Zoey76 (rework)
  */
-public final class PetDataTable implements IGameXmlReader
+public final class PetDataTable implements IXmlReader
 {
 	private static final Logger LOGGER = Logger.getLogger(PetDataTable.class.getName());
 	
-	private final Map<Integer, PetData> _pets = new HashMap<>();
+	private final Map<Integer, PetData> _pets = new ConcurrentHashMap<>();
 	
 	/**
 	 * Instantiates a new pet data table.
diff --git a/L2J_Mobius_5.5_EtinasFate/java/com/l2jmobius/gameserver/data/xml/impl/PetSkillData.java b/L2J_Mobius_5.5_EtinasFate/java/com/l2jmobius/gameserver/data/xml/impl/PetSkillData.java
index 4872dde773..5b2f9a4408 100644
--- a/L2J_Mobius_5.5_EtinasFate/java/com/l2jmobius/gameserver/data/xml/impl/PetSkillData.java
+++ b/L2J_Mobius_5.5_EtinasFate/java/com/l2jmobius/gameserver/data/xml/impl/PetSkillData.java
@@ -27,14 +27,14 @@ import org.w3c.dom.Document;
 import org.w3c.dom.NamedNodeMap;
 import org.w3c.dom.Node;
 
-import com.l2jmobius.commons.util.IGameXmlReader;
+import com.l2jmobius.commons.util.IXmlReader;
 import com.l2jmobius.gameserver.model.actor.Summon;
 import com.l2jmobius.gameserver.model.holders.SkillHolder;
 
 /**
  * @author Mobius
  */
-public class PetSkillData implements IGameXmlReader
+public class PetSkillData implements IXmlReader
 {
 	private static Logger LOGGER = Logger.getLogger(PetSkillData.class.getName());
 	private final Map<Integer, Map<Long, SkillHolder>> _skillTrees = new HashMap<>();
diff --git a/L2J_Mobius_5.5_EtinasFate/java/com/l2jmobius/gameserver/data/xml/impl/PlayerTemplateData.java b/L2J_Mobius_5.5_EtinasFate/java/com/l2jmobius/gameserver/data/xml/impl/PlayerTemplateData.java
index 031fab8027..7a7c230b72 100644
--- a/L2J_Mobius_5.5_EtinasFate/java/com/l2jmobius/gameserver/data/xml/impl/PlayerTemplateData.java
+++ b/L2J_Mobius_5.5_EtinasFate/java/com/l2jmobius/gameserver/data/xml/impl/PlayerTemplateData.java
@@ -18,9 +18,9 @@ package com.l2jmobius.gameserver.data.xml.impl;
 
 import java.io.File;
 import java.util.ArrayList;
-import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
+import java.util.concurrent.ConcurrentHashMap;
 import java.util.logging.Logger;
 
 import org.w3c.dom.Document;
@@ -28,7 +28,7 @@ import org.w3c.dom.NamedNodeMap;
 import org.w3c.dom.Node;
 
 import com.l2jmobius.Config;
-import com.l2jmobius.commons.util.IGameXmlReader;
+import com.l2jmobius.commons.util.IXmlReader;
 import com.l2jmobius.gameserver.model.Location;
 import com.l2jmobius.gameserver.model.StatsSet;
 import com.l2jmobius.gameserver.model.actor.templates.PlayerTemplate;
@@ -38,11 +38,11 @@ import com.l2jmobius.gameserver.model.base.ClassId;
  * Loads player's base stats.
  * @author Forsaiken, Zoey76, GKR
  */
-public final class PlayerTemplateData implements IGameXmlReader
+public final class PlayerTemplateData implements IXmlReader
 {
 	private static final Logger LOGGER = Logger.getLogger(PlayerTemplateData.class.getName());
 	
-	private final Map<ClassId, PlayerTemplate> _playerTemplates = new HashMap<>();
+	private final Map<ClassId, PlayerTemplate> _playerTemplates = new ConcurrentHashMap<>();
 	
 	private int _dataCount = 0;
 	private int _autoGeneratedCount = 0;
diff --git a/L2J_Mobius_5.5_EtinasFate/java/com/l2jmobius/gameserver/data/xml/impl/PlayerXpPercentLostData.java b/L2J_Mobius_5.5_EtinasFate/java/com/l2jmobius/gameserver/data/xml/impl/PlayerXpPercentLostData.java
index 2b867a18e4..816cb7aacf 100644
--- a/L2J_Mobius_5.5_EtinasFate/java/com/l2jmobius/gameserver/data/xml/impl/PlayerXpPercentLostData.java
+++ b/L2J_Mobius_5.5_EtinasFate/java/com/l2jmobius/gameserver/data/xml/impl/PlayerXpPercentLostData.java
@@ -24,13 +24,13 @@ import org.w3c.dom.Document;
 import org.w3c.dom.NamedNodeMap;
 import org.w3c.dom.Node;
 
-import com.l2jmobius.commons.util.IGameXmlReader;
+import com.l2jmobius.commons.util.IXmlReader;
 
 /**
  * This class holds the Player Xp Percent Lost Data for each level for players.
  * @author Zealar
  */
-public final class PlayerXpPercentLostData implements IGameXmlReader
+public final class PlayerXpPercentLostData implements IXmlReader
 {
 	private static final Logger LOGGER = Logger.getLogger(PlayerXpPercentLostData.class.getName());
 	
diff --git a/L2J_Mobius_5.5_EtinasFate/java/com/l2jmobius/gameserver/data/xml/impl/PrimeShopData.java b/L2J_Mobius_5.5_EtinasFate/java/com/l2jmobius/gameserver/data/xml/impl/PrimeShopData.java
index 82ddd51f26..650d156194 100644
--- a/L2J_Mobius_5.5_EtinasFate/java/com/l2jmobius/gameserver/data/xml/impl/PrimeShopData.java
+++ b/L2J_Mobius_5.5_EtinasFate/java/com/l2jmobius/gameserver/data/xml/impl/PrimeShopData.java
@@ -27,7 +27,7 @@ import org.w3c.dom.Document;
 import org.w3c.dom.NamedNodeMap;
 import org.w3c.dom.Node;
 
-import com.l2jmobius.commons.util.IGameXmlReader;
+import com.l2jmobius.commons.util.IXmlReader;
 import com.l2jmobius.gameserver.datatables.ItemTable;
 import com.l2jmobius.gameserver.model.StatsSet;
 import com.l2jmobius.gameserver.model.actor.instance.PlayerInstance;
@@ -39,7 +39,7 @@ import com.l2jmobius.gameserver.network.serverpackets.primeshop.ExBRProductInfo;
 /**
  * @author Gnacik, UnAfraid
  */
-public class PrimeShopData implements IGameXmlReader
+public class PrimeShopData implements IXmlReader
 {
 	private static final Logger LOGGER = Logger.getLogger(PrimeShopData.class.getName());
 	
diff --git a/L2J_Mobius_5.5_EtinasFate/java/com/l2jmobius/gameserver/data/xml/impl/RecipeData.java b/L2J_Mobius_5.5_EtinasFate/java/com/l2jmobius/gameserver/data/xml/impl/RecipeData.java
index 80d9297e84..04794cd354 100644
--- a/L2J_Mobius_5.5_EtinasFate/java/com/l2jmobius/gameserver/data/xml/impl/RecipeData.java
+++ b/L2J_Mobius_5.5_EtinasFate/java/com/l2jmobius/gameserver/data/xml/impl/RecipeData.java
@@ -29,7 +29,7 @@ import org.w3c.dom.Document;
 import org.w3c.dom.NamedNodeMap;
 import org.w3c.dom.Node;
 
-import com.l2jmobius.commons.util.IGameXmlReader;
+import com.l2jmobius.commons.util.IXmlReader;
 import com.l2jmobius.gameserver.enums.StatusUpdateType;
 import com.l2jmobius.gameserver.model.StatsSet;
 import com.l2jmobius.gameserver.model.holders.ItemChanceHolder;
@@ -39,7 +39,7 @@ import com.l2jmobius.gameserver.model.holders.RecipeHolder;
 /**
  * @author Nik
  */
-public class RecipeData implements IGameXmlReader
+public class RecipeData implements IXmlReader
 {
 	private static final Logger LOGGER = Logger.getLogger(RecipeData.class.getName());
 	
diff --git a/L2J_Mobius_5.5_EtinasFate/java/com/l2jmobius/gameserver/data/xml/impl/ResidenceFunctionsData.java b/L2J_Mobius_5.5_EtinasFate/java/com/l2jmobius/gameserver/data/xml/impl/ResidenceFunctionsData.java
index 66951e9e59..094ef13149 100644
--- a/L2J_Mobius_5.5_EtinasFate/java/com/l2jmobius/gameserver/data/xml/impl/ResidenceFunctionsData.java
+++ b/L2J_Mobius_5.5_EtinasFate/java/com/l2jmobius/gameserver/data/xml/impl/ResidenceFunctionsData.java
@@ -28,7 +28,7 @@ import org.w3c.dom.Document;
 import org.w3c.dom.NamedNodeMap;
 import org.w3c.dom.Node;
 
-import com.l2jmobius.commons.util.IGameXmlReader;
+import com.l2jmobius.commons.util.IXmlReader;
 import com.l2jmobius.gameserver.model.StatsSet;
 import com.l2jmobius.gameserver.model.residences.ResidenceFunctionTemplate;
 
@@ -36,7 +36,7 @@ import com.l2jmobius.gameserver.model.residences.ResidenceFunctionTemplate;
  * The residence functions data
  * @author UnAfraid
  */
-public final class ResidenceFunctionsData implements IGameXmlReader
+public final class ResidenceFunctionsData implements IXmlReader
 {
 	private static final Logger LOGGER = Logger.getLogger(ResidenceFunctionsData.class.getName());
 	private final Map<Integer, List<ResidenceFunctionTemplate>> _functions = new HashMap<>();
diff --git a/L2J_Mobius_5.5_EtinasFate/java/com/l2jmobius/gameserver/data/xml/impl/SayuneData.java b/L2J_Mobius_5.5_EtinasFate/java/com/l2jmobius/gameserver/data/xml/impl/SayuneData.java
index 835bd96930..13b4d33b1e 100644
--- a/L2J_Mobius_5.5_EtinasFate/java/com/l2jmobius/gameserver/data/xml/impl/SayuneData.java
+++ b/L2J_Mobius_5.5_EtinasFate/java/com/l2jmobius/gameserver/data/xml/impl/SayuneData.java
@@ -26,13 +26,13 @@ import org.w3c.dom.Document;
 import org.w3c.dom.NamedNodeMap;
 import org.w3c.dom.Node;
 
-import com.l2jmobius.commons.util.IGameXmlReader;
+import com.l2jmobius.commons.util.IXmlReader;
 import com.l2jmobius.gameserver.model.SayuneEntry;
 
 /**
  * @author UnAfraid
  */
-public class SayuneData implements IGameXmlReader
+public class SayuneData implements IXmlReader
 {
 	private static final Logger LOGGER = Logger.getLogger(SayuneData.class.getName());
 	
diff --git a/L2J_Mobius_5.5_EtinasFate/java/com/l2jmobius/gameserver/data/xml/impl/SecondaryAuthData.java b/L2J_Mobius_5.5_EtinasFate/java/com/l2jmobius/gameserver/data/xml/impl/SecondaryAuthData.java
index c0ebd36146..ca85056b10 100644
--- a/L2J_Mobius_5.5_EtinasFate/java/com/l2jmobius/gameserver/data/xml/impl/SecondaryAuthData.java
+++ b/L2J_Mobius_5.5_EtinasFate/java/com/l2jmobius/gameserver/data/xml/impl/SecondaryAuthData.java
@@ -25,12 +25,12 @@ import java.util.logging.Logger;
 import org.w3c.dom.Document;
 import org.w3c.dom.Node;
 
-import com.l2jmobius.commons.util.IGameXmlReader;
+import com.l2jmobius.commons.util.IXmlReader;
 
 /**
  * @author NosBit
  */
-public class SecondaryAuthData implements IGameXmlReader
+public class SecondaryAuthData implements IXmlReader
 {
 	private static final Logger LOGGER = Logger.getLogger(SecondaryAuthData.class.getName());
 	
diff --git a/L2J_Mobius_5.5_EtinasFate/java/com/l2jmobius/gameserver/data/xml/impl/ShuttleData.java b/L2J_Mobius_5.5_EtinasFate/java/com/l2jmobius/gameserver/data/xml/impl/ShuttleData.java
index 9454d24d6b..ff26f4f409 100644
--- a/L2J_Mobius_5.5_EtinasFate/java/com/l2jmobius/gameserver/data/xml/impl/ShuttleData.java
+++ b/L2J_Mobius_5.5_EtinasFate/java/com/l2jmobius/gameserver/data/xml/impl/ShuttleData.java
@@ -27,7 +27,7 @@ import org.w3c.dom.Document;
 import org.w3c.dom.NamedNodeMap;
 import org.w3c.dom.Node;
 
-import com.l2jmobius.commons.util.IGameXmlReader;
+import com.l2jmobius.commons.util.IXmlReader;
 import com.l2jmobius.gameserver.model.Location;
 import com.l2jmobius.gameserver.model.StatsSet;
 import com.l2jmobius.gameserver.model.VehiclePathPoint;
@@ -40,7 +40,7 @@ import com.l2jmobius.gameserver.model.shuttle.ShuttleStop;
 /**
  * @author UnAfraid
  */
-public final class ShuttleData implements IGameXmlReader
+public final class ShuttleData implements IXmlReader
 {
 	private static final Logger LOGGER = Logger.getLogger(ShuttleData.class.getName());
 	
diff --git a/L2J_Mobius_5.5_EtinasFate/java/com/l2jmobius/gameserver/data/xml/impl/SiegeScheduleData.java b/L2J_Mobius_5.5_EtinasFate/java/com/l2jmobius/gameserver/data/xml/impl/SiegeScheduleData.java
index 265bf7c528..6bff09010b 100644
--- a/L2J_Mobius_5.5_EtinasFate/java/com/l2jmobius/gameserver/data/xml/impl/SiegeScheduleData.java
+++ b/L2J_Mobius_5.5_EtinasFate/java/com/l2jmobius/gameserver/data/xml/impl/SiegeScheduleData.java
@@ -27,7 +27,7 @@ import org.w3c.dom.Document;
 import org.w3c.dom.NamedNodeMap;
 import org.w3c.dom.Node;
 
-import com.l2jmobius.commons.util.IGameXmlReader;
+import com.l2jmobius.commons.util.IXmlReader;
 import com.l2jmobius.gameserver.model.SiegeScheduleDate;
 import com.l2jmobius.gameserver.model.StatsSet;
 import com.l2jmobius.gameserver.util.Util;
@@ -35,7 +35,7 @@ import com.l2jmobius.gameserver.util.Util;
 /**
  * @author UnAfraid
  */
-public class SiegeScheduleData implements IGameXmlReader
+public class SiegeScheduleData implements IXmlReader
 {
 	private static final Logger LOGGER = Logger.getLogger(SiegeScheduleData.class.getName());
 	
diff --git a/L2J_Mobius_5.5_EtinasFate/java/com/l2jmobius/gameserver/data/xml/impl/SkillData.java b/L2J_Mobius_5.5_EtinasFate/java/com/l2jmobius/gameserver/data/xml/impl/SkillData.java
index 7a1ae2e15b..64900d4d45 100644
--- a/L2J_Mobius_5.5_EtinasFate/java/com/l2jmobius/gameserver/data/xml/impl/SkillData.java
+++ b/L2J_Mobius_5.5_EtinasFate/java/com/l2jmobius/gameserver/data/xml/impl/SkillData.java
@@ -25,6 +25,7 @@ import java.util.List;
 import java.util.Map;
 import java.util.Optional;
 import java.util.Set;
+import java.util.concurrent.ConcurrentHashMap;
 import java.util.function.BiConsumer;
 import java.util.function.Function;
 import java.util.logging.Level;
@@ -35,7 +36,7 @@ import org.w3c.dom.Document;
 import org.w3c.dom.NamedNodeMap;
 import org.w3c.dom.Node;
 
-import com.l2jmobius.commons.util.IGameXmlReader;
+import com.l2jmobius.commons.util.IXmlReader;
 import com.l2jmobius.gameserver.handler.EffectHandler;
 import com.l2jmobius.gameserver.handler.SkillConditionHandler;
 import com.l2jmobius.gameserver.model.StatsSet;
@@ -51,12 +52,12 @@ import com.l2jmobius.gameserver.util.exp4j.ExpressionBuilder;
  * Skill data parser.
  * @author NosBit
  */
-public class SkillData implements IGameXmlReader
+public class SkillData implements IXmlReader
 {
 	private static final Logger LOGGER = Logger.getLogger(SkillData.class.getName());
 	
-	private final Map<Long, Skill> _skills = new HashMap<>();
-	private final Map<Integer, Integer> _skillsMaxLevel = new HashMap<>();
+	private final Map<Long, Skill> _skills = new ConcurrentHashMap<>();
+	private final Map<Integer, Integer> _skillsMaxLevel = new ConcurrentHashMap<>();
 	
 	private class NamedParamInfo
 	{
diff --git a/L2J_Mobius_5.5_EtinasFate/java/com/l2jmobius/gameserver/data/xml/impl/SkillTreesData.java b/L2J_Mobius_5.5_EtinasFate/java/com/l2jmobius/gameserver/data/xml/impl/SkillTreesData.java
index 7f667059db..780e0a1d1c 100644
--- a/L2J_Mobius_5.5_EtinasFate/java/com/l2jmobius/gameserver/data/xml/impl/SkillTreesData.java
+++ b/L2J_Mobius_5.5_EtinasFate/java/com/l2jmobius/gameserver/data/xml/impl/SkillTreesData.java
@@ -29,6 +29,7 @@ import java.util.List;
 import java.util.Map;
 import java.util.Map.Entry;
 import java.util.Set;
+import java.util.concurrent.ConcurrentHashMap;
 import java.util.concurrent.atomic.AtomicBoolean;
 import java.util.logging.Logger;
 import java.util.stream.Collectors;
@@ -38,7 +39,7 @@ import org.w3c.dom.NamedNodeMap;
 import org.w3c.dom.Node;
 
 import com.l2jmobius.Config;
-import com.l2jmobius.commons.util.IGameXmlReader;
+import com.l2jmobius.commons.util.IXmlReader;
 import com.l2jmobius.gameserver.enums.CategoryType;
 import com.l2jmobius.gameserver.enums.Race;
 import com.l2jmobius.gameserver.enums.SubclassType;
@@ -77,34 +78,34 @@ import com.l2jmobius.gameserver.model.skills.Skill;
  * For XML schema please refer to skillTrees.xsd in datapack in xsd folder and for parameters documentation refer to documentation.txt in skillTrees folder.<br>
  * @author Zoey76
  */
-public final class SkillTreesData implements IGameXmlReader
+public final class SkillTreesData implements IXmlReader
 {
 	private static final Logger LOGGER = Logger.getLogger(SkillTreesData.class.getName());
 	
 	// ClassId, Map of Skill Hash Code, SkillLearn
-	private static final Map<ClassId, Map<Long, SkillLearn>> _classSkillTrees = new HashMap<>();
-	private static final Map<ClassId, Map<Long, SkillLearn>> _transferSkillTrees = new HashMap<>();
-	private static final Map<Race, Map<Long, SkillLearn>> _raceSkillTree = new HashMap<>();
-	private static final Map<SubclassType, Map<Long, SkillLearn>> _revelationSkillTree = new HashMap<>();
-	private static final Map<ClassId, Set<Integer>> _awakeningSaveSkillTree = new HashMap<>();
+	private static final Map<ClassId, Map<Long, SkillLearn>> _classSkillTrees = new ConcurrentHashMap<>();
+	private static final Map<ClassId, Map<Long, SkillLearn>> _transferSkillTrees = new ConcurrentHashMap<>();
+	private static final Map<Race, Map<Long, SkillLearn>> _raceSkillTree = new ConcurrentHashMap<>();
+	private static final Map<SubclassType, Map<Long, SkillLearn>> _revelationSkillTree = new ConcurrentHashMap<>();
+	private static final Map<ClassId, Set<Integer>> _awakeningSaveSkillTree = new ConcurrentHashMap<>();
 	// Skill Hash Code, SkillLearn
-	private static final Map<Long, SkillLearn> _collectSkillTree = new HashMap<>();
-	private static final Map<Long, SkillLearn> _fishingSkillTree = new HashMap<>();
-	private static final Map<Long, SkillLearn> _pledgeSkillTree = new HashMap<>();
-	private static final Map<Long, SkillLearn> _subClassSkillTree = new HashMap<>();
-	private static final Map<Long, SkillLearn> _subPledgeSkillTree = new HashMap<>();
-	private static final Map<Long, SkillLearn> _transformSkillTree = new HashMap<>();
-	private static final Map<Long, SkillLearn> _commonSkillTree = new HashMap<>();
-	private static final Map<Long, SkillLearn> _abilitySkillTree = new HashMap<>();
-	private static final Map<Long, SkillLearn> _alchemySkillTree = new HashMap<>();
-	private static final Map<Long, SkillLearn> _dualClassSkillTree = new HashMap<>();
+	private static final Map<Long, SkillLearn> _collectSkillTree = new ConcurrentHashMap<>();
+	private static final Map<Long, SkillLearn> _fishingSkillTree = new ConcurrentHashMap<>();
+	private static final Map<Long, SkillLearn> _pledgeSkillTree = new ConcurrentHashMap<>();
+	private static final Map<Long, SkillLearn> _subClassSkillTree = new ConcurrentHashMap<>();
+	private static final Map<Long, SkillLearn> _subPledgeSkillTree = new ConcurrentHashMap<>();
+	private static final Map<Long, SkillLearn> _transformSkillTree = new ConcurrentHashMap<>();
+	private static final Map<Long, SkillLearn> _commonSkillTree = new ConcurrentHashMap<>();
+	private static final Map<Long, SkillLearn> _abilitySkillTree = new ConcurrentHashMap<>();
+	private static final Map<Long, SkillLearn> _alchemySkillTree = new ConcurrentHashMap<>();
+	private static final Map<Long, SkillLearn> _dualClassSkillTree = new ConcurrentHashMap<>();
 	// Other skill trees
-	private static final Map<Long, SkillLearn> _nobleSkillTree = new HashMap<>();
-	private static final Map<Long, SkillLearn> _heroSkillTree = new HashMap<>();
-	private static final Map<Long, SkillLearn> _gameMasterSkillTree = new HashMap<>();
-	private static final Map<Long, SkillLearn> _gameMasterAuraSkillTree = new HashMap<>();
+	private static final Map<Long, SkillLearn> _nobleSkillTree = new ConcurrentHashMap<>();
+	private static final Map<Long, SkillLearn> _heroSkillTree = new ConcurrentHashMap<>();
+	private static final Map<Long, SkillLearn> _gameMasterSkillTree = new ConcurrentHashMap<>();
+	private static final Map<Long, SkillLearn> _gameMasterAuraSkillTree = new ConcurrentHashMap<>();
 	// Remove skill tree
-	private static final Map<ClassId, Set<Integer>> _removeSkillCache = new HashMap<>();
+	private static final Map<ClassId, Set<Integer>> _removeSkillCache = new ConcurrentHashMap<>();
 	
 	// Checker, sorted arrays of hash codes
 	private Map<Integer, long[]> _skillsByClassIdHashCodes; // Occupation skills
@@ -112,7 +113,7 @@ public final class SkillTreesData implements IGameXmlReader
 	private long[] _allSkillsHashCodes; // Fishing, Collection, Transformations, Common Skills.
 	
 	/** Parent class Ids are read from XML and stored in this map, to allow easy customization. */
-	private static final Map<ClassId, ClassId> _parentClassMap = new HashMap<>();
+	private static final Map<ClassId, ClassId> _parentClassMap = new ConcurrentHashMap<>();
 	
 	private final AtomicBoolean _isLoading = new AtomicBoolean();
 	
diff --git a/L2J_Mobius_5.5_EtinasFate/java/com/l2jmobius/gameserver/data/xml/impl/SpawnsData.java b/L2J_Mobius_5.5_EtinasFate/java/com/l2jmobius/gameserver/data/xml/impl/SpawnsData.java
index dc41b02109..806d00902a 100644
--- a/L2J_Mobius_5.5_EtinasFate/java/com/l2jmobius/gameserver/data/xml/impl/SpawnsData.java
+++ b/L2J_Mobius_5.5_EtinasFate/java/com/l2jmobius/gameserver/data/xml/impl/SpawnsData.java
@@ -19,9 +19,10 @@ package com.l2jmobius.gameserver.data.xml.impl;
 import java.io.File;
 import java.util.ArrayList;
 import java.util.Collections;
-import java.util.LinkedList;
 import java.util.List;
 import java.util.Map;
+import java.util.concurrent.CopyOnWriteArrayList;
+import java.util.concurrent.ScheduledFuture;
 import java.util.function.Predicate;
 import java.util.logging.Level;
 import java.util.logging.Logger;
@@ -31,7 +32,7 @@ import org.w3c.dom.Document;
 import org.w3c.dom.Node;
 
 import com.l2jmobius.Config;
-import com.l2jmobius.commons.util.IGameXmlReader;
+import com.l2jmobius.commons.concurrent.ThreadPool;
 import com.l2jmobius.commons.util.IXmlReader;
 import com.l2jmobius.gameserver.model.ChanceLocation;
 import com.l2jmobius.gameserver.model.StatsSet;
@@ -49,11 +50,11 @@ import com.l2jmobius.gameserver.model.zone.type.SpawnTerritory;
 /**
  * @author UnAfraid
  */
-public class SpawnsData implements IGameXmlReader
+public class SpawnsData implements IXmlReader
 {
 	protected static final Logger LOGGER = Logger.getLogger(SpawnsData.class.getName());
 	
-	private final List<SpawnTemplate> _spawns = new LinkedList<>();
+	private final List<SpawnTemplate> _spawns = new CopyOnWriteArrayList<>();
 	
 	protected SpawnsData()
 	{
@@ -94,11 +95,28 @@ public class SpawnsData implements IGameXmlReader
 		}
 		
 		LOGGER.info(getClass().getSimpleName() + ": Initializing spawns...");
-		_spawns.stream().filter(SpawnTemplate::isSpawningByDefault).forEach(template ->
+		final List<ScheduledFuture<?>> jobs = new CopyOnWriteArrayList<>();
+		for (SpawnTemplate template : _spawns)
 		{
-			template.spawnAll(null);
-			template.notifyActivate();
-		});
+			if (template.isSpawningByDefault())
+			{
+				jobs.add(ThreadPool.schedule(() ->
+				{
+					template.spawnAll(null);
+					template.notifyActivate();
+				}, 0));
+			}
+		}
+		while (!jobs.isEmpty())
+		{
+			for (ScheduledFuture<?> job : jobs)
+			{
+				if ((job == null) || job.isDone() || job.isCancelled())
+				{
+					jobs.remove(job);
+				}
+			}
+		}
 		LOGGER.info(getClass().getSimpleName() + ": All spawns has been initialized!");
 	}
 	
diff --git a/L2J_Mobius_5.5_EtinasFate/java/com/l2jmobius/gameserver/data/xml/impl/StaticObjectData.java b/L2J_Mobius_5.5_EtinasFate/java/com/l2jmobius/gameserver/data/xml/impl/StaticObjectData.java
index 8af86bec88..5e88dd66fb 100644
--- a/L2J_Mobius_5.5_EtinasFate/java/com/l2jmobius/gameserver/data/xml/impl/StaticObjectData.java
+++ b/L2J_Mobius_5.5_EtinasFate/java/com/l2jmobius/gameserver/data/xml/impl/StaticObjectData.java
@@ -26,7 +26,7 @@ import org.w3c.dom.Document;
 import org.w3c.dom.NamedNodeMap;
 import org.w3c.dom.Node;
 
-import com.l2jmobius.commons.util.IGameXmlReader;
+import com.l2jmobius.commons.util.IXmlReader;
 import com.l2jmobius.gameserver.model.StatsSet;
 import com.l2jmobius.gameserver.model.actor.instance.StaticObjectInstance;
 import com.l2jmobius.gameserver.model.actor.templates.CreatureTemplate;
@@ -35,7 +35,7 @@ import com.l2jmobius.gameserver.model.actor.templates.CreatureTemplate;
  * This class loads and holds all static object data.
  * @author UnAfraid
  */
-public final class StaticObjectData implements IGameXmlReader
+public final class StaticObjectData implements IXmlReader
 {
 	private static final Logger LOGGER = Logger.getLogger(StaticObjectData.class.getName());
 	
diff --git a/L2J_Mobius_5.5_EtinasFate/java/com/l2jmobius/gameserver/data/xml/impl/TeleportersData.java b/L2J_Mobius_5.5_EtinasFate/java/com/l2jmobius/gameserver/data/xml/impl/TeleportersData.java
index 1d039725ad..5afec008f7 100644
--- a/L2J_Mobius_5.5_EtinasFate/java/com/l2jmobius/gameserver/data/xml/impl/TeleportersData.java
+++ b/L2J_Mobius_5.5_EtinasFate/java/com/l2jmobius/gameserver/data/xml/impl/TeleportersData.java
@@ -20,12 +20,13 @@ import java.io.File;
 import java.util.Collections;
 import java.util.HashMap;
 import java.util.Map;
+import java.util.concurrent.ConcurrentHashMap;
 import java.util.logging.Logger;
 
 import org.w3c.dom.Document;
 import org.w3c.dom.NamedNodeMap;
 
-import com.l2jmobius.commons.util.IGameXmlReader;
+import com.l2jmobius.commons.util.IXmlReader;
 import com.l2jmobius.gameserver.enums.TeleportType;
 import com.l2jmobius.gameserver.model.StatsSet;
 import com.l2jmobius.gameserver.model.teleporter.TeleportHolder;
@@ -33,12 +34,12 @@ import com.l2jmobius.gameserver.model.teleporter.TeleportHolder;
 /**
  * @author UnAfraid
  */
-public class TeleportersData implements IGameXmlReader
+public class TeleportersData implements IXmlReader
 {
 	// Logger instance
 	private static final Logger LOGGER = Logger.getLogger(TeleportersData.class.getName());
 	// Teleporter data
-	private final Map<Integer, Map<String, TeleportHolder>> _teleporters = new HashMap<>();
+	private final Map<Integer, Map<String, TeleportHolder>> _teleporters = new ConcurrentHashMap<>();
 	
 	protected TeleportersData()
 	{
diff --git a/L2J_Mobius_5.5_EtinasFate/java/com/l2jmobius/gameserver/data/xml/impl/TransformData.java b/L2J_Mobius_5.5_EtinasFate/java/com/l2jmobius/gameserver/data/xml/impl/TransformData.java
index 896111de87..d917c7e46f 100644
--- a/L2J_Mobius_5.5_EtinasFate/java/com/l2jmobius/gameserver/data/xml/impl/TransformData.java
+++ b/L2J_Mobius_5.5_EtinasFate/java/com/l2jmobius/gameserver/data/xml/impl/TransformData.java
@@ -17,15 +17,15 @@
 package com.l2jmobius.gameserver.data.xml.impl;
 
 import java.io.File;
-import java.util.HashMap;
 import java.util.Map;
+import java.util.concurrent.ConcurrentHashMap;
 import java.util.logging.Logger;
 
 import org.w3c.dom.Document;
 import org.w3c.dom.NamedNodeMap;
 import org.w3c.dom.Node;
 
-import com.l2jmobius.commons.util.IGameXmlReader;
+import com.l2jmobius.commons.util.IXmlReader;
 import com.l2jmobius.gameserver.model.StatsSet;
 import com.l2jmobius.gameserver.model.actor.transform.Transform;
 import com.l2jmobius.gameserver.model.actor.transform.TransformLevelData;
@@ -39,11 +39,11 @@ import com.l2jmobius.gameserver.network.serverpackets.ExBasicActionList;
  * Transformation data.
  * @author UnAfraid
  */
-public final class TransformData implements IGameXmlReader
+public final class TransformData implements IXmlReader
 {
 	private static final Logger LOGGER = Logger.getLogger(TransformData.class.getName());
 	
-	private final Map<Integer, Transform> _transformData = new HashMap<>();
+	private final Map<Integer, Transform> _transformData = new ConcurrentHashMap<>();
 	
 	protected TransformData()
 	{
diff --git a/L2J_Mobius_5.5_EtinasFate/java/com/l2jmobius/gameserver/data/xml/impl/VariationData.java b/L2J_Mobius_5.5_EtinasFate/java/com/l2jmobius/gameserver/data/xml/impl/VariationData.java
index 13b41c6359..542acc971b 100644
--- a/L2J_Mobius_5.5_EtinasFate/java/com/l2jmobius/gameserver/data/xml/impl/VariationData.java
+++ b/L2J_Mobius_5.5_EtinasFate/java/com/l2jmobius/gameserver/data/xml/impl/VariationData.java
@@ -22,11 +22,12 @@ import java.util.Collections;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
+import java.util.concurrent.ConcurrentHashMap;
 import java.util.logging.Logger;
 
 import org.w3c.dom.Document;
 
-import com.l2jmobius.commons.util.IGameXmlReader;
+import com.l2jmobius.commons.util.IXmlReader;
 import com.l2jmobius.gameserver.datatables.ItemTable;
 import com.l2jmobius.gameserver.model.VariationInstance;
 import com.l2jmobius.gameserver.model.items.instance.ItemInstance;
@@ -40,12 +41,12 @@ import com.l2jmobius.gameserver.model.options.VariationWeaponType;
 /**
  * @author Pere
  */
-public class VariationData implements IGameXmlReader
+public class VariationData implements IXmlReader
 {
 	private static final Logger LOGGER = Logger.getLogger(VariationData.class.getSimpleName());
 	
-	private final Map<Integer, Variation> _variations = new HashMap<>();
-	private final Map<Integer, Map<Integer, VariationFee>> _fees = new HashMap<>();
+	private final Map<Integer, Variation> _variations = new ConcurrentHashMap<>();
+	private final Map<Integer, Map<Integer, VariationFee>> _fees = new ConcurrentHashMap<>();
 	
 	protected VariationData()
 	{
diff --git a/L2J_Mobius_5.5_EtinasFate/java/com/l2jmobius/gameserver/engines/DocumentEngine.java b/L2J_Mobius_5.5_EtinasFate/java/com/l2jmobius/gameserver/engines/DocumentEngine.java
index d787488757..10f04f4fb3 100644
--- a/L2J_Mobius_5.5_EtinasFate/java/com/l2jmobius/gameserver/engines/DocumentEngine.java
+++ b/L2J_Mobius_5.5_EtinasFate/java/com/l2jmobius/gameserver/engines/DocumentEngine.java
@@ -17,11 +17,14 @@
 package com.l2jmobius.gameserver.engines;
 
 import java.io.File;
-import java.util.LinkedList;
+import java.util.ArrayList;
 import java.util.List;
+import java.util.concurrent.CopyOnWriteArrayList;
+import java.util.concurrent.ScheduledFuture;
 import java.util.logging.Logger;
 
 import com.l2jmobius.Config;
+import com.l2jmobius.commons.concurrent.ThreadPool;
 import com.l2jmobius.commons.util.file.filter.XMLFilter;
 import com.l2jmobius.gameserver.engines.items.DocumentItem;
 import com.l2jmobius.gameserver.model.items.Item;
@@ -33,34 +36,29 @@ public class DocumentEngine
 {
 	private static final Logger LOGGER = Logger.getLogger(DocumentEngine.class.getName());
 	
-	private final List<File> _itemFiles = new LinkedList<>();
-	
-	public static DocumentEngine getInstance()
-	{
-		return SingletonHolder._instance;
-	}
+	private final List<File> _itemFiles = new ArrayList<>();
 	
 	protected DocumentEngine()
 	{
-		hashFiles("data/stats/items", _itemFiles);
+		processDirectory("data/stats/items", _itemFiles);
 		if (Config.CUSTOM_ITEMS_LOAD)
 		{
-			hashFiles("data/stats/items/custom", _itemFiles);
+			processDirectory("data/stats/items/custom", _itemFiles);
 		}
 	}
 	
-	private void hashFiles(String dirname, List<File> hash)
+	private void processDirectory(String dirName, List<File> list)
 	{
-		final File dir = new File(Config.DATAPACK_ROOT, dirname);
+		final File dir = new File(Config.DATAPACK_ROOT, dirName);
 		if (!dir.exists())
 		{
-			LOGGER.warning("Dir " + dir.getAbsolutePath() + " not exists");
+			LOGGER.warning("Dir " + dir.getAbsolutePath() + " does not exist.");
 			return;
 		}
 		final File[] files = dir.listFiles(new XMLFilter());
-		for (File f : files)
+		for (File file : files)
 		{
-			hash.add(f);
+			list.add(file);
 		}
 	}
 	
@@ -70,12 +68,26 @@ public class DocumentEngine
 	 */
 	public List<Item> loadItems()
 	{
-		final List<Item> list = new LinkedList<>();
-		for (File f : _itemFiles)
+		final List<Item> list = new CopyOnWriteArrayList<>();
+		final List<ScheduledFuture<?>> jobs = new CopyOnWriteArrayList<>();
+		for (File file : _itemFiles)
 		{
-			final DocumentItem document = new DocumentItem(f);
-			document.parse();
-			list.addAll(document.getItemList());
+			jobs.add(ThreadPool.schedule(() ->
+			{
+				final DocumentItem document = new DocumentItem(file);
+				document.parse();
+				list.addAll(document.getItemList());
+			}, 0));
+		}
+		while (!jobs.isEmpty())
+		{
+			for (ScheduledFuture<?> job : jobs)
+			{
+				if ((job == null) || job.isDone() || job.isCancelled())
+				{
+					jobs.remove(job);
+				}
+			}
 		}
 		return list;
 	}
@@ -84,4 +96,9 @@ public class DocumentEngine
 	{
 		protected static final DocumentEngine _instance = new DocumentEngine();
 	}
+	
+	public static DocumentEngine getInstance()
+	{
+		return SingletonHolder._instance;
+	}
 }
diff --git a/L2J_Mobius_5.5_EtinasFate/java/com/l2jmobius/gameserver/engines/items/DocumentItem.java b/L2J_Mobius_5.5_EtinasFate/java/com/l2jmobius/gameserver/engines/items/DocumentItem.java
index 8aaaed2cb4..4ea960563d 100644
--- a/L2J_Mobius_5.5_EtinasFate/java/com/l2jmobius/gameserver/engines/items/DocumentItem.java
+++ b/L2J_Mobius_5.5_EtinasFate/java/com/l2jmobius/gameserver/engines/items/DocumentItem.java
@@ -19,7 +19,7 @@ package com.l2jmobius.gameserver.engines.items;
 import java.io.File;
 import java.lang.reflect.Constructor;
 import java.lang.reflect.InvocationTargetException;
-import java.util.LinkedList;
+import java.util.ArrayList;
 import java.util.List;
 import java.util.logging.Level;
 import java.util.logging.Logger;
@@ -27,7 +27,7 @@ import java.util.logging.Logger;
 import org.w3c.dom.Document;
 import org.w3c.dom.Node;
 
-import com.l2jmobius.commons.util.IGameXmlReader;
+import com.l2jmobius.commons.util.IXmlReader;
 import com.l2jmobius.gameserver.engines.DocumentBase;
 import com.l2jmobius.gameserver.enums.ItemSkillType;
 import com.l2jmobius.gameserver.model.ExtractableProduct;
@@ -41,12 +41,12 @@ import com.l2jmobius.gameserver.model.stats.functions.FuncTemplate;
 /**
  * @author mkizub, JIV
  */
-public final class DocumentItem extends DocumentBase implements IGameXmlReader
+public final class DocumentItem extends DocumentBase implements IXmlReader
 {
 	Logger LOGGER = Logger.getLogger(DocumentItem.class.getName());
 	
 	private ItemDataHolder _currentItem = null;
-	private final List<Item> _itemsInFile = new LinkedList<>();
+	private final List<Item> _itemsInFile = new ArrayList<>();
 	
 	/**
 	 * @param file
diff --git a/L2J_Mobius_5.5_EtinasFate/java/com/l2jmobius/gameserver/handler/ConditionHandler.java b/L2J_Mobius_5.5_EtinasFate/java/com/l2jmobius/gameserver/handler/ConditionHandler.java
index c92ef368b3..4e20d5e720 100644
--- a/L2J_Mobius_5.5_EtinasFate/java/com/l2jmobius/gameserver/handler/ConditionHandler.java
+++ b/L2J_Mobius_5.5_EtinasFate/java/com/l2jmobius/gameserver/handler/ConditionHandler.java
@@ -50,7 +50,7 @@ public final class ConditionHandler
 	{
 		try
 		{
-			ScriptEngineManager.getInstance().executeConditionMasterHandler();
+			ScriptEngineManager.getInstance().executeScript(ScriptEngineManager.CONDITION_HANDLER_FILE);
 		}
 		catch (Exception e)
 		{
diff --git a/L2J_Mobius_5.5_EtinasFate/java/com/l2jmobius/gameserver/handler/DailyMissionHandler.java b/L2J_Mobius_5.5_EtinasFate/java/com/l2jmobius/gameserver/handler/DailyMissionHandler.java
index 9a80c1db8f..6b6248da49 100644
--- a/L2J_Mobius_5.5_EtinasFate/java/com/l2jmobius/gameserver/handler/DailyMissionHandler.java
+++ b/L2J_Mobius_5.5_EtinasFate/java/com/l2jmobius/gameserver/handler/DailyMissionHandler.java
@@ -49,7 +49,7 @@ public class DailyMissionHandler
 	{
 		try
 		{
-			ScriptEngineManager.getInstance().executeDailyMissionMasterHandler();
+			ScriptEngineManager.getInstance().executeScript(ScriptEngineManager.ONE_DAY_REWARD_MASTER_HANDLER);
 		}
 		catch (Exception e)
 		{
diff --git a/L2J_Mobius_5.5_EtinasFate/java/com/l2jmobius/gameserver/handler/EffectHandler.java b/L2J_Mobius_5.5_EtinasFate/java/com/l2jmobius/gameserver/handler/EffectHandler.java
index 0bf5350cb8..cab6562421 100644
--- a/L2J_Mobius_5.5_EtinasFate/java/com/l2jmobius/gameserver/handler/EffectHandler.java
+++ b/L2J_Mobius_5.5_EtinasFate/java/com/l2jmobius/gameserver/handler/EffectHandler.java
@@ -50,7 +50,7 @@ public final class EffectHandler
 	{
 		try
 		{
-			ScriptEngineManager.getInstance().executeEffectMasterHandler();
+			ScriptEngineManager.getInstance().executeScript(ScriptEngineManager.EFFECT_MASTER_HANDLER_FILE);
 		}
 		catch (Exception e)
 		{
diff --git a/L2J_Mobius_5.5_EtinasFate/java/com/l2jmobius/gameserver/handler/SkillConditionHandler.java b/L2J_Mobius_5.5_EtinasFate/java/com/l2jmobius/gameserver/handler/SkillConditionHandler.java
index b764410ba1..8685b0279a 100644
--- a/L2J_Mobius_5.5_EtinasFate/java/com/l2jmobius/gameserver/handler/SkillConditionHandler.java
+++ b/L2J_Mobius_5.5_EtinasFate/java/com/l2jmobius/gameserver/handler/SkillConditionHandler.java
@@ -50,7 +50,7 @@ public final class SkillConditionHandler
 	{
 		try
 		{
-			ScriptEngineManager.getInstance().executeSkillConditionMasterHandler();
+			ScriptEngineManager.getInstance().executeScript(ScriptEngineManager.SKILL_CONDITION_HANDLER_FILE);
 		}
 		catch (Exception e)
 		{
diff --git a/L2J_Mobius_5.5_EtinasFate/java/com/l2jmobius/gameserver/instancemanager/CastleManorManager.java b/L2J_Mobius_5.5_EtinasFate/java/com/l2jmobius/gameserver/instancemanager/CastleManorManager.java
index 48d04d3f38..212d1a043c 100644
--- a/L2J_Mobius_5.5_EtinasFate/java/com/l2jmobius/gameserver/instancemanager/CastleManorManager.java
+++ b/L2J_Mobius_5.5_EtinasFate/java/com/l2jmobius/gameserver/instancemanager/CastleManorManager.java
@@ -40,7 +40,7 @@ import org.w3c.dom.Node;
 import com.l2jmobius.Config;
 import com.l2jmobius.commons.concurrent.ThreadPool;
 import com.l2jmobius.commons.database.DatabaseFactory;
-import com.l2jmobius.commons.util.IGameXmlReader;
+import com.l2jmobius.commons.util.IXmlReader;
 import com.l2jmobius.commons.util.Rnd;
 import com.l2jmobius.gameserver.enums.ManorMode;
 import com.l2jmobius.gameserver.model.CropProcure;
@@ -58,7 +58,7 @@ import com.l2jmobius.gameserver.network.SystemMessageId;
  * Castle manor system.
  * @author malyelfik
  */
-public final class CastleManorManager implements IGameXmlReader, IStorable
+public final class CastleManorManager implements IXmlReader, IStorable
 {
 	private static final Logger LOGGER = Logger.getLogger(CastleManorManager.class.getName());
 	
diff --git a/L2J_Mobius_5.5_EtinasFate/java/com/l2jmobius/gameserver/instancemanager/CursedWeaponsManager.java b/L2J_Mobius_5.5_EtinasFate/java/com/l2jmobius/gameserver/instancemanager/CursedWeaponsManager.java
index d123b41ef6..835d961c56 100644
--- a/L2J_Mobius_5.5_EtinasFate/java/com/l2jmobius/gameserver/instancemanager/CursedWeaponsManager.java
+++ b/L2J_Mobius_5.5_EtinasFate/java/com/l2jmobius/gameserver/instancemanager/CursedWeaponsManager.java
@@ -35,7 +35,7 @@ import org.w3c.dom.Node;
 
 import com.l2jmobius.Config;
 import com.l2jmobius.commons.database.DatabaseFactory;
-import com.l2jmobius.commons.util.IGameXmlReader;
+import com.l2jmobius.commons.util.IXmlReader;
 import com.l2jmobius.gameserver.model.CursedWeapon;
 import com.l2jmobius.gameserver.model.actor.Attackable;
 import com.l2jmobius.gameserver.model.actor.Creature;
@@ -54,7 +54,7 @@ import com.l2jmobius.gameserver.util.Broadcast;
  * UnAfraid: TODO: Rewrite with DocumentParser
  * @author Micht
  */
-public final class CursedWeaponsManager implements IGameXmlReader
+public final class CursedWeaponsManager implements IXmlReader
 {
 	private static final Logger LOGGER = Logger.getLogger(CursedWeaponsManager.class.getName());
 	
diff --git a/L2J_Mobius_5.5_EtinasFate/java/com/l2jmobius/gameserver/instancemanager/FakePlayerChatManager.java b/L2J_Mobius_5.5_EtinasFate/java/com/l2jmobius/gameserver/instancemanager/FakePlayerChatManager.java
index 7101927e48..39c239a762 100644
--- a/L2J_Mobius_5.5_EtinasFate/java/com/l2jmobius/gameserver/instancemanager/FakePlayerChatManager.java
+++ b/L2J_Mobius_5.5_EtinasFate/java/com/l2jmobius/gameserver/instancemanager/FakePlayerChatManager.java
@@ -25,7 +25,7 @@ import org.w3c.dom.Document;
 
 import com.l2jmobius.Config;
 import com.l2jmobius.commons.concurrent.ThreadPool;
-import com.l2jmobius.commons.util.IGameXmlReader;
+import com.l2jmobius.commons.util.IXmlReader;
 import com.l2jmobius.commons.util.Rnd;
 import com.l2jmobius.gameserver.data.xml.impl.FakePlayerData;
 import com.l2jmobius.gameserver.datatables.SpawnTable;
@@ -41,7 +41,7 @@ import com.l2jmobius.gameserver.network.serverpackets.CreatureSay;
 /**
  * @author Mobius
  */
-public final class FakePlayerChatManager implements IGameXmlReader
+public final class FakePlayerChatManager implements IXmlReader
 {
 	private static Logger LOGGER = Logger.getLogger(FakePlayerChatManager.class.getName());
 	final List<FakePlayerChatHolder> MESSAGES = new ArrayList<>();
diff --git a/L2J_Mobius_5.5_EtinasFate/java/com/l2jmobius/gameserver/instancemanager/InstanceManager.java b/L2J_Mobius_5.5_EtinasFate/java/com/l2jmobius/gameserver/instancemanager/InstanceManager.java
index f300213c49..5ea229cf1b 100644
--- a/L2J_Mobius_5.5_EtinasFate/java/com/l2jmobius/gameserver/instancemanager/InstanceManager.java
+++ b/L2J_Mobius_5.5_EtinasFate/java/com/l2jmobius/gameserver/instancemanager/InstanceManager.java
@@ -40,7 +40,6 @@ import org.w3c.dom.Node;
 
 import com.l2jmobius.Config;
 import com.l2jmobius.commons.database.DatabaseFactory;
-import com.l2jmobius.commons.util.IGameXmlReader;
 import com.l2jmobius.commons.util.IXmlReader;
 import com.l2jmobius.gameserver.data.xml.impl.DoorData;
 import com.l2jmobius.gameserver.data.xml.impl.SpawnsData;
@@ -61,7 +60,7 @@ import com.l2jmobius.gameserver.model.spawns.SpawnTemplate;
  * Instance manager.
  * @author evill33t, GodKratos, malyelfik
  */
-public final class InstanceManager implements IGameXmlReader
+public final class InstanceManager implements IXmlReader
 {
 	private static final Logger LOGGER = Logger.getLogger(InstanceManager.class.getName());
 	// Database query
diff --git a/L2J_Mobius_5.5_EtinasFate/java/com/l2jmobius/gameserver/instancemanager/ItemAuctionManager.java b/L2J_Mobius_5.5_EtinasFate/java/com/l2jmobius/gameserver/instancemanager/ItemAuctionManager.java
index f819adf93b..752bcfdd3f 100644
--- a/L2J_Mobius_5.5_EtinasFate/java/com/l2jmobius/gameserver/instancemanager/ItemAuctionManager.java
+++ b/L2J_Mobius_5.5_EtinasFate/java/com/l2jmobius/gameserver/instancemanager/ItemAuctionManager.java
@@ -34,13 +34,13 @@ import org.w3c.dom.Node;
 
 import com.l2jmobius.Config;
 import com.l2jmobius.commons.database.DatabaseFactory;
-import com.l2jmobius.commons.util.IGameXmlReader;
+import com.l2jmobius.commons.util.IXmlReader;
 import com.l2jmobius.gameserver.model.itemauction.ItemAuctionInstance;
 
 /**
  * @author Forsaiken
  */
-public final class ItemAuctionManager implements IGameXmlReader
+public final class ItemAuctionManager implements IXmlReader
 {
 	private static final Logger LOGGER = Logger.getLogger(ItemAuctionManager.class.getName());
 	
diff --git a/L2J_Mobius_5.5_EtinasFate/java/com/l2jmobius/gameserver/instancemanager/MapRegionManager.java b/L2J_Mobius_5.5_EtinasFate/java/com/l2jmobius/gameserver/instancemanager/MapRegionManager.java
index 255d4340ff..8f68a4bdf5 100644
--- a/L2J_Mobius_5.5_EtinasFate/java/com/l2jmobius/gameserver/instancemanager/MapRegionManager.java
+++ b/L2J_Mobius_5.5_EtinasFate/java/com/l2jmobius/gameserver/instancemanager/MapRegionManager.java
@@ -27,7 +27,7 @@ import org.w3c.dom.NamedNodeMap;
 import org.w3c.dom.Node;
 
 import com.l2jmobius.Config;
-import com.l2jmobius.commons.util.IGameXmlReader;
+import com.l2jmobius.commons.util.IXmlReader;
 import com.l2jmobius.gameserver.data.xml.impl.ClanHallData;
 import com.l2jmobius.gameserver.model.Location;
 import com.l2jmobius.gameserver.model.MapRegion;
@@ -47,7 +47,7 @@ import com.l2jmobius.gameserver.model.zone.type.RespawnZone;
  * Map Region Manager.
  * @author Nyaran
  */
-public final class MapRegionManager implements IGameXmlReader
+public final class MapRegionManager implements IXmlReader
 {
 	private static final Logger LOGGER = Logger.getLogger(MapRegionManager.class.getName());
 	
diff --git a/L2J_Mobius_5.5_EtinasFate/java/com/l2jmobius/gameserver/instancemanager/SellBuffsManager.java b/L2J_Mobius_5.5_EtinasFate/java/com/l2jmobius/gameserver/instancemanager/SellBuffsManager.java
index dcf1bae346..0c4e94f449 100644
--- a/L2J_Mobius_5.5_EtinasFate/java/com/l2jmobius/gameserver/instancemanager/SellBuffsManager.java
+++ b/L2J_Mobius_5.5_EtinasFate/java/com/l2jmobius/gameserver/instancemanager/SellBuffsManager.java
@@ -26,7 +26,7 @@ import org.w3c.dom.Element;
 import org.w3c.dom.NodeList;
 
 import com.l2jmobius.Config;
-import com.l2jmobius.commons.util.IGameXmlReader;
+import com.l2jmobius.commons.util.IXmlReader;
 import com.l2jmobius.gameserver.cache.HtmCache;
 import com.l2jmobius.gameserver.data.xml.impl.SkillData;
 import com.l2jmobius.gameserver.datatables.ItemTable;
@@ -46,7 +46,7 @@ import com.l2jmobius.gameserver.util.Util;
  * Sell Buffs Manager
  * @author St3eT
  */
-public final class SellBuffsManager implements IGameXmlReader
+public final class SellBuffsManager implements IXmlReader
 {
 	private static final Logger LOGGER = Logger.getLogger(SellBuffsManager.class.getName());
 	private static final List<Integer> ALLOWED_BUFFS = new ArrayList<>();
diff --git a/L2J_Mobius_5.5_EtinasFate/java/com/l2jmobius/gameserver/instancemanager/WalkingManager.java b/L2J_Mobius_5.5_EtinasFate/java/com/l2jmobius/gameserver/instancemanager/WalkingManager.java
index 4583519bc4..18c4814040 100644
--- a/L2J_Mobius_5.5_EtinasFate/java/com/l2jmobius/gameserver/instancemanager/WalkingManager.java
+++ b/L2J_Mobius_5.5_EtinasFate/java/com/l2jmobius/gameserver/instancemanager/WalkingManager.java
@@ -28,7 +28,7 @@ import org.w3c.dom.NamedNodeMap;
 import org.w3c.dom.Node;
 
 import com.l2jmobius.commons.concurrent.ThreadPool;
-import com.l2jmobius.commons.util.IGameXmlReader;
+import com.l2jmobius.commons.util.IXmlReader;
 import com.l2jmobius.gameserver.ai.CtrlIntention;
 import com.l2jmobius.gameserver.data.xml.impl.NpcData;
 import com.l2jmobius.gameserver.enums.ChatType;
@@ -49,7 +49,7 @@ import com.l2jmobius.gameserver.network.NpcStringId;
  * This class manages walking monsters.
  * @author GKR
  */
-public final class WalkingManager implements IGameXmlReader
+public final class WalkingManager implements IXmlReader
 {
 	private static final Logger LOGGER = Logger.getLogger(WalkingManager.class.getName());
 	
diff --git a/L2J_Mobius_5.5_EtinasFate/java/com/l2jmobius/gameserver/instancemanager/ZoneManager.java b/L2J_Mobius_5.5_EtinasFate/java/com/l2jmobius/gameserver/instancemanager/ZoneManager.java
index b698f51a03..9a0bd870f2 100644
--- a/L2J_Mobius_5.5_EtinasFate/java/com/l2jmobius/gameserver/instancemanager/ZoneManager.java
+++ b/L2J_Mobius_5.5_EtinasFate/java/com/l2jmobius/gameserver/instancemanager/ZoneManager.java
@@ -26,6 +26,7 @@ import java.util.List;
 import java.util.Map;
 import java.util.Optional;
 import java.util.OptionalInt;
+import java.util.concurrent.ConcurrentHashMap;
 import java.util.logging.Level;
 import java.util.logging.Logger;
 
@@ -33,7 +34,7 @@ import org.w3c.dom.Document;
 import org.w3c.dom.NamedNodeMap;
 import org.w3c.dom.Node;
 
-import com.l2jmobius.commons.util.IGameXmlReader;
+import com.l2jmobius.commons.util.IXmlReader;
 import com.l2jmobius.gameserver.model.World;
 import com.l2jmobius.gameserver.model.WorldObject;
 import com.l2jmobius.gameserver.model.actor.Creature;
@@ -55,7 +56,7 @@ import com.l2jmobius.gameserver.model.zone.type.SpawnTerritory;
  * This class manages the zones
  * @author durgus
  */
-public final class ZoneManager implements IGameXmlReader
+public final class ZoneManager implements IXmlReader
 {
 	private static final Logger LOGGER = Logger.getLogger(ZoneManager.class.getName());
 	
@@ -65,9 +66,9 @@ public final class ZoneManager implements IGameXmlReader
 	private static final int OFFSET_X = Math.abs(World.MAP_MIN_X >> SHIFT_BY);
 	private static final int OFFSET_Y = Math.abs(World.MAP_MIN_Y >> SHIFT_BY);
 	
-	private final Map<Class<? extends ZoneType>, Map<Integer, ? extends ZoneType>> _classZones = new HashMap<>();
-	private final Map<String, SpawnTerritory> _spawnTerritories = new HashMap<>();
-	private int _lastDynamicId = 300000;
+	private final Map<Class<? extends ZoneType>, ConcurrentHashMap<Integer, ? extends ZoneType>> _classZones = new ConcurrentHashMap<>();
+	private final Map<String, SpawnTerritory> _spawnTerritories = new ConcurrentHashMap<>();
+	private volatile int _lastDynamicId = 300000;
 	private List<ItemInstance> _debugItems;
 	
 	private final ZoneRegion[][] _zoneRegions = new ZoneRegion[(World.MAP_MAX_X >> SHIFT_BY) + OFFSET_X + 1][(World.MAP_MAX_Y >> SHIFT_BY) + OFFSET_Y + 1];
@@ -365,7 +366,7 @@ public final class ZoneManager implements IGameXmlReader
 						}
 						if (checkId(zoneId))
 						{
-							LOGGER.config(getClass().getSimpleName() + ": Caution: Zone (" + zoneId + ") from file: " + f.getName() + " overrides previos definition.");
+							LOGGER.config(getClass().getSimpleName() + ": Caution: Zone (" + zoneId + ") from file: " + f.getName() + " overrides previuos definition.");
 						}
 						
 						if ((zoneName != null) && !zoneName.isEmpty())
@@ -453,10 +454,10 @@ public final class ZoneManager implements IGameXmlReader
 	@SuppressWarnings("unchecked")
 	private <T extends ZoneType> void addZone(Integer id, T zone)
 	{
-		Map<Integer, T> map = (Map<Integer, T>) _classZones.get(zone.getClass());
+		ConcurrentHashMap<Integer, T> map = (ConcurrentHashMap<Integer, T>) _classZones.get(zone.getClass());
 		if (map == null)
 		{
-			map = new HashMap<>();
+			map = new ConcurrentHashMap<>();
 			map.put(id, zone);
 			_classZones.put(zone.getClass(), map);
 		}
diff --git a/L2J_Mobius_5.5_EtinasFate/java/com/l2jmobius/gameserver/model/quest/LongTimeEvent.java b/L2J_Mobius_5.5_EtinasFate/java/com/l2jmobius/gameserver/model/quest/LongTimeEvent.java
index cc71991407..0fa020eb5d 100644
--- a/L2J_Mobius_5.5_EtinasFate/java/com/l2jmobius/gameserver/model/quest/LongTimeEvent.java
+++ b/L2J_Mobius_5.5_EtinasFate/java/com/l2jmobius/gameserver/model/quest/LongTimeEvent.java
@@ -32,7 +32,7 @@ import org.w3c.dom.Node;
 
 import com.l2jmobius.commons.concurrent.ThreadPool;
 import com.l2jmobius.commons.database.DatabaseFactory;
-import com.l2jmobius.commons.util.IGameXmlReader;
+import com.l2jmobius.commons.util.IXmlReader;
 import com.l2jmobius.gameserver.data.sql.impl.AnnouncementsTable;
 import com.l2jmobius.gameserver.data.xml.impl.NpcData;
 import com.l2jmobius.gameserver.datatables.EventDroplist;
@@ -117,7 +117,7 @@ public class LongTimeEvent extends Quest
 	 */
 	private void loadConfig()
 	{
-		new IGameXmlReader()
+		new IXmlReader()
 		{
 			@Override
 			public void load()
diff --git a/L2J_Mobius_5.5_EtinasFate/java/com/l2jmobius/gameserver/model/stats/BaseStats.java b/L2J_Mobius_5.5_EtinasFate/java/com/l2jmobius/gameserver/model/stats/BaseStats.java
index daba0d3071..64af7961e9 100644
--- a/L2J_Mobius_5.5_EtinasFate/java/com/l2jmobius/gameserver/model/stats/BaseStats.java
+++ b/L2J_Mobius_5.5_EtinasFate/java/com/l2jmobius/gameserver/model/stats/BaseStats.java
@@ -23,7 +23,6 @@ import java.util.logging.Logger;
 import org.w3c.dom.Document;
 import org.w3c.dom.NamedNodeMap;
 
-import com.l2jmobius.commons.util.IGameXmlReader;
 import com.l2jmobius.commons.util.IXmlReader;
 import com.l2jmobius.gameserver.model.actor.Creature;
 
@@ -105,7 +104,7 @@ public enum BaseStats
 	
 	static
 	{
-		new IGameXmlReader()
+		new IXmlReader()
 		{
 			final Logger LOGGER = Logger.getLogger(BaseStats.class.getName());
 			
diff --git a/L2J_Mobius_5.5_EtinasFate/java/com/l2jmobius/gameserver/scripting/ScriptEngineManager.java b/L2J_Mobius_5.5_EtinasFate/java/com/l2jmobius/gameserver/scripting/ScriptEngineManager.java
index 9eb6d85b69..95409c567a 100644
--- a/L2J_Mobius_5.5_EtinasFate/java/com/l2jmobius/gameserver/scripting/ScriptEngineManager.java
+++ b/L2J_Mobius_5.5_EtinasFate/java/com/l2jmobius/gameserver/scripting/ScriptEngineManager.java
@@ -28,8 +28,6 @@ import java.nio.file.attribute.BasicFileAttributes;
 import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.Iterator;
-import java.util.LinkedHashMap;
-import java.util.LinkedList;
 import java.util.List;
 import java.util.Map;
 import java.util.Map.Entry;
@@ -42,14 +40,14 @@ import java.util.logging.Logger;
 import org.w3c.dom.Document;
 
 import com.l2jmobius.Config;
-import com.l2jmobius.commons.util.IGameXmlReader;
+import com.l2jmobius.commons.util.IXmlReader;
 import com.l2jmobius.gameserver.scripting.java.JavaScriptingEngine;
 
 /**
  * Caches script engines and provides functionality for executing and managing scripts.
  * @author KenM, HorridoJoho
  */
-public final class ScriptEngineManager implements IGameXmlReader
+public final class ScriptEngineManager implements IXmlReader
 {
 	private static final Logger LOGGER = Logger.getLogger(ScriptEngineManager.class.getName());
 	public static final Path SCRIPT_FOLDER = Paths.get(Config.DATAPACK_ROOT.getAbsolutePath(), "data", "scripts");
@@ -59,8 +57,7 @@ public final class ScriptEngineManager implements IGameXmlReader
 	public static final Path CONDITION_HANDLER_FILE = Paths.get(SCRIPT_FOLDER.toString(), "handlers", "ConditionMasterHandler.java");
 	public static final Path ONE_DAY_REWARD_MASTER_HANDLER = Paths.get(SCRIPT_FOLDER.toString(), "handlers", "DailyMissionMasterHandler.java");
 	
-	private final Map<String, IExecutionContext> _extEngines = new HashMap<>();
-	private IExecutionContext _currentExecutionContext = null;
+	private IExecutionContext _javaExecutionContext = null;
 	static final List<String> _exclusions = new ArrayList<>();
 	
 	protected ScriptEngineManager()
@@ -166,12 +163,7 @@ public final class ScriptEngineManager implements IGameXmlReader
 	private void registerEngine(IScriptingEngine engine, Properties props)
 	{
 		maybeSetProperties("language." + engine.getLanguageName() + ".", props, engine);
-		final IExecutionContext context = engine.createExecutionContext();
-		for (String commonExtension : engine.getCommonFileExtensions())
-		{
-			_extEngines.put(commonExtension, context);
-		}
-		
+		_javaExecutionContext = engine.createExecutionContext();
 		LOGGER.info("ScriptEngine: " + engine.getEngineName() + " " + engine.getEngineVersion() + " (" + engine.getLanguageName() + " " + engine.getLanguageVersion() + ")");
 	}
 	
@@ -200,66 +192,6 @@ public final class ScriptEngineManager implements IGameXmlReader
 		}
 	}
 	
-	private IExecutionContext getEngineByExtension(String ext)
-	{
-		return _extEngines.get(ext);
-	}
-	
-	private String getFileExtension(Path p)
-	{
-		final String name = p.getFileName().toString();
-		final int lastDotIdx = name.lastIndexOf('.');
-		if (lastDotIdx == -1)
-		{
-			return null;
-		}
-		
-		final String extension = name.substring(lastDotIdx + 1);
-		if (extension.isEmpty())
-		{
-			return null;
-		}
-		
-		return extension;
-	}
-	
-	private void checkExistingFile(String messagePre, Path filePath) throws Exception
-	{
-		if (!Files.exists(filePath))
-		{
-			throw new Exception(messagePre + ": " + filePath + " does not exists!");
-		}
-		else if (!Files.isRegularFile(filePath))
-		{
-			throw new Exception(messagePre + ": " + filePath + " is not a file!");
-		}
-	}
-	
-	public void executeMasterHandler() throws Exception
-	{
-		executeScript(MASTER_HANDLER_FILE);
-	}
-	
-	public void executeEffectMasterHandler() throws Exception
-	{
-		executeScript(EFFECT_MASTER_HANDLER_FILE);
-	}
-	
-	public void executeSkillConditionMasterHandler() throws Exception
-	{
-		executeScript(SKILL_CONDITION_HANDLER_FILE);
-	}
-	
-	public void executeConditionMasterHandler() throws Exception
-	{
-		executeScript(CONDITION_HANDLER_FILE);
-	}
-	
-	public void executeDailyMissionMasterHandler() throws Exception
-	{
-		executeScript(ONE_DAY_REWARD_MASTER_HANDLER);
-	}
-	
 	public void executeScriptList() throws Exception
 	{
 		if (Config.ALT_DEV_NO_QUESTS)
@@ -267,77 +199,35 @@ public final class ScriptEngineManager implements IGameXmlReader
 			return;
 		}
 		
-		final Map<IExecutionContext, List<Path>> files = new LinkedHashMap<>();
+		final List<Path> files = new ArrayList<>();
 		processDirectory(SCRIPT_FOLDER.toFile(), files);
 		
-		for (Entry<IExecutionContext, List<Path>> entry : files.entrySet())
+		final Map<Path, Throwable> invokationErrors = _javaExecutionContext.executeScripts(files);
+		for (Entry<Path, Throwable> entry : invokationErrors.entrySet())
 		{
-			_currentExecutionContext = entry.getKey();
-			try
-			{
-				final Map<Path, Throwable> invokationErrors = entry.getKey().executeScripts(entry.getValue());
-				for (Entry<Path, Throwable> entry2 : invokationErrors.entrySet())
-				{
-					LOGGER.log(Level.WARNING, "ScriptEngine: " + entry2.getKey() + " failed execution!", entry2.getValue());
-				}
-			}
-			finally
-			{
-				_currentExecutionContext = null;
-			}
+			LOGGER.log(Level.WARNING, "ScriptEngine: " + entry.getKey() + " failed execution!", entry.getValue());
 		}
 	}
 	
-	private void processDirectory(File dir, Map<IExecutionContext, List<Path>> files)
+	private void processDirectory(File dir, List<Path> files)
 	{
 		for (File file : dir.listFiles())
 		{
-			if (file.isDirectory())
+			if (file.isFile())
+			{
+				final String fileName = file.getName();
+				if (fileName.endsWith(".java") && !_exclusions.contains(fileName))
+				{
+					files.add(file.toPath().toAbsolutePath());
+				}
+			}
+			else if (file.isDirectory())
 			{
 				processDirectory(file, files);
 			}
-			else
-			{
-				processFile(file, files);
-			}
 		}
 	}
 	
-	private void processFile(File file, Map<IExecutionContext, List<Path>> files)
-	{
-		if (_exclusions.contains(file.getName()))
-		{
-			return;
-		}
-		
-		Path sourceFile = file.toPath();
-		try
-		{
-			checkExistingFile("ScriptFile", sourceFile);
-		}
-		catch (Exception e)
-		{
-			LOGGER.warning(e.getMessage());
-			return;
-		}
-		
-		sourceFile = sourceFile.toAbsolutePath();
-		final String ext = getFileExtension(sourceFile);
-		if (ext == null)
-		{
-			LOGGER.warning("ScriptFile: " + sourceFile + " does not have an extension to determine the script engine!");
-			return;
-		}
-		
-		final IExecutionContext engine = getEngineByExtension(ext);
-		if (engine == null)
-		{
-			return;
-		}
-		
-		files.computeIfAbsent(engine, k -> new LinkedList<>()).add(sourceFile);
-	}
-	
 	public void executeScript(Path sourceFile) throws Exception
 	{
 		Objects.requireNonNull(sourceFile);
@@ -347,34 +237,19 @@ public final class ScriptEngineManager implements IGameXmlReader
 			sourceFile = SCRIPT_FOLDER.resolve(sourceFile);
 		}
 		
-		// throws exception if not exists or not file
-		checkExistingFile("ScriptFile", sourceFile);
-		
 		sourceFile = sourceFile.toAbsolutePath();
-		final String ext = getFileExtension(sourceFile);
 		Objects.requireNonNull(sourceFile, "ScriptFile: " + sourceFile + " does not have an extension to determine the script engine!");
 		
-		final IExecutionContext engine = getEngineByExtension(ext);
-		Objects.requireNonNull(engine, "ScriptEngine: No engine registered for extension " + ext + "!");
-		
-		_currentExecutionContext = engine;
-		try
+		final Entry<Path, Throwable> error = _javaExecutionContext.executeScript(sourceFile);
+		if (error != null)
 		{
-			final Entry<Path, Throwable> error = engine.executeScript(sourceFile);
-			if (error != null)
-			{
-				throw new Exception("ScriptEngine: " + error.getKey() + " failed execution!", error.getValue());
-			}
-		}
-		finally
-		{
-			_currentExecutionContext = null;
+			throw new Exception("ScriptEngine: " + error.getKey() + " failed execution!", error.getValue());
 		}
 	}
 	
 	public Path getCurrentLoadingScript()
 	{
-		return _currentExecutionContext != null ? _currentExecutionContext.getCurrentExecutingScript() : null;
+		return _javaExecutionContext.getCurrentExecutingScript();
 	}
 	
 	public static ScriptEngineManager getInstance()
diff --git a/L2J_Mobius_5.5_EtinasFate/java/com/l2jmobius/loginserver/GameServerTable.java b/L2J_Mobius_5.5_EtinasFate/java/com/l2jmobius/loginserver/GameServerTable.java
index 456224d78c..4269e47969 100644
--- a/L2J_Mobius_5.5_EtinasFate/java/com/l2jmobius/loginserver/GameServerTable.java
+++ b/L2J_Mobius_5.5_EtinasFate/java/com/l2jmobius/loginserver/GameServerTable.java
@@ -36,8 +36,8 @@ import org.w3c.dom.Document;
 import org.w3c.dom.NodeList;
 
 import com.l2jmobius.commons.database.DatabaseFactory;
-import com.l2jmobius.commons.util.IGameXmlReader;
 import com.l2jmobius.commons.util.IPSubnet;
+import com.l2jmobius.commons.util.IXmlReader;
 import com.l2jmobius.commons.util.Rnd;
 import com.l2jmobius.loginserver.network.gameserverpackets.ServerStatus;
 
@@ -45,7 +45,7 @@ import com.l2jmobius.loginserver.network.gameserverpackets.ServerStatus;
  * The Class GameServerTable loads the game server names and initialize the game server tables.
  * @author KenM, Zoey76
  */
-public final class GameServerTable implements IGameXmlReader
+public final class GameServerTable implements IXmlReader
 {
 	private static final Logger LOGGER = Logger.getLogger(GameServerTable.class.getName());
 	
diff --git a/L2J_Mobius_6.0_Fafurion/dist/game/config/Scripts.xml b/L2J_Mobius_6.0_Fafurion/dist/game/config/Scripts.xml
index 284aa0a31f..54d05b241f 100644
--- a/L2J_Mobius_6.0_Fafurion/dist/game/config/Scripts.xml
+++ b/L2J_Mobius_6.0_Fafurion/dist/game/config/Scripts.xml
@@ -2,11 +2,7 @@
 <list xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../data/xsd/Scripts.xsd">
 	<!-- Skip these filenames from script loading, because they are already loaded using a different way. -->
 	<exclude file="package-info.java" />
-	<exclude file="MasterHandler.java" />
-	<exclude file="EffectMasterHandler.java" />
-	<exclude file="SkillConditionMasterHandler.java" />
-	<exclude file="ConditionMasterHandler.java" />
-	<exclude file="DailyMissionMasterHandler.java" />
+	<exclude file="handlers" />
 	
 	<!--
 	With this file you can exclude/include specific folders/files from within the scripts directory.
diff --git a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/ai/areas/ImperialTomb/FourSepulchers/FourSepulchers.java b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/ai/areas/ImperialTomb/FourSepulchers/FourSepulchers.java
index ceda5a638a..638fbd00ad 100644
--- a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/ai/areas/ImperialTomb/FourSepulchers/FourSepulchers.java
+++ b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/ai/areas/ImperialTomb/FourSepulchers/FourSepulchers.java
@@ -29,7 +29,7 @@ import org.w3c.dom.NamedNodeMap;
 import org.w3c.dom.Node;
 
 import com.l2jmobius.commons.concurrent.ThreadPool;
-import com.l2jmobius.commons.util.IGameXmlReader;
+import com.l2jmobius.commons.util.IXmlReader;
 import com.l2jmobius.gameserver.ai.CtrlIntention;
 import com.l2jmobius.gameserver.enums.ChatType;
 import com.l2jmobius.gameserver.geoengine.GeoEngine;
@@ -56,7 +56,7 @@ import quests.Q00620_FourGoblets.Q00620_FourGoblets;
  * Four Selpuchers AI
  * @author Mobius
  */
-public final class FourSepulchers extends AbstractNpcAI implements IGameXmlReader
+public final class FourSepulchers extends AbstractNpcAI implements IXmlReader
 {
 	Logger LOGGER = Logger.getLogger(FourSepulchers.class.getName());
 	
diff --git a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/ai/bosses/Tiat/Stage1.java b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/ai/bosses/Tiat/Stage1.java
index e1e54da1a8..1b350c946e 100644
--- a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/ai/bosses/Tiat/Stage1.java
+++ b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/ai/bosses/Tiat/Stage1.java
@@ -30,7 +30,7 @@ import org.w3c.dom.NamedNodeMap;
 import org.w3c.dom.Node;
 
 import com.l2jmobius.commons.util.CommonUtil;
-import com.l2jmobius.commons.util.IGameXmlReader;
+import com.l2jmobius.commons.util.IXmlReader;
 import com.l2jmobius.gameserver.ai.CtrlIntention;
 import com.l2jmobius.gameserver.enums.Movie;
 import com.l2jmobius.gameserver.enums.TrapAction;
@@ -66,7 +66,7 @@ import instances.AbstractInstance;
  * Please maintain consistency between the Seed scripts.
  * @author Gigiikun
  */
-public final class Stage1 extends AbstractInstance implements IGameXmlReader
+public final class Stage1 extends AbstractInstance implements IXmlReader
 {
 	Logger LOGGER = Logger.getLogger(Stage1.class.getName());
 	
diff --git a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/ai/others/ClassMaster/ClassMaster.java b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/ai/others/ClassMaster/ClassMaster.java
index 5192d710b6..c74cba2e07 100644
--- a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/ai/others/ClassMaster/ClassMaster.java
+++ b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/ai/others/ClassMaster/ClassMaster.java
@@ -30,7 +30,7 @@ import org.w3c.dom.NamedNodeMap;
 import org.w3c.dom.Node;
 
 import com.l2jmobius.Config;
-import com.l2jmobius.commons.util.IGameXmlReader;
+import com.l2jmobius.commons.util.IXmlReader;
 import com.l2jmobius.gameserver.data.xml.impl.CategoryData;
 import com.l2jmobius.gameserver.data.xml.impl.ClassListData;
 import com.l2jmobius.gameserver.data.xml.impl.SkillData;
@@ -63,7 +63,7 @@ import ai.AbstractNpcAI;
  * Class Master AI.
  * @author Nik
  */
-public final class ClassMaster extends AbstractNpcAI implements IGameXmlReader
+public final class ClassMaster extends AbstractNpcAI implements IXmlReader
 {
 	// NPCs
 	private static final List<Integer> CLASS_MASTERS = new ArrayList<>();
diff --git a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/ai/others/MentorGuide/MentorGuide.java b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/ai/others/MentorGuide/MentorGuide.java
index 9ddcd66a0f..65322b7a01 100644
--- a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/ai/others/MentorGuide/MentorGuide.java
+++ b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/ai/others/MentorGuide/MentorGuide.java
@@ -26,7 +26,7 @@ import org.w3c.dom.Document;
 import org.w3c.dom.Node;
 
 import com.l2jmobius.Config;
-import com.l2jmobius.commons.util.IGameXmlReader;
+import com.l2jmobius.commons.util.IXmlReader;
 import com.l2jmobius.gameserver.enums.CategoryType;
 import com.l2jmobius.gameserver.enums.MailType;
 import com.l2jmobius.gameserver.instancemanager.MailManager;
@@ -61,7 +61,7 @@ import ai.AbstractNpcAI;
  * Mentor Guide AI.
  * @author Gnacik, UnAfraid
  */
-public final class MentorGuide extends AbstractNpcAI implements IGameXmlReader
+public final class MentorGuide extends AbstractNpcAI implements IXmlReader
 {
 	private static final Logger LOGGER = Logger.getLogger(MentorGuide.class.getName());
 	
diff --git a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/ai/others/NpcBuffers/NpcBuffersData.java b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/ai/others/NpcBuffers/NpcBuffersData.java
index b0287e1df6..51708af4f8 100644
--- a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/ai/others/NpcBuffers/NpcBuffersData.java
+++ b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/ai/others/NpcBuffers/NpcBuffersData.java
@@ -27,13 +27,13 @@ import org.w3c.dom.Document;
 import org.w3c.dom.NamedNodeMap;
 import org.w3c.dom.Node;
 
-import com.l2jmobius.commons.util.IGameXmlReader;
+import com.l2jmobius.commons.util.IXmlReader;
 import com.l2jmobius.gameserver.model.StatsSet;
 
 /**
  * @author UnAfraid
  */
-class NpcBuffersData implements IGameXmlReader
+class NpcBuffersData implements IXmlReader
 {
 	private static final Logger LOGGER = Logger.getLogger(NpcBuffersData.class.getName());
 	
diff --git a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/admincommandhandlers/AdminQuest.java b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/admincommandhandlers/AdminQuest.java
index 228cc1668d..a771c4ab90 100644
--- a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/admincommandhandlers/AdminQuest.java
+++ b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/admincommandhandlers/AdminQuest.java
@@ -320,7 +320,7 @@ public class AdminQuest implements IAdminCommandHandler
 				{
 					sb.append("<a action=\"bypass -h admin_script_dir " + c + "\">" + c + "</a><br1>");
 				}
-				else if (c.endsWith(".java") || c.endsWith(".py"))
+				else if (c.endsWith(".java"))
 				{
 					sb.append("<a action=\"bypass -h admin_script_load " + c + "\"><font color=\"LEVEL\">" + c + "</font></a><br1>");
 				}
@@ -352,7 +352,7 @@ public class AdminQuest implements IAdminCommandHandler
 				{
 					sb.append("<a action=\"bypass -h admin_script_dir " + currentPath + "/" + c + "\">" + (questReducedNames ? getQuestName(c) : c) + "</a><br1>");
 				}
-				else if (c.endsWith(".java") || c.endsWith(".py"))
+				else if (c.endsWith(".java"))
 				{
 					sb.append("<a action=\"bypass -h admin_script_load " + currentPath + "/" + c + "\"><font color=\"LEVEL\">" + c + "</font></a><br1>");
 				}
diff --git a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/admincommandhandlers/AdminReload.java b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/admincommandhandlers/AdminReload.java
index c1d29b87fb..df9c268b60 100644
--- a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/admincommandhandlers/AdminReload.java
+++ b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/admincommandhandlers/AdminReload.java
@@ -222,7 +222,7 @@ public class AdminReload implements IAdminCommandHandler
 				{
 					try
 					{
-						ScriptEngineManager.getInstance().executeEffectMasterHandler();
+						ScriptEngineManager.getInstance().executeScript(ScriptEngineManager.EFFECT_MASTER_HANDLER_FILE);
 						AdminData.getInstance().broadcastMessageToGMs(activeChar.getName() + ": Reloaded effect master handler.");
 					}
 					catch (Exception e)
@@ -236,7 +236,7 @@ public class AdminReload implements IAdminCommandHandler
 				{
 					try
 					{
-						ScriptEngineManager.getInstance().executeMasterHandler();
+						ScriptEngineManager.getInstance().executeScript(ScriptEngineManager.MASTER_HANDLER_FILE);
 						AdminData.getInstance().broadcastMessageToGMs(activeChar.getName() + ": Reloaded master handler.");
 					}
 					catch (Exception e)
diff --git a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/telnethandlers/server/Reload.java b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/telnethandlers/server/Reload.java
index d679ea1212..491b10cc62 100644
--- a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/telnethandlers/server/Reload.java
+++ b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/telnethandlers/server/Reload.java
@@ -181,7 +181,7 @@ public class Reload implements ITelnetCommand
 			{
 				try
 				{
-					ScriptEngineManager.getInstance().executeEffectMasterHandler();
+					ScriptEngineManager.getInstance().executeScript(ScriptEngineManager.EFFECT_MASTER_HANDLER_FILE);
 					return AdminData.getInstance().broadcastMessageToGMs("Telnet Admin: Reloaded effect master handler.");
 				}
 				catch (Exception e)
@@ -194,7 +194,7 @@ public class Reload implements ITelnetCommand
 			{
 				try
 				{
-					ScriptEngineManager.getInstance().executeMasterHandler();
+					ScriptEngineManager.getInstance().executeScript(ScriptEngineManager.MASTER_HANDLER_FILE);
 					return AdminData.getInstance().broadcastMessageToGMs("Telnet Admin: Reloaded master handler.");
 				}
 				catch (Exception e)
diff --git a/L2J_Mobius_6.0_Fafurion/java/com/l2jmobius/Config.java b/L2J_Mobius_6.0_Fafurion/java/com/l2jmobius/Config.java
index 22b6204971..97446a9a9f 100644
--- a/L2J_Mobius_6.0_Fafurion/java/com/l2jmobius/Config.java
+++ b/L2J_Mobius_6.0_Fafurion/java/com/l2jmobius/Config.java
@@ -54,7 +54,7 @@ import org.w3c.dom.Document;
 import org.w3c.dom.NamedNodeMap;
 import org.w3c.dom.Node;
 
-import com.l2jmobius.commons.util.IGameXmlReader;
+import com.l2jmobius.commons.util.IXmlReader;
 import com.l2jmobius.commons.util.PropertiesParser;
 import com.l2jmobius.commons.util.StringUtil;
 import com.l2jmobius.gameserver.enums.ChatType;
@@ -3131,7 +3131,7 @@ public final class Config
 		return result;
 	}
 	
-	private static class IPConfigData implements IGameXmlReader
+	private static class IPConfigData implements IXmlReader
 	{
 		private static final List<String> _subnets = new ArrayList<>(5);
 		private static final List<String> _hosts = new ArrayList<>(5);
diff --git a/L2J_Mobius_6.0_Fafurion/java/com/l2jmobius/commons/util/IGameXmlReader.java b/L2J_Mobius_6.0_Fafurion/java/com/l2jmobius/commons/util/IGameXmlReader.java
deleted file mode 100644
index b29089db77..0000000000
--- a/L2J_Mobius_6.0_Fafurion/java/com/l2jmobius/commons/util/IGameXmlReader.java
+++ /dev/null
@@ -1,118 +0,0 @@
-/*
- * This file is part of the L2J Mobius project.
- * 
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- * 
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * General Public License for more details.
- * 
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- */
-package com.l2jmobius.commons.util;
-
-import java.io.File;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
-import org.w3c.dom.NamedNodeMap;
-import org.w3c.dom.Node;
-
-import com.l2jmobius.Config;
-import com.l2jmobius.gameserver.model.Location;
-import com.l2jmobius.gameserver.model.holders.MinionHolder;
-import com.l2jmobius.gameserver.model.holders.SkillHolder;
-
-/**
- * Interface for XML parsers.
- * @author Zoey76
- */
-public interface IGameXmlReader extends IXmlReader
-{
-	/**
-	 * Wrapper for {@link #parseFile(File)} method.
-	 * @param path the relative path to the datapack root of the XML file to parse.
-	 */
-	default void parseDatapackFile(String path)
-	{
-		parseFile(new File(Config.DATAPACK_ROOT, path));
-	}
-	
-	/**
-	 * Wrapper for {@link #parseDirectory(File, boolean)}.
-	 * @param path the path to the directory where the XML files are
-	 * @param recursive parses all sub folders if there is
-	 * @return {@code false} if it fails to find the directory, {@code true} otherwise
-	 */
-	default boolean parseDatapackDirectory(String path, boolean recursive)
-	{
-		return parseDirectory(new File(Config.DATAPACK_ROOT, path), recursive);
-	}
-	
-	/**
-	 * @param n
-	 * @return a map of parameters
-	 */
-	default Map<String, Object> parseParameters(Node n)
-	{
-		final Map<String, Object> parameters = new HashMap<>();
-		for (Node parameters_node = n.getFirstChild(); parameters_node != null; parameters_node = parameters_node.getNextSibling())
-		{
-			NamedNodeMap attrs = parameters_node.getAttributes();
-			switch (parameters_node.getNodeName().toLowerCase())
-			{
-				case "param":
-				{
-					parameters.put(parseString(attrs, "name"), parseString(attrs, "value"));
-					break;
-				}
-				case "skill":
-				{
-					parameters.put(parseString(attrs, "name"), new SkillHolder(parseInteger(attrs, "id"), parseInteger(attrs, "level")));
-					break;
-				}
-				case "location":
-				{
-					parameters.put(parseString(attrs, "name"), new Location(parseInteger(attrs, "x"), parseInteger(attrs, "y"), parseInteger(attrs, "z"), parseInteger(attrs, "heading", 0)));
-					break;
-				}
-				case "minions":
-				{
-					final List<MinionHolder> minions = new ArrayList<>(1);
-					for (Node minions_node = parameters_node.getFirstChild(); minions_node != null; minions_node = minions_node.getNextSibling())
-					{
-						if (minions_node.getNodeName().equalsIgnoreCase("npc"))
-						{
-							attrs = minions_node.getAttributes();
-							minions.add(new MinionHolder(parseInteger(attrs, "id"), parseInteger(attrs, "count"), parseInteger(attrs, "respawnTime"), parseInteger(attrs, "weightPoint")));
-						}
-					}
-					
-					if (!minions.isEmpty())
-					{
-						parameters.put(parseString(parameters_node.getAttributes(), "name"), minions);
-					}
-					break;
-				}
-			}
-		}
-		return parameters;
-	}
-	
-	default Location parseLocation(Node n)
-	{
-		final NamedNodeMap attrs = n.getAttributes();
-		final int x = parseInteger(attrs, "x");
-		final int y = parseInteger(attrs, "y");
-		final int z = parseInteger(attrs, "z");
-		final int heading = parseInteger(attrs, "heading", 0);
-		return new Location(x, y, z, heading);
-	}
-}
diff --git a/L2J_Mobius_6.0_Fafurion/java/com/l2jmobius/commons/util/IXmlReader.java b/L2J_Mobius_6.0_Fafurion/java/com/l2jmobius/commons/util/IXmlReader.java
index 0317816fd8..4bfed2396e 100644
--- a/L2J_Mobius_6.0_Fafurion/java/com/l2jmobius/commons/util/IXmlReader.java
+++ b/L2J_Mobius_6.0_Fafurion/java/com/l2jmobius/commons/util/IXmlReader.java
@@ -18,8 +18,13 @@ package com.l2jmobius.commons.util;
 
 import java.io.File;
 import java.io.FileFilter;
+import java.util.ArrayList;
+import java.util.HashMap;
 import java.util.LinkedHashMap;
+import java.util.List;
 import java.util.Map;
+import java.util.concurrent.CopyOnWriteArrayList;
+import java.util.concurrent.ScheduledFuture;
 import java.util.function.Consumer;
 import java.util.function.Predicate;
 import java.util.logging.Level;
@@ -35,7 +40,12 @@ import org.w3c.dom.NodeList;
 import org.xml.sax.ErrorHandler;
 import org.xml.sax.SAXParseException;
 
+import com.l2jmobius.Config;
+import com.l2jmobius.commons.concurrent.ThreadPool;
 import com.l2jmobius.commons.util.file.filter.XMLFilter;
+import com.l2jmobius.gameserver.model.Location;
+import com.l2jmobius.gameserver.model.holders.MinionHolder;
+import com.l2jmobius.gameserver.model.holders.SkillHolder;
 
 /**
  * Interface for XML parsers.
@@ -56,6 +66,15 @@ public interface IXmlReader
 	 */
 	void load();
 	
+	/**
+	 * Wrapper for {@link #parseFile(File)} method.
+	 * @param path the relative path to the datapack root of the XML file to parse.
+	 */
+	default void parseDatapackFile(String path)
+	{
+		parseFile(new File(Config.DATAPACK_ROOT, path));
+	}
+	
 	/**
 	 * Parses a single XML file.<br>
 	 * If the file was successfully parsed, call {@link #parseDocument(Document, File)} for the parsed document.<br>
@@ -121,6 +140,17 @@ public interface IXmlReader
 		return parseDirectory(file, false);
 	}
 	
+	/**
+	 * Wrapper for {@link #parseDirectory(File, boolean)}.
+	 * @param path the path to the directory where the XML files are
+	 * @param recursive parses all sub folders if there is
+	 * @return {@code false} if it fails to find the directory, {@code true} otherwise
+	 */
+	default boolean parseDatapackDirectory(String path, boolean recursive)
+	{
+		return parseDirectory(new File(Config.DATAPACK_ROOT, path), recursive);
+	}
+	
 	/**
 	 * Loads all XML files from {@code path} and calls {@link #parseFile(File)} for each one of them.
 	 * @param dir the directory object to scan.
@@ -135,6 +165,7 @@ public interface IXmlReader
 			return false;
 		}
 		
+		final List<ScheduledFuture<?>> jobs = new CopyOnWriteArrayList<>();
 		final File[] listOfFiles = dir.listFiles();
 		for (File f : listOfFiles)
 		{
@@ -144,9 +175,23 @@ public interface IXmlReader
 			}
 			else if (getCurrentFileFilter().accept(f))
 			{
-				parseFile(f);
+				jobs.add(ThreadPool.schedule(() ->
+				{
+					parseFile(f);
+				}, 0));
 			}
 		}
+		while (!jobs.isEmpty())
+		{
+			for (ScheduledFuture<?> job : jobs)
+			{
+				if ((job == null) || job.isDone() || job.isCancelled())
+				{
+					jobs.remove(job);
+				}
+			}
+		}
+		
 		return true;
 	}
 	
@@ -531,6 +576,16 @@ public interface IXmlReader
 		return parseString(attrs.getNamedItem(name), defaultValue);
 	}
 	
+	default Location parseLocation(Node n)
+	{
+		final NamedNodeMap attrs = n.getAttributes();
+		final int x = parseInteger(attrs, "x");
+		final int y = parseInteger(attrs, "y");
+		final int z = parseInteger(attrs, "z");
+		final int heading = parseInteger(attrs, "heading", 0);
+		return new Location(x, y, z, heading);
+	}
+	
 	/**
 	 * Parses an enumerated value.
 	 * @param <T> the enumerated type
@@ -612,6 +667,56 @@ public interface IXmlReader
 		return map;
 	}
 	
+	/**
+	 * @param n
+	 * @return a map of parameters
+	 */
+	default Map<String, Object> parseParameters(Node n)
+	{
+		final Map<String, Object> parameters = new HashMap<>();
+		for (Node parameters_node = n.getFirstChild(); parameters_node != null; parameters_node = parameters_node.getNextSibling())
+		{
+			NamedNodeMap attrs = parameters_node.getAttributes();
+			switch (parameters_node.getNodeName().toLowerCase())
+			{
+				case "param":
+				{
+					parameters.put(parseString(attrs, "name"), parseString(attrs, "value"));
+					break;
+				}
+				case "skill":
+				{
+					parameters.put(parseString(attrs, "name"), new SkillHolder(parseInteger(attrs, "id"), parseInteger(attrs, "level")));
+					break;
+				}
+				case "location":
+				{
+					parameters.put(parseString(attrs, "name"), new Location(parseInteger(attrs, "x"), parseInteger(attrs, "y"), parseInteger(attrs, "z"), parseInteger(attrs, "heading", 0)));
+					break;
+				}
+				case "minions":
+				{
+					final List<MinionHolder> minions = new ArrayList<>(1);
+					for (Node minions_node = parameters_node.getFirstChild(); minions_node != null; minions_node = minions_node.getNextSibling())
+					{
+						if (minions_node.getNodeName().equalsIgnoreCase("npc"))
+						{
+							attrs = minions_node.getAttributes();
+							minions.add(new MinionHolder(parseInteger(attrs, "id"), parseInteger(attrs, "count"), parseInteger(attrs, "respawnTime"), parseInteger(attrs, "weightPoint")));
+						}
+					}
+					
+					if (!minions.isEmpty())
+					{
+						parameters.put(parseString(parameters_node.getAttributes(), "name"), minions);
+					}
+					break;
+				}
+			}
+		}
+		return parameters;
+	}
+	
 	/**
 	 * Executes action for each child of node
 	 * @param node
diff --git a/L2J_Mobius_6.0_Fafurion/java/com/l2jmobius/gameserver/GameServer.java b/L2J_Mobius_6.0_Fafurion/java/com/l2jmobius/gameserver/GameServer.java
index d3c858dad8..ffd419f087 100644
--- a/L2J_Mobius_6.0_Fafurion/java/com/l2jmobius/gameserver/GameServer.java
+++ b/L2J_Mobius_6.0_Fafurion/java/com/l2jmobius/gameserver/GameServer.java
@@ -366,7 +366,7 @@ public class GameServer
 		try
 		{
 			LOGGER.info(getClass().getSimpleName() + ": Loading server scripts:");
-			ScriptEngineManager.getInstance().executeMasterHandler();
+			ScriptEngineManager.getInstance().executeScript(ScriptEngineManager.MASTER_HANDLER_FILE);
 			ScriptEngineManager.getInstance().executeScriptList();
 		}
 		catch (Exception e)
diff --git a/L2J_Mobius_6.0_Fafurion/java/com/l2jmobius/gameserver/data/xml/impl/ActionData.java b/L2J_Mobius_6.0_Fafurion/java/com/l2jmobius/gameserver/data/xml/impl/ActionData.java
index 0bffdc5bb1..a322dad1d9 100644
--- a/L2J_Mobius_6.0_Fafurion/java/com/l2jmobius/gameserver/data/xml/impl/ActionData.java
+++ b/L2J_Mobius_6.0_Fafurion/java/com/l2jmobius/gameserver/data/xml/impl/ActionData.java
@@ -23,14 +23,14 @@ import java.util.logging.Logger;
 
 import org.w3c.dom.Document;
 
-import com.l2jmobius.commons.util.IGameXmlReader;
+import com.l2jmobius.commons.util.IXmlReader;
 import com.l2jmobius.gameserver.model.ActionDataHolder;
 import com.l2jmobius.gameserver.model.StatsSet;
 
 /**
  * @author UnAfraid
  */
-public class ActionData implements IGameXmlReader
+public class ActionData implements IXmlReader
 {
 	private static final Logger LOGGER = Logger.getLogger(ActionData.class.getName());
 	
diff --git a/L2J_Mobius_6.0_Fafurion/java/com/l2jmobius/gameserver/data/xml/impl/AdminData.java b/L2J_Mobius_6.0_Fafurion/java/com/l2jmobius/gameserver/data/xml/impl/AdminData.java
index 0b1d3e3245..9e359b1521 100644
--- a/L2J_Mobius_6.0_Fafurion/java/com/l2jmobius/gameserver/data/xml/impl/AdminData.java
+++ b/L2J_Mobius_6.0_Fafurion/java/com/l2jmobius/gameserver/data/xml/impl/AdminData.java
@@ -29,7 +29,7 @@ import org.w3c.dom.Document;
 import org.w3c.dom.NamedNodeMap;
 import org.w3c.dom.Node;
 
-import com.l2jmobius.commons.util.IGameXmlReader;
+import com.l2jmobius.commons.util.IXmlReader;
 import com.l2jmobius.gameserver.model.AccessLevel;
 import com.l2jmobius.gameserver.model.AdminCommandAccessRight;
 import com.l2jmobius.gameserver.model.StatsSet;
@@ -42,7 +42,7 @@ import com.l2jmobius.gameserver.network.serverpackets.SystemMessage;
  * Loads administrator access levels and commands.
  * @author UnAfraid
  */
-public final class AdminData implements IGameXmlReader
+public final class AdminData implements IXmlReader
 {
 	private static final Logger LOGGER = Logger.getLogger(AdminData.class.getName());
 	
diff --git a/L2J_Mobius_6.0_Fafurion/java/com/l2jmobius/gameserver/data/xml/impl/AlchemyData.java b/L2J_Mobius_6.0_Fafurion/java/com/l2jmobius/gameserver/data/xml/impl/AlchemyData.java
index a5d8153b82..76f7eb98b5 100644
--- a/L2J_Mobius_6.0_Fafurion/java/com/l2jmobius/gameserver/data/xml/impl/AlchemyData.java
+++ b/L2J_Mobius_6.0_Fafurion/java/com/l2jmobius/gameserver/data/xml/impl/AlchemyData.java
@@ -25,7 +25,7 @@ import org.w3c.dom.Document;
 import org.w3c.dom.NamedNodeMap;
 import org.w3c.dom.Node;
 
-import com.l2jmobius.commons.util.IGameXmlReader;
+import com.l2jmobius.commons.util.IXmlReader;
 import com.l2jmobius.gameserver.model.StatsSet;
 import com.l2jmobius.gameserver.model.alchemy.AlchemyCraftData;
 import com.l2jmobius.gameserver.model.holders.ItemHolder;
@@ -33,7 +33,7 @@ import com.l2jmobius.gameserver.model.holders.ItemHolder;
 /**
  * @author Sdw
  */
-public class AlchemyData implements IGameXmlReader
+public class AlchemyData implements IXmlReader
 {
 	private static final Logger LOGGER = Logger.getLogger(AlchemyData.class.getName());
 	
diff --git a/L2J_Mobius_6.0_Fafurion/java/com/l2jmobius/gameserver/data/xml/impl/AppearanceItemData.java b/L2J_Mobius_6.0_Fafurion/java/com/l2jmobius/gameserver/data/xml/impl/AppearanceItemData.java
index 089004322a..801c66340d 100644
--- a/L2J_Mobius_6.0_Fafurion/java/com/l2jmobius/gameserver/data/xml/impl/AppearanceItemData.java
+++ b/L2J_Mobius_6.0_Fafurion/java/com/l2jmobius/gameserver/data/xml/impl/AppearanceItemData.java
@@ -24,7 +24,7 @@ import java.util.logging.Logger;
 import org.w3c.dom.Document;
 import org.w3c.dom.Node;
 
-import com.l2jmobius.commons.util.IGameXmlReader;
+import com.l2jmobius.commons.util.IXmlReader;
 import com.l2jmobius.gameserver.datatables.ItemTable;
 import com.l2jmobius.gameserver.enums.Race;
 import com.l2jmobius.gameserver.model.StatsSet;
@@ -36,7 +36,7 @@ import com.l2jmobius.gameserver.model.items.type.CrystalType;
 /**
  * @author UnAfraid
  */
-public class AppearanceItemData implements IGameXmlReader
+public class AppearanceItemData implements IXmlReader
 {
 	private static final Logger LOGGER = Logger.getLogger(AppearanceItemData.class.getName());
 	
diff --git a/L2J_Mobius_6.0_Fafurion/java/com/l2jmobius/gameserver/data/xml/impl/ArmorSetsData.java b/L2J_Mobius_6.0_Fafurion/java/com/l2jmobius/gameserver/data/xml/impl/ArmorSetsData.java
index 54e8f6b82e..b0475692fd 100644
--- a/L2J_Mobius_6.0_Fafurion/java/com/l2jmobius/gameserver/data/xml/impl/ArmorSetsData.java
+++ b/L2J_Mobius_6.0_Fafurion/java/com/l2jmobius/gameserver/data/xml/impl/ArmorSetsData.java
@@ -19,9 +19,9 @@ package com.l2jmobius.gameserver.data.xml.impl;
 import java.io.File;
 import java.util.ArrayList;
 import java.util.Collections;
-import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
+import java.util.concurrent.ConcurrentHashMap;
 import java.util.logging.Logger;
 import java.util.stream.Stream;
 
@@ -29,7 +29,7 @@ import org.w3c.dom.Document;
 import org.w3c.dom.NamedNodeMap;
 import org.w3c.dom.Node;
 
-import com.l2jmobius.commons.util.IGameXmlReader;
+import com.l2jmobius.commons.util.IXmlReader;
 import com.l2jmobius.gameserver.datatables.ItemTable;
 import com.l2jmobius.gameserver.model.ArmorSet;
 import com.l2jmobius.gameserver.model.holders.ArmorsetSkillHolder;
@@ -40,12 +40,12 @@ import com.l2jmobius.gameserver.model.stats.BaseStats;
  * Loads armor set bonuses.
  * @author godson, Luno, UnAfraid
  */
-public final class ArmorSetsData implements IGameXmlReader
+public final class ArmorSetsData implements IXmlReader
 {
 	private static final Logger LOGGER = Logger.getLogger(ArmorSetsData.class.getName());
 	
-	private final Map<Integer, ArmorSet> _armorSets = new HashMap<>();
-	private final Map<Integer, List<ArmorSet>> _armorSetItems = new HashMap<>();
+	private final Map<Integer, ArmorSet> _armorSets = new ConcurrentHashMap<>();
+	private final Map<Integer, List<ArmorSet>> _armorSetItems = new ConcurrentHashMap<>();
 	
 	protected ArmorSetsData()
 	{
diff --git a/L2J_Mobius_6.0_Fafurion/java/com/l2jmobius/gameserver/data/xml/impl/AttendanceRewardData.java b/L2J_Mobius_6.0_Fafurion/java/com/l2jmobius/gameserver/data/xml/impl/AttendanceRewardData.java
index c60afbd78a..24e402e706 100644
--- a/L2J_Mobius_6.0_Fafurion/java/com/l2jmobius/gameserver/data/xml/impl/AttendanceRewardData.java
+++ b/L2J_Mobius_6.0_Fafurion/java/com/l2jmobius/gameserver/data/xml/impl/AttendanceRewardData.java
@@ -24,7 +24,7 @@ import java.util.logging.Logger;
 import org.w3c.dom.Document;
 
 import com.l2jmobius.Config;
-import com.l2jmobius.commons.util.IGameXmlReader;
+import com.l2jmobius.commons.util.IXmlReader;
 import com.l2jmobius.gameserver.datatables.ItemTable;
 import com.l2jmobius.gameserver.model.StatsSet;
 import com.l2jmobius.gameserver.model.holders.ItemHolder;
@@ -32,7 +32,7 @@ import com.l2jmobius.gameserver.model.holders.ItemHolder;
 /**
  * @author Mobius
  */
-public class AttendanceRewardData implements IGameXmlReader
+public class AttendanceRewardData implements IXmlReader
 {
 	private static Logger LOGGER = Logger.getLogger(AttendanceRewardData.class.getName());
 	private final List<ItemHolder> _rewards = new ArrayList<>();
diff --git a/L2J_Mobius_6.0_Fafurion/java/com/l2jmobius/gameserver/data/xml/impl/BeautyShopData.java b/L2J_Mobius_6.0_Fafurion/java/com/l2jmobius/gameserver/data/xml/impl/BeautyShopData.java
index 133f11d978..d88ccc7747 100644
--- a/L2J_Mobius_6.0_Fafurion/java/com/l2jmobius/gameserver/data/xml/impl/BeautyShopData.java
+++ b/L2J_Mobius_6.0_Fafurion/java/com/l2jmobius/gameserver/data/xml/impl/BeautyShopData.java
@@ -24,7 +24,7 @@ import org.w3c.dom.Document;
 import org.w3c.dom.NamedNodeMap;
 import org.w3c.dom.Node;
 
-import com.l2jmobius.commons.util.IGameXmlReader;
+import com.l2jmobius.commons.util.IXmlReader;
 import com.l2jmobius.gameserver.enums.Race;
 import com.l2jmobius.gameserver.enums.Sex;
 import com.l2jmobius.gameserver.model.StatsSet;
@@ -34,7 +34,7 @@ import com.l2jmobius.gameserver.model.beautyshop.BeautyItem;
 /**
  * @author Sdw
  */
-public final class BeautyShopData implements IGameXmlReader
+public final class BeautyShopData implements IXmlReader
 {
 	private final Map<Race, Map<Sex, BeautyData>> _beautyList = new HashMap<>();
 	private final Map<Sex, BeautyData> _beautyData = new HashMap<>();
diff --git a/L2J_Mobius_6.0_Fafurion/java/com/l2jmobius/gameserver/data/xml/impl/BuyListData.java b/L2J_Mobius_6.0_Fafurion/java/com/l2jmobius/gameserver/data/xml/impl/BuyListData.java
index de298ef358..8ab9ea8097 100644
--- a/L2J_Mobius_6.0_Fafurion/java/com/l2jmobius/gameserver/data/xml/impl/BuyListData.java
+++ b/L2J_Mobius_6.0_Fafurion/java/com/l2jmobius/gameserver/data/xml/impl/BuyListData.java
@@ -21,8 +21,8 @@ import java.io.FileFilter;
 import java.sql.Connection;
 import java.sql.ResultSet;
 import java.sql.Statement;
-import java.util.HashMap;
 import java.util.Map;
+import java.util.concurrent.ConcurrentHashMap;
 import java.util.logging.Level;
 import java.util.logging.Logger;
 
@@ -31,7 +31,7 @@ import org.w3c.dom.NamedNodeMap;
 
 import com.l2jmobius.Config;
 import com.l2jmobius.commons.database.DatabaseFactory;
-import com.l2jmobius.commons.util.IGameXmlReader;
+import com.l2jmobius.commons.util.IXmlReader;
 import com.l2jmobius.commons.util.file.filter.NumericNameFilter;
 import com.l2jmobius.gameserver.datatables.ItemTable;
 import com.l2jmobius.gameserver.model.buylist.Product;
@@ -42,11 +42,11 @@ import com.l2jmobius.gameserver.model.items.Item;
  * Loads buy lists for NPCs.
  * @author NosBit
  */
-public final class BuyListData implements IGameXmlReader
+public final class BuyListData implements IXmlReader
 {
 	private static final Logger LOGGER = Logger.getLogger(BuyListData.class.getName());
 	
-	private final Map<Integer, ProductList> _buyLists = new HashMap<>();
+	private final Map<Integer, ProductList> _buyLists = new ConcurrentHashMap<>();
 	private static final FileFilter NUMERIC_FILTER = new NumericNameFilter();
 	
 	protected BuyListData()
diff --git a/L2J_Mobius_6.0_Fafurion/java/com/l2jmobius/gameserver/data/xml/impl/CastleData.java b/L2J_Mobius_6.0_Fafurion/java/com/l2jmobius/gameserver/data/xml/impl/CastleData.java
index 6618dcdf1d..792afbfa0b 100644
--- a/L2J_Mobius_6.0_Fafurion/java/com/l2jmobius/gameserver/data/xml/impl/CastleData.java
+++ b/L2J_Mobius_6.0_Fafurion/java/com/l2jmobius/gameserver/data/xml/impl/CastleData.java
@@ -19,16 +19,16 @@ package com.l2jmobius.gameserver.data.xml.impl;
 import java.io.File;
 import java.util.ArrayList;
 import java.util.Collections;
-import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
+import java.util.concurrent.ConcurrentHashMap;
 import java.util.stream.Collectors;
 
 import org.w3c.dom.Document;
 import org.w3c.dom.NamedNodeMap;
 import org.w3c.dom.Node;
 
-import com.l2jmobius.commons.util.IGameXmlReader;
+import com.l2jmobius.commons.util.IXmlReader;
 import com.l2jmobius.gameserver.enums.CastleSide;
 import com.l2jmobius.gameserver.enums.SiegeGuardType;
 import com.l2jmobius.gameserver.model.holders.CastleSpawnHolder;
@@ -37,10 +37,10 @@ import com.l2jmobius.gameserver.model.holders.SiegeGuardHolder;
 /**
  * @author St3eT
  */
-public final class CastleData implements IGameXmlReader
+public final class CastleData implements IXmlReader
 {
-	private final Map<Integer, List<CastleSpawnHolder>> _spawns = new HashMap<>();
-	private static final Map<Integer, List<SiegeGuardHolder>> _siegeGuards = new HashMap<>();
+	private final Map<Integer, List<CastleSpawnHolder>> _spawns = new ConcurrentHashMap<>();
+	private static final Map<Integer, List<SiegeGuardHolder>> _siegeGuards = new ConcurrentHashMap<>();
 	
 	protected CastleData()
 	{
diff --git a/L2J_Mobius_6.0_Fafurion/java/com/l2jmobius/gameserver/data/xml/impl/CategoryData.java b/L2J_Mobius_6.0_Fafurion/java/com/l2jmobius/gameserver/data/xml/impl/CategoryData.java
index f851aa6703..df7d390dfb 100644
--- a/L2J_Mobius_6.0_Fafurion/java/com/l2jmobius/gameserver/data/xml/impl/CategoryData.java
+++ b/L2J_Mobius_6.0_Fafurion/java/com/l2jmobius/gameserver/data/xml/impl/CategoryData.java
@@ -27,14 +27,14 @@ import org.w3c.dom.Document;
 import org.w3c.dom.NamedNodeMap;
 import org.w3c.dom.Node;
 
-import com.l2jmobius.commons.util.IGameXmlReader;
+import com.l2jmobius.commons.util.IXmlReader;
 import com.l2jmobius.gameserver.enums.CategoryType;
 
 /**
  * Loads the category data with Class or NPC IDs.
  * @author NosBit, xban1x
  */
-public final class CategoryData implements IGameXmlReader
+public final class CategoryData implements IXmlReader
 {
 	private static final Logger LOGGER = Logger.getLogger(CategoryData.class.getName());
 	
diff --git a/L2J_Mobius_6.0_Fafurion/java/com/l2jmobius/gameserver/data/xml/impl/ClanHallData.java b/L2J_Mobius_6.0_Fafurion/java/com/l2jmobius/gameserver/data/xml/impl/ClanHallData.java
index 511cc7f4f7..90a1a51029 100644
--- a/L2J_Mobius_6.0_Fafurion/java/com/l2jmobius/gameserver/data/xml/impl/ClanHallData.java
+++ b/L2J_Mobius_6.0_Fafurion/java/com/l2jmobius/gameserver/data/xml/impl/ClanHallData.java
@@ -20,9 +20,9 @@ import java.io.File;
 import java.util.ArrayList;
 import java.util.Collection;
 import java.util.Comparator;
-import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
+import java.util.concurrent.ConcurrentHashMap;
 import java.util.logging.Logger;
 import java.util.stream.Collectors;
 
@@ -30,7 +30,7 @@ import org.w3c.dom.Document;
 import org.w3c.dom.NamedNodeMap;
 import org.w3c.dom.Node;
 
-import com.l2jmobius.commons.util.IGameXmlReader;
+import com.l2jmobius.commons.util.IXmlReader;
 import com.l2jmobius.gameserver.enums.ClanHallGrade;
 import com.l2jmobius.gameserver.enums.ClanHallType;
 import com.l2jmobius.gameserver.model.Location;
@@ -43,10 +43,10 @@ import com.l2jmobius.gameserver.model.holders.ClanHallTeleportHolder;
 /**
  * @author St3eT
  */
-public final class ClanHallData implements IGameXmlReader
+public final class ClanHallData implements IXmlReader
 {
 	private static final Logger LOGGER = Logger.getLogger(ClanHallData.class.getName());
-	private static final Map<Integer, ClanHall> _clanHalls = new HashMap<>();
+	private static final Map<Integer, ClanHall> _clanHalls = new ConcurrentHashMap<>();
 	
 	protected ClanHallData()
 	{
diff --git a/L2J_Mobius_6.0_Fafurion/java/com/l2jmobius/gameserver/data/xml/impl/ClanMasteryData.java b/L2J_Mobius_6.0_Fafurion/java/com/l2jmobius/gameserver/data/xml/impl/ClanMasteryData.java
index 2b4c575d33..1c3b0f7a9f 100644
--- a/L2J_Mobius_6.0_Fafurion/java/com/l2jmobius/gameserver/data/xml/impl/ClanMasteryData.java
+++ b/L2J_Mobius_6.0_Fafurion/java/com/l2jmobius/gameserver/data/xml/impl/ClanMasteryData.java
@@ -23,7 +23,7 @@ import java.util.logging.Logger;
 
 import org.w3c.dom.Document;
 
-import com.l2jmobius.commons.util.IGameXmlReader;
+import com.l2jmobius.commons.util.IXmlReader;
 import com.l2jmobius.gameserver.model.StatsSet;
 import com.l2jmobius.gameserver.model.holders.ClanMasteryHolder;
 import com.l2jmobius.gameserver.model.skills.Skill;
@@ -31,7 +31,7 @@ import com.l2jmobius.gameserver.model.skills.Skill;
 /**
  * @author Mobius
  */
-public class ClanMasteryData implements IGameXmlReader
+public class ClanMasteryData implements IXmlReader
 {
 	private static Logger LOGGER = Logger.getLogger(ClanMasteryData.class.getName());
 	
diff --git a/L2J_Mobius_6.0_Fafurion/java/com/l2jmobius/gameserver/data/xml/impl/ClanRewardData.java b/L2J_Mobius_6.0_Fafurion/java/com/l2jmobius/gameserver/data/xml/impl/ClanRewardData.java
index 252bba1c64..d5938ee964 100644
--- a/L2J_Mobius_6.0_Fafurion/java/com/l2jmobius/gameserver/data/xml/impl/ClanRewardData.java
+++ b/L2J_Mobius_6.0_Fafurion/java/com/l2jmobius/gameserver/data/xml/impl/ClanRewardData.java
@@ -28,7 +28,6 @@ import org.w3c.dom.Document;
 import org.w3c.dom.NamedNodeMap;
 import org.w3c.dom.Node;
 
-import com.l2jmobius.commons.util.IGameXmlReader;
 import com.l2jmobius.commons.util.IXmlReader;
 import com.l2jmobius.gameserver.enums.ClanRewardType;
 import com.l2jmobius.gameserver.model.clan.ClanRewardBonus;
@@ -38,7 +37,7 @@ import com.l2jmobius.gameserver.model.holders.SkillHolder;
 /**
  * @author UnAfraid
  */
-public class ClanRewardData implements IGameXmlReader
+public class ClanRewardData implements IXmlReader
 {
 	private static final Logger LOGGER = Logger.getLogger(ClanRewardData.class.getName());
 	private final Map<ClanRewardType, List<ClanRewardBonus>> _clanRewards = new ConcurrentHashMap<>();
diff --git a/L2J_Mobius_6.0_Fafurion/java/com/l2jmobius/gameserver/data/xml/impl/ClanShopData.java b/L2J_Mobius_6.0_Fafurion/java/com/l2jmobius/gameserver/data/xml/impl/ClanShopData.java
index 2ed49eee9f..006d51a7ea 100644
--- a/L2J_Mobius_6.0_Fafurion/java/com/l2jmobius/gameserver/data/xml/impl/ClanShopData.java
+++ b/L2J_Mobius_6.0_Fafurion/java/com/l2jmobius/gameserver/data/xml/impl/ClanShopData.java
@@ -23,7 +23,7 @@ import java.util.logging.Logger;
 
 import org.w3c.dom.Document;
 
-import com.l2jmobius.commons.util.IGameXmlReader;
+import com.l2jmobius.commons.util.IXmlReader;
 import com.l2jmobius.gameserver.datatables.ItemTable;
 import com.l2jmobius.gameserver.model.StatsSet;
 import com.l2jmobius.gameserver.model.holders.ClanShopProductHolder;
@@ -32,7 +32,7 @@ import com.l2jmobius.gameserver.model.items.Item;
 /**
  * @author Mobius
  */
-public class ClanShopData implements IGameXmlReader
+public class ClanShopData implements IXmlReader
 {
 	private static Logger LOGGER = Logger.getLogger(ClanShopData.class.getName());
 	
diff --git a/L2J_Mobius_6.0_Fafurion/java/com/l2jmobius/gameserver/data/xml/impl/ClassListData.java b/L2J_Mobius_6.0_Fafurion/java/com/l2jmobius/gameserver/data/xml/impl/ClassListData.java
index a40f726d50..6e99aeabfa 100644
--- a/L2J_Mobius_6.0_Fafurion/java/com/l2jmobius/gameserver/data/xml/impl/ClassListData.java
+++ b/L2J_Mobius_6.0_Fafurion/java/com/l2jmobius/gameserver/data/xml/impl/ClassListData.java
@@ -17,15 +17,15 @@
 package com.l2jmobius.gameserver.data.xml.impl;
 
 import java.io.File;
-import java.util.HashMap;
 import java.util.Map;
+import java.util.concurrent.ConcurrentHashMap;
 import java.util.logging.Logger;
 
 import org.w3c.dom.Document;
 import org.w3c.dom.NamedNodeMap;
 import org.w3c.dom.Node;
 
-import com.l2jmobius.commons.util.IGameXmlReader;
+import com.l2jmobius.commons.util.IXmlReader;
 import com.l2jmobius.gameserver.model.base.ClassId;
 import com.l2jmobius.gameserver.model.base.ClassInfo;
 
@@ -33,11 +33,11 @@ import com.l2jmobius.gameserver.model.base.ClassInfo;
  * Loads the the list of classes and it's info.
  * @author Zoey76
  */
-public final class ClassListData implements IGameXmlReader
+public final class ClassListData implements IXmlReader
 {
 	private static final Logger LOGGER = Logger.getLogger(ClassListData.class.getName());
 	
-	private final Map<ClassId, ClassInfo> _classData = new HashMap<>();
+	private final Map<ClassId, ClassInfo> _classData = new ConcurrentHashMap<>();
 	
 	/**
 	 * Instantiates a new class list data.
diff --git a/L2J_Mobius_6.0_Fafurion/java/com/l2jmobius/gameserver/data/xml/impl/CombinationItemsData.java b/L2J_Mobius_6.0_Fafurion/java/com/l2jmobius/gameserver/data/xml/impl/CombinationItemsData.java
index a7e90d5f89..c2ce205300 100644
--- a/L2J_Mobius_6.0_Fafurion/java/com/l2jmobius/gameserver/data/xml/impl/CombinationItemsData.java
+++ b/L2J_Mobius_6.0_Fafurion/java/com/l2jmobius/gameserver/data/xml/impl/CombinationItemsData.java
@@ -24,7 +24,7 @@ import java.util.stream.Collectors;
 
 import org.w3c.dom.Document;
 
-import com.l2jmobius.commons.util.IGameXmlReader;
+import com.l2jmobius.commons.util.IXmlReader;
 import com.l2jmobius.gameserver.datatables.ItemTable;
 import com.l2jmobius.gameserver.model.StatsSet;
 import com.l2jmobius.gameserver.model.items.combination.CombinationItem;
@@ -34,7 +34,7 @@ import com.l2jmobius.gameserver.model.items.combination.CombinationItemType;
 /**
  * @author UnAfraid
  */
-public class CombinationItemsData implements IGameXmlReader
+public class CombinationItemsData implements IXmlReader
 {
 	private static final Logger LOGGER = Logger.getLogger(CombinationItemsData.class.getName());
 	private final List<CombinationItem> _items = new ArrayList<>();
diff --git a/L2J_Mobius_6.0_Fafurion/java/com/l2jmobius/gameserver/data/xml/impl/CubicData.java b/L2J_Mobius_6.0_Fafurion/java/com/l2jmobius/gameserver/data/xml/impl/CubicData.java
index f682509217..ef46a08a7f 100644
--- a/L2J_Mobius_6.0_Fafurion/java/com/l2jmobius/gameserver/data/xml/impl/CubicData.java
+++ b/L2J_Mobius_6.0_Fafurion/java/com/l2jmobius/gameserver/data/xml/impl/CubicData.java
@@ -20,12 +20,12 @@ import java.io.File;
 import java.util.Collections;
 import java.util.HashMap;
 import java.util.Map;
+import java.util.concurrent.ConcurrentHashMap;
 import java.util.logging.Logger;
 
 import org.w3c.dom.Document;
 import org.w3c.dom.Node;
 
-import com.l2jmobius.commons.util.IGameXmlReader;
 import com.l2jmobius.commons.util.IXmlReader;
 import com.l2jmobius.gameserver.model.StatsSet;
 import com.l2jmobius.gameserver.model.actor.templates.CubicTemplate;
@@ -39,11 +39,11 @@ import com.l2jmobius.gameserver.model.cubic.conditions.RangeCondition;
 /**
  * @author UnAfraid
  */
-public class CubicData implements IGameXmlReader
+public class CubicData implements IXmlReader
 {
 	private static final Logger LOGGER = Logger.getLogger(CubicData.class.getName());
 	
-	private final Map<Integer, Map<Integer, CubicTemplate>> _cubics = new HashMap<>();
+	private final Map<Integer, Map<Integer, CubicTemplate>> _cubics = new ConcurrentHashMap<>();
 	
 	protected CubicData()
 	{
diff --git a/L2J_Mobius_6.0_Fafurion/java/com/l2jmobius/gameserver/data/xml/impl/DailyMissionData.java b/L2J_Mobius_6.0_Fafurion/java/com/l2jmobius/gameserver/data/xml/impl/DailyMissionData.java
index 53519f2492..1e275049d9 100644
--- a/L2J_Mobius_6.0_Fafurion/java/com/l2jmobius/gameserver/data/xml/impl/DailyMissionData.java
+++ b/L2J_Mobius_6.0_Fafurion/java/com/l2jmobius/gameserver/data/xml/impl/DailyMissionData.java
@@ -27,7 +27,7 @@ import java.util.stream.Collectors;
 
 import org.w3c.dom.Document;
 
-import com.l2jmobius.commons.util.IGameXmlReader;
+import com.l2jmobius.commons.util.IXmlReader;
 import com.l2jmobius.gameserver.model.DailyMissionDataHolder;
 import com.l2jmobius.gameserver.model.StatsSet;
 import com.l2jmobius.gameserver.model.actor.instance.PlayerInstance;
@@ -37,7 +37,7 @@ import com.l2jmobius.gameserver.model.holders.ItemHolder;
 /**
  * @author Sdw
  */
-public class DailyMissionData implements IGameXmlReader
+public class DailyMissionData implements IXmlReader
 {
 	private static final Logger LOGGER = Logger.getLogger(DailyMissionData.class.getName());
 	private final Map<Integer, List<DailyMissionDataHolder>> _dailyMissionRewards = new LinkedHashMap<>();
diff --git a/L2J_Mobius_6.0_Fafurion/java/com/l2jmobius/gameserver/data/xml/impl/DoorData.java b/L2J_Mobius_6.0_Fafurion/java/com/l2jmobius/gameserver/data/xml/impl/DoorData.java
index e8b1ff7bfa..5dd43e98eb 100644
--- a/L2J_Mobius_6.0_Fafurion/java/com/l2jmobius/gameserver/data/xml/impl/DoorData.java
+++ b/L2J_Mobius_6.0_Fafurion/java/com/l2jmobius/gameserver/data/xml/impl/DoorData.java
@@ -32,7 +32,6 @@ import org.w3c.dom.Document;
 import org.w3c.dom.NamedNodeMap;
 import org.w3c.dom.Node;
 
-import com.l2jmobius.commons.util.IGameXmlReader;
 import com.l2jmobius.commons.util.IXmlReader;
 import com.l2jmobius.gameserver.instancemanager.MapRegionManager;
 import com.l2jmobius.gameserver.model.Location;
@@ -45,7 +44,7 @@ import com.l2jmobius.gameserver.model.instancezone.Instance;
  * This class loads and hold info about doors.
  * @author JIV, GodKratos, UnAfraid
  */
-public final class DoorData implements IGameXmlReader
+public final class DoorData implements IXmlReader
 {
 	private static final Logger LOGGER = Logger.getLogger(DoorData.class.getName());
 	
diff --git a/L2J_Mobius_6.0_Fafurion/java/com/l2jmobius/gameserver/data/xml/impl/EnchantItemData.java b/L2J_Mobius_6.0_Fafurion/java/com/l2jmobius/gameserver/data/xml/impl/EnchantItemData.java
index 24e12d1218..342b4cde07 100644
--- a/L2J_Mobius_6.0_Fafurion/java/com/l2jmobius/gameserver/data/xml/impl/EnchantItemData.java
+++ b/L2J_Mobius_6.0_Fafurion/java/com/l2jmobius/gameserver/data/xml/impl/EnchantItemData.java
@@ -25,7 +25,7 @@ import org.w3c.dom.Document;
 import org.w3c.dom.NamedNodeMap;
 import org.w3c.dom.Node;
 
-import com.l2jmobius.commons.util.IGameXmlReader;
+import com.l2jmobius.commons.util.IXmlReader;
 import com.l2jmobius.gameserver.model.StatsSet;
 import com.l2jmobius.gameserver.model.items.enchant.EnchantScroll;
 import com.l2jmobius.gameserver.model.items.enchant.EnchantSupportItem;
@@ -35,7 +35,7 @@ import com.l2jmobius.gameserver.model.items.instance.ItemInstance;
  * Loads item enchant data.
  * @author UnAfraid
  */
-public class EnchantItemData implements IGameXmlReader
+public class EnchantItemData implements IXmlReader
 {
 	private static final Logger LOGGER = Logger.getLogger(EnchantItemData.class.getName());
 	
diff --git a/L2J_Mobius_6.0_Fafurion/java/com/l2jmobius/gameserver/data/xml/impl/EnchantItemGroupsData.java b/L2J_Mobius_6.0_Fafurion/java/com/l2jmobius/gameserver/data/xml/impl/EnchantItemGroupsData.java
index 666d821e42..44582a7dd4 100644
--- a/L2J_Mobius_6.0_Fafurion/java/com/l2jmobius/gameserver/data/xml/impl/EnchantItemGroupsData.java
+++ b/L2J_Mobius_6.0_Fafurion/java/com/l2jmobius/gameserver/data/xml/impl/EnchantItemGroupsData.java
@@ -25,7 +25,7 @@ import org.w3c.dom.Document;
 import org.w3c.dom.NamedNodeMap;
 import org.w3c.dom.Node;
 
-import com.l2jmobius.commons.util.IGameXmlReader;
+import com.l2jmobius.commons.util.IXmlReader;
 import com.l2jmobius.gameserver.datatables.ItemTable;
 import com.l2jmobius.gameserver.model.holders.RangeChanceHolder;
 import com.l2jmobius.gameserver.model.items.Item;
@@ -37,7 +37,7 @@ import com.l2jmobius.gameserver.util.Util;
 /**
  * @author UnAfraid
  */
-public final class EnchantItemGroupsData implements IGameXmlReader
+public final class EnchantItemGroupsData implements IXmlReader
 {
 	private static final Logger LOGGER = Logger.getLogger(EnchantItemGroupsData.class.getName());
 	
diff --git a/L2J_Mobius_6.0_Fafurion/java/com/l2jmobius/gameserver/data/xml/impl/EnchantItemHPBonusData.java b/L2J_Mobius_6.0_Fafurion/java/com/l2jmobius/gameserver/data/xml/impl/EnchantItemHPBonusData.java
index d2ce1096b5..868b1f95f6 100644
--- a/L2J_Mobius_6.0_Fafurion/java/com/l2jmobius/gameserver/data/xml/impl/EnchantItemHPBonusData.java
+++ b/L2J_Mobius_6.0_Fafurion/java/com/l2jmobius/gameserver/data/xml/impl/EnchantItemHPBonusData.java
@@ -26,7 +26,7 @@ import java.util.logging.Logger;
 import org.w3c.dom.Document;
 import org.w3c.dom.Node;
 
-import com.l2jmobius.commons.util.IGameXmlReader;
+import com.l2jmobius.commons.util.IXmlReader;
 import com.l2jmobius.gameserver.model.items.Item;
 import com.l2jmobius.gameserver.model.items.instance.ItemInstance;
 import com.l2jmobius.gameserver.model.items.type.CrystalType;
@@ -35,7 +35,7 @@ import com.l2jmobius.gameserver.model.items.type.CrystalType;
  * This class holds the Enchant HP Bonus Data.
  * @author MrPoke, Zoey76
  */
-public class EnchantItemHPBonusData implements IGameXmlReader
+public class EnchantItemHPBonusData implements IXmlReader
 {
 	private static final Logger LOGGER = Logger.getLogger(EnchantItemHPBonusData.class.getName());
 	
diff --git a/L2J_Mobius_6.0_Fafurion/java/com/l2jmobius/gameserver/data/xml/impl/EnchantItemOptionsData.java b/L2J_Mobius_6.0_Fafurion/java/com/l2jmobius/gameserver/data/xml/impl/EnchantItemOptionsData.java
index f6e9946b94..b8d805132f 100644
--- a/L2J_Mobius_6.0_Fafurion/java/com/l2jmobius/gameserver/data/xml/impl/EnchantItemOptionsData.java
+++ b/L2J_Mobius_6.0_Fafurion/java/com/l2jmobius/gameserver/data/xml/impl/EnchantItemOptionsData.java
@@ -24,7 +24,7 @@ import java.util.logging.Logger;
 import org.w3c.dom.Document;
 import org.w3c.dom.Node;
 
-import com.l2jmobius.commons.util.IGameXmlReader;
+import com.l2jmobius.commons.util.IXmlReader;
 import com.l2jmobius.gameserver.model.items.instance.ItemInstance;
 import com.l2jmobius.gameserver.model.options.EnchantOptions;
 import com.l2jmobius.gameserver.util.Util;
@@ -32,7 +32,7 @@ import com.l2jmobius.gameserver.util.Util;
 /**
  * @author UnAfraid
  */
-public class EnchantItemOptionsData implements IGameXmlReader
+public class EnchantItemOptionsData implements IXmlReader
 {
 	private static final Logger LOGGER = Logger.getLogger(EnchantItemOptionsData.class.getName());
 	
diff --git a/L2J_Mobius_6.0_Fafurion/java/com/l2jmobius/gameserver/data/xml/impl/EnchantSkillGroupsData.java b/L2J_Mobius_6.0_Fafurion/java/com/l2jmobius/gameserver/data/xml/impl/EnchantSkillGroupsData.java
index 0b557ced04..45127fe5f6 100644
--- a/L2J_Mobius_6.0_Fafurion/java/com/l2jmobius/gameserver/data/xml/impl/EnchantSkillGroupsData.java
+++ b/L2J_Mobius_6.0_Fafurion/java/com/l2jmobius/gameserver/data/xml/impl/EnchantSkillGroupsData.java
@@ -18,16 +18,15 @@ package com.l2jmobius.gameserver.data.xml.impl;
 
 import java.io.File;
 import java.util.Collections;
-import java.util.HashMap;
 import java.util.HashSet;
-import java.util.LinkedHashMap;
 import java.util.Map;
 import java.util.Set;
+import java.util.concurrent.ConcurrentHashMap;
 import java.util.logging.Logger;
 
 import org.w3c.dom.Document;
 
-import com.l2jmobius.commons.util.IGameXmlReader;
+import com.l2jmobius.commons.util.IXmlReader;
 import com.l2jmobius.gameserver.enums.SkillEnchantType;
 import com.l2jmobius.gameserver.model.StatsSet;
 import com.l2jmobius.gameserver.model.holders.EnchantSkillHolder;
@@ -39,12 +38,12 @@ import com.l2jmobius.gameserver.model.skills.Skill;
  * This class holds the Enchant Groups information.
  * @author Micr0
  */
-public class EnchantSkillGroupsData implements IGameXmlReader
+public class EnchantSkillGroupsData implements IXmlReader
 {
 	private static final Logger LOGGER = Logger.getLogger(EnchantSkillGroupsData.class.getName());
 	
-	private final Map<Integer, EnchantSkillHolder> _enchantSkillHolders = new LinkedHashMap<>();
-	private final Map<SkillHolder, Set<Integer>> _enchantSkillTrees = new HashMap<>();
+	private final Map<Integer, EnchantSkillHolder> _enchantSkillHolders = new ConcurrentHashMap<>();
+	private final Map<SkillHolder, Set<Integer>> _enchantSkillTrees = new ConcurrentHashMap<>();
 	
 	public static int MAX_ENCHANT_LEVEL;
 	
diff --git a/L2J_Mobius_6.0_Fafurion/java/com/l2jmobius/gameserver/data/xml/impl/EnsoulData.java b/L2J_Mobius_6.0_Fafurion/java/com/l2jmobius/gameserver/data/xml/impl/EnsoulData.java
index 0881f3aaec..bea9592527 100644
--- a/L2J_Mobius_6.0_Fafurion/java/com/l2jmobius/gameserver/data/xml/impl/EnsoulData.java
+++ b/L2J_Mobius_6.0_Fafurion/java/com/l2jmobius/gameserver/data/xml/impl/EnsoulData.java
@@ -19,16 +19,14 @@ package com.l2jmobius.gameserver.data.xml.impl;
 import java.io.File;
 import java.util.Collection;
 import java.util.Collections;
-import java.util.EnumMap;
-import java.util.HashMap;
 import java.util.Map;
+import java.util.concurrent.ConcurrentHashMap;
 import java.util.logging.Logger;
 
 import org.w3c.dom.Document;
 import org.w3c.dom.NamedNodeMap;
 import org.w3c.dom.Node;
 
-import com.l2jmobius.commons.util.IGameXmlReader;
 import com.l2jmobius.commons.util.IXmlReader;
 import com.l2jmobius.gameserver.model.ensoul.EnsoulFee;
 import com.l2jmobius.gameserver.model.ensoul.EnsoulOption;
@@ -39,12 +37,12 @@ import com.l2jmobius.gameserver.model.items.type.CrystalType;
 /**
  * @author UnAfraid
  */
-public class EnsoulData implements IGameXmlReader
+public class EnsoulData implements IXmlReader
 {
 	private static final Logger LOGGER = Logger.getLogger(EnsoulData.class.getName());
-	private final Map<CrystalType, EnsoulFee> _ensoulFees = new EnumMap<>(CrystalType.class);
-	private final Map<Integer, EnsoulOption> _ensoulOptions = new HashMap<>();
-	private final Map<Integer, EnsoulStone> _ensoulStones = new HashMap<>();
+	private final Map<CrystalType, EnsoulFee> _ensoulFees = new ConcurrentHashMap<>();
+	private final Map<Integer, EnsoulOption> _ensoulOptions = new ConcurrentHashMap<>();
+	private final Map<Integer, EnsoulStone> _ensoulStones = new ConcurrentHashMap<>();
 	
 	protected EnsoulData()
 	{
diff --git a/L2J_Mobius_6.0_Fafurion/java/com/l2jmobius/gameserver/data/xml/impl/EventEngineData.java b/L2J_Mobius_6.0_Fafurion/java/com/l2jmobius/gameserver/data/xml/impl/EventEngineData.java
index c43970ea31..144e2d5599 100644
--- a/L2J_Mobius_6.0_Fafurion/java/com/l2jmobius/gameserver/data/xml/impl/EventEngineData.java
+++ b/L2J_Mobius_6.0_Fafurion/java/com/l2jmobius/gameserver/data/xml/impl/EventEngineData.java
@@ -32,7 +32,6 @@ import org.w3c.dom.Document;
 import org.w3c.dom.NamedNodeMap;
 import org.w3c.dom.Node;
 
-import com.l2jmobius.commons.util.IGameXmlReader;
 import com.l2jmobius.commons.util.IXmlReader;
 import com.l2jmobius.gameserver.model.Location;
 import com.l2jmobius.gameserver.model.StatsSet;
@@ -54,7 +53,7 @@ import com.l2jmobius.gameserver.model.holders.SkillHolder;
 /**
  * @author UnAfraid
  */
-public final class EventEngineData implements IGameXmlReader
+public final class EventEngineData implements IXmlReader
 {
 	private static final Logger LOGGER = Logger.getLogger(EventEngineData.class.getName());
 	
diff --git a/L2J_Mobius_6.0_Fafurion/java/com/l2jmobius/gameserver/data/xml/impl/ExperienceData.java b/L2J_Mobius_6.0_Fafurion/java/com/l2jmobius/gameserver/data/xml/impl/ExperienceData.java
index 2daaf16220..ea9d13c2aa 100644
--- a/L2J_Mobius_6.0_Fafurion/java/com/l2jmobius/gameserver/data/xml/impl/ExperienceData.java
+++ b/L2J_Mobius_6.0_Fafurion/java/com/l2jmobius/gameserver/data/xml/impl/ExperienceData.java
@@ -26,13 +26,13 @@ import org.w3c.dom.NamedNodeMap;
 import org.w3c.dom.Node;
 
 import com.l2jmobius.Config;
-import com.l2jmobius.commons.util.IGameXmlReader;
+import com.l2jmobius.commons.util.IXmlReader;
 
 /**
  * This class holds the Experience points for each level for players and pets.
  * @author mrTJO
  */
-public final class ExperienceData implements IGameXmlReader
+public final class ExperienceData implements IXmlReader
 {
 	private static final Logger LOGGER = Logger.getLogger(ExperienceData.class.getName());
 	
diff --git a/L2J_Mobius_6.0_Fafurion/java/com/l2jmobius/gameserver/data/xml/impl/ExtendDropData.java b/L2J_Mobius_6.0_Fafurion/java/com/l2jmobius/gameserver/data/xml/impl/ExtendDropData.java
index 00af3a4f77..09da39ad14 100644
--- a/L2J_Mobius_6.0_Fafurion/java/com/l2jmobius/gameserver/data/xml/impl/ExtendDropData.java
+++ b/L2J_Mobius_6.0_Fafurion/java/com/l2jmobius/gameserver/data/xml/impl/ExtendDropData.java
@@ -28,7 +28,7 @@ import java.util.logging.Logger;
 import org.w3c.dom.Document;
 import org.w3c.dom.Node;
 
-import com.l2jmobius.commons.util.IGameXmlReader;
+import com.l2jmobius.commons.util.IXmlReader;
 import com.l2jmobius.gameserver.handler.ConditionHandler;
 import com.l2jmobius.gameserver.model.StatsSet;
 import com.l2jmobius.gameserver.model.conditions.ICondition;
@@ -39,7 +39,7 @@ import com.l2jmobius.gameserver.network.SystemMessageId;
 /**
  * @author Sdw
  */
-public class ExtendDropData implements IGameXmlReader
+public class ExtendDropData implements IXmlReader
 {
 	private static final Logger LOGGER = Logger.getLogger(ExtendDropData.class.getName());
 	private final Map<Integer, ExtendDropDataHolder> _extendDrop = new HashMap<>();
diff --git a/L2J_Mobius_6.0_Fafurion/java/com/l2jmobius/gameserver/data/xml/impl/FakePlayerData.java b/L2J_Mobius_6.0_Fafurion/java/com/l2jmobius/gameserver/data/xml/impl/FakePlayerData.java
index afb92c06d5..74b7957fd9 100644
--- a/L2J_Mobius_6.0_Fafurion/java/com/l2jmobius/gameserver/data/xml/impl/FakePlayerData.java
+++ b/L2J_Mobius_6.0_Fafurion/java/com/l2jmobius/gameserver/data/xml/impl/FakePlayerData.java
@@ -26,7 +26,7 @@ import java.util.logging.Logger;
 import org.w3c.dom.Document;
 
 import com.l2jmobius.Config;
-import com.l2jmobius.commons.util.IGameXmlReader;
+import com.l2jmobius.commons.util.IXmlReader;
 import com.l2jmobius.gameserver.data.sql.impl.CharNameTable;
 import com.l2jmobius.gameserver.model.StatsSet;
 import com.l2jmobius.gameserver.model.actor.templates.NpcTemplate;
@@ -35,7 +35,7 @@ import com.l2jmobius.gameserver.model.holders.FakePlayerHolder;
 /**
  * @author Mobius
  */
-public class FakePlayerData implements IGameXmlReader
+public class FakePlayerData implements IXmlReader
 {
 	private static Logger LOGGER = Logger.getLogger(FakePlayerData.class.getName());
 	
diff --git a/L2J_Mobius_6.0_Fafurion/java/com/l2jmobius/gameserver/data/xml/impl/FenceData.java b/L2J_Mobius_6.0_Fafurion/java/com/l2jmobius/gameserver/data/xml/impl/FenceData.java
index f51175e5fa..d36ab2e16b 100644
--- a/L2J_Mobius_6.0_Fafurion/java/com/l2jmobius/gameserver/data/xml/impl/FenceData.java
+++ b/L2J_Mobius_6.0_Fafurion/java/com/l2jmobius/gameserver/data/xml/impl/FenceData.java
@@ -28,7 +28,7 @@ import java.util.logging.Logger;
 import org.w3c.dom.Document;
 import org.w3c.dom.Node;
 
-import com.l2jmobius.commons.util.IGameXmlReader;
+import com.l2jmobius.commons.util.IXmlReader;
 import com.l2jmobius.gameserver.enums.FenceState;
 import com.l2jmobius.gameserver.model.StatsSet;
 import com.l2jmobius.gameserver.model.World;
@@ -39,7 +39,7 @@ import com.l2jmobius.gameserver.model.instancezone.Instance;
 /**
  * @author HoridoJoho / FBIagent
  */
-public final class FenceData implements IGameXmlReader
+public final class FenceData implements IXmlReader
 {
 	private static final Logger LOGGER = Logger.getLogger(FenceData.class.getSimpleName());
 	
diff --git a/L2J_Mobius_6.0_Fafurion/java/com/l2jmobius/gameserver/data/xml/impl/FishingData.java b/L2J_Mobius_6.0_Fafurion/java/com/l2jmobius/gameserver/data/xml/impl/FishingData.java
index bacf1ed08c..16436a2f5c 100644
--- a/L2J_Mobius_6.0_Fafurion/java/com/l2jmobius/gameserver/data/xml/impl/FishingData.java
+++ b/L2J_Mobius_6.0_Fafurion/java/com/l2jmobius/gameserver/data/xml/impl/FishingData.java
@@ -26,7 +26,7 @@ import org.w3c.dom.NamedNodeMap;
 import org.w3c.dom.Node;
 
 import com.l2jmobius.Config;
-import com.l2jmobius.commons.util.IGameXmlReader;
+import com.l2jmobius.commons.util.IXmlReader;
 import com.l2jmobius.gameserver.datatables.ItemTable;
 import com.l2jmobius.gameserver.model.fishing.FishingBait;
 import com.l2jmobius.gameserver.model.fishing.FishingCatch;
@@ -36,7 +36,7 @@ import com.l2jmobius.gameserver.model.fishing.FishingRod;
  * This class holds the Fishing information.
  * @author bit
  */
-public final class FishingData implements IGameXmlReader
+public final class FishingData implements IXmlReader
 {
 	private static final Logger LOGGER = Logger.getLogger(FishingData.class.getName());
 	private final Map<Integer, FishingBait> _baitData = new HashMap<>();
diff --git a/L2J_Mobius_6.0_Fafurion/java/com/l2jmobius/gameserver/data/xml/impl/HennaData.java b/L2J_Mobius_6.0_Fafurion/java/com/l2jmobius/gameserver/data/xml/impl/HennaData.java
index e27e186193..d3ac163f3c 100644
--- a/L2J_Mobius_6.0_Fafurion/java/com/l2jmobius/gameserver/data/xml/impl/HennaData.java
+++ b/L2J_Mobius_6.0_Fafurion/java/com/l2jmobius/gameserver/data/xml/impl/HennaData.java
@@ -27,7 +27,7 @@ import org.w3c.dom.Document;
 import org.w3c.dom.NamedNodeMap;
 import org.w3c.dom.Node;
 
-import com.l2jmobius.commons.util.IGameXmlReader;
+import com.l2jmobius.commons.util.IXmlReader;
 import com.l2jmobius.gameserver.model.StatsSet;
 import com.l2jmobius.gameserver.model.base.ClassId;
 import com.l2jmobius.gameserver.model.items.Henna;
@@ -40,7 +40,7 @@ import com.l2jmobius.gameserver.model.skills.Skill;
  * Allowed classes to wear each henna.
  * @author Zoey76, Mobius
  */
-public final class HennaData implements IGameXmlReader
+public final class HennaData implements IXmlReader
 {
 	private static final Logger LOGGER = Logger.getLogger(HennaData.class.getName());
 	
diff --git a/L2J_Mobius_6.0_Fafurion/java/com/l2jmobius/gameserver/data/xml/impl/HitConditionBonusData.java b/L2J_Mobius_6.0_Fafurion/java/com/l2jmobius/gameserver/data/xml/impl/HitConditionBonusData.java
index e9f2f9a87d..2d6ccf0467 100644
--- a/L2J_Mobius_6.0_Fafurion/java/com/l2jmobius/gameserver/data/xml/impl/HitConditionBonusData.java
+++ b/L2J_Mobius_6.0_Fafurion/java/com/l2jmobius/gameserver/data/xml/impl/HitConditionBonusData.java
@@ -23,7 +23,7 @@ import org.w3c.dom.Document;
 import org.w3c.dom.NamedNodeMap;
 import org.w3c.dom.Node;
 
-import com.l2jmobius.commons.util.IGameXmlReader;
+import com.l2jmobius.commons.util.IXmlReader;
 import com.l2jmobius.gameserver.GameTimeController;
 import com.l2jmobius.gameserver.enums.Position;
 import com.l2jmobius.gameserver.model.actor.Creature;
@@ -32,7 +32,7 @@ import com.l2jmobius.gameserver.model.actor.Creature;
  * This class load, holds and calculates the hit condition bonuses.
  * @author Nik
  */
-public final class HitConditionBonusData implements IGameXmlReader
+public final class HitConditionBonusData implements IXmlReader
 {
 	private static final Logger LOGGER = Logger.getLogger(HitConditionBonusData.class.getName());
 	
diff --git a/L2J_Mobius_6.0_Fafurion/java/com/l2jmobius/gameserver/data/xml/impl/InitialEquipmentData.java b/L2J_Mobius_6.0_Fafurion/java/com/l2jmobius/gameserver/data/xml/impl/InitialEquipmentData.java
index 247ea4b46d..275a23f28f 100644
--- a/L2J_Mobius_6.0_Fafurion/java/com/l2jmobius/gameserver/data/xml/impl/InitialEquipmentData.java
+++ b/L2J_Mobius_6.0_Fafurion/java/com/l2jmobius/gameserver/data/xml/impl/InitialEquipmentData.java
@@ -28,7 +28,7 @@ import org.w3c.dom.NamedNodeMap;
 import org.w3c.dom.Node;
 
 import com.l2jmobius.Config;
-import com.l2jmobius.commons.util.IGameXmlReader;
+import com.l2jmobius.commons.util.IXmlReader;
 import com.l2jmobius.gameserver.model.StatsSet;
 import com.l2jmobius.gameserver.model.base.ClassId;
 import com.l2jmobius.gameserver.model.items.PlayerItemTemplate;
@@ -38,7 +38,7 @@ import com.l2jmobius.gameserver.model.items.PlayerItemTemplate;
  * What items get each newly created character and if this item is equipped upon creation (<b>Requires the item to be equippable</b>).
  * @author Zoey76
  */
-public final class InitialEquipmentData implements IGameXmlReader
+public final class InitialEquipmentData implements IXmlReader
 {
 	private static final Logger LOGGER = Logger.getLogger(InitialEquipmentData.class.getName());
 	
diff --git a/L2J_Mobius_6.0_Fafurion/java/com/l2jmobius/gameserver/data/xml/impl/InitialShortcutData.java b/L2J_Mobius_6.0_Fafurion/java/com/l2jmobius/gameserver/data/xml/impl/InitialShortcutData.java
index 5f886bafa8..3b9e976607 100644
--- a/L2J_Mobius_6.0_Fafurion/java/com/l2jmobius/gameserver/data/xml/impl/InitialShortcutData.java
+++ b/L2J_Mobius_6.0_Fafurion/java/com/l2jmobius/gameserver/data/xml/impl/InitialShortcutData.java
@@ -27,7 +27,7 @@ import org.w3c.dom.Document;
 import org.w3c.dom.NamedNodeMap;
 import org.w3c.dom.Node;
 
-import com.l2jmobius.commons.util.IGameXmlReader;
+import com.l2jmobius.commons.util.IXmlReader;
 import com.l2jmobius.gameserver.enums.MacroType;
 import com.l2jmobius.gameserver.enums.ShortcutType;
 import com.l2jmobius.gameserver.model.Macro;
@@ -43,7 +43,7 @@ import com.l2jmobius.gameserver.network.serverpackets.ShortCutRegister;
  * What shortcuts get each newly created character.
  * @author Zoey76
  */
-public final class InitialShortcutData implements IGameXmlReader
+public final class InitialShortcutData implements IXmlReader
 {
 	private static final Logger LOGGER = Logger.getLogger(InitialShortcutData.class.getName());
 	
diff --git a/L2J_Mobius_6.0_Fafurion/java/com/l2jmobius/gameserver/data/xml/impl/ItemCrystallizationData.java b/L2J_Mobius_6.0_Fafurion/java/com/l2jmobius/gameserver/data/xml/impl/ItemCrystallizationData.java
index 86454b2b71..aa7742afa1 100644
--- a/L2J_Mobius_6.0_Fafurion/java/com/l2jmobius/gameserver/data/xml/impl/ItemCrystallizationData.java
+++ b/L2J_Mobius_6.0_Fafurion/java/com/l2jmobius/gameserver/data/xml/impl/ItemCrystallizationData.java
@@ -28,7 +28,7 @@ import org.w3c.dom.Document;
 import org.w3c.dom.NamedNodeMap;
 import org.w3c.dom.Node;
 
-import com.l2jmobius.commons.util.IGameXmlReader;
+import com.l2jmobius.commons.util.IXmlReader;
 import com.l2jmobius.gameserver.datatables.ItemTable;
 import com.l2jmobius.gameserver.enums.CrystallizationType;
 import com.l2jmobius.gameserver.model.holders.CrystallizationDataHolder;
@@ -42,7 +42,7 @@ import com.l2jmobius.gameserver.model.items.type.CrystalType;
 /**
  * @author UnAfraid
  */
-public final class ItemCrystallizationData implements IGameXmlReader
+public final class ItemCrystallizationData implements IXmlReader
 {
 	private static final Logger LOGGER = Logger.getLogger(ItemCrystallizationData.class.getName());
 	
diff --git a/L2J_Mobius_6.0_Fafurion/java/com/l2jmobius/gameserver/data/xml/impl/KarmaData.java b/L2J_Mobius_6.0_Fafurion/java/com/l2jmobius/gameserver/data/xml/impl/KarmaData.java
index ca826eba2e..bd68c38748 100644
--- a/L2J_Mobius_6.0_Fafurion/java/com/l2jmobius/gameserver/data/xml/impl/KarmaData.java
+++ b/L2J_Mobius_6.0_Fafurion/java/com/l2jmobius/gameserver/data/xml/impl/KarmaData.java
@@ -26,12 +26,12 @@ import org.w3c.dom.NamedNodeMap;
 import org.w3c.dom.Node;
 
 import com.l2jmobius.Config;
-import com.l2jmobius.commons.util.IGameXmlReader;
+import com.l2jmobius.commons.util.IXmlReader;
 
 /**
  * @author UnAfraid
  */
-public class KarmaData implements IGameXmlReader
+public class KarmaData implements IXmlReader
 {
 	private static final Logger LOGGER = Logger.getLogger(KarmaData.class.getName());
 	
diff --git a/L2J_Mobius_6.0_Fafurion/java/com/l2jmobius/gameserver/data/xml/impl/LuckyGameData.java b/L2J_Mobius_6.0_Fafurion/java/com/l2jmobius/gameserver/data/xml/impl/LuckyGameData.java
index 6759bfec3f..41c0d0fc31 100644
--- a/L2J_Mobius_6.0_Fafurion/java/com/l2jmobius/gameserver/data/xml/impl/LuckyGameData.java
+++ b/L2J_Mobius_6.0_Fafurion/java/com/l2jmobius/gameserver/data/xml/impl/LuckyGameData.java
@@ -23,7 +23,7 @@ import java.util.concurrent.atomic.AtomicInteger;
 
 import org.w3c.dom.Document;
 
-import com.l2jmobius.commons.util.IGameXmlReader;
+import com.l2jmobius.commons.util.IXmlReader;
 import com.l2jmobius.gameserver.model.StatsSet;
 import com.l2jmobius.gameserver.model.holders.ItemChanceHolder;
 import com.l2jmobius.gameserver.model.holders.ItemPointHolder;
@@ -32,7 +32,7 @@ import com.l2jmobius.gameserver.model.holders.LuckyGameDataHolder;
 /**
  * @author Sdw
  */
-public class LuckyGameData implements IGameXmlReader
+public class LuckyGameData implements IXmlReader
 {
 	private final Map<Integer, LuckyGameDataHolder> _luckyGame = new HashMap<>();
 	private final AtomicInteger _serverPlay = new AtomicInteger();
diff --git a/L2J_Mobius_6.0_Fafurion/java/com/l2jmobius/gameserver/data/xml/impl/MonsterBookData.java b/L2J_Mobius_6.0_Fafurion/java/com/l2jmobius/gameserver/data/xml/impl/MonsterBookData.java
index 50f2faefd5..9c69fe71fb 100644
--- a/L2J_Mobius_6.0_Fafurion/java/com/l2jmobius/gameserver/data/xml/impl/MonsterBookData.java
+++ b/L2J_Mobius_6.0_Fafurion/java/com/l2jmobius/gameserver/data/xml/impl/MonsterBookData.java
@@ -25,7 +25,7 @@ import org.w3c.dom.Document;
 import org.w3c.dom.NamedNodeMap;
 import org.w3c.dom.Node;
 
-import com.l2jmobius.commons.util.IGameXmlReader;
+import com.l2jmobius.commons.util.IXmlReader;
 import com.l2jmobius.gameserver.enums.Faction;
 import com.l2jmobius.gameserver.model.holders.MonsterBookCardHolder;
 import com.l2jmobius.gameserver.model.holders.MonsterBookRewardHolder;
@@ -33,7 +33,7 @@ import com.l2jmobius.gameserver.model.holders.MonsterBookRewardHolder;
 /**
  * @author Mobius
  */
-public class MonsterBookData implements IGameXmlReader
+public class MonsterBookData implements IXmlReader
 {
 	private static final Logger LOGGER = Logger.getLogger(MonsterBookData.class.getName());
 	private final List<MonsterBookCardHolder> _monsterBook = new ArrayList<>();
diff --git a/L2J_Mobius_6.0_Fafurion/java/com/l2jmobius/gameserver/data/xml/impl/MultisellData.java b/L2J_Mobius_6.0_Fafurion/java/com/l2jmobius/gameserver/data/xml/impl/MultisellData.java
index 796cd9b6f1..e9c494b91e 100644
--- a/L2J_Mobius_6.0_Fafurion/java/com/l2jmobius/gameserver/data/xml/impl/MultisellData.java
+++ b/L2J_Mobius_6.0_Fafurion/java/com/l2jmobius/gameserver/data/xml/impl/MultisellData.java
@@ -19,11 +19,11 @@ package com.l2jmobius.gameserver.data.xml.impl;
 import java.io.File;
 import java.io.FileFilter;
 import java.util.ArrayList;
-import java.util.HashMap;
 import java.util.HashSet;
 import java.util.List;
 import java.util.Map;
 import java.util.Set;
+import java.util.concurrent.ConcurrentHashMap;
 import java.util.logging.Level;
 import java.util.logging.Logger;
 
@@ -31,7 +31,7 @@ import org.w3c.dom.Document;
 import org.w3c.dom.Node;
 
 import com.l2jmobius.Config;
-import com.l2jmobius.commons.util.IGameXmlReader;
+import com.l2jmobius.commons.util.IXmlReader;
 import com.l2jmobius.commons.util.file.filter.NumericNameFilter;
 import com.l2jmobius.gameserver.datatables.ItemTable;
 import com.l2jmobius.gameserver.enums.SpecialItemType;
@@ -46,14 +46,14 @@ import com.l2jmobius.gameserver.model.holders.PreparedMultisellListHolder;
 import com.l2jmobius.gameserver.model.items.Item;
 import com.l2jmobius.gameserver.network.serverpackets.MultiSellList;
 
-public final class MultisellData implements IGameXmlReader
+public final class MultisellData implements IXmlReader
 {
 	private static final Logger LOGGER = Logger.getLogger(MultisellData.class.getName());
 	
 	public static final int PAGE_SIZE = 40;
 	private static final FileFilter NUMERIC_FILTER = new NumericNameFilter();
 	
-	private final Map<Integer, MultisellListHolder> _multisells = new HashMap<>();
+	private final Map<Integer, MultisellListHolder> _multisells = new ConcurrentHashMap<>();
 	
 	protected MultisellData()
 	{
diff --git a/L2J_Mobius_6.0_Fafurion/java/com/l2jmobius/gameserver/data/xml/impl/NpcData.java b/L2J_Mobius_6.0_Fafurion/java/com/l2jmobius/gameserver/data/xml/impl/NpcData.java
index e43e5c5147..3e1adcb420 100644
--- a/L2J_Mobius_6.0_Fafurion/java/com/l2jmobius/gameserver/data/xml/impl/NpcData.java
+++ b/L2J_Mobius_6.0_Fafurion/java/com/l2jmobius/gameserver/data/xml/impl/NpcData.java
@@ -26,6 +26,8 @@ import java.util.List;
 import java.util.Map;
 import java.util.Map.Entry;
 import java.util.Set;
+import java.util.concurrent.ConcurrentHashMap;
+import java.util.concurrent.CopyOnWriteArrayList;
 import java.util.function.Predicate;
 import java.util.logging.Logger;
 import java.util.stream.Collectors;
@@ -36,7 +38,7 @@ import org.w3c.dom.Node;
 
 import com.l2jmobius.Config;
 import com.l2jmobius.commons.util.CommonUtil;
-import com.l2jmobius.commons.util.IGameXmlReader;
+import com.l2jmobius.commons.util.IXmlReader;
 import com.l2jmobius.gameserver.datatables.ItemTable;
 import com.l2jmobius.gameserver.enums.AISkillScope;
 import com.l2jmobius.gameserver.enums.DropType;
@@ -52,13 +54,13 @@ import com.l2jmobius.gameserver.model.skills.Skill;
  * NPC data parser.
  * @author NosBit
  */
-public class NpcData implements IGameXmlReader
+public class NpcData implements IXmlReader
 {
 	protected static final Logger LOGGER = Logger.getLogger(NpcData.class.getName());
 	
-	private final Map<Integer, NpcTemplate> _npcs = new HashMap<>();
-	private final Map<String, Integer> _clans = new HashMap<>();
-	private static final List<Integer> _masterMonsterIDs = new ArrayList<>();
+	private final Map<Integer, NpcTemplate> _npcs = new ConcurrentHashMap<>();
+	private final Map<String, Integer> _clans = new ConcurrentHashMap<>();
+	private static final List<Integer> _masterMonsterIDs = new CopyOnWriteArrayList<>();
 	
 	protected NpcData()
 	{
diff --git a/L2J_Mobius_6.0_Fafurion/java/com/l2jmobius/gameserver/data/xml/impl/OptionData.java b/L2J_Mobius_6.0_Fafurion/java/com/l2jmobius/gameserver/data/xml/impl/OptionData.java
index bffa2b107c..424e2b27ad 100644
--- a/L2J_Mobius_6.0_Fafurion/java/com/l2jmobius/gameserver/data/xml/impl/OptionData.java
+++ b/L2J_Mobius_6.0_Fafurion/java/com/l2jmobius/gameserver/data/xml/impl/OptionData.java
@@ -18,13 +18,12 @@ package com.l2jmobius.gameserver.data.xml.impl;
 
 import java.io.File;
 import java.util.Collections;
-import java.util.HashMap;
 import java.util.Map;
+import java.util.concurrent.ConcurrentHashMap;
 import java.util.logging.Logger;
 
 import org.w3c.dom.Document;
 
-import com.l2jmobius.commons.util.IGameXmlReader;
 import com.l2jmobius.commons.util.IXmlReader;
 import com.l2jmobius.gameserver.handler.EffectHandler;
 import com.l2jmobius.gameserver.model.StatsSet;
@@ -36,11 +35,11 @@ import com.l2jmobius.gameserver.model.options.OptionsSkillType;
 /**
  * @author UnAfraid
  */
-public class OptionData implements IGameXmlReader
+public class OptionData implements IXmlReader
 {
 	private static final Logger LOGGER = Logger.getLogger(OptionData.class.getName());
 	
-	private final Map<Integer, Options> _optionData = new HashMap<>();
+	private final Map<Integer, Options> _optionData = new ConcurrentHashMap<>();
 	
 	protected OptionData()
 	{
diff --git a/L2J_Mobius_6.0_Fafurion/java/com/l2jmobius/gameserver/data/xml/impl/PetDataTable.java b/L2J_Mobius_6.0_Fafurion/java/com/l2jmobius/gameserver/data/xml/impl/PetDataTable.java
index 65afb75d7d..aa6975cd72 100644
--- a/L2J_Mobius_6.0_Fafurion/java/com/l2jmobius/gameserver/data/xml/impl/PetDataTable.java
+++ b/L2J_Mobius_6.0_Fafurion/java/com/l2jmobius/gameserver/data/xml/impl/PetDataTable.java
@@ -17,15 +17,15 @@
 package com.l2jmobius.gameserver.data.xml.impl;
 
 import java.io.File;
-import java.util.HashMap;
 import java.util.Map;
+import java.util.concurrent.ConcurrentHashMap;
 import java.util.logging.Logger;
 
 import org.w3c.dom.Document;
 import org.w3c.dom.NamedNodeMap;
 import org.w3c.dom.Node;
 
-import com.l2jmobius.commons.util.IGameXmlReader;
+import com.l2jmobius.commons.util.IXmlReader;
 import com.l2jmobius.gameserver.enums.MountType;
 import com.l2jmobius.gameserver.model.PetData;
 import com.l2jmobius.gameserver.model.PetLevelData;
@@ -36,11 +36,11 @@ import com.l2jmobius.gameserver.model.StatsSet;
  * TODO: load and use all pet parameters.
  * @author Zoey76 (rework)
  */
-public final class PetDataTable implements IGameXmlReader
+public final class PetDataTable implements IXmlReader
 {
 	private static final Logger LOGGER = Logger.getLogger(PetDataTable.class.getName());
 	
-	private final Map<Integer, PetData> _pets = new HashMap<>();
+	private final Map<Integer, PetData> _pets = new ConcurrentHashMap<>();
 	
 	/**
 	 * Instantiates a new pet data table.
diff --git a/L2J_Mobius_6.0_Fafurion/java/com/l2jmobius/gameserver/data/xml/impl/PetSkillData.java b/L2J_Mobius_6.0_Fafurion/java/com/l2jmobius/gameserver/data/xml/impl/PetSkillData.java
index 4872dde773..5b2f9a4408 100644
--- a/L2J_Mobius_6.0_Fafurion/java/com/l2jmobius/gameserver/data/xml/impl/PetSkillData.java
+++ b/L2J_Mobius_6.0_Fafurion/java/com/l2jmobius/gameserver/data/xml/impl/PetSkillData.java
@@ -27,14 +27,14 @@ import org.w3c.dom.Document;
 import org.w3c.dom.NamedNodeMap;
 import org.w3c.dom.Node;
 
-import com.l2jmobius.commons.util.IGameXmlReader;
+import com.l2jmobius.commons.util.IXmlReader;
 import com.l2jmobius.gameserver.model.actor.Summon;
 import com.l2jmobius.gameserver.model.holders.SkillHolder;
 
 /**
  * @author Mobius
  */
-public class PetSkillData implements IGameXmlReader
+public class PetSkillData implements IXmlReader
 {
 	private static Logger LOGGER = Logger.getLogger(PetSkillData.class.getName());
 	private final Map<Integer, Map<Long, SkillHolder>> _skillTrees = new HashMap<>();
diff --git a/L2J_Mobius_6.0_Fafurion/java/com/l2jmobius/gameserver/data/xml/impl/PlayerTemplateData.java b/L2J_Mobius_6.0_Fafurion/java/com/l2jmobius/gameserver/data/xml/impl/PlayerTemplateData.java
index 031fab8027..7a7c230b72 100644
--- a/L2J_Mobius_6.0_Fafurion/java/com/l2jmobius/gameserver/data/xml/impl/PlayerTemplateData.java
+++ b/L2J_Mobius_6.0_Fafurion/java/com/l2jmobius/gameserver/data/xml/impl/PlayerTemplateData.java
@@ -18,9 +18,9 @@ package com.l2jmobius.gameserver.data.xml.impl;
 
 import java.io.File;
 import java.util.ArrayList;
-import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
+import java.util.concurrent.ConcurrentHashMap;
 import java.util.logging.Logger;
 
 import org.w3c.dom.Document;
@@ -28,7 +28,7 @@ import org.w3c.dom.NamedNodeMap;
 import org.w3c.dom.Node;
 
 import com.l2jmobius.Config;
-import com.l2jmobius.commons.util.IGameXmlReader;
+import com.l2jmobius.commons.util.IXmlReader;
 import com.l2jmobius.gameserver.model.Location;
 import com.l2jmobius.gameserver.model.StatsSet;
 import com.l2jmobius.gameserver.model.actor.templates.PlayerTemplate;
@@ -38,11 +38,11 @@ import com.l2jmobius.gameserver.model.base.ClassId;
  * Loads player's base stats.
  * @author Forsaiken, Zoey76, GKR
  */
-public final class PlayerTemplateData implements IGameXmlReader
+public final class PlayerTemplateData implements IXmlReader
 {
 	private static final Logger LOGGER = Logger.getLogger(PlayerTemplateData.class.getName());
 	
-	private final Map<ClassId, PlayerTemplate> _playerTemplates = new HashMap<>();
+	private final Map<ClassId, PlayerTemplate> _playerTemplates = new ConcurrentHashMap<>();
 	
 	private int _dataCount = 0;
 	private int _autoGeneratedCount = 0;
diff --git a/L2J_Mobius_6.0_Fafurion/java/com/l2jmobius/gameserver/data/xml/impl/PlayerXpPercentLostData.java b/L2J_Mobius_6.0_Fafurion/java/com/l2jmobius/gameserver/data/xml/impl/PlayerXpPercentLostData.java
index 2b867a18e4..816cb7aacf 100644
--- a/L2J_Mobius_6.0_Fafurion/java/com/l2jmobius/gameserver/data/xml/impl/PlayerXpPercentLostData.java
+++ b/L2J_Mobius_6.0_Fafurion/java/com/l2jmobius/gameserver/data/xml/impl/PlayerXpPercentLostData.java
@@ -24,13 +24,13 @@ import org.w3c.dom.Document;
 import org.w3c.dom.NamedNodeMap;
 import org.w3c.dom.Node;
 
-import com.l2jmobius.commons.util.IGameXmlReader;
+import com.l2jmobius.commons.util.IXmlReader;
 
 /**
  * This class holds the Player Xp Percent Lost Data for each level for players.
  * @author Zealar
  */
-public final class PlayerXpPercentLostData implements IGameXmlReader
+public final class PlayerXpPercentLostData implements IXmlReader
 {
 	private static final Logger LOGGER = Logger.getLogger(PlayerXpPercentLostData.class.getName());
 	
diff --git a/L2J_Mobius_6.0_Fafurion/java/com/l2jmobius/gameserver/data/xml/impl/PrimeShopData.java b/L2J_Mobius_6.0_Fafurion/java/com/l2jmobius/gameserver/data/xml/impl/PrimeShopData.java
index 82ddd51f26..650d156194 100644
--- a/L2J_Mobius_6.0_Fafurion/java/com/l2jmobius/gameserver/data/xml/impl/PrimeShopData.java
+++ b/L2J_Mobius_6.0_Fafurion/java/com/l2jmobius/gameserver/data/xml/impl/PrimeShopData.java
@@ -27,7 +27,7 @@ import org.w3c.dom.Document;
 import org.w3c.dom.NamedNodeMap;
 import org.w3c.dom.Node;
 
-import com.l2jmobius.commons.util.IGameXmlReader;
+import com.l2jmobius.commons.util.IXmlReader;
 import com.l2jmobius.gameserver.datatables.ItemTable;
 import com.l2jmobius.gameserver.model.StatsSet;
 import com.l2jmobius.gameserver.model.actor.instance.PlayerInstance;
@@ -39,7 +39,7 @@ import com.l2jmobius.gameserver.network.serverpackets.primeshop.ExBRProductInfo;
 /**
  * @author Gnacik, UnAfraid
  */
-public class PrimeShopData implements IGameXmlReader
+public class PrimeShopData implements IXmlReader
 {
 	private static final Logger LOGGER = Logger.getLogger(PrimeShopData.class.getName());
 	
diff --git a/L2J_Mobius_6.0_Fafurion/java/com/l2jmobius/gameserver/data/xml/impl/RecipeData.java b/L2J_Mobius_6.0_Fafurion/java/com/l2jmobius/gameserver/data/xml/impl/RecipeData.java
index 80d9297e84..04794cd354 100644
--- a/L2J_Mobius_6.0_Fafurion/java/com/l2jmobius/gameserver/data/xml/impl/RecipeData.java
+++ b/L2J_Mobius_6.0_Fafurion/java/com/l2jmobius/gameserver/data/xml/impl/RecipeData.java
@@ -29,7 +29,7 @@ import org.w3c.dom.Document;
 import org.w3c.dom.NamedNodeMap;
 import org.w3c.dom.Node;
 
-import com.l2jmobius.commons.util.IGameXmlReader;
+import com.l2jmobius.commons.util.IXmlReader;
 import com.l2jmobius.gameserver.enums.StatusUpdateType;
 import com.l2jmobius.gameserver.model.StatsSet;
 import com.l2jmobius.gameserver.model.holders.ItemChanceHolder;
@@ -39,7 +39,7 @@ import com.l2jmobius.gameserver.model.holders.RecipeHolder;
 /**
  * @author Nik
  */
-public class RecipeData implements IGameXmlReader
+public class RecipeData implements IXmlReader
 {
 	private static final Logger LOGGER = Logger.getLogger(RecipeData.class.getName());
 	
diff --git a/L2J_Mobius_6.0_Fafurion/java/com/l2jmobius/gameserver/data/xml/impl/ResidenceFunctionsData.java b/L2J_Mobius_6.0_Fafurion/java/com/l2jmobius/gameserver/data/xml/impl/ResidenceFunctionsData.java
index 66951e9e59..094ef13149 100644
--- a/L2J_Mobius_6.0_Fafurion/java/com/l2jmobius/gameserver/data/xml/impl/ResidenceFunctionsData.java
+++ b/L2J_Mobius_6.0_Fafurion/java/com/l2jmobius/gameserver/data/xml/impl/ResidenceFunctionsData.java
@@ -28,7 +28,7 @@ import org.w3c.dom.Document;
 import org.w3c.dom.NamedNodeMap;
 import org.w3c.dom.Node;
 
-import com.l2jmobius.commons.util.IGameXmlReader;
+import com.l2jmobius.commons.util.IXmlReader;
 import com.l2jmobius.gameserver.model.StatsSet;
 import com.l2jmobius.gameserver.model.residences.ResidenceFunctionTemplate;
 
@@ -36,7 +36,7 @@ import com.l2jmobius.gameserver.model.residences.ResidenceFunctionTemplate;
  * The residence functions data
  * @author UnAfraid
  */
-public final class ResidenceFunctionsData implements IGameXmlReader
+public final class ResidenceFunctionsData implements IXmlReader
 {
 	private static final Logger LOGGER = Logger.getLogger(ResidenceFunctionsData.class.getName());
 	private final Map<Integer, List<ResidenceFunctionTemplate>> _functions = new HashMap<>();
diff --git a/L2J_Mobius_6.0_Fafurion/java/com/l2jmobius/gameserver/data/xml/impl/SayuneData.java b/L2J_Mobius_6.0_Fafurion/java/com/l2jmobius/gameserver/data/xml/impl/SayuneData.java
index 835bd96930..13b4d33b1e 100644
--- a/L2J_Mobius_6.0_Fafurion/java/com/l2jmobius/gameserver/data/xml/impl/SayuneData.java
+++ b/L2J_Mobius_6.0_Fafurion/java/com/l2jmobius/gameserver/data/xml/impl/SayuneData.java
@@ -26,13 +26,13 @@ import org.w3c.dom.Document;
 import org.w3c.dom.NamedNodeMap;
 import org.w3c.dom.Node;
 
-import com.l2jmobius.commons.util.IGameXmlReader;
+import com.l2jmobius.commons.util.IXmlReader;
 import com.l2jmobius.gameserver.model.SayuneEntry;
 
 /**
  * @author UnAfraid
  */
-public class SayuneData implements IGameXmlReader
+public class SayuneData implements IXmlReader
 {
 	private static final Logger LOGGER = Logger.getLogger(SayuneData.class.getName());
 	
diff --git a/L2J_Mobius_6.0_Fafurion/java/com/l2jmobius/gameserver/data/xml/impl/SecondaryAuthData.java b/L2J_Mobius_6.0_Fafurion/java/com/l2jmobius/gameserver/data/xml/impl/SecondaryAuthData.java
index c0ebd36146..ca85056b10 100644
--- a/L2J_Mobius_6.0_Fafurion/java/com/l2jmobius/gameserver/data/xml/impl/SecondaryAuthData.java
+++ b/L2J_Mobius_6.0_Fafurion/java/com/l2jmobius/gameserver/data/xml/impl/SecondaryAuthData.java
@@ -25,12 +25,12 @@ import java.util.logging.Logger;
 import org.w3c.dom.Document;
 import org.w3c.dom.Node;
 
-import com.l2jmobius.commons.util.IGameXmlReader;
+import com.l2jmobius.commons.util.IXmlReader;
 
 /**
  * @author NosBit
  */
-public class SecondaryAuthData implements IGameXmlReader
+public class SecondaryAuthData implements IXmlReader
 {
 	private static final Logger LOGGER = Logger.getLogger(SecondaryAuthData.class.getName());
 	
diff --git a/L2J_Mobius_6.0_Fafurion/java/com/l2jmobius/gameserver/data/xml/impl/ShuttleData.java b/L2J_Mobius_6.0_Fafurion/java/com/l2jmobius/gameserver/data/xml/impl/ShuttleData.java
index d98e504809..a078e20dc7 100644
--- a/L2J_Mobius_6.0_Fafurion/java/com/l2jmobius/gameserver/data/xml/impl/ShuttleData.java
+++ b/L2J_Mobius_6.0_Fafurion/java/com/l2jmobius/gameserver/data/xml/impl/ShuttleData.java
@@ -27,7 +27,7 @@ import org.w3c.dom.Document;
 import org.w3c.dom.NamedNodeMap;
 import org.w3c.dom.Node;
 
-import com.l2jmobius.commons.util.IGameXmlReader;
+import com.l2jmobius.commons.util.IXmlReader;
 import com.l2jmobius.gameserver.model.Location;
 import com.l2jmobius.gameserver.model.StatsSet;
 import com.l2jmobius.gameserver.model.VehiclePathPoint;
@@ -40,7 +40,7 @@ import com.l2jmobius.gameserver.model.shuttle.ShuttleStop;
 /**
  * @author UnAfraid
  */
-public final class ShuttleData implements IGameXmlReader
+public final class ShuttleData implements IXmlReader
 {
 	private static final Logger LOGGER = Logger.getLogger(ShuttleData.class.getName());
 	
diff --git a/L2J_Mobius_6.0_Fafurion/java/com/l2jmobius/gameserver/data/xml/impl/SiegeScheduleData.java b/L2J_Mobius_6.0_Fafurion/java/com/l2jmobius/gameserver/data/xml/impl/SiegeScheduleData.java
index 265bf7c528..6bff09010b 100644
--- a/L2J_Mobius_6.0_Fafurion/java/com/l2jmobius/gameserver/data/xml/impl/SiegeScheduleData.java
+++ b/L2J_Mobius_6.0_Fafurion/java/com/l2jmobius/gameserver/data/xml/impl/SiegeScheduleData.java
@@ -27,7 +27,7 @@ import org.w3c.dom.Document;
 import org.w3c.dom.NamedNodeMap;
 import org.w3c.dom.Node;
 
-import com.l2jmobius.commons.util.IGameXmlReader;
+import com.l2jmobius.commons.util.IXmlReader;
 import com.l2jmobius.gameserver.model.SiegeScheduleDate;
 import com.l2jmobius.gameserver.model.StatsSet;
 import com.l2jmobius.gameserver.util.Util;
@@ -35,7 +35,7 @@ import com.l2jmobius.gameserver.util.Util;
 /**
  * @author UnAfraid
  */
-public class SiegeScheduleData implements IGameXmlReader
+public class SiegeScheduleData implements IXmlReader
 {
 	private static final Logger LOGGER = Logger.getLogger(SiegeScheduleData.class.getName());
 	
diff --git a/L2J_Mobius_6.0_Fafurion/java/com/l2jmobius/gameserver/data/xml/impl/SkillData.java b/L2J_Mobius_6.0_Fafurion/java/com/l2jmobius/gameserver/data/xml/impl/SkillData.java
index 7a1ae2e15b..64900d4d45 100644
--- a/L2J_Mobius_6.0_Fafurion/java/com/l2jmobius/gameserver/data/xml/impl/SkillData.java
+++ b/L2J_Mobius_6.0_Fafurion/java/com/l2jmobius/gameserver/data/xml/impl/SkillData.java
@@ -25,6 +25,7 @@ import java.util.List;
 import java.util.Map;
 import java.util.Optional;
 import java.util.Set;
+import java.util.concurrent.ConcurrentHashMap;
 import java.util.function.BiConsumer;
 import java.util.function.Function;
 import java.util.logging.Level;
@@ -35,7 +36,7 @@ import org.w3c.dom.Document;
 import org.w3c.dom.NamedNodeMap;
 import org.w3c.dom.Node;
 
-import com.l2jmobius.commons.util.IGameXmlReader;
+import com.l2jmobius.commons.util.IXmlReader;
 import com.l2jmobius.gameserver.handler.EffectHandler;
 import com.l2jmobius.gameserver.handler.SkillConditionHandler;
 import com.l2jmobius.gameserver.model.StatsSet;
@@ -51,12 +52,12 @@ import com.l2jmobius.gameserver.util.exp4j.ExpressionBuilder;
  * Skill data parser.
  * @author NosBit
  */
-public class SkillData implements IGameXmlReader
+public class SkillData implements IXmlReader
 {
 	private static final Logger LOGGER = Logger.getLogger(SkillData.class.getName());
 	
-	private final Map<Long, Skill> _skills = new HashMap<>();
-	private final Map<Integer, Integer> _skillsMaxLevel = new HashMap<>();
+	private final Map<Long, Skill> _skills = new ConcurrentHashMap<>();
+	private final Map<Integer, Integer> _skillsMaxLevel = new ConcurrentHashMap<>();
 	
 	private class NamedParamInfo
 	{
diff --git a/L2J_Mobius_6.0_Fafurion/java/com/l2jmobius/gameserver/data/xml/impl/SkillTreesData.java b/L2J_Mobius_6.0_Fafurion/java/com/l2jmobius/gameserver/data/xml/impl/SkillTreesData.java
index 0ae7e9b862..ae1318ef3d 100644
--- a/L2J_Mobius_6.0_Fafurion/java/com/l2jmobius/gameserver/data/xml/impl/SkillTreesData.java
+++ b/L2J_Mobius_6.0_Fafurion/java/com/l2jmobius/gameserver/data/xml/impl/SkillTreesData.java
@@ -29,6 +29,7 @@ import java.util.List;
 import java.util.Map;
 import java.util.Map.Entry;
 import java.util.Set;
+import java.util.concurrent.ConcurrentHashMap;
 import java.util.concurrent.atomic.AtomicBoolean;
 import java.util.logging.Logger;
 import java.util.stream.Collectors;
@@ -38,7 +39,7 @@ import org.w3c.dom.NamedNodeMap;
 import org.w3c.dom.Node;
 
 import com.l2jmobius.Config;
-import com.l2jmobius.commons.util.IGameXmlReader;
+import com.l2jmobius.commons.util.IXmlReader;
 import com.l2jmobius.gameserver.enums.CategoryType;
 import com.l2jmobius.gameserver.enums.Race;
 import com.l2jmobius.gameserver.enums.SubclassType;
@@ -77,34 +78,34 @@ import com.l2jmobius.gameserver.model.skills.Skill;
  * For XML schema please refer to skillTrees.xsd in datapack in xsd folder and for parameters documentation refer to documentation.txt in skillTrees folder.<br>
  * @author Zoey76
  */
-public final class SkillTreesData implements IGameXmlReader
+public final class SkillTreesData implements IXmlReader
 {
 	private static final Logger LOGGER = Logger.getLogger(SkillTreesData.class.getName());
 	
 	// ClassId, Map of Skill Hash Code, SkillLearn
-	private static final Map<ClassId, Map<Long, SkillLearn>> _classSkillTrees = new HashMap<>();
-	private static final Map<ClassId, Map<Long, SkillLearn>> _transferSkillTrees = new HashMap<>();
-	private static final Map<Race, Map<Long, SkillLearn>> _raceSkillTree = new HashMap<>();
-	private static final Map<SubclassType, Map<Long, SkillLearn>> _revelationSkillTree = new HashMap<>();
-	private static final Map<ClassId, Set<Integer>> _awakeningSaveSkillTree = new HashMap<>();
+	private static final Map<ClassId, Map<Long, SkillLearn>> _classSkillTrees = new ConcurrentHashMap<>();
+	private static final Map<ClassId, Map<Long, SkillLearn>> _transferSkillTrees = new ConcurrentHashMap<>();
+	private static final Map<Race, Map<Long, SkillLearn>> _raceSkillTree = new ConcurrentHashMap<>();
+	private static final Map<SubclassType, Map<Long, SkillLearn>> _revelationSkillTree = new ConcurrentHashMap<>();
+	private static final Map<ClassId, Set<Integer>> _awakeningSaveSkillTree = new ConcurrentHashMap<>();
 	// Skill Hash Code, SkillLearn
-	private static final Map<Long, SkillLearn> _collectSkillTree = new HashMap<>();
-	private static final Map<Long, SkillLearn> _fishingSkillTree = new HashMap<>();
-	private static final Map<Long, SkillLearn> _pledgeSkillTree = new HashMap<>();
-	private static final Map<Long, SkillLearn> _subClassSkillTree = new HashMap<>();
-	private static final Map<Long, SkillLearn> _subPledgeSkillTree = new HashMap<>();
-	private static final Map<Long, SkillLearn> _transformSkillTree = new HashMap<>();
-	private static final Map<Long, SkillLearn> _commonSkillTree = new HashMap<>();
-	private static final Map<Long, SkillLearn> _abilitySkillTree = new HashMap<>();
-	private static final Map<Long, SkillLearn> _alchemySkillTree = new HashMap<>();
-	private static final Map<Long, SkillLearn> _dualClassSkillTree = new HashMap<>();
+	private static final Map<Long, SkillLearn> _collectSkillTree = new ConcurrentHashMap<>();
+	private static final Map<Long, SkillLearn> _fishingSkillTree = new ConcurrentHashMap<>();
+	private static final Map<Long, SkillLearn> _pledgeSkillTree = new ConcurrentHashMap<>();
+	private static final Map<Long, SkillLearn> _subClassSkillTree = new ConcurrentHashMap<>();
+	private static final Map<Long, SkillLearn> _subPledgeSkillTree = new ConcurrentHashMap<>();
+	private static final Map<Long, SkillLearn> _transformSkillTree = new ConcurrentHashMap<>();
+	private static final Map<Long, SkillLearn> _commonSkillTree = new ConcurrentHashMap<>();
+	private static final Map<Long, SkillLearn> _abilitySkillTree = new ConcurrentHashMap<>();
+	private static final Map<Long, SkillLearn> _alchemySkillTree = new ConcurrentHashMap<>();
+	private static final Map<Long, SkillLearn> _dualClassSkillTree = new ConcurrentHashMap<>();
 	// Other skill trees
-	private static final Map<Long, SkillLearn> _nobleSkillTree = new HashMap<>();
-	private static final Map<Long, SkillLearn> _heroSkillTree = new HashMap<>();
-	private static final Map<Long, SkillLearn> _gameMasterSkillTree = new HashMap<>();
-	private static final Map<Long, SkillLearn> _gameMasterAuraSkillTree = new HashMap<>();
+	private static final Map<Long, SkillLearn> _nobleSkillTree = new ConcurrentHashMap<>();
+	private static final Map<Long, SkillLearn> _heroSkillTree = new ConcurrentHashMap<>();
+	private static final Map<Long, SkillLearn> _gameMasterSkillTree = new ConcurrentHashMap<>();
+	private static final Map<Long, SkillLearn> _gameMasterAuraSkillTree = new ConcurrentHashMap<>();
 	// Remove skill tree
-	private static final Map<ClassId, Set<Integer>> _removeSkillCache = new HashMap<>();
+	private static final Map<ClassId, Set<Integer>> _removeSkillCache = new ConcurrentHashMap<>();
 	
 	// Checker, sorted arrays of hash codes
 	private Map<Integer, long[]> _skillsByClassIdHashCodes; // Occupation skills
@@ -112,7 +113,7 @@ public final class SkillTreesData implements IGameXmlReader
 	private long[] _allSkillsHashCodes; // Fishing, Collection, Transformations, Common Skills.
 	
 	/** Parent class Ids are read from XML and stored in this map, to allow easy customization. */
-	private static final Map<ClassId, ClassId> _parentClassMap = new HashMap<>();
+	private static final Map<ClassId, ClassId> _parentClassMap = new ConcurrentHashMap<>();
 	
 	private final AtomicBoolean _isLoading = new AtomicBoolean();
 	
diff --git a/L2J_Mobius_6.0_Fafurion/java/com/l2jmobius/gameserver/data/xml/impl/SpawnsData.java b/L2J_Mobius_6.0_Fafurion/java/com/l2jmobius/gameserver/data/xml/impl/SpawnsData.java
index dc41b02109..806d00902a 100644
--- a/L2J_Mobius_6.0_Fafurion/java/com/l2jmobius/gameserver/data/xml/impl/SpawnsData.java
+++ b/L2J_Mobius_6.0_Fafurion/java/com/l2jmobius/gameserver/data/xml/impl/SpawnsData.java
@@ -19,9 +19,10 @@ package com.l2jmobius.gameserver.data.xml.impl;
 import java.io.File;
 import java.util.ArrayList;
 import java.util.Collections;
-import java.util.LinkedList;
 import java.util.List;
 import java.util.Map;
+import java.util.concurrent.CopyOnWriteArrayList;
+import java.util.concurrent.ScheduledFuture;
 import java.util.function.Predicate;
 import java.util.logging.Level;
 import java.util.logging.Logger;
@@ -31,7 +32,7 @@ import org.w3c.dom.Document;
 import org.w3c.dom.Node;
 
 import com.l2jmobius.Config;
-import com.l2jmobius.commons.util.IGameXmlReader;
+import com.l2jmobius.commons.concurrent.ThreadPool;
 import com.l2jmobius.commons.util.IXmlReader;
 import com.l2jmobius.gameserver.model.ChanceLocation;
 import com.l2jmobius.gameserver.model.StatsSet;
@@ -49,11 +50,11 @@ import com.l2jmobius.gameserver.model.zone.type.SpawnTerritory;
 /**
  * @author UnAfraid
  */
-public class SpawnsData implements IGameXmlReader
+public class SpawnsData implements IXmlReader
 {
 	protected static final Logger LOGGER = Logger.getLogger(SpawnsData.class.getName());
 	
-	private final List<SpawnTemplate> _spawns = new LinkedList<>();
+	private final List<SpawnTemplate> _spawns = new CopyOnWriteArrayList<>();
 	
 	protected SpawnsData()
 	{
@@ -94,11 +95,28 @@ public class SpawnsData implements IGameXmlReader
 		}
 		
 		LOGGER.info(getClass().getSimpleName() + ": Initializing spawns...");
-		_spawns.stream().filter(SpawnTemplate::isSpawningByDefault).forEach(template ->
+		final List<ScheduledFuture<?>> jobs = new CopyOnWriteArrayList<>();
+		for (SpawnTemplate template : _spawns)
 		{
-			template.spawnAll(null);
-			template.notifyActivate();
-		});
+			if (template.isSpawningByDefault())
+			{
+				jobs.add(ThreadPool.schedule(() ->
+				{
+					template.spawnAll(null);
+					template.notifyActivate();
+				}, 0));
+			}
+		}
+		while (!jobs.isEmpty())
+		{
+			for (ScheduledFuture<?> job : jobs)
+			{
+				if ((job == null) || job.isDone() || job.isCancelled())
+				{
+					jobs.remove(job);
+				}
+			}
+		}
 		LOGGER.info(getClass().getSimpleName() + ": All spawns has been initialized!");
 	}
 	
diff --git a/L2J_Mobius_6.0_Fafurion/java/com/l2jmobius/gameserver/data/xml/impl/StaticObjectData.java b/L2J_Mobius_6.0_Fafurion/java/com/l2jmobius/gameserver/data/xml/impl/StaticObjectData.java
index 016b9ff921..4b7009416c 100644
--- a/L2J_Mobius_6.0_Fafurion/java/com/l2jmobius/gameserver/data/xml/impl/StaticObjectData.java
+++ b/L2J_Mobius_6.0_Fafurion/java/com/l2jmobius/gameserver/data/xml/impl/StaticObjectData.java
@@ -26,7 +26,7 @@ import org.w3c.dom.Document;
 import org.w3c.dom.NamedNodeMap;
 import org.w3c.dom.Node;
 
-import com.l2jmobius.commons.util.IGameXmlReader;
+import com.l2jmobius.commons.util.IXmlReader;
 import com.l2jmobius.gameserver.model.StatsSet;
 import com.l2jmobius.gameserver.model.actor.instance.StaticObjectInstance;
 import com.l2jmobius.gameserver.model.actor.templates.CharTemplate;
@@ -35,7 +35,7 @@ import com.l2jmobius.gameserver.model.actor.templates.CharTemplate;
  * This class loads and holds all static object data.
  * @author UnAfraid
  */
-public final class StaticObjectData implements IGameXmlReader
+public final class StaticObjectData implements IXmlReader
 {
 	private static final Logger LOGGER = Logger.getLogger(StaticObjectData.class.getName());
 	
diff --git a/L2J_Mobius_6.0_Fafurion/java/com/l2jmobius/gameserver/data/xml/impl/TeleportersData.java b/L2J_Mobius_6.0_Fafurion/java/com/l2jmobius/gameserver/data/xml/impl/TeleportersData.java
index 1d039725ad..5afec008f7 100644
--- a/L2J_Mobius_6.0_Fafurion/java/com/l2jmobius/gameserver/data/xml/impl/TeleportersData.java
+++ b/L2J_Mobius_6.0_Fafurion/java/com/l2jmobius/gameserver/data/xml/impl/TeleportersData.java
@@ -20,12 +20,13 @@ import java.io.File;
 import java.util.Collections;
 import java.util.HashMap;
 import java.util.Map;
+import java.util.concurrent.ConcurrentHashMap;
 import java.util.logging.Logger;
 
 import org.w3c.dom.Document;
 import org.w3c.dom.NamedNodeMap;
 
-import com.l2jmobius.commons.util.IGameXmlReader;
+import com.l2jmobius.commons.util.IXmlReader;
 import com.l2jmobius.gameserver.enums.TeleportType;
 import com.l2jmobius.gameserver.model.StatsSet;
 import com.l2jmobius.gameserver.model.teleporter.TeleportHolder;
@@ -33,12 +34,12 @@ import com.l2jmobius.gameserver.model.teleporter.TeleportHolder;
 /**
  * @author UnAfraid
  */
-public class TeleportersData implements IGameXmlReader
+public class TeleportersData implements IXmlReader
 {
 	// Logger instance
 	private static final Logger LOGGER = Logger.getLogger(TeleportersData.class.getName());
 	// Teleporter data
-	private final Map<Integer, Map<String, TeleportHolder>> _teleporters = new HashMap<>();
+	private final Map<Integer, Map<String, TeleportHolder>> _teleporters = new ConcurrentHashMap<>();
 	
 	protected TeleportersData()
 	{
diff --git a/L2J_Mobius_6.0_Fafurion/java/com/l2jmobius/gameserver/data/xml/impl/TransformData.java b/L2J_Mobius_6.0_Fafurion/java/com/l2jmobius/gameserver/data/xml/impl/TransformData.java
index 896111de87..d917c7e46f 100644
--- a/L2J_Mobius_6.0_Fafurion/java/com/l2jmobius/gameserver/data/xml/impl/TransformData.java
+++ b/L2J_Mobius_6.0_Fafurion/java/com/l2jmobius/gameserver/data/xml/impl/TransformData.java
@@ -17,15 +17,15 @@
 package com.l2jmobius.gameserver.data.xml.impl;
 
 import java.io.File;
-import java.util.HashMap;
 import java.util.Map;
+import java.util.concurrent.ConcurrentHashMap;
 import java.util.logging.Logger;
 
 import org.w3c.dom.Document;
 import org.w3c.dom.NamedNodeMap;
 import org.w3c.dom.Node;
 
-import com.l2jmobius.commons.util.IGameXmlReader;
+import com.l2jmobius.commons.util.IXmlReader;
 import com.l2jmobius.gameserver.model.StatsSet;
 import com.l2jmobius.gameserver.model.actor.transform.Transform;
 import com.l2jmobius.gameserver.model.actor.transform.TransformLevelData;
@@ -39,11 +39,11 @@ import com.l2jmobius.gameserver.network.serverpackets.ExBasicActionList;
  * Transformation data.
  * @author UnAfraid
  */
-public final class TransformData implements IGameXmlReader
+public final class TransformData implements IXmlReader
 {
 	private static final Logger LOGGER = Logger.getLogger(TransformData.class.getName());
 	
-	private final Map<Integer, Transform> _transformData = new HashMap<>();
+	private final Map<Integer, Transform> _transformData = new ConcurrentHashMap<>();
 	
 	protected TransformData()
 	{
diff --git a/L2J_Mobius_6.0_Fafurion/java/com/l2jmobius/gameserver/data/xml/impl/VariationData.java b/L2J_Mobius_6.0_Fafurion/java/com/l2jmobius/gameserver/data/xml/impl/VariationData.java
index 13b41c6359..542acc971b 100644
--- a/L2J_Mobius_6.0_Fafurion/java/com/l2jmobius/gameserver/data/xml/impl/VariationData.java
+++ b/L2J_Mobius_6.0_Fafurion/java/com/l2jmobius/gameserver/data/xml/impl/VariationData.java
@@ -22,11 +22,12 @@ import java.util.Collections;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
+import java.util.concurrent.ConcurrentHashMap;
 import java.util.logging.Logger;
 
 import org.w3c.dom.Document;
 
-import com.l2jmobius.commons.util.IGameXmlReader;
+import com.l2jmobius.commons.util.IXmlReader;
 import com.l2jmobius.gameserver.datatables.ItemTable;
 import com.l2jmobius.gameserver.model.VariationInstance;
 import com.l2jmobius.gameserver.model.items.instance.ItemInstance;
@@ -40,12 +41,12 @@ import com.l2jmobius.gameserver.model.options.VariationWeaponType;
 /**
  * @author Pere
  */
-public class VariationData implements IGameXmlReader
+public class VariationData implements IXmlReader
 {
 	private static final Logger LOGGER = Logger.getLogger(VariationData.class.getSimpleName());
 	
-	private final Map<Integer, Variation> _variations = new HashMap<>();
-	private final Map<Integer, Map<Integer, VariationFee>> _fees = new HashMap<>();
+	private final Map<Integer, Variation> _variations = new ConcurrentHashMap<>();
+	private final Map<Integer, Map<Integer, VariationFee>> _fees = new ConcurrentHashMap<>();
 	
 	protected VariationData()
 	{
diff --git a/L2J_Mobius_6.0_Fafurion/java/com/l2jmobius/gameserver/engines/DocumentEngine.java b/L2J_Mobius_6.0_Fafurion/java/com/l2jmobius/gameserver/engines/DocumentEngine.java
index d787488757..10f04f4fb3 100644
--- a/L2J_Mobius_6.0_Fafurion/java/com/l2jmobius/gameserver/engines/DocumentEngine.java
+++ b/L2J_Mobius_6.0_Fafurion/java/com/l2jmobius/gameserver/engines/DocumentEngine.java
@@ -17,11 +17,14 @@
 package com.l2jmobius.gameserver.engines;
 
 import java.io.File;
-import java.util.LinkedList;
+import java.util.ArrayList;
 import java.util.List;
+import java.util.concurrent.CopyOnWriteArrayList;
+import java.util.concurrent.ScheduledFuture;
 import java.util.logging.Logger;
 
 import com.l2jmobius.Config;
+import com.l2jmobius.commons.concurrent.ThreadPool;
 import com.l2jmobius.commons.util.file.filter.XMLFilter;
 import com.l2jmobius.gameserver.engines.items.DocumentItem;
 import com.l2jmobius.gameserver.model.items.Item;
@@ -33,34 +36,29 @@ public class DocumentEngine
 {
 	private static final Logger LOGGER = Logger.getLogger(DocumentEngine.class.getName());
 	
-	private final List<File> _itemFiles = new LinkedList<>();
-	
-	public static DocumentEngine getInstance()
-	{
-		return SingletonHolder._instance;
-	}
+	private final List<File> _itemFiles = new ArrayList<>();
 	
 	protected DocumentEngine()
 	{
-		hashFiles("data/stats/items", _itemFiles);
+		processDirectory("data/stats/items", _itemFiles);
 		if (Config.CUSTOM_ITEMS_LOAD)
 		{
-			hashFiles("data/stats/items/custom", _itemFiles);
+			processDirectory("data/stats/items/custom", _itemFiles);
 		}
 	}
 	
-	private void hashFiles(String dirname, List<File> hash)
+	private void processDirectory(String dirName, List<File> list)
 	{
-		final File dir = new File(Config.DATAPACK_ROOT, dirname);
+		final File dir = new File(Config.DATAPACK_ROOT, dirName);
 		if (!dir.exists())
 		{
-			LOGGER.warning("Dir " + dir.getAbsolutePath() + " not exists");
+			LOGGER.warning("Dir " + dir.getAbsolutePath() + " does not exist.");
 			return;
 		}
 		final File[] files = dir.listFiles(new XMLFilter());
-		for (File f : files)
+		for (File file : files)
 		{
-			hash.add(f);
+			list.add(file);
 		}
 	}
 	
@@ -70,12 +68,26 @@ public class DocumentEngine
 	 */
 	public List<Item> loadItems()
 	{
-		final List<Item> list = new LinkedList<>();
-		for (File f : _itemFiles)
+		final List<Item> list = new CopyOnWriteArrayList<>();
+		final List<ScheduledFuture<?>> jobs = new CopyOnWriteArrayList<>();
+		for (File file : _itemFiles)
 		{
-			final DocumentItem document = new DocumentItem(f);
-			document.parse();
-			list.addAll(document.getItemList());
+			jobs.add(ThreadPool.schedule(() ->
+			{
+				final DocumentItem document = new DocumentItem(file);
+				document.parse();
+				list.addAll(document.getItemList());
+			}, 0));
+		}
+		while (!jobs.isEmpty())
+		{
+			for (ScheduledFuture<?> job : jobs)
+			{
+				if ((job == null) || job.isDone() || job.isCancelled())
+				{
+					jobs.remove(job);
+				}
+			}
 		}
 		return list;
 	}
@@ -84,4 +96,9 @@ public class DocumentEngine
 	{
 		protected static final DocumentEngine _instance = new DocumentEngine();
 	}
+	
+	public static DocumentEngine getInstance()
+	{
+		return SingletonHolder._instance;
+	}
 }
diff --git a/L2J_Mobius_6.0_Fafurion/java/com/l2jmobius/gameserver/engines/items/DocumentItem.java b/L2J_Mobius_6.0_Fafurion/java/com/l2jmobius/gameserver/engines/items/DocumentItem.java
index 8aaaed2cb4..4ea960563d 100644
--- a/L2J_Mobius_6.0_Fafurion/java/com/l2jmobius/gameserver/engines/items/DocumentItem.java
+++ b/L2J_Mobius_6.0_Fafurion/java/com/l2jmobius/gameserver/engines/items/DocumentItem.java
@@ -19,7 +19,7 @@ package com.l2jmobius.gameserver.engines.items;
 import java.io.File;
 import java.lang.reflect.Constructor;
 import java.lang.reflect.InvocationTargetException;
-import java.util.LinkedList;
+import java.util.ArrayList;
 import java.util.List;
 import java.util.logging.Level;
 import java.util.logging.Logger;
@@ -27,7 +27,7 @@ import java.util.logging.Logger;
 import org.w3c.dom.Document;
 import org.w3c.dom.Node;
 
-import com.l2jmobius.commons.util.IGameXmlReader;
+import com.l2jmobius.commons.util.IXmlReader;
 import com.l2jmobius.gameserver.engines.DocumentBase;
 import com.l2jmobius.gameserver.enums.ItemSkillType;
 import com.l2jmobius.gameserver.model.ExtractableProduct;
@@ -41,12 +41,12 @@ import com.l2jmobius.gameserver.model.stats.functions.FuncTemplate;
 /**
  * @author mkizub, JIV
  */
-public final class DocumentItem extends DocumentBase implements IGameXmlReader
+public final class DocumentItem extends DocumentBase implements IXmlReader
 {
 	Logger LOGGER = Logger.getLogger(DocumentItem.class.getName());
 	
 	private ItemDataHolder _currentItem = null;
-	private final List<Item> _itemsInFile = new LinkedList<>();
+	private final List<Item> _itemsInFile = new ArrayList<>();
 	
 	/**
 	 * @param file
diff --git a/L2J_Mobius_6.0_Fafurion/java/com/l2jmobius/gameserver/handler/ConditionHandler.java b/L2J_Mobius_6.0_Fafurion/java/com/l2jmobius/gameserver/handler/ConditionHandler.java
index c92ef368b3..4e20d5e720 100644
--- a/L2J_Mobius_6.0_Fafurion/java/com/l2jmobius/gameserver/handler/ConditionHandler.java
+++ b/L2J_Mobius_6.0_Fafurion/java/com/l2jmobius/gameserver/handler/ConditionHandler.java
@@ -50,7 +50,7 @@ public final class ConditionHandler
 	{
 		try
 		{
-			ScriptEngineManager.getInstance().executeConditionMasterHandler();
+			ScriptEngineManager.getInstance().executeScript(ScriptEngineManager.CONDITION_HANDLER_FILE);
 		}
 		catch (Exception e)
 		{
diff --git a/L2J_Mobius_6.0_Fafurion/java/com/l2jmobius/gameserver/handler/DailyMissionHandler.java b/L2J_Mobius_6.0_Fafurion/java/com/l2jmobius/gameserver/handler/DailyMissionHandler.java
index 9a80c1db8f..6b6248da49 100644
--- a/L2J_Mobius_6.0_Fafurion/java/com/l2jmobius/gameserver/handler/DailyMissionHandler.java
+++ b/L2J_Mobius_6.0_Fafurion/java/com/l2jmobius/gameserver/handler/DailyMissionHandler.java
@@ -49,7 +49,7 @@ public class DailyMissionHandler
 	{
 		try
 		{
-			ScriptEngineManager.getInstance().executeDailyMissionMasterHandler();
+			ScriptEngineManager.getInstance().executeScript(ScriptEngineManager.ONE_DAY_REWARD_MASTER_HANDLER);
 		}
 		catch (Exception e)
 		{
diff --git a/L2J_Mobius_6.0_Fafurion/java/com/l2jmobius/gameserver/handler/EffectHandler.java b/L2J_Mobius_6.0_Fafurion/java/com/l2jmobius/gameserver/handler/EffectHandler.java
index 0bf5350cb8..cab6562421 100644
--- a/L2J_Mobius_6.0_Fafurion/java/com/l2jmobius/gameserver/handler/EffectHandler.java
+++ b/L2J_Mobius_6.0_Fafurion/java/com/l2jmobius/gameserver/handler/EffectHandler.java
@@ -50,7 +50,7 @@ public final class EffectHandler
 	{
 		try
 		{
-			ScriptEngineManager.getInstance().executeEffectMasterHandler();
+			ScriptEngineManager.getInstance().executeScript(ScriptEngineManager.EFFECT_MASTER_HANDLER_FILE);
 		}
 		catch (Exception e)
 		{
diff --git a/L2J_Mobius_6.0_Fafurion/java/com/l2jmobius/gameserver/handler/SkillConditionHandler.java b/L2J_Mobius_6.0_Fafurion/java/com/l2jmobius/gameserver/handler/SkillConditionHandler.java
index b764410ba1..8685b0279a 100644
--- a/L2J_Mobius_6.0_Fafurion/java/com/l2jmobius/gameserver/handler/SkillConditionHandler.java
+++ b/L2J_Mobius_6.0_Fafurion/java/com/l2jmobius/gameserver/handler/SkillConditionHandler.java
@@ -50,7 +50,7 @@ public final class SkillConditionHandler
 	{
 		try
 		{
-			ScriptEngineManager.getInstance().executeSkillConditionMasterHandler();
+			ScriptEngineManager.getInstance().executeScript(ScriptEngineManager.SKILL_CONDITION_HANDLER_FILE);
 		}
 		catch (Exception e)
 		{
diff --git a/L2J_Mobius_6.0_Fafurion/java/com/l2jmobius/gameserver/instancemanager/CastleManorManager.java b/L2J_Mobius_6.0_Fafurion/java/com/l2jmobius/gameserver/instancemanager/CastleManorManager.java
index 48d04d3f38..212d1a043c 100644
--- a/L2J_Mobius_6.0_Fafurion/java/com/l2jmobius/gameserver/instancemanager/CastleManorManager.java
+++ b/L2J_Mobius_6.0_Fafurion/java/com/l2jmobius/gameserver/instancemanager/CastleManorManager.java
@@ -40,7 +40,7 @@ import org.w3c.dom.Node;
 import com.l2jmobius.Config;
 import com.l2jmobius.commons.concurrent.ThreadPool;
 import com.l2jmobius.commons.database.DatabaseFactory;
-import com.l2jmobius.commons.util.IGameXmlReader;
+import com.l2jmobius.commons.util.IXmlReader;
 import com.l2jmobius.commons.util.Rnd;
 import com.l2jmobius.gameserver.enums.ManorMode;
 import com.l2jmobius.gameserver.model.CropProcure;
@@ -58,7 +58,7 @@ import com.l2jmobius.gameserver.network.SystemMessageId;
  * Castle manor system.
  * @author malyelfik
  */
-public final class CastleManorManager implements IGameXmlReader, IStorable
+public final class CastleManorManager implements IXmlReader, IStorable
 {
 	private static final Logger LOGGER = Logger.getLogger(CastleManorManager.class.getName());
 	
diff --git a/L2J_Mobius_6.0_Fafurion/java/com/l2jmobius/gameserver/instancemanager/CursedWeaponsManager.java b/L2J_Mobius_6.0_Fafurion/java/com/l2jmobius/gameserver/instancemanager/CursedWeaponsManager.java
index d123b41ef6..835d961c56 100644
--- a/L2J_Mobius_6.0_Fafurion/java/com/l2jmobius/gameserver/instancemanager/CursedWeaponsManager.java
+++ b/L2J_Mobius_6.0_Fafurion/java/com/l2jmobius/gameserver/instancemanager/CursedWeaponsManager.java
@@ -35,7 +35,7 @@ import org.w3c.dom.Node;
 
 import com.l2jmobius.Config;
 import com.l2jmobius.commons.database.DatabaseFactory;
-import com.l2jmobius.commons.util.IGameXmlReader;
+import com.l2jmobius.commons.util.IXmlReader;
 import com.l2jmobius.gameserver.model.CursedWeapon;
 import com.l2jmobius.gameserver.model.actor.Attackable;
 import com.l2jmobius.gameserver.model.actor.Creature;
@@ -54,7 +54,7 @@ import com.l2jmobius.gameserver.util.Broadcast;
  * UnAfraid: TODO: Rewrite with DocumentParser
  * @author Micht
  */
-public final class CursedWeaponsManager implements IGameXmlReader
+public final class CursedWeaponsManager implements IXmlReader
 {
 	private static final Logger LOGGER = Logger.getLogger(CursedWeaponsManager.class.getName());
 	
diff --git a/L2J_Mobius_6.0_Fafurion/java/com/l2jmobius/gameserver/instancemanager/FakePlayerChatManager.java b/L2J_Mobius_6.0_Fafurion/java/com/l2jmobius/gameserver/instancemanager/FakePlayerChatManager.java
index 7101927e48..39c239a762 100644
--- a/L2J_Mobius_6.0_Fafurion/java/com/l2jmobius/gameserver/instancemanager/FakePlayerChatManager.java
+++ b/L2J_Mobius_6.0_Fafurion/java/com/l2jmobius/gameserver/instancemanager/FakePlayerChatManager.java
@@ -25,7 +25,7 @@ import org.w3c.dom.Document;
 
 import com.l2jmobius.Config;
 import com.l2jmobius.commons.concurrent.ThreadPool;
-import com.l2jmobius.commons.util.IGameXmlReader;
+import com.l2jmobius.commons.util.IXmlReader;
 import com.l2jmobius.commons.util.Rnd;
 import com.l2jmobius.gameserver.data.xml.impl.FakePlayerData;
 import com.l2jmobius.gameserver.datatables.SpawnTable;
@@ -41,7 +41,7 @@ import com.l2jmobius.gameserver.network.serverpackets.CreatureSay;
 /**
  * @author Mobius
  */
-public final class FakePlayerChatManager implements IGameXmlReader
+public final class FakePlayerChatManager implements IXmlReader
 {
 	private static Logger LOGGER = Logger.getLogger(FakePlayerChatManager.class.getName());
 	final List<FakePlayerChatHolder> MESSAGES = new ArrayList<>();
diff --git a/L2J_Mobius_6.0_Fafurion/java/com/l2jmobius/gameserver/instancemanager/InstanceManager.java b/L2J_Mobius_6.0_Fafurion/java/com/l2jmobius/gameserver/instancemanager/InstanceManager.java
index f300213c49..5ea229cf1b 100644
--- a/L2J_Mobius_6.0_Fafurion/java/com/l2jmobius/gameserver/instancemanager/InstanceManager.java
+++ b/L2J_Mobius_6.0_Fafurion/java/com/l2jmobius/gameserver/instancemanager/InstanceManager.java
@@ -40,7 +40,6 @@ import org.w3c.dom.Node;
 
 import com.l2jmobius.Config;
 import com.l2jmobius.commons.database.DatabaseFactory;
-import com.l2jmobius.commons.util.IGameXmlReader;
 import com.l2jmobius.commons.util.IXmlReader;
 import com.l2jmobius.gameserver.data.xml.impl.DoorData;
 import com.l2jmobius.gameserver.data.xml.impl.SpawnsData;
@@ -61,7 +60,7 @@ import com.l2jmobius.gameserver.model.spawns.SpawnTemplate;
  * Instance manager.
  * @author evill33t, GodKratos, malyelfik
  */
-public final class InstanceManager implements IGameXmlReader
+public final class InstanceManager implements IXmlReader
 {
 	private static final Logger LOGGER = Logger.getLogger(InstanceManager.class.getName());
 	// Database query
diff --git a/L2J_Mobius_6.0_Fafurion/java/com/l2jmobius/gameserver/instancemanager/ItemAuctionManager.java b/L2J_Mobius_6.0_Fafurion/java/com/l2jmobius/gameserver/instancemanager/ItemAuctionManager.java
index f819adf93b..752bcfdd3f 100644
--- a/L2J_Mobius_6.0_Fafurion/java/com/l2jmobius/gameserver/instancemanager/ItemAuctionManager.java
+++ b/L2J_Mobius_6.0_Fafurion/java/com/l2jmobius/gameserver/instancemanager/ItemAuctionManager.java
@@ -34,13 +34,13 @@ import org.w3c.dom.Node;
 
 import com.l2jmobius.Config;
 import com.l2jmobius.commons.database.DatabaseFactory;
-import com.l2jmobius.commons.util.IGameXmlReader;
+import com.l2jmobius.commons.util.IXmlReader;
 import com.l2jmobius.gameserver.model.itemauction.ItemAuctionInstance;
 
 /**
  * @author Forsaiken
  */
-public final class ItemAuctionManager implements IGameXmlReader
+public final class ItemAuctionManager implements IXmlReader
 {
 	private static final Logger LOGGER = Logger.getLogger(ItemAuctionManager.class.getName());
 	
diff --git a/L2J_Mobius_6.0_Fafurion/java/com/l2jmobius/gameserver/instancemanager/MapRegionManager.java b/L2J_Mobius_6.0_Fafurion/java/com/l2jmobius/gameserver/instancemanager/MapRegionManager.java
index 255d4340ff..8f68a4bdf5 100644
--- a/L2J_Mobius_6.0_Fafurion/java/com/l2jmobius/gameserver/instancemanager/MapRegionManager.java
+++ b/L2J_Mobius_6.0_Fafurion/java/com/l2jmobius/gameserver/instancemanager/MapRegionManager.java
@@ -27,7 +27,7 @@ import org.w3c.dom.NamedNodeMap;
 import org.w3c.dom.Node;
 
 import com.l2jmobius.Config;
-import com.l2jmobius.commons.util.IGameXmlReader;
+import com.l2jmobius.commons.util.IXmlReader;
 import com.l2jmobius.gameserver.data.xml.impl.ClanHallData;
 import com.l2jmobius.gameserver.model.Location;
 import com.l2jmobius.gameserver.model.MapRegion;
@@ -47,7 +47,7 @@ import com.l2jmobius.gameserver.model.zone.type.RespawnZone;
  * Map Region Manager.
  * @author Nyaran
  */
-public final class MapRegionManager implements IGameXmlReader
+public final class MapRegionManager implements IXmlReader
 {
 	private static final Logger LOGGER = Logger.getLogger(MapRegionManager.class.getName());
 	
diff --git a/L2J_Mobius_6.0_Fafurion/java/com/l2jmobius/gameserver/instancemanager/SellBuffsManager.java b/L2J_Mobius_6.0_Fafurion/java/com/l2jmobius/gameserver/instancemanager/SellBuffsManager.java
index dcf1bae346..0c4e94f449 100644
--- a/L2J_Mobius_6.0_Fafurion/java/com/l2jmobius/gameserver/instancemanager/SellBuffsManager.java
+++ b/L2J_Mobius_6.0_Fafurion/java/com/l2jmobius/gameserver/instancemanager/SellBuffsManager.java
@@ -26,7 +26,7 @@ import org.w3c.dom.Element;
 import org.w3c.dom.NodeList;
 
 import com.l2jmobius.Config;
-import com.l2jmobius.commons.util.IGameXmlReader;
+import com.l2jmobius.commons.util.IXmlReader;
 import com.l2jmobius.gameserver.cache.HtmCache;
 import com.l2jmobius.gameserver.data.xml.impl.SkillData;
 import com.l2jmobius.gameserver.datatables.ItemTable;
@@ -46,7 +46,7 @@ import com.l2jmobius.gameserver.util.Util;
  * Sell Buffs Manager
  * @author St3eT
  */
-public final class SellBuffsManager implements IGameXmlReader
+public final class SellBuffsManager implements IXmlReader
 {
 	private static final Logger LOGGER = Logger.getLogger(SellBuffsManager.class.getName());
 	private static final List<Integer> ALLOWED_BUFFS = new ArrayList<>();
diff --git a/L2J_Mobius_6.0_Fafurion/java/com/l2jmobius/gameserver/instancemanager/WalkingManager.java b/L2J_Mobius_6.0_Fafurion/java/com/l2jmobius/gameserver/instancemanager/WalkingManager.java
index 4583519bc4..18c4814040 100644
--- a/L2J_Mobius_6.0_Fafurion/java/com/l2jmobius/gameserver/instancemanager/WalkingManager.java
+++ b/L2J_Mobius_6.0_Fafurion/java/com/l2jmobius/gameserver/instancemanager/WalkingManager.java
@@ -28,7 +28,7 @@ import org.w3c.dom.NamedNodeMap;
 import org.w3c.dom.Node;
 
 import com.l2jmobius.commons.concurrent.ThreadPool;
-import com.l2jmobius.commons.util.IGameXmlReader;
+import com.l2jmobius.commons.util.IXmlReader;
 import com.l2jmobius.gameserver.ai.CtrlIntention;
 import com.l2jmobius.gameserver.data.xml.impl.NpcData;
 import com.l2jmobius.gameserver.enums.ChatType;
@@ -49,7 +49,7 @@ import com.l2jmobius.gameserver.network.NpcStringId;
  * This class manages walking monsters.
  * @author GKR
  */
-public final class WalkingManager implements IGameXmlReader
+public final class WalkingManager implements IXmlReader
 {
 	private static final Logger LOGGER = Logger.getLogger(WalkingManager.class.getName());
 	
diff --git a/L2J_Mobius_6.0_Fafurion/java/com/l2jmobius/gameserver/instancemanager/ZoneManager.java b/L2J_Mobius_6.0_Fafurion/java/com/l2jmobius/gameserver/instancemanager/ZoneManager.java
index b698f51a03..9a0bd870f2 100644
--- a/L2J_Mobius_6.0_Fafurion/java/com/l2jmobius/gameserver/instancemanager/ZoneManager.java
+++ b/L2J_Mobius_6.0_Fafurion/java/com/l2jmobius/gameserver/instancemanager/ZoneManager.java
@@ -26,6 +26,7 @@ import java.util.List;
 import java.util.Map;
 import java.util.Optional;
 import java.util.OptionalInt;
+import java.util.concurrent.ConcurrentHashMap;
 import java.util.logging.Level;
 import java.util.logging.Logger;
 
@@ -33,7 +34,7 @@ import org.w3c.dom.Document;
 import org.w3c.dom.NamedNodeMap;
 import org.w3c.dom.Node;
 
-import com.l2jmobius.commons.util.IGameXmlReader;
+import com.l2jmobius.commons.util.IXmlReader;
 import com.l2jmobius.gameserver.model.World;
 import com.l2jmobius.gameserver.model.WorldObject;
 import com.l2jmobius.gameserver.model.actor.Creature;
@@ -55,7 +56,7 @@ import com.l2jmobius.gameserver.model.zone.type.SpawnTerritory;
  * This class manages the zones
  * @author durgus
  */
-public final class ZoneManager implements IGameXmlReader
+public final class ZoneManager implements IXmlReader
 {
 	private static final Logger LOGGER = Logger.getLogger(ZoneManager.class.getName());
 	
@@ -65,9 +66,9 @@ public final class ZoneManager implements IGameXmlReader
 	private static final int OFFSET_X = Math.abs(World.MAP_MIN_X >> SHIFT_BY);
 	private static final int OFFSET_Y = Math.abs(World.MAP_MIN_Y >> SHIFT_BY);
 	
-	private final Map<Class<? extends ZoneType>, Map<Integer, ? extends ZoneType>> _classZones = new HashMap<>();
-	private final Map<String, SpawnTerritory> _spawnTerritories = new HashMap<>();
-	private int _lastDynamicId = 300000;
+	private final Map<Class<? extends ZoneType>, ConcurrentHashMap<Integer, ? extends ZoneType>> _classZones = new ConcurrentHashMap<>();
+	private final Map<String, SpawnTerritory> _spawnTerritories = new ConcurrentHashMap<>();
+	private volatile int _lastDynamicId = 300000;
 	private List<ItemInstance> _debugItems;
 	
 	private final ZoneRegion[][] _zoneRegions = new ZoneRegion[(World.MAP_MAX_X >> SHIFT_BY) + OFFSET_X + 1][(World.MAP_MAX_Y >> SHIFT_BY) + OFFSET_Y + 1];
@@ -365,7 +366,7 @@ public final class ZoneManager implements IGameXmlReader
 						}
 						if (checkId(zoneId))
 						{
-							LOGGER.config(getClass().getSimpleName() + ": Caution: Zone (" + zoneId + ") from file: " + f.getName() + " overrides previos definition.");
+							LOGGER.config(getClass().getSimpleName() + ": Caution: Zone (" + zoneId + ") from file: " + f.getName() + " overrides previuos definition.");
 						}
 						
 						if ((zoneName != null) && !zoneName.isEmpty())
@@ -453,10 +454,10 @@ public final class ZoneManager implements IGameXmlReader
 	@SuppressWarnings("unchecked")
 	private <T extends ZoneType> void addZone(Integer id, T zone)
 	{
-		Map<Integer, T> map = (Map<Integer, T>) _classZones.get(zone.getClass());
+		ConcurrentHashMap<Integer, T> map = (ConcurrentHashMap<Integer, T>) _classZones.get(zone.getClass());
 		if (map == null)
 		{
-			map = new HashMap<>();
+			map = new ConcurrentHashMap<>();
 			map.put(id, zone);
 			_classZones.put(zone.getClass(), map);
 		}
diff --git a/L2J_Mobius_6.0_Fafurion/java/com/l2jmobius/gameserver/model/quest/LongTimeEvent.java b/L2J_Mobius_6.0_Fafurion/java/com/l2jmobius/gameserver/model/quest/LongTimeEvent.java
index cc71991407..0fa020eb5d 100644
--- a/L2J_Mobius_6.0_Fafurion/java/com/l2jmobius/gameserver/model/quest/LongTimeEvent.java
+++ b/L2J_Mobius_6.0_Fafurion/java/com/l2jmobius/gameserver/model/quest/LongTimeEvent.java
@@ -32,7 +32,7 @@ import org.w3c.dom.Node;
 
 import com.l2jmobius.commons.concurrent.ThreadPool;
 import com.l2jmobius.commons.database.DatabaseFactory;
-import com.l2jmobius.commons.util.IGameXmlReader;
+import com.l2jmobius.commons.util.IXmlReader;
 import com.l2jmobius.gameserver.data.sql.impl.AnnouncementsTable;
 import com.l2jmobius.gameserver.data.xml.impl.NpcData;
 import com.l2jmobius.gameserver.datatables.EventDroplist;
@@ -117,7 +117,7 @@ public class LongTimeEvent extends Quest
 	 */
 	private void loadConfig()
 	{
-		new IGameXmlReader()
+		new IXmlReader()
 		{
 			@Override
 			public void load()
diff --git a/L2J_Mobius_6.0_Fafurion/java/com/l2jmobius/gameserver/model/stats/BaseStats.java b/L2J_Mobius_6.0_Fafurion/java/com/l2jmobius/gameserver/model/stats/BaseStats.java
index daba0d3071..64af7961e9 100644
--- a/L2J_Mobius_6.0_Fafurion/java/com/l2jmobius/gameserver/model/stats/BaseStats.java
+++ b/L2J_Mobius_6.0_Fafurion/java/com/l2jmobius/gameserver/model/stats/BaseStats.java
@@ -23,7 +23,6 @@ import java.util.logging.Logger;
 import org.w3c.dom.Document;
 import org.w3c.dom.NamedNodeMap;
 
-import com.l2jmobius.commons.util.IGameXmlReader;
 import com.l2jmobius.commons.util.IXmlReader;
 import com.l2jmobius.gameserver.model.actor.Creature;
 
@@ -105,7 +104,7 @@ public enum BaseStats
 	
 	static
 	{
-		new IGameXmlReader()
+		new IXmlReader()
 		{
 			final Logger LOGGER = Logger.getLogger(BaseStats.class.getName());
 			
diff --git a/L2J_Mobius_6.0_Fafurion/java/com/l2jmobius/gameserver/scripting/ScriptEngineManager.java b/L2J_Mobius_6.0_Fafurion/java/com/l2jmobius/gameserver/scripting/ScriptEngineManager.java
index 9eb6d85b69..95409c567a 100644
--- a/L2J_Mobius_6.0_Fafurion/java/com/l2jmobius/gameserver/scripting/ScriptEngineManager.java
+++ b/L2J_Mobius_6.0_Fafurion/java/com/l2jmobius/gameserver/scripting/ScriptEngineManager.java
@@ -28,8 +28,6 @@ import java.nio.file.attribute.BasicFileAttributes;
 import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.Iterator;
-import java.util.LinkedHashMap;
-import java.util.LinkedList;
 import java.util.List;
 import java.util.Map;
 import java.util.Map.Entry;
@@ -42,14 +40,14 @@ import java.util.logging.Logger;
 import org.w3c.dom.Document;
 
 import com.l2jmobius.Config;
-import com.l2jmobius.commons.util.IGameXmlReader;
+import com.l2jmobius.commons.util.IXmlReader;
 import com.l2jmobius.gameserver.scripting.java.JavaScriptingEngine;
 
 /**
  * Caches script engines and provides functionality for executing and managing scripts.
  * @author KenM, HorridoJoho
  */
-public final class ScriptEngineManager implements IGameXmlReader
+public final class ScriptEngineManager implements IXmlReader
 {
 	private static final Logger LOGGER = Logger.getLogger(ScriptEngineManager.class.getName());
 	public static final Path SCRIPT_FOLDER = Paths.get(Config.DATAPACK_ROOT.getAbsolutePath(), "data", "scripts");
@@ -59,8 +57,7 @@ public final class ScriptEngineManager implements IGameXmlReader
 	public static final Path CONDITION_HANDLER_FILE = Paths.get(SCRIPT_FOLDER.toString(), "handlers", "ConditionMasterHandler.java");
 	public static final Path ONE_DAY_REWARD_MASTER_HANDLER = Paths.get(SCRIPT_FOLDER.toString(), "handlers", "DailyMissionMasterHandler.java");
 	
-	private final Map<String, IExecutionContext> _extEngines = new HashMap<>();
-	private IExecutionContext _currentExecutionContext = null;
+	private IExecutionContext _javaExecutionContext = null;
 	static final List<String> _exclusions = new ArrayList<>();
 	
 	protected ScriptEngineManager()
@@ -166,12 +163,7 @@ public final class ScriptEngineManager implements IGameXmlReader
 	private void registerEngine(IScriptingEngine engine, Properties props)
 	{
 		maybeSetProperties("language." + engine.getLanguageName() + ".", props, engine);
-		final IExecutionContext context = engine.createExecutionContext();
-		for (String commonExtension : engine.getCommonFileExtensions())
-		{
-			_extEngines.put(commonExtension, context);
-		}
-		
+		_javaExecutionContext = engine.createExecutionContext();
 		LOGGER.info("ScriptEngine: " + engine.getEngineName() + " " + engine.getEngineVersion() + " (" + engine.getLanguageName() + " " + engine.getLanguageVersion() + ")");
 	}
 	
@@ -200,66 +192,6 @@ public final class ScriptEngineManager implements IGameXmlReader
 		}
 	}
 	
-	private IExecutionContext getEngineByExtension(String ext)
-	{
-		return _extEngines.get(ext);
-	}
-	
-	private String getFileExtension(Path p)
-	{
-		final String name = p.getFileName().toString();
-		final int lastDotIdx = name.lastIndexOf('.');
-		if (lastDotIdx == -1)
-		{
-			return null;
-		}
-		
-		final String extension = name.substring(lastDotIdx + 1);
-		if (extension.isEmpty())
-		{
-			return null;
-		}
-		
-		return extension;
-	}
-	
-	private void checkExistingFile(String messagePre, Path filePath) throws Exception
-	{
-		if (!Files.exists(filePath))
-		{
-			throw new Exception(messagePre + ": " + filePath + " does not exists!");
-		}
-		else if (!Files.isRegularFile(filePath))
-		{
-			throw new Exception(messagePre + ": " + filePath + " is not a file!");
-		}
-	}
-	
-	public void executeMasterHandler() throws Exception
-	{
-		executeScript(MASTER_HANDLER_FILE);
-	}
-	
-	public void executeEffectMasterHandler() throws Exception
-	{
-		executeScript(EFFECT_MASTER_HANDLER_FILE);
-	}
-	
-	public void executeSkillConditionMasterHandler() throws Exception
-	{
-		executeScript(SKILL_CONDITION_HANDLER_FILE);
-	}
-	
-	public void executeConditionMasterHandler() throws Exception
-	{
-		executeScript(CONDITION_HANDLER_FILE);
-	}
-	
-	public void executeDailyMissionMasterHandler() throws Exception
-	{
-		executeScript(ONE_DAY_REWARD_MASTER_HANDLER);
-	}
-	
 	public void executeScriptList() throws Exception
 	{
 		if (Config.ALT_DEV_NO_QUESTS)
@@ -267,77 +199,35 @@ public final class ScriptEngineManager implements IGameXmlReader
 			return;
 		}
 		
-		final Map<IExecutionContext, List<Path>> files = new LinkedHashMap<>();
+		final List<Path> files = new ArrayList<>();
 		processDirectory(SCRIPT_FOLDER.toFile(), files);
 		
-		for (Entry<IExecutionContext, List<Path>> entry : files.entrySet())
+		final Map<Path, Throwable> invokationErrors = _javaExecutionContext.executeScripts(files);
+		for (Entry<Path, Throwable> entry : invokationErrors.entrySet())
 		{
-			_currentExecutionContext = entry.getKey();
-			try
-			{
-				final Map<Path, Throwable> invokationErrors = entry.getKey().executeScripts(entry.getValue());
-				for (Entry<Path, Throwable> entry2 : invokationErrors.entrySet())
-				{
-					LOGGER.log(Level.WARNING, "ScriptEngine: " + entry2.getKey() + " failed execution!", entry2.getValue());
-				}
-			}
-			finally
-			{
-				_currentExecutionContext = null;
-			}
+			LOGGER.log(Level.WARNING, "ScriptEngine: " + entry.getKey() + " failed execution!", entry.getValue());
 		}
 	}
 	
-	private void processDirectory(File dir, Map<IExecutionContext, List<Path>> files)
+	private void processDirectory(File dir, List<Path> files)
 	{
 		for (File file : dir.listFiles())
 		{
-			if (file.isDirectory())
+			if (file.isFile())
+			{
+				final String fileName = file.getName();
+				if (fileName.endsWith(".java") && !_exclusions.contains(fileName))
+				{
+					files.add(file.toPath().toAbsolutePath());
+				}
+			}
+			else if (file.isDirectory())
 			{
 				processDirectory(file, files);
 			}
-			else
-			{
-				processFile(file, files);
-			}
 		}
 	}
 	
-	private void processFile(File file, Map<IExecutionContext, List<Path>> files)
-	{
-		if (_exclusions.contains(file.getName()))
-		{
-			return;
-		}
-		
-		Path sourceFile = file.toPath();
-		try
-		{
-			checkExistingFile("ScriptFile", sourceFile);
-		}
-		catch (Exception e)
-		{
-			LOGGER.warning(e.getMessage());
-			return;
-		}
-		
-		sourceFile = sourceFile.toAbsolutePath();
-		final String ext = getFileExtension(sourceFile);
-		if (ext == null)
-		{
-			LOGGER.warning("ScriptFile: " + sourceFile + " does not have an extension to determine the script engine!");
-			return;
-		}
-		
-		final IExecutionContext engine = getEngineByExtension(ext);
-		if (engine == null)
-		{
-			return;
-		}
-		
-		files.computeIfAbsent(engine, k -> new LinkedList<>()).add(sourceFile);
-	}
-	
 	public void executeScript(Path sourceFile) throws Exception
 	{
 		Objects.requireNonNull(sourceFile);
@@ -347,34 +237,19 @@ public final class ScriptEngineManager implements IGameXmlReader
 			sourceFile = SCRIPT_FOLDER.resolve(sourceFile);
 		}
 		
-		// throws exception if not exists or not file
-		checkExistingFile("ScriptFile", sourceFile);
-		
 		sourceFile = sourceFile.toAbsolutePath();
-		final String ext = getFileExtension(sourceFile);
 		Objects.requireNonNull(sourceFile, "ScriptFile: " + sourceFile + " does not have an extension to determine the script engine!");
 		
-		final IExecutionContext engine = getEngineByExtension(ext);
-		Objects.requireNonNull(engine, "ScriptEngine: No engine registered for extension " + ext + "!");
-		
-		_currentExecutionContext = engine;
-		try
+		final Entry<Path, Throwable> error = _javaExecutionContext.executeScript(sourceFile);
+		if (error != null)
 		{
-			final Entry<Path, Throwable> error = engine.executeScript(sourceFile);
-			if (error != null)
-			{
-				throw new Exception("ScriptEngine: " + error.getKey() + " failed execution!", error.getValue());
-			}
-		}
-		finally
-		{
-			_currentExecutionContext = null;
+			throw new Exception("ScriptEngine: " + error.getKey() + " failed execution!", error.getValue());
 		}
 	}
 	
 	public Path getCurrentLoadingScript()
 	{
-		return _currentExecutionContext != null ? _currentExecutionContext.getCurrentExecutingScript() : null;
+		return _javaExecutionContext.getCurrentExecutingScript();
 	}
 	
 	public static ScriptEngineManager getInstance()
diff --git a/L2J_Mobius_6.0_Fafurion/java/com/l2jmobius/loginserver/GameServerTable.java b/L2J_Mobius_6.0_Fafurion/java/com/l2jmobius/loginserver/GameServerTable.java
index 456224d78c..4269e47969 100644
--- a/L2J_Mobius_6.0_Fafurion/java/com/l2jmobius/loginserver/GameServerTable.java
+++ b/L2J_Mobius_6.0_Fafurion/java/com/l2jmobius/loginserver/GameServerTable.java
@@ -36,8 +36,8 @@ import org.w3c.dom.Document;
 import org.w3c.dom.NodeList;
 
 import com.l2jmobius.commons.database.DatabaseFactory;
-import com.l2jmobius.commons.util.IGameXmlReader;
 import com.l2jmobius.commons.util.IPSubnet;
+import com.l2jmobius.commons.util.IXmlReader;
 import com.l2jmobius.commons.util.Rnd;
 import com.l2jmobius.loginserver.network.gameserverpackets.ServerStatus;
 
@@ -45,7 +45,7 @@ import com.l2jmobius.loginserver.network.gameserverpackets.ServerStatus;
  * The Class GameServerTable loads the game server names and initialize the game server tables.
  * @author KenM, Zoey76
  */
-public final class GameServerTable implements IGameXmlReader
+public final class GameServerTable implements IXmlReader
 {
 	private static final Logger LOGGER = Logger.getLogger(GameServerTable.class.getName());
 	
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/config/Scripts.xml b/L2J_Mobius_CT_2.6_HighFive/dist/game/config/Scripts.xml
index 0b06b04579..54d05b241f 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/game/config/Scripts.xml
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/config/Scripts.xml
@@ -2,8 +2,7 @@
 <list xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../data/xsd/Scripts.xsd">
 	<!-- Skip these filenames from script loading, because they are already loaded using a different way. -->
 	<exclude file="package-info.java" />
-	<exclude file="MasterHandler.java" />
-	<exclude file="EffectMasterHandler.java" />
+	<exclude file="handlers" />
 	
 	<!--
 	With this file you can exclude/include specific folders/files from within the scripts directory.
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/areas/ForgeOfTheGods/TarBeetleSpawn.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/areas/ForgeOfTheGods/TarBeetleSpawn.java
index 07bdc08dbc..1a372e194e 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/areas/ForgeOfTheGods/TarBeetleSpawn.java
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/areas/ForgeOfTheGods/TarBeetleSpawn.java
@@ -27,7 +27,7 @@ import org.w3c.dom.NamedNodeMap;
 import org.w3c.dom.Node;
 
 import com.l2jmobius.commons.concurrent.ThreadPool;
-import com.l2jmobius.commons.util.IGameXmlReader;
+import com.l2jmobius.commons.util.IXmlReader;
 import com.l2jmobius.commons.util.Rnd;
 import com.l2jmobius.gameserver.geoengine.GeoEngine;
 import com.l2jmobius.gameserver.model.Location;
@@ -39,7 +39,7 @@ import com.l2jmobius.gameserver.model.actor.Npc;
  * Tar Beetle zone spawn
  * @author malyelfik
  */
-public class TarBeetleSpawn implements IGameXmlReader
+public class TarBeetleSpawn implements IXmlReader
 {
 	private final List<SpawnZone> zones = new ArrayList<>();
 	private ScheduledFuture<?> spawnTask;
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/areas/Hellbound/HellboundPointData.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/areas/Hellbound/HellboundPointData.java
index e31b21f6a9..b7d0d16d08 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/areas/Hellbound/HellboundPointData.java
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/areas/Hellbound/HellboundPointData.java
@@ -24,13 +24,13 @@ import org.w3c.dom.Document;
 import org.w3c.dom.NamedNodeMap;
 import org.w3c.dom.Node;
 
-import com.l2jmobius.commons.util.IGameXmlReader;
+import com.l2jmobius.commons.util.IXmlReader;
 
 /**
  * Point data parser.
  * @author Zoey76
  */
-public final class HellboundPointData implements IGameXmlReader
+public final class HellboundPointData implements IXmlReader
 {
 	private final Map<Integer, int[]> _pointsInfo = new HashMap<>();
 	
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/areas/Hellbound/HellboundSpawns.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/areas/Hellbound/HellboundSpawns.java
index 434e8eb734..7d4c86fd8a 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/areas/Hellbound/HellboundSpawns.java
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/areas/Hellbound/HellboundSpawns.java
@@ -26,7 +26,7 @@ import org.w3c.dom.Document;
 import org.w3c.dom.NamedNodeMap;
 import org.w3c.dom.Node;
 
-import com.l2jmobius.commons.util.IGameXmlReader;
+import com.l2jmobius.commons.util.IXmlReader;
 import com.l2jmobius.gameserver.datatables.SpawnTable;
 import com.l2jmobius.gameserver.model.Location;
 import com.l2jmobius.gameserver.model.Spawn;
@@ -35,7 +35,7 @@ import com.l2jmobius.gameserver.model.Spawn;
  * Hellbound Spawns parser.
  * @author Zoey76
  */
-public final class HellboundSpawns implements IGameXmlReader
+public final class HellboundSpawns implements IXmlReader
 {
 	private final List<Spawn> _spawns = new ArrayList<>();
 	private final Map<Integer, int[]> _spawnLevels = new HashMap<>();
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/NpcBuffers/NpcBuffersData.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/NpcBuffers/NpcBuffersData.java
index f94776c505..6db996d11d 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/NpcBuffers/NpcBuffersData.java
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/NpcBuffers/NpcBuffersData.java
@@ -27,13 +27,13 @@ import org.w3c.dom.Document;
 import org.w3c.dom.NamedNodeMap;
 import org.w3c.dom.Node;
 
-import com.l2jmobius.commons.util.IGameXmlReader;
+import com.l2jmobius.commons.util.IXmlReader;
 import com.l2jmobius.gameserver.model.StatsSet;
 
 /**
  * @author UnAfraid
  */
-public class NpcBuffersData implements IGameXmlReader
+public class NpcBuffersData implements IXmlReader
 {
 	private final Map<Integer, NpcBufferData> _npcBuffers = new HashMap<>();
 	
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/admincommandhandlers/AdminReload.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/admincommandhandlers/AdminReload.java
index d883628c22..15c77a5ad6 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/admincommandhandlers/AdminReload.java
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/admincommandhandlers/AdminReload.java
@@ -214,7 +214,7 @@ public class AdminReload implements IAdminCommandHandler
 				{
 					try
 					{
-						ScriptEngineManager.getInstance().executeEffectMasterHandler();
+						ScriptEngineManager.getInstance().executeScript(ScriptEngineManager.EFFECT_MASTER_HANDLER_FILE);
 						AdminData.getInstance().broadcastMessageToGMs(activeChar.getName() + ": Reloaded effect master handler.");
 					}
 					catch (Exception e)
@@ -228,7 +228,7 @@ public class AdminReload implements IAdminCommandHandler
 				{
 					try
 					{
-						ScriptEngineManager.getInstance().executeMasterHandler();
+						ScriptEngineManager.getInstance().executeScript(ScriptEngineManager.MASTER_HANDLER_FILE);
 						AdminData.getInstance().broadcastMessageToGMs(activeChar.getName() + ": Reloaded master handler.");
 					}
 					catch (Exception e)
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/telnethandlers/server/Reload.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/telnethandlers/server/Reload.java
index 2fa6db5bf8..0246d7bd64 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/telnethandlers/server/Reload.java
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/telnethandlers/server/Reload.java
@@ -165,7 +165,7 @@ public class Reload implements ITelnetCommand
 			{
 				try
 				{
-					ScriptEngineManager.getInstance().executeEffectMasterHandler();
+					ScriptEngineManager.getInstance().executeScript(ScriptEngineManager.EFFECT_MASTER_HANDLER_FILE);
 					return "Telnet Admin: Reloaded effect master handler.";
 				}
 				catch (Exception e)
@@ -178,7 +178,7 @@ public class Reload implements ITelnetCommand
 			{
 				try
 				{
-					ScriptEngineManager.getInstance().executeMasterHandler();
+					ScriptEngineManager.getInstance().executeScript(ScriptEngineManager.MASTER_HANDLER_FILE);
 					return "Telnet Admin: Reloaded master handler.";
 				}
 				catch (Exception e)
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/instances/FinalEmperialTomb/FinalEmperialTomb.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/instances/FinalEmperialTomb/FinalEmperialTomb.java
index b2f99049c2..2fd7930824 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/instances/FinalEmperialTomb/FinalEmperialTomb.java
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/instances/FinalEmperialTomb/FinalEmperialTomb.java
@@ -31,7 +31,7 @@ import org.w3c.dom.Node;
 
 import com.l2jmobius.commons.concurrent.ThreadPool;
 import com.l2jmobius.commons.util.CommonUtil;
-import com.l2jmobius.commons.util.IGameXmlReader;
+import com.l2jmobius.commons.util.IXmlReader;
 import com.l2jmobius.gameserver.ai.CtrlIntention;
 import com.l2jmobius.gameserver.enums.InstanceType;
 import com.l2jmobius.gameserver.geoengine.GeoEngine;
@@ -72,7 +72,7 @@ import instances.AbstractInstance;
  * Use proper zone spawn system.
  * @author Gigiikun
  */
-public final class FinalEmperialTomb extends AbstractInstance implements IGameXmlReader
+public final class FinalEmperialTomb extends AbstractInstance implements IXmlReader
 {
 	Logger LOGGER = Logger.getLogger(FinalEmperialTomb.class.getName());
 	
diff --git a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/Config.java b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/Config.java
index d1aa564081..0b6cecef18 100644
--- a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/Config.java
+++ b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/Config.java
@@ -54,7 +54,7 @@ import org.w3c.dom.Document;
 import org.w3c.dom.NamedNodeMap;
 import org.w3c.dom.Node;
 
-import com.l2jmobius.commons.util.IGameXmlReader;
+import com.l2jmobius.commons.util.IXmlReader;
 import com.l2jmobius.commons.util.PropertiesParser;
 import com.l2jmobius.gameserver.enums.ChatType;
 import com.l2jmobius.gameserver.enums.IllegalActionPunishmentType;
@@ -3691,7 +3691,7 @@ public final class Config
 		return result;
 	}
 	
-	private static class IPConfigData implements IGameXmlReader
+	private static class IPConfigData implements IXmlReader
 	{
 		private static final List<String> _subnets = new ArrayList<>(5);
 		private static final List<String> _hosts = new ArrayList<>(5);
diff --git a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/commons/util/IGameXmlReader.java b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/commons/util/IGameXmlReader.java
deleted file mode 100644
index b29089db77..0000000000
--- a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/commons/util/IGameXmlReader.java
+++ /dev/null
@@ -1,118 +0,0 @@
-/*
- * This file is part of the L2J Mobius project.
- * 
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- * 
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * General Public License for more details.
- * 
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- */
-package com.l2jmobius.commons.util;
-
-import java.io.File;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
-import org.w3c.dom.NamedNodeMap;
-import org.w3c.dom.Node;
-
-import com.l2jmobius.Config;
-import com.l2jmobius.gameserver.model.Location;
-import com.l2jmobius.gameserver.model.holders.MinionHolder;
-import com.l2jmobius.gameserver.model.holders.SkillHolder;
-
-/**
- * Interface for XML parsers.
- * @author Zoey76
- */
-public interface IGameXmlReader extends IXmlReader
-{
-	/**
-	 * Wrapper for {@link #parseFile(File)} method.
-	 * @param path the relative path to the datapack root of the XML file to parse.
-	 */
-	default void parseDatapackFile(String path)
-	{
-		parseFile(new File(Config.DATAPACK_ROOT, path));
-	}
-	
-	/**
-	 * Wrapper for {@link #parseDirectory(File, boolean)}.
-	 * @param path the path to the directory where the XML files are
-	 * @param recursive parses all sub folders if there is
-	 * @return {@code false} if it fails to find the directory, {@code true} otherwise
-	 */
-	default boolean parseDatapackDirectory(String path, boolean recursive)
-	{
-		return parseDirectory(new File(Config.DATAPACK_ROOT, path), recursive);
-	}
-	
-	/**
-	 * @param n
-	 * @return a map of parameters
-	 */
-	default Map<String, Object> parseParameters(Node n)
-	{
-		final Map<String, Object> parameters = new HashMap<>();
-		for (Node parameters_node = n.getFirstChild(); parameters_node != null; parameters_node = parameters_node.getNextSibling())
-		{
-			NamedNodeMap attrs = parameters_node.getAttributes();
-			switch (parameters_node.getNodeName().toLowerCase())
-			{
-				case "param":
-				{
-					parameters.put(parseString(attrs, "name"), parseString(attrs, "value"));
-					break;
-				}
-				case "skill":
-				{
-					parameters.put(parseString(attrs, "name"), new SkillHolder(parseInteger(attrs, "id"), parseInteger(attrs, "level")));
-					break;
-				}
-				case "location":
-				{
-					parameters.put(parseString(attrs, "name"), new Location(parseInteger(attrs, "x"), parseInteger(attrs, "y"), parseInteger(attrs, "z"), parseInteger(attrs, "heading", 0)));
-					break;
-				}
-				case "minions":
-				{
-					final List<MinionHolder> minions = new ArrayList<>(1);
-					for (Node minions_node = parameters_node.getFirstChild(); minions_node != null; minions_node = minions_node.getNextSibling())
-					{
-						if (minions_node.getNodeName().equalsIgnoreCase("npc"))
-						{
-							attrs = minions_node.getAttributes();
-							minions.add(new MinionHolder(parseInteger(attrs, "id"), parseInteger(attrs, "count"), parseInteger(attrs, "respawnTime"), parseInteger(attrs, "weightPoint")));
-						}
-					}
-					
-					if (!minions.isEmpty())
-					{
-						parameters.put(parseString(parameters_node.getAttributes(), "name"), minions);
-					}
-					break;
-				}
-			}
-		}
-		return parameters;
-	}
-	
-	default Location parseLocation(Node n)
-	{
-		final NamedNodeMap attrs = n.getAttributes();
-		final int x = parseInteger(attrs, "x");
-		final int y = parseInteger(attrs, "y");
-		final int z = parseInteger(attrs, "z");
-		final int heading = parseInteger(attrs, "heading", 0);
-		return new Location(x, y, z, heading);
-	}
-}
diff --git a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/commons/util/IXmlReader.java b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/commons/util/IXmlReader.java
index 0317816fd8..4bfed2396e 100644
--- a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/commons/util/IXmlReader.java
+++ b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/commons/util/IXmlReader.java
@@ -18,8 +18,13 @@ package com.l2jmobius.commons.util;
 
 import java.io.File;
 import java.io.FileFilter;
+import java.util.ArrayList;
+import java.util.HashMap;
 import java.util.LinkedHashMap;
+import java.util.List;
 import java.util.Map;
+import java.util.concurrent.CopyOnWriteArrayList;
+import java.util.concurrent.ScheduledFuture;
 import java.util.function.Consumer;
 import java.util.function.Predicate;
 import java.util.logging.Level;
@@ -35,7 +40,12 @@ import org.w3c.dom.NodeList;
 import org.xml.sax.ErrorHandler;
 import org.xml.sax.SAXParseException;
 
+import com.l2jmobius.Config;
+import com.l2jmobius.commons.concurrent.ThreadPool;
 import com.l2jmobius.commons.util.file.filter.XMLFilter;
+import com.l2jmobius.gameserver.model.Location;
+import com.l2jmobius.gameserver.model.holders.MinionHolder;
+import com.l2jmobius.gameserver.model.holders.SkillHolder;
 
 /**
  * Interface for XML parsers.
@@ -56,6 +66,15 @@ public interface IXmlReader
 	 */
 	void load();
 	
+	/**
+	 * Wrapper for {@link #parseFile(File)} method.
+	 * @param path the relative path to the datapack root of the XML file to parse.
+	 */
+	default void parseDatapackFile(String path)
+	{
+		parseFile(new File(Config.DATAPACK_ROOT, path));
+	}
+	
 	/**
 	 * Parses a single XML file.<br>
 	 * If the file was successfully parsed, call {@link #parseDocument(Document, File)} for the parsed document.<br>
@@ -121,6 +140,17 @@ public interface IXmlReader
 		return parseDirectory(file, false);
 	}
 	
+	/**
+	 * Wrapper for {@link #parseDirectory(File, boolean)}.
+	 * @param path the path to the directory where the XML files are
+	 * @param recursive parses all sub folders if there is
+	 * @return {@code false} if it fails to find the directory, {@code true} otherwise
+	 */
+	default boolean parseDatapackDirectory(String path, boolean recursive)
+	{
+		return parseDirectory(new File(Config.DATAPACK_ROOT, path), recursive);
+	}
+	
 	/**
 	 * Loads all XML files from {@code path} and calls {@link #parseFile(File)} for each one of them.
 	 * @param dir the directory object to scan.
@@ -135,6 +165,7 @@ public interface IXmlReader
 			return false;
 		}
 		
+		final List<ScheduledFuture<?>> jobs = new CopyOnWriteArrayList<>();
 		final File[] listOfFiles = dir.listFiles();
 		for (File f : listOfFiles)
 		{
@@ -144,9 +175,23 @@ public interface IXmlReader
 			}
 			else if (getCurrentFileFilter().accept(f))
 			{
-				parseFile(f);
+				jobs.add(ThreadPool.schedule(() ->
+				{
+					parseFile(f);
+				}, 0));
 			}
 		}
+		while (!jobs.isEmpty())
+		{
+			for (ScheduledFuture<?> job : jobs)
+			{
+				if ((job == null) || job.isDone() || job.isCancelled())
+				{
+					jobs.remove(job);
+				}
+			}
+		}
+		
 		return true;
 	}
 	
@@ -531,6 +576,16 @@ public interface IXmlReader
 		return parseString(attrs.getNamedItem(name), defaultValue);
 	}
 	
+	default Location parseLocation(Node n)
+	{
+		final NamedNodeMap attrs = n.getAttributes();
+		final int x = parseInteger(attrs, "x");
+		final int y = parseInteger(attrs, "y");
+		final int z = parseInteger(attrs, "z");
+		final int heading = parseInteger(attrs, "heading", 0);
+		return new Location(x, y, z, heading);
+	}
+	
 	/**
 	 * Parses an enumerated value.
 	 * @param <T> the enumerated type
@@ -612,6 +667,56 @@ public interface IXmlReader
 		return map;
 	}
 	
+	/**
+	 * @param n
+	 * @return a map of parameters
+	 */
+	default Map<String, Object> parseParameters(Node n)
+	{
+		final Map<String, Object> parameters = new HashMap<>();
+		for (Node parameters_node = n.getFirstChild(); parameters_node != null; parameters_node = parameters_node.getNextSibling())
+		{
+			NamedNodeMap attrs = parameters_node.getAttributes();
+			switch (parameters_node.getNodeName().toLowerCase())
+			{
+				case "param":
+				{
+					parameters.put(parseString(attrs, "name"), parseString(attrs, "value"));
+					break;
+				}
+				case "skill":
+				{
+					parameters.put(parseString(attrs, "name"), new SkillHolder(parseInteger(attrs, "id"), parseInteger(attrs, "level")));
+					break;
+				}
+				case "location":
+				{
+					parameters.put(parseString(attrs, "name"), new Location(parseInteger(attrs, "x"), parseInteger(attrs, "y"), parseInteger(attrs, "z"), parseInteger(attrs, "heading", 0)));
+					break;
+				}
+				case "minions":
+				{
+					final List<MinionHolder> minions = new ArrayList<>(1);
+					for (Node minions_node = parameters_node.getFirstChild(); minions_node != null; minions_node = minions_node.getNextSibling())
+					{
+						if (minions_node.getNodeName().equalsIgnoreCase("npc"))
+						{
+							attrs = minions_node.getAttributes();
+							minions.add(new MinionHolder(parseInteger(attrs, "id"), parseInteger(attrs, "count"), parseInteger(attrs, "respawnTime"), parseInteger(attrs, "weightPoint")));
+						}
+					}
+					
+					if (!minions.isEmpty())
+					{
+						parameters.put(parseString(parameters_node.getAttributes(), "name"), minions);
+					}
+					break;
+				}
+			}
+		}
+		return parameters;
+	}
+	
 	/**
 	 * Executes action for each child of node
 	 * @param node
diff --git a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/GameServer.java b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/GameServer.java
index d1e5c8e9cf..5b897b2c80 100644
--- a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/GameServer.java
+++ b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/GameServer.java
@@ -344,7 +344,7 @@ public class GameServer
 		try
 		{
 			LOGGER.info("Loading server scripts...");
-			ScriptEngineManager.getInstance().executeMasterHandler();
+			ScriptEngineManager.getInstance().executeScript(ScriptEngineManager.MASTER_HANDLER_FILE);
 			ScriptEngineManager.getInstance().executeScriptList();
 		}
 		catch (Exception e)
diff --git a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/data/xml/impl/AdminData.java b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/data/xml/impl/AdminData.java
index ae57c2c452..78ce2b9b53 100644
--- a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/data/xml/impl/AdminData.java
+++ b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/data/xml/impl/AdminData.java
@@ -29,7 +29,7 @@ import org.w3c.dom.Document;
 import org.w3c.dom.NamedNodeMap;
 import org.w3c.dom.Node;
 
-import com.l2jmobius.commons.util.IGameXmlReader;
+import com.l2jmobius.commons.util.IXmlReader;
 import com.l2jmobius.gameserver.model.AccessLevel;
 import com.l2jmobius.gameserver.model.AdminCommandAccessRight;
 import com.l2jmobius.gameserver.model.StatsSet;
@@ -42,7 +42,7 @@ import com.l2jmobius.gameserver.network.serverpackets.SystemMessage;
  * Loads administrator access levels and commands.
  * @author UnAfraid
  */
-public final class AdminData implements IGameXmlReader
+public final class AdminData implements IXmlReader
 {
 	private final Map<Integer, AccessLevel> _accessLevels = new HashMap<>();
 	private final Map<String, AdminCommandAccessRight> _adminCommandAccessRights = new HashMap<>();
diff --git a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/data/xml/impl/ArmorSetsData.java b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/data/xml/impl/ArmorSetsData.java
index 616cc69430..d31b7b462d 100644
--- a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/data/xml/impl/ArmorSetsData.java
+++ b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/data/xml/impl/ArmorSetsData.java
@@ -17,14 +17,14 @@
 package com.l2jmobius.gameserver.data.xml.impl;
 
 import java.io.File;
-import java.util.HashMap;
 import java.util.Map;
+import java.util.concurrent.ConcurrentHashMap;
 
 import org.w3c.dom.Document;
 import org.w3c.dom.NamedNodeMap;
 import org.w3c.dom.Node;
 
-import com.l2jmobius.commons.util.IGameXmlReader;
+import com.l2jmobius.commons.util.IXmlReader;
 import com.l2jmobius.gameserver.model.ArmorSet;
 import com.l2jmobius.gameserver.model.holders.SkillHolder;
 
@@ -32,9 +32,9 @@ import com.l2jmobius.gameserver.model.holders.SkillHolder;
  * Loads armor set bonuses.
  * @author godson, Luno, UnAfraid
  */
-public final class ArmorSetsData implements IGameXmlReader
+public final class ArmorSetsData implements IXmlReader
 {
-	private final Map<Integer, ArmorSet> _armorSets = new HashMap<>();
+	private final Map<Integer, ArmorSet> _armorSets = new ConcurrentHashMap<>();
 	
 	/**
 	 * Instantiates a new armor sets data.
diff --git a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/data/xml/impl/BuyListData.java b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/data/xml/impl/BuyListData.java
index f3a00086ef..dad8c31a2e 100644
--- a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/data/xml/impl/BuyListData.java
+++ b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/data/xml/impl/BuyListData.java
@@ -21,8 +21,8 @@ import java.io.FileFilter;
 import java.sql.Connection;
 import java.sql.ResultSet;
 import java.sql.Statement;
-import java.util.HashMap;
 import java.util.Map;
+import java.util.concurrent.ConcurrentHashMap;
 import java.util.logging.Level;
 import java.util.logging.Logger;
 
@@ -32,7 +32,7 @@ import org.w3c.dom.Node;
 
 import com.l2jmobius.Config;
 import com.l2jmobius.commons.database.DatabaseFactory;
-import com.l2jmobius.commons.util.IGameXmlReader;
+import com.l2jmobius.commons.util.IXmlReader;
 import com.l2jmobius.commons.util.file.filter.NumericNameFilter;
 import com.l2jmobius.gameserver.datatables.ItemTable;
 import com.l2jmobius.gameserver.model.buylist.BuyListHolder;
@@ -43,11 +43,11 @@ import com.l2jmobius.gameserver.model.items.Item;
  * Loads buy lists for NPCs.
  * @author NosBit
  */
-public final class BuyListData implements IGameXmlReader
+public final class BuyListData implements IXmlReader
 {
 	private static final Logger LOGGER = Logger.getLogger(BuyListData.class.getName());
 	
-	private final Map<Integer, BuyListHolder> _buyLists = new HashMap<>();
+	private final Map<Integer, BuyListHolder> _buyLists = new ConcurrentHashMap<>();
 	private static final FileFilter NUMERIC_FILTER = new NumericNameFilter();
 	
 	protected BuyListData()
diff --git a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/data/xml/impl/CategoryData.java b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/data/xml/impl/CategoryData.java
index d0fd9d4731..6a5a0397cf 100644
--- a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/data/xml/impl/CategoryData.java
+++ b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/data/xml/impl/CategoryData.java
@@ -28,14 +28,14 @@ import org.w3c.dom.Document;
 import org.w3c.dom.NamedNodeMap;
 import org.w3c.dom.Node;
 
-import com.l2jmobius.commons.util.IGameXmlReader;
+import com.l2jmobius.commons.util.IXmlReader;
 import com.l2jmobius.gameserver.enums.CategoryType;
 
 /**
  * Loads the category data with Class or NPC IDs.
  * @author NosBit, xban1x
  */
-public final class CategoryData implements IGameXmlReader
+public final class CategoryData implements IXmlReader
 {
 	private static final Logger LOGGER = Logger.getLogger(CategoryData.class.getName());
 	
diff --git a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/data/xml/impl/ClassListData.java b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/data/xml/impl/ClassListData.java
index 8d3a89606b..77667a1518 100644
--- a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/data/xml/impl/ClassListData.java
+++ b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/data/xml/impl/ClassListData.java
@@ -24,7 +24,7 @@ import org.w3c.dom.Document;
 import org.w3c.dom.NamedNodeMap;
 import org.w3c.dom.Node;
 
-import com.l2jmobius.commons.util.IGameXmlReader;
+import com.l2jmobius.commons.util.IXmlReader;
 import com.l2jmobius.gameserver.model.base.ClassId;
 import com.l2jmobius.gameserver.model.base.ClassInfo;
 
@@ -32,7 +32,7 @@ import com.l2jmobius.gameserver.model.base.ClassInfo;
  * Loads the the list of classes and it's info.
  * @author Zoey76
  */
-public final class ClassListData implements IGameXmlReader
+public final class ClassListData implements IXmlReader
 {
 	private final Map<ClassId, ClassInfo> _classData = new HashMap<>();
 	
diff --git a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/data/xml/impl/DoorData.java b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/data/xml/impl/DoorData.java
index 8ef4ffc833..3835ff16a5 100644
--- a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/data/xml/impl/DoorData.java
+++ b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/data/xml/impl/DoorData.java
@@ -29,7 +29,7 @@ import org.w3c.dom.Document;
 import org.w3c.dom.NamedNodeMap;
 import org.w3c.dom.Node;
 
-import com.l2jmobius.commons.util.IGameXmlReader;
+import com.l2jmobius.commons.util.IXmlReader;
 import com.l2jmobius.gameserver.instancemanager.InstanceManager;
 import com.l2jmobius.gameserver.instancemanager.MapRegionManager;
 import com.l2jmobius.gameserver.model.Location;
@@ -41,7 +41,7 @@ import com.l2jmobius.gameserver.model.actor.templates.DoorTemplate;
  * Loads doors.
  * @author JIV, GodKratos, UnAfraid
  */
-public class DoorData implements IGameXmlReader
+public class DoorData implements IXmlReader
 {
 	private static final Map<String, Set<Integer>> _groups = new HashMap<>();
 	private final Map<Integer, DoorInstance> _doors = new HashMap<>();
diff --git a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/data/xml/impl/EnchantItemData.java b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/data/xml/impl/EnchantItemData.java
index 838b5601f4..765384d758 100644
--- a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/data/xml/impl/EnchantItemData.java
+++ b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/data/xml/impl/EnchantItemData.java
@@ -25,7 +25,7 @@ import org.w3c.dom.Document;
 import org.w3c.dom.NamedNodeMap;
 import org.w3c.dom.Node;
 
-import com.l2jmobius.commons.util.IGameXmlReader;
+import com.l2jmobius.commons.util.IXmlReader;
 import com.l2jmobius.gameserver.model.StatsSet;
 import com.l2jmobius.gameserver.model.items.enchant.EnchantScroll;
 import com.l2jmobius.gameserver.model.items.enchant.EnchantSupportItem;
@@ -35,7 +35,7 @@ import com.l2jmobius.gameserver.model.items.instance.ItemInstance;
  * Loads item enchant data.
  * @author UnAfraid
  */
-public class EnchantItemData implements IGameXmlReader
+public class EnchantItemData implements IXmlReader
 {
 	private final Map<Integer, EnchantScroll> _scrolls = new HashMap<>();
 	private final Map<Integer, EnchantSupportItem> _supports = new HashMap<>();
diff --git a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/data/xml/impl/EnchantItemGroupsData.java b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/data/xml/impl/EnchantItemGroupsData.java
index e534d13ff3..7131b2e3e1 100644
--- a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/data/xml/impl/EnchantItemGroupsData.java
+++ b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/data/xml/impl/EnchantItemGroupsData.java
@@ -25,7 +25,7 @@ import org.w3c.dom.Document;
 import org.w3c.dom.NamedNodeMap;
 import org.w3c.dom.Node;
 
-import com.l2jmobius.commons.util.IGameXmlReader;
+import com.l2jmobius.commons.util.IXmlReader;
 import com.l2jmobius.gameserver.datatables.ItemTable;
 import com.l2jmobius.gameserver.model.holders.RangeChanceHolder;
 import com.l2jmobius.gameserver.model.items.Item;
@@ -37,7 +37,7 @@ import com.l2jmobius.gameserver.util.Util;
 /**
  * @author UnAfraid
  */
-public final class EnchantItemGroupsData implements IGameXmlReader
+public final class EnchantItemGroupsData implements IXmlReader
 {
 	private final Map<String, EnchantItemGroup> _itemGroups = new HashMap<>();
 	private final Map<Integer, EnchantScrollGroup> _scrollGroups = new HashMap<>();
diff --git a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/data/xml/impl/EnchantItemHPBonusData.java b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/data/xml/impl/EnchantItemHPBonusData.java
index 1c2b0871d1..73c69ccfe8 100644
--- a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/data/xml/impl/EnchantItemHPBonusData.java
+++ b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/data/xml/impl/EnchantItemHPBonusData.java
@@ -26,7 +26,7 @@ import java.util.Map;
 import org.w3c.dom.Document;
 import org.w3c.dom.Node;
 
-import com.l2jmobius.commons.util.IGameXmlReader;
+import com.l2jmobius.commons.util.IXmlReader;
 import com.l2jmobius.gameserver.datatables.ItemTable;
 import com.l2jmobius.gameserver.enums.StatFunction;
 import com.l2jmobius.gameserver.model.items.Item;
@@ -39,7 +39,7 @@ import com.l2jmobius.gameserver.model.stats.functions.FuncTemplate;
  * This class holds the Enchant HP Bonus Data.
  * @author MrPoke, Zoey76
  */
-public class EnchantItemHPBonusData implements IGameXmlReader
+public class EnchantItemHPBonusData implements IXmlReader
 {
 	private final Map<CrystalType, List<Integer>> _armorHPBonuses = new EnumMap<>(CrystalType.class);
 	
diff --git a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/data/xml/impl/EnchantItemOptionsData.java b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/data/xml/impl/EnchantItemOptionsData.java
index cbc735c74b..c6115d49be 100644
--- a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/data/xml/impl/EnchantItemOptionsData.java
+++ b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/data/xml/impl/EnchantItemOptionsData.java
@@ -24,7 +24,7 @@ import java.util.logging.Level;
 import org.w3c.dom.Document;
 import org.w3c.dom.Node;
 
-import com.l2jmobius.commons.util.IGameXmlReader;
+import com.l2jmobius.commons.util.IXmlReader;
 import com.l2jmobius.gameserver.model.items.instance.ItemInstance;
 import com.l2jmobius.gameserver.model.options.EnchantOptions;
 import com.l2jmobius.gameserver.util.Util;
@@ -32,7 +32,7 @@ import com.l2jmobius.gameserver.util.Util;
 /**
  * @author UnAfraid
  */
-public class EnchantItemOptionsData implements IGameXmlReader
+public class EnchantItemOptionsData implements IXmlReader
 {
 	private final Map<Integer, Map<Integer, EnchantOptions>> _data = new HashMap<>();
 	
diff --git a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/data/xml/impl/EnchantSkillGroupsData.java b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/data/xml/impl/EnchantSkillGroupsData.java
index 76a87f3bea..3a6bd5a6c5 100644
--- a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/data/xml/impl/EnchantSkillGroupsData.java
+++ b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/data/xml/impl/EnchantSkillGroupsData.java
@@ -26,7 +26,7 @@ import org.w3c.dom.NamedNodeMap;
 import org.w3c.dom.Node;
 
 import com.l2jmobius.Config;
-import com.l2jmobius.commons.util.IGameXmlReader;
+import com.l2jmobius.commons.util.IXmlReader;
 import com.l2jmobius.gameserver.model.EnchantSkillGroup;
 import com.l2jmobius.gameserver.model.EnchantSkillGroup.EnchantSkillHolder;
 import com.l2jmobius.gameserver.model.EnchantSkillLearn;
@@ -38,7 +38,7 @@ import com.l2jmobius.gameserver.model.skills.Skill;
  * This class holds the Enchant Groups information.
  * @author Micr0
  */
-public class EnchantSkillGroupsData implements IGameXmlReader
+public class EnchantSkillGroupsData implements IXmlReader
 {
 	public static final int NORMAL_ENCHANT_COST_MULTIPLIER = Config.NORMAL_ENCHANT_COST_MULTIPLIER;
 	public static final int SAFE_ENCHANT_COST_MULTIPLIER = Config.SAFE_ENCHANT_COST_MULTIPLIER;
diff --git a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/data/xml/impl/ExperienceData.java b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/data/xml/impl/ExperienceData.java
index 07c2327207..7a3f042808 100644
--- a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/data/xml/impl/ExperienceData.java
+++ b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/data/xml/impl/ExperienceData.java
@@ -24,13 +24,13 @@ import org.w3c.dom.Document;
 import org.w3c.dom.NamedNodeMap;
 import org.w3c.dom.Node;
 
-import com.l2jmobius.commons.util.IGameXmlReader;
+import com.l2jmobius.commons.util.IXmlReader;
 
 /**
  * This class holds the Experience points for each level for players and pets.
  * @author mrTJO
  */
-public final class ExperienceData implements IGameXmlReader
+public final class ExperienceData implements IXmlReader
 {
 	private final Map<Integer, Long> _expTable = new HashMap<>();
 	
diff --git a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/data/xml/impl/FakePlayerData.java b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/data/xml/impl/FakePlayerData.java
index afb92c06d5..74b7957fd9 100644
--- a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/data/xml/impl/FakePlayerData.java
+++ b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/data/xml/impl/FakePlayerData.java
@@ -26,7 +26,7 @@ import java.util.logging.Logger;
 import org.w3c.dom.Document;
 
 import com.l2jmobius.Config;
-import com.l2jmobius.commons.util.IGameXmlReader;
+import com.l2jmobius.commons.util.IXmlReader;
 import com.l2jmobius.gameserver.data.sql.impl.CharNameTable;
 import com.l2jmobius.gameserver.model.StatsSet;
 import com.l2jmobius.gameserver.model.actor.templates.NpcTemplate;
@@ -35,7 +35,7 @@ import com.l2jmobius.gameserver.model.holders.FakePlayerHolder;
 /**
  * @author Mobius
  */
-public class FakePlayerData implements IGameXmlReader
+public class FakePlayerData implements IXmlReader
 {
 	private static Logger LOGGER = Logger.getLogger(FakePlayerData.class.getName());
 	
diff --git a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/data/xml/impl/FenceData.java b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/data/xml/impl/FenceData.java
index 39b04c26d4..3b5fb285af 100644
--- a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/data/xml/impl/FenceData.java
+++ b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/data/xml/impl/FenceData.java
@@ -28,7 +28,7 @@ import java.util.logging.Logger;
 import org.w3c.dom.Document;
 import org.w3c.dom.Node;
 
-import com.l2jmobius.commons.util.IGameXmlReader;
+import com.l2jmobius.commons.util.IXmlReader;
 import com.l2jmobius.gameserver.enums.FenceState;
 import com.l2jmobius.gameserver.model.StatsSet;
 import com.l2jmobius.gameserver.model.World;
@@ -38,7 +38,7 @@ import com.l2jmobius.gameserver.model.actor.instance.FenceInstance;
 /**
  * @author HoridoJoho / FBIagent
  */
-public final class FenceData implements IGameXmlReader
+public final class FenceData implements IXmlReader
 {
 	private static final Logger LOGGER = Logger.getLogger(FenceData.class.getSimpleName());
 	
diff --git a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/data/xml/impl/FishData.java b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/data/xml/impl/FishData.java
index 695aa853be..2a2a2cdffc 100644
--- a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/data/xml/impl/FishData.java
+++ b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/data/xml/impl/FishData.java
@@ -26,7 +26,7 @@ import org.w3c.dom.Document;
 import org.w3c.dom.NamedNodeMap;
 import org.w3c.dom.Node;
 
-import com.l2jmobius.commons.util.IGameXmlReader;
+import com.l2jmobius.commons.util.IXmlReader;
 import com.l2jmobius.gameserver.model.StatsSet;
 import com.l2jmobius.gameserver.model.fishing.Fish;
 
@@ -34,7 +34,7 @@ import com.l2jmobius.gameserver.model.fishing.Fish;
  * This class holds the Fish information.
  * @author nonom
  */
-public final class FishData implements IGameXmlReader
+public final class FishData implements IXmlReader
 {
 	private final Map<Integer, Fish> _fishNormal = new HashMap<>();
 	private final Map<Integer, Fish> _fishEasy = new HashMap<>();
diff --git a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/data/xml/impl/FishingMonstersData.java b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/data/xml/impl/FishingMonstersData.java
index 529351e15a..aee88105a3 100644
--- a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/data/xml/impl/FishingMonstersData.java
+++ b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/data/xml/impl/FishingMonstersData.java
@@ -24,7 +24,7 @@ import org.w3c.dom.Document;
 import org.w3c.dom.NamedNodeMap;
 import org.w3c.dom.Node;
 
-import com.l2jmobius.commons.util.IGameXmlReader;
+import com.l2jmobius.commons.util.IXmlReader;
 import com.l2jmobius.gameserver.model.StatsSet;
 import com.l2jmobius.gameserver.model.fishing.FishingMonster;
 
@@ -32,7 +32,7 @@ import com.l2jmobius.gameserver.model.fishing.FishingMonster;
  * This class holds the Fishing Monsters information.
  * @author nonom
  */
-public final class FishingMonstersData implements IGameXmlReader
+public final class FishingMonstersData implements IXmlReader
 {
 	private final Map<Integer, FishingMonster> _fishingMonstersData = new HashMap<>();
 	
diff --git a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/data/xml/impl/FishingRodsData.java b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/data/xml/impl/FishingRodsData.java
index 1c75730c08..e19d5a21b2 100644
--- a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/data/xml/impl/FishingRodsData.java
+++ b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/data/xml/impl/FishingRodsData.java
@@ -24,7 +24,7 @@ import org.w3c.dom.Document;
 import org.w3c.dom.NamedNodeMap;
 import org.w3c.dom.Node;
 
-import com.l2jmobius.commons.util.IGameXmlReader;
+import com.l2jmobius.commons.util.IXmlReader;
 import com.l2jmobius.gameserver.model.StatsSet;
 import com.l2jmobius.gameserver.model.fishing.FishingRod;
 
@@ -32,7 +32,7 @@ import com.l2jmobius.gameserver.model.fishing.FishingRod;
  * This class holds the Fishing Rods information.
  * @author nonom
  */
-public final class FishingRodsData implements IGameXmlReader
+public final class FishingRodsData implements IXmlReader
 {
 	private final Map<Integer, FishingRod> _fishingRods = new HashMap<>();
 	
diff --git a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/data/xml/impl/HennaData.java b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/data/xml/impl/HennaData.java
index 39865e2bdc..7de3045c93 100644
--- a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/data/xml/impl/HennaData.java
+++ b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/data/xml/impl/HennaData.java
@@ -26,7 +26,7 @@ import org.w3c.dom.Document;
 import org.w3c.dom.NamedNodeMap;
 import org.w3c.dom.Node;
 
-import com.l2jmobius.commons.util.IGameXmlReader;
+import com.l2jmobius.commons.util.IXmlReader;
 import com.l2jmobius.gameserver.model.StatsSet;
 import com.l2jmobius.gameserver.model.base.ClassId;
 import com.l2jmobius.gameserver.model.items.Henna;
@@ -38,7 +38,7 @@ import com.l2jmobius.gameserver.model.items.Henna;
  * Allowed classes to wear each henna.
  * @author Zoey76
  */
-public final class HennaData implements IGameXmlReader
+public final class HennaData implements IXmlReader
 {
 	private final Map<Integer, Henna> _hennaList = new HashMap<>();
 	
diff --git a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/data/xml/impl/HitConditionBonusData.java b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/data/xml/impl/HitConditionBonusData.java
index 71fb5cb4ab..0511562efc 100644
--- a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/data/xml/impl/HitConditionBonusData.java
+++ b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/data/xml/impl/HitConditionBonusData.java
@@ -22,7 +22,7 @@ import org.w3c.dom.Document;
 import org.w3c.dom.NamedNodeMap;
 import org.w3c.dom.Node;
 
-import com.l2jmobius.commons.util.IGameXmlReader;
+import com.l2jmobius.commons.util.IXmlReader;
 import com.l2jmobius.gameserver.GameTimeController;
 import com.l2jmobius.gameserver.model.actor.Creature;
 
@@ -30,7 +30,7 @@ import com.l2jmobius.gameserver.model.actor.Creature;
  * This class load, holds and calculates the hit condition bonuses.
  * @author Nik
  */
-public final class HitConditionBonusData implements IGameXmlReader
+public final class HitConditionBonusData implements IXmlReader
 {
 	private int frontBonus = 0;
 	private int sideBonus = 0;
diff --git a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/data/xml/impl/InitialEquipmentData.java b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/data/xml/impl/InitialEquipmentData.java
index 0cf1cd1c81..7fc5803d8c 100644
--- a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/data/xml/impl/InitialEquipmentData.java
+++ b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/data/xml/impl/InitialEquipmentData.java
@@ -27,7 +27,7 @@ import org.w3c.dom.NamedNodeMap;
 import org.w3c.dom.Node;
 
 import com.l2jmobius.Config;
-import com.l2jmobius.commons.util.IGameXmlReader;
+import com.l2jmobius.commons.util.IXmlReader;
 import com.l2jmobius.gameserver.model.StatsSet;
 import com.l2jmobius.gameserver.model.base.ClassId;
 import com.l2jmobius.gameserver.model.items.PlayerItemTemplate;
@@ -37,7 +37,7 @@ import com.l2jmobius.gameserver.model.items.PlayerItemTemplate;
  * What items get each newly created character and if this item is equipped upon creation (<b>Requires the item to be equippable</b>).
  * @author Zoey76
  */
-public final class InitialEquipmentData implements IGameXmlReader
+public final class InitialEquipmentData implements IXmlReader
 {
 	private final Map<ClassId, List<PlayerItemTemplate>> _initialEquipmentList = new HashMap<>();
 	private static final String NORMAL = "data/stats/initialEquipment.xml";
diff --git a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/data/xml/impl/InitialShortcutData.java b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/data/xml/impl/InitialShortcutData.java
index 10ae09657a..738638c81a 100644
--- a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/data/xml/impl/InitialShortcutData.java
+++ b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/data/xml/impl/InitialShortcutData.java
@@ -26,7 +26,7 @@ import org.w3c.dom.Document;
 import org.w3c.dom.NamedNodeMap;
 import org.w3c.dom.Node;
 
-import com.l2jmobius.commons.util.IGameXmlReader;
+import com.l2jmobius.commons.util.IXmlReader;
 import com.l2jmobius.gameserver.enums.MacroType;
 import com.l2jmobius.gameserver.enums.ShortcutType;
 import com.l2jmobius.gameserver.model.Macro;
@@ -42,7 +42,7 @@ import com.l2jmobius.gameserver.network.serverpackets.ShortCutRegister;
  * What shortcuts get each newly created character.
  * @author Zoey76
  */
-public final class InitialShortcutData implements IGameXmlReader
+public final class InitialShortcutData implements IXmlReader
 {
 	private final Map<ClassId, List<Shortcut>> _initialShortcutData = new HashMap<>();
 	private final List<Shortcut> _initialGlobalShortcutList = new ArrayList<>();
diff --git a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/data/xml/impl/KarmaData.java b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/data/xml/impl/KarmaData.java
index b0bec30b14..cba3e5dfd2 100644
--- a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/data/xml/impl/KarmaData.java
+++ b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/data/xml/impl/KarmaData.java
@@ -25,12 +25,12 @@ import org.w3c.dom.Document;
 import org.w3c.dom.NamedNodeMap;
 import org.w3c.dom.Node;
 
-import com.l2jmobius.commons.util.IGameXmlReader;
+import com.l2jmobius.commons.util.IXmlReader;
 
 /**
  * @author UnAfraid
  */
-public class KarmaData implements IGameXmlReader
+public class KarmaData implements IXmlReader
 {
 	private final Map<Integer, Double> _karmaTable = new HashMap<>();
 	
diff --git a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/data/xml/impl/MultisellData.java b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/data/xml/impl/MultisellData.java
index a84cba25a9..dad926b5ec 100644
--- a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/data/xml/impl/MultisellData.java
+++ b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/data/xml/impl/MultisellData.java
@@ -18,9 +18,9 @@ package com.l2jmobius.gameserver.data.xml.impl;
 
 import java.io.File;
 import java.io.FileFilter;
-import java.util.HashMap;
 import java.util.Iterator;
 import java.util.Map;
+import java.util.concurrent.ConcurrentHashMap;
 import java.util.logging.Level;
 
 import org.w3c.dom.DOMException;
@@ -29,7 +29,7 @@ import org.w3c.dom.NamedNodeMap;
 import org.w3c.dom.Node;
 
 import com.l2jmobius.Config;
-import com.l2jmobius.commons.util.IGameXmlReader;
+import com.l2jmobius.commons.util.IXmlReader;
 import com.l2jmobius.commons.util.file.filter.NumericNameFilter;
 import com.l2jmobius.gameserver.model.StatsSet;
 import com.l2jmobius.gameserver.model.actor.Npc;
@@ -45,9 +45,9 @@ import com.l2jmobius.gameserver.network.serverpackets.SystemMessage;
 import com.l2jmobius.gameserver.network.serverpackets.UserInfo;
 import com.l2jmobius.gameserver.util.Util;
 
-public final class MultisellData implements IGameXmlReader
+public final class MultisellData implements IXmlReader
 {
-	private final Map<Integer, ListContainer> _entries = new HashMap<>();
+	private final Map<Integer, ListContainer> _entries = new ConcurrentHashMap<>();
 	
 	public static final int PAGE_SIZE = 40;
 	// Special IDs.
diff --git a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/data/xml/impl/NpcData.java b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/data/xml/impl/NpcData.java
index eee8331300..df625c4d61 100644
--- a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/data/xml/impl/NpcData.java
+++ b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/data/xml/impl/NpcData.java
@@ -25,6 +25,8 @@ import java.util.HashSet;
 import java.util.List;
 import java.util.Map;
 import java.util.Set;
+import java.util.concurrent.ConcurrentHashMap;
+import java.util.concurrent.CopyOnWriteArrayList;
 import java.util.function.Predicate;
 import java.util.stream.Collectors;
 
@@ -34,7 +36,7 @@ import org.w3c.dom.Node;
 
 import com.l2jmobius.Config;
 import com.l2jmobius.commons.util.CommonUtil;
-import com.l2jmobius.commons.util.IGameXmlReader;
+import com.l2jmobius.commons.util.IXmlReader;
 import com.l2jmobius.gameserver.datatables.ItemTable;
 import com.l2jmobius.gameserver.enums.AISkillScope;
 import com.l2jmobius.gameserver.enums.DropType;
@@ -51,11 +53,11 @@ import com.l2jmobius.gameserver.model.skills.Skill;
  * NPC data parser.
  * @author NosBit
  */
-public class NpcData implements IGameXmlReader
+public class NpcData implements IXmlReader
 {
-	private final Map<Integer, NpcTemplate> _npcs = new HashMap<>();
-	private final Map<String, Integer> _clans = new HashMap<>();
-	private static final List<Integer> _masterMonsterIDs = new ArrayList<>();
+	private final Map<Integer, NpcTemplate> _npcs = new ConcurrentHashMap<>();
+	private final Map<String, Integer> _clans = new ConcurrentHashMap<>();
+	private static final List<Integer> _masterMonsterIDs = new CopyOnWriteArrayList<>();
 	
 	protected NpcData()
 	{
diff --git a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/data/xml/impl/OptionData.java b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/data/xml/impl/OptionData.java
index 575e91be1c..2efe7b1834 100644
--- a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/data/xml/impl/OptionData.java
+++ b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/data/xml/impl/OptionData.java
@@ -17,15 +17,15 @@
 package com.l2jmobius.gameserver.data.xml.impl;
 
 import java.io.File;
-import java.util.HashMap;
 import java.util.Map;
+import java.util.concurrent.ConcurrentHashMap;
 import java.util.logging.Level;
 
 import org.w3c.dom.Document;
 import org.w3c.dom.NamedNodeMap;
 import org.w3c.dom.Node;
 
-import com.l2jmobius.commons.util.IGameXmlReader;
+import com.l2jmobius.commons.util.IXmlReader;
 import com.l2jmobius.gameserver.model.holders.SkillHolder;
 import com.l2jmobius.gameserver.model.options.Options;
 import com.l2jmobius.gameserver.model.options.OptionsSkillHolder;
@@ -37,9 +37,9 @@ import com.l2jmobius.gameserver.model.stats.functions.FuncTemplate;
  * Item Option data.
  * @author UnAfraid
  */
-public class OptionData implements IGameXmlReader
+public class OptionData implements IXmlReader
 {
-	private final Map<Integer, Options> _optionData = new HashMap<>();
+	private final Map<Integer, Options> _optionData = new ConcurrentHashMap<>();
 	
 	protected OptionData()
 	{
diff --git a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/data/xml/impl/PetDataTable.java b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/data/xml/impl/PetDataTable.java
index e947a07071..980f49a26a 100644
--- a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/data/xml/impl/PetDataTable.java
+++ b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/data/xml/impl/PetDataTable.java
@@ -17,14 +17,14 @@
 package com.l2jmobius.gameserver.data.xml.impl;
 
 import java.io.File;
-import java.util.HashMap;
 import java.util.Map;
+import java.util.concurrent.ConcurrentHashMap;
 
 import org.w3c.dom.Document;
 import org.w3c.dom.NamedNodeMap;
 import org.w3c.dom.Node;
 
-import com.l2jmobius.commons.util.IGameXmlReader;
+import com.l2jmobius.commons.util.IXmlReader;
 import com.l2jmobius.gameserver.enums.MountType;
 import com.l2jmobius.gameserver.model.PetData;
 import com.l2jmobius.gameserver.model.PetLevelData;
@@ -35,9 +35,9 @@ import com.l2jmobius.gameserver.model.StatsSet;
  * TODO: load and use all pet parameters.
  * @author Zoey76 (rework)
  */
-public final class PetDataTable implements IGameXmlReader
+public final class PetDataTable implements IXmlReader
 {
-	private final Map<Integer, PetData> _pets = new HashMap<>();
+	private final Map<Integer, PetData> _pets = new ConcurrentHashMap<>();
 	
 	/**
 	 * Instantiates a new pet data table.
diff --git a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/data/xml/impl/PetSkillData.java b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/data/xml/impl/PetSkillData.java
index b6ec2fe524..7c33d897d5 100644
--- a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/data/xml/impl/PetSkillData.java
+++ b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/data/xml/impl/PetSkillData.java
@@ -27,14 +27,14 @@ import org.w3c.dom.Document;
 import org.w3c.dom.NamedNodeMap;
 import org.w3c.dom.Node;
 
-import com.l2jmobius.commons.util.IGameXmlReader;
+import com.l2jmobius.commons.util.IXmlReader;
 import com.l2jmobius.gameserver.model.actor.Summon;
 import com.l2jmobius.gameserver.model.holders.SkillHolder;
 
 /**
  * @author Mobius
  */
-public class PetSkillData implements IGameXmlReader
+public class PetSkillData implements IXmlReader
 {
 	private static Logger LOGGER = Logger.getLogger(PetSkillData.class.getName());
 	private final Map<Integer, Map<Long, SkillHolder>> _skillTrees = new HashMap<>();
diff --git a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/data/xml/impl/PlayerTemplateData.java b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/data/xml/impl/PlayerTemplateData.java
index be4205621e..73da4df1ab 100644
--- a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/data/xml/impl/PlayerTemplateData.java
+++ b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/data/xml/impl/PlayerTemplateData.java
@@ -18,16 +18,16 @@ package com.l2jmobius.gameserver.data.xml.impl;
 
 import java.io.File;
 import java.util.ArrayList;
-import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
+import java.util.concurrent.ConcurrentHashMap;
 import java.util.logging.Logger;
 
 import org.w3c.dom.Document;
 import org.w3c.dom.NamedNodeMap;
 import org.w3c.dom.Node;
 
-import com.l2jmobius.commons.util.IGameXmlReader;
+import com.l2jmobius.commons.util.IXmlReader;
 import com.l2jmobius.gameserver.model.Location;
 import com.l2jmobius.gameserver.model.StatsSet;
 import com.l2jmobius.gameserver.model.actor.templates.PlayerTemplate;
@@ -37,11 +37,11 @@ import com.l2jmobius.gameserver.model.base.ClassId;
  * Loads player's base stats.
  * @author Forsaiken, Zoey76, GKR
  */
-public final class PlayerTemplateData implements IGameXmlReader
+public final class PlayerTemplateData implements IXmlReader
 {
 	private static final Logger LOGGER = Logger.getLogger(PlayerTemplateData.class.getName());
 	
-	private final Map<ClassId, PlayerTemplate> _playerTemplates = new HashMap<>();
+	private final Map<ClassId, PlayerTemplate> _playerTemplates = new ConcurrentHashMap<>();
 	
 	private int _dataCount = 0;
 	
diff --git a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/data/xml/impl/PlayerXpPercentLostData.java b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/data/xml/impl/PlayerXpPercentLostData.java
index c4529b48b4..39dab115ea 100644
--- a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/data/xml/impl/PlayerXpPercentLostData.java
+++ b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/data/xml/impl/PlayerXpPercentLostData.java
@@ -23,13 +23,13 @@ import org.w3c.dom.Document;
 import org.w3c.dom.NamedNodeMap;
 import org.w3c.dom.Node;
 
-import com.l2jmobius.commons.util.IGameXmlReader;
+import com.l2jmobius.commons.util.IXmlReader;
 
 /**
  * This class holds the Player Xp Percent Lost Data for each level for players.
  * @author Zealar
  */
-public final class PlayerXpPercentLostData implements IGameXmlReader
+public final class PlayerXpPercentLostData implements IXmlReader
 {
 	private final int _maxlevel = ExperienceData.getInstance().getMaxLevel();
 	private final double[] _playerXpPercentLost = new double[_maxlevel + 1];
diff --git a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/data/xml/impl/PrimeShopData.java b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/data/xml/impl/PrimeShopData.java
index b47a13a59c..d7d413b13a 100644
--- a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/data/xml/impl/PrimeShopData.java
+++ b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/data/xml/impl/PrimeShopData.java
@@ -27,14 +27,14 @@ import org.w3c.dom.NamedNodeMap;
 import org.w3c.dom.Node;
 
 import com.l2jmobius.Config;
-import com.l2jmobius.commons.util.IGameXmlReader;
+import com.l2jmobius.commons.util.IXmlReader;
 import com.l2jmobius.gameserver.model.StatsSet;
 import com.l2jmobius.gameserver.model.holders.PrimeShopProductHolder;
 
 /**
  * @author Mobius
  */
-public class PrimeShopData implements IGameXmlReader
+public class PrimeShopData implements IXmlReader
 {
 	private static final Logger LOGGER = Logger.getLogger(PrimeShopData.class.getName());
 	private final Map<Integer, PrimeShopProductHolder> _products = new HashMap<>();
diff --git a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/data/xml/impl/RecipeData.java b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/data/xml/impl/RecipeData.java
index 11bbbfd60b..199f3ece4c 100644
--- a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/data/xml/impl/RecipeData.java
+++ b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/data/xml/impl/RecipeData.java
@@ -26,7 +26,7 @@ import org.w3c.dom.Document;
 import org.w3c.dom.NamedNodeMap;
 import org.w3c.dom.Node;
 
-import com.l2jmobius.commons.util.IGameXmlReader;
+import com.l2jmobius.commons.util.IXmlReader;
 import com.l2jmobius.gameserver.model.RecipeInstance;
 import com.l2jmobius.gameserver.model.RecipeList;
 import com.l2jmobius.gameserver.model.RecipeStatInstance;
@@ -37,7 +37,7 @@ import com.l2jmobius.gameserver.model.actor.instance.PlayerInstance;
  * The Class RecipeData.
  * @author Zoey76
  */
-public class RecipeData implements IGameXmlReader
+public class RecipeData implements IXmlReader
 {
 	private final Map<Integer, RecipeList> _recipes = new HashMap<>();
 	
diff --git a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/data/xml/impl/SecondaryAuthData.java b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/data/xml/impl/SecondaryAuthData.java
index 22996482fd..af5d365620 100644
--- a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/data/xml/impl/SecondaryAuthData.java
+++ b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/data/xml/impl/SecondaryAuthData.java
@@ -24,13 +24,13 @@ import java.util.logging.Level;
 import org.w3c.dom.Document;
 import org.w3c.dom.Node;
 
-import com.l2jmobius.commons.util.IGameXmlReader;
+import com.l2jmobius.commons.util.IXmlReader;
 
 /**
  * Secondary Auth data.
  * @author NosBit
  */
-public class SecondaryAuthData implements IGameXmlReader
+public class SecondaryAuthData implements IXmlReader
 {
 	private final Set<String> _forbiddenPasswords = new HashSet<>();
 	private boolean _enabled = false;
diff --git a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/data/xml/impl/SiegeScheduleData.java b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/data/xml/impl/SiegeScheduleData.java
index e4883b72fa..c9a38db19d 100644
--- a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/data/xml/impl/SiegeScheduleData.java
+++ b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/data/xml/impl/SiegeScheduleData.java
@@ -26,7 +26,7 @@ import org.w3c.dom.Document;
 import org.w3c.dom.NamedNodeMap;
 import org.w3c.dom.Node;
 
-import com.l2jmobius.commons.util.IGameXmlReader;
+import com.l2jmobius.commons.util.IXmlReader;
 import com.l2jmobius.gameserver.model.SiegeScheduleDate;
 import com.l2jmobius.gameserver.model.StatsSet;
 import com.l2jmobius.gameserver.util.Util;
@@ -34,7 +34,7 @@ import com.l2jmobius.gameserver.util.Util;
 /**
  * @author UnAfraid
  */
-public class SiegeScheduleData implements IGameXmlReader
+public class SiegeScheduleData implements IXmlReader
 {
 	private final List<SiegeScheduleDate> _scheduleData = new ArrayList<>();
 	
diff --git a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/data/xml/impl/SkillData.java b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/data/xml/impl/SkillData.java
index eaa6c07c85..7739fdc16b 100644
--- a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/data/xml/impl/SkillData.java
+++ b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/data/xml/impl/SkillData.java
@@ -16,10 +16,9 @@
  */
 package com.l2jmobius.gameserver.data.xml.impl;
 
-import java.util.HashMap;
-import java.util.HashSet;
 import java.util.Map;
 import java.util.Set;
+import java.util.concurrent.ConcurrentHashMap;
 import java.util.logging.Logger;
 
 import com.l2jmobius.gameserver.engines.DocumentEngine;
@@ -32,9 +31,9 @@ public final class SkillData
 {
 	private static Logger LOGGER = Logger.getLogger(SkillData.class.getName());
 	
-	private final Map<Integer, Skill> _skills = new HashMap<>();
-	private final Map<Integer, Integer> _skillMaxLevel = new HashMap<>();
-	private final Set<Integer> _enchantable = new HashSet<>();
+	private final Map<Integer, Skill> _skills = new ConcurrentHashMap<>();
+	private final Map<Integer, Integer> _skillMaxLevel = new ConcurrentHashMap<>();
+	private final Set<Integer> _enchantable = ConcurrentHashMap.newKeySet();
 	
 	protected SkillData()
 	{
@@ -50,11 +49,11 @@ public final class SkillData
 	
 	private void load()
 	{
-		final Map<Integer, Skill> _temp = new HashMap<>();
-		DocumentEngine.getInstance().loadAllSkills(_temp);
+		final Map<Integer, Skill> temp = new ConcurrentHashMap<>();
+		DocumentEngine.getInstance().loadAllSkills(temp);
 		
 		_skills.clear();
-		_skills.putAll(_temp);
+		_skills.putAll(temp);
 		
 		_skillMaxLevel.clear();
 		_enchantable.clear();
diff --git a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/data/xml/impl/SkillLearnData.java b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/data/xml/impl/SkillLearnData.java
index fc2496c691..5d463d68eb 100644
--- a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/data/xml/impl/SkillLearnData.java
+++ b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/data/xml/impl/SkillLearnData.java
@@ -25,14 +25,14 @@ import java.util.Map;
 import org.w3c.dom.Document;
 import org.w3c.dom.Node;
 
-import com.l2jmobius.commons.util.IGameXmlReader;
+import com.l2jmobius.commons.util.IXmlReader;
 import com.l2jmobius.gameserver.model.base.ClassId;
 
 /**
  * Holds all skill learn data for all NPCs.
  * @author xban1x
  */
-public final class SkillLearnData implements IGameXmlReader
+public final class SkillLearnData implements IXmlReader
 {
 	private final Map<Integer, List<ClassId>> _skillLearn = new HashMap<>();
 	
diff --git a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/data/xml/impl/SkillTreesData.java b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/data/xml/impl/SkillTreesData.java
index 93d8139d55..f7da954f03 100644
--- a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/data/xml/impl/SkillTreesData.java
+++ b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/data/xml/impl/SkillTreesData.java
@@ -27,13 +27,14 @@ import java.util.List;
 import java.util.Map;
 import java.util.Map.Entry;
 import java.util.Set;
+import java.util.concurrent.ConcurrentHashMap;
 
 import org.w3c.dom.Document;
 import org.w3c.dom.NamedNodeMap;
 import org.w3c.dom.Node;
 
 import com.l2jmobius.Config;
-import com.l2jmobius.commons.util.IGameXmlReader;
+import com.l2jmobius.commons.util.IXmlReader;
 import com.l2jmobius.gameserver.enums.Race;
 import com.l2jmobius.gameserver.model.SkillLearn;
 import com.l2jmobius.gameserver.model.SkillLearn.SubClassData;
@@ -72,24 +73,24 @@ import com.l2jmobius.gameserver.model.skills.Skill;
  * For XML schema please refer to skillTrees.xsd in datapack in xsd folder and for parameters documentation refer to documentation.txt in skillTrees folder.<br>
  * @author Zoey76
  */
-public final class SkillTreesData implements IGameXmlReader
+public final class SkillTreesData implements IXmlReader
 {
 	// ClassId, Map of Skill Hash Code, SkillLearn
-	private final Map<ClassId, Map<Integer, SkillLearn>> _classSkillTrees = new LinkedHashMap<>();
-	private final Map<ClassId, Map<Integer, SkillLearn>> _transferSkillTrees = new LinkedHashMap<>();
+	private final Map<ClassId, Map<Integer, SkillLearn>> _classSkillTrees = new ConcurrentHashMap<>();
+	private final Map<ClassId, Map<Integer, SkillLearn>> _transferSkillTrees = new ConcurrentHashMap<>();
 	// Skill Hash Code, SkillLearn
-	private final Map<Integer, SkillLearn> _collectSkillTree = new LinkedHashMap<>();
-	private final Map<Integer, SkillLearn> _fishingSkillTree = new LinkedHashMap<>();
-	private final Map<Integer, SkillLearn> _pledgeSkillTree = new LinkedHashMap<>();
-	private final Map<Integer, SkillLearn> _subClassSkillTree = new LinkedHashMap<>();
-	private final Map<Integer, SkillLearn> _subPledgeSkillTree = new LinkedHashMap<>();
-	private final Map<Integer, SkillLearn> _transformSkillTree = new LinkedHashMap<>();
-	private final Map<Integer, SkillLearn> _commonSkillTree = new LinkedHashMap<>();
+	private final Map<Integer, SkillLearn> _collectSkillTree = new ConcurrentHashMap<>();
+	private final Map<Integer, SkillLearn> _fishingSkillTree = new ConcurrentHashMap<>();
+	private final Map<Integer, SkillLearn> _pledgeSkillTree = new ConcurrentHashMap<>();
+	private final Map<Integer, SkillLearn> _subClassSkillTree = new ConcurrentHashMap<>();
+	private final Map<Integer, SkillLearn> _subPledgeSkillTree = new ConcurrentHashMap<>();
+	private final Map<Integer, SkillLearn> _transformSkillTree = new ConcurrentHashMap<>();
+	private final Map<Integer, SkillLearn> _commonSkillTree = new ConcurrentHashMap<>();
 	// Other skill trees
-	private final Map<Integer, SkillLearn> _nobleSkillTree = new LinkedHashMap<>();
-	private final Map<Integer, SkillLearn> _heroSkillTree = new LinkedHashMap<>();
-	private final Map<Integer, SkillLearn> _gameMasterSkillTree = new LinkedHashMap<>();
-	private final Map<Integer, SkillLearn> _gameMasterAuraSkillTree = new LinkedHashMap<>();
+	private final Map<Integer, SkillLearn> _nobleSkillTree = new ConcurrentHashMap<>();
+	private final Map<Integer, SkillLearn> _heroSkillTree = new ConcurrentHashMap<>();
+	private final Map<Integer, SkillLearn> _gameMasterSkillTree = new ConcurrentHashMap<>();
+	private final Map<Integer, SkillLearn> _gameMasterAuraSkillTree = new ConcurrentHashMap<>();
 	
 	// Checker, sorted arrays of hash codes
 	private Map<Integer, int[]> _skillsByClassIdHashCodes; // Occupation skills
diff --git a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/data/xml/impl/StaticObjectData.java b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/data/xml/impl/StaticObjectData.java
index 1fe6c1e89d..2f221f1203 100644
--- a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/data/xml/impl/StaticObjectData.java
+++ b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/data/xml/impl/StaticObjectData.java
@@ -25,7 +25,7 @@ import org.w3c.dom.Document;
 import org.w3c.dom.NamedNodeMap;
 import org.w3c.dom.Node;
 
-import com.l2jmobius.commons.util.IGameXmlReader;
+import com.l2jmobius.commons.util.IXmlReader;
 import com.l2jmobius.gameserver.model.StatsSet;
 import com.l2jmobius.gameserver.model.actor.instance.StaticObjectInstance;
 import com.l2jmobius.gameserver.model.actor.templates.CreatureTemplate;
@@ -34,7 +34,7 @@ import com.l2jmobius.gameserver.model.actor.templates.CreatureTemplate;
  * This class loads and holds all static object data.
  * @author UnAfraid
  */
-public final class StaticObjectData implements IGameXmlReader
+public final class StaticObjectData implements IXmlReader
 {
 	private final Map<Integer, StaticObjectInstance> _staticObjects = new HashMap<>();
 	
diff --git a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/data/xml/impl/TransformData.java b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/data/xml/impl/TransformData.java
index 8b47de0e28..44dbfcf258 100644
--- a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/data/xml/impl/TransformData.java
+++ b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/data/xml/impl/TransformData.java
@@ -17,15 +17,15 @@
 package com.l2jmobius.gameserver.data.xml.impl;
 
 import java.io.File;
-import java.util.HashMap;
 import java.util.Map;
+import java.util.concurrent.ConcurrentHashMap;
 import java.util.logging.Level;
 
 import org.w3c.dom.Document;
 import org.w3c.dom.NamedNodeMap;
 import org.w3c.dom.Node;
 
-import com.l2jmobius.commons.util.IGameXmlReader;
+import com.l2jmobius.commons.util.IXmlReader;
 import com.l2jmobius.gameserver.model.StatsSet;
 import com.l2jmobius.gameserver.model.actor.instance.PlayerInstance;
 import com.l2jmobius.gameserver.model.actor.transform.Transform;
@@ -39,9 +39,9 @@ import com.l2jmobius.gameserver.network.serverpackets.ExBasicActionList;
 /**
  * @author UnAfraid
  */
-public final class TransformData implements IGameXmlReader
+public final class TransformData implements IXmlReader
 {
-	private final Map<Integer, Transform> _transformData = new HashMap<>();
+	private final Map<Integer, Transform> _transformData = new ConcurrentHashMap<>();
 	
 	protected TransformData()
 	{
diff --git a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/data/xml/impl/UIData.java b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/data/xml/impl/UIData.java
index b388a55748..d7fb1e3eb1 100644
--- a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/data/xml/impl/UIData.java
+++ b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/data/xml/impl/UIData.java
@@ -26,14 +26,14 @@ import java.util.logging.Logger;
 import org.w3c.dom.Document;
 import org.w3c.dom.Node;
 
-import com.l2jmobius.commons.util.IGameXmlReader;
+import com.l2jmobius.commons.util.IXmlReader;
 import com.l2jmobius.gameserver.model.ActionKey;
 
 /**
  * UI Data parser.
  * @author Zoey76
  */
-public class UIData implements IGameXmlReader
+public class UIData implements IXmlReader
 {
 	private static final Logger LOGGER = Logger.getLogger(UIData.class.getName());
 	
diff --git a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/datatables/SpawnTable.java b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/datatables/SpawnTable.java
index bd1e31e6b0..5e51713fc7 100644
--- a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/datatables/SpawnTable.java
+++ b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/datatables/SpawnTable.java
@@ -36,7 +36,7 @@ import org.w3c.dom.NamedNodeMap;
 import org.w3c.dom.Node;
 
 import com.l2jmobius.Config;
-import com.l2jmobius.commons.util.IGameXmlReader;
+import com.l2jmobius.commons.util.IXmlReader;
 import com.l2jmobius.gameserver.data.xml.impl.NpcData;
 import com.l2jmobius.gameserver.instancemanager.DayNightSpawnManager;
 import com.l2jmobius.gameserver.instancemanager.ZoneManager;
@@ -49,12 +49,12 @@ import com.l2jmobius.gameserver.model.actor.templates.NpcTemplate;
  * Spawn data retriever.
  * @author Zoey76, Mobius
  */
-public final class SpawnTable implements IGameXmlReader
+public final class SpawnTable implements IXmlReader
 {
 	private static final Logger LOGGER = Logger.getLogger(SpawnTable.class.getName());
 	private static final String OTHER_XML_FOLDER = "data/spawns/Others";
 	private static final Map<Integer, Set<Spawn>> _spawnTable = new ConcurrentHashMap<>();
-	private static final Map<Integer, String> _spawnTemplates = new HashMap<>();
+	private static final Map<Integer, String> _spawnTemplates = new ConcurrentHashMap<>();
 	private int _spanwCount = 0;
 	
 	@Override
diff --git a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/engines/DocumentEngine.java b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/engines/DocumentEngine.java
index 57df3fbf52..026aa43597 100644
--- a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/engines/DocumentEngine.java
+++ b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/engines/DocumentEngine.java
@@ -17,12 +17,15 @@
 package com.l2jmobius.gameserver.engines;
 
 import java.io.File;
-import java.util.LinkedList;
+import java.util.ArrayList;
 import java.util.List;
 import java.util.Map;
+import java.util.concurrent.CopyOnWriteArrayList;
+import java.util.concurrent.ScheduledFuture;
 import java.util.logging.Logger;
 
 import com.l2jmobius.Config;
+import com.l2jmobius.commons.concurrent.ThreadPool;
 import com.l2jmobius.commons.util.file.filter.XMLFilter;
 import com.l2jmobius.gameserver.data.xml.impl.SkillData;
 import com.l2jmobius.gameserver.engines.items.DocumentItem;
@@ -37,40 +40,36 @@ public class DocumentEngine
 {
 	private static final Logger LOGGER = Logger.getLogger(DocumentEngine.class.getName());
 	
-	private final List<File> _itemFiles = new LinkedList<>();
-	private final List<File> _skillFiles = new LinkedList<>();
-	
-	public static DocumentEngine getInstance()
-	{
-		return SingletonHolder._instance;
-	}
+	private final List<File> _itemFiles = new ArrayList<>();
+	private final List<File> _skillFiles = new ArrayList<>();
+	private static int count = 0;
 	
 	protected DocumentEngine()
 	{
-		hashFiles("data/stats/items", _itemFiles);
+		processDirectory("data/stats/items", _itemFiles);
 		if (Config.CUSTOM_ITEMS_LOAD)
 		{
-			hashFiles("data/stats/items/custom", _itemFiles);
+			processDirectory("data/stats/items/custom", _itemFiles);
 		}
-		hashFiles("data/stats/skills", _skillFiles);
+		processDirectory("data/stats/skills", _skillFiles);
 		if (Config.CUSTOM_SKILLS_LOAD)
 		{
-			hashFiles("data/stats/skills/custom", _skillFiles);
+			processDirectory("data/stats/skills/custom", _skillFiles);
 		}
 	}
 	
-	private void hashFiles(String dirname, List<File> hash)
+	private void processDirectory(String dirName, List<File> list)
 	{
-		final File dir = new File(Config.DATAPACK_ROOT, dirname);
+		final File dir = new File(Config.DATAPACK_ROOT, dirName);
 		if (!dir.exists())
 		{
-			LOGGER.warning("Dir " + dir.getAbsolutePath() + " not exists");
+			LOGGER.warning("Dir " + dir.getAbsolutePath() + " does not exist.");
 			return;
 		}
 		final File[] files = dir.listFiles(new XMLFilter());
-		for (File f : files)
+		for (File file : files)
 		{
-			hash.add(f);
+			list.add(file);
 		}
 	}
 	
@@ -88,18 +87,31 @@ public class DocumentEngine
 	
 	public void loadAllSkills(Map<Integer, Skill> allSkills)
 	{
-		int count = 0;
+		final List<ScheduledFuture<?>> jobs = new CopyOnWriteArrayList<>();
 		for (File file : _skillFiles)
 		{
-			final List<Skill> s = loadSkills(file);
-			if (s == null)
+			jobs.add(ThreadPool.schedule(() ->
 			{
-				continue;
-			}
-			for (Skill skill : s)
+				final List<Skill> skills = loadSkills(file);
+				if (skills == null)
+				{
+					return;
+				}
+				for (Skill skill : skills)
+				{
+					allSkills.put(SkillData.getSkillHashCode(skill), skill);
+					count++;
+				}
+			}, 0));
+		}
+		while (!jobs.isEmpty())
+		{
+			for (ScheduledFuture<?> job : jobs)
 			{
-				allSkills.put(SkillData.getSkillHashCode(skill), skill);
-				count++;
+				if ((job == null) || job.isDone() || job.isCancelled())
+				{
+					jobs.remove(job);
+				}
 			}
 		}
 		LOGGER.info(getClass().getSimpleName() + ": Loaded " + count + " Skill templates from XML files.");
@@ -111,12 +123,26 @@ public class DocumentEngine
 	 */
 	public List<Item> loadItems()
 	{
-		final List<Item> list = new LinkedList<>();
-		for (File f : _itemFiles)
+		final List<ScheduledFuture<?>> jobs = new CopyOnWriteArrayList<>();
+		final List<Item> list = new CopyOnWriteArrayList<>();
+		for (File file : _itemFiles)
 		{
-			final DocumentItem document = new DocumentItem(f);
-			document.parse();
-			list.addAll(document.getItemList());
+			jobs.add(ThreadPool.schedule(() ->
+			{
+				final DocumentItem document = new DocumentItem(file);
+				document.parse();
+				list.addAll(document.getItemList());
+			}, 0));
+		}
+		while (!jobs.isEmpty())
+		{
+			for (ScheduledFuture<?> job : jobs)
+			{
+				if ((job == null) || job.isDone() || job.isCancelled())
+				{
+					jobs.remove(job);
+				}
+			}
 		}
 		return list;
 	}
@@ -125,4 +151,9 @@ public class DocumentEngine
 	{
 		protected static final DocumentEngine _instance = new DocumentEngine();
 	}
+	
+	public static DocumentEngine getInstance()
+	{
+		return SingletonHolder._instance;
+	}
 }
diff --git a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/handler/EffectHandler.java b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/handler/EffectHandler.java
index ff66b7e86e..f3e395b9ae 100644
--- a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/handler/EffectHandler.java
+++ b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/handler/EffectHandler.java
@@ -62,7 +62,7 @@ public final class EffectHandler implements IHandler<Class<? extends AbstractEff
 	{
 		try
 		{
-			ScriptEngineManager.getInstance().executeEffectMasterHandler();
+			ScriptEngineManager.getInstance().executeScript(ScriptEngineManager.EFFECT_MASTER_HANDLER_FILE);
 		}
 		catch (Exception e)
 		{
diff --git a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/instancemanager/CastleManorManager.java b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/instancemanager/CastleManorManager.java
index 3601cd3043..d81ef7f241 100644
--- a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/instancemanager/CastleManorManager.java
+++ b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/instancemanager/CastleManorManager.java
@@ -38,7 +38,7 @@ import org.w3c.dom.Node;
 import com.l2jmobius.Config;
 import com.l2jmobius.commons.concurrent.ThreadPool;
 import com.l2jmobius.commons.database.DatabaseFactory;
-import com.l2jmobius.commons.util.IGameXmlReader;
+import com.l2jmobius.commons.util.IXmlReader;
 import com.l2jmobius.commons.util.Rnd;
 import com.l2jmobius.gameserver.enums.ManorMode;
 import com.l2jmobius.gameserver.model.CropProcure;
@@ -56,7 +56,7 @@ import com.l2jmobius.gameserver.network.SystemMessageId;
  * Castle manor system.
  * @author malyelfik
  */
-public final class CastleManorManager implements IGameXmlReader, IStorable
+public final class CastleManorManager implements IXmlReader, IStorable
 {
 	// SQL queries
 	private static final String INSERT_PRODUCT = "INSERT INTO castle_manor_production VALUES (?, ?, ?, ?, ?, ?)";
diff --git a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/instancemanager/FakePlayerChatManager.java b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/instancemanager/FakePlayerChatManager.java
index 7101927e48..39c239a762 100644
--- a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/instancemanager/FakePlayerChatManager.java
+++ b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/instancemanager/FakePlayerChatManager.java
@@ -25,7 +25,7 @@ import org.w3c.dom.Document;
 
 import com.l2jmobius.Config;
 import com.l2jmobius.commons.concurrent.ThreadPool;
-import com.l2jmobius.commons.util.IGameXmlReader;
+import com.l2jmobius.commons.util.IXmlReader;
 import com.l2jmobius.commons.util.Rnd;
 import com.l2jmobius.gameserver.data.xml.impl.FakePlayerData;
 import com.l2jmobius.gameserver.datatables.SpawnTable;
@@ -41,7 +41,7 @@ import com.l2jmobius.gameserver.network.serverpackets.CreatureSay;
 /**
  * @author Mobius
  */
-public final class FakePlayerChatManager implements IGameXmlReader
+public final class FakePlayerChatManager implements IXmlReader
 {
 	private static Logger LOGGER = Logger.getLogger(FakePlayerChatManager.class.getName());
 	final List<FakePlayerChatHolder> MESSAGES = new ArrayList<>();
diff --git a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/instancemanager/InstanceManager.java b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/instancemanager/InstanceManager.java
index d5ee6747ba..4c0455c102 100644
--- a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/instancemanager/InstanceManager.java
+++ b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/instancemanager/InstanceManager.java
@@ -29,7 +29,7 @@ import org.w3c.dom.NamedNodeMap;
 import org.w3c.dom.Node;
 
 import com.l2jmobius.commons.database.DatabaseFactory;
-import com.l2jmobius.commons.util.IGameXmlReader;
+import com.l2jmobius.commons.util.IXmlReader;
 import com.l2jmobius.gameserver.model.WorldObject;
 import com.l2jmobius.gameserver.model.actor.instance.PlayerInstance;
 import com.l2jmobius.gameserver.model.instancezone.Instance;
@@ -38,7 +38,7 @@ import com.l2jmobius.gameserver.model.instancezone.InstanceWorld;
 /**
  * @author evill33t, GodKratos
  */
-public final class InstanceManager implements IGameXmlReader
+public final class InstanceManager implements IXmlReader
 {
 	private static final Map<Integer, Instance> INSTANCES = new ConcurrentHashMap<>();
 	private final Map<Integer, InstanceWorld> _instanceWorlds = new ConcurrentHashMap<>();
@@ -46,7 +46,7 @@ public final class InstanceManager implements IGameXmlReader
 	// InstanceId Names
 	private static final Map<Integer, String> _instanceIdNames = new HashMap<>();
 	// Instance templates
-	private final Map<Integer, String> _instanceTemplates = new HashMap<>();
+	private final Map<Integer, String> _instanceTemplates = new ConcurrentHashMap<>();
 	private final Map<Integer, Map<Integer, Long>> _playerInstanceTimes = new ConcurrentHashMap<>();
 	// SQL Queries
 	private static final String ADD_INSTANCE_TIME = "INSERT INTO character_instance_time (charId,instanceId,time) values (?,?,?) ON DUPLICATE KEY UPDATE time=?";
diff --git a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/instancemanager/MapRegionManager.java b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/instancemanager/MapRegionManager.java
index 0f7863be0f..bb9171b379 100644
--- a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/instancemanager/MapRegionManager.java
+++ b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/instancemanager/MapRegionManager.java
@@ -17,16 +17,16 @@
 package com.l2jmobius.gameserver.instancemanager;
 
 import java.io.File;
-import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
+import java.util.concurrent.ConcurrentHashMap;
 
 import org.w3c.dom.Document;
 import org.w3c.dom.NamedNodeMap;
 import org.w3c.dom.Node;
 
 import com.l2jmobius.Config;
-import com.l2jmobius.commons.util.IGameXmlReader;
+import com.l2jmobius.commons.util.IXmlReader;
 import com.l2jmobius.gameserver.SevenSigns;
 import com.l2jmobius.gameserver.model.Location;
 import com.l2jmobius.gameserver.model.MapRegion;
@@ -48,9 +48,9 @@ import com.l2jmobius.gameserver.model.zone.type.RespawnZone;
  * Map Region Manager.
  * @author Nyaran
  */
-public final class MapRegionManager implements IGameXmlReader
+public final class MapRegionManager implements IXmlReader
 {
-	private static final Map<String, MapRegion> _regions = new HashMap<>();
+	private static final Map<String, MapRegion> _regions = new ConcurrentHashMap<>();
 	private static final String defaultRespawn = "talking_island_town";
 	
 	protected MapRegionManager()
diff --git a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/instancemanager/SellBuffsManager.java b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/instancemanager/SellBuffsManager.java
index ef2b060de3..ac2332d1c6 100644
--- a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/instancemanager/SellBuffsManager.java
+++ b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/instancemanager/SellBuffsManager.java
@@ -26,7 +26,7 @@ import org.w3c.dom.Element;
 import org.w3c.dom.NodeList;
 
 import com.l2jmobius.Config;
-import com.l2jmobius.commons.util.IGameXmlReader;
+import com.l2jmobius.commons.util.IXmlReader;
 import com.l2jmobius.gameserver.cache.HtmCache;
 import com.l2jmobius.gameserver.data.xml.impl.SkillData;
 import com.l2jmobius.gameserver.datatables.ItemTable;
@@ -46,7 +46,7 @@ import com.l2jmobius.gameserver.util.Util;
  * Sell Buffs Manager
  * @author St3eT
  */
-public final class SellBuffsManager implements IGameXmlReader
+public final class SellBuffsManager implements IXmlReader
 {
 	private static final Logger LOGGER = Logger.getLogger(SellBuffsManager.class.getName());
 	private static final List<Integer> ALLOWED_BUFFS = new ArrayList<>();
diff --git a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/instancemanager/WalkingManager.java b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/instancemanager/WalkingManager.java
index 054c838eb7..bb817904c5 100644
--- a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/instancemanager/WalkingManager.java
+++ b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/instancemanager/WalkingManager.java
@@ -27,7 +27,7 @@ import org.w3c.dom.NamedNodeMap;
 import org.w3c.dom.Node;
 
 import com.l2jmobius.commons.concurrent.ThreadPool;
-import com.l2jmobius.commons.util.IGameXmlReader;
+import com.l2jmobius.commons.util.IXmlReader;
 import com.l2jmobius.gameserver.ai.CtrlIntention;
 import com.l2jmobius.gameserver.enums.ChatType;
 import com.l2jmobius.gameserver.instancemanager.tasks.StartMovingTask;
@@ -47,7 +47,7 @@ import com.l2jmobius.gameserver.network.NpcStringId;
  * This class manages walking monsters.
  * @author GKR
  */
-public final class WalkingManager implements IGameXmlReader
+public final class WalkingManager implements IXmlReader
 {
 	// Repeat style:
 	// -1 - no repeat
diff --git a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/instancemanager/ZoneManager.java b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/instancemanager/ZoneManager.java
index f33655f6b8..f2b8e01d06 100644
--- a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/instancemanager/ZoneManager.java
+++ b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/instancemanager/ZoneManager.java
@@ -26,6 +26,7 @@ import java.util.List;
 import java.util.Map;
 import java.util.Optional;
 import java.util.OptionalInt;
+import java.util.concurrent.ConcurrentHashMap;
 import java.util.logging.Level;
 import java.util.logging.Logger;
 
@@ -33,7 +34,7 @@ import org.w3c.dom.Document;
 import org.w3c.dom.NamedNodeMap;
 import org.w3c.dom.Node;
 
-import com.l2jmobius.commons.util.IGameXmlReader;
+import com.l2jmobius.commons.util.IXmlReader;
 import com.l2jmobius.gameserver.model.World;
 import com.l2jmobius.gameserver.model.WorldObject;
 import com.l2jmobius.gameserver.model.actor.Creature;
@@ -56,19 +57,19 @@ import com.l2jmobius.gameserver.model.zone.type.RespawnZone;
  * This class manages the zones
  * @author durgus
  */
-public final class ZoneManager implements IGameXmlReader
+public final class ZoneManager implements IXmlReader
 {
 	private static final Logger LOGGER = Logger.getLogger(ZoneManager.class.getName());
 	
 	private static final Map<String, AbstractZoneSettings> SETTINGS = new HashMap<>();
 	
-	public static final int SHIFT_BY = 15;
-	public static final int OFFSET_X = Math.abs(World.MAP_MIN_X >> SHIFT_BY);
-	public static final int OFFSET_Y = Math.abs(World.MAP_MIN_Y >> SHIFT_BY);
+	private static final int SHIFT_BY = 15;
+	private static final int OFFSET_X = Math.abs(World.MAP_MIN_X >> SHIFT_BY);
+	private static final int OFFSET_Y = Math.abs(World.MAP_MIN_Y >> SHIFT_BY);
 	
-	private final Map<Class<? extends ZoneType>, Map<Integer, ? extends ZoneType>> _classZones = new HashMap<>();
-	private final Map<String, NpcSpawnTerritory> _spawnTerritories = new HashMap<>();
-	private int _lastDynamicId = 300000;
+	private final Map<Class<? extends ZoneType>, ConcurrentHashMap<Integer, ? extends ZoneType>> _classZones = new ConcurrentHashMap<>();
+	private final Map<String, NpcSpawnTerritory> _spawnTerritories = new ConcurrentHashMap<>();
+	private volatile int _lastDynamicId = 300000;
 	private List<ItemInstance> _debugItems;
 	
 	private final ZoneRegion[][] _zoneRegions = new ZoneRegion[(World.MAP_MAX_X >> SHIFT_BY) + OFFSET_X + 1][(World.MAP_MAX_Y >> SHIFT_BY) + OFFSET_Y + 1];
@@ -326,6 +327,7 @@ public final class ZoneManager implements IGameXmlReader
 						}
 						catch (Exception e)
 						{
+							e.printStackTrace();
 							LOGGER.warning(getClass().getSimpleName() + ": ZoneData: No such zone type: " + zoneType + " in file: " + f.getName());
 							continue;
 						}
@@ -361,7 +363,7 @@ public final class ZoneManager implements IGameXmlReader
 						}
 						if (checkId(zoneId))
 						{
-							LOGGER.config(getClass().getSimpleName() + ": Caution: Zone (" + zoneId + ") from file: " + f.getName() + " overrides previos definition.");
+							LOGGER.config(getClass().getSimpleName() + ": Caution: Zone (" + zoneId + ") from file: " + f.getName() + " overrides previous definition.");
 						}
 						
 						if ((zoneName != null) && !zoneName.isEmpty())
@@ -428,7 +430,7 @@ public final class ZoneManager implements IGameXmlReader
 	 * @param id the id
 	 * @return true, if successful
 	 */
-	public boolean checkId(int id)
+	private boolean checkId(int id)
 	{
 		for (Map<Integer, ? extends ZoneType> map : _classZones.values())
 		{
@@ -447,12 +449,12 @@ public final class ZoneManager implements IGameXmlReader
 	 * @param zone the zone
 	 */
 	@SuppressWarnings("unchecked")
-	public <T extends ZoneType> void addZone(Integer id, T zone)
+	private <T extends ZoneType> void addZone(Integer id, T zone)
 	{
-		Map<Integer, T> map = (Map<Integer, T>) _classZones.get(zone.getClass());
+		ConcurrentHashMap<Integer, T> map = (ConcurrentHashMap<Integer, T>) _classZones.get(zone.getClass());
 		if (map == null)
 		{
-			map = new HashMap<>();
+			map = new ConcurrentHashMap<>();
 			map.put(id, zone);
 			_classZones.put(zone.getClass(), map);
 		}
diff --git a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/zone/type/BossZone.java b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/zone/type/BossZone.java
index 505dcb9340..0374b7f4a7 100644
--- a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/zone/type/BossZone.java
+++ b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/zone/type/BossZone.java
@@ -93,7 +93,11 @@ public class BossZone extends ZoneType
 	{
 		super(id);
 		_oustLoc = new int[3];
-		final AbstractZoneSettings settings = ZoneManager.getSettings(getName()) == null ? new Settings() : ZoneManager.getSettings(getName());
+		AbstractZoneSettings settings = ZoneManager.getSettings(getName());
+		if (settings == null)
+		{
+			settings = new Settings();
+		}
 		setSettings(settings);
 		GrandBossManager.getInstance().addZone(this);
 	}
diff --git a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/zone/type/DamageZone.java b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/zone/type/DamageZone.java
index 07cf55073f..6381f8cbb2 100644
--- a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/zone/type/DamageZone.java
+++ b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/zone/type/DamageZone.java
@@ -24,6 +24,7 @@ import com.l2jmobius.gameserver.model.actor.Creature;
 import com.l2jmobius.gameserver.model.actor.instance.PlayerInstance;
 import com.l2jmobius.gameserver.model.entity.Castle;
 import com.l2jmobius.gameserver.model.stats.Stats;
+import com.l2jmobius.gameserver.model.zone.AbstractZoneSettings;
 import com.l2jmobius.gameserver.model.zone.TaskZoneSettings;
 import com.l2jmobius.gameserver.model.zone.ZoneType;
 
@@ -59,7 +60,12 @@ public class DamageZone extends ZoneType
 		_castle = null;
 		
 		setTargetType(InstanceType.Playable); // default only playabale
-		setSettings(ZoneManager.getSettings(getName()) == null ? new TaskZoneSettings() : ZoneManager.getSettings(getName()));
+		AbstractZoneSettings settings = ZoneManager.getSettings(getName());
+		if (settings == null)
+		{
+			settings = new TaskZoneSettings();
+		}
+		setSettings(settings);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/zone/type/EffectZone.java b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/zone/type/EffectZone.java
index 9b14362dee..e7e74cb3b1 100644
--- a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/zone/type/EffectZone.java
+++ b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/zone/type/EffectZone.java
@@ -27,6 +27,7 @@ import com.l2jmobius.gameserver.enums.InstanceType;
 import com.l2jmobius.gameserver.instancemanager.ZoneManager;
 import com.l2jmobius.gameserver.model.actor.Creature;
 import com.l2jmobius.gameserver.model.skills.Skill;
+import com.l2jmobius.gameserver.model.zone.AbstractZoneSettings;
 import com.l2jmobius.gameserver.model.zone.TaskZoneSettings;
 import com.l2jmobius.gameserver.model.zone.ZoneId;
 import com.l2jmobius.gameserver.model.zone.ZoneType;
@@ -54,7 +55,12 @@ public class EffectZone extends ZoneType
 		setTargetType(InstanceType.Playable); // default only playable
 		_bypassConditions = false;
 		_isShowDangerIcon = true;
-		setSettings(ZoneManager.getSettings(getName()) == null ? new TaskZoneSettings() : ZoneManager.getSettings(getName()));
+		AbstractZoneSettings settings = ZoneManager.getSettings(getName());
+		if (settings == null)
+		{
+			settings = new TaskZoneSettings();
+		}
+		setSettings(settings);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/zone/type/OlympiadStadiumZone.java b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/zone/type/OlympiadStadiumZone.java
index 69342185ad..b0caa7b30e 100644
--- a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/zone/type/OlympiadStadiumZone.java
+++ b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/zone/type/OlympiadStadiumZone.java
@@ -51,7 +51,12 @@ public class OlympiadStadiumZone extends ZoneRespawn
 	public OlympiadStadiumZone(int id)
 	{
 		super(id);
-		setSettings(ZoneManager.getSettings(getName()) == null ? new Settings() : ZoneManager.getSettings(getName()));
+		AbstractZoneSettings settings = ZoneManager.getSettings(getName());
+		if (settings == null)
+		{
+			settings = new Settings();
+		}
+		setSettings(settings);
 	}
 	
 	public final class Settings extends AbstractZoneSettings
diff --git a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/zone/type/SiegeZone.java b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/zone/type/SiegeZone.java
index c3a64d6b5c..0c62b495af 100644
--- a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/zone/type/SiegeZone.java
+++ b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/zone/type/SiegeZone.java
@@ -49,7 +49,12 @@ public class SiegeZone extends ZoneType
 	public SiegeZone(int id)
 	{
 		super(id);
-		setSettings(ZoneManager.getSettings(getName()) == null ? new Settings() : ZoneManager.getSettings(getName()));
+		AbstractZoneSettings settings = ZoneManager.getSettings(getName());
+		if (settings == null)
+		{
+			settings = new Settings();
+		}
+		setSettings(settings);
 	}
 	
 	public final class Settings extends AbstractZoneSettings
diff --git a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/scripting/ScriptEngineManager.java b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/scripting/ScriptEngineManager.java
index 5ff81500fe..648c891242 100644
--- a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/scripting/ScriptEngineManager.java
+++ b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/scripting/ScriptEngineManager.java
@@ -28,8 +28,6 @@ import java.nio.file.attribute.BasicFileAttributes;
 import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.Iterator;
-import java.util.LinkedHashMap;
-import java.util.LinkedList;
 import java.util.List;
 import java.util.Map;
 import java.util.Map.Entry;
@@ -42,22 +40,21 @@ import java.util.logging.Logger;
 import org.w3c.dom.Document;
 
 import com.l2jmobius.Config;
-import com.l2jmobius.commons.util.IGameXmlReader;
+import com.l2jmobius.commons.util.IXmlReader;
 import com.l2jmobius.gameserver.scripting.java.JavaScriptingEngine;
 
 /**
  * Caches script engines and provides functionality for executing and managing scripts.
  * @author KenM, HorridoJoho
  */
-public final class ScriptEngineManager implements IGameXmlReader
+public final class ScriptEngineManager implements IXmlReader
 {
 	private static final Logger LOGGER = Logger.getLogger(ScriptEngineManager.class.getName());
 	public static final Path SCRIPT_FOLDER = Paths.get(Config.DATAPACK_ROOT.getAbsolutePath(), "data", "scripts");
 	public static final Path MASTER_HANDLER_FILE = Paths.get(SCRIPT_FOLDER.toString(), "handlers", "MasterHandler.java");
 	public static final Path EFFECT_MASTER_HANDLER_FILE = Paths.get(SCRIPT_FOLDER.toString(), "handlers", "EffectMasterHandler.java");
 	
-	private final Map<String, IExecutionContext> _extEngines = new HashMap<>();
-	private IExecutionContext _currentExecutionContext = null;
+	private IExecutionContext _javaExecutionContext = null;
 	static final List<String> _exclusions = new ArrayList<>();
 	
 	protected ScriptEngineManager()
@@ -163,12 +160,7 @@ public final class ScriptEngineManager implements IGameXmlReader
 	private void registerEngine(IScriptingEngine engine, Properties props)
 	{
 		maybeSetProperties("language." + engine.getLanguageName() + ".", props, engine);
-		final IExecutionContext context = engine.createExecutionContext();
-		for (String commonExtension : engine.getCommonFileExtensions())
-		{
-			_extEngines.put(commonExtension, context);
-		}
-		
+		_javaExecutionContext = engine.createExecutionContext();
 		LOGGER.info("ScriptEngine: " + engine.getEngineName() + " " + engine.getEngineVersion() + " (" + engine.getLanguageName() + " " + engine.getLanguageVersion() + ")");
 	}
 	
@@ -197,51 +189,6 @@ public final class ScriptEngineManager implements IGameXmlReader
 		}
 	}
 	
-	private IExecutionContext getEngineByExtension(String ext)
-	{
-		return _extEngines.get(ext);
-	}
-	
-	private String getFileExtension(Path p)
-	{
-		final String name = p.getFileName().toString();
-		final int lastDotIdx = name.lastIndexOf('.');
-		if (lastDotIdx == -1)
-		{
-			return null;
-		}
-		
-		final String extension = name.substring(lastDotIdx + 1);
-		if (extension.isEmpty())
-		{
-			return null;
-		}
-		
-		return extension;
-	}
-	
-	private void checkExistingFile(String messagePre, Path filePath) throws Exception
-	{
-		if (!Files.exists(filePath))
-		{
-			throw new Exception(messagePre + ": " + filePath + " does not exists!");
-		}
-		else if (!Files.isRegularFile(filePath))
-		{
-			throw new Exception(messagePre + ": " + filePath + " is not a file!");
-		}
-	}
-	
-	public void executeMasterHandler() throws Exception
-	{
-		executeScript(MASTER_HANDLER_FILE);
-	}
-	
-	public void executeEffectMasterHandler() throws Exception
-	{
-		executeScript(EFFECT_MASTER_HANDLER_FILE);
-	}
-	
 	public void executeScriptList() throws Exception
 	{
 		if (Config.ALT_DEV_NO_QUESTS)
@@ -249,77 +196,35 @@ public final class ScriptEngineManager implements IGameXmlReader
 			return;
 		}
 		
-		final Map<IExecutionContext, List<Path>> files = new LinkedHashMap<>();
+		final List<Path> files = new ArrayList<>();
 		processDirectory(SCRIPT_FOLDER.toFile(), files);
 		
-		for (Entry<IExecutionContext, List<Path>> entry : files.entrySet())
-		{
-			_currentExecutionContext = entry.getKey();
-			try
-			{
-				final Map<Path, Throwable> invokationErrors = entry.getKey().executeScripts(entry.getValue());
-				for (Entry<Path, Throwable> entry2 : invokationErrors.entrySet())
+		final Map<Path, Throwable> invokationErrors = _javaExecutionContext.executeScripts(files);
+		for (Entry<Path, Throwable> entry : invokationErrors.entrySet())
 				{
-					LOGGER.log(Level.WARNING, "ScriptEngine: " + entry2.getKey() + " failed execution!", entry2.getValue());
-				}
-			}
-			finally
-			{
-				_currentExecutionContext = null;
-			}
+			LOGGER.log(Level.WARNING, "ScriptEngine: " + entry.getKey() + " failed execution!", entry.getValue());
 		}
 	}
 	
-	private void processDirectory(File dir, Map<IExecutionContext, List<Path>> files)
+	private void processDirectory(File dir, List<Path> files)
 	{
 		for (File file : dir.listFiles())
 		{
-			if (file.isDirectory())
+			if (file.isFile())
+			{
+				final String fileName = file.getName();
+				if (fileName.endsWith(".java") && !_exclusions.contains(fileName))
+				{
+					files.add(file.toPath().toAbsolutePath());
+				}
+			}
+			else if (file.isDirectory())
 			{
 				processDirectory(file, files);
 			}
-			else
-			{
-				processFile(file, files);
-			}
 		}
 	}
 	
-	private void processFile(File file, Map<IExecutionContext, List<Path>> files)
-	{
-		if (_exclusions.contains(file.getName()))
-		{
-			return;
-		}
-		
-		Path sourceFile = file.toPath();
-		try
-		{
-			checkExistingFile("ScriptFile", sourceFile);
-		}
-		catch (Exception e)
-		{
-			LOGGER.warning(e.getMessage());
-			return;
-		}
-		
-		sourceFile = sourceFile.toAbsolutePath();
-		final String ext = getFileExtension(sourceFile);
-		if (ext == null)
-		{
-			LOGGER.warning("ScriptFile: " + sourceFile + " does not have an extension to determine the script engine!");
-			return;
-		}
-		
-		final IExecutionContext engine = getEngineByExtension(ext);
-		if (engine == null)
-		{
-			return;
-		}
-		
-		files.computeIfAbsent(engine, k -> new LinkedList<>()).add(sourceFile);
-	}
-	
 	public void executeScript(Path sourceFile) throws Exception
 	{
 		Objects.requireNonNull(sourceFile);
@@ -329,34 +234,19 @@ public final class ScriptEngineManager implements IGameXmlReader
 			sourceFile = SCRIPT_FOLDER.resolve(sourceFile);
 		}
 		
-		// throws exception if not exists or not file
-		checkExistingFile("ScriptFile", sourceFile);
-		
 		sourceFile = sourceFile.toAbsolutePath();
-		final String ext = getFileExtension(sourceFile);
 		Objects.requireNonNull(sourceFile, "ScriptFile: " + sourceFile + " does not have an extension to determine the script engine!");
 		
-		final IExecutionContext engine = getEngineByExtension(ext);
-		Objects.requireNonNull(engine, "ScriptEngine: No engine registered for extension " + ext + "!");
-		
-		_currentExecutionContext = engine;
-		try
+		final Entry<Path, Throwable> error = _javaExecutionContext.executeScript(sourceFile);
+		if (error != null)
 		{
-			final Entry<Path, Throwable> error = engine.executeScript(sourceFile);
-			if (error != null)
-			{
-				throw new Exception("ScriptEngine: " + error.getKey() + " failed execution!", error.getValue());
-			}
-		}
-		finally
-		{
-			_currentExecutionContext = null;
+			throw new Exception("ScriptEngine: " + error.getKey() + " failed execution!", error.getValue());
 		}
 	}
 	
 	public Path getCurrentLoadingScript()
 	{
-		return _currentExecutionContext != null ? _currentExecutionContext.getCurrentExecutingScript() : null;
+		return _javaExecutionContext.getCurrentExecutingScript();
 	}
 	
 	public static ScriptEngineManager getInstance()
diff --git a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/loginserver/GameServerTable.java b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/loginserver/GameServerTable.java
index b806090d02..b1ef12d5fa 100644
--- a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/loginserver/GameServerTable.java
+++ b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/loginserver/GameServerTable.java
@@ -36,8 +36,8 @@ import org.w3c.dom.Document;
 import org.w3c.dom.NodeList;
 
 import com.l2jmobius.commons.database.DatabaseFactory;
-import com.l2jmobius.commons.util.IGameXmlReader;
 import com.l2jmobius.commons.util.IPSubnet;
+import com.l2jmobius.commons.util.IXmlReader;
 import com.l2jmobius.commons.util.Rnd;
 import com.l2jmobius.loginserver.network.gameserverpackets.ServerStatus;
 
@@ -45,7 +45,7 @@ import com.l2jmobius.loginserver.network.gameserverpackets.ServerStatus;
  * The Class GameServerTable loads the game server names and initialize the game server tables.
  * @author KenM, Zoey76
  */
-public final class GameServerTable implements IGameXmlReader
+public final class GameServerTable implements IXmlReader
 {
 	private static final Logger LOGGER = Logger.getLogger(GameServerTable.class.getName());
 	
diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/config/Scripts.xml b/L2J_Mobius_Classic_2.0_Saviors/dist/game/config/Scripts.xml
index 284aa0a31f..54d05b241f 100644
--- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/config/Scripts.xml
+++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/config/Scripts.xml
@@ -2,11 +2,7 @@
 <list xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../data/xsd/Scripts.xsd">
 	<!-- Skip these filenames from script loading, because they are already loaded using a different way. -->
 	<exclude file="package-info.java" />
-	<exclude file="MasterHandler.java" />
-	<exclude file="EffectMasterHandler.java" />
-	<exclude file="SkillConditionMasterHandler.java" />
-	<exclude file="ConditionMasterHandler.java" />
-	<exclude file="DailyMissionMasterHandler.java" />
+	<exclude file="handlers" />
 	
 	<!--
 	With this file you can exclude/include specific folders/files from within the scripts directory.
diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/ai/others/ClassMaster/ClassMaster.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/ai/others/ClassMaster/ClassMaster.java
index b4aa56887e..64b38902b0 100644
--- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/ai/others/ClassMaster/ClassMaster.java
+++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/ai/others/ClassMaster/ClassMaster.java
@@ -30,7 +30,7 @@ import org.w3c.dom.NamedNodeMap;
 import org.w3c.dom.Node;
 
 import com.l2jmobius.Config;
-import com.l2jmobius.commons.util.IGameXmlReader;
+import com.l2jmobius.commons.util.IXmlReader;
 import com.l2jmobius.gameserver.data.xml.impl.CategoryData;
 import com.l2jmobius.gameserver.data.xml.impl.ClassListData;
 import com.l2jmobius.gameserver.data.xml.impl.SkillData;
@@ -63,7 +63,7 @@ import ai.AbstractNpcAI;
  * Class Master AI.
  * @author Nik
  */
-public final class ClassMaster extends AbstractNpcAI implements IGameXmlReader
+public final class ClassMaster extends AbstractNpcAI implements IXmlReader
 {
 	// NPCs
 	private static final List<Integer> CLASS_MASTERS = new ArrayList<>();
diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/admincommandhandlers/AdminQuest.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/admincommandhandlers/AdminQuest.java
index 228cc1668d..a771c4ab90 100644
--- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/admincommandhandlers/AdminQuest.java
+++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/admincommandhandlers/AdminQuest.java
@@ -320,7 +320,7 @@ public class AdminQuest implements IAdminCommandHandler
 				{
 					sb.append("<a action=\"bypass -h admin_script_dir " + c + "\">" + c + "</a><br1>");
 				}
-				else if (c.endsWith(".java") || c.endsWith(".py"))
+				else if (c.endsWith(".java"))
 				{
 					sb.append("<a action=\"bypass -h admin_script_load " + c + "\"><font color=\"LEVEL\">" + c + "</font></a><br1>");
 				}
@@ -352,7 +352,7 @@ public class AdminQuest implements IAdminCommandHandler
 				{
 					sb.append("<a action=\"bypass -h admin_script_dir " + currentPath + "/" + c + "\">" + (questReducedNames ? getQuestName(c) : c) + "</a><br1>");
 				}
-				else if (c.endsWith(".java") || c.endsWith(".py"))
+				else if (c.endsWith(".java"))
 				{
 					sb.append("<a action=\"bypass -h admin_script_load " + currentPath + "/" + c + "\"><font color=\"LEVEL\">" + c + "</font></a><br1>");
 				}
diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/admincommandhandlers/AdminReload.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/admincommandhandlers/AdminReload.java
index 466ed146cd..b89bd7cbcd 100644
--- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/admincommandhandlers/AdminReload.java
+++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/admincommandhandlers/AdminReload.java
@@ -221,7 +221,7 @@ public class AdminReload implements IAdminCommandHandler
 				{
 					try
 					{
-						ScriptEngineManager.getInstance().executeEffectMasterHandler();
+						ScriptEngineManager.getInstance().executeScript(ScriptEngineManager.EFFECT_MASTER_HANDLER_FILE);
 						AdminData.getInstance().broadcastMessageToGMs(activeChar.getName() + ": Reloaded effect master handler.");
 					}
 					catch (Exception e)
@@ -235,7 +235,7 @@ public class AdminReload implements IAdminCommandHandler
 				{
 					try
 					{
-						ScriptEngineManager.getInstance().executeMasterHandler();
+						ScriptEngineManager.getInstance().executeScript(ScriptEngineManager.MASTER_HANDLER_FILE);
 						AdminData.getInstance().broadcastMessageToGMs(activeChar.getName() + ": Reloaded master handler.");
 					}
 					catch (Exception e)
diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/telnethandlers/server/Reload.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/telnethandlers/server/Reload.java
index d679ea1212..491b10cc62 100644
--- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/telnethandlers/server/Reload.java
+++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/telnethandlers/server/Reload.java
@@ -181,7 +181,7 @@ public class Reload implements ITelnetCommand
 			{
 				try
 				{
-					ScriptEngineManager.getInstance().executeEffectMasterHandler();
+					ScriptEngineManager.getInstance().executeScript(ScriptEngineManager.EFFECT_MASTER_HANDLER_FILE);
 					return AdminData.getInstance().broadcastMessageToGMs("Telnet Admin: Reloaded effect master handler.");
 				}
 				catch (Exception e)
@@ -194,7 +194,7 @@ public class Reload implements ITelnetCommand
 			{
 				try
 				{
-					ScriptEngineManager.getInstance().executeMasterHandler();
+					ScriptEngineManager.getInstance().executeScript(ScriptEngineManager.MASTER_HANDLER_FILE);
 					return AdminData.getInstance().broadcastMessageToGMs("Telnet Admin: Reloaded master handler.");
 				}
 				catch (Exception e)
diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/Config.java b/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/Config.java
index aca6856fb5..9aa164a69d 100644
--- a/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/Config.java
+++ b/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/Config.java
@@ -54,7 +54,7 @@ import org.w3c.dom.Document;
 import org.w3c.dom.NamedNodeMap;
 import org.w3c.dom.Node;
 
-import com.l2jmobius.commons.util.IGameXmlReader;
+import com.l2jmobius.commons.util.IXmlReader;
 import com.l2jmobius.commons.util.PropertiesParser;
 import com.l2jmobius.commons.util.StringUtil;
 import com.l2jmobius.gameserver.enums.ChatType;
@@ -2992,7 +2992,7 @@ public final class Config
 		return result;
 	}
 	
-	private static class IPConfigData implements IGameXmlReader
+	private static class IPConfigData implements IXmlReader
 	{
 		private static final List<String> _subnets = new ArrayList<>(5);
 		private static final List<String> _hosts = new ArrayList<>(5);
diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/commons/util/IGameXmlReader.java b/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/commons/util/IGameXmlReader.java
deleted file mode 100644
index b29089db77..0000000000
--- a/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/commons/util/IGameXmlReader.java
+++ /dev/null
@@ -1,118 +0,0 @@
-/*
- * This file is part of the L2J Mobius project.
- * 
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- * 
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * General Public License for more details.
- * 
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- */
-package com.l2jmobius.commons.util;
-
-import java.io.File;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
-import org.w3c.dom.NamedNodeMap;
-import org.w3c.dom.Node;
-
-import com.l2jmobius.Config;
-import com.l2jmobius.gameserver.model.Location;
-import com.l2jmobius.gameserver.model.holders.MinionHolder;
-import com.l2jmobius.gameserver.model.holders.SkillHolder;
-
-/**
- * Interface for XML parsers.
- * @author Zoey76
- */
-public interface IGameXmlReader extends IXmlReader
-{
-	/**
-	 * Wrapper for {@link #parseFile(File)} method.
-	 * @param path the relative path to the datapack root of the XML file to parse.
-	 */
-	default void parseDatapackFile(String path)
-	{
-		parseFile(new File(Config.DATAPACK_ROOT, path));
-	}
-	
-	/**
-	 * Wrapper for {@link #parseDirectory(File, boolean)}.
-	 * @param path the path to the directory where the XML files are
-	 * @param recursive parses all sub folders if there is
-	 * @return {@code false} if it fails to find the directory, {@code true} otherwise
-	 */
-	default boolean parseDatapackDirectory(String path, boolean recursive)
-	{
-		return parseDirectory(new File(Config.DATAPACK_ROOT, path), recursive);
-	}
-	
-	/**
-	 * @param n
-	 * @return a map of parameters
-	 */
-	default Map<String, Object> parseParameters(Node n)
-	{
-		final Map<String, Object> parameters = new HashMap<>();
-		for (Node parameters_node = n.getFirstChild(); parameters_node != null; parameters_node = parameters_node.getNextSibling())
-		{
-			NamedNodeMap attrs = parameters_node.getAttributes();
-			switch (parameters_node.getNodeName().toLowerCase())
-			{
-				case "param":
-				{
-					parameters.put(parseString(attrs, "name"), parseString(attrs, "value"));
-					break;
-				}
-				case "skill":
-				{
-					parameters.put(parseString(attrs, "name"), new SkillHolder(parseInteger(attrs, "id"), parseInteger(attrs, "level")));
-					break;
-				}
-				case "location":
-				{
-					parameters.put(parseString(attrs, "name"), new Location(parseInteger(attrs, "x"), parseInteger(attrs, "y"), parseInteger(attrs, "z"), parseInteger(attrs, "heading", 0)));
-					break;
-				}
-				case "minions":
-				{
-					final List<MinionHolder> minions = new ArrayList<>(1);
-					for (Node minions_node = parameters_node.getFirstChild(); minions_node != null; minions_node = minions_node.getNextSibling())
-					{
-						if (minions_node.getNodeName().equalsIgnoreCase("npc"))
-						{
-							attrs = minions_node.getAttributes();
-							minions.add(new MinionHolder(parseInteger(attrs, "id"), parseInteger(attrs, "count"), parseInteger(attrs, "respawnTime"), parseInteger(attrs, "weightPoint")));
-						}
-					}
-					
-					if (!minions.isEmpty())
-					{
-						parameters.put(parseString(parameters_node.getAttributes(), "name"), minions);
-					}
-					break;
-				}
-			}
-		}
-		return parameters;
-	}
-	
-	default Location parseLocation(Node n)
-	{
-		final NamedNodeMap attrs = n.getAttributes();
-		final int x = parseInteger(attrs, "x");
-		final int y = parseInteger(attrs, "y");
-		final int z = parseInteger(attrs, "z");
-		final int heading = parseInteger(attrs, "heading", 0);
-		return new Location(x, y, z, heading);
-	}
-}
diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/commons/util/IXmlReader.java b/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/commons/util/IXmlReader.java
index 0317816fd8..4bfed2396e 100644
--- a/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/commons/util/IXmlReader.java
+++ b/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/commons/util/IXmlReader.java
@@ -18,8 +18,13 @@ package com.l2jmobius.commons.util;
 
 import java.io.File;
 import java.io.FileFilter;
+import java.util.ArrayList;
+import java.util.HashMap;
 import java.util.LinkedHashMap;
+import java.util.List;
 import java.util.Map;
+import java.util.concurrent.CopyOnWriteArrayList;
+import java.util.concurrent.ScheduledFuture;
 import java.util.function.Consumer;
 import java.util.function.Predicate;
 import java.util.logging.Level;
@@ -35,7 +40,12 @@ import org.w3c.dom.NodeList;
 import org.xml.sax.ErrorHandler;
 import org.xml.sax.SAXParseException;
 
+import com.l2jmobius.Config;
+import com.l2jmobius.commons.concurrent.ThreadPool;
 import com.l2jmobius.commons.util.file.filter.XMLFilter;
+import com.l2jmobius.gameserver.model.Location;
+import com.l2jmobius.gameserver.model.holders.MinionHolder;
+import com.l2jmobius.gameserver.model.holders.SkillHolder;
 
 /**
  * Interface for XML parsers.
@@ -56,6 +66,15 @@ public interface IXmlReader
 	 */
 	void load();
 	
+	/**
+	 * Wrapper for {@link #parseFile(File)} method.
+	 * @param path the relative path to the datapack root of the XML file to parse.
+	 */
+	default void parseDatapackFile(String path)
+	{
+		parseFile(new File(Config.DATAPACK_ROOT, path));
+	}
+	
 	/**
 	 * Parses a single XML file.<br>
 	 * If the file was successfully parsed, call {@link #parseDocument(Document, File)} for the parsed document.<br>
@@ -121,6 +140,17 @@ public interface IXmlReader
 		return parseDirectory(file, false);
 	}
 	
+	/**
+	 * Wrapper for {@link #parseDirectory(File, boolean)}.
+	 * @param path the path to the directory where the XML files are
+	 * @param recursive parses all sub folders if there is
+	 * @return {@code false} if it fails to find the directory, {@code true} otherwise
+	 */
+	default boolean parseDatapackDirectory(String path, boolean recursive)
+	{
+		return parseDirectory(new File(Config.DATAPACK_ROOT, path), recursive);
+	}
+	
 	/**
 	 * Loads all XML files from {@code path} and calls {@link #parseFile(File)} for each one of them.
 	 * @param dir the directory object to scan.
@@ -135,6 +165,7 @@ public interface IXmlReader
 			return false;
 		}
 		
+		final List<ScheduledFuture<?>> jobs = new CopyOnWriteArrayList<>();
 		final File[] listOfFiles = dir.listFiles();
 		for (File f : listOfFiles)
 		{
@@ -144,9 +175,23 @@ public interface IXmlReader
 			}
 			else if (getCurrentFileFilter().accept(f))
 			{
-				parseFile(f);
+				jobs.add(ThreadPool.schedule(() ->
+				{
+					parseFile(f);
+				}, 0));
 			}
 		}
+		while (!jobs.isEmpty())
+		{
+			for (ScheduledFuture<?> job : jobs)
+			{
+				if ((job == null) || job.isDone() || job.isCancelled())
+				{
+					jobs.remove(job);
+				}
+			}
+		}
+		
 		return true;
 	}
 	
@@ -531,6 +576,16 @@ public interface IXmlReader
 		return parseString(attrs.getNamedItem(name), defaultValue);
 	}
 	
+	default Location parseLocation(Node n)
+	{
+		final NamedNodeMap attrs = n.getAttributes();
+		final int x = parseInteger(attrs, "x");
+		final int y = parseInteger(attrs, "y");
+		final int z = parseInteger(attrs, "z");
+		final int heading = parseInteger(attrs, "heading", 0);
+		return new Location(x, y, z, heading);
+	}
+	
 	/**
 	 * Parses an enumerated value.
 	 * @param <T> the enumerated type
@@ -612,6 +667,56 @@ public interface IXmlReader
 		return map;
 	}
 	
+	/**
+	 * @param n
+	 * @return a map of parameters
+	 */
+	default Map<String, Object> parseParameters(Node n)
+	{
+		final Map<String, Object> parameters = new HashMap<>();
+		for (Node parameters_node = n.getFirstChild(); parameters_node != null; parameters_node = parameters_node.getNextSibling())
+		{
+			NamedNodeMap attrs = parameters_node.getAttributes();
+			switch (parameters_node.getNodeName().toLowerCase())
+			{
+				case "param":
+				{
+					parameters.put(parseString(attrs, "name"), parseString(attrs, "value"));
+					break;
+				}
+				case "skill":
+				{
+					parameters.put(parseString(attrs, "name"), new SkillHolder(parseInteger(attrs, "id"), parseInteger(attrs, "level")));
+					break;
+				}
+				case "location":
+				{
+					parameters.put(parseString(attrs, "name"), new Location(parseInteger(attrs, "x"), parseInteger(attrs, "y"), parseInteger(attrs, "z"), parseInteger(attrs, "heading", 0)));
+					break;
+				}
+				case "minions":
+				{
+					final List<MinionHolder> minions = new ArrayList<>(1);
+					for (Node minions_node = parameters_node.getFirstChild(); minions_node != null; minions_node = minions_node.getNextSibling())
+					{
+						if (minions_node.getNodeName().equalsIgnoreCase("npc"))
+						{
+							attrs = minions_node.getAttributes();
+							minions.add(new MinionHolder(parseInteger(attrs, "id"), parseInteger(attrs, "count"), parseInteger(attrs, "respawnTime"), parseInteger(attrs, "weightPoint")));
+						}
+					}
+					
+					if (!minions.isEmpty())
+					{
+						parameters.put(parseString(parameters_node.getAttributes(), "name"), minions);
+					}
+					break;
+				}
+			}
+		}
+		return parameters;
+	}
+	
 	/**
 	 * Executes action for each child of node
 	 * @param node
diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/GameServer.java b/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/GameServer.java
index 0276cda81d..10c150f549 100644
--- a/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/GameServer.java
+++ b/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/GameServer.java
@@ -358,7 +358,7 @@ public class GameServer
 		try
 		{
 			LOGGER.info(getClass().getSimpleName() + ": Loading server scripts:");
-			ScriptEngineManager.getInstance().executeMasterHandler();
+			ScriptEngineManager.getInstance().executeScript(ScriptEngineManager.MASTER_HANDLER_FILE);
 			ScriptEngineManager.getInstance().executeScriptList();
 		}
 		catch (Exception e)
diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/data/xml/impl/ActionData.java b/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/data/xml/impl/ActionData.java
index 0bffdc5bb1..a322dad1d9 100644
--- a/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/data/xml/impl/ActionData.java
+++ b/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/data/xml/impl/ActionData.java
@@ -23,14 +23,14 @@ import java.util.logging.Logger;
 
 import org.w3c.dom.Document;
 
-import com.l2jmobius.commons.util.IGameXmlReader;
+import com.l2jmobius.commons.util.IXmlReader;
 import com.l2jmobius.gameserver.model.ActionDataHolder;
 import com.l2jmobius.gameserver.model.StatsSet;
 
 /**
  * @author UnAfraid
  */
-public class ActionData implements IGameXmlReader
+public class ActionData implements IXmlReader
 {
 	private static final Logger LOGGER = Logger.getLogger(ActionData.class.getName());
 	
diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/data/xml/impl/AdminData.java b/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/data/xml/impl/AdminData.java
index 0b1d3e3245..9e359b1521 100644
--- a/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/data/xml/impl/AdminData.java
+++ b/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/data/xml/impl/AdminData.java
@@ -29,7 +29,7 @@ import org.w3c.dom.Document;
 import org.w3c.dom.NamedNodeMap;
 import org.w3c.dom.Node;
 
-import com.l2jmobius.commons.util.IGameXmlReader;
+import com.l2jmobius.commons.util.IXmlReader;
 import com.l2jmobius.gameserver.model.AccessLevel;
 import com.l2jmobius.gameserver.model.AdminCommandAccessRight;
 import com.l2jmobius.gameserver.model.StatsSet;
@@ -42,7 +42,7 @@ import com.l2jmobius.gameserver.network.serverpackets.SystemMessage;
  * Loads administrator access levels and commands.
  * @author UnAfraid
  */
-public final class AdminData implements IGameXmlReader
+public final class AdminData implements IXmlReader
 {
 	private static final Logger LOGGER = Logger.getLogger(AdminData.class.getName());
 	
diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/data/xml/impl/AppearanceItemData.java b/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/data/xml/impl/AppearanceItemData.java
index f7746d073d..468f35ffce 100644
--- a/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/data/xml/impl/AppearanceItemData.java
+++ b/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/data/xml/impl/AppearanceItemData.java
@@ -24,7 +24,7 @@ import java.util.logging.Logger;
 import org.w3c.dom.Document;
 import org.w3c.dom.Node;
 
-import com.l2jmobius.commons.util.IGameXmlReader;
+import com.l2jmobius.commons.util.IXmlReader;
 import com.l2jmobius.gameserver.datatables.ItemTable;
 import com.l2jmobius.gameserver.enums.Race;
 import com.l2jmobius.gameserver.model.StatsSet;
@@ -36,7 +36,7 @@ import com.l2jmobius.gameserver.model.items.type.CrystalType;
 /**
  * @author UnAfraid
  */
-public class AppearanceItemData implements IGameXmlReader
+public class AppearanceItemData implements IXmlReader
 {
 	private static final Logger LOGGER = Logger.getLogger(AppearanceItemData.class.getName());
 	
diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/data/xml/impl/ArmorSetsData.java b/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/data/xml/impl/ArmorSetsData.java
index 0f1445c10a..d7582d8d5a 100644
--- a/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/data/xml/impl/ArmorSetsData.java
+++ b/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/data/xml/impl/ArmorSetsData.java
@@ -19,9 +19,9 @@ package com.l2jmobius.gameserver.data.xml.impl;
 import java.io.File;
 import java.util.ArrayList;
 import java.util.Collections;
-import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
+import java.util.concurrent.ConcurrentHashMap;
 import java.util.logging.Logger;
 import java.util.stream.Stream;
 
@@ -29,7 +29,7 @@ import org.w3c.dom.Document;
 import org.w3c.dom.NamedNodeMap;
 import org.w3c.dom.Node;
 
-import com.l2jmobius.commons.util.IGameXmlReader;
+import com.l2jmobius.commons.util.IXmlReader;
 import com.l2jmobius.gameserver.datatables.ItemTable;
 import com.l2jmobius.gameserver.model.ArmorSet;
 import com.l2jmobius.gameserver.model.holders.ArmorsetSkillHolder;
@@ -40,12 +40,12 @@ import com.l2jmobius.gameserver.model.stats.BaseStats;
  * Loads armor set bonuses.
  * @author godson, Luno, UnAfraid
  */
-public final class ArmorSetsData implements IGameXmlReader
+public final class ArmorSetsData implements IXmlReader
 {
 	private static final Logger LOGGER = Logger.getLogger(ArmorSetsData.class.getName());
 	
-	private final Map<Integer, ArmorSet> _armorSets = new HashMap<>();
-	private final Map<Integer, List<ArmorSet>> _armorSetItems = new HashMap<>();
+	private final Map<Integer, ArmorSet> _armorSets = new ConcurrentHashMap<>();
+	private final Map<Integer, List<ArmorSet>> _armorSetItems = new ConcurrentHashMap<>();
 	
 	protected ArmorSetsData()
 	{
diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/data/xml/impl/AttendanceRewardData.java b/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/data/xml/impl/AttendanceRewardData.java
index c60afbd78a..24e402e706 100644
--- a/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/data/xml/impl/AttendanceRewardData.java
+++ b/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/data/xml/impl/AttendanceRewardData.java
@@ -24,7 +24,7 @@ import java.util.logging.Logger;
 import org.w3c.dom.Document;
 
 import com.l2jmobius.Config;
-import com.l2jmobius.commons.util.IGameXmlReader;
+import com.l2jmobius.commons.util.IXmlReader;
 import com.l2jmobius.gameserver.datatables.ItemTable;
 import com.l2jmobius.gameserver.model.StatsSet;
 import com.l2jmobius.gameserver.model.holders.ItemHolder;
@@ -32,7 +32,7 @@ import com.l2jmobius.gameserver.model.holders.ItemHolder;
 /**
  * @author Mobius
  */
-public class AttendanceRewardData implements IGameXmlReader
+public class AttendanceRewardData implements IXmlReader
 {
 	private static Logger LOGGER = Logger.getLogger(AttendanceRewardData.class.getName());
 	private final List<ItemHolder> _rewards = new ArrayList<>();
diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/data/xml/impl/BeautyShopData.java b/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/data/xml/impl/BeautyShopData.java
index 133f11d978..d88ccc7747 100644
--- a/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/data/xml/impl/BeautyShopData.java
+++ b/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/data/xml/impl/BeautyShopData.java
@@ -24,7 +24,7 @@ import org.w3c.dom.Document;
 import org.w3c.dom.NamedNodeMap;
 import org.w3c.dom.Node;
 
-import com.l2jmobius.commons.util.IGameXmlReader;
+import com.l2jmobius.commons.util.IXmlReader;
 import com.l2jmobius.gameserver.enums.Race;
 import com.l2jmobius.gameserver.enums.Sex;
 import com.l2jmobius.gameserver.model.StatsSet;
@@ -34,7 +34,7 @@ import com.l2jmobius.gameserver.model.beautyshop.BeautyItem;
 /**
  * @author Sdw
  */
-public final class BeautyShopData implements IGameXmlReader
+public final class BeautyShopData implements IXmlReader
 {
 	private final Map<Race, Map<Sex, BeautyData>> _beautyList = new HashMap<>();
 	private final Map<Sex, BeautyData> _beautyData = new HashMap<>();
diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/data/xml/impl/BuyListData.java b/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/data/xml/impl/BuyListData.java
index de298ef358..8ab9ea8097 100644
--- a/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/data/xml/impl/BuyListData.java
+++ b/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/data/xml/impl/BuyListData.java
@@ -21,8 +21,8 @@ import java.io.FileFilter;
 import java.sql.Connection;
 import java.sql.ResultSet;
 import java.sql.Statement;
-import java.util.HashMap;
 import java.util.Map;
+import java.util.concurrent.ConcurrentHashMap;
 import java.util.logging.Level;
 import java.util.logging.Logger;
 
@@ -31,7 +31,7 @@ import org.w3c.dom.NamedNodeMap;
 
 import com.l2jmobius.Config;
 import com.l2jmobius.commons.database.DatabaseFactory;
-import com.l2jmobius.commons.util.IGameXmlReader;
+import com.l2jmobius.commons.util.IXmlReader;
 import com.l2jmobius.commons.util.file.filter.NumericNameFilter;
 import com.l2jmobius.gameserver.datatables.ItemTable;
 import com.l2jmobius.gameserver.model.buylist.Product;
@@ -42,11 +42,11 @@ import com.l2jmobius.gameserver.model.items.Item;
  * Loads buy lists for NPCs.
  * @author NosBit
  */
-public final class BuyListData implements IGameXmlReader
+public final class BuyListData implements IXmlReader
 {
 	private static final Logger LOGGER = Logger.getLogger(BuyListData.class.getName());
 	
-	private final Map<Integer, ProductList> _buyLists = new HashMap<>();
+	private final Map<Integer, ProductList> _buyLists = new ConcurrentHashMap<>();
 	private static final FileFilter NUMERIC_FILTER = new NumericNameFilter();
 	
 	protected BuyListData()
diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/data/xml/impl/CastleData.java b/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/data/xml/impl/CastleData.java
index 6618dcdf1d..792afbfa0b 100644
--- a/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/data/xml/impl/CastleData.java
+++ b/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/data/xml/impl/CastleData.java
@@ -19,16 +19,16 @@ package com.l2jmobius.gameserver.data.xml.impl;
 import java.io.File;
 import java.util.ArrayList;
 import java.util.Collections;
-import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
+import java.util.concurrent.ConcurrentHashMap;
 import java.util.stream.Collectors;
 
 import org.w3c.dom.Document;
 import org.w3c.dom.NamedNodeMap;
 import org.w3c.dom.Node;
 
-import com.l2jmobius.commons.util.IGameXmlReader;
+import com.l2jmobius.commons.util.IXmlReader;
 import com.l2jmobius.gameserver.enums.CastleSide;
 import com.l2jmobius.gameserver.enums.SiegeGuardType;
 import com.l2jmobius.gameserver.model.holders.CastleSpawnHolder;
@@ -37,10 +37,10 @@ import com.l2jmobius.gameserver.model.holders.SiegeGuardHolder;
 /**
  * @author St3eT
  */
-public final class CastleData implements IGameXmlReader
+public final class CastleData implements IXmlReader
 {
-	private final Map<Integer, List<CastleSpawnHolder>> _spawns = new HashMap<>();
-	private static final Map<Integer, List<SiegeGuardHolder>> _siegeGuards = new HashMap<>();
+	private final Map<Integer, List<CastleSpawnHolder>> _spawns = new ConcurrentHashMap<>();
+	private static final Map<Integer, List<SiegeGuardHolder>> _siegeGuards = new ConcurrentHashMap<>();
 	
 	protected CastleData()
 	{
diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/data/xml/impl/CategoryData.java b/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/data/xml/impl/CategoryData.java
index f851aa6703..df7d390dfb 100644
--- a/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/data/xml/impl/CategoryData.java
+++ b/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/data/xml/impl/CategoryData.java
@@ -27,14 +27,14 @@ import org.w3c.dom.Document;
 import org.w3c.dom.NamedNodeMap;
 import org.w3c.dom.Node;
 
-import com.l2jmobius.commons.util.IGameXmlReader;
+import com.l2jmobius.commons.util.IXmlReader;
 import com.l2jmobius.gameserver.enums.CategoryType;
 
 /**
  * Loads the category data with Class or NPC IDs.
  * @author NosBit, xban1x
  */
-public final class CategoryData implements IGameXmlReader
+public final class CategoryData implements IXmlReader
 {
 	private static final Logger LOGGER = Logger.getLogger(CategoryData.class.getName());
 	
diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/data/xml/impl/ClanHallData.java b/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/data/xml/impl/ClanHallData.java
index 511cc7f4f7..90a1a51029 100644
--- a/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/data/xml/impl/ClanHallData.java
+++ b/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/data/xml/impl/ClanHallData.java
@@ -20,9 +20,9 @@ import java.io.File;
 import java.util.ArrayList;
 import java.util.Collection;
 import java.util.Comparator;
-import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
+import java.util.concurrent.ConcurrentHashMap;
 import java.util.logging.Logger;
 import java.util.stream.Collectors;
 
@@ -30,7 +30,7 @@ import org.w3c.dom.Document;
 import org.w3c.dom.NamedNodeMap;
 import org.w3c.dom.Node;
 
-import com.l2jmobius.commons.util.IGameXmlReader;
+import com.l2jmobius.commons.util.IXmlReader;
 import com.l2jmobius.gameserver.enums.ClanHallGrade;
 import com.l2jmobius.gameserver.enums.ClanHallType;
 import com.l2jmobius.gameserver.model.Location;
@@ -43,10 +43,10 @@ import com.l2jmobius.gameserver.model.holders.ClanHallTeleportHolder;
 /**
  * @author St3eT
  */
-public final class ClanHallData implements IGameXmlReader
+public final class ClanHallData implements IXmlReader
 {
 	private static final Logger LOGGER = Logger.getLogger(ClanHallData.class.getName());
-	private static final Map<Integer, ClanHall> _clanHalls = new HashMap<>();
+	private static final Map<Integer, ClanHall> _clanHalls = new ConcurrentHashMap<>();
 	
 	protected ClanHallData()
 	{
diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/data/xml/impl/ClanRewardData.java b/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/data/xml/impl/ClanRewardData.java
index 252bba1c64..d5938ee964 100644
--- a/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/data/xml/impl/ClanRewardData.java
+++ b/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/data/xml/impl/ClanRewardData.java
@@ -28,7 +28,6 @@ import org.w3c.dom.Document;
 import org.w3c.dom.NamedNodeMap;
 import org.w3c.dom.Node;
 
-import com.l2jmobius.commons.util.IGameXmlReader;
 import com.l2jmobius.commons.util.IXmlReader;
 import com.l2jmobius.gameserver.enums.ClanRewardType;
 import com.l2jmobius.gameserver.model.clan.ClanRewardBonus;
@@ -38,7 +37,7 @@ import com.l2jmobius.gameserver.model.holders.SkillHolder;
 /**
  * @author UnAfraid
  */
-public class ClanRewardData implements IGameXmlReader
+public class ClanRewardData implements IXmlReader
 {
 	private static final Logger LOGGER = Logger.getLogger(ClanRewardData.class.getName());
 	private final Map<ClanRewardType, List<ClanRewardBonus>> _clanRewards = new ConcurrentHashMap<>();
diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/data/xml/impl/ClassListData.java b/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/data/xml/impl/ClassListData.java
index a40f726d50..6e99aeabfa 100644
--- a/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/data/xml/impl/ClassListData.java
+++ b/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/data/xml/impl/ClassListData.java
@@ -17,15 +17,15 @@
 package com.l2jmobius.gameserver.data.xml.impl;
 
 import java.io.File;
-import java.util.HashMap;
 import java.util.Map;
+import java.util.concurrent.ConcurrentHashMap;
 import java.util.logging.Logger;
 
 import org.w3c.dom.Document;
 import org.w3c.dom.NamedNodeMap;
 import org.w3c.dom.Node;
 
-import com.l2jmobius.commons.util.IGameXmlReader;
+import com.l2jmobius.commons.util.IXmlReader;
 import com.l2jmobius.gameserver.model.base.ClassId;
 import com.l2jmobius.gameserver.model.base.ClassInfo;
 
@@ -33,11 +33,11 @@ import com.l2jmobius.gameserver.model.base.ClassInfo;
  * Loads the the list of classes and it's info.
  * @author Zoey76
  */
-public final class ClassListData implements IGameXmlReader
+public final class ClassListData implements IXmlReader
 {
 	private static final Logger LOGGER = Logger.getLogger(ClassListData.class.getName());
 	
-	private final Map<ClassId, ClassInfo> _classData = new HashMap<>();
+	private final Map<ClassId, ClassInfo> _classData = new ConcurrentHashMap<>();
 	
 	/**
 	 * Instantiates a new class list data.
diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/data/xml/impl/CombinationItemsData.java b/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/data/xml/impl/CombinationItemsData.java
index a7e90d5f89..c2ce205300 100644
--- a/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/data/xml/impl/CombinationItemsData.java
+++ b/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/data/xml/impl/CombinationItemsData.java
@@ -24,7 +24,7 @@ import java.util.stream.Collectors;
 
 import org.w3c.dom.Document;
 
-import com.l2jmobius.commons.util.IGameXmlReader;
+import com.l2jmobius.commons.util.IXmlReader;
 import com.l2jmobius.gameserver.datatables.ItemTable;
 import com.l2jmobius.gameserver.model.StatsSet;
 import com.l2jmobius.gameserver.model.items.combination.CombinationItem;
@@ -34,7 +34,7 @@ import com.l2jmobius.gameserver.model.items.combination.CombinationItemType;
 /**
  * @author UnAfraid
  */
-public class CombinationItemsData implements IGameXmlReader
+public class CombinationItemsData implements IXmlReader
 {
 	private static final Logger LOGGER = Logger.getLogger(CombinationItemsData.class.getName());
 	private final List<CombinationItem> _items = new ArrayList<>();
diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/data/xml/impl/CubicData.java b/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/data/xml/impl/CubicData.java
index f682509217..ef46a08a7f 100644
--- a/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/data/xml/impl/CubicData.java
+++ b/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/data/xml/impl/CubicData.java
@@ -20,12 +20,12 @@ import java.io.File;
 import java.util.Collections;
 import java.util.HashMap;
 import java.util.Map;
+import java.util.concurrent.ConcurrentHashMap;
 import java.util.logging.Logger;
 
 import org.w3c.dom.Document;
 import org.w3c.dom.Node;
 
-import com.l2jmobius.commons.util.IGameXmlReader;
 import com.l2jmobius.commons.util.IXmlReader;
 import com.l2jmobius.gameserver.model.StatsSet;
 import com.l2jmobius.gameserver.model.actor.templates.CubicTemplate;
@@ -39,11 +39,11 @@ import com.l2jmobius.gameserver.model.cubic.conditions.RangeCondition;
 /**
  * @author UnAfraid
  */
-public class CubicData implements IGameXmlReader
+public class CubicData implements IXmlReader
 {
 	private static final Logger LOGGER = Logger.getLogger(CubicData.class.getName());
 	
-	private final Map<Integer, Map<Integer, CubicTemplate>> _cubics = new HashMap<>();
+	private final Map<Integer, Map<Integer, CubicTemplate>> _cubics = new ConcurrentHashMap<>();
 	
 	protected CubicData()
 	{
diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/data/xml/impl/DailyMissionData.java b/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/data/xml/impl/DailyMissionData.java
index 53519f2492..1e275049d9 100644
--- a/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/data/xml/impl/DailyMissionData.java
+++ b/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/data/xml/impl/DailyMissionData.java
@@ -27,7 +27,7 @@ import java.util.stream.Collectors;
 
 import org.w3c.dom.Document;
 
-import com.l2jmobius.commons.util.IGameXmlReader;
+import com.l2jmobius.commons.util.IXmlReader;
 import com.l2jmobius.gameserver.model.DailyMissionDataHolder;
 import com.l2jmobius.gameserver.model.StatsSet;
 import com.l2jmobius.gameserver.model.actor.instance.PlayerInstance;
@@ -37,7 +37,7 @@ import com.l2jmobius.gameserver.model.holders.ItemHolder;
 /**
  * @author Sdw
  */
-public class DailyMissionData implements IGameXmlReader
+public class DailyMissionData implements IXmlReader
 {
 	private static final Logger LOGGER = Logger.getLogger(DailyMissionData.class.getName());
 	private final Map<Integer, List<DailyMissionDataHolder>> _dailyMissionRewards = new LinkedHashMap<>();
diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/data/xml/impl/DoorData.java b/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/data/xml/impl/DoorData.java
index e8b1ff7bfa..5dd43e98eb 100644
--- a/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/data/xml/impl/DoorData.java
+++ b/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/data/xml/impl/DoorData.java
@@ -32,7 +32,6 @@ import org.w3c.dom.Document;
 import org.w3c.dom.NamedNodeMap;
 import org.w3c.dom.Node;
 
-import com.l2jmobius.commons.util.IGameXmlReader;
 import com.l2jmobius.commons.util.IXmlReader;
 import com.l2jmobius.gameserver.instancemanager.MapRegionManager;
 import com.l2jmobius.gameserver.model.Location;
@@ -45,7 +44,7 @@ import com.l2jmobius.gameserver.model.instancezone.Instance;
  * This class loads and hold info about doors.
  * @author JIV, GodKratos, UnAfraid
  */
-public final class DoorData implements IGameXmlReader
+public final class DoorData implements IXmlReader
 {
 	private static final Logger LOGGER = Logger.getLogger(DoorData.class.getName());
 	
diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/data/xml/impl/EnchantItemData.java b/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/data/xml/impl/EnchantItemData.java
index 24e12d1218..342b4cde07 100644
--- a/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/data/xml/impl/EnchantItemData.java
+++ b/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/data/xml/impl/EnchantItemData.java
@@ -25,7 +25,7 @@ import org.w3c.dom.Document;
 import org.w3c.dom.NamedNodeMap;
 import org.w3c.dom.Node;
 
-import com.l2jmobius.commons.util.IGameXmlReader;
+import com.l2jmobius.commons.util.IXmlReader;
 import com.l2jmobius.gameserver.model.StatsSet;
 import com.l2jmobius.gameserver.model.items.enchant.EnchantScroll;
 import com.l2jmobius.gameserver.model.items.enchant.EnchantSupportItem;
@@ -35,7 +35,7 @@ import com.l2jmobius.gameserver.model.items.instance.ItemInstance;
  * Loads item enchant data.
  * @author UnAfraid
  */
-public class EnchantItemData implements IGameXmlReader
+public class EnchantItemData implements IXmlReader
 {
 	private static final Logger LOGGER = Logger.getLogger(EnchantItemData.class.getName());
 	
diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/data/xml/impl/EnchantItemGroupsData.java b/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/data/xml/impl/EnchantItemGroupsData.java
index 666d821e42..44582a7dd4 100644
--- a/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/data/xml/impl/EnchantItemGroupsData.java
+++ b/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/data/xml/impl/EnchantItemGroupsData.java
@@ -25,7 +25,7 @@ import org.w3c.dom.Document;
 import org.w3c.dom.NamedNodeMap;
 import org.w3c.dom.Node;
 
-import com.l2jmobius.commons.util.IGameXmlReader;
+import com.l2jmobius.commons.util.IXmlReader;
 import com.l2jmobius.gameserver.datatables.ItemTable;
 import com.l2jmobius.gameserver.model.holders.RangeChanceHolder;
 import com.l2jmobius.gameserver.model.items.Item;
@@ -37,7 +37,7 @@ import com.l2jmobius.gameserver.util.Util;
 /**
  * @author UnAfraid
  */
-public final class EnchantItemGroupsData implements IGameXmlReader
+public final class EnchantItemGroupsData implements IXmlReader
 {
 	private static final Logger LOGGER = Logger.getLogger(EnchantItemGroupsData.class.getName());
 	
diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/data/xml/impl/EnchantItemHPBonusData.java b/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/data/xml/impl/EnchantItemHPBonusData.java
index d2ce1096b5..868b1f95f6 100644
--- a/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/data/xml/impl/EnchantItemHPBonusData.java
+++ b/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/data/xml/impl/EnchantItemHPBonusData.java
@@ -26,7 +26,7 @@ import java.util.logging.Logger;
 import org.w3c.dom.Document;
 import org.w3c.dom.Node;
 
-import com.l2jmobius.commons.util.IGameXmlReader;
+import com.l2jmobius.commons.util.IXmlReader;
 import com.l2jmobius.gameserver.model.items.Item;
 import com.l2jmobius.gameserver.model.items.instance.ItemInstance;
 import com.l2jmobius.gameserver.model.items.type.CrystalType;
@@ -35,7 +35,7 @@ import com.l2jmobius.gameserver.model.items.type.CrystalType;
  * This class holds the Enchant HP Bonus Data.
  * @author MrPoke, Zoey76
  */
-public class EnchantItemHPBonusData implements IGameXmlReader
+public class EnchantItemHPBonusData implements IXmlReader
 {
 	private static final Logger LOGGER = Logger.getLogger(EnchantItemHPBonusData.class.getName());
 	
diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/data/xml/impl/EnchantItemOptionsData.java b/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/data/xml/impl/EnchantItemOptionsData.java
index f6e9946b94..b8d805132f 100644
--- a/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/data/xml/impl/EnchantItemOptionsData.java
+++ b/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/data/xml/impl/EnchantItemOptionsData.java
@@ -24,7 +24,7 @@ import java.util.logging.Logger;
 import org.w3c.dom.Document;
 import org.w3c.dom.Node;
 
-import com.l2jmobius.commons.util.IGameXmlReader;
+import com.l2jmobius.commons.util.IXmlReader;
 import com.l2jmobius.gameserver.model.items.instance.ItemInstance;
 import com.l2jmobius.gameserver.model.options.EnchantOptions;
 import com.l2jmobius.gameserver.util.Util;
@@ -32,7 +32,7 @@ import com.l2jmobius.gameserver.util.Util;
 /**
  * @author UnAfraid
  */
-public class EnchantItemOptionsData implements IGameXmlReader
+public class EnchantItemOptionsData implements IXmlReader
 {
 	private static final Logger LOGGER = Logger.getLogger(EnchantItemOptionsData.class.getName());
 	
diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/data/xml/impl/EnchantSkillGroupsData.java b/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/data/xml/impl/EnchantSkillGroupsData.java
index 0b557ced04..45127fe5f6 100644
--- a/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/data/xml/impl/EnchantSkillGroupsData.java
+++ b/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/data/xml/impl/EnchantSkillGroupsData.java
@@ -18,16 +18,15 @@ package com.l2jmobius.gameserver.data.xml.impl;
 
 import java.io.File;
 import java.util.Collections;
-import java.util.HashMap;
 import java.util.HashSet;
-import java.util.LinkedHashMap;
 import java.util.Map;
 import java.util.Set;
+import java.util.concurrent.ConcurrentHashMap;
 import java.util.logging.Logger;
 
 import org.w3c.dom.Document;
 
-import com.l2jmobius.commons.util.IGameXmlReader;
+import com.l2jmobius.commons.util.IXmlReader;
 import com.l2jmobius.gameserver.enums.SkillEnchantType;
 import com.l2jmobius.gameserver.model.StatsSet;
 import com.l2jmobius.gameserver.model.holders.EnchantSkillHolder;
@@ -39,12 +38,12 @@ import com.l2jmobius.gameserver.model.skills.Skill;
  * This class holds the Enchant Groups information.
  * @author Micr0
  */
-public class EnchantSkillGroupsData implements IGameXmlReader
+public class EnchantSkillGroupsData implements IXmlReader
 {
 	private static final Logger LOGGER = Logger.getLogger(EnchantSkillGroupsData.class.getName());
 	
-	private final Map<Integer, EnchantSkillHolder> _enchantSkillHolders = new LinkedHashMap<>();
-	private final Map<SkillHolder, Set<Integer>> _enchantSkillTrees = new HashMap<>();
+	private final Map<Integer, EnchantSkillHolder> _enchantSkillHolders = new ConcurrentHashMap<>();
+	private final Map<SkillHolder, Set<Integer>> _enchantSkillTrees = new ConcurrentHashMap<>();
 	
 	public static int MAX_ENCHANT_LEVEL;
 	
diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/data/xml/impl/EnsoulData.java b/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/data/xml/impl/EnsoulData.java
index 0881f3aaec..bea9592527 100644
--- a/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/data/xml/impl/EnsoulData.java
+++ b/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/data/xml/impl/EnsoulData.java
@@ -19,16 +19,14 @@ package com.l2jmobius.gameserver.data.xml.impl;
 import java.io.File;
 import java.util.Collection;
 import java.util.Collections;
-import java.util.EnumMap;
-import java.util.HashMap;
 import java.util.Map;
+import java.util.concurrent.ConcurrentHashMap;
 import java.util.logging.Logger;
 
 import org.w3c.dom.Document;
 import org.w3c.dom.NamedNodeMap;
 import org.w3c.dom.Node;
 
-import com.l2jmobius.commons.util.IGameXmlReader;
 import com.l2jmobius.commons.util.IXmlReader;
 import com.l2jmobius.gameserver.model.ensoul.EnsoulFee;
 import com.l2jmobius.gameserver.model.ensoul.EnsoulOption;
@@ -39,12 +37,12 @@ import com.l2jmobius.gameserver.model.items.type.CrystalType;
 /**
  * @author UnAfraid
  */
-public class EnsoulData implements IGameXmlReader
+public class EnsoulData implements IXmlReader
 {
 	private static final Logger LOGGER = Logger.getLogger(EnsoulData.class.getName());
-	private final Map<CrystalType, EnsoulFee> _ensoulFees = new EnumMap<>(CrystalType.class);
-	private final Map<Integer, EnsoulOption> _ensoulOptions = new HashMap<>();
-	private final Map<Integer, EnsoulStone> _ensoulStones = new HashMap<>();
+	private final Map<CrystalType, EnsoulFee> _ensoulFees = new ConcurrentHashMap<>();
+	private final Map<Integer, EnsoulOption> _ensoulOptions = new ConcurrentHashMap<>();
+	private final Map<Integer, EnsoulStone> _ensoulStones = new ConcurrentHashMap<>();
 	
 	protected EnsoulData()
 	{
diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/data/xml/impl/EventEngineData.java b/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/data/xml/impl/EventEngineData.java
index c43970ea31..144e2d5599 100644
--- a/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/data/xml/impl/EventEngineData.java
+++ b/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/data/xml/impl/EventEngineData.java
@@ -32,7 +32,6 @@ import org.w3c.dom.Document;
 import org.w3c.dom.NamedNodeMap;
 import org.w3c.dom.Node;
 
-import com.l2jmobius.commons.util.IGameXmlReader;
 import com.l2jmobius.commons.util.IXmlReader;
 import com.l2jmobius.gameserver.model.Location;
 import com.l2jmobius.gameserver.model.StatsSet;
@@ -54,7 +53,7 @@ import com.l2jmobius.gameserver.model.holders.SkillHolder;
 /**
  * @author UnAfraid
  */
-public final class EventEngineData implements IGameXmlReader
+public final class EventEngineData implements IXmlReader
 {
 	private static final Logger LOGGER = Logger.getLogger(EventEngineData.class.getName());
 	
diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/data/xml/impl/ExperienceData.java b/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/data/xml/impl/ExperienceData.java
index 2daaf16220..ea9d13c2aa 100644
--- a/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/data/xml/impl/ExperienceData.java
+++ b/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/data/xml/impl/ExperienceData.java
@@ -26,13 +26,13 @@ import org.w3c.dom.NamedNodeMap;
 import org.w3c.dom.Node;
 
 import com.l2jmobius.Config;
-import com.l2jmobius.commons.util.IGameXmlReader;
+import com.l2jmobius.commons.util.IXmlReader;
 
 /**
  * This class holds the Experience points for each level for players and pets.
  * @author mrTJO
  */
-public final class ExperienceData implements IGameXmlReader
+public final class ExperienceData implements IXmlReader
 {
 	private static final Logger LOGGER = Logger.getLogger(ExperienceData.class.getName());
 	
diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/data/xml/impl/ExtendDropData.java b/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/data/xml/impl/ExtendDropData.java
index 00af3a4f77..09da39ad14 100644
--- a/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/data/xml/impl/ExtendDropData.java
+++ b/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/data/xml/impl/ExtendDropData.java
@@ -28,7 +28,7 @@ import java.util.logging.Logger;
 import org.w3c.dom.Document;
 import org.w3c.dom.Node;
 
-import com.l2jmobius.commons.util.IGameXmlReader;
+import com.l2jmobius.commons.util.IXmlReader;
 import com.l2jmobius.gameserver.handler.ConditionHandler;
 import com.l2jmobius.gameserver.model.StatsSet;
 import com.l2jmobius.gameserver.model.conditions.ICondition;
@@ -39,7 +39,7 @@ import com.l2jmobius.gameserver.network.SystemMessageId;
 /**
  * @author Sdw
  */
-public class ExtendDropData implements IGameXmlReader
+public class ExtendDropData implements IXmlReader
 {
 	private static final Logger LOGGER = Logger.getLogger(ExtendDropData.class.getName());
 	private final Map<Integer, ExtendDropDataHolder> _extendDrop = new HashMap<>();
diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/data/xml/impl/FakePlayerData.java b/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/data/xml/impl/FakePlayerData.java
index afb92c06d5..74b7957fd9 100644
--- a/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/data/xml/impl/FakePlayerData.java
+++ b/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/data/xml/impl/FakePlayerData.java
@@ -26,7 +26,7 @@ import java.util.logging.Logger;
 import org.w3c.dom.Document;
 
 import com.l2jmobius.Config;
-import com.l2jmobius.commons.util.IGameXmlReader;
+import com.l2jmobius.commons.util.IXmlReader;
 import com.l2jmobius.gameserver.data.sql.impl.CharNameTable;
 import com.l2jmobius.gameserver.model.StatsSet;
 import com.l2jmobius.gameserver.model.actor.templates.NpcTemplate;
@@ -35,7 +35,7 @@ import com.l2jmobius.gameserver.model.holders.FakePlayerHolder;
 /**
  * @author Mobius
  */
-public class FakePlayerData implements IGameXmlReader
+public class FakePlayerData implements IXmlReader
 {
 	private static Logger LOGGER = Logger.getLogger(FakePlayerData.class.getName());
 	
diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/data/xml/impl/FenceData.java b/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/data/xml/impl/FenceData.java
index f51175e5fa..d36ab2e16b 100644
--- a/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/data/xml/impl/FenceData.java
+++ b/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/data/xml/impl/FenceData.java
@@ -28,7 +28,7 @@ import java.util.logging.Logger;
 import org.w3c.dom.Document;
 import org.w3c.dom.Node;
 
-import com.l2jmobius.commons.util.IGameXmlReader;
+import com.l2jmobius.commons.util.IXmlReader;
 import com.l2jmobius.gameserver.enums.FenceState;
 import com.l2jmobius.gameserver.model.StatsSet;
 import com.l2jmobius.gameserver.model.World;
@@ -39,7 +39,7 @@ import com.l2jmobius.gameserver.model.instancezone.Instance;
 /**
  * @author HoridoJoho / FBIagent
  */
-public final class FenceData implements IGameXmlReader
+public final class FenceData implements IXmlReader
 {
 	private static final Logger LOGGER = Logger.getLogger(FenceData.class.getSimpleName());
 	
diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/data/xml/impl/FishingData.java b/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/data/xml/impl/FishingData.java
index bacf1ed08c..16436a2f5c 100644
--- a/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/data/xml/impl/FishingData.java
+++ b/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/data/xml/impl/FishingData.java
@@ -26,7 +26,7 @@ import org.w3c.dom.NamedNodeMap;
 import org.w3c.dom.Node;
 
 import com.l2jmobius.Config;
-import com.l2jmobius.commons.util.IGameXmlReader;
+import com.l2jmobius.commons.util.IXmlReader;
 import com.l2jmobius.gameserver.datatables.ItemTable;
 import com.l2jmobius.gameserver.model.fishing.FishingBait;
 import com.l2jmobius.gameserver.model.fishing.FishingCatch;
@@ -36,7 +36,7 @@ import com.l2jmobius.gameserver.model.fishing.FishingRod;
  * This class holds the Fishing information.
  * @author bit
  */
-public final class FishingData implements IGameXmlReader
+public final class FishingData implements IXmlReader
 {
 	private static final Logger LOGGER = Logger.getLogger(FishingData.class.getName());
 	private final Map<Integer, FishingBait> _baitData = new HashMap<>();
diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/data/xml/impl/HennaData.java b/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/data/xml/impl/HennaData.java
index e27e186193..d3ac163f3c 100644
--- a/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/data/xml/impl/HennaData.java
+++ b/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/data/xml/impl/HennaData.java
@@ -27,7 +27,7 @@ import org.w3c.dom.Document;
 import org.w3c.dom.NamedNodeMap;
 import org.w3c.dom.Node;
 
-import com.l2jmobius.commons.util.IGameXmlReader;
+import com.l2jmobius.commons.util.IXmlReader;
 import com.l2jmobius.gameserver.model.StatsSet;
 import com.l2jmobius.gameserver.model.base.ClassId;
 import com.l2jmobius.gameserver.model.items.Henna;
@@ -40,7 +40,7 @@ import com.l2jmobius.gameserver.model.skills.Skill;
  * Allowed classes to wear each henna.
  * @author Zoey76, Mobius
  */
-public final class HennaData implements IGameXmlReader
+public final class HennaData implements IXmlReader
 {
 	private static final Logger LOGGER = Logger.getLogger(HennaData.class.getName());
 	
diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/data/xml/impl/HitConditionBonusData.java b/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/data/xml/impl/HitConditionBonusData.java
index e9f2f9a87d..2d6ccf0467 100644
--- a/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/data/xml/impl/HitConditionBonusData.java
+++ b/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/data/xml/impl/HitConditionBonusData.java
@@ -23,7 +23,7 @@ import org.w3c.dom.Document;
 import org.w3c.dom.NamedNodeMap;
 import org.w3c.dom.Node;
 
-import com.l2jmobius.commons.util.IGameXmlReader;
+import com.l2jmobius.commons.util.IXmlReader;
 import com.l2jmobius.gameserver.GameTimeController;
 import com.l2jmobius.gameserver.enums.Position;
 import com.l2jmobius.gameserver.model.actor.Creature;
@@ -32,7 +32,7 @@ import com.l2jmobius.gameserver.model.actor.Creature;
  * This class load, holds and calculates the hit condition bonuses.
  * @author Nik
  */
-public final class HitConditionBonusData implements IGameXmlReader
+public final class HitConditionBonusData implements IXmlReader
 {
 	private static final Logger LOGGER = Logger.getLogger(HitConditionBonusData.class.getName());
 	
diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/data/xml/impl/InitialEquipmentData.java b/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/data/xml/impl/InitialEquipmentData.java
index 247ea4b46d..275a23f28f 100644
--- a/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/data/xml/impl/InitialEquipmentData.java
+++ b/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/data/xml/impl/InitialEquipmentData.java
@@ -28,7 +28,7 @@ import org.w3c.dom.NamedNodeMap;
 import org.w3c.dom.Node;
 
 import com.l2jmobius.Config;
-import com.l2jmobius.commons.util.IGameXmlReader;
+import com.l2jmobius.commons.util.IXmlReader;
 import com.l2jmobius.gameserver.model.StatsSet;
 import com.l2jmobius.gameserver.model.base.ClassId;
 import com.l2jmobius.gameserver.model.items.PlayerItemTemplate;
@@ -38,7 +38,7 @@ import com.l2jmobius.gameserver.model.items.PlayerItemTemplate;
  * What items get each newly created character and if this item is equipped upon creation (<b>Requires the item to be equippable</b>).
  * @author Zoey76
  */
-public final class InitialEquipmentData implements IGameXmlReader
+public final class InitialEquipmentData implements IXmlReader
 {
 	private static final Logger LOGGER = Logger.getLogger(InitialEquipmentData.class.getName());
 	
diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/data/xml/impl/InitialShortcutData.java b/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/data/xml/impl/InitialShortcutData.java
index 5f886bafa8..3b9e976607 100644
--- a/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/data/xml/impl/InitialShortcutData.java
+++ b/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/data/xml/impl/InitialShortcutData.java
@@ -27,7 +27,7 @@ import org.w3c.dom.Document;
 import org.w3c.dom.NamedNodeMap;
 import org.w3c.dom.Node;
 
-import com.l2jmobius.commons.util.IGameXmlReader;
+import com.l2jmobius.commons.util.IXmlReader;
 import com.l2jmobius.gameserver.enums.MacroType;
 import com.l2jmobius.gameserver.enums.ShortcutType;
 import com.l2jmobius.gameserver.model.Macro;
@@ -43,7 +43,7 @@ import com.l2jmobius.gameserver.network.serverpackets.ShortCutRegister;
  * What shortcuts get each newly created character.
  * @author Zoey76
  */
-public final class InitialShortcutData implements IGameXmlReader
+public final class InitialShortcutData implements IXmlReader
 {
 	private static final Logger LOGGER = Logger.getLogger(InitialShortcutData.class.getName());
 	
diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/data/xml/impl/ItemCrystallizationData.java b/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/data/xml/impl/ItemCrystallizationData.java
index 86454b2b71..aa7742afa1 100644
--- a/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/data/xml/impl/ItemCrystallizationData.java
+++ b/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/data/xml/impl/ItemCrystallizationData.java
@@ -28,7 +28,7 @@ import org.w3c.dom.Document;
 import org.w3c.dom.NamedNodeMap;
 import org.w3c.dom.Node;
 
-import com.l2jmobius.commons.util.IGameXmlReader;
+import com.l2jmobius.commons.util.IXmlReader;
 import com.l2jmobius.gameserver.datatables.ItemTable;
 import com.l2jmobius.gameserver.enums.CrystallizationType;
 import com.l2jmobius.gameserver.model.holders.CrystallizationDataHolder;
@@ -42,7 +42,7 @@ import com.l2jmobius.gameserver.model.items.type.CrystalType;
 /**
  * @author UnAfraid
  */
-public final class ItemCrystallizationData implements IGameXmlReader
+public final class ItemCrystallizationData implements IXmlReader
 {
 	private static final Logger LOGGER = Logger.getLogger(ItemCrystallizationData.class.getName());
 	
diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/data/xml/impl/KarmaData.java b/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/data/xml/impl/KarmaData.java
index ca826eba2e..bd68c38748 100644
--- a/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/data/xml/impl/KarmaData.java
+++ b/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/data/xml/impl/KarmaData.java
@@ -26,12 +26,12 @@ import org.w3c.dom.NamedNodeMap;
 import org.w3c.dom.Node;
 
 import com.l2jmobius.Config;
-import com.l2jmobius.commons.util.IGameXmlReader;
+import com.l2jmobius.commons.util.IXmlReader;
 
 /**
  * @author UnAfraid
  */
-public class KarmaData implements IGameXmlReader
+public class KarmaData implements IXmlReader
 {
 	private static final Logger LOGGER = Logger.getLogger(KarmaData.class.getName());
 	
diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/data/xml/impl/LuckyGameData.java b/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/data/xml/impl/LuckyGameData.java
index 6759bfec3f..41c0d0fc31 100644
--- a/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/data/xml/impl/LuckyGameData.java
+++ b/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/data/xml/impl/LuckyGameData.java
@@ -23,7 +23,7 @@ import java.util.concurrent.atomic.AtomicInteger;
 
 import org.w3c.dom.Document;
 
-import com.l2jmobius.commons.util.IGameXmlReader;
+import com.l2jmobius.commons.util.IXmlReader;
 import com.l2jmobius.gameserver.model.StatsSet;
 import com.l2jmobius.gameserver.model.holders.ItemChanceHolder;
 import com.l2jmobius.gameserver.model.holders.ItemPointHolder;
@@ -32,7 +32,7 @@ import com.l2jmobius.gameserver.model.holders.LuckyGameDataHolder;
 /**
  * @author Sdw
  */
-public class LuckyGameData implements IGameXmlReader
+public class LuckyGameData implements IXmlReader
 {
 	private final Map<Integer, LuckyGameDataHolder> _luckyGame = new HashMap<>();
 	private final AtomicInteger _serverPlay = new AtomicInteger();
diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/data/xml/impl/MultisellData.java b/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/data/xml/impl/MultisellData.java
index 796cd9b6f1..e9c494b91e 100644
--- a/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/data/xml/impl/MultisellData.java
+++ b/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/data/xml/impl/MultisellData.java
@@ -19,11 +19,11 @@ package com.l2jmobius.gameserver.data.xml.impl;
 import java.io.File;
 import java.io.FileFilter;
 import java.util.ArrayList;
-import java.util.HashMap;
 import java.util.HashSet;
 import java.util.List;
 import java.util.Map;
 import java.util.Set;
+import java.util.concurrent.ConcurrentHashMap;
 import java.util.logging.Level;
 import java.util.logging.Logger;
 
@@ -31,7 +31,7 @@ import org.w3c.dom.Document;
 import org.w3c.dom.Node;
 
 import com.l2jmobius.Config;
-import com.l2jmobius.commons.util.IGameXmlReader;
+import com.l2jmobius.commons.util.IXmlReader;
 import com.l2jmobius.commons.util.file.filter.NumericNameFilter;
 import com.l2jmobius.gameserver.datatables.ItemTable;
 import com.l2jmobius.gameserver.enums.SpecialItemType;
@@ -46,14 +46,14 @@ import com.l2jmobius.gameserver.model.holders.PreparedMultisellListHolder;
 import com.l2jmobius.gameserver.model.items.Item;
 import com.l2jmobius.gameserver.network.serverpackets.MultiSellList;
 
-public final class MultisellData implements IGameXmlReader
+public final class MultisellData implements IXmlReader
 {
 	private static final Logger LOGGER = Logger.getLogger(MultisellData.class.getName());
 	
 	public static final int PAGE_SIZE = 40;
 	private static final FileFilter NUMERIC_FILTER = new NumericNameFilter();
 	
-	private final Map<Integer, MultisellListHolder> _multisells = new HashMap<>();
+	private final Map<Integer, MultisellListHolder> _multisells = new ConcurrentHashMap<>();
 	
 	protected MultisellData()
 	{
diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/data/xml/impl/NpcData.java b/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/data/xml/impl/NpcData.java
index 277495ca9d..3bcdb58f40 100644
--- a/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/data/xml/impl/NpcData.java
+++ b/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/data/xml/impl/NpcData.java
@@ -26,6 +26,8 @@ import java.util.List;
 import java.util.Map;
 import java.util.Map.Entry;
 import java.util.Set;
+import java.util.concurrent.ConcurrentHashMap;
+import java.util.concurrent.CopyOnWriteArrayList;
 import java.util.function.Predicate;
 import java.util.logging.Logger;
 import java.util.stream.Collectors;
@@ -36,7 +38,7 @@ import org.w3c.dom.Node;
 
 import com.l2jmobius.Config;
 import com.l2jmobius.commons.util.CommonUtil;
-import com.l2jmobius.commons.util.IGameXmlReader;
+import com.l2jmobius.commons.util.IXmlReader;
 import com.l2jmobius.gameserver.datatables.ItemTable;
 import com.l2jmobius.gameserver.enums.AISkillScope;
 import com.l2jmobius.gameserver.enums.DropType;
@@ -52,13 +54,13 @@ import com.l2jmobius.gameserver.model.skills.Skill;
  * NPC data parser.
  * @author NosBit
  */
-public class NpcData implements IGameXmlReader
+public class NpcData implements IXmlReader
 {
 	protected static final Logger LOGGER = Logger.getLogger(NpcData.class.getName());
 	
-	private final Map<Integer, NpcTemplate> _npcs = new HashMap<>();
-	private final Map<String, Integer> _clans = new HashMap<>();
-	private static final List<Integer> _masterMonsterIDs = new ArrayList<>();
+	private final Map<Integer, NpcTemplate> _npcs = new ConcurrentHashMap<>();
+	private final Map<String, Integer> _clans = new ConcurrentHashMap<>();
+	private static final List<Integer> _masterMonsterIDs = new CopyOnWriteArrayList<>();
 	
 	protected NpcData()
 	{
diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/data/xml/impl/OptionData.java b/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/data/xml/impl/OptionData.java
index bffa2b107c..424e2b27ad 100644
--- a/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/data/xml/impl/OptionData.java
+++ b/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/data/xml/impl/OptionData.java
@@ -18,13 +18,12 @@ package com.l2jmobius.gameserver.data.xml.impl;
 
 import java.io.File;
 import java.util.Collections;
-import java.util.HashMap;
 import java.util.Map;
+import java.util.concurrent.ConcurrentHashMap;
 import java.util.logging.Logger;
 
 import org.w3c.dom.Document;
 
-import com.l2jmobius.commons.util.IGameXmlReader;
 import com.l2jmobius.commons.util.IXmlReader;
 import com.l2jmobius.gameserver.handler.EffectHandler;
 import com.l2jmobius.gameserver.model.StatsSet;
@@ -36,11 +35,11 @@ import com.l2jmobius.gameserver.model.options.OptionsSkillType;
 /**
  * @author UnAfraid
  */
-public class OptionData implements IGameXmlReader
+public class OptionData implements IXmlReader
 {
 	private static final Logger LOGGER = Logger.getLogger(OptionData.class.getName());
 	
-	private final Map<Integer, Options> _optionData = new HashMap<>();
+	private final Map<Integer, Options> _optionData = new ConcurrentHashMap<>();
 	
 	protected OptionData()
 	{
diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/data/xml/impl/PetDataTable.java b/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/data/xml/impl/PetDataTable.java
index 65afb75d7d..aa6975cd72 100644
--- a/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/data/xml/impl/PetDataTable.java
+++ b/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/data/xml/impl/PetDataTable.java
@@ -17,15 +17,15 @@
 package com.l2jmobius.gameserver.data.xml.impl;
 
 import java.io.File;
-import java.util.HashMap;
 import java.util.Map;
+import java.util.concurrent.ConcurrentHashMap;
 import java.util.logging.Logger;
 
 import org.w3c.dom.Document;
 import org.w3c.dom.NamedNodeMap;
 import org.w3c.dom.Node;
 
-import com.l2jmobius.commons.util.IGameXmlReader;
+import com.l2jmobius.commons.util.IXmlReader;
 import com.l2jmobius.gameserver.enums.MountType;
 import com.l2jmobius.gameserver.model.PetData;
 import com.l2jmobius.gameserver.model.PetLevelData;
@@ -36,11 +36,11 @@ import com.l2jmobius.gameserver.model.StatsSet;
  * TODO: load and use all pet parameters.
  * @author Zoey76 (rework)
  */
-public final class PetDataTable implements IGameXmlReader
+public final class PetDataTable implements IXmlReader
 {
 	private static final Logger LOGGER = Logger.getLogger(PetDataTable.class.getName());
 	
-	private final Map<Integer, PetData> _pets = new HashMap<>();
+	private final Map<Integer, PetData> _pets = new ConcurrentHashMap<>();
 	
 	/**
 	 * Instantiates a new pet data table.
diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/data/xml/impl/PetSkillData.java b/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/data/xml/impl/PetSkillData.java
index 4872dde773..5b2f9a4408 100644
--- a/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/data/xml/impl/PetSkillData.java
+++ b/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/data/xml/impl/PetSkillData.java
@@ -27,14 +27,14 @@ import org.w3c.dom.Document;
 import org.w3c.dom.NamedNodeMap;
 import org.w3c.dom.Node;
 
-import com.l2jmobius.commons.util.IGameXmlReader;
+import com.l2jmobius.commons.util.IXmlReader;
 import com.l2jmobius.gameserver.model.actor.Summon;
 import com.l2jmobius.gameserver.model.holders.SkillHolder;
 
 /**
  * @author Mobius
  */
-public class PetSkillData implements IGameXmlReader
+public class PetSkillData implements IXmlReader
 {
 	private static Logger LOGGER = Logger.getLogger(PetSkillData.class.getName());
 	private final Map<Integer, Map<Long, SkillHolder>> _skillTrees = new HashMap<>();
diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/data/xml/impl/PlayerTemplateData.java b/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/data/xml/impl/PlayerTemplateData.java
index 031fab8027..7a7c230b72 100644
--- a/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/data/xml/impl/PlayerTemplateData.java
+++ b/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/data/xml/impl/PlayerTemplateData.java
@@ -18,9 +18,9 @@ package com.l2jmobius.gameserver.data.xml.impl;
 
 import java.io.File;
 import java.util.ArrayList;
-import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
+import java.util.concurrent.ConcurrentHashMap;
 import java.util.logging.Logger;
 
 import org.w3c.dom.Document;
@@ -28,7 +28,7 @@ import org.w3c.dom.NamedNodeMap;
 import org.w3c.dom.Node;
 
 import com.l2jmobius.Config;
-import com.l2jmobius.commons.util.IGameXmlReader;
+import com.l2jmobius.commons.util.IXmlReader;
 import com.l2jmobius.gameserver.model.Location;
 import com.l2jmobius.gameserver.model.StatsSet;
 import com.l2jmobius.gameserver.model.actor.templates.PlayerTemplate;
@@ -38,11 +38,11 @@ import com.l2jmobius.gameserver.model.base.ClassId;
  * Loads player's base stats.
  * @author Forsaiken, Zoey76, GKR
  */
-public final class PlayerTemplateData implements IGameXmlReader
+public final class PlayerTemplateData implements IXmlReader
 {
 	private static final Logger LOGGER = Logger.getLogger(PlayerTemplateData.class.getName());
 	
-	private final Map<ClassId, PlayerTemplate> _playerTemplates = new HashMap<>();
+	private final Map<ClassId, PlayerTemplate> _playerTemplates = new ConcurrentHashMap<>();
 	
 	private int _dataCount = 0;
 	private int _autoGeneratedCount = 0;
diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/data/xml/impl/PlayerXpPercentLostData.java b/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/data/xml/impl/PlayerXpPercentLostData.java
index 2b867a18e4..816cb7aacf 100644
--- a/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/data/xml/impl/PlayerXpPercentLostData.java
+++ b/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/data/xml/impl/PlayerXpPercentLostData.java
@@ -24,13 +24,13 @@ import org.w3c.dom.Document;
 import org.w3c.dom.NamedNodeMap;
 import org.w3c.dom.Node;
 
-import com.l2jmobius.commons.util.IGameXmlReader;
+import com.l2jmobius.commons.util.IXmlReader;
 
 /**
  * This class holds the Player Xp Percent Lost Data for each level for players.
  * @author Zealar
  */
-public final class PlayerXpPercentLostData implements IGameXmlReader
+public final class PlayerXpPercentLostData implements IXmlReader
 {
 	private static final Logger LOGGER = Logger.getLogger(PlayerXpPercentLostData.class.getName());
 	
diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/data/xml/impl/PrimeShopData.java b/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/data/xml/impl/PrimeShopData.java
index 82ddd51f26..650d156194 100644
--- a/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/data/xml/impl/PrimeShopData.java
+++ b/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/data/xml/impl/PrimeShopData.java
@@ -27,7 +27,7 @@ import org.w3c.dom.Document;
 import org.w3c.dom.NamedNodeMap;
 import org.w3c.dom.Node;
 
-import com.l2jmobius.commons.util.IGameXmlReader;
+import com.l2jmobius.commons.util.IXmlReader;
 import com.l2jmobius.gameserver.datatables.ItemTable;
 import com.l2jmobius.gameserver.model.StatsSet;
 import com.l2jmobius.gameserver.model.actor.instance.PlayerInstance;
@@ -39,7 +39,7 @@ import com.l2jmobius.gameserver.network.serverpackets.primeshop.ExBRProductInfo;
 /**
  * @author Gnacik, UnAfraid
  */
-public class PrimeShopData implements IGameXmlReader
+public class PrimeShopData implements IXmlReader
 {
 	private static final Logger LOGGER = Logger.getLogger(PrimeShopData.class.getName());
 	
diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/data/xml/impl/RecipeData.java b/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/data/xml/impl/RecipeData.java
index 9c035c1fde..54ce272bd2 100644
--- a/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/data/xml/impl/RecipeData.java
+++ b/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/data/xml/impl/RecipeData.java
@@ -27,7 +27,7 @@ import org.w3c.dom.Document;
 import org.w3c.dom.NamedNodeMap;
 import org.w3c.dom.Node;
 
-import com.l2jmobius.commons.util.IGameXmlReader;
+import com.l2jmobius.commons.util.IXmlReader;
 import com.l2jmobius.gameserver.model.RecipeInstance;
 import com.l2jmobius.gameserver.model.RecipeList;
 import com.l2jmobius.gameserver.model.RecipeStatInstance;
@@ -38,7 +38,7 @@ import com.l2jmobius.gameserver.model.actor.instance.PlayerInstance;
  * The Class RecipeData.
  * @author Zoey76
  */
-public class RecipeData implements IGameXmlReader
+public class RecipeData implements IXmlReader
 {
 	private static final Logger LOGGER = Logger.getLogger(RecipeData.class.getName());
 	
diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/data/xml/impl/ResidenceFunctionsData.java b/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/data/xml/impl/ResidenceFunctionsData.java
index 66951e9e59..094ef13149 100644
--- a/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/data/xml/impl/ResidenceFunctionsData.java
+++ b/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/data/xml/impl/ResidenceFunctionsData.java
@@ -28,7 +28,7 @@ import org.w3c.dom.Document;
 import org.w3c.dom.NamedNodeMap;
 import org.w3c.dom.Node;
 
-import com.l2jmobius.commons.util.IGameXmlReader;
+import com.l2jmobius.commons.util.IXmlReader;
 import com.l2jmobius.gameserver.model.StatsSet;
 import com.l2jmobius.gameserver.model.residences.ResidenceFunctionTemplate;
 
@@ -36,7 +36,7 @@ import com.l2jmobius.gameserver.model.residences.ResidenceFunctionTemplate;
  * The residence functions data
  * @author UnAfraid
  */
-public final class ResidenceFunctionsData implements IGameXmlReader
+public final class ResidenceFunctionsData implements IXmlReader
 {
 	private static final Logger LOGGER = Logger.getLogger(ResidenceFunctionsData.class.getName());
 	private final Map<Integer, List<ResidenceFunctionTemplate>> _functions = new HashMap<>();
diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/data/xml/impl/SayuneData.java b/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/data/xml/impl/SayuneData.java
index 835bd96930..13b4d33b1e 100644
--- a/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/data/xml/impl/SayuneData.java
+++ b/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/data/xml/impl/SayuneData.java
@@ -26,13 +26,13 @@ import org.w3c.dom.Document;
 import org.w3c.dom.NamedNodeMap;
 import org.w3c.dom.Node;
 
-import com.l2jmobius.commons.util.IGameXmlReader;
+import com.l2jmobius.commons.util.IXmlReader;
 import com.l2jmobius.gameserver.model.SayuneEntry;
 
 /**
  * @author UnAfraid
  */
-public class SayuneData implements IGameXmlReader
+public class SayuneData implements IXmlReader
 {
 	private static final Logger LOGGER = Logger.getLogger(SayuneData.class.getName());
 	
diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/data/xml/impl/SecondaryAuthData.java b/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/data/xml/impl/SecondaryAuthData.java
index c0ebd36146..ca85056b10 100644
--- a/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/data/xml/impl/SecondaryAuthData.java
+++ b/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/data/xml/impl/SecondaryAuthData.java
@@ -25,12 +25,12 @@ import java.util.logging.Logger;
 import org.w3c.dom.Document;
 import org.w3c.dom.Node;
 
-import com.l2jmobius.commons.util.IGameXmlReader;
+import com.l2jmobius.commons.util.IXmlReader;
 
 /**
  * @author NosBit
  */
-public class SecondaryAuthData implements IGameXmlReader
+public class SecondaryAuthData implements IXmlReader
 {
 	private static final Logger LOGGER = Logger.getLogger(SecondaryAuthData.class.getName());
 	
diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/data/xml/impl/ShuttleData.java b/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/data/xml/impl/ShuttleData.java
index 9454d24d6b..ff26f4f409 100644
--- a/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/data/xml/impl/ShuttleData.java
+++ b/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/data/xml/impl/ShuttleData.java
@@ -27,7 +27,7 @@ import org.w3c.dom.Document;
 import org.w3c.dom.NamedNodeMap;
 import org.w3c.dom.Node;
 
-import com.l2jmobius.commons.util.IGameXmlReader;
+import com.l2jmobius.commons.util.IXmlReader;
 import com.l2jmobius.gameserver.model.Location;
 import com.l2jmobius.gameserver.model.StatsSet;
 import com.l2jmobius.gameserver.model.VehiclePathPoint;
@@ -40,7 +40,7 @@ import com.l2jmobius.gameserver.model.shuttle.ShuttleStop;
 /**
  * @author UnAfraid
  */
-public final class ShuttleData implements IGameXmlReader
+public final class ShuttleData implements IXmlReader
 {
 	private static final Logger LOGGER = Logger.getLogger(ShuttleData.class.getName());
 	
diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/data/xml/impl/SiegeScheduleData.java b/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/data/xml/impl/SiegeScheduleData.java
index 265bf7c528..6bff09010b 100644
--- a/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/data/xml/impl/SiegeScheduleData.java
+++ b/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/data/xml/impl/SiegeScheduleData.java
@@ -27,7 +27,7 @@ import org.w3c.dom.Document;
 import org.w3c.dom.NamedNodeMap;
 import org.w3c.dom.Node;
 
-import com.l2jmobius.commons.util.IGameXmlReader;
+import com.l2jmobius.commons.util.IXmlReader;
 import com.l2jmobius.gameserver.model.SiegeScheduleDate;
 import com.l2jmobius.gameserver.model.StatsSet;
 import com.l2jmobius.gameserver.util.Util;
@@ -35,7 +35,7 @@ import com.l2jmobius.gameserver.util.Util;
 /**
  * @author UnAfraid
  */
-public class SiegeScheduleData implements IGameXmlReader
+public class SiegeScheduleData implements IXmlReader
 {
 	private static final Logger LOGGER = Logger.getLogger(SiegeScheduleData.class.getName());
 	
diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/data/xml/impl/SkillData.java b/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/data/xml/impl/SkillData.java
index 7a1ae2e15b..64900d4d45 100644
--- a/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/data/xml/impl/SkillData.java
+++ b/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/data/xml/impl/SkillData.java
@@ -25,6 +25,7 @@ import java.util.List;
 import java.util.Map;
 import java.util.Optional;
 import java.util.Set;
+import java.util.concurrent.ConcurrentHashMap;
 import java.util.function.BiConsumer;
 import java.util.function.Function;
 import java.util.logging.Level;
@@ -35,7 +36,7 @@ import org.w3c.dom.Document;
 import org.w3c.dom.NamedNodeMap;
 import org.w3c.dom.Node;
 
-import com.l2jmobius.commons.util.IGameXmlReader;
+import com.l2jmobius.commons.util.IXmlReader;
 import com.l2jmobius.gameserver.handler.EffectHandler;
 import com.l2jmobius.gameserver.handler.SkillConditionHandler;
 import com.l2jmobius.gameserver.model.StatsSet;
@@ -51,12 +52,12 @@ import com.l2jmobius.gameserver.util.exp4j.ExpressionBuilder;
  * Skill data parser.
  * @author NosBit
  */
-public class SkillData implements IGameXmlReader
+public class SkillData implements IXmlReader
 {
 	private static final Logger LOGGER = Logger.getLogger(SkillData.class.getName());
 	
-	private final Map<Long, Skill> _skills = new HashMap<>();
-	private final Map<Integer, Integer> _skillsMaxLevel = new HashMap<>();
+	private final Map<Long, Skill> _skills = new ConcurrentHashMap<>();
+	private final Map<Integer, Integer> _skillsMaxLevel = new ConcurrentHashMap<>();
 	
 	private class NamedParamInfo
 	{
diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/data/xml/impl/SkillTreesData.java b/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/data/xml/impl/SkillTreesData.java
index 7f667059db..780e0a1d1c 100644
--- a/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/data/xml/impl/SkillTreesData.java
+++ b/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/data/xml/impl/SkillTreesData.java
@@ -29,6 +29,7 @@ import java.util.List;
 import java.util.Map;
 import java.util.Map.Entry;
 import java.util.Set;
+import java.util.concurrent.ConcurrentHashMap;
 import java.util.concurrent.atomic.AtomicBoolean;
 import java.util.logging.Logger;
 import java.util.stream.Collectors;
@@ -38,7 +39,7 @@ import org.w3c.dom.NamedNodeMap;
 import org.w3c.dom.Node;
 
 import com.l2jmobius.Config;
-import com.l2jmobius.commons.util.IGameXmlReader;
+import com.l2jmobius.commons.util.IXmlReader;
 import com.l2jmobius.gameserver.enums.CategoryType;
 import com.l2jmobius.gameserver.enums.Race;
 import com.l2jmobius.gameserver.enums.SubclassType;
@@ -77,34 +78,34 @@ import com.l2jmobius.gameserver.model.skills.Skill;
  * For XML schema please refer to skillTrees.xsd in datapack in xsd folder and for parameters documentation refer to documentation.txt in skillTrees folder.<br>
  * @author Zoey76
  */
-public final class SkillTreesData implements IGameXmlReader
+public final class SkillTreesData implements IXmlReader
 {
 	private static final Logger LOGGER = Logger.getLogger(SkillTreesData.class.getName());
 	
 	// ClassId, Map of Skill Hash Code, SkillLearn
-	private static final Map<ClassId, Map<Long, SkillLearn>> _classSkillTrees = new HashMap<>();
-	private static final Map<ClassId, Map<Long, SkillLearn>> _transferSkillTrees = new HashMap<>();
-	private static final Map<Race, Map<Long, SkillLearn>> _raceSkillTree = new HashMap<>();
-	private static final Map<SubclassType, Map<Long, SkillLearn>> _revelationSkillTree = new HashMap<>();
-	private static final Map<ClassId, Set<Integer>> _awakeningSaveSkillTree = new HashMap<>();
+	private static final Map<ClassId, Map<Long, SkillLearn>> _classSkillTrees = new ConcurrentHashMap<>();
+	private static final Map<ClassId, Map<Long, SkillLearn>> _transferSkillTrees = new ConcurrentHashMap<>();
+	private static final Map<Race, Map<Long, SkillLearn>> _raceSkillTree = new ConcurrentHashMap<>();
+	private static final Map<SubclassType, Map<Long, SkillLearn>> _revelationSkillTree = new ConcurrentHashMap<>();
+	private static final Map<ClassId, Set<Integer>> _awakeningSaveSkillTree = new ConcurrentHashMap<>();
 	// Skill Hash Code, SkillLearn
-	private static final Map<Long, SkillLearn> _collectSkillTree = new HashMap<>();
-	private static final Map<Long, SkillLearn> _fishingSkillTree = new HashMap<>();
-	private static final Map<Long, SkillLearn> _pledgeSkillTree = new HashMap<>();
-	private static final Map<Long, SkillLearn> _subClassSkillTree = new HashMap<>();
-	private static final Map<Long, SkillLearn> _subPledgeSkillTree = new HashMap<>();
-	private static final Map<Long, SkillLearn> _transformSkillTree = new HashMap<>();
-	private static final Map<Long, SkillLearn> _commonSkillTree = new HashMap<>();
-	private static final Map<Long, SkillLearn> _abilitySkillTree = new HashMap<>();
-	private static final Map<Long, SkillLearn> _alchemySkillTree = new HashMap<>();
-	private static final Map<Long, SkillLearn> _dualClassSkillTree = new HashMap<>();
+	private static final Map<Long, SkillLearn> _collectSkillTree = new ConcurrentHashMap<>();
+	private static final Map<Long, SkillLearn> _fishingSkillTree = new ConcurrentHashMap<>();
+	private static final Map<Long, SkillLearn> _pledgeSkillTree = new ConcurrentHashMap<>();
+	private static final Map<Long, SkillLearn> _subClassSkillTree = new ConcurrentHashMap<>();
+	private static final Map<Long, SkillLearn> _subPledgeSkillTree = new ConcurrentHashMap<>();
+	private static final Map<Long, SkillLearn> _transformSkillTree = new ConcurrentHashMap<>();
+	private static final Map<Long, SkillLearn> _commonSkillTree = new ConcurrentHashMap<>();
+	private static final Map<Long, SkillLearn> _abilitySkillTree = new ConcurrentHashMap<>();
+	private static final Map<Long, SkillLearn> _alchemySkillTree = new ConcurrentHashMap<>();
+	private static final Map<Long, SkillLearn> _dualClassSkillTree = new ConcurrentHashMap<>();
 	// Other skill trees
-	private static final Map<Long, SkillLearn> _nobleSkillTree = new HashMap<>();
-	private static final Map<Long, SkillLearn> _heroSkillTree = new HashMap<>();
-	private static final Map<Long, SkillLearn> _gameMasterSkillTree = new HashMap<>();
-	private static final Map<Long, SkillLearn> _gameMasterAuraSkillTree = new HashMap<>();
+	private static final Map<Long, SkillLearn> _nobleSkillTree = new ConcurrentHashMap<>();
+	private static final Map<Long, SkillLearn> _heroSkillTree = new ConcurrentHashMap<>();
+	private static final Map<Long, SkillLearn> _gameMasterSkillTree = new ConcurrentHashMap<>();
+	private static final Map<Long, SkillLearn> _gameMasterAuraSkillTree = new ConcurrentHashMap<>();
 	// Remove skill tree
-	private static final Map<ClassId, Set<Integer>> _removeSkillCache = new HashMap<>();
+	private static final Map<ClassId, Set<Integer>> _removeSkillCache = new ConcurrentHashMap<>();
 	
 	// Checker, sorted arrays of hash codes
 	private Map<Integer, long[]> _skillsByClassIdHashCodes; // Occupation skills
@@ -112,7 +113,7 @@ public final class SkillTreesData implements IGameXmlReader
 	private long[] _allSkillsHashCodes; // Fishing, Collection, Transformations, Common Skills.
 	
 	/** Parent class Ids are read from XML and stored in this map, to allow easy customization. */
-	private static final Map<ClassId, ClassId> _parentClassMap = new HashMap<>();
+	private static final Map<ClassId, ClassId> _parentClassMap = new ConcurrentHashMap<>();
 	
 	private final AtomicBoolean _isLoading = new AtomicBoolean();
 	
diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/data/xml/impl/SpawnsData.java b/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/data/xml/impl/SpawnsData.java
index dc41b02109..806d00902a 100644
--- a/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/data/xml/impl/SpawnsData.java
+++ b/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/data/xml/impl/SpawnsData.java
@@ -19,9 +19,10 @@ package com.l2jmobius.gameserver.data.xml.impl;
 import java.io.File;
 import java.util.ArrayList;
 import java.util.Collections;
-import java.util.LinkedList;
 import java.util.List;
 import java.util.Map;
+import java.util.concurrent.CopyOnWriteArrayList;
+import java.util.concurrent.ScheduledFuture;
 import java.util.function.Predicate;
 import java.util.logging.Level;
 import java.util.logging.Logger;
@@ -31,7 +32,7 @@ import org.w3c.dom.Document;
 import org.w3c.dom.Node;
 
 import com.l2jmobius.Config;
-import com.l2jmobius.commons.util.IGameXmlReader;
+import com.l2jmobius.commons.concurrent.ThreadPool;
 import com.l2jmobius.commons.util.IXmlReader;
 import com.l2jmobius.gameserver.model.ChanceLocation;
 import com.l2jmobius.gameserver.model.StatsSet;
@@ -49,11 +50,11 @@ import com.l2jmobius.gameserver.model.zone.type.SpawnTerritory;
 /**
  * @author UnAfraid
  */
-public class SpawnsData implements IGameXmlReader
+public class SpawnsData implements IXmlReader
 {
 	protected static final Logger LOGGER = Logger.getLogger(SpawnsData.class.getName());
 	
-	private final List<SpawnTemplate> _spawns = new LinkedList<>();
+	private final List<SpawnTemplate> _spawns = new CopyOnWriteArrayList<>();
 	
 	protected SpawnsData()
 	{
@@ -94,11 +95,28 @@ public class SpawnsData implements IGameXmlReader
 		}
 		
 		LOGGER.info(getClass().getSimpleName() + ": Initializing spawns...");
-		_spawns.stream().filter(SpawnTemplate::isSpawningByDefault).forEach(template ->
+		final List<ScheduledFuture<?>> jobs = new CopyOnWriteArrayList<>();
+		for (SpawnTemplate template : _spawns)
 		{
-			template.spawnAll(null);
-			template.notifyActivate();
-		});
+			if (template.isSpawningByDefault())
+			{
+				jobs.add(ThreadPool.schedule(() ->
+				{
+					template.spawnAll(null);
+					template.notifyActivate();
+				}, 0));
+			}
+		}
+		while (!jobs.isEmpty())
+		{
+			for (ScheduledFuture<?> job : jobs)
+			{
+				if ((job == null) || job.isDone() || job.isCancelled())
+				{
+					jobs.remove(job);
+				}
+			}
+		}
 		LOGGER.info(getClass().getSimpleName() + ": All spawns has been initialized!");
 	}
 	
diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/data/xml/impl/StaticObjectData.java b/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/data/xml/impl/StaticObjectData.java
index 8af86bec88..5e88dd66fb 100644
--- a/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/data/xml/impl/StaticObjectData.java
+++ b/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/data/xml/impl/StaticObjectData.java
@@ -26,7 +26,7 @@ import org.w3c.dom.Document;
 import org.w3c.dom.NamedNodeMap;
 import org.w3c.dom.Node;
 
-import com.l2jmobius.commons.util.IGameXmlReader;
+import com.l2jmobius.commons.util.IXmlReader;
 import com.l2jmobius.gameserver.model.StatsSet;
 import com.l2jmobius.gameserver.model.actor.instance.StaticObjectInstance;
 import com.l2jmobius.gameserver.model.actor.templates.CreatureTemplate;
@@ -35,7 +35,7 @@ import com.l2jmobius.gameserver.model.actor.templates.CreatureTemplate;
  * This class loads and holds all static object data.
  * @author UnAfraid
  */
-public final class StaticObjectData implements IGameXmlReader
+public final class StaticObjectData implements IXmlReader
 {
 	private static final Logger LOGGER = Logger.getLogger(StaticObjectData.class.getName());
 	
diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/data/xml/impl/TeleportersData.java b/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/data/xml/impl/TeleportersData.java
index 1d039725ad..5afec008f7 100644
--- a/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/data/xml/impl/TeleportersData.java
+++ b/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/data/xml/impl/TeleportersData.java
@@ -20,12 +20,13 @@ import java.io.File;
 import java.util.Collections;
 import java.util.HashMap;
 import java.util.Map;
+import java.util.concurrent.ConcurrentHashMap;
 import java.util.logging.Logger;
 
 import org.w3c.dom.Document;
 import org.w3c.dom.NamedNodeMap;
 
-import com.l2jmobius.commons.util.IGameXmlReader;
+import com.l2jmobius.commons.util.IXmlReader;
 import com.l2jmobius.gameserver.enums.TeleportType;
 import com.l2jmobius.gameserver.model.StatsSet;
 import com.l2jmobius.gameserver.model.teleporter.TeleportHolder;
@@ -33,12 +34,12 @@ import com.l2jmobius.gameserver.model.teleporter.TeleportHolder;
 /**
  * @author UnAfraid
  */
-public class TeleportersData implements IGameXmlReader
+public class TeleportersData implements IXmlReader
 {
 	// Logger instance
 	private static final Logger LOGGER = Logger.getLogger(TeleportersData.class.getName());
 	// Teleporter data
-	private final Map<Integer, Map<String, TeleportHolder>> _teleporters = new HashMap<>();
+	private final Map<Integer, Map<String, TeleportHolder>> _teleporters = new ConcurrentHashMap<>();
 	
 	protected TeleportersData()
 	{
diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/data/xml/impl/TransformData.java b/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/data/xml/impl/TransformData.java
index 896111de87..d917c7e46f 100644
--- a/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/data/xml/impl/TransformData.java
+++ b/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/data/xml/impl/TransformData.java
@@ -17,15 +17,15 @@
 package com.l2jmobius.gameserver.data.xml.impl;
 
 import java.io.File;
-import java.util.HashMap;
 import java.util.Map;
+import java.util.concurrent.ConcurrentHashMap;
 import java.util.logging.Logger;
 
 import org.w3c.dom.Document;
 import org.w3c.dom.NamedNodeMap;
 import org.w3c.dom.Node;
 
-import com.l2jmobius.commons.util.IGameXmlReader;
+import com.l2jmobius.commons.util.IXmlReader;
 import com.l2jmobius.gameserver.model.StatsSet;
 import com.l2jmobius.gameserver.model.actor.transform.Transform;
 import com.l2jmobius.gameserver.model.actor.transform.TransformLevelData;
@@ -39,11 +39,11 @@ import com.l2jmobius.gameserver.network.serverpackets.ExBasicActionList;
  * Transformation data.
  * @author UnAfraid
  */
-public final class TransformData implements IGameXmlReader
+public final class TransformData implements IXmlReader
 {
 	private static final Logger LOGGER = Logger.getLogger(TransformData.class.getName());
 	
-	private final Map<Integer, Transform> _transformData = new HashMap<>();
+	private final Map<Integer, Transform> _transformData = new ConcurrentHashMap<>();
 	
 	protected TransformData()
 	{
diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/data/xml/impl/VariationData.java b/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/data/xml/impl/VariationData.java
index 13b41c6359..542acc971b 100644
--- a/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/data/xml/impl/VariationData.java
+++ b/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/data/xml/impl/VariationData.java
@@ -22,11 +22,12 @@ import java.util.Collections;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
+import java.util.concurrent.ConcurrentHashMap;
 import java.util.logging.Logger;
 
 import org.w3c.dom.Document;
 
-import com.l2jmobius.commons.util.IGameXmlReader;
+import com.l2jmobius.commons.util.IXmlReader;
 import com.l2jmobius.gameserver.datatables.ItemTable;
 import com.l2jmobius.gameserver.model.VariationInstance;
 import com.l2jmobius.gameserver.model.items.instance.ItemInstance;
@@ -40,12 +41,12 @@ import com.l2jmobius.gameserver.model.options.VariationWeaponType;
 /**
  * @author Pere
  */
-public class VariationData implements IGameXmlReader
+public class VariationData implements IXmlReader
 {
 	private static final Logger LOGGER = Logger.getLogger(VariationData.class.getSimpleName());
 	
-	private final Map<Integer, Variation> _variations = new HashMap<>();
-	private final Map<Integer, Map<Integer, VariationFee>> _fees = new HashMap<>();
+	private final Map<Integer, Variation> _variations = new ConcurrentHashMap<>();
+	private final Map<Integer, Map<Integer, VariationFee>> _fees = new ConcurrentHashMap<>();
 	
 	protected VariationData()
 	{
diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/engines/DocumentEngine.java b/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/engines/DocumentEngine.java
index d787488757..10f04f4fb3 100644
--- a/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/engines/DocumentEngine.java
+++ b/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/engines/DocumentEngine.java
@@ -17,11 +17,14 @@
 package com.l2jmobius.gameserver.engines;
 
 import java.io.File;
-import java.util.LinkedList;
+import java.util.ArrayList;
 import java.util.List;
+import java.util.concurrent.CopyOnWriteArrayList;
+import java.util.concurrent.ScheduledFuture;
 import java.util.logging.Logger;
 
 import com.l2jmobius.Config;
+import com.l2jmobius.commons.concurrent.ThreadPool;
 import com.l2jmobius.commons.util.file.filter.XMLFilter;
 import com.l2jmobius.gameserver.engines.items.DocumentItem;
 import com.l2jmobius.gameserver.model.items.Item;
@@ -33,34 +36,29 @@ public class DocumentEngine
 {
 	private static final Logger LOGGER = Logger.getLogger(DocumentEngine.class.getName());
 	
-	private final List<File> _itemFiles = new LinkedList<>();
-	
-	public static DocumentEngine getInstance()
-	{
-		return SingletonHolder._instance;
-	}
+	private final List<File> _itemFiles = new ArrayList<>();
 	
 	protected DocumentEngine()
 	{
-		hashFiles("data/stats/items", _itemFiles);
+		processDirectory("data/stats/items", _itemFiles);
 		if (Config.CUSTOM_ITEMS_LOAD)
 		{
-			hashFiles("data/stats/items/custom", _itemFiles);
+			processDirectory("data/stats/items/custom", _itemFiles);
 		}
 	}
 	
-	private void hashFiles(String dirname, List<File> hash)
+	private void processDirectory(String dirName, List<File> list)
 	{
-		final File dir = new File(Config.DATAPACK_ROOT, dirname);
+		final File dir = new File(Config.DATAPACK_ROOT, dirName);
 		if (!dir.exists())
 		{
-			LOGGER.warning("Dir " + dir.getAbsolutePath() + " not exists");
+			LOGGER.warning("Dir " + dir.getAbsolutePath() + " does not exist.");
 			return;
 		}
 		final File[] files = dir.listFiles(new XMLFilter());
-		for (File f : files)
+		for (File file : files)
 		{
-			hash.add(f);
+			list.add(file);
 		}
 	}
 	
@@ -70,12 +68,26 @@ public class DocumentEngine
 	 */
 	public List<Item> loadItems()
 	{
-		final List<Item> list = new LinkedList<>();
-		for (File f : _itemFiles)
+		final List<Item> list = new CopyOnWriteArrayList<>();
+		final List<ScheduledFuture<?>> jobs = new CopyOnWriteArrayList<>();
+		for (File file : _itemFiles)
 		{
-			final DocumentItem document = new DocumentItem(f);
-			document.parse();
-			list.addAll(document.getItemList());
+			jobs.add(ThreadPool.schedule(() ->
+			{
+				final DocumentItem document = new DocumentItem(file);
+				document.parse();
+				list.addAll(document.getItemList());
+			}, 0));
+		}
+		while (!jobs.isEmpty())
+		{
+			for (ScheduledFuture<?> job : jobs)
+			{
+				if ((job == null) || job.isDone() || job.isCancelled())
+				{
+					jobs.remove(job);
+				}
+			}
 		}
 		return list;
 	}
@@ -84,4 +96,9 @@ public class DocumentEngine
 	{
 		protected static final DocumentEngine _instance = new DocumentEngine();
 	}
+	
+	public static DocumentEngine getInstance()
+	{
+		return SingletonHolder._instance;
+	}
 }
diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/engines/items/DocumentItem.java b/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/engines/items/DocumentItem.java
index 8aaaed2cb4..4ea960563d 100644
--- a/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/engines/items/DocumentItem.java
+++ b/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/engines/items/DocumentItem.java
@@ -19,7 +19,7 @@ package com.l2jmobius.gameserver.engines.items;
 import java.io.File;
 import java.lang.reflect.Constructor;
 import java.lang.reflect.InvocationTargetException;
-import java.util.LinkedList;
+import java.util.ArrayList;
 import java.util.List;
 import java.util.logging.Level;
 import java.util.logging.Logger;
@@ -27,7 +27,7 @@ import java.util.logging.Logger;
 import org.w3c.dom.Document;
 import org.w3c.dom.Node;
 
-import com.l2jmobius.commons.util.IGameXmlReader;
+import com.l2jmobius.commons.util.IXmlReader;
 import com.l2jmobius.gameserver.engines.DocumentBase;
 import com.l2jmobius.gameserver.enums.ItemSkillType;
 import com.l2jmobius.gameserver.model.ExtractableProduct;
@@ -41,12 +41,12 @@ import com.l2jmobius.gameserver.model.stats.functions.FuncTemplate;
 /**
  * @author mkizub, JIV
  */
-public final class DocumentItem extends DocumentBase implements IGameXmlReader
+public final class DocumentItem extends DocumentBase implements IXmlReader
 {
 	Logger LOGGER = Logger.getLogger(DocumentItem.class.getName());
 	
 	private ItemDataHolder _currentItem = null;
-	private final List<Item> _itemsInFile = new LinkedList<>();
+	private final List<Item> _itemsInFile = new ArrayList<>();
 	
 	/**
 	 * @param file
diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/handler/ConditionHandler.java b/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/handler/ConditionHandler.java
index c92ef368b3..4e20d5e720 100644
--- a/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/handler/ConditionHandler.java
+++ b/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/handler/ConditionHandler.java
@@ -50,7 +50,7 @@ public final class ConditionHandler
 	{
 		try
 		{
-			ScriptEngineManager.getInstance().executeConditionMasterHandler();
+			ScriptEngineManager.getInstance().executeScript(ScriptEngineManager.CONDITION_HANDLER_FILE);
 		}
 		catch (Exception e)
 		{
diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/handler/DailyMissionHandler.java b/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/handler/DailyMissionHandler.java
index 9a80c1db8f..6b6248da49 100644
--- a/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/handler/DailyMissionHandler.java
+++ b/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/handler/DailyMissionHandler.java
@@ -49,7 +49,7 @@ public class DailyMissionHandler
 	{
 		try
 		{
-			ScriptEngineManager.getInstance().executeDailyMissionMasterHandler();
+			ScriptEngineManager.getInstance().executeScript(ScriptEngineManager.ONE_DAY_REWARD_MASTER_HANDLER);
 		}
 		catch (Exception e)
 		{
diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/handler/EffectHandler.java b/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/handler/EffectHandler.java
index 0bf5350cb8..cab6562421 100644
--- a/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/handler/EffectHandler.java
+++ b/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/handler/EffectHandler.java
@@ -50,7 +50,7 @@ public final class EffectHandler
 	{
 		try
 		{
-			ScriptEngineManager.getInstance().executeEffectMasterHandler();
+			ScriptEngineManager.getInstance().executeScript(ScriptEngineManager.EFFECT_MASTER_HANDLER_FILE);
 		}
 		catch (Exception e)
 		{
diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/handler/SkillConditionHandler.java b/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/handler/SkillConditionHandler.java
index b764410ba1..8685b0279a 100644
--- a/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/handler/SkillConditionHandler.java
+++ b/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/handler/SkillConditionHandler.java
@@ -50,7 +50,7 @@ public final class SkillConditionHandler
 	{
 		try
 		{
-			ScriptEngineManager.getInstance().executeSkillConditionMasterHandler();
+			ScriptEngineManager.getInstance().executeScript(ScriptEngineManager.SKILL_CONDITION_HANDLER_FILE);
 		}
 		catch (Exception e)
 		{
diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/instancemanager/CastleManorManager.java b/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/instancemanager/CastleManorManager.java
index 48d04d3f38..212d1a043c 100644
--- a/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/instancemanager/CastleManorManager.java
+++ b/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/instancemanager/CastleManorManager.java
@@ -40,7 +40,7 @@ import org.w3c.dom.Node;
 import com.l2jmobius.Config;
 import com.l2jmobius.commons.concurrent.ThreadPool;
 import com.l2jmobius.commons.database.DatabaseFactory;
-import com.l2jmobius.commons.util.IGameXmlReader;
+import com.l2jmobius.commons.util.IXmlReader;
 import com.l2jmobius.commons.util.Rnd;
 import com.l2jmobius.gameserver.enums.ManorMode;
 import com.l2jmobius.gameserver.model.CropProcure;
@@ -58,7 +58,7 @@ import com.l2jmobius.gameserver.network.SystemMessageId;
  * Castle manor system.
  * @author malyelfik
  */
-public final class CastleManorManager implements IGameXmlReader, IStorable
+public final class CastleManorManager implements IXmlReader, IStorable
 {
 	private static final Logger LOGGER = Logger.getLogger(CastleManorManager.class.getName());
 	
diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/instancemanager/CursedWeaponsManager.java b/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/instancemanager/CursedWeaponsManager.java
index d123b41ef6..835d961c56 100644
--- a/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/instancemanager/CursedWeaponsManager.java
+++ b/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/instancemanager/CursedWeaponsManager.java
@@ -35,7 +35,7 @@ import org.w3c.dom.Node;
 
 import com.l2jmobius.Config;
 import com.l2jmobius.commons.database.DatabaseFactory;
-import com.l2jmobius.commons.util.IGameXmlReader;
+import com.l2jmobius.commons.util.IXmlReader;
 import com.l2jmobius.gameserver.model.CursedWeapon;
 import com.l2jmobius.gameserver.model.actor.Attackable;
 import com.l2jmobius.gameserver.model.actor.Creature;
@@ -54,7 +54,7 @@ import com.l2jmobius.gameserver.util.Broadcast;
  * UnAfraid: TODO: Rewrite with DocumentParser
  * @author Micht
  */
-public final class CursedWeaponsManager implements IGameXmlReader
+public final class CursedWeaponsManager implements IXmlReader
 {
 	private static final Logger LOGGER = Logger.getLogger(CursedWeaponsManager.class.getName());
 	
diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/instancemanager/FakePlayerChatManager.java b/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/instancemanager/FakePlayerChatManager.java
index 7101927e48..39c239a762 100644
--- a/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/instancemanager/FakePlayerChatManager.java
+++ b/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/instancemanager/FakePlayerChatManager.java
@@ -25,7 +25,7 @@ import org.w3c.dom.Document;
 
 import com.l2jmobius.Config;
 import com.l2jmobius.commons.concurrent.ThreadPool;
-import com.l2jmobius.commons.util.IGameXmlReader;
+import com.l2jmobius.commons.util.IXmlReader;
 import com.l2jmobius.commons.util.Rnd;
 import com.l2jmobius.gameserver.data.xml.impl.FakePlayerData;
 import com.l2jmobius.gameserver.datatables.SpawnTable;
@@ -41,7 +41,7 @@ import com.l2jmobius.gameserver.network.serverpackets.CreatureSay;
 /**
  * @author Mobius
  */
-public final class FakePlayerChatManager implements IGameXmlReader
+public final class FakePlayerChatManager implements IXmlReader
 {
 	private static Logger LOGGER = Logger.getLogger(FakePlayerChatManager.class.getName());
 	final List<FakePlayerChatHolder> MESSAGES = new ArrayList<>();
diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/instancemanager/InstanceManager.java b/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/instancemanager/InstanceManager.java
index f300213c49..5ea229cf1b 100644
--- a/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/instancemanager/InstanceManager.java
+++ b/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/instancemanager/InstanceManager.java
@@ -40,7 +40,6 @@ import org.w3c.dom.Node;
 
 import com.l2jmobius.Config;
 import com.l2jmobius.commons.database.DatabaseFactory;
-import com.l2jmobius.commons.util.IGameXmlReader;
 import com.l2jmobius.commons.util.IXmlReader;
 import com.l2jmobius.gameserver.data.xml.impl.DoorData;
 import com.l2jmobius.gameserver.data.xml.impl.SpawnsData;
@@ -61,7 +60,7 @@ import com.l2jmobius.gameserver.model.spawns.SpawnTemplate;
  * Instance manager.
  * @author evill33t, GodKratos, malyelfik
  */
-public final class InstanceManager implements IGameXmlReader
+public final class InstanceManager implements IXmlReader
 {
 	private static final Logger LOGGER = Logger.getLogger(InstanceManager.class.getName());
 	// Database query
diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/instancemanager/ItemAuctionManager.java b/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/instancemanager/ItemAuctionManager.java
index f819adf93b..752bcfdd3f 100644
--- a/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/instancemanager/ItemAuctionManager.java
+++ b/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/instancemanager/ItemAuctionManager.java
@@ -34,13 +34,13 @@ import org.w3c.dom.Node;
 
 import com.l2jmobius.Config;
 import com.l2jmobius.commons.database.DatabaseFactory;
-import com.l2jmobius.commons.util.IGameXmlReader;
+import com.l2jmobius.commons.util.IXmlReader;
 import com.l2jmobius.gameserver.model.itemauction.ItemAuctionInstance;
 
 /**
  * @author Forsaiken
  */
-public final class ItemAuctionManager implements IGameXmlReader
+public final class ItemAuctionManager implements IXmlReader
 {
 	private static final Logger LOGGER = Logger.getLogger(ItemAuctionManager.class.getName());
 	
diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/instancemanager/MapRegionManager.java b/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/instancemanager/MapRegionManager.java
index 255d4340ff..8f68a4bdf5 100644
--- a/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/instancemanager/MapRegionManager.java
+++ b/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/instancemanager/MapRegionManager.java
@@ -27,7 +27,7 @@ import org.w3c.dom.NamedNodeMap;
 import org.w3c.dom.Node;
 
 import com.l2jmobius.Config;
-import com.l2jmobius.commons.util.IGameXmlReader;
+import com.l2jmobius.commons.util.IXmlReader;
 import com.l2jmobius.gameserver.data.xml.impl.ClanHallData;
 import com.l2jmobius.gameserver.model.Location;
 import com.l2jmobius.gameserver.model.MapRegion;
@@ -47,7 +47,7 @@ import com.l2jmobius.gameserver.model.zone.type.RespawnZone;
  * Map Region Manager.
  * @author Nyaran
  */
-public final class MapRegionManager implements IGameXmlReader
+public final class MapRegionManager implements IXmlReader
 {
 	private static final Logger LOGGER = Logger.getLogger(MapRegionManager.class.getName());
 	
diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/instancemanager/SellBuffsManager.java b/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/instancemanager/SellBuffsManager.java
index dcf1bae346..0c4e94f449 100644
--- a/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/instancemanager/SellBuffsManager.java
+++ b/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/instancemanager/SellBuffsManager.java
@@ -26,7 +26,7 @@ import org.w3c.dom.Element;
 import org.w3c.dom.NodeList;
 
 import com.l2jmobius.Config;
-import com.l2jmobius.commons.util.IGameXmlReader;
+import com.l2jmobius.commons.util.IXmlReader;
 import com.l2jmobius.gameserver.cache.HtmCache;
 import com.l2jmobius.gameserver.data.xml.impl.SkillData;
 import com.l2jmobius.gameserver.datatables.ItemTable;
@@ -46,7 +46,7 @@ import com.l2jmobius.gameserver.util.Util;
  * Sell Buffs Manager
  * @author St3eT
  */
-public final class SellBuffsManager implements IGameXmlReader
+public final class SellBuffsManager implements IXmlReader
 {
 	private static final Logger LOGGER = Logger.getLogger(SellBuffsManager.class.getName());
 	private static final List<Integer> ALLOWED_BUFFS = new ArrayList<>();
diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/instancemanager/WalkingManager.java b/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/instancemanager/WalkingManager.java
index d1bba35f7c..423cbe0447 100644
--- a/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/instancemanager/WalkingManager.java
+++ b/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/instancemanager/WalkingManager.java
@@ -28,7 +28,7 @@ import org.w3c.dom.NamedNodeMap;
 import org.w3c.dom.Node;
 
 import com.l2jmobius.commons.concurrent.ThreadPool;
-import com.l2jmobius.commons.util.IGameXmlReader;
+import com.l2jmobius.commons.util.IXmlReader;
 import com.l2jmobius.gameserver.ai.CtrlIntention;
 import com.l2jmobius.gameserver.data.xml.impl.NpcData;
 import com.l2jmobius.gameserver.enums.ChatType;
@@ -47,7 +47,7 @@ import com.l2jmobius.gameserver.network.NpcStringId;
  * This class manages walking monsters.
  * @author GKR
  */
-public final class WalkingManager implements IGameXmlReader
+public final class WalkingManager implements IXmlReader
 {
 	private static final Logger LOGGER = Logger.getLogger(WalkingManager.class.getName());
 	
diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/instancemanager/ZoneManager.java b/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/instancemanager/ZoneManager.java
index b698f51a03..9a0bd870f2 100644
--- a/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/instancemanager/ZoneManager.java
+++ b/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/instancemanager/ZoneManager.java
@@ -26,6 +26,7 @@ import java.util.List;
 import java.util.Map;
 import java.util.Optional;
 import java.util.OptionalInt;
+import java.util.concurrent.ConcurrentHashMap;
 import java.util.logging.Level;
 import java.util.logging.Logger;
 
@@ -33,7 +34,7 @@ import org.w3c.dom.Document;
 import org.w3c.dom.NamedNodeMap;
 import org.w3c.dom.Node;
 
-import com.l2jmobius.commons.util.IGameXmlReader;
+import com.l2jmobius.commons.util.IXmlReader;
 import com.l2jmobius.gameserver.model.World;
 import com.l2jmobius.gameserver.model.WorldObject;
 import com.l2jmobius.gameserver.model.actor.Creature;
@@ -55,7 +56,7 @@ import com.l2jmobius.gameserver.model.zone.type.SpawnTerritory;
  * This class manages the zones
  * @author durgus
  */
-public final class ZoneManager implements IGameXmlReader
+public final class ZoneManager implements IXmlReader
 {
 	private static final Logger LOGGER = Logger.getLogger(ZoneManager.class.getName());
 	
@@ -65,9 +66,9 @@ public final class ZoneManager implements IGameXmlReader
 	private static final int OFFSET_X = Math.abs(World.MAP_MIN_X >> SHIFT_BY);
 	private static final int OFFSET_Y = Math.abs(World.MAP_MIN_Y >> SHIFT_BY);
 	
-	private final Map<Class<? extends ZoneType>, Map<Integer, ? extends ZoneType>> _classZones = new HashMap<>();
-	private final Map<String, SpawnTerritory> _spawnTerritories = new HashMap<>();
-	private int _lastDynamicId = 300000;
+	private final Map<Class<? extends ZoneType>, ConcurrentHashMap<Integer, ? extends ZoneType>> _classZones = new ConcurrentHashMap<>();
+	private final Map<String, SpawnTerritory> _spawnTerritories = new ConcurrentHashMap<>();
+	private volatile int _lastDynamicId = 300000;
 	private List<ItemInstance> _debugItems;
 	
 	private final ZoneRegion[][] _zoneRegions = new ZoneRegion[(World.MAP_MAX_X >> SHIFT_BY) + OFFSET_X + 1][(World.MAP_MAX_Y >> SHIFT_BY) + OFFSET_Y + 1];
@@ -365,7 +366,7 @@ public final class ZoneManager implements IGameXmlReader
 						}
 						if (checkId(zoneId))
 						{
-							LOGGER.config(getClass().getSimpleName() + ": Caution: Zone (" + zoneId + ") from file: " + f.getName() + " overrides previos definition.");
+							LOGGER.config(getClass().getSimpleName() + ": Caution: Zone (" + zoneId + ") from file: " + f.getName() + " overrides previuos definition.");
 						}
 						
 						if ((zoneName != null) && !zoneName.isEmpty())
@@ -453,10 +454,10 @@ public final class ZoneManager implements IGameXmlReader
 	@SuppressWarnings("unchecked")
 	private <T extends ZoneType> void addZone(Integer id, T zone)
 	{
-		Map<Integer, T> map = (Map<Integer, T>) _classZones.get(zone.getClass());
+		ConcurrentHashMap<Integer, T> map = (ConcurrentHashMap<Integer, T>) _classZones.get(zone.getClass());
 		if (map == null)
 		{
-			map = new HashMap<>();
+			map = new ConcurrentHashMap<>();
 			map.put(id, zone);
 			_classZones.put(zone.getClass(), map);
 		}
diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/model/quest/LongTimeEvent.java b/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/model/quest/LongTimeEvent.java
index cc71991407..0fa020eb5d 100644
--- a/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/model/quest/LongTimeEvent.java
+++ b/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/model/quest/LongTimeEvent.java
@@ -32,7 +32,7 @@ import org.w3c.dom.Node;
 
 import com.l2jmobius.commons.concurrent.ThreadPool;
 import com.l2jmobius.commons.database.DatabaseFactory;
-import com.l2jmobius.commons.util.IGameXmlReader;
+import com.l2jmobius.commons.util.IXmlReader;
 import com.l2jmobius.gameserver.data.sql.impl.AnnouncementsTable;
 import com.l2jmobius.gameserver.data.xml.impl.NpcData;
 import com.l2jmobius.gameserver.datatables.EventDroplist;
@@ -117,7 +117,7 @@ public class LongTimeEvent extends Quest
 	 */
 	private void loadConfig()
 	{
-		new IGameXmlReader()
+		new IXmlReader()
 		{
 			@Override
 			public void load()
diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/model/stats/BaseStats.java b/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/model/stats/BaseStats.java
index 1cb9ebbe1e..b692107007 100644
--- a/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/model/stats/BaseStats.java
+++ b/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/model/stats/BaseStats.java
@@ -23,7 +23,6 @@ import java.util.logging.Logger;
 import org.w3c.dom.Document;
 import org.w3c.dom.NamedNodeMap;
 
-import com.l2jmobius.commons.util.IGameXmlReader;
 import com.l2jmobius.commons.util.IXmlReader;
 import com.l2jmobius.gameserver.model.actor.Creature;
 
@@ -103,7 +102,7 @@ public enum BaseStats
 	
 	static
 	{
-		new IGameXmlReader()
+		new IXmlReader()
 		{
 			final Logger LOGGER = Logger.getLogger(BaseStats.class.getName());
 			
diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/scripting/ScriptEngineManager.java b/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/scripting/ScriptEngineManager.java
index 9eb6d85b69..95409c567a 100644
--- a/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/scripting/ScriptEngineManager.java
+++ b/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/scripting/ScriptEngineManager.java
@@ -28,8 +28,6 @@ import java.nio.file.attribute.BasicFileAttributes;
 import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.Iterator;
-import java.util.LinkedHashMap;
-import java.util.LinkedList;
 import java.util.List;
 import java.util.Map;
 import java.util.Map.Entry;
@@ -42,14 +40,14 @@ import java.util.logging.Logger;
 import org.w3c.dom.Document;
 
 import com.l2jmobius.Config;
-import com.l2jmobius.commons.util.IGameXmlReader;
+import com.l2jmobius.commons.util.IXmlReader;
 import com.l2jmobius.gameserver.scripting.java.JavaScriptingEngine;
 
 /**
  * Caches script engines and provides functionality for executing and managing scripts.
  * @author KenM, HorridoJoho
  */
-public final class ScriptEngineManager implements IGameXmlReader
+public final class ScriptEngineManager implements IXmlReader
 {
 	private static final Logger LOGGER = Logger.getLogger(ScriptEngineManager.class.getName());
 	public static final Path SCRIPT_FOLDER = Paths.get(Config.DATAPACK_ROOT.getAbsolutePath(), "data", "scripts");
@@ -59,8 +57,7 @@ public final class ScriptEngineManager implements IGameXmlReader
 	public static final Path CONDITION_HANDLER_FILE = Paths.get(SCRIPT_FOLDER.toString(), "handlers", "ConditionMasterHandler.java");
 	public static final Path ONE_DAY_REWARD_MASTER_HANDLER = Paths.get(SCRIPT_FOLDER.toString(), "handlers", "DailyMissionMasterHandler.java");
 	
-	private final Map<String, IExecutionContext> _extEngines = new HashMap<>();
-	private IExecutionContext _currentExecutionContext = null;
+	private IExecutionContext _javaExecutionContext = null;
 	static final List<String> _exclusions = new ArrayList<>();
 	
 	protected ScriptEngineManager()
@@ -166,12 +163,7 @@ public final class ScriptEngineManager implements IGameXmlReader
 	private void registerEngine(IScriptingEngine engine, Properties props)
 	{
 		maybeSetProperties("language." + engine.getLanguageName() + ".", props, engine);
-		final IExecutionContext context = engine.createExecutionContext();
-		for (String commonExtension : engine.getCommonFileExtensions())
-		{
-			_extEngines.put(commonExtension, context);
-		}
-		
+		_javaExecutionContext = engine.createExecutionContext();
 		LOGGER.info("ScriptEngine: " + engine.getEngineName() + " " + engine.getEngineVersion() + " (" + engine.getLanguageName() + " " + engine.getLanguageVersion() + ")");
 	}
 	
@@ -200,66 +192,6 @@ public final class ScriptEngineManager implements IGameXmlReader
 		}
 	}
 	
-	private IExecutionContext getEngineByExtension(String ext)
-	{
-		return _extEngines.get(ext);
-	}
-	
-	private String getFileExtension(Path p)
-	{
-		final String name = p.getFileName().toString();
-		final int lastDotIdx = name.lastIndexOf('.');
-		if (lastDotIdx == -1)
-		{
-			return null;
-		}
-		
-		final String extension = name.substring(lastDotIdx + 1);
-		if (extension.isEmpty())
-		{
-			return null;
-		}
-		
-		return extension;
-	}
-	
-	private void checkExistingFile(String messagePre, Path filePath) throws Exception
-	{
-		if (!Files.exists(filePath))
-		{
-			throw new Exception(messagePre + ": " + filePath + " does not exists!");
-		}
-		else if (!Files.isRegularFile(filePath))
-		{
-			throw new Exception(messagePre + ": " + filePath + " is not a file!");
-		}
-	}
-	
-	public void executeMasterHandler() throws Exception
-	{
-		executeScript(MASTER_HANDLER_FILE);
-	}
-	
-	public void executeEffectMasterHandler() throws Exception
-	{
-		executeScript(EFFECT_MASTER_HANDLER_FILE);
-	}
-	
-	public void executeSkillConditionMasterHandler() throws Exception
-	{
-		executeScript(SKILL_CONDITION_HANDLER_FILE);
-	}
-	
-	public void executeConditionMasterHandler() throws Exception
-	{
-		executeScript(CONDITION_HANDLER_FILE);
-	}
-	
-	public void executeDailyMissionMasterHandler() throws Exception
-	{
-		executeScript(ONE_DAY_REWARD_MASTER_HANDLER);
-	}
-	
 	public void executeScriptList() throws Exception
 	{
 		if (Config.ALT_DEV_NO_QUESTS)
@@ -267,77 +199,35 @@ public final class ScriptEngineManager implements IGameXmlReader
 			return;
 		}
 		
-		final Map<IExecutionContext, List<Path>> files = new LinkedHashMap<>();
+		final List<Path> files = new ArrayList<>();
 		processDirectory(SCRIPT_FOLDER.toFile(), files);
 		
-		for (Entry<IExecutionContext, List<Path>> entry : files.entrySet())
+		final Map<Path, Throwable> invokationErrors = _javaExecutionContext.executeScripts(files);
+		for (Entry<Path, Throwable> entry : invokationErrors.entrySet())
 		{
-			_currentExecutionContext = entry.getKey();
-			try
-			{
-				final Map<Path, Throwable> invokationErrors = entry.getKey().executeScripts(entry.getValue());
-				for (Entry<Path, Throwable> entry2 : invokationErrors.entrySet())
-				{
-					LOGGER.log(Level.WARNING, "ScriptEngine: " + entry2.getKey() + " failed execution!", entry2.getValue());
-				}
-			}
-			finally
-			{
-				_currentExecutionContext = null;
-			}
+			LOGGER.log(Level.WARNING, "ScriptEngine: " + entry.getKey() + " failed execution!", entry.getValue());
 		}
 	}
 	
-	private void processDirectory(File dir, Map<IExecutionContext, List<Path>> files)
+	private void processDirectory(File dir, List<Path> files)
 	{
 		for (File file : dir.listFiles())
 		{
-			if (file.isDirectory())
+			if (file.isFile())
+			{
+				final String fileName = file.getName();
+				if (fileName.endsWith(".java") && !_exclusions.contains(fileName))
+				{
+					files.add(file.toPath().toAbsolutePath());
+				}
+			}
+			else if (file.isDirectory())
 			{
 				processDirectory(file, files);
 			}
-			else
-			{
-				processFile(file, files);
-			}
 		}
 	}
 	
-	private void processFile(File file, Map<IExecutionContext, List<Path>> files)
-	{
-		if (_exclusions.contains(file.getName()))
-		{
-			return;
-		}
-		
-		Path sourceFile = file.toPath();
-		try
-		{
-			checkExistingFile("ScriptFile", sourceFile);
-		}
-		catch (Exception e)
-		{
-			LOGGER.warning(e.getMessage());
-			return;
-		}
-		
-		sourceFile = sourceFile.toAbsolutePath();
-		final String ext = getFileExtension(sourceFile);
-		if (ext == null)
-		{
-			LOGGER.warning("ScriptFile: " + sourceFile + " does not have an extension to determine the script engine!");
-			return;
-		}
-		
-		final IExecutionContext engine = getEngineByExtension(ext);
-		if (engine == null)
-		{
-			return;
-		}
-		
-		files.computeIfAbsent(engine, k -> new LinkedList<>()).add(sourceFile);
-	}
-	
 	public void executeScript(Path sourceFile) throws Exception
 	{
 		Objects.requireNonNull(sourceFile);
@@ -347,34 +237,19 @@ public final class ScriptEngineManager implements IGameXmlReader
 			sourceFile = SCRIPT_FOLDER.resolve(sourceFile);
 		}
 		
-		// throws exception if not exists or not file
-		checkExistingFile("ScriptFile", sourceFile);
-		
 		sourceFile = sourceFile.toAbsolutePath();
-		final String ext = getFileExtension(sourceFile);
 		Objects.requireNonNull(sourceFile, "ScriptFile: " + sourceFile + " does not have an extension to determine the script engine!");
 		
-		final IExecutionContext engine = getEngineByExtension(ext);
-		Objects.requireNonNull(engine, "ScriptEngine: No engine registered for extension " + ext + "!");
-		
-		_currentExecutionContext = engine;
-		try
+		final Entry<Path, Throwable> error = _javaExecutionContext.executeScript(sourceFile);
+		if (error != null)
 		{
-			final Entry<Path, Throwable> error = engine.executeScript(sourceFile);
-			if (error != null)
-			{
-				throw new Exception("ScriptEngine: " + error.getKey() + " failed execution!", error.getValue());
-			}
-		}
-		finally
-		{
-			_currentExecutionContext = null;
+			throw new Exception("ScriptEngine: " + error.getKey() + " failed execution!", error.getValue());
 		}
 	}
 	
 	public Path getCurrentLoadingScript()
 	{
-		return _currentExecutionContext != null ? _currentExecutionContext.getCurrentExecutingScript() : null;
+		return _javaExecutionContext.getCurrentExecutingScript();
 	}
 	
 	public static ScriptEngineManager getInstance()
diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/loginserver/GameServerTable.java b/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/loginserver/GameServerTable.java
index 456224d78c..4269e47969 100644
--- a/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/loginserver/GameServerTable.java
+++ b/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/loginserver/GameServerTable.java
@@ -36,8 +36,8 @@ import org.w3c.dom.Document;
 import org.w3c.dom.NodeList;
 
 import com.l2jmobius.commons.database.DatabaseFactory;
-import com.l2jmobius.commons.util.IGameXmlReader;
 import com.l2jmobius.commons.util.IPSubnet;
+import com.l2jmobius.commons.util.IXmlReader;
 import com.l2jmobius.commons.util.Rnd;
 import com.l2jmobius.loginserver.network.gameserverpackets.ServerStatus;
 
@@ -45,7 +45,7 @@ import com.l2jmobius.loginserver.network.gameserverpackets.ServerStatus;
  * The Class GameServerTable loads the game server names and initialize the game server tables.
  * @author KenM, Zoey76
  */
-public final class GameServerTable implements IGameXmlReader
+public final class GameServerTable implements IXmlReader
 {
 	private static final Logger LOGGER = Logger.getLogger(GameServerTable.class.getName());
 	
diff --git a/L2J_Mobius_Classic_2.1_Zaken/dist/game/config/Scripts.xml b/L2J_Mobius_Classic_2.1_Zaken/dist/game/config/Scripts.xml
index 284aa0a31f..54d05b241f 100644
--- a/L2J_Mobius_Classic_2.1_Zaken/dist/game/config/Scripts.xml
+++ b/L2J_Mobius_Classic_2.1_Zaken/dist/game/config/Scripts.xml
@@ -2,11 +2,7 @@
 <list xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../data/xsd/Scripts.xsd">
 	<!-- Skip these filenames from script loading, because they are already loaded using a different way. -->
 	<exclude file="package-info.java" />
-	<exclude file="MasterHandler.java" />
-	<exclude file="EffectMasterHandler.java" />
-	<exclude file="SkillConditionMasterHandler.java" />
-	<exclude file="ConditionMasterHandler.java" />
-	<exclude file="DailyMissionMasterHandler.java" />
+	<exclude file="handlers" />
 	
 	<!--
 	With this file you can exclude/include specific folders/files from within the scripts directory.
diff --git a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/ai/others/ClassMaster/ClassMaster.java b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/ai/others/ClassMaster/ClassMaster.java
index b4aa56887e..64b38902b0 100644
--- a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/ai/others/ClassMaster/ClassMaster.java
+++ b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/ai/others/ClassMaster/ClassMaster.java
@@ -30,7 +30,7 @@ import org.w3c.dom.NamedNodeMap;
 import org.w3c.dom.Node;
 
 import com.l2jmobius.Config;
-import com.l2jmobius.commons.util.IGameXmlReader;
+import com.l2jmobius.commons.util.IXmlReader;
 import com.l2jmobius.gameserver.data.xml.impl.CategoryData;
 import com.l2jmobius.gameserver.data.xml.impl.ClassListData;
 import com.l2jmobius.gameserver.data.xml.impl.SkillData;
@@ -63,7 +63,7 @@ import ai.AbstractNpcAI;
  * Class Master AI.
  * @author Nik
  */
-public final class ClassMaster extends AbstractNpcAI implements IGameXmlReader
+public final class ClassMaster extends AbstractNpcAI implements IXmlReader
 {
 	// NPCs
 	private static final List<Integer> CLASS_MASTERS = new ArrayList<>();
diff --git a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/admincommandhandlers/AdminQuest.java b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/admincommandhandlers/AdminQuest.java
index 228cc1668d..a771c4ab90 100644
--- a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/admincommandhandlers/AdminQuest.java
+++ b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/admincommandhandlers/AdminQuest.java
@@ -320,7 +320,7 @@ public class AdminQuest implements IAdminCommandHandler
 				{
 					sb.append("<a action=\"bypass -h admin_script_dir " + c + "\">" + c + "</a><br1>");
 				}
-				else if (c.endsWith(".java") || c.endsWith(".py"))
+				else if (c.endsWith(".java"))
 				{
 					sb.append("<a action=\"bypass -h admin_script_load " + c + "\"><font color=\"LEVEL\">" + c + "</font></a><br1>");
 				}
@@ -352,7 +352,7 @@ public class AdminQuest implements IAdminCommandHandler
 				{
 					sb.append("<a action=\"bypass -h admin_script_dir " + currentPath + "/" + c + "\">" + (questReducedNames ? getQuestName(c) : c) + "</a><br1>");
 				}
-				else if (c.endsWith(".java") || c.endsWith(".py"))
+				else if (c.endsWith(".java"))
 				{
 					sb.append("<a action=\"bypass -h admin_script_load " + currentPath + "/" + c + "\"><font color=\"LEVEL\">" + c + "</font></a><br1>");
 				}
diff --git a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/admincommandhandlers/AdminReload.java b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/admincommandhandlers/AdminReload.java
index 466ed146cd..b89bd7cbcd 100644
--- a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/admincommandhandlers/AdminReload.java
+++ b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/admincommandhandlers/AdminReload.java
@@ -221,7 +221,7 @@ public class AdminReload implements IAdminCommandHandler
 				{
 					try
 					{
-						ScriptEngineManager.getInstance().executeEffectMasterHandler();
+						ScriptEngineManager.getInstance().executeScript(ScriptEngineManager.EFFECT_MASTER_HANDLER_FILE);
 						AdminData.getInstance().broadcastMessageToGMs(activeChar.getName() + ": Reloaded effect master handler.");
 					}
 					catch (Exception e)
@@ -235,7 +235,7 @@ public class AdminReload implements IAdminCommandHandler
 				{
 					try
 					{
-						ScriptEngineManager.getInstance().executeMasterHandler();
+						ScriptEngineManager.getInstance().executeScript(ScriptEngineManager.MASTER_HANDLER_FILE);
 						AdminData.getInstance().broadcastMessageToGMs(activeChar.getName() + ": Reloaded master handler.");
 					}
 					catch (Exception e)
diff --git a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/telnethandlers/server/Reload.java b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/telnethandlers/server/Reload.java
index d679ea1212..491b10cc62 100644
--- a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/telnethandlers/server/Reload.java
+++ b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/telnethandlers/server/Reload.java
@@ -181,7 +181,7 @@ public class Reload implements ITelnetCommand
 			{
 				try
 				{
-					ScriptEngineManager.getInstance().executeEffectMasterHandler();
+					ScriptEngineManager.getInstance().executeScript(ScriptEngineManager.EFFECT_MASTER_HANDLER_FILE);
 					return AdminData.getInstance().broadcastMessageToGMs("Telnet Admin: Reloaded effect master handler.");
 				}
 				catch (Exception e)
@@ -194,7 +194,7 @@ public class Reload implements ITelnetCommand
 			{
 				try
 				{
-					ScriptEngineManager.getInstance().executeMasterHandler();
+					ScriptEngineManager.getInstance().executeScript(ScriptEngineManager.MASTER_HANDLER_FILE);
 					return AdminData.getInstance().broadcastMessageToGMs("Telnet Admin: Reloaded master handler.");
 				}
 				catch (Exception e)
diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/com/l2jmobius/Config.java b/L2J_Mobius_Classic_2.1_Zaken/java/com/l2jmobius/Config.java
index 5a8a6b731d..4069e1357d 100644
--- a/L2J_Mobius_Classic_2.1_Zaken/java/com/l2jmobius/Config.java
+++ b/L2J_Mobius_Classic_2.1_Zaken/java/com/l2jmobius/Config.java
@@ -54,7 +54,7 @@ import org.w3c.dom.Document;
 import org.w3c.dom.NamedNodeMap;
 import org.w3c.dom.Node;
 
-import com.l2jmobius.commons.util.IGameXmlReader;
+import com.l2jmobius.commons.util.IXmlReader;
 import com.l2jmobius.commons.util.PropertiesParser;
 import com.l2jmobius.commons.util.StringUtil;
 import com.l2jmobius.gameserver.enums.ChatType;
@@ -2999,7 +2999,7 @@ public final class Config
 		return result;
 	}
 	
-	private static class IPConfigData implements IGameXmlReader
+	private static class IPConfigData implements IXmlReader
 	{
 		private static final List<String> _subnets = new ArrayList<>(5);
 		private static final List<String> _hosts = new ArrayList<>(5);
diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/com/l2jmobius/commons/util/IGameXmlReader.java b/L2J_Mobius_Classic_2.1_Zaken/java/com/l2jmobius/commons/util/IGameXmlReader.java
deleted file mode 100644
index b29089db77..0000000000
--- a/L2J_Mobius_Classic_2.1_Zaken/java/com/l2jmobius/commons/util/IGameXmlReader.java
+++ /dev/null
@@ -1,118 +0,0 @@
-/*
- * This file is part of the L2J Mobius project.
- * 
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- * 
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * General Public License for more details.
- * 
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- */
-package com.l2jmobius.commons.util;
-
-import java.io.File;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
-import org.w3c.dom.NamedNodeMap;
-import org.w3c.dom.Node;
-
-import com.l2jmobius.Config;
-import com.l2jmobius.gameserver.model.Location;
-import com.l2jmobius.gameserver.model.holders.MinionHolder;
-import com.l2jmobius.gameserver.model.holders.SkillHolder;
-
-/**
- * Interface for XML parsers.
- * @author Zoey76
- */
-public interface IGameXmlReader extends IXmlReader
-{
-	/**
-	 * Wrapper for {@link #parseFile(File)} method.
-	 * @param path the relative path to the datapack root of the XML file to parse.
-	 */
-	default void parseDatapackFile(String path)
-	{
-		parseFile(new File(Config.DATAPACK_ROOT, path));
-	}
-	
-	/**
-	 * Wrapper for {@link #parseDirectory(File, boolean)}.
-	 * @param path the path to the directory where the XML files are
-	 * @param recursive parses all sub folders if there is
-	 * @return {@code false} if it fails to find the directory, {@code true} otherwise
-	 */
-	default boolean parseDatapackDirectory(String path, boolean recursive)
-	{
-		return parseDirectory(new File(Config.DATAPACK_ROOT, path), recursive);
-	}
-	
-	/**
-	 * @param n
-	 * @return a map of parameters
-	 */
-	default Map<String, Object> parseParameters(Node n)
-	{
-		final Map<String, Object> parameters = new HashMap<>();
-		for (Node parameters_node = n.getFirstChild(); parameters_node != null; parameters_node = parameters_node.getNextSibling())
-		{
-			NamedNodeMap attrs = parameters_node.getAttributes();
-			switch (parameters_node.getNodeName().toLowerCase())
-			{
-				case "param":
-				{
-					parameters.put(parseString(attrs, "name"), parseString(attrs, "value"));
-					break;
-				}
-				case "skill":
-				{
-					parameters.put(parseString(attrs, "name"), new SkillHolder(parseInteger(attrs, "id"), parseInteger(attrs, "level")));
-					break;
-				}
-				case "location":
-				{
-					parameters.put(parseString(attrs, "name"), new Location(parseInteger(attrs, "x"), parseInteger(attrs, "y"), parseInteger(attrs, "z"), parseInteger(attrs, "heading", 0)));
-					break;
-				}
-				case "minions":
-				{
-					final List<MinionHolder> minions = new ArrayList<>(1);
-					for (Node minions_node = parameters_node.getFirstChild(); minions_node != null; minions_node = minions_node.getNextSibling())
-					{
-						if (minions_node.getNodeName().equalsIgnoreCase("npc"))
-						{
-							attrs = minions_node.getAttributes();
-							minions.add(new MinionHolder(parseInteger(attrs, "id"), parseInteger(attrs, "count"), parseInteger(attrs, "respawnTime"), parseInteger(attrs, "weightPoint")));
-						}
-					}
-					
-					if (!minions.isEmpty())
-					{
-						parameters.put(parseString(parameters_node.getAttributes(), "name"), minions);
-					}
-					break;
-				}
-			}
-		}
-		return parameters;
-	}
-	
-	default Location parseLocation(Node n)
-	{
-		final NamedNodeMap attrs = n.getAttributes();
-		final int x = parseInteger(attrs, "x");
-		final int y = parseInteger(attrs, "y");
-		final int z = parseInteger(attrs, "z");
-		final int heading = parseInteger(attrs, "heading", 0);
-		return new Location(x, y, z, heading);
-	}
-}
diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/com/l2jmobius/commons/util/IXmlReader.java b/L2J_Mobius_Classic_2.1_Zaken/java/com/l2jmobius/commons/util/IXmlReader.java
index 0317816fd8..4bfed2396e 100644
--- a/L2J_Mobius_Classic_2.1_Zaken/java/com/l2jmobius/commons/util/IXmlReader.java
+++ b/L2J_Mobius_Classic_2.1_Zaken/java/com/l2jmobius/commons/util/IXmlReader.java
@@ -18,8 +18,13 @@ package com.l2jmobius.commons.util;
 
 import java.io.File;
 import java.io.FileFilter;
+import java.util.ArrayList;
+import java.util.HashMap;
 import java.util.LinkedHashMap;
+import java.util.List;
 import java.util.Map;
+import java.util.concurrent.CopyOnWriteArrayList;
+import java.util.concurrent.ScheduledFuture;
 import java.util.function.Consumer;
 import java.util.function.Predicate;
 import java.util.logging.Level;
@@ -35,7 +40,12 @@ import org.w3c.dom.NodeList;
 import org.xml.sax.ErrorHandler;
 import org.xml.sax.SAXParseException;
 
+import com.l2jmobius.Config;
+import com.l2jmobius.commons.concurrent.ThreadPool;
 import com.l2jmobius.commons.util.file.filter.XMLFilter;
+import com.l2jmobius.gameserver.model.Location;
+import com.l2jmobius.gameserver.model.holders.MinionHolder;
+import com.l2jmobius.gameserver.model.holders.SkillHolder;
 
 /**
  * Interface for XML parsers.
@@ -56,6 +66,15 @@ public interface IXmlReader
 	 */
 	void load();
 	
+	/**
+	 * Wrapper for {@link #parseFile(File)} method.
+	 * @param path the relative path to the datapack root of the XML file to parse.
+	 */
+	default void parseDatapackFile(String path)
+	{
+		parseFile(new File(Config.DATAPACK_ROOT, path));
+	}
+	
 	/**
 	 * Parses a single XML file.<br>
 	 * If the file was successfully parsed, call {@link #parseDocument(Document, File)} for the parsed document.<br>
@@ -121,6 +140,17 @@ public interface IXmlReader
 		return parseDirectory(file, false);
 	}
 	
+	/**
+	 * Wrapper for {@link #parseDirectory(File, boolean)}.
+	 * @param path the path to the directory where the XML files are
+	 * @param recursive parses all sub folders if there is
+	 * @return {@code false} if it fails to find the directory, {@code true} otherwise
+	 */
+	default boolean parseDatapackDirectory(String path, boolean recursive)
+	{
+		return parseDirectory(new File(Config.DATAPACK_ROOT, path), recursive);
+	}
+	
 	/**
 	 * Loads all XML files from {@code path} and calls {@link #parseFile(File)} for each one of them.
 	 * @param dir the directory object to scan.
@@ -135,6 +165,7 @@ public interface IXmlReader
 			return false;
 		}
 		
+		final List<ScheduledFuture<?>> jobs = new CopyOnWriteArrayList<>();
 		final File[] listOfFiles = dir.listFiles();
 		for (File f : listOfFiles)
 		{
@@ -144,9 +175,23 @@ public interface IXmlReader
 			}
 			else if (getCurrentFileFilter().accept(f))
 			{
-				parseFile(f);
+				jobs.add(ThreadPool.schedule(() ->
+				{
+					parseFile(f);
+				}, 0));
 			}
 		}
+		while (!jobs.isEmpty())
+		{
+			for (ScheduledFuture<?> job : jobs)
+			{
+				if ((job == null) || job.isDone() || job.isCancelled())
+				{
+					jobs.remove(job);
+				}
+			}
+		}
+		
 		return true;
 	}
 	
@@ -531,6 +576,16 @@ public interface IXmlReader
 		return parseString(attrs.getNamedItem(name), defaultValue);
 	}
 	
+	default Location parseLocation(Node n)
+	{
+		final NamedNodeMap attrs = n.getAttributes();
+		final int x = parseInteger(attrs, "x");
+		final int y = parseInteger(attrs, "y");
+		final int z = parseInteger(attrs, "z");
+		final int heading = parseInteger(attrs, "heading", 0);
+		return new Location(x, y, z, heading);
+	}
+	
 	/**
 	 * Parses an enumerated value.
 	 * @param <T> the enumerated type
@@ -612,6 +667,56 @@ public interface IXmlReader
 		return map;
 	}
 	
+	/**
+	 * @param n
+	 * @return a map of parameters
+	 */
+	default Map<String, Object> parseParameters(Node n)
+	{
+		final Map<String, Object> parameters = new HashMap<>();
+		for (Node parameters_node = n.getFirstChild(); parameters_node != null; parameters_node = parameters_node.getNextSibling())
+		{
+			NamedNodeMap attrs = parameters_node.getAttributes();
+			switch (parameters_node.getNodeName().toLowerCase())
+			{
+				case "param":
+				{
+					parameters.put(parseString(attrs, "name"), parseString(attrs, "value"));
+					break;
+				}
+				case "skill":
+				{
+					parameters.put(parseString(attrs, "name"), new SkillHolder(parseInteger(attrs, "id"), parseInteger(attrs, "level")));
+					break;
+				}
+				case "location":
+				{
+					parameters.put(parseString(attrs, "name"), new Location(parseInteger(attrs, "x"), parseInteger(attrs, "y"), parseInteger(attrs, "z"), parseInteger(attrs, "heading", 0)));
+					break;
+				}
+				case "minions":
+				{
+					final List<MinionHolder> minions = new ArrayList<>(1);
+					for (Node minions_node = parameters_node.getFirstChild(); minions_node != null; minions_node = minions_node.getNextSibling())
+					{
+						if (minions_node.getNodeName().equalsIgnoreCase("npc"))
+						{
+							attrs = minions_node.getAttributes();
+							minions.add(new MinionHolder(parseInteger(attrs, "id"), parseInteger(attrs, "count"), parseInteger(attrs, "respawnTime"), parseInteger(attrs, "weightPoint")));
+						}
+					}
+					
+					if (!minions.isEmpty())
+					{
+						parameters.put(parseString(parameters_node.getAttributes(), "name"), minions);
+					}
+					break;
+				}
+			}
+		}
+		return parameters;
+	}
+	
 	/**
 	 * Executes action for each child of node
 	 * @param node
diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/com/l2jmobius/gameserver/GameServer.java b/L2J_Mobius_Classic_2.1_Zaken/java/com/l2jmobius/gameserver/GameServer.java
index 0276cda81d..10c150f549 100644
--- a/L2J_Mobius_Classic_2.1_Zaken/java/com/l2jmobius/gameserver/GameServer.java
+++ b/L2J_Mobius_Classic_2.1_Zaken/java/com/l2jmobius/gameserver/GameServer.java
@@ -358,7 +358,7 @@ public class GameServer
 		try
 		{
 			LOGGER.info(getClass().getSimpleName() + ": Loading server scripts:");
-			ScriptEngineManager.getInstance().executeMasterHandler();
+			ScriptEngineManager.getInstance().executeScript(ScriptEngineManager.MASTER_HANDLER_FILE);
 			ScriptEngineManager.getInstance().executeScriptList();
 		}
 		catch (Exception e)
diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/com/l2jmobius/gameserver/data/xml/impl/ActionData.java b/L2J_Mobius_Classic_2.1_Zaken/java/com/l2jmobius/gameserver/data/xml/impl/ActionData.java
index 0bffdc5bb1..a322dad1d9 100644
--- a/L2J_Mobius_Classic_2.1_Zaken/java/com/l2jmobius/gameserver/data/xml/impl/ActionData.java
+++ b/L2J_Mobius_Classic_2.1_Zaken/java/com/l2jmobius/gameserver/data/xml/impl/ActionData.java
@@ -23,14 +23,14 @@ import java.util.logging.Logger;
 
 import org.w3c.dom.Document;
 
-import com.l2jmobius.commons.util.IGameXmlReader;
+import com.l2jmobius.commons.util.IXmlReader;
 import com.l2jmobius.gameserver.model.ActionDataHolder;
 import com.l2jmobius.gameserver.model.StatsSet;
 
 /**
  * @author UnAfraid
  */
-public class ActionData implements IGameXmlReader
+public class ActionData implements IXmlReader
 {
 	private static final Logger LOGGER = Logger.getLogger(ActionData.class.getName());
 	
diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/com/l2jmobius/gameserver/data/xml/impl/AdminData.java b/L2J_Mobius_Classic_2.1_Zaken/java/com/l2jmobius/gameserver/data/xml/impl/AdminData.java
index 0b1d3e3245..9e359b1521 100644
--- a/L2J_Mobius_Classic_2.1_Zaken/java/com/l2jmobius/gameserver/data/xml/impl/AdminData.java
+++ b/L2J_Mobius_Classic_2.1_Zaken/java/com/l2jmobius/gameserver/data/xml/impl/AdminData.java
@@ -29,7 +29,7 @@ import org.w3c.dom.Document;
 import org.w3c.dom.NamedNodeMap;
 import org.w3c.dom.Node;
 
-import com.l2jmobius.commons.util.IGameXmlReader;
+import com.l2jmobius.commons.util.IXmlReader;
 import com.l2jmobius.gameserver.model.AccessLevel;
 import com.l2jmobius.gameserver.model.AdminCommandAccessRight;
 import com.l2jmobius.gameserver.model.StatsSet;
@@ -42,7 +42,7 @@ import com.l2jmobius.gameserver.network.serverpackets.SystemMessage;
  * Loads administrator access levels and commands.
  * @author UnAfraid
  */
-public final class AdminData implements IGameXmlReader
+public final class AdminData implements IXmlReader
 {
 	private static final Logger LOGGER = Logger.getLogger(AdminData.class.getName());
 	
diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/com/l2jmobius/gameserver/data/xml/impl/AppearanceItemData.java b/L2J_Mobius_Classic_2.1_Zaken/java/com/l2jmobius/gameserver/data/xml/impl/AppearanceItemData.java
index f7746d073d..468f35ffce 100644
--- a/L2J_Mobius_Classic_2.1_Zaken/java/com/l2jmobius/gameserver/data/xml/impl/AppearanceItemData.java
+++ b/L2J_Mobius_Classic_2.1_Zaken/java/com/l2jmobius/gameserver/data/xml/impl/AppearanceItemData.java
@@ -24,7 +24,7 @@ import java.util.logging.Logger;
 import org.w3c.dom.Document;
 import org.w3c.dom.Node;
 
-import com.l2jmobius.commons.util.IGameXmlReader;
+import com.l2jmobius.commons.util.IXmlReader;
 import com.l2jmobius.gameserver.datatables.ItemTable;
 import com.l2jmobius.gameserver.enums.Race;
 import com.l2jmobius.gameserver.model.StatsSet;
@@ -36,7 +36,7 @@ import com.l2jmobius.gameserver.model.items.type.CrystalType;
 /**
  * @author UnAfraid
  */
-public class AppearanceItemData implements IGameXmlReader
+public class AppearanceItemData implements IXmlReader
 {
 	private static final Logger LOGGER = Logger.getLogger(AppearanceItemData.class.getName());
 	
diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/com/l2jmobius/gameserver/data/xml/impl/ArmorSetsData.java b/L2J_Mobius_Classic_2.1_Zaken/java/com/l2jmobius/gameserver/data/xml/impl/ArmorSetsData.java
index 0f1445c10a..d7582d8d5a 100644
--- a/L2J_Mobius_Classic_2.1_Zaken/java/com/l2jmobius/gameserver/data/xml/impl/ArmorSetsData.java
+++ b/L2J_Mobius_Classic_2.1_Zaken/java/com/l2jmobius/gameserver/data/xml/impl/ArmorSetsData.java
@@ -19,9 +19,9 @@ package com.l2jmobius.gameserver.data.xml.impl;
 import java.io.File;
 import java.util.ArrayList;
 import java.util.Collections;
-import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
+import java.util.concurrent.ConcurrentHashMap;
 import java.util.logging.Logger;
 import java.util.stream.Stream;
 
@@ -29,7 +29,7 @@ import org.w3c.dom.Document;
 import org.w3c.dom.NamedNodeMap;
 import org.w3c.dom.Node;
 
-import com.l2jmobius.commons.util.IGameXmlReader;
+import com.l2jmobius.commons.util.IXmlReader;
 import com.l2jmobius.gameserver.datatables.ItemTable;
 import com.l2jmobius.gameserver.model.ArmorSet;
 import com.l2jmobius.gameserver.model.holders.ArmorsetSkillHolder;
@@ -40,12 +40,12 @@ import com.l2jmobius.gameserver.model.stats.BaseStats;
  * Loads armor set bonuses.
  * @author godson, Luno, UnAfraid
  */
-public final class ArmorSetsData implements IGameXmlReader
+public final class ArmorSetsData implements IXmlReader
 {
 	private static final Logger LOGGER = Logger.getLogger(ArmorSetsData.class.getName());
 	
-	private final Map<Integer, ArmorSet> _armorSets = new HashMap<>();
-	private final Map<Integer, List<ArmorSet>> _armorSetItems = new HashMap<>();
+	private final Map<Integer, ArmorSet> _armorSets = new ConcurrentHashMap<>();
+	private final Map<Integer, List<ArmorSet>> _armorSetItems = new ConcurrentHashMap<>();
 	
 	protected ArmorSetsData()
 	{
diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/com/l2jmobius/gameserver/data/xml/impl/AttendanceRewardData.java b/L2J_Mobius_Classic_2.1_Zaken/java/com/l2jmobius/gameserver/data/xml/impl/AttendanceRewardData.java
index c60afbd78a..24e402e706 100644
--- a/L2J_Mobius_Classic_2.1_Zaken/java/com/l2jmobius/gameserver/data/xml/impl/AttendanceRewardData.java
+++ b/L2J_Mobius_Classic_2.1_Zaken/java/com/l2jmobius/gameserver/data/xml/impl/AttendanceRewardData.java
@@ -24,7 +24,7 @@ import java.util.logging.Logger;
 import org.w3c.dom.Document;
 
 import com.l2jmobius.Config;
-import com.l2jmobius.commons.util.IGameXmlReader;
+import com.l2jmobius.commons.util.IXmlReader;
 import com.l2jmobius.gameserver.datatables.ItemTable;
 import com.l2jmobius.gameserver.model.StatsSet;
 import com.l2jmobius.gameserver.model.holders.ItemHolder;
@@ -32,7 +32,7 @@ import com.l2jmobius.gameserver.model.holders.ItemHolder;
 /**
  * @author Mobius
  */
-public class AttendanceRewardData implements IGameXmlReader
+public class AttendanceRewardData implements IXmlReader
 {
 	private static Logger LOGGER = Logger.getLogger(AttendanceRewardData.class.getName());
 	private final List<ItemHolder> _rewards = new ArrayList<>();
diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/com/l2jmobius/gameserver/data/xml/impl/BeautyShopData.java b/L2J_Mobius_Classic_2.1_Zaken/java/com/l2jmobius/gameserver/data/xml/impl/BeautyShopData.java
index 133f11d978..d88ccc7747 100644
--- a/L2J_Mobius_Classic_2.1_Zaken/java/com/l2jmobius/gameserver/data/xml/impl/BeautyShopData.java
+++ b/L2J_Mobius_Classic_2.1_Zaken/java/com/l2jmobius/gameserver/data/xml/impl/BeautyShopData.java
@@ -24,7 +24,7 @@ import org.w3c.dom.Document;
 import org.w3c.dom.NamedNodeMap;
 import org.w3c.dom.Node;
 
-import com.l2jmobius.commons.util.IGameXmlReader;
+import com.l2jmobius.commons.util.IXmlReader;
 import com.l2jmobius.gameserver.enums.Race;
 import com.l2jmobius.gameserver.enums.Sex;
 import com.l2jmobius.gameserver.model.StatsSet;
@@ -34,7 +34,7 @@ import com.l2jmobius.gameserver.model.beautyshop.BeautyItem;
 /**
  * @author Sdw
  */
-public final class BeautyShopData implements IGameXmlReader
+public final class BeautyShopData implements IXmlReader
 {
 	private final Map<Race, Map<Sex, BeautyData>> _beautyList = new HashMap<>();
 	private final Map<Sex, BeautyData> _beautyData = new HashMap<>();
diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/com/l2jmobius/gameserver/data/xml/impl/BuyListData.java b/L2J_Mobius_Classic_2.1_Zaken/java/com/l2jmobius/gameserver/data/xml/impl/BuyListData.java
index de298ef358..8ab9ea8097 100644
--- a/L2J_Mobius_Classic_2.1_Zaken/java/com/l2jmobius/gameserver/data/xml/impl/BuyListData.java
+++ b/L2J_Mobius_Classic_2.1_Zaken/java/com/l2jmobius/gameserver/data/xml/impl/BuyListData.java
@@ -21,8 +21,8 @@ import java.io.FileFilter;
 import java.sql.Connection;
 import java.sql.ResultSet;
 import java.sql.Statement;
-import java.util.HashMap;
 import java.util.Map;
+import java.util.concurrent.ConcurrentHashMap;
 import java.util.logging.Level;
 import java.util.logging.Logger;
 
@@ -31,7 +31,7 @@ import org.w3c.dom.NamedNodeMap;
 
 import com.l2jmobius.Config;
 import com.l2jmobius.commons.database.DatabaseFactory;
-import com.l2jmobius.commons.util.IGameXmlReader;
+import com.l2jmobius.commons.util.IXmlReader;
 import com.l2jmobius.commons.util.file.filter.NumericNameFilter;
 import com.l2jmobius.gameserver.datatables.ItemTable;
 import com.l2jmobius.gameserver.model.buylist.Product;
@@ -42,11 +42,11 @@ import com.l2jmobius.gameserver.model.items.Item;
  * Loads buy lists for NPCs.
  * @author NosBit
  */
-public final class BuyListData implements IGameXmlReader
+public final class BuyListData implements IXmlReader
 {
 	private static final Logger LOGGER = Logger.getLogger(BuyListData.class.getName());
 	
-	private final Map<Integer, ProductList> _buyLists = new HashMap<>();
+	private final Map<Integer, ProductList> _buyLists = new ConcurrentHashMap<>();
 	private static final FileFilter NUMERIC_FILTER = new NumericNameFilter();
 	
 	protected BuyListData()
diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/com/l2jmobius/gameserver/data/xml/impl/CastleData.java b/L2J_Mobius_Classic_2.1_Zaken/java/com/l2jmobius/gameserver/data/xml/impl/CastleData.java
index 6618dcdf1d..792afbfa0b 100644
--- a/L2J_Mobius_Classic_2.1_Zaken/java/com/l2jmobius/gameserver/data/xml/impl/CastleData.java
+++ b/L2J_Mobius_Classic_2.1_Zaken/java/com/l2jmobius/gameserver/data/xml/impl/CastleData.java
@@ -19,16 +19,16 @@ package com.l2jmobius.gameserver.data.xml.impl;
 import java.io.File;
 import java.util.ArrayList;
 import java.util.Collections;
-import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
+import java.util.concurrent.ConcurrentHashMap;
 import java.util.stream.Collectors;
 
 import org.w3c.dom.Document;
 import org.w3c.dom.NamedNodeMap;
 import org.w3c.dom.Node;
 
-import com.l2jmobius.commons.util.IGameXmlReader;
+import com.l2jmobius.commons.util.IXmlReader;
 import com.l2jmobius.gameserver.enums.CastleSide;
 import com.l2jmobius.gameserver.enums.SiegeGuardType;
 import com.l2jmobius.gameserver.model.holders.CastleSpawnHolder;
@@ -37,10 +37,10 @@ import com.l2jmobius.gameserver.model.holders.SiegeGuardHolder;
 /**
  * @author St3eT
  */
-public final class CastleData implements IGameXmlReader
+public final class CastleData implements IXmlReader
 {
-	private final Map<Integer, List<CastleSpawnHolder>> _spawns = new HashMap<>();
-	private static final Map<Integer, List<SiegeGuardHolder>> _siegeGuards = new HashMap<>();
+	private final Map<Integer, List<CastleSpawnHolder>> _spawns = new ConcurrentHashMap<>();
+	private static final Map<Integer, List<SiegeGuardHolder>> _siegeGuards = new ConcurrentHashMap<>();
 	
 	protected CastleData()
 	{
diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/com/l2jmobius/gameserver/data/xml/impl/CategoryData.java b/L2J_Mobius_Classic_2.1_Zaken/java/com/l2jmobius/gameserver/data/xml/impl/CategoryData.java
index f851aa6703..df7d390dfb 100644
--- a/L2J_Mobius_Classic_2.1_Zaken/java/com/l2jmobius/gameserver/data/xml/impl/CategoryData.java
+++ b/L2J_Mobius_Classic_2.1_Zaken/java/com/l2jmobius/gameserver/data/xml/impl/CategoryData.java
@@ -27,14 +27,14 @@ import org.w3c.dom.Document;
 import org.w3c.dom.NamedNodeMap;
 import org.w3c.dom.Node;
 
-import com.l2jmobius.commons.util.IGameXmlReader;
+import com.l2jmobius.commons.util.IXmlReader;
 import com.l2jmobius.gameserver.enums.CategoryType;
 
 /**
  * Loads the category data with Class or NPC IDs.
  * @author NosBit, xban1x
  */
-public final class CategoryData implements IGameXmlReader
+public final class CategoryData implements IXmlReader
 {
 	private static final Logger LOGGER = Logger.getLogger(CategoryData.class.getName());
 	
diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/com/l2jmobius/gameserver/data/xml/impl/ClanHallData.java b/L2J_Mobius_Classic_2.1_Zaken/java/com/l2jmobius/gameserver/data/xml/impl/ClanHallData.java
index 511cc7f4f7..90a1a51029 100644
--- a/L2J_Mobius_Classic_2.1_Zaken/java/com/l2jmobius/gameserver/data/xml/impl/ClanHallData.java
+++ b/L2J_Mobius_Classic_2.1_Zaken/java/com/l2jmobius/gameserver/data/xml/impl/ClanHallData.java
@@ -20,9 +20,9 @@ import java.io.File;
 import java.util.ArrayList;
 import java.util.Collection;
 import java.util.Comparator;
-import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
+import java.util.concurrent.ConcurrentHashMap;
 import java.util.logging.Logger;
 import java.util.stream.Collectors;
 
@@ -30,7 +30,7 @@ import org.w3c.dom.Document;
 import org.w3c.dom.NamedNodeMap;
 import org.w3c.dom.Node;
 
-import com.l2jmobius.commons.util.IGameXmlReader;
+import com.l2jmobius.commons.util.IXmlReader;
 import com.l2jmobius.gameserver.enums.ClanHallGrade;
 import com.l2jmobius.gameserver.enums.ClanHallType;
 import com.l2jmobius.gameserver.model.Location;
@@ -43,10 +43,10 @@ import com.l2jmobius.gameserver.model.holders.ClanHallTeleportHolder;
 /**
  * @author St3eT
  */
-public final class ClanHallData implements IGameXmlReader
+public final class ClanHallData implements IXmlReader
 {
 	private static final Logger LOGGER = Logger.getLogger(ClanHallData.class.getName());
-	private static final Map<Integer, ClanHall> _clanHalls = new HashMap<>();
+	private static final Map<Integer, ClanHall> _clanHalls = new ConcurrentHashMap<>();
 	
 	protected ClanHallData()
 	{
diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/com/l2jmobius/gameserver/data/xml/impl/ClanRewardData.java b/L2J_Mobius_Classic_2.1_Zaken/java/com/l2jmobius/gameserver/data/xml/impl/ClanRewardData.java
index 252bba1c64..d5938ee964 100644
--- a/L2J_Mobius_Classic_2.1_Zaken/java/com/l2jmobius/gameserver/data/xml/impl/ClanRewardData.java
+++ b/L2J_Mobius_Classic_2.1_Zaken/java/com/l2jmobius/gameserver/data/xml/impl/ClanRewardData.java
@@ -28,7 +28,6 @@ import org.w3c.dom.Document;
 import org.w3c.dom.NamedNodeMap;
 import org.w3c.dom.Node;
 
-import com.l2jmobius.commons.util.IGameXmlReader;
 import com.l2jmobius.commons.util.IXmlReader;
 import com.l2jmobius.gameserver.enums.ClanRewardType;
 import com.l2jmobius.gameserver.model.clan.ClanRewardBonus;
@@ -38,7 +37,7 @@ import com.l2jmobius.gameserver.model.holders.SkillHolder;
 /**
  * @author UnAfraid
  */
-public class ClanRewardData implements IGameXmlReader
+public class ClanRewardData implements IXmlReader
 {
 	private static final Logger LOGGER = Logger.getLogger(ClanRewardData.class.getName());
 	private final Map<ClanRewardType, List<ClanRewardBonus>> _clanRewards = new ConcurrentHashMap<>();
diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/com/l2jmobius/gameserver/data/xml/impl/ClassListData.java b/L2J_Mobius_Classic_2.1_Zaken/java/com/l2jmobius/gameserver/data/xml/impl/ClassListData.java
index a40f726d50..6e99aeabfa 100644
--- a/L2J_Mobius_Classic_2.1_Zaken/java/com/l2jmobius/gameserver/data/xml/impl/ClassListData.java
+++ b/L2J_Mobius_Classic_2.1_Zaken/java/com/l2jmobius/gameserver/data/xml/impl/ClassListData.java
@@ -17,15 +17,15 @@
 package com.l2jmobius.gameserver.data.xml.impl;
 
 import java.io.File;
-import java.util.HashMap;
 import java.util.Map;
+import java.util.concurrent.ConcurrentHashMap;
 import java.util.logging.Logger;
 
 import org.w3c.dom.Document;
 import org.w3c.dom.NamedNodeMap;
 import org.w3c.dom.Node;
 
-import com.l2jmobius.commons.util.IGameXmlReader;
+import com.l2jmobius.commons.util.IXmlReader;
 import com.l2jmobius.gameserver.model.base.ClassId;
 import com.l2jmobius.gameserver.model.base.ClassInfo;
 
@@ -33,11 +33,11 @@ import com.l2jmobius.gameserver.model.base.ClassInfo;
  * Loads the the list of classes and it's info.
  * @author Zoey76
  */
-public final class ClassListData implements IGameXmlReader
+public final class ClassListData implements IXmlReader
 {
 	private static final Logger LOGGER = Logger.getLogger(ClassListData.class.getName());
 	
-	private final Map<ClassId, ClassInfo> _classData = new HashMap<>();
+	private final Map<ClassId, ClassInfo> _classData = new ConcurrentHashMap<>();
 	
 	/**
 	 * Instantiates a new class list data.
diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/com/l2jmobius/gameserver/data/xml/impl/CombinationItemsData.java b/L2J_Mobius_Classic_2.1_Zaken/java/com/l2jmobius/gameserver/data/xml/impl/CombinationItemsData.java
index a7e90d5f89..c2ce205300 100644
--- a/L2J_Mobius_Classic_2.1_Zaken/java/com/l2jmobius/gameserver/data/xml/impl/CombinationItemsData.java
+++ b/L2J_Mobius_Classic_2.1_Zaken/java/com/l2jmobius/gameserver/data/xml/impl/CombinationItemsData.java
@@ -24,7 +24,7 @@ import java.util.stream.Collectors;
 
 import org.w3c.dom.Document;
 
-import com.l2jmobius.commons.util.IGameXmlReader;
+import com.l2jmobius.commons.util.IXmlReader;
 import com.l2jmobius.gameserver.datatables.ItemTable;
 import com.l2jmobius.gameserver.model.StatsSet;
 import com.l2jmobius.gameserver.model.items.combination.CombinationItem;
@@ -34,7 +34,7 @@ import com.l2jmobius.gameserver.model.items.combination.CombinationItemType;
 /**
  * @author UnAfraid
  */
-public class CombinationItemsData implements IGameXmlReader
+public class CombinationItemsData implements IXmlReader
 {
 	private static final Logger LOGGER = Logger.getLogger(CombinationItemsData.class.getName());
 	private final List<CombinationItem> _items = new ArrayList<>();
diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/com/l2jmobius/gameserver/data/xml/impl/CubicData.java b/L2J_Mobius_Classic_2.1_Zaken/java/com/l2jmobius/gameserver/data/xml/impl/CubicData.java
index f682509217..ef46a08a7f 100644
--- a/L2J_Mobius_Classic_2.1_Zaken/java/com/l2jmobius/gameserver/data/xml/impl/CubicData.java
+++ b/L2J_Mobius_Classic_2.1_Zaken/java/com/l2jmobius/gameserver/data/xml/impl/CubicData.java
@@ -20,12 +20,12 @@ import java.io.File;
 import java.util.Collections;
 import java.util.HashMap;
 import java.util.Map;
+import java.util.concurrent.ConcurrentHashMap;
 import java.util.logging.Logger;
 
 import org.w3c.dom.Document;
 import org.w3c.dom.Node;
 
-import com.l2jmobius.commons.util.IGameXmlReader;
 import com.l2jmobius.commons.util.IXmlReader;
 import com.l2jmobius.gameserver.model.StatsSet;
 import com.l2jmobius.gameserver.model.actor.templates.CubicTemplate;
@@ -39,11 +39,11 @@ import com.l2jmobius.gameserver.model.cubic.conditions.RangeCondition;
 /**
  * @author UnAfraid
  */
-public class CubicData implements IGameXmlReader
+public class CubicData implements IXmlReader
 {
 	private static final Logger LOGGER = Logger.getLogger(CubicData.class.getName());
 	
-	private final Map<Integer, Map<Integer, CubicTemplate>> _cubics = new HashMap<>();
+	private final Map<Integer, Map<Integer, CubicTemplate>> _cubics = new ConcurrentHashMap<>();
 	
 	protected CubicData()
 	{
diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/com/l2jmobius/gameserver/data/xml/impl/DailyMissionData.java b/L2J_Mobius_Classic_2.1_Zaken/java/com/l2jmobius/gameserver/data/xml/impl/DailyMissionData.java
index 53519f2492..1e275049d9 100644
--- a/L2J_Mobius_Classic_2.1_Zaken/java/com/l2jmobius/gameserver/data/xml/impl/DailyMissionData.java
+++ b/L2J_Mobius_Classic_2.1_Zaken/java/com/l2jmobius/gameserver/data/xml/impl/DailyMissionData.java
@@ -27,7 +27,7 @@ import java.util.stream.Collectors;
 
 import org.w3c.dom.Document;
 
-import com.l2jmobius.commons.util.IGameXmlReader;
+import com.l2jmobius.commons.util.IXmlReader;
 import com.l2jmobius.gameserver.model.DailyMissionDataHolder;
 import com.l2jmobius.gameserver.model.StatsSet;
 import com.l2jmobius.gameserver.model.actor.instance.PlayerInstance;
@@ -37,7 +37,7 @@ import com.l2jmobius.gameserver.model.holders.ItemHolder;
 /**
  * @author Sdw
  */
-public class DailyMissionData implements IGameXmlReader
+public class DailyMissionData implements IXmlReader
 {
 	private static final Logger LOGGER = Logger.getLogger(DailyMissionData.class.getName());
 	private final Map<Integer, List<DailyMissionDataHolder>> _dailyMissionRewards = new LinkedHashMap<>();
diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/com/l2jmobius/gameserver/data/xml/impl/DoorData.java b/L2J_Mobius_Classic_2.1_Zaken/java/com/l2jmobius/gameserver/data/xml/impl/DoorData.java
index e8b1ff7bfa..5dd43e98eb 100644
--- a/L2J_Mobius_Classic_2.1_Zaken/java/com/l2jmobius/gameserver/data/xml/impl/DoorData.java
+++ b/L2J_Mobius_Classic_2.1_Zaken/java/com/l2jmobius/gameserver/data/xml/impl/DoorData.java
@@ -32,7 +32,6 @@ import org.w3c.dom.Document;
 import org.w3c.dom.NamedNodeMap;
 import org.w3c.dom.Node;
 
-import com.l2jmobius.commons.util.IGameXmlReader;
 import com.l2jmobius.commons.util.IXmlReader;
 import com.l2jmobius.gameserver.instancemanager.MapRegionManager;
 import com.l2jmobius.gameserver.model.Location;
@@ -45,7 +44,7 @@ import com.l2jmobius.gameserver.model.instancezone.Instance;
  * This class loads and hold info about doors.
  * @author JIV, GodKratos, UnAfraid
  */
-public final class DoorData implements IGameXmlReader
+public final class DoorData implements IXmlReader
 {
 	private static final Logger LOGGER = Logger.getLogger(DoorData.class.getName());
 	
diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/com/l2jmobius/gameserver/data/xml/impl/EnchantItemData.java b/L2J_Mobius_Classic_2.1_Zaken/java/com/l2jmobius/gameserver/data/xml/impl/EnchantItemData.java
index 24e12d1218..342b4cde07 100644
--- a/L2J_Mobius_Classic_2.1_Zaken/java/com/l2jmobius/gameserver/data/xml/impl/EnchantItemData.java
+++ b/L2J_Mobius_Classic_2.1_Zaken/java/com/l2jmobius/gameserver/data/xml/impl/EnchantItemData.java
@@ -25,7 +25,7 @@ import org.w3c.dom.Document;
 import org.w3c.dom.NamedNodeMap;
 import org.w3c.dom.Node;
 
-import com.l2jmobius.commons.util.IGameXmlReader;
+import com.l2jmobius.commons.util.IXmlReader;
 import com.l2jmobius.gameserver.model.StatsSet;
 import com.l2jmobius.gameserver.model.items.enchant.EnchantScroll;
 import com.l2jmobius.gameserver.model.items.enchant.EnchantSupportItem;
@@ -35,7 +35,7 @@ import com.l2jmobius.gameserver.model.items.instance.ItemInstance;
  * Loads item enchant data.
  * @author UnAfraid
  */
-public class EnchantItemData implements IGameXmlReader
+public class EnchantItemData implements IXmlReader
 {
 	private static final Logger LOGGER = Logger.getLogger(EnchantItemData.class.getName());
 	
diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/com/l2jmobius/gameserver/data/xml/impl/EnchantItemGroupsData.java b/L2J_Mobius_Classic_2.1_Zaken/java/com/l2jmobius/gameserver/data/xml/impl/EnchantItemGroupsData.java
index 666d821e42..44582a7dd4 100644
--- a/L2J_Mobius_Classic_2.1_Zaken/java/com/l2jmobius/gameserver/data/xml/impl/EnchantItemGroupsData.java
+++ b/L2J_Mobius_Classic_2.1_Zaken/java/com/l2jmobius/gameserver/data/xml/impl/EnchantItemGroupsData.java
@@ -25,7 +25,7 @@ import org.w3c.dom.Document;
 import org.w3c.dom.NamedNodeMap;
 import org.w3c.dom.Node;
 
-import com.l2jmobius.commons.util.IGameXmlReader;
+import com.l2jmobius.commons.util.IXmlReader;
 import com.l2jmobius.gameserver.datatables.ItemTable;
 import com.l2jmobius.gameserver.model.holders.RangeChanceHolder;
 import com.l2jmobius.gameserver.model.items.Item;
@@ -37,7 +37,7 @@ import com.l2jmobius.gameserver.util.Util;
 /**
  * @author UnAfraid
  */
-public final class EnchantItemGroupsData implements IGameXmlReader
+public final class EnchantItemGroupsData implements IXmlReader
 {
 	private static final Logger LOGGER = Logger.getLogger(EnchantItemGroupsData.class.getName());
 	
diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/com/l2jmobius/gameserver/data/xml/impl/EnchantItemHPBonusData.java b/L2J_Mobius_Classic_2.1_Zaken/java/com/l2jmobius/gameserver/data/xml/impl/EnchantItemHPBonusData.java
index d2ce1096b5..868b1f95f6 100644
--- a/L2J_Mobius_Classic_2.1_Zaken/java/com/l2jmobius/gameserver/data/xml/impl/EnchantItemHPBonusData.java
+++ b/L2J_Mobius_Classic_2.1_Zaken/java/com/l2jmobius/gameserver/data/xml/impl/EnchantItemHPBonusData.java
@@ -26,7 +26,7 @@ import java.util.logging.Logger;
 import org.w3c.dom.Document;
 import org.w3c.dom.Node;
 
-import com.l2jmobius.commons.util.IGameXmlReader;
+import com.l2jmobius.commons.util.IXmlReader;
 import com.l2jmobius.gameserver.model.items.Item;
 import com.l2jmobius.gameserver.model.items.instance.ItemInstance;
 import com.l2jmobius.gameserver.model.items.type.CrystalType;
@@ -35,7 +35,7 @@ import com.l2jmobius.gameserver.model.items.type.CrystalType;
  * This class holds the Enchant HP Bonus Data.
  * @author MrPoke, Zoey76
  */
-public class EnchantItemHPBonusData implements IGameXmlReader
+public class EnchantItemHPBonusData implements IXmlReader
 {
 	private static final Logger LOGGER = Logger.getLogger(EnchantItemHPBonusData.class.getName());
 	
diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/com/l2jmobius/gameserver/data/xml/impl/EnchantItemOptionsData.java b/L2J_Mobius_Classic_2.1_Zaken/java/com/l2jmobius/gameserver/data/xml/impl/EnchantItemOptionsData.java
index f6e9946b94..b8d805132f 100644
--- a/L2J_Mobius_Classic_2.1_Zaken/java/com/l2jmobius/gameserver/data/xml/impl/EnchantItemOptionsData.java
+++ b/L2J_Mobius_Classic_2.1_Zaken/java/com/l2jmobius/gameserver/data/xml/impl/EnchantItemOptionsData.java
@@ -24,7 +24,7 @@ import java.util.logging.Logger;
 import org.w3c.dom.Document;
 import org.w3c.dom.Node;
 
-import com.l2jmobius.commons.util.IGameXmlReader;
+import com.l2jmobius.commons.util.IXmlReader;
 import com.l2jmobius.gameserver.model.items.instance.ItemInstance;
 import com.l2jmobius.gameserver.model.options.EnchantOptions;
 import com.l2jmobius.gameserver.util.Util;
@@ -32,7 +32,7 @@ import com.l2jmobius.gameserver.util.Util;
 /**
  * @author UnAfraid
  */
-public class EnchantItemOptionsData implements IGameXmlReader
+public class EnchantItemOptionsData implements IXmlReader
 {
 	private static final Logger LOGGER = Logger.getLogger(EnchantItemOptionsData.class.getName());
 	
diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/com/l2jmobius/gameserver/data/xml/impl/EnchantSkillGroupsData.java b/L2J_Mobius_Classic_2.1_Zaken/java/com/l2jmobius/gameserver/data/xml/impl/EnchantSkillGroupsData.java
index 0b557ced04..45127fe5f6 100644
--- a/L2J_Mobius_Classic_2.1_Zaken/java/com/l2jmobius/gameserver/data/xml/impl/EnchantSkillGroupsData.java
+++ b/L2J_Mobius_Classic_2.1_Zaken/java/com/l2jmobius/gameserver/data/xml/impl/EnchantSkillGroupsData.java
@@ -18,16 +18,15 @@ package com.l2jmobius.gameserver.data.xml.impl;
 
 import java.io.File;
 import java.util.Collections;
-import java.util.HashMap;
 import java.util.HashSet;
-import java.util.LinkedHashMap;
 import java.util.Map;
 import java.util.Set;
+import java.util.concurrent.ConcurrentHashMap;
 import java.util.logging.Logger;
 
 import org.w3c.dom.Document;
 
-import com.l2jmobius.commons.util.IGameXmlReader;
+import com.l2jmobius.commons.util.IXmlReader;
 import com.l2jmobius.gameserver.enums.SkillEnchantType;
 import com.l2jmobius.gameserver.model.StatsSet;
 import com.l2jmobius.gameserver.model.holders.EnchantSkillHolder;
@@ -39,12 +38,12 @@ import com.l2jmobius.gameserver.model.skills.Skill;
  * This class holds the Enchant Groups information.
  * @author Micr0
  */
-public class EnchantSkillGroupsData implements IGameXmlReader
+public class EnchantSkillGroupsData implements IXmlReader
 {
 	private static final Logger LOGGER = Logger.getLogger(EnchantSkillGroupsData.class.getName());
 	
-	private final Map<Integer, EnchantSkillHolder> _enchantSkillHolders = new LinkedHashMap<>();
-	private final Map<SkillHolder, Set<Integer>> _enchantSkillTrees = new HashMap<>();
+	private final Map<Integer, EnchantSkillHolder> _enchantSkillHolders = new ConcurrentHashMap<>();
+	private final Map<SkillHolder, Set<Integer>> _enchantSkillTrees = new ConcurrentHashMap<>();
 	
 	public static int MAX_ENCHANT_LEVEL;
 	
diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/com/l2jmobius/gameserver/data/xml/impl/EnsoulData.java b/L2J_Mobius_Classic_2.1_Zaken/java/com/l2jmobius/gameserver/data/xml/impl/EnsoulData.java
index 0881f3aaec..bea9592527 100644
--- a/L2J_Mobius_Classic_2.1_Zaken/java/com/l2jmobius/gameserver/data/xml/impl/EnsoulData.java
+++ b/L2J_Mobius_Classic_2.1_Zaken/java/com/l2jmobius/gameserver/data/xml/impl/EnsoulData.java
@@ -19,16 +19,14 @@ package com.l2jmobius.gameserver.data.xml.impl;
 import java.io.File;
 import java.util.Collection;
 import java.util.Collections;
-import java.util.EnumMap;
-import java.util.HashMap;
 import java.util.Map;
+import java.util.concurrent.ConcurrentHashMap;
 import java.util.logging.Logger;
 
 import org.w3c.dom.Document;
 import org.w3c.dom.NamedNodeMap;
 import org.w3c.dom.Node;
 
-import com.l2jmobius.commons.util.IGameXmlReader;
 import com.l2jmobius.commons.util.IXmlReader;
 import com.l2jmobius.gameserver.model.ensoul.EnsoulFee;
 import com.l2jmobius.gameserver.model.ensoul.EnsoulOption;
@@ -39,12 +37,12 @@ import com.l2jmobius.gameserver.model.items.type.CrystalType;
 /**
  * @author UnAfraid
  */
-public class EnsoulData implements IGameXmlReader
+public class EnsoulData implements IXmlReader
 {
 	private static final Logger LOGGER = Logger.getLogger(EnsoulData.class.getName());
-	private final Map<CrystalType, EnsoulFee> _ensoulFees = new EnumMap<>(CrystalType.class);
-	private final Map<Integer, EnsoulOption> _ensoulOptions = new HashMap<>();
-	private final Map<Integer, EnsoulStone> _ensoulStones = new HashMap<>();
+	private final Map<CrystalType, EnsoulFee> _ensoulFees = new ConcurrentHashMap<>();
+	private final Map<Integer, EnsoulOption> _ensoulOptions = new ConcurrentHashMap<>();
+	private final Map<Integer, EnsoulStone> _ensoulStones = new ConcurrentHashMap<>();
 	
 	protected EnsoulData()
 	{
diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/com/l2jmobius/gameserver/data/xml/impl/EventEngineData.java b/L2J_Mobius_Classic_2.1_Zaken/java/com/l2jmobius/gameserver/data/xml/impl/EventEngineData.java
index c43970ea31..144e2d5599 100644
--- a/L2J_Mobius_Classic_2.1_Zaken/java/com/l2jmobius/gameserver/data/xml/impl/EventEngineData.java
+++ b/L2J_Mobius_Classic_2.1_Zaken/java/com/l2jmobius/gameserver/data/xml/impl/EventEngineData.java
@@ -32,7 +32,6 @@ import org.w3c.dom.Document;
 import org.w3c.dom.NamedNodeMap;
 import org.w3c.dom.Node;
 
-import com.l2jmobius.commons.util.IGameXmlReader;
 import com.l2jmobius.commons.util.IXmlReader;
 import com.l2jmobius.gameserver.model.Location;
 import com.l2jmobius.gameserver.model.StatsSet;
@@ -54,7 +53,7 @@ import com.l2jmobius.gameserver.model.holders.SkillHolder;
 /**
  * @author UnAfraid
  */
-public final class EventEngineData implements IGameXmlReader
+public final class EventEngineData implements IXmlReader
 {
 	private static final Logger LOGGER = Logger.getLogger(EventEngineData.class.getName());
 	
diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/com/l2jmobius/gameserver/data/xml/impl/ExperienceData.java b/L2J_Mobius_Classic_2.1_Zaken/java/com/l2jmobius/gameserver/data/xml/impl/ExperienceData.java
index 2daaf16220..ea9d13c2aa 100644
--- a/L2J_Mobius_Classic_2.1_Zaken/java/com/l2jmobius/gameserver/data/xml/impl/ExperienceData.java
+++ b/L2J_Mobius_Classic_2.1_Zaken/java/com/l2jmobius/gameserver/data/xml/impl/ExperienceData.java
@@ -26,13 +26,13 @@ import org.w3c.dom.NamedNodeMap;
 import org.w3c.dom.Node;
 
 import com.l2jmobius.Config;
-import com.l2jmobius.commons.util.IGameXmlReader;
+import com.l2jmobius.commons.util.IXmlReader;
 
 /**
  * This class holds the Experience points for each level for players and pets.
  * @author mrTJO
  */
-public final class ExperienceData implements IGameXmlReader
+public final class ExperienceData implements IXmlReader
 {
 	private static final Logger LOGGER = Logger.getLogger(ExperienceData.class.getName());
 	
diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/com/l2jmobius/gameserver/data/xml/impl/ExtendDropData.java b/L2J_Mobius_Classic_2.1_Zaken/java/com/l2jmobius/gameserver/data/xml/impl/ExtendDropData.java
index 00af3a4f77..09da39ad14 100644
--- a/L2J_Mobius_Classic_2.1_Zaken/java/com/l2jmobius/gameserver/data/xml/impl/ExtendDropData.java
+++ b/L2J_Mobius_Classic_2.1_Zaken/java/com/l2jmobius/gameserver/data/xml/impl/ExtendDropData.java
@@ -28,7 +28,7 @@ import java.util.logging.Logger;
 import org.w3c.dom.Document;
 import org.w3c.dom.Node;
 
-import com.l2jmobius.commons.util.IGameXmlReader;
+import com.l2jmobius.commons.util.IXmlReader;
 import com.l2jmobius.gameserver.handler.ConditionHandler;
 import com.l2jmobius.gameserver.model.StatsSet;
 import com.l2jmobius.gameserver.model.conditions.ICondition;
@@ -39,7 +39,7 @@ import com.l2jmobius.gameserver.network.SystemMessageId;
 /**
  * @author Sdw
  */
-public class ExtendDropData implements IGameXmlReader
+public class ExtendDropData implements IXmlReader
 {
 	private static final Logger LOGGER = Logger.getLogger(ExtendDropData.class.getName());
 	private final Map<Integer, ExtendDropDataHolder> _extendDrop = new HashMap<>();
diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/com/l2jmobius/gameserver/data/xml/impl/FakePlayerData.java b/L2J_Mobius_Classic_2.1_Zaken/java/com/l2jmobius/gameserver/data/xml/impl/FakePlayerData.java
index afb92c06d5..74b7957fd9 100644
--- a/L2J_Mobius_Classic_2.1_Zaken/java/com/l2jmobius/gameserver/data/xml/impl/FakePlayerData.java
+++ b/L2J_Mobius_Classic_2.1_Zaken/java/com/l2jmobius/gameserver/data/xml/impl/FakePlayerData.java
@@ -26,7 +26,7 @@ import java.util.logging.Logger;
 import org.w3c.dom.Document;
 
 import com.l2jmobius.Config;
-import com.l2jmobius.commons.util.IGameXmlReader;
+import com.l2jmobius.commons.util.IXmlReader;
 import com.l2jmobius.gameserver.data.sql.impl.CharNameTable;
 import com.l2jmobius.gameserver.model.StatsSet;
 import com.l2jmobius.gameserver.model.actor.templates.NpcTemplate;
@@ -35,7 +35,7 @@ import com.l2jmobius.gameserver.model.holders.FakePlayerHolder;
 /**
  * @author Mobius
  */
-public class FakePlayerData implements IGameXmlReader
+public class FakePlayerData implements IXmlReader
 {
 	private static Logger LOGGER = Logger.getLogger(FakePlayerData.class.getName());
 	
diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/com/l2jmobius/gameserver/data/xml/impl/FenceData.java b/L2J_Mobius_Classic_2.1_Zaken/java/com/l2jmobius/gameserver/data/xml/impl/FenceData.java
index f51175e5fa..d36ab2e16b 100644
--- a/L2J_Mobius_Classic_2.1_Zaken/java/com/l2jmobius/gameserver/data/xml/impl/FenceData.java
+++ b/L2J_Mobius_Classic_2.1_Zaken/java/com/l2jmobius/gameserver/data/xml/impl/FenceData.java
@@ -28,7 +28,7 @@ import java.util.logging.Logger;
 import org.w3c.dom.Document;
 import org.w3c.dom.Node;
 
-import com.l2jmobius.commons.util.IGameXmlReader;
+import com.l2jmobius.commons.util.IXmlReader;
 import com.l2jmobius.gameserver.enums.FenceState;
 import com.l2jmobius.gameserver.model.StatsSet;
 import com.l2jmobius.gameserver.model.World;
@@ -39,7 +39,7 @@ import com.l2jmobius.gameserver.model.instancezone.Instance;
 /**
  * @author HoridoJoho / FBIagent
  */
-public final class FenceData implements IGameXmlReader
+public final class FenceData implements IXmlReader
 {
 	private static final Logger LOGGER = Logger.getLogger(FenceData.class.getSimpleName());
 	
diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/com/l2jmobius/gameserver/data/xml/impl/FishingData.java b/L2J_Mobius_Classic_2.1_Zaken/java/com/l2jmobius/gameserver/data/xml/impl/FishingData.java
index bacf1ed08c..16436a2f5c 100644
--- a/L2J_Mobius_Classic_2.1_Zaken/java/com/l2jmobius/gameserver/data/xml/impl/FishingData.java
+++ b/L2J_Mobius_Classic_2.1_Zaken/java/com/l2jmobius/gameserver/data/xml/impl/FishingData.java
@@ -26,7 +26,7 @@ import org.w3c.dom.NamedNodeMap;
 import org.w3c.dom.Node;
 
 import com.l2jmobius.Config;
-import com.l2jmobius.commons.util.IGameXmlReader;
+import com.l2jmobius.commons.util.IXmlReader;
 import com.l2jmobius.gameserver.datatables.ItemTable;
 import com.l2jmobius.gameserver.model.fishing.FishingBait;
 import com.l2jmobius.gameserver.model.fishing.FishingCatch;
@@ -36,7 +36,7 @@ import com.l2jmobius.gameserver.model.fishing.FishingRod;
  * This class holds the Fishing information.
  * @author bit
  */
-public final class FishingData implements IGameXmlReader
+public final class FishingData implements IXmlReader
 {
 	private static final Logger LOGGER = Logger.getLogger(FishingData.class.getName());
 	private final Map<Integer, FishingBait> _baitData = new HashMap<>();
diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/com/l2jmobius/gameserver/data/xml/impl/HennaData.java b/L2J_Mobius_Classic_2.1_Zaken/java/com/l2jmobius/gameserver/data/xml/impl/HennaData.java
index e27e186193..d3ac163f3c 100644
--- a/L2J_Mobius_Classic_2.1_Zaken/java/com/l2jmobius/gameserver/data/xml/impl/HennaData.java
+++ b/L2J_Mobius_Classic_2.1_Zaken/java/com/l2jmobius/gameserver/data/xml/impl/HennaData.java
@@ -27,7 +27,7 @@ import org.w3c.dom.Document;
 import org.w3c.dom.NamedNodeMap;
 import org.w3c.dom.Node;
 
-import com.l2jmobius.commons.util.IGameXmlReader;
+import com.l2jmobius.commons.util.IXmlReader;
 import com.l2jmobius.gameserver.model.StatsSet;
 import com.l2jmobius.gameserver.model.base.ClassId;
 import com.l2jmobius.gameserver.model.items.Henna;
@@ -40,7 +40,7 @@ import com.l2jmobius.gameserver.model.skills.Skill;
  * Allowed classes to wear each henna.
  * @author Zoey76, Mobius
  */
-public final class HennaData implements IGameXmlReader
+public final class HennaData implements IXmlReader
 {
 	private static final Logger LOGGER = Logger.getLogger(HennaData.class.getName());
 	
diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/com/l2jmobius/gameserver/data/xml/impl/HitConditionBonusData.java b/L2J_Mobius_Classic_2.1_Zaken/java/com/l2jmobius/gameserver/data/xml/impl/HitConditionBonusData.java
index e9f2f9a87d..2d6ccf0467 100644
--- a/L2J_Mobius_Classic_2.1_Zaken/java/com/l2jmobius/gameserver/data/xml/impl/HitConditionBonusData.java
+++ b/L2J_Mobius_Classic_2.1_Zaken/java/com/l2jmobius/gameserver/data/xml/impl/HitConditionBonusData.java
@@ -23,7 +23,7 @@ import org.w3c.dom.Document;
 import org.w3c.dom.NamedNodeMap;
 import org.w3c.dom.Node;
 
-import com.l2jmobius.commons.util.IGameXmlReader;
+import com.l2jmobius.commons.util.IXmlReader;
 import com.l2jmobius.gameserver.GameTimeController;
 import com.l2jmobius.gameserver.enums.Position;
 import com.l2jmobius.gameserver.model.actor.Creature;
@@ -32,7 +32,7 @@ import com.l2jmobius.gameserver.model.actor.Creature;
  * This class load, holds and calculates the hit condition bonuses.
  * @author Nik
  */
-public final class HitConditionBonusData implements IGameXmlReader
+public final class HitConditionBonusData implements IXmlReader
 {
 	private static final Logger LOGGER = Logger.getLogger(HitConditionBonusData.class.getName());
 	
diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/com/l2jmobius/gameserver/data/xml/impl/InitialEquipmentData.java b/L2J_Mobius_Classic_2.1_Zaken/java/com/l2jmobius/gameserver/data/xml/impl/InitialEquipmentData.java
index 247ea4b46d..275a23f28f 100644
--- a/L2J_Mobius_Classic_2.1_Zaken/java/com/l2jmobius/gameserver/data/xml/impl/InitialEquipmentData.java
+++ b/L2J_Mobius_Classic_2.1_Zaken/java/com/l2jmobius/gameserver/data/xml/impl/InitialEquipmentData.java
@@ -28,7 +28,7 @@ import org.w3c.dom.NamedNodeMap;
 import org.w3c.dom.Node;
 
 import com.l2jmobius.Config;
-import com.l2jmobius.commons.util.IGameXmlReader;
+import com.l2jmobius.commons.util.IXmlReader;
 import com.l2jmobius.gameserver.model.StatsSet;
 import com.l2jmobius.gameserver.model.base.ClassId;
 import com.l2jmobius.gameserver.model.items.PlayerItemTemplate;
@@ -38,7 +38,7 @@ import com.l2jmobius.gameserver.model.items.PlayerItemTemplate;
  * What items get each newly created character and if this item is equipped upon creation (<b>Requires the item to be equippable</b>).
  * @author Zoey76
  */
-public final class InitialEquipmentData implements IGameXmlReader
+public final class InitialEquipmentData implements IXmlReader
 {
 	private static final Logger LOGGER = Logger.getLogger(InitialEquipmentData.class.getName());
 	
diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/com/l2jmobius/gameserver/data/xml/impl/InitialShortcutData.java b/L2J_Mobius_Classic_2.1_Zaken/java/com/l2jmobius/gameserver/data/xml/impl/InitialShortcutData.java
index 5f886bafa8..3b9e976607 100644
--- a/L2J_Mobius_Classic_2.1_Zaken/java/com/l2jmobius/gameserver/data/xml/impl/InitialShortcutData.java
+++ b/L2J_Mobius_Classic_2.1_Zaken/java/com/l2jmobius/gameserver/data/xml/impl/InitialShortcutData.java
@@ -27,7 +27,7 @@ import org.w3c.dom.Document;
 import org.w3c.dom.NamedNodeMap;
 import org.w3c.dom.Node;
 
-import com.l2jmobius.commons.util.IGameXmlReader;
+import com.l2jmobius.commons.util.IXmlReader;
 import com.l2jmobius.gameserver.enums.MacroType;
 import com.l2jmobius.gameserver.enums.ShortcutType;
 import com.l2jmobius.gameserver.model.Macro;
@@ -43,7 +43,7 @@ import com.l2jmobius.gameserver.network.serverpackets.ShortCutRegister;
  * What shortcuts get each newly created character.
  * @author Zoey76
  */
-public final class InitialShortcutData implements IGameXmlReader
+public final class InitialShortcutData implements IXmlReader
 {
 	private static final Logger LOGGER = Logger.getLogger(InitialShortcutData.class.getName());
 	
diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/com/l2jmobius/gameserver/data/xml/impl/ItemCrystallizationData.java b/L2J_Mobius_Classic_2.1_Zaken/java/com/l2jmobius/gameserver/data/xml/impl/ItemCrystallizationData.java
index 86454b2b71..aa7742afa1 100644
--- a/L2J_Mobius_Classic_2.1_Zaken/java/com/l2jmobius/gameserver/data/xml/impl/ItemCrystallizationData.java
+++ b/L2J_Mobius_Classic_2.1_Zaken/java/com/l2jmobius/gameserver/data/xml/impl/ItemCrystallizationData.java
@@ -28,7 +28,7 @@ import org.w3c.dom.Document;
 import org.w3c.dom.NamedNodeMap;
 import org.w3c.dom.Node;
 
-import com.l2jmobius.commons.util.IGameXmlReader;
+import com.l2jmobius.commons.util.IXmlReader;
 import com.l2jmobius.gameserver.datatables.ItemTable;
 import com.l2jmobius.gameserver.enums.CrystallizationType;
 import com.l2jmobius.gameserver.model.holders.CrystallizationDataHolder;
@@ -42,7 +42,7 @@ import com.l2jmobius.gameserver.model.items.type.CrystalType;
 /**
  * @author UnAfraid
  */
-public final class ItemCrystallizationData implements IGameXmlReader
+public final class ItemCrystallizationData implements IXmlReader
 {
 	private static final Logger LOGGER = Logger.getLogger(ItemCrystallizationData.class.getName());
 	
diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/com/l2jmobius/gameserver/data/xml/impl/KarmaData.java b/L2J_Mobius_Classic_2.1_Zaken/java/com/l2jmobius/gameserver/data/xml/impl/KarmaData.java
index ca826eba2e..bd68c38748 100644
--- a/L2J_Mobius_Classic_2.1_Zaken/java/com/l2jmobius/gameserver/data/xml/impl/KarmaData.java
+++ b/L2J_Mobius_Classic_2.1_Zaken/java/com/l2jmobius/gameserver/data/xml/impl/KarmaData.java
@@ -26,12 +26,12 @@ import org.w3c.dom.NamedNodeMap;
 import org.w3c.dom.Node;
 
 import com.l2jmobius.Config;
-import com.l2jmobius.commons.util.IGameXmlReader;
+import com.l2jmobius.commons.util.IXmlReader;
 
 /**
  * @author UnAfraid
  */
-public class KarmaData implements IGameXmlReader
+public class KarmaData implements IXmlReader
 {
 	private static final Logger LOGGER = Logger.getLogger(KarmaData.class.getName());
 	
diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/com/l2jmobius/gameserver/data/xml/impl/LuckyGameData.java b/L2J_Mobius_Classic_2.1_Zaken/java/com/l2jmobius/gameserver/data/xml/impl/LuckyGameData.java
index 6759bfec3f..41c0d0fc31 100644
--- a/L2J_Mobius_Classic_2.1_Zaken/java/com/l2jmobius/gameserver/data/xml/impl/LuckyGameData.java
+++ b/L2J_Mobius_Classic_2.1_Zaken/java/com/l2jmobius/gameserver/data/xml/impl/LuckyGameData.java
@@ -23,7 +23,7 @@ import java.util.concurrent.atomic.AtomicInteger;
 
 import org.w3c.dom.Document;
 
-import com.l2jmobius.commons.util.IGameXmlReader;
+import com.l2jmobius.commons.util.IXmlReader;
 import com.l2jmobius.gameserver.model.StatsSet;
 import com.l2jmobius.gameserver.model.holders.ItemChanceHolder;
 import com.l2jmobius.gameserver.model.holders.ItemPointHolder;
@@ -32,7 +32,7 @@ import com.l2jmobius.gameserver.model.holders.LuckyGameDataHolder;
 /**
  * @author Sdw
  */
-public class LuckyGameData implements IGameXmlReader
+public class LuckyGameData implements IXmlReader
 {
 	private final Map<Integer, LuckyGameDataHolder> _luckyGame = new HashMap<>();
 	private final AtomicInteger _serverPlay = new AtomicInteger();
diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/com/l2jmobius/gameserver/data/xml/impl/MultisellData.java b/L2J_Mobius_Classic_2.1_Zaken/java/com/l2jmobius/gameserver/data/xml/impl/MultisellData.java
index 796cd9b6f1..e9c494b91e 100644
--- a/L2J_Mobius_Classic_2.1_Zaken/java/com/l2jmobius/gameserver/data/xml/impl/MultisellData.java
+++ b/L2J_Mobius_Classic_2.1_Zaken/java/com/l2jmobius/gameserver/data/xml/impl/MultisellData.java
@@ -19,11 +19,11 @@ package com.l2jmobius.gameserver.data.xml.impl;
 import java.io.File;
 import java.io.FileFilter;
 import java.util.ArrayList;
-import java.util.HashMap;
 import java.util.HashSet;
 import java.util.List;
 import java.util.Map;
 import java.util.Set;
+import java.util.concurrent.ConcurrentHashMap;
 import java.util.logging.Level;
 import java.util.logging.Logger;
 
@@ -31,7 +31,7 @@ import org.w3c.dom.Document;
 import org.w3c.dom.Node;
 
 import com.l2jmobius.Config;
-import com.l2jmobius.commons.util.IGameXmlReader;
+import com.l2jmobius.commons.util.IXmlReader;
 import com.l2jmobius.commons.util.file.filter.NumericNameFilter;
 import com.l2jmobius.gameserver.datatables.ItemTable;
 import com.l2jmobius.gameserver.enums.SpecialItemType;
@@ -46,14 +46,14 @@ import com.l2jmobius.gameserver.model.holders.PreparedMultisellListHolder;
 import com.l2jmobius.gameserver.model.items.Item;
 import com.l2jmobius.gameserver.network.serverpackets.MultiSellList;
 
-public final class MultisellData implements IGameXmlReader
+public final class MultisellData implements IXmlReader
 {
 	private static final Logger LOGGER = Logger.getLogger(MultisellData.class.getName());
 	
 	public static final int PAGE_SIZE = 40;
 	private static final FileFilter NUMERIC_FILTER = new NumericNameFilter();
 	
-	private final Map<Integer, MultisellListHolder> _multisells = new HashMap<>();
+	private final Map<Integer, MultisellListHolder> _multisells = new ConcurrentHashMap<>();
 	
 	protected MultisellData()
 	{
diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/com/l2jmobius/gameserver/data/xml/impl/NpcData.java b/L2J_Mobius_Classic_2.1_Zaken/java/com/l2jmobius/gameserver/data/xml/impl/NpcData.java
index 277495ca9d..3bcdb58f40 100644
--- a/L2J_Mobius_Classic_2.1_Zaken/java/com/l2jmobius/gameserver/data/xml/impl/NpcData.java
+++ b/L2J_Mobius_Classic_2.1_Zaken/java/com/l2jmobius/gameserver/data/xml/impl/NpcData.java
@@ -26,6 +26,8 @@ import java.util.List;
 import java.util.Map;
 import java.util.Map.Entry;
 import java.util.Set;
+import java.util.concurrent.ConcurrentHashMap;
+import java.util.concurrent.CopyOnWriteArrayList;
 import java.util.function.Predicate;
 import java.util.logging.Logger;
 import java.util.stream.Collectors;
@@ -36,7 +38,7 @@ import org.w3c.dom.Node;
 
 import com.l2jmobius.Config;
 import com.l2jmobius.commons.util.CommonUtil;
-import com.l2jmobius.commons.util.IGameXmlReader;
+import com.l2jmobius.commons.util.IXmlReader;
 import com.l2jmobius.gameserver.datatables.ItemTable;
 import com.l2jmobius.gameserver.enums.AISkillScope;
 import com.l2jmobius.gameserver.enums.DropType;
@@ -52,13 +54,13 @@ import com.l2jmobius.gameserver.model.skills.Skill;
  * NPC data parser.
  * @author NosBit
  */
-public class NpcData implements IGameXmlReader
+public class NpcData implements IXmlReader
 {
 	protected static final Logger LOGGER = Logger.getLogger(NpcData.class.getName());
 	
-	private final Map<Integer, NpcTemplate> _npcs = new HashMap<>();
-	private final Map<String, Integer> _clans = new HashMap<>();
-	private static final List<Integer> _masterMonsterIDs = new ArrayList<>();
+	private final Map<Integer, NpcTemplate> _npcs = new ConcurrentHashMap<>();
+	private final Map<String, Integer> _clans = new ConcurrentHashMap<>();
+	private static final List<Integer> _masterMonsterIDs = new CopyOnWriteArrayList<>();
 	
 	protected NpcData()
 	{
diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/com/l2jmobius/gameserver/data/xml/impl/OptionData.java b/L2J_Mobius_Classic_2.1_Zaken/java/com/l2jmobius/gameserver/data/xml/impl/OptionData.java
index bffa2b107c..424e2b27ad 100644
--- a/L2J_Mobius_Classic_2.1_Zaken/java/com/l2jmobius/gameserver/data/xml/impl/OptionData.java
+++ b/L2J_Mobius_Classic_2.1_Zaken/java/com/l2jmobius/gameserver/data/xml/impl/OptionData.java
@@ -18,13 +18,12 @@ package com.l2jmobius.gameserver.data.xml.impl;
 
 import java.io.File;
 import java.util.Collections;
-import java.util.HashMap;
 import java.util.Map;
+import java.util.concurrent.ConcurrentHashMap;
 import java.util.logging.Logger;
 
 import org.w3c.dom.Document;
 
-import com.l2jmobius.commons.util.IGameXmlReader;
 import com.l2jmobius.commons.util.IXmlReader;
 import com.l2jmobius.gameserver.handler.EffectHandler;
 import com.l2jmobius.gameserver.model.StatsSet;
@@ -36,11 +35,11 @@ import com.l2jmobius.gameserver.model.options.OptionsSkillType;
 /**
  * @author UnAfraid
  */
-public class OptionData implements IGameXmlReader
+public class OptionData implements IXmlReader
 {
 	private static final Logger LOGGER = Logger.getLogger(OptionData.class.getName());
 	
-	private final Map<Integer, Options> _optionData = new HashMap<>();
+	private final Map<Integer, Options> _optionData = new ConcurrentHashMap<>();
 	
 	protected OptionData()
 	{
diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/com/l2jmobius/gameserver/data/xml/impl/PetDataTable.java b/L2J_Mobius_Classic_2.1_Zaken/java/com/l2jmobius/gameserver/data/xml/impl/PetDataTable.java
index 65afb75d7d..aa6975cd72 100644
--- a/L2J_Mobius_Classic_2.1_Zaken/java/com/l2jmobius/gameserver/data/xml/impl/PetDataTable.java
+++ b/L2J_Mobius_Classic_2.1_Zaken/java/com/l2jmobius/gameserver/data/xml/impl/PetDataTable.java
@@ -17,15 +17,15 @@
 package com.l2jmobius.gameserver.data.xml.impl;
 
 import java.io.File;
-import java.util.HashMap;
 import java.util.Map;
+import java.util.concurrent.ConcurrentHashMap;
 import java.util.logging.Logger;
 
 import org.w3c.dom.Document;
 import org.w3c.dom.NamedNodeMap;
 import org.w3c.dom.Node;
 
-import com.l2jmobius.commons.util.IGameXmlReader;
+import com.l2jmobius.commons.util.IXmlReader;
 import com.l2jmobius.gameserver.enums.MountType;
 import com.l2jmobius.gameserver.model.PetData;
 import com.l2jmobius.gameserver.model.PetLevelData;
@@ -36,11 +36,11 @@ import com.l2jmobius.gameserver.model.StatsSet;
  * TODO: load and use all pet parameters.
  * @author Zoey76 (rework)
  */
-public final class PetDataTable implements IGameXmlReader
+public final class PetDataTable implements IXmlReader
 {
 	private static final Logger LOGGER = Logger.getLogger(PetDataTable.class.getName());
 	
-	private final Map<Integer, PetData> _pets = new HashMap<>();
+	private final Map<Integer, PetData> _pets = new ConcurrentHashMap<>();
 	
 	/**
 	 * Instantiates a new pet data table.
diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/com/l2jmobius/gameserver/data/xml/impl/PetSkillData.java b/L2J_Mobius_Classic_2.1_Zaken/java/com/l2jmobius/gameserver/data/xml/impl/PetSkillData.java
index 4872dde773..5b2f9a4408 100644
--- a/L2J_Mobius_Classic_2.1_Zaken/java/com/l2jmobius/gameserver/data/xml/impl/PetSkillData.java
+++ b/L2J_Mobius_Classic_2.1_Zaken/java/com/l2jmobius/gameserver/data/xml/impl/PetSkillData.java
@@ -27,14 +27,14 @@ import org.w3c.dom.Document;
 import org.w3c.dom.NamedNodeMap;
 import org.w3c.dom.Node;
 
-import com.l2jmobius.commons.util.IGameXmlReader;
+import com.l2jmobius.commons.util.IXmlReader;
 import com.l2jmobius.gameserver.model.actor.Summon;
 import com.l2jmobius.gameserver.model.holders.SkillHolder;
 
 /**
  * @author Mobius
  */
-public class PetSkillData implements IGameXmlReader
+public class PetSkillData implements IXmlReader
 {
 	private static Logger LOGGER = Logger.getLogger(PetSkillData.class.getName());
 	private final Map<Integer, Map<Long, SkillHolder>> _skillTrees = new HashMap<>();
diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/com/l2jmobius/gameserver/data/xml/impl/PlayerTemplateData.java b/L2J_Mobius_Classic_2.1_Zaken/java/com/l2jmobius/gameserver/data/xml/impl/PlayerTemplateData.java
index 031fab8027..7a7c230b72 100644
--- a/L2J_Mobius_Classic_2.1_Zaken/java/com/l2jmobius/gameserver/data/xml/impl/PlayerTemplateData.java
+++ b/L2J_Mobius_Classic_2.1_Zaken/java/com/l2jmobius/gameserver/data/xml/impl/PlayerTemplateData.java
@@ -18,9 +18,9 @@ package com.l2jmobius.gameserver.data.xml.impl;
 
 import java.io.File;
 import java.util.ArrayList;
-import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
+import java.util.concurrent.ConcurrentHashMap;
 import java.util.logging.Logger;
 
 import org.w3c.dom.Document;
@@ -28,7 +28,7 @@ import org.w3c.dom.NamedNodeMap;
 import org.w3c.dom.Node;
 
 import com.l2jmobius.Config;
-import com.l2jmobius.commons.util.IGameXmlReader;
+import com.l2jmobius.commons.util.IXmlReader;
 import com.l2jmobius.gameserver.model.Location;
 import com.l2jmobius.gameserver.model.StatsSet;
 import com.l2jmobius.gameserver.model.actor.templates.PlayerTemplate;
@@ -38,11 +38,11 @@ import com.l2jmobius.gameserver.model.base.ClassId;
  * Loads player's base stats.
  * @author Forsaiken, Zoey76, GKR
  */
-public final class PlayerTemplateData implements IGameXmlReader
+public final class PlayerTemplateData implements IXmlReader
 {
 	private static final Logger LOGGER = Logger.getLogger(PlayerTemplateData.class.getName());
 	
-	private final Map<ClassId, PlayerTemplate> _playerTemplates = new HashMap<>();
+	private final Map<ClassId, PlayerTemplate> _playerTemplates = new ConcurrentHashMap<>();
 	
 	private int _dataCount = 0;
 	private int _autoGeneratedCount = 0;
diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/com/l2jmobius/gameserver/data/xml/impl/PlayerXpPercentLostData.java b/L2J_Mobius_Classic_2.1_Zaken/java/com/l2jmobius/gameserver/data/xml/impl/PlayerXpPercentLostData.java
index 2b867a18e4..816cb7aacf 100644
--- a/L2J_Mobius_Classic_2.1_Zaken/java/com/l2jmobius/gameserver/data/xml/impl/PlayerXpPercentLostData.java
+++ b/L2J_Mobius_Classic_2.1_Zaken/java/com/l2jmobius/gameserver/data/xml/impl/PlayerXpPercentLostData.java
@@ -24,13 +24,13 @@ import org.w3c.dom.Document;
 import org.w3c.dom.NamedNodeMap;
 import org.w3c.dom.Node;
 
-import com.l2jmobius.commons.util.IGameXmlReader;
+import com.l2jmobius.commons.util.IXmlReader;
 
 /**
  * This class holds the Player Xp Percent Lost Data for each level for players.
  * @author Zealar
  */
-public final class PlayerXpPercentLostData implements IGameXmlReader
+public final class PlayerXpPercentLostData implements IXmlReader
 {
 	private static final Logger LOGGER = Logger.getLogger(PlayerXpPercentLostData.class.getName());
 	
diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/com/l2jmobius/gameserver/data/xml/impl/PrimeShopData.java b/L2J_Mobius_Classic_2.1_Zaken/java/com/l2jmobius/gameserver/data/xml/impl/PrimeShopData.java
index 82ddd51f26..650d156194 100644
--- a/L2J_Mobius_Classic_2.1_Zaken/java/com/l2jmobius/gameserver/data/xml/impl/PrimeShopData.java
+++ b/L2J_Mobius_Classic_2.1_Zaken/java/com/l2jmobius/gameserver/data/xml/impl/PrimeShopData.java
@@ -27,7 +27,7 @@ import org.w3c.dom.Document;
 import org.w3c.dom.NamedNodeMap;
 import org.w3c.dom.Node;
 
-import com.l2jmobius.commons.util.IGameXmlReader;
+import com.l2jmobius.commons.util.IXmlReader;
 import com.l2jmobius.gameserver.datatables.ItemTable;
 import com.l2jmobius.gameserver.model.StatsSet;
 import com.l2jmobius.gameserver.model.actor.instance.PlayerInstance;
@@ -39,7 +39,7 @@ import com.l2jmobius.gameserver.network.serverpackets.primeshop.ExBRProductInfo;
 /**
  * @author Gnacik, UnAfraid
  */
-public class PrimeShopData implements IGameXmlReader
+public class PrimeShopData implements IXmlReader
 {
 	private static final Logger LOGGER = Logger.getLogger(PrimeShopData.class.getName());
 	
diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/com/l2jmobius/gameserver/data/xml/impl/RecipeData.java b/L2J_Mobius_Classic_2.1_Zaken/java/com/l2jmobius/gameserver/data/xml/impl/RecipeData.java
index 9c035c1fde..54ce272bd2 100644
--- a/L2J_Mobius_Classic_2.1_Zaken/java/com/l2jmobius/gameserver/data/xml/impl/RecipeData.java
+++ b/L2J_Mobius_Classic_2.1_Zaken/java/com/l2jmobius/gameserver/data/xml/impl/RecipeData.java
@@ -27,7 +27,7 @@ import org.w3c.dom.Document;
 import org.w3c.dom.NamedNodeMap;
 import org.w3c.dom.Node;
 
-import com.l2jmobius.commons.util.IGameXmlReader;
+import com.l2jmobius.commons.util.IXmlReader;
 import com.l2jmobius.gameserver.model.RecipeInstance;
 import com.l2jmobius.gameserver.model.RecipeList;
 import com.l2jmobius.gameserver.model.RecipeStatInstance;
@@ -38,7 +38,7 @@ import com.l2jmobius.gameserver.model.actor.instance.PlayerInstance;
  * The Class RecipeData.
  * @author Zoey76
  */
-public class RecipeData implements IGameXmlReader
+public class RecipeData implements IXmlReader
 {
 	private static final Logger LOGGER = Logger.getLogger(RecipeData.class.getName());
 	
diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/com/l2jmobius/gameserver/data/xml/impl/ResidenceFunctionsData.java b/L2J_Mobius_Classic_2.1_Zaken/java/com/l2jmobius/gameserver/data/xml/impl/ResidenceFunctionsData.java
index 66951e9e59..094ef13149 100644
--- a/L2J_Mobius_Classic_2.1_Zaken/java/com/l2jmobius/gameserver/data/xml/impl/ResidenceFunctionsData.java
+++ b/L2J_Mobius_Classic_2.1_Zaken/java/com/l2jmobius/gameserver/data/xml/impl/ResidenceFunctionsData.java
@@ -28,7 +28,7 @@ import org.w3c.dom.Document;
 import org.w3c.dom.NamedNodeMap;
 import org.w3c.dom.Node;
 
-import com.l2jmobius.commons.util.IGameXmlReader;
+import com.l2jmobius.commons.util.IXmlReader;
 import com.l2jmobius.gameserver.model.StatsSet;
 import com.l2jmobius.gameserver.model.residences.ResidenceFunctionTemplate;
 
@@ -36,7 +36,7 @@ import com.l2jmobius.gameserver.model.residences.ResidenceFunctionTemplate;
  * The residence functions data
  * @author UnAfraid
  */
-public final class ResidenceFunctionsData implements IGameXmlReader
+public final class ResidenceFunctionsData implements IXmlReader
 {
 	private static final Logger LOGGER = Logger.getLogger(ResidenceFunctionsData.class.getName());
 	private final Map<Integer, List<ResidenceFunctionTemplate>> _functions = new HashMap<>();
diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/com/l2jmobius/gameserver/data/xml/impl/SayuneData.java b/L2J_Mobius_Classic_2.1_Zaken/java/com/l2jmobius/gameserver/data/xml/impl/SayuneData.java
index 835bd96930..13b4d33b1e 100644
--- a/L2J_Mobius_Classic_2.1_Zaken/java/com/l2jmobius/gameserver/data/xml/impl/SayuneData.java
+++ b/L2J_Mobius_Classic_2.1_Zaken/java/com/l2jmobius/gameserver/data/xml/impl/SayuneData.java
@@ -26,13 +26,13 @@ import org.w3c.dom.Document;
 import org.w3c.dom.NamedNodeMap;
 import org.w3c.dom.Node;
 
-import com.l2jmobius.commons.util.IGameXmlReader;
+import com.l2jmobius.commons.util.IXmlReader;
 import com.l2jmobius.gameserver.model.SayuneEntry;
 
 /**
  * @author UnAfraid
  */
-public class SayuneData implements IGameXmlReader
+public class SayuneData implements IXmlReader
 {
 	private static final Logger LOGGER = Logger.getLogger(SayuneData.class.getName());
 	
diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/com/l2jmobius/gameserver/data/xml/impl/SecondaryAuthData.java b/L2J_Mobius_Classic_2.1_Zaken/java/com/l2jmobius/gameserver/data/xml/impl/SecondaryAuthData.java
index c0ebd36146..ca85056b10 100644
--- a/L2J_Mobius_Classic_2.1_Zaken/java/com/l2jmobius/gameserver/data/xml/impl/SecondaryAuthData.java
+++ b/L2J_Mobius_Classic_2.1_Zaken/java/com/l2jmobius/gameserver/data/xml/impl/SecondaryAuthData.java
@@ -25,12 +25,12 @@ import java.util.logging.Logger;
 import org.w3c.dom.Document;
 import org.w3c.dom.Node;
 
-import com.l2jmobius.commons.util.IGameXmlReader;
+import com.l2jmobius.commons.util.IXmlReader;
 
 /**
  * @author NosBit
  */
-public class SecondaryAuthData implements IGameXmlReader
+public class SecondaryAuthData implements IXmlReader
 {
 	private static final Logger LOGGER = Logger.getLogger(SecondaryAuthData.class.getName());
 	
diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/com/l2jmobius/gameserver/data/xml/impl/ShuttleData.java b/L2J_Mobius_Classic_2.1_Zaken/java/com/l2jmobius/gameserver/data/xml/impl/ShuttleData.java
index 9454d24d6b..ff26f4f409 100644
--- a/L2J_Mobius_Classic_2.1_Zaken/java/com/l2jmobius/gameserver/data/xml/impl/ShuttleData.java
+++ b/L2J_Mobius_Classic_2.1_Zaken/java/com/l2jmobius/gameserver/data/xml/impl/ShuttleData.java
@@ -27,7 +27,7 @@ import org.w3c.dom.Document;
 import org.w3c.dom.NamedNodeMap;
 import org.w3c.dom.Node;
 
-import com.l2jmobius.commons.util.IGameXmlReader;
+import com.l2jmobius.commons.util.IXmlReader;
 import com.l2jmobius.gameserver.model.Location;
 import com.l2jmobius.gameserver.model.StatsSet;
 import com.l2jmobius.gameserver.model.VehiclePathPoint;
@@ -40,7 +40,7 @@ import com.l2jmobius.gameserver.model.shuttle.ShuttleStop;
 /**
  * @author UnAfraid
  */
-public final class ShuttleData implements IGameXmlReader
+public final class ShuttleData implements IXmlReader
 {
 	private static final Logger LOGGER = Logger.getLogger(ShuttleData.class.getName());
 	
diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/com/l2jmobius/gameserver/data/xml/impl/SiegeScheduleData.java b/L2J_Mobius_Classic_2.1_Zaken/java/com/l2jmobius/gameserver/data/xml/impl/SiegeScheduleData.java
index 265bf7c528..6bff09010b 100644
--- a/L2J_Mobius_Classic_2.1_Zaken/java/com/l2jmobius/gameserver/data/xml/impl/SiegeScheduleData.java
+++ b/L2J_Mobius_Classic_2.1_Zaken/java/com/l2jmobius/gameserver/data/xml/impl/SiegeScheduleData.java
@@ -27,7 +27,7 @@ import org.w3c.dom.Document;
 import org.w3c.dom.NamedNodeMap;
 import org.w3c.dom.Node;
 
-import com.l2jmobius.commons.util.IGameXmlReader;
+import com.l2jmobius.commons.util.IXmlReader;
 import com.l2jmobius.gameserver.model.SiegeScheduleDate;
 import com.l2jmobius.gameserver.model.StatsSet;
 import com.l2jmobius.gameserver.util.Util;
@@ -35,7 +35,7 @@ import com.l2jmobius.gameserver.util.Util;
 /**
  * @author UnAfraid
  */
-public class SiegeScheduleData implements IGameXmlReader
+public class SiegeScheduleData implements IXmlReader
 {
 	private static final Logger LOGGER = Logger.getLogger(SiegeScheduleData.class.getName());
 	
diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/com/l2jmobius/gameserver/data/xml/impl/SkillData.java b/L2J_Mobius_Classic_2.1_Zaken/java/com/l2jmobius/gameserver/data/xml/impl/SkillData.java
index 7a1ae2e15b..64900d4d45 100644
--- a/L2J_Mobius_Classic_2.1_Zaken/java/com/l2jmobius/gameserver/data/xml/impl/SkillData.java
+++ b/L2J_Mobius_Classic_2.1_Zaken/java/com/l2jmobius/gameserver/data/xml/impl/SkillData.java
@@ -25,6 +25,7 @@ import java.util.List;
 import java.util.Map;
 import java.util.Optional;
 import java.util.Set;
+import java.util.concurrent.ConcurrentHashMap;
 import java.util.function.BiConsumer;
 import java.util.function.Function;
 import java.util.logging.Level;
@@ -35,7 +36,7 @@ import org.w3c.dom.Document;
 import org.w3c.dom.NamedNodeMap;
 import org.w3c.dom.Node;
 
-import com.l2jmobius.commons.util.IGameXmlReader;
+import com.l2jmobius.commons.util.IXmlReader;
 import com.l2jmobius.gameserver.handler.EffectHandler;
 import com.l2jmobius.gameserver.handler.SkillConditionHandler;
 import com.l2jmobius.gameserver.model.StatsSet;
@@ -51,12 +52,12 @@ import com.l2jmobius.gameserver.util.exp4j.ExpressionBuilder;
  * Skill data parser.
  * @author NosBit
  */
-public class SkillData implements IGameXmlReader
+public class SkillData implements IXmlReader
 {
 	private static final Logger LOGGER = Logger.getLogger(SkillData.class.getName());
 	
-	private final Map<Long, Skill> _skills = new HashMap<>();
-	private final Map<Integer, Integer> _skillsMaxLevel = new HashMap<>();
+	private final Map<Long, Skill> _skills = new ConcurrentHashMap<>();
+	private final Map<Integer, Integer> _skillsMaxLevel = new ConcurrentHashMap<>();
 	
 	private class NamedParamInfo
 	{
diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/com/l2jmobius/gameserver/data/xml/impl/SkillTreesData.java b/L2J_Mobius_Classic_2.1_Zaken/java/com/l2jmobius/gameserver/data/xml/impl/SkillTreesData.java
index 7f667059db..780e0a1d1c 100644
--- a/L2J_Mobius_Classic_2.1_Zaken/java/com/l2jmobius/gameserver/data/xml/impl/SkillTreesData.java
+++ b/L2J_Mobius_Classic_2.1_Zaken/java/com/l2jmobius/gameserver/data/xml/impl/SkillTreesData.java
@@ -29,6 +29,7 @@ import java.util.List;
 import java.util.Map;
 import java.util.Map.Entry;
 import java.util.Set;
+import java.util.concurrent.ConcurrentHashMap;
 import java.util.concurrent.atomic.AtomicBoolean;
 import java.util.logging.Logger;
 import java.util.stream.Collectors;
@@ -38,7 +39,7 @@ import org.w3c.dom.NamedNodeMap;
 import org.w3c.dom.Node;
 
 import com.l2jmobius.Config;
-import com.l2jmobius.commons.util.IGameXmlReader;
+import com.l2jmobius.commons.util.IXmlReader;
 import com.l2jmobius.gameserver.enums.CategoryType;
 import com.l2jmobius.gameserver.enums.Race;
 import com.l2jmobius.gameserver.enums.SubclassType;
@@ -77,34 +78,34 @@ import com.l2jmobius.gameserver.model.skills.Skill;
  * For XML schema please refer to skillTrees.xsd in datapack in xsd folder and for parameters documentation refer to documentation.txt in skillTrees folder.<br>
  * @author Zoey76
  */
-public final class SkillTreesData implements IGameXmlReader
+public final class SkillTreesData implements IXmlReader
 {
 	private static final Logger LOGGER = Logger.getLogger(SkillTreesData.class.getName());
 	
 	// ClassId, Map of Skill Hash Code, SkillLearn
-	private static final Map<ClassId, Map<Long, SkillLearn>> _classSkillTrees = new HashMap<>();
-	private static final Map<ClassId, Map<Long, SkillLearn>> _transferSkillTrees = new HashMap<>();
-	private static final Map<Race, Map<Long, SkillLearn>> _raceSkillTree = new HashMap<>();
-	private static final Map<SubclassType, Map<Long, SkillLearn>> _revelationSkillTree = new HashMap<>();
-	private static final Map<ClassId, Set<Integer>> _awakeningSaveSkillTree = new HashMap<>();
+	private static final Map<ClassId, Map<Long, SkillLearn>> _classSkillTrees = new ConcurrentHashMap<>();
+	private static final Map<ClassId, Map<Long, SkillLearn>> _transferSkillTrees = new ConcurrentHashMap<>();
+	private static final Map<Race, Map<Long, SkillLearn>> _raceSkillTree = new ConcurrentHashMap<>();
+	private static final Map<SubclassType, Map<Long, SkillLearn>> _revelationSkillTree = new ConcurrentHashMap<>();
+	private static final Map<ClassId, Set<Integer>> _awakeningSaveSkillTree = new ConcurrentHashMap<>();
 	// Skill Hash Code, SkillLearn
-	private static final Map<Long, SkillLearn> _collectSkillTree = new HashMap<>();
-	private static final Map<Long, SkillLearn> _fishingSkillTree = new HashMap<>();
-	private static final Map<Long, SkillLearn> _pledgeSkillTree = new HashMap<>();
-	private static final Map<Long, SkillLearn> _subClassSkillTree = new HashMap<>();
-	private static final Map<Long, SkillLearn> _subPledgeSkillTree = new HashMap<>();
-	private static final Map<Long, SkillLearn> _transformSkillTree = new HashMap<>();
-	private static final Map<Long, SkillLearn> _commonSkillTree = new HashMap<>();
-	private static final Map<Long, SkillLearn> _abilitySkillTree = new HashMap<>();
-	private static final Map<Long, SkillLearn> _alchemySkillTree = new HashMap<>();
-	private static final Map<Long, SkillLearn> _dualClassSkillTree = new HashMap<>();
+	private static final Map<Long, SkillLearn> _collectSkillTree = new ConcurrentHashMap<>();
+	private static final Map<Long, SkillLearn> _fishingSkillTree = new ConcurrentHashMap<>();
+	private static final Map<Long, SkillLearn> _pledgeSkillTree = new ConcurrentHashMap<>();
+	private static final Map<Long, SkillLearn> _subClassSkillTree = new ConcurrentHashMap<>();
+	private static final Map<Long, SkillLearn> _subPledgeSkillTree = new ConcurrentHashMap<>();
+	private static final Map<Long, SkillLearn> _transformSkillTree = new ConcurrentHashMap<>();
+	private static final Map<Long, SkillLearn> _commonSkillTree = new ConcurrentHashMap<>();
+	private static final Map<Long, SkillLearn> _abilitySkillTree = new ConcurrentHashMap<>();
+	private static final Map<Long, SkillLearn> _alchemySkillTree = new ConcurrentHashMap<>();
+	private static final Map<Long, SkillLearn> _dualClassSkillTree = new ConcurrentHashMap<>();
 	// Other skill trees
-	private static final Map<Long, SkillLearn> _nobleSkillTree = new HashMap<>();
-	private static final Map<Long, SkillLearn> _heroSkillTree = new HashMap<>();
-	private static final Map<Long, SkillLearn> _gameMasterSkillTree = new HashMap<>();
-	private static final Map<Long, SkillLearn> _gameMasterAuraSkillTree = new HashMap<>();
+	private static final Map<Long, SkillLearn> _nobleSkillTree = new ConcurrentHashMap<>();
+	private static final Map<Long, SkillLearn> _heroSkillTree = new ConcurrentHashMap<>();
+	private static final Map<Long, SkillLearn> _gameMasterSkillTree = new ConcurrentHashMap<>();
+	private static final Map<Long, SkillLearn> _gameMasterAuraSkillTree = new ConcurrentHashMap<>();
 	// Remove skill tree
-	private static final Map<ClassId, Set<Integer>> _removeSkillCache = new HashMap<>();
+	private static final Map<ClassId, Set<Integer>> _removeSkillCache = new ConcurrentHashMap<>();
 	
 	// Checker, sorted arrays of hash codes
 	private Map<Integer, long[]> _skillsByClassIdHashCodes; // Occupation skills
@@ -112,7 +113,7 @@ public final class SkillTreesData implements IGameXmlReader
 	private long[] _allSkillsHashCodes; // Fishing, Collection, Transformations, Common Skills.
 	
 	/** Parent class Ids are read from XML and stored in this map, to allow easy customization. */
-	private static final Map<ClassId, ClassId> _parentClassMap = new HashMap<>();
+	private static final Map<ClassId, ClassId> _parentClassMap = new ConcurrentHashMap<>();
 	
 	private final AtomicBoolean _isLoading = new AtomicBoolean();
 	
diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/com/l2jmobius/gameserver/data/xml/impl/SpawnsData.java b/L2J_Mobius_Classic_2.1_Zaken/java/com/l2jmobius/gameserver/data/xml/impl/SpawnsData.java
index dc41b02109..806d00902a 100644
--- a/L2J_Mobius_Classic_2.1_Zaken/java/com/l2jmobius/gameserver/data/xml/impl/SpawnsData.java
+++ b/L2J_Mobius_Classic_2.1_Zaken/java/com/l2jmobius/gameserver/data/xml/impl/SpawnsData.java
@@ -19,9 +19,10 @@ package com.l2jmobius.gameserver.data.xml.impl;
 import java.io.File;
 import java.util.ArrayList;
 import java.util.Collections;
-import java.util.LinkedList;
 import java.util.List;
 import java.util.Map;
+import java.util.concurrent.CopyOnWriteArrayList;
+import java.util.concurrent.ScheduledFuture;
 import java.util.function.Predicate;
 import java.util.logging.Level;
 import java.util.logging.Logger;
@@ -31,7 +32,7 @@ import org.w3c.dom.Document;
 import org.w3c.dom.Node;
 
 import com.l2jmobius.Config;
-import com.l2jmobius.commons.util.IGameXmlReader;
+import com.l2jmobius.commons.concurrent.ThreadPool;
 import com.l2jmobius.commons.util.IXmlReader;
 import com.l2jmobius.gameserver.model.ChanceLocation;
 import com.l2jmobius.gameserver.model.StatsSet;
@@ -49,11 +50,11 @@ import com.l2jmobius.gameserver.model.zone.type.SpawnTerritory;
 /**
  * @author UnAfraid
  */
-public class SpawnsData implements IGameXmlReader
+public class SpawnsData implements IXmlReader
 {
 	protected static final Logger LOGGER = Logger.getLogger(SpawnsData.class.getName());
 	
-	private final List<SpawnTemplate> _spawns = new LinkedList<>();
+	private final List<SpawnTemplate> _spawns = new CopyOnWriteArrayList<>();
 	
 	protected SpawnsData()
 	{
@@ -94,11 +95,28 @@ public class SpawnsData implements IGameXmlReader
 		}
 		
 		LOGGER.info(getClass().getSimpleName() + ": Initializing spawns...");
-		_spawns.stream().filter(SpawnTemplate::isSpawningByDefault).forEach(template ->
+		final List<ScheduledFuture<?>> jobs = new CopyOnWriteArrayList<>();
+		for (SpawnTemplate template : _spawns)
 		{
-			template.spawnAll(null);
-			template.notifyActivate();
-		});
+			if (template.isSpawningByDefault())
+			{
+				jobs.add(ThreadPool.schedule(() ->
+				{
+					template.spawnAll(null);
+					template.notifyActivate();
+				}, 0));
+			}
+		}
+		while (!jobs.isEmpty())
+		{
+			for (ScheduledFuture<?> job : jobs)
+			{
+				if ((job == null) || job.isDone() || job.isCancelled())
+				{
+					jobs.remove(job);
+				}
+			}
+		}
 		LOGGER.info(getClass().getSimpleName() + ": All spawns has been initialized!");
 	}
 	
diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/com/l2jmobius/gameserver/data/xml/impl/StaticObjectData.java b/L2J_Mobius_Classic_2.1_Zaken/java/com/l2jmobius/gameserver/data/xml/impl/StaticObjectData.java
index 8af86bec88..5e88dd66fb 100644
--- a/L2J_Mobius_Classic_2.1_Zaken/java/com/l2jmobius/gameserver/data/xml/impl/StaticObjectData.java
+++ b/L2J_Mobius_Classic_2.1_Zaken/java/com/l2jmobius/gameserver/data/xml/impl/StaticObjectData.java
@@ -26,7 +26,7 @@ import org.w3c.dom.Document;
 import org.w3c.dom.NamedNodeMap;
 import org.w3c.dom.Node;
 
-import com.l2jmobius.commons.util.IGameXmlReader;
+import com.l2jmobius.commons.util.IXmlReader;
 import com.l2jmobius.gameserver.model.StatsSet;
 import com.l2jmobius.gameserver.model.actor.instance.StaticObjectInstance;
 import com.l2jmobius.gameserver.model.actor.templates.CreatureTemplate;
@@ -35,7 +35,7 @@ import com.l2jmobius.gameserver.model.actor.templates.CreatureTemplate;
  * This class loads and holds all static object data.
  * @author UnAfraid
  */
-public final class StaticObjectData implements IGameXmlReader
+public final class StaticObjectData implements IXmlReader
 {
 	private static final Logger LOGGER = Logger.getLogger(StaticObjectData.class.getName());
 	
diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/com/l2jmobius/gameserver/data/xml/impl/TeleportersData.java b/L2J_Mobius_Classic_2.1_Zaken/java/com/l2jmobius/gameserver/data/xml/impl/TeleportersData.java
index 1d039725ad..5afec008f7 100644
--- a/L2J_Mobius_Classic_2.1_Zaken/java/com/l2jmobius/gameserver/data/xml/impl/TeleportersData.java
+++ b/L2J_Mobius_Classic_2.1_Zaken/java/com/l2jmobius/gameserver/data/xml/impl/TeleportersData.java
@@ -20,12 +20,13 @@ import java.io.File;
 import java.util.Collections;
 import java.util.HashMap;
 import java.util.Map;
+import java.util.concurrent.ConcurrentHashMap;
 import java.util.logging.Logger;
 
 import org.w3c.dom.Document;
 import org.w3c.dom.NamedNodeMap;
 
-import com.l2jmobius.commons.util.IGameXmlReader;
+import com.l2jmobius.commons.util.IXmlReader;
 import com.l2jmobius.gameserver.enums.TeleportType;
 import com.l2jmobius.gameserver.model.StatsSet;
 import com.l2jmobius.gameserver.model.teleporter.TeleportHolder;
@@ -33,12 +34,12 @@ import com.l2jmobius.gameserver.model.teleporter.TeleportHolder;
 /**
  * @author UnAfraid
  */
-public class TeleportersData implements IGameXmlReader
+public class TeleportersData implements IXmlReader
 {
 	// Logger instance
 	private static final Logger LOGGER = Logger.getLogger(TeleportersData.class.getName());
 	// Teleporter data
-	private final Map<Integer, Map<String, TeleportHolder>> _teleporters = new HashMap<>();
+	private final Map<Integer, Map<String, TeleportHolder>> _teleporters = new ConcurrentHashMap<>();
 	
 	protected TeleportersData()
 	{
diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/com/l2jmobius/gameserver/data/xml/impl/TransformData.java b/L2J_Mobius_Classic_2.1_Zaken/java/com/l2jmobius/gameserver/data/xml/impl/TransformData.java
index 896111de87..d917c7e46f 100644
--- a/L2J_Mobius_Classic_2.1_Zaken/java/com/l2jmobius/gameserver/data/xml/impl/TransformData.java
+++ b/L2J_Mobius_Classic_2.1_Zaken/java/com/l2jmobius/gameserver/data/xml/impl/TransformData.java
@@ -17,15 +17,15 @@
 package com.l2jmobius.gameserver.data.xml.impl;
 
 import java.io.File;
-import java.util.HashMap;
 import java.util.Map;
+import java.util.concurrent.ConcurrentHashMap;
 import java.util.logging.Logger;
 
 import org.w3c.dom.Document;
 import org.w3c.dom.NamedNodeMap;
 import org.w3c.dom.Node;
 
-import com.l2jmobius.commons.util.IGameXmlReader;
+import com.l2jmobius.commons.util.IXmlReader;
 import com.l2jmobius.gameserver.model.StatsSet;
 import com.l2jmobius.gameserver.model.actor.transform.Transform;
 import com.l2jmobius.gameserver.model.actor.transform.TransformLevelData;
@@ -39,11 +39,11 @@ import com.l2jmobius.gameserver.network.serverpackets.ExBasicActionList;
  * Transformation data.
  * @author UnAfraid
  */
-public final class TransformData implements IGameXmlReader
+public final class TransformData implements IXmlReader
 {
 	private static final Logger LOGGER = Logger.getLogger(TransformData.class.getName());
 	
-	private final Map<Integer, Transform> _transformData = new HashMap<>();
+	private final Map<Integer, Transform> _transformData = new ConcurrentHashMap<>();
 	
 	protected TransformData()
 	{
diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/com/l2jmobius/gameserver/data/xml/impl/VariationData.java b/L2J_Mobius_Classic_2.1_Zaken/java/com/l2jmobius/gameserver/data/xml/impl/VariationData.java
index 13b41c6359..542acc971b 100644
--- a/L2J_Mobius_Classic_2.1_Zaken/java/com/l2jmobius/gameserver/data/xml/impl/VariationData.java
+++ b/L2J_Mobius_Classic_2.1_Zaken/java/com/l2jmobius/gameserver/data/xml/impl/VariationData.java
@@ -22,11 +22,12 @@ import java.util.Collections;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
+import java.util.concurrent.ConcurrentHashMap;
 import java.util.logging.Logger;
 
 import org.w3c.dom.Document;
 
-import com.l2jmobius.commons.util.IGameXmlReader;
+import com.l2jmobius.commons.util.IXmlReader;
 import com.l2jmobius.gameserver.datatables.ItemTable;
 import com.l2jmobius.gameserver.model.VariationInstance;
 import com.l2jmobius.gameserver.model.items.instance.ItemInstance;
@@ -40,12 +41,12 @@ import com.l2jmobius.gameserver.model.options.VariationWeaponType;
 /**
  * @author Pere
  */
-public class VariationData implements IGameXmlReader
+public class VariationData implements IXmlReader
 {
 	private static final Logger LOGGER = Logger.getLogger(VariationData.class.getSimpleName());
 	
-	private final Map<Integer, Variation> _variations = new HashMap<>();
-	private final Map<Integer, Map<Integer, VariationFee>> _fees = new HashMap<>();
+	private final Map<Integer, Variation> _variations = new ConcurrentHashMap<>();
+	private final Map<Integer, Map<Integer, VariationFee>> _fees = new ConcurrentHashMap<>();
 	
 	protected VariationData()
 	{
diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/com/l2jmobius/gameserver/engines/DocumentEngine.java b/L2J_Mobius_Classic_2.1_Zaken/java/com/l2jmobius/gameserver/engines/DocumentEngine.java
index d787488757..10f04f4fb3 100644
--- a/L2J_Mobius_Classic_2.1_Zaken/java/com/l2jmobius/gameserver/engines/DocumentEngine.java
+++ b/L2J_Mobius_Classic_2.1_Zaken/java/com/l2jmobius/gameserver/engines/DocumentEngine.java
@@ -17,11 +17,14 @@
 package com.l2jmobius.gameserver.engines;
 
 import java.io.File;
-import java.util.LinkedList;
+import java.util.ArrayList;
 import java.util.List;
+import java.util.concurrent.CopyOnWriteArrayList;
+import java.util.concurrent.ScheduledFuture;
 import java.util.logging.Logger;
 
 import com.l2jmobius.Config;
+import com.l2jmobius.commons.concurrent.ThreadPool;
 import com.l2jmobius.commons.util.file.filter.XMLFilter;
 import com.l2jmobius.gameserver.engines.items.DocumentItem;
 import com.l2jmobius.gameserver.model.items.Item;
@@ -33,34 +36,29 @@ public class DocumentEngine
 {
 	private static final Logger LOGGER = Logger.getLogger(DocumentEngine.class.getName());
 	
-	private final List<File> _itemFiles = new LinkedList<>();
-	
-	public static DocumentEngine getInstance()
-	{
-		return SingletonHolder._instance;
-	}
+	private final List<File> _itemFiles = new ArrayList<>();
 	
 	protected DocumentEngine()
 	{
-		hashFiles("data/stats/items", _itemFiles);
+		processDirectory("data/stats/items", _itemFiles);
 		if (Config.CUSTOM_ITEMS_LOAD)
 		{
-			hashFiles("data/stats/items/custom", _itemFiles);
+			processDirectory("data/stats/items/custom", _itemFiles);
 		}
 	}
 	
-	private void hashFiles(String dirname, List<File> hash)
+	private void processDirectory(String dirName, List<File> list)
 	{
-		final File dir = new File(Config.DATAPACK_ROOT, dirname);
+		final File dir = new File(Config.DATAPACK_ROOT, dirName);
 		if (!dir.exists())
 		{
-			LOGGER.warning("Dir " + dir.getAbsolutePath() + " not exists");
+			LOGGER.warning("Dir " + dir.getAbsolutePath() + " does not exist.");
 			return;
 		}
 		final File[] files = dir.listFiles(new XMLFilter());
-		for (File f : files)
+		for (File file : files)
 		{
-			hash.add(f);
+			list.add(file);
 		}
 	}
 	
@@ -70,12 +68,26 @@ public class DocumentEngine
 	 */
 	public List<Item> loadItems()
 	{
-		final List<Item> list = new LinkedList<>();
-		for (File f : _itemFiles)
+		final List<Item> list = new CopyOnWriteArrayList<>();
+		final List<ScheduledFuture<?>> jobs = new CopyOnWriteArrayList<>();
+		for (File file : _itemFiles)
 		{
-			final DocumentItem document = new DocumentItem(f);
-			document.parse();
-			list.addAll(document.getItemList());
+			jobs.add(ThreadPool.schedule(() ->
+			{
+				final DocumentItem document = new DocumentItem(file);
+				document.parse();
+				list.addAll(document.getItemList());
+			}, 0));
+		}
+		while (!jobs.isEmpty())
+		{
+			for (ScheduledFuture<?> job : jobs)
+			{
+				if ((job == null) || job.isDone() || job.isCancelled())
+				{
+					jobs.remove(job);
+				}
+			}
 		}
 		return list;
 	}
@@ -84,4 +96,9 @@ public class DocumentEngine
 	{
 		protected static final DocumentEngine _instance = new DocumentEngine();
 	}
+	
+	public static DocumentEngine getInstance()
+	{
+		return SingletonHolder._instance;
+	}
 }
diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/com/l2jmobius/gameserver/engines/items/DocumentItem.java b/L2J_Mobius_Classic_2.1_Zaken/java/com/l2jmobius/gameserver/engines/items/DocumentItem.java
index 8aaaed2cb4..4ea960563d 100644
--- a/L2J_Mobius_Classic_2.1_Zaken/java/com/l2jmobius/gameserver/engines/items/DocumentItem.java
+++ b/L2J_Mobius_Classic_2.1_Zaken/java/com/l2jmobius/gameserver/engines/items/DocumentItem.java
@@ -19,7 +19,7 @@ package com.l2jmobius.gameserver.engines.items;
 import java.io.File;
 import java.lang.reflect.Constructor;
 import java.lang.reflect.InvocationTargetException;
-import java.util.LinkedList;
+import java.util.ArrayList;
 import java.util.List;
 import java.util.logging.Level;
 import java.util.logging.Logger;
@@ -27,7 +27,7 @@ import java.util.logging.Logger;
 import org.w3c.dom.Document;
 import org.w3c.dom.Node;
 
-import com.l2jmobius.commons.util.IGameXmlReader;
+import com.l2jmobius.commons.util.IXmlReader;
 import com.l2jmobius.gameserver.engines.DocumentBase;
 import com.l2jmobius.gameserver.enums.ItemSkillType;
 import com.l2jmobius.gameserver.model.ExtractableProduct;
@@ -41,12 +41,12 @@ import com.l2jmobius.gameserver.model.stats.functions.FuncTemplate;
 /**
  * @author mkizub, JIV
  */
-public final class DocumentItem extends DocumentBase implements IGameXmlReader
+public final class DocumentItem extends DocumentBase implements IXmlReader
 {
 	Logger LOGGER = Logger.getLogger(DocumentItem.class.getName());
 	
 	private ItemDataHolder _currentItem = null;
-	private final List<Item> _itemsInFile = new LinkedList<>();
+	private final List<Item> _itemsInFile = new ArrayList<>();
 	
 	/**
 	 * @param file
diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/com/l2jmobius/gameserver/handler/ConditionHandler.java b/L2J_Mobius_Classic_2.1_Zaken/java/com/l2jmobius/gameserver/handler/ConditionHandler.java
index c92ef368b3..4e20d5e720 100644
--- a/L2J_Mobius_Classic_2.1_Zaken/java/com/l2jmobius/gameserver/handler/ConditionHandler.java
+++ b/L2J_Mobius_Classic_2.1_Zaken/java/com/l2jmobius/gameserver/handler/ConditionHandler.java
@@ -50,7 +50,7 @@ public final class ConditionHandler
 	{
 		try
 		{
-			ScriptEngineManager.getInstance().executeConditionMasterHandler();
+			ScriptEngineManager.getInstance().executeScript(ScriptEngineManager.CONDITION_HANDLER_FILE);
 		}
 		catch (Exception e)
 		{
diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/com/l2jmobius/gameserver/handler/DailyMissionHandler.java b/L2J_Mobius_Classic_2.1_Zaken/java/com/l2jmobius/gameserver/handler/DailyMissionHandler.java
index 9a80c1db8f..6b6248da49 100644
--- a/L2J_Mobius_Classic_2.1_Zaken/java/com/l2jmobius/gameserver/handler/DailyMissionHandler.java
+++ b/L2J_Mobius_Classic_2.1_Zaken/java/com/l2jmobius/gameserver/handler/DailyMissionHandler.java
@@ -49,7 +49,7 @@ public class DailyMissionHandler
 	{
 		try
 		{
-			ScriptEngineManager.getInstance().executeDailyMissionMasterHandler();
+			ScriptEngineManager.getInstance().executeScript(ScriptEngineManager.ONE_DAY_REWARD_MASTER_HANDLER);
 		}
 		catch (Exception e)
 		{
diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/com/l2jmobius/gameserver/handler/EffectHandler.java b/L2J_Mobius_Classic_2.1_Zaken/java/com/l2jmobius/gameserver/handler/EffectHandler.java
index 0bf5350cb8..cab6562421 100644
--- a/L2J_Mobius_Classic_2.1_Zaken/java/com/l2jmobius/gameserver/handler/EffectHandler.java
+++ b/L2J_Mobius_Classic_2.1_Zaken/java/com/l2jmobius/gameserver/handler/EffectHandler.java
@@ -50,7 +50,7 @@ public final class EffectHandler
 	{
 		try
 		{
-			ScriptEngineManager.getInstance().executeEffectMasterHandler();
+			ScriptEngineManager.getInstance().executeScript(ScriptEngineManager.EFFECT_MASTER_HANDLER_FILE);
 		}
 		catch (Exception e)
 		{
diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/com/l2jmobius/gameserver/handler/SkillConditionHandler.java b/L2J_Mobius_Classic_2.1_Zaken/java/com/l2jmobius/gameserver/handler/SkillConditionHandler.java
index b764410ba1..8685b0279a 100644
--- a/L2J_Mobius_Classic_2.1_Zaken/java/com/l2jmobius/gameserver/handler/SkillConditionHandler.java
+++ b/L2J_Mobius_Classic_2.1_Zaken/java/com/l2jmobius/gameserver/handler/SkillConditionHandler.java
@@ -50,7 +50,7 @@ public final class SkillConditionHandler
 	{
 		try
 		{
-			ScriptEngineManager.getInstance().executeSkillConditionMasterHandler();
+			ScriptEngineManager.getInstance().executeScript(ScriptEngineManager.SKILL_CONDITION_HANDLER_FILE);
 		}
 		catch (Exception e)
 		{
diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/com/l2jmobius/gameserver/instancemanager/CastleManorManager.java b/L2J_Mobius_Classic_2.1_Zaken/java/com/l2jmobius/gameserver/instancemanager/CastleManorManager.java
index 48d04d3f38..212d1a043c 100644
--- a/L2J_Mobius_Classic_2.1_Zaken/java/com/l2jmobius/gameserver/instancemanager/CastleManorManager.java
+++ b/L2J_Mobius_Classic_2.1_Zaken/java/com/l2jmobius/gameserver/instancemanager/CastleManorManager.java
@@ -40,7 +40,7 @@ import org.w3c.dom.Node;
 import com.l2jmobius.Config;
 import com.l2jmobius.commons.concurrent.ThreadPool;
 import com.l2jmobius.commons.database.DatabaseFactory;
-import com.l2jmobius.commons.util.IGameXmlReader;
+import com.l2jmobius.commons.util.IXmlReader;
 import com.l2jmobius.commons.util.Rnd;
 import com.l2jmobius.gameserver.enums.ManorMode;
 import com.l2jmobius.gameserver.model.CropProcure;
@@ -58,7 +58,7 @@ import com.l2jmobius.gameserver.network.SystemMessageId;
  * Castle manor system.
  * @author malyelfik
  */
-public final class CastleManorManager implements IGameXmlReader, IStorable
+public final class CastleManorManager implements IXmlReader, IStorable
 {
 	private static final Logger LOGGER = Logger.getLogger(CastleManorManager.class.getName());
 	
diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/com/l2jmobius/gameserver/instancemanager/CursedWeaponsManager.java b/L2J_Mobius_Classic_2.1_Zaken/java/com/l2jmobius/gameserver/instancemanager/CursedWeaponsManager.java
index d123b41ef6..835d961c56 100644
--- a/L2J_Mobius_Classic_2.1_Zaken/java/com/l2jmobius/gameserver/instancemanager/CursedWeaponsManager.java
+++ b/L2J_Mobius_Classic_2.1_Zaken/java/com/l2jmobius/gameserver/instancemanager/CursedWeaponsManager.java
@@ -35,7 +35,7 @@ import org.w3c.dom.Node;
 
 import com.l2jmobius.Config;
 import com.l2jmobius.commons.database.DatabaseFactory;
-import com.l2jmobius.commons.util.IGameXmlReader;
+import com.l2jmobius.commons.util.IXmlReader;
 import com.l2jmobius.gameserver.model.CursedWeapon;
 import com.l2jmobius.gameserver.model.actor.Attackable;
 import com.l2jmobius.gameserver.model.actor.Creature;
@@ -54,7 +54,7 @@ import com.l2jmobius.gameserver.util.Broadcast;
  * UnAfraid: TODO: Rewrite with DocumentParser
  * @author Micht
  */
-public final class CursedWeaponsManager implements IGameXmlReader
+public final class CursedWeaponsManager implements IXmlReader
 {
 	private static final Logger LOGGER = Logger.getLogger(CursedWeaponsManager.class.getName());
 	
diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/com/l2jmobius/gameserver/instancemanager/FakePlayerChatManager.java b/L2J_Mobius_Classic_2.1_Zaken/java/com/l2jmobius/gameserver/instancemanager/FakePlayerChatManager.java
index 7101927e48..39c239a762 100644
--- a/L2J_Mobius_Classic_2.1_Zaken/java/com/l2jmobius/gameserver/instancemanager/FakePlayerChatManager.java
+++ b/L2J_Mobius_Classic_2.1_Zaken/java/com/l2jmobius/gameserver/instancemanager/FakePlayerChatManager.java
@@ -25,7 +25,7 @@ import org.w3c.dom.Document;
 
 import com.l2jmobius.Config;
 import com.l2jmobius.commons.concurrent.ThreadPool;
-import com.l2jmobius.commons.util.IGameXmlReader;
+import com.l2jmobius.commons.util.IXmlReader;
 import com.l2jmobius.commons.util.Rnd;
 import com.l2jmobius.gameserver.data.xml.impl.FakePlayerData;
 import com.l2jmobius.gameserver.datatables.SpawnTable;
@@ -41,7 +41,7 @@ import com.l2jmobius.gameserver.network.serverpackets.CreatureSay;
 /**
  * @author Mobius
  */
-public final class FakePlayerChatManager implements IGameXmlReader
+public final class FakePlayerChatManager implements IXmlReader
 {
 	private static Logger LOGGER = Logger.getLogger(FakePlayerChatManager.class.getName());
 	final List<FakePlayerChatHolder> MESSAGES = new ArrayList<>();
diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/com/l2jmobius/gameserver/instancemanager/InstanceManager.java b/L2J_Mobius_Classic_2.1_Zaken/java/com/l2jmobius/gameserver/instancemanager/InstanceManager.java
index f300213c49..5ea229cf1b 100644
--- a/L2J_Mobius_Classic_2.1_Zaken/java/com/l2jmobius/gameserver/instancemanager/InstanceManager.java
+++ b/L2J_Mobius_Classic_2.1_Zaken/java/com/l2jmobius/gameserver/instancemanager/InstanceManager.java
@@ -40,7 +40,6 @@ import org.w3c.dom.Node;
 
 import com.l2jmobius.Config;
 import com.l2jmobius.commons.database.DatabaseFactory;
-import com.l2jmobius.commons.util.IGameXmlReader;
 import com.l2jmobius.commons.util.IXmlReader;
 import com.l2jmobius.gameserver.data.xml.impl.DoorData;
 import com.l2jmobius.gameserver.data.xml.impl.SpawnsData;
@@ -61,7 +60,7 @@ import com.l2jmobius.gameserver.model.spawns.SpawnTemplate;
  * Instance manager.
  * @author evill33t, GodKratos, malyelfik
  */
-public final class InstanceManager implements IGameXmlReader
+public final class InstanceManager implements IXmlReader
 {
 	private static final Logger LOGGER = Logger.getLogger(InstanceManager.class.getName());
 	// Database query
diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/com/l2jmobius/gameserver/instancemanager/ItemAuctionManager.java b/L2J_Mobius_Classic_2.1_Zaken/java/com/l2jmobius/gameserver/instancemanager/ItemAuctionManager.java
index f819adf93b..752bcfdd3f 100644
--- a/L2J_Mobius_Classic_2.1_Zaken/java/com/l2jmobius/gameserver/instancemanager/ItemAuctionManager.java
+++ b/L2J_Mobius_Classic_2.1_Zaken/java/com/l2jmobius/gameserver/instancemanager/ItemAuctionManager.java
@@ -34,13 +34,13 @@ import org.w3c.dom.Node;
 
 import com.l2jmobius.Config;
 import com.l2jmobius.commons.database.DatabaseFactory;
-import com.l2jmobius.commons.util.IGameXmlReader;
+import com.l2jmobius.commons.util.IXmlReader;
 import com.l2jmobius.gameserver.model.itemauction.ItemAuctionInstance;
 
 /**
  * @author Forsaiken
  */
-public final class ItemAuctionManager implements IGameXmlReader
+public final class ItemAuctionManager implements IXmlReader
 {
 	private static final Logger LOGGER = Logger.getLogger(ItemAuctionManager.class.getName());
 	
diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/com/l2jmobius/gameserver/instancemanager/MapRegionManager.java b/L2J_Mobius_Classic_2.1_Zaken/java/com/l2jmobius/gameserver/instancemanager/MapRegionManager.java
index 255d4340ff..8f68a4bdf5 100644
--- a/L2J_Mobius_Classic_2.1_Zaken/java/com/l2jmobius/gameserver/instancemanager/MapRegionManager.java
+++ b/L2J_Mobius_Classic_2.1_Zaken/java/com/l2jmobius/gameserver/instancemanager/MapRegionManager.java
@@ -27,7 +27,7 @@ import org.w3c.dom.NamedNodeMap;
 import org.w3c.dom.Node;
 
 import com.l2jmobius.Config;
-import com.l2jmobius.commons.util.IGameXmlReader;
+import com.l2jmobius.commons.util.IXmlReader;
 import com.l2jmobius.gameserver.data.xml.impl.ClanHallData;
 import com.l2jmobius.gameserver.model.Location;
 import com.l2jmobius.gameserver.model.MapRegion;
@@ -47,7 +47,7 @@ import com.l2jmobius.gameserver.model.zone.type.RespawnZone;
  * Map Region Manager.
  * @author Nyaran
  */
-public final class MapRegionManager implements IGameXmlReader
+public final class MapRegionManager implements IXmlReader
 {
 	private static final Logger LOGGER = Logger.getLogger(MapRegionManager.class.getName());
 	
diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/com/l2jmobius/gameserver/instancemanager/SellBuffsManager.java b/L2J_Mobius_Classic_2.1_Zaken/java/com/l2jmobius/gameserver/instancemanager/SellBuffsManager.java
index dcf1bae346..0c4e94f449 100644
--- a/L2J_Mobius_Classic_2.1_Zaken/java/com/l2jmobius/gameserver/instancemanager/SellBuffsManager.java
+++ b/L2J_Mobius_Classic_2.1_Zaken/java/com/l2jmobius/gameserver/instancemanager/SellBuffsManager.java
@@ -26,7 +26,7 @@ import org.w3c.dom.Element;
 import org.w3c.dom.NodeList;
 
 import com.l2jmobius.Config;
-import com.l2jmobius.commons.util.IGameXmlReader;
+import com.l2jmobius.commons.util.IXmlReader;
 import com.l2jmobius.gameserver.cache.HtmCache;
 import com.l2jmobius.gameserver.data.xml.impl.SkillData;
 import com.l2jmobius.gameserver.datatables.ItemTable;
@@ -46,7 +46,7 @@ import com.l2jmobius.gameserver.util.Util;
  * Sell Buffs Manager
  * @author St3eT
  */
-public final class SellBuffsManager implements IGameXmlReader
+public final class SellBuffsManager implements IXmlReader
 {
 	private static final Logger LOGGER = Logger.getLogger(SellBuffsManager.class.getName());
 	private static final List<Integer> ALLOWED_BUFFS = new ArrayList<>();
diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/com/l2jmobius/gameserver/instancemanager/WalkingManager.java b/L2J_Mobius_Classic_2.1_Zaken/java/com/l2jmobius/gameserver/instancemanager/WalkingManager.java
index d1bba35f7c..423cbe0447 100644
--- a/L2J_Mobius_Classic_2.1_Zaken/java/com/l2jmobius/gameserver/instancemanager/WalkingManager.java
+++ b/L2J_Mobius_Classic_2.1_Zaken/java/com/l2jmobius/gameserver/instancemanager/WalkingManager.java
@@ -28,7 +28,7 @@ import org.w3c.dom.NamedNodeMap;
 import org.w3c.dom.Node;
 
 import com.l2jmobius.commons.concurrent.ThreadPool;
-import com.l2jmobius.commons.util.IGameXmlReader;
+import com.l2jmobius.commons.util.IXmlReader;
 import com.l2jmobius.gameserver.ai.CtrlIntention;
 import com.l2jmobius.gameserver.data.xml.impl.NpcData;
 import com.l2jmobius.gameserver.enums.ChatType;
@@ -47,7 +47,7 @@ import com.l2jmobius.gameserver.network.NpcStringId;
  * This class manages walking monsters.
  * @author GKR
  */
-public final class WalkingManager implements IGameXmlReader
+public final class WalkingManager implements IXmlReader
 {
 	private static final Logger LOGGER = Logger.getLogger(WalkingManager.class.getName());
 	
diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/com/l2jmobius/gameserver/instancemanager/ZoneManager.java b/L2J_Mobius_Classic_2.1_Zaken/java/com/l2jmobius/gameserver/instancemanager/ZoneManager.java
index b698f51a03..9a0bd870f2 100644
--- a/L2J_Mobius_Classic_2.1_Zaken/java/com/l2jmobius/gameserver/instancemanager/ZoneManager.java
+++ b/L2J_Mobius_Classic_2.1_Zaken/java/com/l2jmobius/gameserver/instancemanager/ZoneManager.java
@@ -26,6 +26,7 @@ import java.util.List;
 import java.util.Map;
 import java.util.Optional;
 import java.util.OptionalInt;
+import java.util.concurrent.ConcurrentHashMap;
 import java.util.logging.Level;
 import java.util.logging.Logger;
 
@@ -33,7 +34,7 @@ import org.w3c.dom.Document;
 import org.w3c.dom.NamedNodeMap;
 import org.w3c.dom.Node;
 
-import com.l2jmobius.commons.util.IGameXmlReader;
+import com.l2jmobius.commons.util.IXmlReader;
 import com.l2jmobius.gameserver.model.World;
 import com.l2jmobius.gameserver.model.WorldObject;
 import com.l2jmobius.gameserver.model.actor.Creature;
@@ -55,7 +56,7 @@ import com.l2jmobius.gameserver.model.zone.type.SpawnTerritory;
  * This class manages the zones
  * @author durgus
  */
-public final class ZoneManager implements IGameXmlReader
+public final class ZoneManager implements IXmlReader
 {
 	private static final Logger LOGGER = Logger.getLogger(ZoneManager.class.getName());
 	
@@ -65,9 +66,9 @@ public final class ZoneManager implements IGameXmlReader
 	private static final int OFFSET_X = Math.abs(World.MAP_MIN_X >> SHIFT_BY);
 	private static final int OFFSET_Y = Math.abs(World.MAP_MIN_Y >> SHIFT_BY);
 	
-	private final Map<Class<? extends ZoneType>, Map<Integer, ? extends ZoneType>> _classZones = new HashMap<>();
-	private final Map<String, SpawnTerritory> _spawnTerritories = new HashMap<>();
-	private int _lastDynamicId = 300000;
+	private final Map<Class<? extends ZoneType>, ConcurrentHashMap<Integer, ? extends ZoneType>> _classZones = new ConcurrentHashMap<>();
+	private final Map<String, SpawnTerritory> _spawnTerritories = new ConcurrentHashMap<>();
+	private volatile int _lastDynamicId = 300000;
 	private List<ItemInstance> _debugItems;
 	
 	private final ZoneRegion[][] _zoneRegions = new ZoneRegion[(World.MAP_MAX_X >> SHIFT_BY) + OFFSET_X + 1][(World.MAP_MAX_Y >> SHIFT_BY) + OFFSET_Y + 1];
@@ -365,7 +366,7 @@ public final class ZoneManager implements IGameXmlReader
 						}
 						if (checkId(zoneId))
 						{
-							LOGGER.config(getClass().getSimpleName() + ": Caution: Zone (" + zoneId + ") from file: " + f.getName() + " overrides previos definition.");
+							LOGGER.config(getClass().getSimpleName() + ": Caution: Zone (" + zoneId + ") from file: " + f.getName() + " overrides previuos definition.");
 						}
 						
 						if ((zoneName != null) && !zoneName.isEmpty())
@@ -453,10 +454,10 @@ public final class ZoneManager implements IGameXmlReader
 	@SuppressWarnings("unchecked")
 	private <T extends ZoneType> void addZone(Integer id, T zone)
 	{
-		Map<Integer, T> map = (Map<Integer, T>) _classZones.get(zone.getClass());
+		ConcurrentHashMap<Integer, T> map = (ConcurrentHashMap<Integer, T>) _classZones.get(zone.getClass());
 		if (map == null)
 		{
-			map = new HashMap<>();
+			map = new ConcurrentHashMap<>();
 			map.put(id, zone);
 			_classZones.put(zone.getClass(), map);
 		}
diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/com/l2jmobius/gameserver/model/quest/LongTimeEvent.java b/L2J_Mobius_Classic_2.1_Zaken/java/com/l2jmobius/gameserver/model/quest/LongTimeEvent.java
index cc71991407..0fa020eb5d 100644
--- a/L2J_Mobius_Classic_2.1_Zaken/java/com/l2jmobius/gameserver/model/quest/LongTimeEvent.java
+++ b/L2J_Mobius_Classic_2.1_Zaken/java/com/l2jmobius/gameserver/model/quest/LongTimeEvent.java
@@ -32,7 +32,7 @@ import org.w3c.dom.Node;
 
 import com.l2jmobius.commons.concurrent.ThreadPool;
 import com.l2jmobius.commons.database.DatabaseFactory;
-import com.l2jmobius.commons.util.IGameXmlReader;
+import com.l2jmobius.commons.util.IXmlReader;
 import com.l2jmobius.gameserver.data.sql.impl.AnnouncementsTable;
 import com.l2jmobius.gameserver.data.xml.impl.NpcData;
 import com.l2jmobius.gameserver.datatables.EventDroplist;
@@ -117,7 +117,7 @@ public class LongTimeEvent extends Quest
 	 */
 	private void loadConfig()
 	{
-		new IGameXmlReader()
+		new IXmlReader()
 		{
 			@Override
 			public void load()
diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/com/l2jmobius/gameserver/model/stats/BaseStats.java b/L2J_Mobius_Classic_2.1_Zaken/java/com/l2jmobius/gameserver/model/stats/BaseStats.java
index 1cb9ebbe1e..b692107007 100644
--- a/L2J_Mobius_Classic_2.1_Zaken/java/com/l2jmobius/gameserver/model/stats/BaseStats.java
+++ b/L2J_Mobius_Classic_2.1_Zaken/java/com/l2jmobius/gameserver/model/stats/BaseStats.java
@@ -23,7 +23,6 @@ import java.util.logging.Logger;
 import org.w3c.dom.Document;
 import org.w3c.dom.NamedNodeMap;
 
-import com.l2jmobius.commons.util.IGameXmlReader;
 import com.l2jmobius.commons.util.IXmlReader;
 import com.l2jmobius.gameserver.model.actor.Creature;
 
@@ -103,7 +102,7 @@ public enum BaseStats
 	
 	static
 	{
-		new IGameXmlReader()
+		new IXmlReader()
 		{
 			final Logger LOGGER = Logger.getLogger(BaseStats.class.getName());
 			
diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/com/l2jmobius/gameserver/scripting/ScriptEngineManager.java b/L2J_Mobius_Classic_2.1_Zaken/java/com/l2jmobius/gameserver/scripting/ScriptEngineManager.java
index 9eb6d85b69..95409c567a 100644
--- a/L2J_Mobius_Classic_2.1_Zaken/java/com/l2jmobius/gameserver/scripting/ScriptEngineManager.java
+++ b/L2J_Mobius_Classic_2.1_Zaken/java/com/l2jmobius/gameserver/scripting/ScriptEngineManager.java
@@ -28,8 +28,6 @@ import java.nio.file.attribute.BasicFileAttributes;
 import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.Iterator;
-import java.util.LinkedHashMap;
-import java.util.LinkedList;
 import java.util.List;
 import java.util.Map;
 import java.util.Map.Entry;
@@ -42,14 +40,14 @@ import java.util.logging.Logger;
 import org.w3c.dom.Document;
 
 import com.l2jmobius.Config;
-import com.l2jmobius.commons.util.IGameXmlReader;
+import com.l2jmobius.commons.util.IXmlReader;
 import com.l2jmobius.gameserver.scripting.java.JavaScriptingEngine;
 
 /**
  * Caches script engines and provides functionality for executing and managing scripts.
  * @author KenM, HorridoJoho
  */
-public final class ScriptEngineManager implements IGameXmlReader
+public final class ScriptEngineManager implements IXmlReader
 {
 	private static final Logger LOGGER = Logger.getLogger(ScriptEngineManager.class.getName());
 	public static final Path SCRIPT_FOLDER = Paths.get(Config.DATAPACK_ROOT.getAbsolutePath(), "data", "scripts");
@@ -59,8 +57,7 @@ public final class ScriptEngineManager implements IGameXmlReader
 	public static final Path CONDITION_HANDLER_FILE = Paths.get(SCRIPT_FOLDER.toString(), "handlers", "ConditionMasterHandler.java");
 	public static final Path ONE_DAY_REWARD_MASTER_HANDLER = Paths.get(SCRIPT_FOLDER.toString(), "handlers", "DailyMissionMasterHandler.java");
 	
-	private final Map<String, IExecutionContext> _extEngines = new HashMap<>();
-	private IExecutionContext _currentExecutionContext = null;
+	private IExecutionContext _javaExecutionContext = null;
 	static final List<String> _exclusions = new ArrayList<>();
 	
 	protected ScriptEngineManager()
@@ -166,12 +163,7 @@ public final class ScriptEngineManager implements IGameXmlReader
 	private void registerEngine(IScriptingEngine engine, Properties props)
 	{
 		maybeSetProperties("language." + engine.getLanguageName() + ".", props, engine);
-		final IExecutionContext context = engine.createExecutionContext();
-		for (String commonExtension : engine.getCommonFileExtensions())
-		{
-			_extEngines.put(commonExtension, context);
-		}
-		
+		_javaExecutionContext = engine.createExecutionContext();
 		LOGGER.info("ScriptEngine: " + engine.getEngineName() + " " + engine.getEngineVersion() + " (" + engine.getLanguageName() + " " + engine.getLanguageVersion() + ")");
 	}
 	
@@ -200,66 +192,6 @@ public final class ScriptEngineManager implements IGameXmlReader
 		}
 	}
 	
-	private IExecutionContext getEngineByExtension(String ext)
-	{
-		return _extEngines.get(ext);
-	}
-	
-	private String getFileExtension(Path p)
-	{
-		final String name = p.getFileName().toString();
-		final int lastDotIdx = name.lastIndexOf('.');
-		if (lastDotIdx == -1)
-		{
-			return null;
-		}
-		
-		final String extension = name.substring(lastDotIdx + 1);
-		if (extension.isEmpty())
-		{
-			return null;
-		}
-		
-		return extension;
-	}
-	
-	private void checkExistingFile(String messagePre, Path filePath) throws Exception
-	{
-		if (!Files.exists(filePath))
-		{
-			throw new Exception(messagePre + ": " + filePath + " does not exists!");
-		}
-		else if (!Files.isRegularFile(filePath))
-		{
-			throw new Exception(messagePre + ": " + filePath + " is not a file!");
-		}
-	}
-	
-	public void executeMasterHandler() throws Exception
-	{
-		executeScript(MASTER_HANDLER_FILE);
-	}
-	
-	public void executeEffectMasterHandler() throws Exception
-	{
-		executeScript(EFFECT_MASTER_HANDLER_FILE);
-	}
-	
-	public void executeSkillConditionMasterHandler() throws Exception
-	{
-		executeScript(SKILL_CONDITION_HANDLER_FILE);
-	}
-	
-	public void executeConditionMasterHandler() throws Exception
-	{
-		executeScript(CONDITION_HANDLER_FILE);
-	}
-	
-	public void executeDailyMissionMasterHandler() throws Exception
-	{
-		executeScript(ONE_DAY_REWARD_MASTER_HANDLER);
-	}
-	
 	public void executeScriptList() throws Exception
 	{
 		if (Config.ALT_DEV_NO_QUESTS)
@@ -267,77 +199,35 @@ public final class ScriptEngineManager implements IGameXmlReader
 			return;
 		}
 		
-		final Map<IExecutionContext, List<Path>> files = new LinkedHashMap<>();
+		final List<Path> files = new ArrayList<>();
 		processDirectory(SCRIPT_FOLDER.toFile(), files);
 		
-		for (Entry<IExecutionContext, List<Path>> entry : files.entrySet())
+		final Map<Path, Throwable> invokationErrors = _javaExecutionContext.executeScripts(files);
+		for (Entry<Path, Throwable> entry : invokationErrors.entrySet())
 		{
-			_currentExecutionContext = entry.getKey();
-			try
-			{
-				final Map<Path, Throwable> invokationErrors = entry.getKey().executeScripts(entry.getValue());
-				for (Entry<Path, Throwable> entry2 : invokationErrors.entrySet())
-				{
-					LOGGER.log(Level.WARNING, "ScriptEngine: " + entry2.getKey() + " failed execution!", entry2.getValue());
-				}
-			}
-			finally
-			{
-				_currentExecutionContext = null;
-			}
+			LOGGER.log(Level.WARNING, "ScriptEngine: " + entry.getKey() + " failed execution!", entry.getValue());
 		}
 	}
 	
-	private void processDirectory(File dir, Map<IExecutionContext, List<Path>> files)
+	private void processDirectory(File dir, List<Path> files)
 	{
 		for (File file : dir.listFiles())
 		{
-			if (file.isDirectory())
+			if (file.isFile())
+			{
+				final String fileName = file.getName();
+				if (fileName.endsWith(".java") && !_exclusions.contains(fileName))
+				{
+					files.add(file.toPath().toAbsolutePath());
+				}
+			}
+			else if (file.isDirectory())
 			{
 				processDirectory(file, files);
 			}
-			else
-			{
-				processFile(file, files);
-			}
 		}
 	}
 	
-	private void processFile(File file, Map<IExecutionContext, List<Path>> files)
-	{
-		if (_exclusions.contains(file.getName()))
-		{
-			return;
-		}
-		
-		Path sourceFile = file.toPath();
-		try
-		{
-			checkExistingFile("ScriptFile", sourceFile);
-		}
-		catch (Exception e)
-		{
-			LOGGER.warning(e.getMessage());
-			return;
-		}
-		
-		sourceFile = sourceFile.toAbsolutePath();
-		final String ext = getFileExtension(sourceFile);
-		if (ext == null)
-		{
-			LOGGER.warning("ScriptFile: " + sourceFile + " does not have an extension to determine the script engine!");
-			return;
-		}
-		
-		final IExecutionContext engine = getEngineByExtension(ext);
-		if (engine == null)
-		{
-			return;
-		}
-		
-		files.computeIfAbsent(engine, k -> new LinkedList<>()).add(sourceFile);
-	}
-	
 	public void executeScript(Path sourceFile) throws Exception
 	{
 		Objects.requireNonNull(sourceFile);
@@ -347,34 +237,19 @@ public final class ScriptEngineManager implements IGameXmlReader
 			sourceFile = SCRIPT_FOLDER.resolve(sourceFile);
 		}
 		
-		// throws exception if not exists or not file
-		checkExistingFile("ScriptFile", sourceFile);
-		
 		sourceFile = sourceFile.toAbsolutePath();
-		final String ext = getFileExtension(sourceFile);
 		Objects.requireNonNull(sourceFile, "ScriptFile: " + sourceFile + " does not have an extension to determine the script engine!");
 		
-		final IExecutionContext engine = getEngineByExtension(ext);
-		Objects.requireNonNull(engine, "ScriptEngine: No engine registered for extension " + ext + "!");
-		
-		_currentExecutionContext = engine;
-		try
+		final Entry<Path, Throwable> error = _javaExecutionContext.executeScript(sourceFile);
+		if (error != null)
 		{
-			final Entry<Path, Throwable> error = engine.executeScript(sourceFile);
-			if (error != null)
-			{
-				throw new Exception("ScriptEngine: " + error.getKey() + " failed execution!", error.getValue());
-			}
-		}
-		finally
-		{
-			_currentExecutionContext = null;
+			throw new Exception("ScriptEngine: " + error.getKey() + " failed execution!", error.getValue());
 		}
 	}
 	
 	public Path getCurrentLoadingScript()
 	{
-		return _currentExecutionContext != null ? _currentExecutionContext.getCurrentExecutingScript() : null;
+		return _javaExecutionContext.getCurrentExecutingScript();
 	}
 	
 	public static ScriptEngineManager getInstance()
diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/com/l2jmobius/loginserver/GameServerTable.java b/L2J_Mobius_Classic_2.1_Zaken/java/com/l2jmobius/loginserver/GameServerTable.java
index 456224d78c..4269e47969 100644
--- a/L2J_Mobius_Classic_2.1_Zaken/java/com/l2jmobius/loginserver/GameServerTable.java
+++ b/L2J_Mobius_Classic_2.1_Zaken/java/com/l2jmobius/loginserver/GameServerTable.java
@@ -36,8 +36,8 @@ import org.w3c.dom.Document;
 import org.w3c.dom.NodeList;
 
 import com.l2jmobius.commons.database.DatabaseFactory;
-import com.l2jmobius.commons.util.IGameXmlReader;
 import com.l2jmobius.commons.util.IPSubnet;
+import com.l2jmobius.commons.util.IXmlReader;
 import com.l2jmobius.commons.util.Rnd;
 import com.l2jmobius.loginserver.network.gameserverpackets.ServerStatus;
 
@@ -45,7 +45,7 @@ import com.l2jmobius.loginserver.network.gameserverpackets.ServerStatus;
  * The Class GameServerTable loads the game server names and initialize the game server tables.
  * @author KenM, Zoey76
  */
-public final class GameServerTable implements IGameXmlReader
+public final class GameServerTable implements IXmlReader
 {
 	private static final Logger LOGGER = Logger.getLogger(GameServerTable.class.getName());
 	
diff --git a/L2J_Mobius_Classic_2.2_Antharas/dist/game/config/Scripts.xml b/L2J_Mobius_Classic_2.2_Antharas/dist/game/config/Scripts.xml
index 284aa0a31f..54d05b241f 100644
--- a/L2J_Mobius_Classic_2.2_Antharas/dist/game/config/Scripts.xml
+++ b/L2J_Mobius_Classic_2.2_Antharas/dist/game/config/Scripts.xml
@@ -2,11 +2,7 @@
 <list xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../data/xsd/Scripts.xsd">
 	<!-- Skip these filenames from script loading, because they are already loaded using a different way. -->
 	<exclude file="package-info.java" />
-	<exclude file="MasterHandler.java" />
-	<exclude file="EffectMasterHandler.java" />
-	<exclude file="SkillConditionMasterHandler.java" />
-	<exclude file="ConditionMasterHandler.java" />
-	<exclude file="DailyMissionMasterHandler.java" />
+	<exclude file="handlers" />
 	
 	<!--
 	With this file you can exclude/include specific folders/files from within the scripts directory.
diff --git a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/ai/others/ClassMaster/ClassMaster.java b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/ai/others/ClassMaster/ClassMaster.java
index b4aa56887e..64b38902b0 100644
--- a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/ai/others/ClassMaster/ClassMaster.java
+++ b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/ai/others/ClassMaster/ClassMaster.java
@@ -30,7 +30,7 @@ import org.w3c.dom.NamedNodeMap;
 import org.w3c.dom.Node;
 
 import com.l2jmobius.Config;
-import com.l2jmobius.commons.util.IGameXmlReader;
+import com.l2jmobius.commons.util.IXmlReader;
 import com.l2jmobius.gameserver.data.xml.impl.CategoryData;
 import com.l2jmobius.gameserver.data.xml.impl.ClassListData;
 import com.l2jmobius.gameserver.data.xml.impl.SkillData;
@@ -63,7 +63,7 @@ import ai.AbstractNpcAI;
  * Class Master AI.
  * @author Nik
  */
-public final class ClassMaster extends AbstractNpcAI implements IGameXmlReader
+public final class ClassMaster extends AbstractNpcAI implements IXmlReader
 {
 	// NPCs
 	private static final List<Integer> CLASS_MASTERS = new ArrayList<>();
diff --git a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/admincommandhandlers/AdminQuest.java b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/admincommandhandlers/AdminQuest.java
index 228cc1668d..a771c4ab90 100644
--- a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/admincommandhandlers/AdminQuest.java
+++ b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/admincommandhandlers/AdminQuest.java
@@ -320,7 +320,7 @@ public class AdminQuest implements IAdminCommandHandler
 				{
 					sb.append("<a action=\"bypass -h admin_script_dir " + c + "\">" + c + "</a><br1>");
 				}
-				else if (c.endsWith(".java") || c.endsWith(".py"))
+				else if (c.endsWith(".java"))
 				{
 					sb.append("<a action=\"bypass -h admin_script_load " + c + "\"><font color=\"LEVEL\">" + c + "</font></a><br1>");
 				}
@@ -352,7 +352,7 @@ public class AdminQuest implements IAdminCommandHandler
 				{
 					sb.append("<a action=\"bypass -h admin_script_dir " + currentPath + "/" + c + "\">" + (questReducedNames ? getQuestName(c) : c) + "</a><br1>");
 				}
-				else if (c.endsWith(".java") || c.endsWith(".py"))
+				else if (c.endsWith(".java"))
 				{
 					sb.append("<a action=\"bypass -h admin_script_load " + currentPath + "/" + c + "\"><font color=\"LEVEL\">" + c + "</font></a><br1>");
 				}
diff --git a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/admincommandhandlers/AdminReload.java b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/admincommandhandlers/AdminReload.java
index 466ed146cd..b89bd7cbcd 100644
--- a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/admincommandhandlers/AdminReload.java
+++ b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/admincommandhandlers/AdminReload.java
@@ -221,7 +221,7 @@ public class AdminReload implements IAdminCommandHandler
 				{
 					try
 					{
-						ScriptEngineManager.getInstance().executeEffectMasterHandler();
+						ScriptEngineManager.getInstance().executeScript(ScriptEngineManager.EFFECT_MASTER_HANDLER_FILE);
 						AdminData.getInstance().broadcastMessageToGMs(activeChar.getName() + ": Reloaded effect master handler.");
 					}
 					catch (Exception e)
@@ -235,7 +235,7 @@ public class AdminReload implements IAdminCommandHandler
 				{
 					try
 					{
-						ScriptEngineManager.getInstance().executeMasterHandler();
+						ScriptEngineManager.getInstance().executeScript(ScriptEngineManager.MASTER_HANDLER_FILE);
 						AdminData.getInstance().broadcastMessageToGMs(activeChar.getName() + ": Reloaded master handler.");
 					}
 					catch (Exception e)
diff --git a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/telnethandlers/server/Reload.java b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/telnethandlers/server/Reload.java
index d679ea1212..491b10cc62 100644
--- a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/telnethandlers/server/Reload.java
+++ b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/telnethandlers/server/Reload.java
@@ -181,7 +181,7 @@ public class Reload implements ITelnetCommand
 			{
 				try
 				{
-					ScriptEngineManager.getInstance().executeEffectMasterHandler();
+					ScriptEngineManager.getInstance().executeScript(ScriptEngineManager.EFFECT_MASTER_HANDLER_FILE);
 					return AdminData.getInstance().broadcastMessageToGMs("Telnet Admin: Reloaded effect master handler.");
 				}
 				catch (Exception e)
@@ -194,7 +194,7 @@ public class Reload implements ITelnetCommand
 			{
 				try
 				{
-					ScriptEngineManager.getInstance().executeMasterHandler();
+					ScriptEngineManager.getInstance().executeScript(ScriptEngineManager.MASTER_HANDLER_FILE);
 					return AdminData.getInstance().broadcastMessageToGMs("Telnet Admin: Reloaded master handler.");
 				}
 				catch (Exception e)
diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/com/l2jmobius/Config.java b/L2J_Mobius_Classic_2.2_Antharas/java/com/l2jmobius/Config.java
index 5a8a6b731d..4069e1357d 100644
--- a/L2J_Mobius_Classic_2.2_Antharas/java/com/l2jmobius/Config.java
+++ b/L2J_Mobius_Classic_2.2_Antharas/java/com/l2jmobius/Config.java
@@ -54,7 +54,7 @@ import org.w3c.dom.Document;
 import org.w3c.dom.NamedNodeMap;
 import org.w3c.dom.Node;
 
-import com.l2jmobius.commons.util.IGameXmlReader;
+import com.l2jmobius.commons.util.IXmlReader;
 import com.l2jmobius.commons.util.PropertiesParser;
 import com.l2jmobius.commons.util.StringUtil;
 import com.l2jmobius.gameserver.enums.ChatType;
@@ -2999,7 +2999,7 @@ public final class Config
 		return result;
 	}
 	
-	private static class IPConfigData implements IGameXmlReader
+	private static class IPConfigData implements IXmlReader
 	{
 		private static final List<String> _subnets = new ArrayList<>(5);
 		private static final List<String> _hosts = new ArrayList<>(5);
diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/com/l2jmobius/commons/util/IGameXmlReader.java b/L2J_Mobius_Classic_2.2_Antharas/java/com/l2jmobius/commons/util/IGameXmlReader.java
deleted file mode 100644
index b29089db77..0000000000
--- a/L2J_Mobius_Classic_2.2_Antharas/java/com/l2jmobius/commons/util/IGameXmlReader.java
+++ /dev/null
@@ -1,118 +0,0 @@
-/*
- * This file is part of the L2J Mobius project.
- * 
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- * 
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * General Public License for more details.
- * 
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- */
-package com.l2jmobius.commons.util;
-
-import java.io.File;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
-import org.w3c.dom.NamedNodeMap;
-import org.w3c.dom.Node;
-
-import com.l2jmobius.Config;
-import com.l2jmobius.gameserver.model.Location;
-import com.l2jmobius.gameserver.model.holders.MinionHolder;
-import com.l2jmobius.gameserver.model.holders.SkillHolder;
-
-/**
- * Interface for XML parsers.
- * @author Zoey76
- */
-public interface IGameXmlReader extends IXmlReader
-{
-	/**
-	 * Wrapper for {@link #parseFile(File)} method.
-	 * @param path the relative path to the datapack root of the XML file to parse.
-	 */
-	default void parseDatapackFile(String path)
-	{
-		parseFile(new File(Config.DATAPACK_ROOT, path));
-	}
-	
-	/**
-	 * Wrapper for {@link #parseDirectory(File, boolean)}.
-	 * @param path the path to the directory where the XML files are
-	 * @param recursive parses all sub folders if there is
-	 * @return {@code false} if it fails to find the directory, {@code true} otherwise
-	 */
-	default boolean parseDatapackDirectory(String path, boolean recursive)
-	{
-		return parseDirectory(new File(Config.DATAPACK_ROOT, path), recursive);
-	}
-	
-	/**
-	 * @param n
-	 * @return a map of parameters
-	 */
-	default Map<String, Object> parseParameters(Node n)
-	{
-		final Map<String, Object> parameters = new HashMap<>();
-		for (Node parameters_node = n.getFirstChild(); parameters_node != null; parameters_node = parameters_node.getNextSibling())
-		{
-			NamedNodeMap attrs = parameters_node.getAttributes();
-			switch (parameters_node.getNodeName().toLowerCase())
-			{
-				case "param":
-				{
-					parameters.put(parseString(attrs, "name"), parseString(attrs, "value"));
-					break;
-				}
-				case "skill":
-				{
-					parameters.put(parseString(attrs, "name"), new SkillHolder(parseInteger(attrs, "id"), parseInteger(attrs, "level")));
-					break;
-				}
-				case "location":
-				{
-					parameters.put(parseString(attrs, "name"), new Location(parseInteger(attrs, "x"), parseInteger(attrs, "y"), parseInteger(attrs, "z"), parseInteger(attrs, "heading", 0)));
-					break;
-				}
-				case "minions":
-				{
-					final List<MinionHolder> minions = new ArrayList<>(1);
-					for (Node minions_node = parameters_node.getFirstChild(); minions_node != null; minions_node = minions_node.getNextSibling())
-					{
-						if (minions_node.getNodeName().equalsIgnoreCase("npc"))
-						{
-							attrs = minions_node.getAttributes();
-							minions.add(new MinionHolder(parseInteger(attrs, "id"), parseInteger(attrs, "count"), parseInteger(attrs, "respawnTime"), parseInteger(attrs, "weightPoint")));
-						}
-					}
-					
-					if (!minions.isEmpty())
-					{
-						parameters.put(parseString(parameters_node.getAttributes(), "name"), minions);
-					}
-					break;
-				}
-			}
-		}
-		return parameters;
-	}
-	
-	default Location parseLocation(Node n)
-	{
-		final NamedNodeMap attrs = n.getAttributes();
-		final int x = parseInteger(attrs, "x");
-		final int y = parseInteger(attrs, "y");
-		final int z = parseInteger(attrs, "z");
-		final int heading = parseInteger(attrs, "heading", 0);
-		return new Location(x, y, z, heading);
-	}
-}
diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/com/l2jmobius/commons/util/IXmlReader.java b/L2J_Mobius_Classic_2.2_Antharas/java/com/l2jmobius/commons/util/IXmlReader.java
index 0317816fd8..4bfed2396e 100644
--- a/L2J_Mobius_Classic_2.2_Antharas/java/com/l2jmobius/commons/util/IXmlReader.java
+++ b/L2J_Mobius_Classic_2.2_Antharas/java/com/l2jmobius/commons/util/IXmlReader.java
@@ -18,8 +18,13 @@ package com.l2jmobius.commons.util;
 
 import java.io.File;
 import java.io.FileFilter;
+import java.util.ArrayList;
+import java.util.HashMap;
 import java.util.LinkedHashMap;
+import java.util.List;
 import java.util.Map;
+import java.util.concurrent.CopyOnWriteArrayList;
+import java.util.concurrent.ScheduledFuture;
 import java.util.function.Consumer;
 import java.util.function.Predicate;
 import java.util.logging.Level;
@@ -35,7 +40,12 @@ import org.w3c.dom.NodeList;
 import org.xml.sax.ErrorHandler;
 import org.xml.sax.SAXParseException;
 
+import com.l2jmobius.Config;
+import com.l2jmobius.commons.concurrent.ThreadPool;
 import com.l2jmobius.commons.util.file.filter.XMLFilter;
+import com.l2jmobius.gameserver.model.Location;
+import com.l2jmobius.gameserver.model.holders.MinionHolder;
+import com.l2jmobius.gameserver.model.holders.SkillHolder;
 
 /**
  * Interface for XML parsers.
@@ -56,6 +66,15 @@ public interface IXmlReader
 	 */
 	void load();
 	
+	/**
+	 * Wrapper for {@link #parseFile(File)} method.
+	 * @param path the relative path to the datapack root of the XML file to parse.
+	 */
+	default void parseDatapackFile(String path)
+	{
+		parseFile(new File(Config.DATAPACK_ROOT, path));
+	}
+	
 	/**
 	 * Parses a single XML file.<br>
 	 * If the file was successfully parsed, call {@link #parseDocument(Document, File)} for the parsed document.<br>
@@ -121,6 +140,17 @@ public interface IXmlReader
 		return parseDirectory(file, false);
 	}
 	
+	/**
+	 * Wrapper for {@link #parseDirectory(File, boolean)}.
+	 * @param path the path to the directory where the XML files are
+	 * @param recursive parses all sub folders if there is
+	 * @return {@code false} if it fails to find the directory, {@code true} otherwise
+	 */
+	default boolean parseDatapackDirectory(String path, boolean recursive)
+	{
+		return parseDirectory(new File(Config.DATAPACK_ROOT, path), recursive);
+	}
+	
 	/**
 	 * Loads all XML files from {@code path} and calls {@link #parseFile(File)} for each one of them.
 	 * @param dir the directory object to scan.
@@ -135,6 +165,7 @@ public interface IXmlReader
 			return false;
 		}
 		
+		final List<ScheduledFuture<?>> jobs = new CopyOnWriteArrayList<>();
 		final File[] listOfFiles = dir.listFiles();
 		for (File f : listOfFiles)
 		{
@@ -144,9 +175,23 @@ public interface IXmlReader
 			}
 			else if (getCurrentFileFilter().accept(f))
 			{
-				parseFile(f);
+				jobs.add(ThreadPool.schedule(() ->
+				{
+					parseFile(f);
+				}, 0));
 			}
 		}
+		while (!jobs.isEmpty())
+		{
+			for (ScheduledFuture<?> job : jobs)
+			{
+				if ((job == null) || job.isDone() || job.isCancelled())
+				{
+					jobs.remove(job);
+				}
+			}
+		}
+		
 		return true;
 	}
 	
@@ -531,6 +576,16 @@ public interface IXmlReader
 		return parseString(attrs.getNamedItem(name), defaultValue);
 	}
 	
+	default Location parseLocation(Node n)
+	{
+		final NamedNodeMap attrs = n.getAttributes();
+		final int x = parseInteger(attrs, "x");
+		final int y = parseInteger(attrs, "y");
+		final int z = parseInteger(attrs, "z");
+		final int heading = parseInteger(attrs, "heading", 0);
+		return new Location(x, y, z, heading);
+	}
+	
 	/**
 	 * Parses an enumerated value.
 	 * @param <T> the enumerated type
@@ -612,6 +667,56 @@ public interface IXmlReader
 		return map;
 	}
 	
+	/**
+	 * @param n
+	 * @return a map of parameters
+	 */
+	default Map<String, Object> parseParameters(Node n)
+	{
+		final Map<String, Object> parameters = new HashMap<>();
+		for (Node parameters_node = n.getFirstChild(); parameters_node != null; parameters_node = parameters_node.getNextSibling())
+		{
+			NamedNodeMap attrs = parameters_node.getAttributes();
+			switch (parameters_node.getNodeName().toLowerCase())
+			{
+				case "param":
+				{
+					parameters.put(parseString(attrs, "name"), parseString(attrs, "value"));
+					break;
+				}
+				case "skill":
+				{
+					parameters.put(parseString(attrs, "name"), new SkillHolder(parseInteger(attrs, "id"), parseInteger(attrs, "level")));
+					break;
+				}
+				case "location":
+				{
+					parameters.put(parseString(attrs, "name"), new Location(parseInteger(attrs, "x"), parseInteger(attrs, "y"), parseInteger(attrs, "z"), parseInteger(attrs, "heading", 0)));
+					break;
+				}
+				case "minions":
+				{
+					final List<MinionHolder> minions = new ArrayList<>(1);
+					for (Node minions_node = parameters_node.getFirstChild(); minions_node != null; minions_node = minions_node.getNextSibling())
+					{
+						if (minions_node.getNodeName().equalsIgnoreCase("npc"))
+						{
+							attrs = minions_node.getAttributes();
+							minions.add(new MinionHolder(parseInteger(attrs, "id"), parseInteger(attrs, "count"), parseInteger(attrs, "respawnTime"), parseInteger(attrs, "weightPoint")));
+						}
+					}
+					
+					if (!minions.isEmpty())
+					{
+						parameters.put(parseString(parameters_node.getAttributes(), "name"), minions);
+					}
+					break;
+				}
+			}
+		}
+		return parameters;
+	}
+	
 	/**
 	 * Executes action for each child of node
 	 * @param node
diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/com/l2jmobius/gameserver/GameServer.java b/L2J_Mobius_Classic_2.2_Antharas/java/com/l2jmobius/gameserver/GameServer.java
index 0276cda81d..10c150f549 100644
--- a/L2J_Mobius_Classic_2.2_Antharas/java/com/l2jmobius/gameserver/GameServer.java
+++ b/L2J_Mobius_Classic_2.2_Antharas/java/com/l2jmobius/gameserver/GameServer.java
@@ -358,7 +358,7 @@ public class GameServer
 		try
 		{
 			LOGGER.info(getClass().getSimpleName() + ": Loading server scripts:");
-			ScriptEngineManager.getInstance().executeMasterHandler();
+			ScriptEngineManager.getInstance().executeScript(ScriptEngineManager.MASTER_HANDLER_FILE);
 			ScriptEngineManager.getInstance().executeScriptList();
 		}
 		catch (Exception e)
diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/com/l2jmobius/gameserver/data/xml/impl/ActionData.java b/L2J_Mobius_Classic_2.2_Antharas/java/com/l2jmobius/gameserver/data/xml/impl/ActionData.java
index 0bffdc5bb1..a322dad1d9 100644
--- a/L2J_Mobius_Classic_2.2_Antharas/java/com/l2jmobius/gameserver/data/xml/impl/ActionData.java
+++ b/L2J_Mobius_Classic_2.2_Antharas/java/com/l2jmobius/gameserver/data/xml/impl/ActionData.java
@@ -23,14 +23,14 @@ import java.util.logging.Logger;
 
 import org.w3c.dom.Document;
 
-import com.l2jmobius.commons.util.IGameXmlReader;
+import com.l2jmobius.commons.util.IXmlReader;
 import com.l2jmobius.gameserver.model.ActionDataHolder;
 import com.l2jmobius.gameserver.model.StatsSet;
 
 /**
  * @author UnAfraid
  */
-public class ActionData implements IGameXmlReader
+public class ActionData implements IXmlReader
 {
 	private static final Logger LOGGER = Logger.getLogger(ActionData.class.getName());
 	
diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/com/l2jmobius/gameserver/data/xml/impl/AdminData.java b/L2J_Mobius_Classic_2.2_Antharas/java/com/l2jmobius/gameserver/data/xml/impl/AdminData.java
index 0b1d3e3245..9e359b1521 100644
--- a/L2J_Mobius_Classic_2.2_Antharas/java/com/l2jmobius/gameserver/data/xml/impl/AdminData.java
+++ b/L2J_Mobius_Classic_2.2_Antharas/java/com/l2jmobius/gameserver/data/xml/impl/AdminData.java
@@ -29,7 +29,7 @@ import org.w3c.dom.Document;
 import org.w3c.dom.NamedNodeMap;
 import org.w3c.dom.Node;
 
-import com.l2jmobius.commons.util.IGameXmlReader;
+import com.l2jmobius.commons.util.IXmlReader;
 import com.l2jmobius.gameserver.model.AccessLevel;
 import com.l2jmobius.gameserver.model.AdminCommandAccessRight;
 import com.l2jmobius.gameserver.model.StatsSet;
@@ -42,7 +42,7 @@ import com.l2jmobius.gameserver.network.serverpackets.SystemMessage;
  * Loads administrator access levels and commands.
  * @author UnAfraid
  */
-public final class AdminData implements IGameXmlReader
+public final class AdminData implements IXmlReader
 {
 	private static final Logger LOGGER = Logger.getLogger(AdminData.class.getName());
 	
diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/com/l2jmobius/gameserver/data/xml/impl/AppearanceItemData.java b/L2J_Mobius_Classic_2.2_Antharas/java/com/l2jmobius/gameserver/data/xml/impl/AppearanceItemData.java
index 089004322a..801c66340d 100644
--- a/L2J_Mobius_Classic_2.2_Antharas/java/com/l2jmobius/gameserver/data/xml/impl/AppearanceItemData.java
+++ b/L2J_Mobius_Classic_2.2_Antharas/java/com/l2jmobius/gameserver/data/xml/impl/AppearanceItemData.java
@@ -24,7 +24,7 @@ import java.util.logging.Logger;
 import org.w3c.dom.Document;
 import org.w3c.dom.Node;
 
-import com.l2jmobius.commons.util.IGameXmlReader;
+import com.l2jmobius.commons.util.IXmlReader;
 import com.l2jmobius.gameserver.datatables.ItemTable;
 import com.l2jmobius.gameserver.enums.Race;
 import com.l2jmobius.gameserver.model.StatsSet;
@@ -36,7 +36,7 @@ import com.l2jmobius.gameserver.model.items.type.CrystalType;
 /**
  * @author UnAfraid
  */
-public class AppearanceItemData implements IGameXmlReader
+public class AppearanceItemData implements IXmlReader
 {
 	private static final Logger LOGGER = Logger.getLogger(AppearanceItemData.class.getName());
 	
diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/com/l2jmobius/gameserver/data/xml/impl/ArmorSetsData.java b/L2J_Mobius_Classic_2.2_Antharas/java/com/l2jmobius/gameserver/data/xml/impl/ArmorSetsData.java
index 0f1445c10a..d7582d8d5a 100644
--- a/L2J_Mobius_Classic_2.2_Antharas/java/com/l2jmobius/gameserver/data/xml/impl/ArmorSetsData.java
+++ b/L2J_Mobius_Classic_2.2_Antharas/java/com/l2jmobius/gameserver/data/xml/impl/ArmorSetsData.java
@@ -19,9 +19,9 @@ package com.l2jmobius.gameserver.data.xml.impl;
 import java.io.File;
 import java.util.ArrayList;
 import java.util.Collections;
-import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
+import java.util.concurrent.ConcurrentHashMap;
 import java.util.logging.Logger;
 import java.util.stream.Stream;
 
@@ -29,7 +29,7 @@ import org.w3c.dom.Document;
 import org.w3c.dom.NamedNodeMap;
 import org.w3c.dom.Node;
 
-import com.l2jmobius.commons.util.IGameXmlReader;
+import com.l2jmobius.commons.util.IXmlReader;
 import com.l2jmobius.gameserver.datatables.ItemTable;
 import com.l2jmobius.gameserver.model.ArmorSet;
 import com.l2jmobius.gameserver.model.holders.ArmorsetSkillHolder;
@@ -40,12 +40,12 @@ import com.l2jmobius.gameserver.model.stats.BaseStats;
  * Loads armor set bonuses.
  * @author godson, Luno, UnAfraid
  */
-public final class ArmorSetsData implements IGameXmlReader
+public final class ArmorSetsData implements IXmlReader
 {
 	private static final Logger LOGGER = Logger.getLogger(ArmorSetsData.class.getName());
 	
-	private final Map<Integer, ArmorSet> _armorSets = new HashMap<>();
-	private final Map<Integer, List<ArmorSet>> _armorSetItems = new HashMap<>();
+	private final Map<Integer, ArmorSet> _armorSets = new ConcurrentHashMap<>();
+	private final Map<Integer, List<ArmorSet>> _armorSetItems = new ConcurrentHashMap<>();
 	
 	protected ArmorSetsData()
 	{
diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/com/l2jmobius/gameserver/data/xml/impl/AttendanceRewardData.java b/L2J_Mobius_Classic_2.2_Antharas/java/com/l2jmobius/gameserver/data/xml/impl/AttendanceRewardData.java
index c60afbd78a..24e402e706 100644
--- a/L2J_Mobius_Classic_2.2_Antharas/java/com/l2jmobius/gameserver/data/xml/impl/AttendanceRewardData.java
+++ b/L2J_Mobius_Classic_2.2_Antharas/java/com/l2jmobius/gameserver/data/xml/impl/AttendanceRewardData.java
@@ -24,7 +24,7 @@ import java.util.logging.Logger;
 import org.w3c.dom.Document;
 
 import com.l2jmobius.Config;
-import com.l2jmobius.commons.util.IGameXmlReader;
+import com.l2jmobius.commons.util.IXmlReader;
 import com.l2jmobius.gameserver.datatables.ItemTable;
 import com.l2jmobius.gameserver.model.StatsSet;
 import com.l2jmobius.gameserver.model.holders.ItemHolder;
@@ -32,7 +32,7 @@ import com.l2jmobius.gameserver.model.holders.ItemHolder;
 /**
  * @author Mobius
  */
-public class AttendanceRewardData implements IGameXmlReader
+public class AttendanceRewardData implements IXmlReader
 {
 	private static Logger LOGGER = Logger.getLogger(AttendanceRewardData.class.getName());
 	private final List<ItemHolder> _rewards = new ArrayList<>();
diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/com/l2jmobius/gameserver/data/xml/impl/BeautyShopData.java b/L2J_Mobius_Classic_2.2_Antharas/java/com/l2jmobius/gameserver/data/xml/impl/BeautyShopData.java
index 133f11d978..d88ccc7747 100644
--- a/L2J_Mobius_Classic_2.2_Antharas/java/com/l2jmobius/gameserver/data/xml/impl/BeautyShopData.java
+++ b/L2J_Mobius_Classic_2.2_Antharas/java/com/l2jmobius/gameserver/data/xml/impl/BeautyShopData.java
@@ -24,7 +24,7 @@ import org.w3c.dom.Document;
 import org.w3c.dom.NamedNodeMap;
 import org.w3c.dom.Node;
 
-import com.l2jmobius.commons.util.IGameXmlReader;
+import com.l2jmobius.commons.util.IXmlReader;
 import com.l2jmobius.gameserver.enums.Race;
 import com.l2jmobius.gameserver.enums.Sex;
 import com.l2jmobius.gameserver.model.StatsSet;
@@ -34,7 +34,7 @@ import com.l2jmobius.gameserver.model.beautyshop.BeautyItem;
 /**
  * @author Sdw
  */
-public final class BeautyShopData implements IGameXmlReader
+public final class BeautyShopData implements IXmlReader
 {
 	private final Map<Race, Map<Sex, BeautyData>> _beautyList = new HashMap<>();
 	private final Map<Sex, BeautyData> _beautyData = new HashMap<>();
diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/com/l2jmobius/gameserver/data/xml/impl/BuyListData.java b/L2J_Mobius_Classic_2.2_Antharas/java/com/l2jmobius/gameserver/data/xml/impl/BuyListData.java
index de298ef358..8ab9ea8097 100644
--- a/L2J_Mobius_Classic_2.2_Antharas/java/com/l2jmobius/gameserver/data/xml/impl/BuyListData.java
+++ b/L2J_Mobius_Classic_2.2_Antharas/java/com/l2jmobius/gameserver/data/xml/impl/BuyListData.java
@@ -21,8 +21,8 @@ import java.io.FileFilter;
 import java.sql.Connection;
 import java.sql.ResultSet;
 import java.sql.Statement;
-import java.util.HashMap;
 import java.util.Map;
+import java.util.concurrent.ConcurrentHashMap;
 import java.util.logging.Level;
 import java.util.logging.Logger;
 
@@ -31,7 +31,7 @@ import org.w3c.dom.NamedNodeMap;
 
 import com.l2jmobius.Config;
 import com.l2jmobius.commons.database.DatabaseFactory;
-import com.l2jmobius.commons.util.IGameXmlReader;
+import com.l2jmobius.commons.util.IXmlReader;
 import com.l2jmobius.commons.util.file.filter.NumericNameFilter;
 import com.l2jmobius.gameserver.datatables.ItemTable;
 import com.l2jmobius.gameserver.model.buylist.Product;
@@ -42,11 +42,11 @@ import com.l2jmobius.gameserver.model.items.Item;
  * Loads buy lists for NPCs.
  * @author NosBit
  */
-public final class BuyListData implements IGameXmlReader
+public final class BuyListData implements IXmlReader
 {
 	private static final Logger LOGGER = Logger.getLogger(BuyListData.class.getName());
 	
-	private final Map<Integer, ProductList> _buyLists = new HashMap<>();
+	private final Map<Integer, ProductList> _buyLists = new ConcurrentHashMap<>();
 	private static final FileFilter NUMERIC_FILTER = new NumericNameFilter();
 	
 	protected BuyListData()
diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/com/l2jmobius/gameserver/data/xml/impl/CastleData.java b/L2J_Mobius_Classic_2.2_Antharas/java/com/l2jmobius/gameserver/data/xml/impl/CastleData.java
index 6618dcdf1d..792afbfa0b 100644
--- a/L2J_Mobius_Classic_2.2_Antharas/java/com/l2jmobius/gameserver/data/xml/impl/CastleData.java
+++ b/L2J_Mobius_Classic_2.2_Antharas/java/com/l2jmobius/gameserver/data/xml/impl/CastleData.java
@@ -19,16 +19,16 @@ package com.l2jmobius.gameserver.data.xml.impl;
 import java.io.File;
 import java.util.ArrayList;
 import java.util.Collections;
-import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
+import java.util.concurrent.ConcurrentHashMap;
 import java.util.stream.Collectors;
 
 import org.w3c.dom.Document;
 import org.w3c.dom.NamedNodeMap;
 import org.w3c.dom.Node;
 
-import com.l2jmobius.commons.util.IGameXmlReader;
+import com.l2jmobius.commons.util.IXmlReader;
 import com.l2jmobius.gameserver.enums.CastleSide;
 import com.l2jmobius.gameserver.enums.SiegeGuardType;
 import com.l2jmobius.gameserver.model.holders.CastleSpawnHolder;
@@ -37,10 +37,10 @@ import com.l2jmobius.gameserver.model.holders.SiegeGuardHolder;
 /**
  * @author St3eT
  */
-public final class CastleData implements IGameXmlReader
+public final class CastleData implements IXmlReader
 {
-	private final Map<Integer, List<CastleSpawnHolder>> _spawns = new HashMap<>();
-	private static final Map<Integer, List<SiegeGuardHolder>> _siegeGuards = new HashMap<>();
+	private final Map<Integer, List<CastleSpawnHolder>> _spawns = new ConcurrentHashMap<>();
+	private static final Map<Integer, List<SiegeGuardHolder>> _siegeGuards = new ConcurrentHashMap<>();
 	
 	protected CastleData()
 	{
diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/com/l2jmobius/gameserver/data/xml/impl/CategoryData.java b/L2J_Mobius_Classic_2.2_Antharas/java/com/l2jmobius/gameserver/data/xml/impl/CategoryData.java
index f851aa6703..df7d390dfb 100644
--- a/L2J_Mobius_Classic_2.2_Antharas/java/com/l2jmobius/gameserver/data/xml/impl/CategoryData.java
+++ b/L2J_Mobius_Classic_2.2_Antharas/java/com/l2jmobius/gameserver/data/xml/impl/CategoryData.java
@@ -27,14 +27,14 @@ import org.w3c.dom.Document;
 import org.w3c.dom.NamedNodeMap;
 import org.w3c.dom.Node;
 
-import com.l2jmobius.commons.util.IGameXmlReader;
+import com.l2jmobius.commons.util.IXmlReader;
 import com.l2jmobius.gameserver.enums.CategoryType;
 
 /**
  * Loads the category data with Class or NPC IDs.
  * @author NosBit, xban1x
  */
-public final class CategoryData implements IGameXmlReader
+public final class CategoryData implements IXmlReader
 {
 	private static final Logger LOGGER = Logger.getLogger(CategoryData.class.getName());
 	
diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/com/l2jmobius/gameserver/data/xml/impl/ClanHallData.java b/L2J_Mobius_Classic_2.2_Antharas/java/com/l2jmobius/gameserver/data/xml/impl/ClanHallData.java
index 511cc7f4f7..90a1a51029 100644
--- a/L2J_Mobius_Classic_2.2_Antharas/java/com/l2jmobius/gameserver/data/xml/impl/ClanHallData.java
+++ b/L2J_Mobius_Classic_2.2_Antharas/java/com/l2jmobius/gameserver/data/xml/impl/ClanHallData.java
@@ -20,9 +20,9 @@ import java.io.File;
 import java.util.ArrayList;
 import java.util.Collection;
 import java.util.Comparator;
-import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
+import java.util.concurrent.ConcurrentHashMap;
 import java.util.logging.Logger;
 import java.util.stream.Collectors;
 
@@ -30,7 +30,7 @@ import org.w3c.dom.Document;
 import org.w3c.dom.NamedNodeMap;
 import org.w3c.dom.Node;
 
-import com.l2jmobius.commons.util.IGameXmlReader;
+import com.l2jmobius.commons.util.IXmlReader;
 import com.l2jmobius.gameserver.enums.ClanHallGrade;
 import com.l2jmobius.gameserver.enums.ClanHallType;
 import com.l2jmobius.gameserver.model.Location;
@@ -43,10 +43,10 @@ import com.l2jmobius.gameserver.model.holders.ClanHallTeleportHolder;
 /**
  * @author St3eT
  */
-public final class ClanHallData implements IGameXmlReader
+public final class ClanHallData implements IXmlReader
 {
 	private static final Logger LOGGER = Logger.getLogger(ClanHallData.class.getName());
-	private static final Map<Integer, ClanHall> _clanHalls = new HashMap<>();
+	private static final Map<Integer, ClanHall> _clanHalls = new ConcurrentHashMap<>();
 	
 	protected ClanHallData()
 	{
diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/com/l2jmobius/gameserver/data/xml/impl/ClanRewardData.java b/L2J_Mobius_Classic_2.2_Antharas/java/com/l2jmobius/gameserver/data/xml/impl/ClanRewardData.java
index 252bba1c64..d5938ee964 100644
--- a/L2J_Mobius_Classic_2.2_Antharas/java/com/l2jmobius/gameserver/data/xml/impl/ClanRewardData.java
+++ b/L2J_Mobius_Classic_2.2_Antharas/java/com/l2jmobius/gameserver/data/xml/impl/ClanRewardData.java
@@ -28,7 +28,6 @@ import org.w3c.dom.Document;
 import org.w3c.dom.NamedNodeMap;
 import org.w3c.dom.Node;
 
-import com.l2jmobius.commons.util.IGameXmlReader;
 import com.l2jmobius.commons.util.IXmlReader;
 import com.l2jmobius.gameserver.enums.ClanRewardType;
 import com.l2jmobius.gameserver.model.clan.ClanRewardBonus;
@@ -38,7 +37,7 @@ import com.l2jmobius.gameserver.model.holders.SkillHolder;
 /**
  * @author UnAfraid
  */
-public class ClanRewardData implements IGameXmlReader
+public class ClanRewardData implements IXmlReader
 {
 	private static final Logger LOGGER = Logger.getLogger(ClanRewardData.class.getName());
 	private final Map<ClanRewardType, List<ClanRewardBonus>> _clanRewards = new ConcurrentHashMap<>();
diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/com/l2jmobius/gameserver/data/xml/impl/ClassListData.java b/L2J_Mobius_Classic_2.2_Antharas/java/com/l2jmobius/gameserver/data/xml/impl/ClassListData.java
index a40f726d50..6e99aeabfa 100644
--- a/L2J_Mobius_Classic_2.2_Antharas/java/com/l2jmobius/gameserver/data/xml/impl/ClassListData.java
+++ b/L2J_Mobius_Classic_2.2_Antharas/java/com/l2jmobius/gameserver/data/xml/impl/ClassListData.java
@@ -17,15 +17,15 @@
 package com.l2jmobius.gameserver.data.xml.impl;
 
 import java.io.File;
-import java.util.HashMap;
 import java.util.Map;
+import java.util.concurrent.ConcurrentHashMap;
 import java.util.logging.Logger;
 
 import org.w3c.dom.Document;
 import org.w3c.dom.NamedNodeMap;
 import org.w3c.dom.Node;
 
-import com.l2jmobius.commons.util.IGameXmlReader;
+import com.l2jmobius.commons.util.IXmlReader;
 import com.l2jmobius.gameserver.model.base.ClassId;
 import com.l2jmobius.gameserver.model.base.ClassInfo;
 
@@ -33,11 +33,11 @@ import com.l2jmobius.gameserver.model.base.ClassInfo;
  * Loads the the list of classes and it's info.
  * @author Zoey76
  */
-public final class ClassListData implements IGameXmlReader
+public final class ClassListData implements IXmlReader
 {
 	private static final Logger LOGGER = Logger.getLogger(ClassListData.class.getName());
 	
-	private final Map<ClassId, ClassInfo> _classData = new HashMap<>();
+	private final Map<ClassId, ClassInfo> _classData = new ConcurrentHashMap<>();
 	
 	/**
 	 * Instantiates a new class list data.
diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/com/l2jmobius/gameserver/data/xml/impl/CombinationItemsData.java b/L2J_Mobius_Classic_2.2_Antharas/java/com/l2jmobius/gameserver/data/xml/impl/CombinationItemsData.java
index a7e90d5f89..c2ce205300 100644
--- a/L2J_Mobius_Classic_2.2_Antharas/java/com/l2jmobius/gameserver/data/xml/impl/CombinationItemsData.java
+++ b/L2J_Mobius_Classic_2.2_Antharas/java/com/l2jmobius/gameserver/data/xml/impl/CombinationItemsData.java
@@ -24,7 +24,7 @@ import java.util.stream.Collectors;
 
 import org.w3c.dom.Document;
 
-import com.l2jmobius.commons.util.IGameXmlReader;
+import com.l2jmobius.commons.util.IXmlReader;
 import com.l2jmobius.gameserver.datatables.ItemTable;
 import com.l2jmobius.gameserver.model.StatsSet;
 import com.l2jmobius.gameserver.model.items.combination.CombinationItem;
@@ -34,7 +34,7 @@ import com.l2jmobius.gameserver.model.items.combination.CombinationItemType;
 /**
  * @author UnAfraid
  */
-public class CombinationItemsData implements IGameXmlReader
+public class CombinationItemsData implements IXmlReader
 {
 	private static final Logger LOGGER = Logger.getLogger(CombinationItemsData.class.getName());
 	private final List<CombinationItem> _items = new ArrayList<>();
diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/com/l2jmobius/gameserver/data/xml/impl/CubicData.java b/L2J_Mobius_Classic_2.2_Antharas/java/com/l2jmobius/gameserver/data/xml/impl/CubicData.java
index f682509217..ef46a08a7f 100644
--- a/L2J_Mobius_Classic_2.2_Antharas/java/com/l2jmobius/gameserver/data/xml/impl/CubicData.java
+++ b/L2J_Mobius_Classic_2.2_Antharas/java/com/l2jmobius/gameserver/data/xml/impl/CubicData.java
@@ -20,12 +20,12 @@ import java.io.File;
 import java.util.Collections;
 import java.util.HashMap;
 import java.util.Map;
+import java.util.concurrent.ConcurrentHashMap;
 import java.util.logging.Logger;
 
 import org.w3c.dom.Document;
 import org.w3c.dom.Node;
 
-import com.l2jmobius.commons.util.IGameXmlReader;
 import com.l2jmobius.commons.util.IXmlReader;
 import com.l2jmobius.gameserver.model.StatsSet;
 import com.l2jmobius.gameserver.model.actor.templates.CubicTemplate;
@@ -39,11 +39,11 @@ import com.l2jmobius.gameserver.model.cubic.conditions.RangeCondition;
 /**
  * @author UnAfraid
  */
-public class CubicData implements IGameXmlReader
+public class CubicData implements IXmlReader
 {
 	private static final Logger LOGGER = Logger.getLogger(CubicData.class.getName());
 	
-	private final Map<Integer, Map<Integer, CubicTemplate>> _cubics = new HashMap<>();
+	private final Map<Integer, Map<Integer, CubicTemplate>> _cubics = new ConcurrentHashMap<>();
 	
 	protected CubicData()
 	{
diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/com/l2jmobius/gameserver/data/xml/impl/DailyMissionData.java b/L2J_Mobius_Classic_2.2_Antharas/java/com/l2jmobius/gameserver/data/xml/impl/DailyMissionData.java
index 53519f2492..1e275049d9 100644
--- a/L2J_Mobius_Classic_2.2_Antharas/java/com/l2jmobius/gameserver/data/xml/impl/DailyMissionData.java
+++ b/L2J_Mobius_Classic_2.2_Antharas/java/com/l2jmobius/gameserver/data/xml/impl/DailyMissionData.java
@@ -27,7 +27,7 @@ import java.util.stream.Collectors;
 
 import org.w3c.dom.Document;
 
-import com.l2jmobius.commons.util.IGameXmlReader;
+import com.l2jmobius.commons.util.IXmlReader;
 import com.l2jmobius.gameserver.model.DailyMissionDataHolder;
 import com.l2jmobius.gameserver.model.StatsSet;
 import com.l2jmobius.gameserver.model.actor.instance.PlayerInstance;
@@ -37,7 +37,7 @@ import com.l2jmobius.gameserver.model.holders.ItemHolder;
 /**
  * @author Sdw
  */
-public class DailyMissionData implements IGameXmlReader
+public class DailyMissionData implements IXmlReader
 {
 	private static final Logger LOGGER = Logger.getLogger(DailyMissionData.class.getName());
 	private final Map<Integer, List<DailyMissionDataHolder>> _dailyMissionRewards = new LinkedHashMap<>();
diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/com/l2jmobius/gameserver/data/xml/impl/DoorData.java b/L2J_Mobius_Classic_2.2_Antharas/java/com/l2jmobius/gameserver/data/xml/impl/DoorData.java
index e8b1ff7bfa..5dd43e98eb 100644
--- a/L2J_Mobius_Classic_2.2_Antharas/java/com/l2jmobius/gameserver/data/xml/impl/DoorData.java
+++ b/L2J_Mobius_Classic_2.2_Antharas/java/com/l2jmobius/gameserver/data/xml/impl/DoorData.java
@@ -32,7 +32,6 @@ import org.w3c.dom.Document;
 import org.w3c.dom.NamedNodeMap;
 import org.w3c.dom.Node;
 
-import com.l2jmobius.commons.util.IGameXmlReader;
 import com.l2jmobius.commons.util.IXmlReader;
 import com.l2jmobius.gameserver.instancemanager.MapRegionManager;
 import com.l2jmobius.gameserver.model.Location;
@@ -45,7 +44,7 @@ import com.l2jmobius.gameserver.model.instancezone.Instance;
  * This class loads and hold info about doors.
  * @author JIV, GodKratos, UnAfraid
  */
-public final class DoorData implements IGameXmlReader
+public final class DoorData implements IXmlReader
 {
 	private static final Logger LOGGER = Logger.getLogger(DoorData.class.getName());
 	
diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/com/l2jmobius/gameserver/data/xml/impl/EnchantItemData.java b/L2J_Mobius_Classic_2.2_Antharas/java/com/l2jmobius/gameserver/data/xml/impl/EnchantItemData.java
index 24e12d1218..342b4cde07 100644
--- a/L2J_Mobius_Classic_2.2_Antharas/java/com/l2jmobius/gameserver/data/xml/impl/EnchantItemData.java
+++ b/L2J_Mobius_Classic_2.2_Antharas/java/com/l2jmobius/gameserver/data/xml/impl/EnchantItemData.java
@@ -25,7 +25,7 @@ import org.w3c.dom.Document;
 import org.w3c.dom.NamedNodeMap;
 import org.w3c.dom.Node;
 
-import com.l2jmobius.commons.util.IGameXmlReader;
+import com.l2jmobius.commons.util.IXmlReader;
 import com.l2jmobius.gameserver.model.StatsSet;
 import com.l2jmobius.gameserver.model.items.enchant.EnchantScroll;
 import com.l2jmobius.gameserver.model.items.enchant.EnchantSupportItem;
@@ -35,7 +35,7 @@ import com.l2jmobius.gameserver.model.items.instance.ItemInstance;
  * Loads item enchant data.
  * @author UnAfraid
  */
-public class EnchantItemData implements IGameXmlReader
+public class EnchantItemData implements IXmlReader
 {
 	private static final Logger LOGGER = Logger.getLogger(EnchantItemData.class.getName());
 	
diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/com/l2jmobius/gameserver/data/xml/impl/EnchantItemGroupsData.java b/L2J_Mobius_Classic_2.2_Antharas/java/com/l2jmobius/gameserver/data/xml/impl/EnchantItemGroupsData.java
index 666d821e42..44582a7dd4 100644
--- a/L2J_Mobius_Classic_2.2_Antharas/java/com/l2jmobius/gameserver/data/xml/impl/EnchantItemGroupsData.java
+++ b/L2J_Mobius_Classic_2.2_Antharas/java/com/l2jmobius/gameserver/data/xml/impl/EnchantItemGroupsData.java
@@ -25,7 +25,7 @@ import org.w3c.dom.Document;
 import org.w3c.dom.NamedNodeMap;
 import org.w3c.dom.Node;
 
-import com.l2jmobius.commons.util.IGameXmlReader;
+import com.l2jmobius.commons.util.IXmlReader;
 import com.l2jmobius.gameserver.datatables.ItemTable;
 import com.l2jmobius.gameserver.model.holders.RangeChanceHolder;
 import com.l2jmobius.gameserver.model.items.Item;
@@ -37,7 +37,7 @@ import com.l2jmobius.gameserver.util.Util;
 /**
  * @author UnAfraid
  */
-public final class EnchantItemGroupsData implements IGameXmlReader
+public final class EnchantItemGroupsData implements IXmlReader
 {
 	private static final Logger LOGGER = Logger.getLogger(EnchantItemGroupsData.class.getName());
 	
diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/com/l2jmobius/gameserver/data/xml/impl/EnchantItemHPBonusData.java b/L2J_Mobius_Classic_2.2_Antharas/java/com/l2jmobius/gameserver/data/xml/impl/EnchantItemHPBonusData.java
index d2ce1096b5..868b1f95f6 100644
--- a/L2J_Mobius_Classic_2.2_Antharas/java/com/l2jmobius/gameserver/data/xml/impl/EnchantItemHPBonusData.java
+++ b/L2J_Mobius_Classic_2.2_Antharas/java/com/l2jmobius/gameserver/data/xml/impl/EnchantItemHPBonusData.java
@@ -26,7 +26,7 @@ import java.util.logging.Logger;
 import org.w3c.dom.Document;
 import org.w3c.dom.Node;
 
-import com.l2jmobius.commons.util.IGameXmlReader;
+import com.l2jmobius.commons.util.IXmlReader;
 import com.l2jmobius.gameserver.model.items.Item;
 import com.l2jmobius.gameserver.model.items.instance.ItemInstance;
 import com.l2jmobius.gameserver.model.items.type.CrystalType;
@@ -35,7 +35,7 @@ import com.l2jmobius.gameserver.model.items.type.CrystalType;
  * This class holds the Enchant HP Bonus Data.
  * @author MrPoke, Zoey76
  */
-public class EnchantItemHPBonusData implements IGameXmlReader
+public class EnchantItemHPBonusData implements IXmlReader
 {
 	private static final Logger LOGGER = Logger.getLogger(EnchantItemHPBonusData.class.getName());
 	
diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/com/l2jmobius/gameserver/data/xml/impl/EnchantItemOptionsData.java b/L2J_Mobius_Classic_2.2_Antharas/java/com/l2jmobius/gameserver/data/xml/impl/EnchantItemOptionsData.java
index f6e9946b94..b8d805132f 100644
--- a/L2J_Mobius_Classic_2.2_Antharas/java/com/l2jmobius/gameserver/data/xml/impl/EnchantItemOptionsData.java
+++ b/L2J_Mobius_Classic_2.2_Antharas/java/com/l2jmobius/gameserver/data/xml/impl/EnchantItemOptionsData.java
@@ -24,7 +24,7 @@ import java.util.logging.Logger;
 import org.w3c.dom.Document;
 import org.w3c.dom.Node;
 
-import com.l2jmobius.commons.util.IGameXmlReader;
+import com.l2jmobius.commons.util.IXmlReader;
 import com.l2jmobius.gameserver.model.items.instance.ItemInstance;
 import com.l2jmobius.gameserver.model.options.EnchantOptions;
 import com.l2jmobius.gameserver.util.Util;
@@ -32,7 +32,7 @@ import com.l2jmobius.gameserver.util.Util;
 /**
  * @author UnAfraid
  */
-public class EnchantItemOptionsData implements IGameXmlReader
+public class EnchantItemOptionsData implements IXmlReader
 {
 	private static final Logger LOGGER = Logger.getLogger(EnchantItemOptionsData.class.getName());
 	
diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/com/l2jmobius/gameserver/data/xml/impl/EnchantSkillGroupsData.java b/L2J_Mobius_Classic_2.2_Antharas/java/com/l2jmobius/gameserver/data/xml/impl/EnchantSkillGroupsData.java
index 0b557ced04..45127fe5f6 100644
--- a/L2J_Mobius_Classic_2.2_Antharas/java/com/l2jmobius/gameserver/data/xml/impl/EnchantSkillGroupsData.java
+++ b/L2J_Mobius_Classic_2.2_Antharas/java/com/l2jmobius/gameserver/data/xml/impl/EnchantSkillGroupsData.java
@@ -18,16 +18,15 @@ package com.l2jmobius.gameserver.data.xml.impl;
 
 import java.io.File;
 import java.util.Collections;
-import java.util.HashMap;
 import java.util.HashSet;
-import java.util.LinkedHashMap;
 import java.util.Map;
 import java.util.Set;
+import java.util.concurrent.ConcurrentHashMap;
 import java.util.logging.Logger;
 
 import org.w3c.dom.Document;
 
-import com.l2jmobius.commons.util.IGameXmlReader;
+import com.l2jmobius.commons.util.IXmlReader;
 import com.l2jmobius.gameserver.enums.SkillEnchantType;
 import com.l2jmobius.gameserver.model.StatsSet;
 import com.l2jmobius.gameserver.model.holders.EnchantSkillHolder;
@@ -39,12 +38,12 @@ import com.l2jmobius.gameserver.model.skills.Skill;
  * This class holds the Enchant Groups information.
  * @author Micr0
  */
-public class EnchantSkillGroupsData implements IGameXmlReader
+public class EnchantSkillGroupsData implements IXmlReader
 {
 	private static final Logger LOGGER = Logger.getLogger(EnchantSkillGroupsData.class.getName());
 	
-	private final Map<Integer, EnchantSkillHolder> _enchantSkillHolders = new LinkedHashMap<>();
-	private final Map<SkillHolder, Set<Integer>> _enchantSkillTrees = new HashMap<>();
+	private final Map<Integer, EnchantSkillHolder> _enchantSkillHolders = new ConcurrentHashMap<>();
+	private final Map<SkillHolder, Set<Integer>> _enchantSkillTrees = new ConcurrentHashMap<>();
 	
 	public static int MAX_ENCHANT_LEVEL;
 	
diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/com/l2jmobius/gameserver/data/xml/impl/EnsoulData.java b/L2J_Mobius_Classic_2.2_Antharas/java/com/l2jmobius/gameserver/data/xml/impl/EnsoulData.java
index 0881f3aaec..bea9592527 100644
--- a/L2J_Mobius_Classic_2.2_Antharas/java/com/l2jmobius/gameserver/data/xml/impl/EnsoulData.java
+++ b/L2J_Mobius_Classic_2.2_Antharas/java/com/l2jmobius/gameserver/data/xml/impl/EnsoulData.java
@@ -19,16 +19,14 @@ package com.l2jmobius.gameserver.data.xml.impl;
 import java.io.File;
 import java.util.Collection;
 import java.util.Collections;
-import java.util.EnumMap;
-import java.util.HashMap;
 import java.util.Map;
+import java.util.concurrent.ConcurrentHashMap;
 import java.util.logging.Logger;
 
 import org.w3c.dom.Document;
 import org.w3c.dom.NamedNodeMap;
 import org.w3c.dom.Node;
 
-import com.l2jmobius.commons.util.IGameXmlReader;
 import com.l2jmobius.commons.util.IXmlReader;
 import com.l2jmobius.gameserver.model.ensoul.EnsoulFee;
 import com.l2jmobius.gameserver.model.ensoul.EnsoulOption;
@@ -39,12 +37,12 @@ import com.l2jmobius.gameserver.model.items.type.CrystalType;
 /**
  * @author UnAfraid
  */
-public class EnsoulData implements IGameXmlReader
+public class EnsoulData implements IXmlReader
 {
 	private static final Logger LOGGER = Logger.getLogger(EnsoulData.class.getName());
-	private final Map<CrystalType, EnsoulFee> _ensoulFees = new EnumMap<>(CrystalType.class);
-	private final Map<Integer, EnsoulOption> _ensoulOptions = new HashMap<>();
-	private final Map<Integer, EnsoulStone> _ensoulStones = new HashMap<>();
+	private final Map<CrystalType, EnsoulFee> _ensoulFees = new ConcurrentHashMap<>();
+	private final Map<Integer, EnsoulOption> _ensoulOptions = new ConcurrentHashMap<>();
+	private final Map<Integer, EnsoulStone> _ensoulStones = new ConcurrentHashMap<>();
 	
 	protected EnsoulData()
 	{
diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/com/l2jmobius/gameserver/data/xml/impl/EventEngineData.java b/L2J_Mobius_Classic_2.2_Antharas/java/com/l2jmobius/gameserver/data/xml/impl/EventEngineData.java
index c43970ea31..144e2d5599 100644
--- a/L2J_Mobius_Classic_2.2_Antharas/java/com/l2jmobius/gameserver/data/xml/impl/EventEngineData.java
+++ b/L2J_Mobius_Classic_2.2_Antharas/java/com/l2jmobius/gameserver/data/xml/impl/EventEngineData.java
@@ -32,7 +32,6 @@ import org.w3c.dom.Document;
 import org.w3c.dom.NamedNodeMap;
 import org.w3c.dom.Node;
 
-import com.l2jmobius.commons.util.IGameXmlReader;
 import com.l2jmobius.commons.util.IXmlReader;
 import com.l2jmobius.gameserver.model.Location;
 import com.l2jmobius.gameserver.model.StatsSet;
@@ -54,7 +53,7 @@ import com.l2jmobius.gameserver.model.holders.SkillHolder;
 /**
  * @author UnAfraid
  */
-public final class EventEngineData implements IGameXmlReader
+public final class EventEngineData implements IXmlReader
 {
 	private static final Logger LOGGER = Logger.getLogger(EventEngineData.class.getName());
 	
diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/com/l2jmobius/gameserver/data/xml/impl/ExperienceData.java b/L2J_Mobius_Classic_2.2_Antharas/java/com/l2jmobius/gameserver/data/xml/impl/ExperienceData.java
index 2daaf16220..ea9d13c2aa 100644
--- a/L2J_Mobius_Classic_2.2_Antharas/java/com/l2jmobius/gameserver/data/xml/impl/ExperienceData.java
+++ b/L2J_Mobius_Classic_2.2_Antharas/java/com/l2jmobius/gameserver/data/xml/impl/ExperienceData.java
@@ -26,13 +26,13 @@ import org.w3c.dom.NamedNodeMap;
 import org.w3c.dom.Node;
 
 import com.l2jmobius.Config;
-import com.l2jmobius.commons.util.IGameXmlReader;
+import com.l2jmobius.commons.util.IXmlReader;
 
 /**
  * This class holds the Experience points for each level for players and pets.
  * @author mrTJO
  */
-public final class ExperienceData implements IGameXmlReader
+public final class ExperienceData implements IXmlReader
 {
 	private static final Logger LOGGER = Logger.getLogger(ExperienceData.class.getName());
 	
diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/com/l2jmobius/gameserver/data/xml/impl/ExtendDropData.java b/L2J_Mobius_Classic_2.2_Antharas/java/com/l2jmobius/gameserver/data/xml/impl/ExtendDropData.java
index 00af3a4f77..09da39ad14 100644
--- a/L2J_Mobius_Classic_2.2_Antharas/java/com/l2jmobius/gameserver/data/xml/impl/ExtendDropData.java
+++ b/L2J_Mobius_Classic_2.2_Antharas/java/com/l2jmobius/gameserver/data/xml/impl/ExtendDropData.java
@@ -28,7 +28,7 @@ import java.util.logging.Logger;
 import org.w3c.dom.Document;
 import org.w3c.dom.Node;
 
-import com.l2jmobius.commons.util.IGameXmlReader;
+import com.l2jmobius.commons.util.IXmlReader;
 import com.l2jmobius.gameserver.handler.ConditionHandler;
 import com.l2jmobius.gameserver.model.StatsSet;
 import com.l2jmobius.gameserver.model.conditions.ICondition;
@@ -39,7 +39,7 @@ import com.l2jmobius.gameserver.network.SystemMessageId;
 /**
  * @author Sdw
  */
-public class ExtendDropData implements IGameXmlReader
+public class ExtendDropData implements IXmlReader
 {
 	private static final Logger LOGGER = Logger.getLogger(ExtendDropData.class.getName());
 	private final Map<Integer, ExtendDropDataHolder> _extendDrop = new HashMap<>();
diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/com/l2jmobius/gameserver/data/xml/impl/FakePlayerData.java b/L2J_Mobius_Classic_2.2_Antharas/java/com/l2jmobius/gameserver/data/xml/impl/FakePlayerData.java
index afb92c06d5..74b7957fd9 100644
--- a/L2J_Mobius_Classic_2.2_Antharas/java/com/l2jmobius/gameserver/data/xml/impl/FakePlayerData.java
+++ b/L2J_Mobius_Classic_2.2_Antharas/java/com/l2jmobius/gameserver/data/xml/impl/FakePlayerData.java
@@ -26,7 +26,7 @@ import java.util.logging.Logger;
 import org.w3c.dom.Document;
 
 import com.l2jmobius.Config;
-import com.l2jmobius.commons.util.IGameXmlReader;
+import com.l2jmobius.commons.util.IXmlReader;
 import com.l2jmobius.gameserver.data.sql.impl.CharNameTable;
 import com.l2jmobius.gameserver.model.StatsSet;
 import com.l2jmobius.gameserver.model.actor.templates.NpcTemplate;
@@ -35,7 +35,7 @@ import com.l2jmobius.gameserver.model.holders.FakePlayerHolder;
 /**
  * @author Mobius
  */
-public class FakePlayerData implements IGameXmlReader
+public class FakePlayerData implements IXmlReader
 {
 	private static Logger LOGGER = Logger.getLogger(FakePlayerData.class.getName());
 	
diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/com/l2jmobius/gameserver/data/xml/impl/FenceData.java b/L2J_Mobius_Classic_2.2_Antharas/java/com/l2jmobius/gameserver/data/xml/impl/FenceData.java
index f51175e5fa..d36ab2e16b 100644
--- a/L2J_Mobius_Classic_2.2_Antharas/java/com/l2jmobius/gameserver/data/xml/impl/FenceData.java
+++ b/L2J_Mobius_Classic_2.2_Antharas/java/com/l2jmobius/gameserver/data/xml/impl/FenceData.java
@@ -28,7 +28,7 @@ import java.util.logging.Logger;
 import org.w3c.dom.Document;
 import org.w3c.dom.Node;
 
-import com.l2jmobius.commons.util.IGameXmlReader;
+import com.l2jmobius.commons.util.IXmlReader;
 import com.l2jmobius.gameserver.enums.FenceState;
 import com.l2jmobius.gameserver.model.StatsSet;
 import com.l2jmobius.gameserver.model.World;
@@ -39,7 +39,7 @@ import com.l2jmobius.gameserver.model.instancezone.Instance;
 /**
  * @author HoridoJoho / FBIagent
  */
-public final class FenceData implements IGameXmlReader
+public final class FenceData implements IXmlReader
 {
 	private static final Logger LOGGER = Logger.getLogger(FenceData.class.getSimpleName());
 	
diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/com/l2jmobius/gameserver/data/xml/impl/FishingData.java b/L2J_Mobius_Classic_2.2_Antharas/java/com/l2jmobius/gameserver/data/xml/impl/FishingData.java
index bacf1ed08c..16436a2f5c 100644
--- a/L2J_Mobius_Classic_2.2_Antharas/java/com/l2jmobius/gameserver/data/xml/impl/FishingData.java
+++ b/L2J_Mobius_Classic_2.2_Antharas/java/com/l2jmobius/gameserver/data/xml/impl/FishingData.java
@@ -26,7 +26,7 @@ import org.w3c.dom.NamedNodeMap;
 import org.w3c.dom.Node;
 
 import com.l2jmobius.Config;
-import com.l2jmobius.commons.util.IGameXmlReader;
+import com.l2jmobius.commons.util.IXmlReader;
 import com.l2jmobius.gameserver.datatables.ItemTable;
 import com.l2jmobius.gameserver.model.fishing.FishingBait;
 import com.l2jmobius.gameserver.model.fishing.FishingCatch;
@@ -36,7 +36,7 @@ import com.l2jmobius.gameserver.model.fishing.FishingRod;
  * This class holds the Fishing information.
  * @author bit
  */
-public final class FishingData implements IGameXmlReader
+public final class FishingData implements IXmlReader
 {
 	private static final Logger LOGGER = Logger.getLogger(FishingData.class.getName());
 	private final Map<Integer, FishingBait> _baitData = new HashMap<>();
diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/com/l2jmobius/gameserver/data/xml/impl/HennaData.java b/L2J_Mobius_Classic_2.2_Antharas/java/com/l2jmobius/gameserver/data/xml/impl/HennaData.java
index e27e186193..d3ac163f3c 100644
--- a/L2J_Mobius_Classic_2.2_Antharas/java/com/l2jmobius/gameserver/data/xml/impl/HennaData.java
+++ b/L2J_Mobius_Classic_2.2_Antharas/java/com/l2jmobius/gameserver/data/xml/impl/HennaData.java
@@ -27,7 +27,7 @@ import org.w3c.dom.Document;
 import org.w3c.dom.NamedNodeMap;
 import org.w3c.dom.Node;
 
-import com.l2jmobius.commons.util.IGameXmlReader;
+import com.l2jmobius.commons.util.IXmlReader;
 import com.l2jmobius.gameserver.model.StatsSet;
 import com.l2jmobius.gameserver.model.base.ClassId;
 import com.l2jmobius.gameserver.model.items.Henna;
@@ -40,7 +40,7 @@ import com.l2jmobius.gameserver.model.skills.Skill;
  * Allowed classes to wear each henna.
  * @author Zoey76, Mobius
  */
-public final class HennaData implements IGameXmlReader
+public final class HennaData implements IXmlReader
 {
 	private static final Logger LOGGER = Logger.getLogger(HennaData.class.getName());
 	
diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/com/l2jmobius/gameserver/data/xml/impl/HitConditionBonusData.java b/L2J_Mobius_Classic_2.2_Antharas/java/com/l2jmobius/gameserver/data/xml/impl/HitConditionBonusData.java
index e9f2f9a87d..2d6ccf0467 100644
--- a/L2J_Mobius_Classic_2.2_Antharas/java/com/l2jmobius/gameserver/data/xml/impl/HitConditionBonusData.java
+++ b/L2J_Mobius_Classic_2.2_Antharas/java/com/l2jmobius/gameserver/data/xml/impl/HitConditionBonusData.java
@@ -23,7 +23,7 @@ import org.w3c.dom.Document;
 import org.w3c.dom.NamedNodeMap;
 import org.w3c.dom.Node;
 
-import com.l2jmobius.commons.util.IGameXmlReader;
+import com.l2jmobius.commons.util.IXmlReader;
 import com.l2jmobius.gameserver.GameTimeController;
 import com.l2jmobius.gameserver.enums.Position;
 import com.l2jmobius.gameserver.model.actor.Creature;
@@ -32,7 +32,7 @@ import com.l2jmobius.gameserver.model.actor.Creature;
  * This class load, holds and calculates the hit condition bonuses.
  * @author Nik
  */
-public final class HitConditionBonusData implements IGameXmlReader
+public final class HitConditionBonusData implements IXmlReader
 {
 	private static final Logger LOGGER = Logger.getLogger(HitConditionBonusData.class.getName());
 	
diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/com/l2jmobius/gameserver/data/xml/impl/InitialEquipmentData.java b/L2J_Mobius_Classic_2.2_Antharas/java/com/l2jmobius/gameserver/data/xml/impl/InitialEquipmentData.java
index 247ea4b46d..275a23f28f 100644
--- a/L2J_Mobius_Classic_2.2_Antharas/java/com/l2jmobius/gameserver/data/xml/impl/InitialEquipmentData.java
+++ b/L2J_Mobius_Classic_2.2_Antharas/java/com/l2jmobius/gameserver/data/xml/impl/InitialEquipmentData.java
@@ -28,7 +28,7 @@ import org.w3c.dom.NamedNodeMap;
 import org.w3c.dom.Node;
 
 import com.l2jmobius.Config;
-import com.l2jmobius.commons.util.IGameXmlReader;
+import com.l2jmobius.commons.util.IXmlReader;
 import com.l2jmobius.gameserver.model.StatsSet;
 import com.l2jmobius.gameserver.model.base.ClassId;
 import com.l2jmobius.gameserver.model.items.PlayerItemTemplate;
@@ -38,7 +38,7 @@ import com.l2jmobius.gameserver.model.items.PlayerItemTemplate;
  * What items get each newly created character and if this item is equipped upon creation (<b>Requires the item to be equippable</b>).
  * @author Zoey76
  */
-public final class InitialEquipmentData implements IGameXmlReader
+public final class InitialEquipmentData implements IXmlReader
 {
 	private static final Logger LOGGER = Logger.getLogger(InitialEquipmentData.class.getName());
 	
diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/com/l2jmobius/gameserver/data/xml/impl/InitialShortcutData.java b/L2J_Mobius_Classic_2.2_Antharas/java/com/l2jmobius/gameserver/data/xml/impl/InitialShortcutData.java
index 5f886bafa8..3b9e976607 100644
--- a/L2J_Mobius_Classic_2.2_Antharas/java/com/l2jmobius/gameserver/data/xml/impl/InitialShortcutData.java
+++ b/L2J_Mobius_Classic_2.2_Antharas/java/com/l2jmobius/gameserver/data/xml/impl/InitialShortcutData.java
@@ -27,7 +27,7 @@ import org.w3c.dom.Document;
 import org.w3c.dom.NamedNodeMap;
 import org.w3c.dom.Node;
 
-import com.l2jmobius.commons.util.IGameXmlReader;
+import com.l2jmobius.commons.util.IXmlReader;
 import com.l2jmobius.gameserver.enums.MacroType;
 import com.l2jmobius.gameserver.enums.ShortcutType;
 import com.l2jmobius.gameserver.model.Macro;
@@ -43,7 +43,7 @@ import com.l2jmobius.gameserver.network.serverpackets.ShortCutRegister;
  * What shortcuts get each newly created character.
  * @author Zoey76
  */
-public final class InitialShortcutData implements IGameXmlReader
+public final class InitialShortcutData implements IXmlReader
 {
 	private static final Logger LOGGER = Logger.getLogger(InitialShortcutData.class.getName());
 	
diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/com/l2jmobius/gameserver/data/xml/impl/ItemCrystallizationData.java b/L2J_Mobius_Classic_2.2_Antharas/java/com/l2jmobius/gameserver/data/xml/impl/ItemCrystallizationData.java
index 86454b2b71..aa7742afa1 100644
--- a/L2J_Mobius_Classic_2.2_Antharas/java/com/l2jmobius/gameserver/data/xml/impl/ItemCrystallizationData.java
+++ b/L2J_Mobius_Classic_2.2_Antharas/java/com/l2jmobius/gameserver/data/xml/impl/ItemCrystallizationData.java
@@ -28,7 +28,7 @@ import org.w3c.dom.Document;
 import org.w3c.dom.NamedNodeMap;
 import org.w3c.dom.Node;
 
-import com.l2jmobius.commons.util.IGameXmlReader;
+import com.l2jmobius.commons.util.IXmlReader;
 import com.l2jmobius.gameserver.datatables.ItemTable;
 import com.l2jmobius.gameserver.enums.CrystallizationType;
 import com.l2jmobius.gameserver.model.holders.CrystallizationDataHolder;
@@ -42,7 +42,7 @@ import com.l2jmobius.gameserver.model.items.type.CrystalType;
 /**
  * @author UnAfraid
  */
-public final class ItemCrystallizationData implements IGameXmlReader
+public final class ItemCrystallizationData implements IXmlReader
 {
 	private static final Logger LOGGER = Logger.getLogger(ItemCrystallizationData.class.getName());
 	
diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/com/l2jmobius/gameserver/data/xml/impl/KarmaData.java b/L2J_Mobius_Classic_2.2_Antharas/java/com/l2jmobius/gameserver/data/xml/impl/KarmaData.java
index ca826eba2e..bd68c38748 100644
--- a/L2J_Mobius_Classic_2.2_Antharas/java/com/l2jmobius/gameserver/data/xml/impl/KarmaData.java
+++ b/L2J_Mobius_Classic_2.2_Antharas/java/com/l2jmobius/gameserver/data/xml/impl/KarmaData.java
@@ -26,12 +26,12 @@ import org.w3c.dom.NamedNodeMap;
 import org.w3c.dom.Node;
 
 import com.l2jmobius.Config;
-import com.l2jmobius.commons.util.IGameXmlReader;
+import com.l2jmobius.commons.util.IXmlReader;
 
 /**
  * @author UnAfraid
  */
-public class KarmaData implements IGameXmlReader
+public class KarmaData implements IXmlReader
 {
 	private static final Logger LOGGER = Logger.getLogger(KarmaData.class.getName());
 	
diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/com/l2jmobius/gameserver/data/xml/impl/LuckyGameData.java b/L2J_Mobius_Classic_2.2_Antharas/java/com/l2jmobius/gameserver/data/xml/impl/LuckyGameData.java
index 6759bfec3f..41c0d0fc31 100644
--- a/L2J_Mobius_Classic_2.2_Antharas/java/com/l2jmobius/gameserver/data/xml/impl/LuckyGameData.java
+++ b/L2J_Mobius_Classic_2.2_Antharas/java/com/l2jmobius/gameserver/data/xml/impl/LuckyGameData.java
@@ -23,7 +23,7 @@ import java.util.concurrent.atomic.AtomicInteger;
 
 import org.w3c.dom.Document;
 
-import com.l2jmobius.commons.util.IGameXmlReader;
+import com.l2jmobius.commons.util.IXmlReader;
 import com.l2jmobius.gameserver.model.StatsSet;
 import com.l2jmobius.gameserver.model.holders.ItemChanceHolder;
 import com.l2jmobius.gameserver.model.holders.ItemPointHolder;
@@ -32,7 +32,7 @@ import com.l2jmobius.gameserver.model.holders.LuckyGameDataHolder;
 /**
  * @author Sdw
  */
-public class LuckyGameData implements IGameXmlReader
+public class LuckyGameData implements IXmlReader
 {
 	private final Map<Integer, LuckyGameDataHolder> _luckyGame = new HashMap<>();
 	private final AtomicInteger _serverPlay = new AtomicInteger();
diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/com/l2jmobius/gameserver/data/xml/impl/MultisellData.java b/L2J_Mobius_Classic_2.2_Antharas/java/com/l2jmobius/gameserver/data/xml/impl/MultisellData.java
index 796cd9b6f1..e9c494b91e 100644
--- a/L2J_Mobius_Classic_2.2_Antharas/java/com/l2jmobius/gameserver/data/xml/impl/MultisellData.java
+++ b/L2J_Mobius_Classic_2.2_Antharas/java/com/l2jmobius/gameserver/data/xml/impl/MultisellData.java
@@ -19,11 +19,11 @@ package com.l2jmobius.gameserver.data.xml.impl;
 import java.io.File;
 import java.io.FileFilter;
 import java.util.ArrayList;
-import java.util.HashMap;
 import java.util.HashSet;
 import java.util.List;
 import java.util.Map;
 import java.util.Set;
+import java.util.concurrent.ConcurrentHashMap;
 import java.util.logging.Level;
 import java.util.logging.Logger;
 
@@ -31,7 +31,7 @@ import org.w3c.dom.Document;
 import org.w3c.dom.Node;
 
 import com.l2jmobius.Config;
-import com.l2jmobius.commons.util.IGameXmlReader;
+import com.l2jmobius.commons.util.IXmlReader;
 import com.l2jmobius.commons.util.file.filter.NumericNameFilter;
 import com.l2jmobius.gameserver.datatables.ItemTable;
 import com.l2jmobius.gameserver.enums.SpecialItemType;
@@ -46,14 +46,14 @@ import com.l2jmobius.gameserver.model.holders.PreparedMultisellListHolder;
 import com.l2jmobius.gameserver.model.items.Item;
 import com.l2jmobius.gameserver.network.serverpackets.MultiSellList;
 
-public final class MultisellData implements IGameXmlReader
+public final class MultisellData implements IXmlReader
 {
 	private static final Logger LOGGER = Logger.getLogger(MultisellData.class.getName());
 	
 	public static final int PAGE_SIZE = 40;
 	private static final FileFilter NUMERIC_FILTER = new NumericNameFilter();
 	
-	private final Map<Integer, MultisellListHolder> _multisells = new HashMap<>();
+	private final Map<Integer, MultisellListHolder> _multisells = new ConcurrentHashMap<>();
 	
 	protected MultisellData()
 	{
diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/com/l2jmobius/gameserver/data/xml/impl/NpcData.java b/L2J_Mobius_Classic_2.2_Antharas/java/com/l2jmobius/gameserver/data/xml/impl/NpcData.java
index 277495ca9d..3bcdb58f40 100644
--- a/L2J_Mobius_Classic_2.2_Antharas/java/com/l2jmobius/gameserver/data/xml/impl/NpcData.java
+++ b/L2J_Mobius_Classic_2.2_Antharas/java/com/l2jmobius/gameserver/data/xml/impl/NpcData.java
@@ -26,6 +26,8 @@ import java.util.List;
 import java.util.Map;
 import java.util.Map.Entry;
 import java.util.Set;
+import java.util.concurrent.ConcurrentHashMap;
+import java.util.concurrent.CopyOnWriteArrayList;
 import java.util.function.Predicate;
 import java.util.logging.Logger;
 import java.util.stream.Collectors;
@@ -36,7 +38,7 @@ import org.w3c.dom.Node;
 
 import com.l2jmobius.Config;
 import com.l2jmobius.commons.util.CommonUtil;
-import com.l2jmobius.commons.util.IGameXmlReader;
+import com.l2jmobius.commons.util.IXmlReader;
 import com.l2jmobius.gameserver.datatables.ItemTable;
 import com.l2jmobius.gameserver.enums.AISkillScope;
 import com.l2jmobius.gameserver.enums.DropType;
@@ -52,13 +54,13 @@ import com.l2jmobius.gameserver.model.skills.Skill;
  * NPC data parser.
  * @author NosBit
  */
-public class NpcData implements IGameXmlReader
+public class NpcData implements IXmlReader
 {
 	protected static final Logger LOGGER = Logger.getLogger(NpcData.class.getName());
 	
-	private final Map<Integer, NpcTemplate> _npcs = new HashMap<>();
-	private final Map<String, Integer> _clans = new HashMap<>();
-	private static final List<Integer> _masterMonsterIDs = new ArrayList<>();
+	private final Map<Integer, NpcTemplate> _npcs = new ConcurrentHashMap<>();
+	private final Map<String, Integer> _clans = new ConcurrentHashMap<>();
+	private static final List<Integer> _masterMonsterIDs = new CopyOnWriteArrayList<>();
 	
 	protected NpcData()
 	{
diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/com/l2jmobius/gameserver/data/xml/impl/OptionData.java b/L2J_Mobius_Classic_2.2_Antharas/java/com/l2jmobius/gameserver/data/xml/impl/OptionData.java
index bffa2b107c..424e2b27ad 100644
--- a/L2J_Mobius_Classic_2.2_Antharas/java/com/l2jmobius/gameserver/data/xml/impl/OptionData.java
+++ b/L2J_Mobius_Classic_2.2_Antharas/java/com/l2jmobius/gameserver/data/xml/impl/OptionData.java
@@ -18,13 +18,12 @@ package com.l2jmobius.gameserver.data.xml.impl;
 
 import java.io.File;
 import java.util.Collections;
-import java.util.HashMap;
 import java.util.Map;
+import java.util.concurrent.ConcurrentHashMap;
 import java.util.logging.Logger;
 
 import org.w3c.dom.Document;
 
-import com.l2jmobius.commons.util.IGameXmlReader;
 import com.l2jmobius.commons.util.IXmlReader;
 import com.l2jmobius.gameserver.handler.EffectHandler;
 import com.l2jmobius.gameserver.model.StatsSet;
@@ -36,11 +35,11 @@ import com.l2jmobius.gameserver.model.options.OptionsSkillType;
 /**
  * @author UnAfraid
  */
-public class OptionData implements IGameXmlReader
+public class OptionData implements IXmlReader
 {
 	private static final Logger LOGGER = Logger.getLogger(OptionData.class.getName());
 	
-	private final Map<Integer, Options> _optionData = new HashMap<>();
+	private final Map<Integer, Options> _optionData = new ConcurrentHashMap<>();
 	
 	protected OptionData()
 	{
diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/com/l2jmobius/gameserver/data/xml/impl/PetDataTable.java b/L2J_Mobius_Classic_2.2_Antharas/java/com/l2jmobius/gameserver/data/xml/impl/PetDataTable.java
index 65afb75d7d..aa6975cd72 100644
--- a/L2J_Mobius_Classic_2.2_Antharas/java/com/l2jmobius/gameserver/data/xml/impl/PetDataTable.java
+++ b/L2J_Mobius_Classic_2.2_Antharas/java/com/l2jmobius/gameserver/data/xml/impl/PetDataTable.java
@@ -17,15 +17,15 @@
 package com.l2jmobius.gameserver.data.xml.impl;
 
 import java.io.File;
-import java.util.HashMap;
 import java.util.Map;
+import java.util.concurrent.ConcurrentHashMap;
 import java.util.logging.Logger;
 
 import org.w3c.dom.Document;
 import org.w3c.dom.NamedNodeMap;
 import org.w3c.dom.Node;
 
-import com.l2jmobius.commons.util.IGameXmlReader;
+import com.l2jmobius.commons.util.IXmlReader;
 import com.l2jmobius.gameserver.enums.MountType;
 import com.l2jmobius.gameserver.model.PetData;
 import com.l2jmobius.gameserver.model.PetLevelData;
@@ -36,11 +36,11 @@ import com.l2jmobius.gameserver.model.StatsSet;
  * TODO: load and use all pet parameters.
  * @author Zoey76 (rework)
  */
-public final class PetDataTable implements IGameXmlReader
+public final class PetDataTable implements IXmlReader
 {
 	private static final Logger LOGGER = Logger.getLogger(PetDataTable.class.getName());
 	
-	private final Map<Integer, PetData> _pets = new HashMap<>();
+	private final Map<Integer, PetData> _pets = new ConcurrentHashMap<>();
 	
 	/**
 	 * Instantiates a new pet data table.
diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/com/l2jmobius/gameserver/data/xml/impl/PetSkillData.java b/L2J_Mobius_Classic_2.2_Antharas/java/com/l2jmobius/gameserver/data/xml/impl/PetSkillData.java
index 4872dde773..5b2f9a4408 100644
--- a/L2J_Mobius_Classic_2.2_Antharas/java/com/l2jmobius/gameserver/data/xml/impl/PetSkillData.java
+++ b/L2J_Mobius_Classic_2.2_Antharas/java/com/l2jmobius/gameserver/data/xml/impl/PetSkillData.java
@@ -27,14 +27,14 @@ import org.w3c.dom.Document;
 import org.w3c.dom.NamedNodeMap;
 import org.w3c.dom.Node;
 
-import com.l2jmobius.commons.util.IGameXmlReader;
+import com.l2jmobius.commons.util.IXmlReader;
 import com.l2jmobius.gameserver.model.actor.Summon;
 import com.l2jmobius.gameserver.model.holders.SkillHolder;
 
 /**
  * @author Mobius
  */
-public class PetSkillData implements IGameXmlReader
+public class PetSkillData implements IXmlReader
 {
 	private static Logger LOGGER = Logger.getLogger(PetSkillData.class.getName());
 	private final Map<Integer, Map<Long, SkillHolder>> _skillTrees = new HashMap<>();
diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/com/l2jmobius/gameserver/data/xml/impl/PlayerTemplateData.java b/L2J_Mobius_Classic_2.2_Antharas/java/com/l2jmobius/gameserver/data/xml/impl/PlayerTemplateData.java
index 031fab8027..7a7c230b72 100644
--- a/L2J_Mobius_Classic_2.2_Antharas/java/com/l2jmobius/gameserver/data/xml/impl/PlayerTemplateData.java
+++ b/L2J_Mobius_Classic_2.2_Antharas/java/com/l2jmobius/gameserver/data/xml/impl/PlayerTemplateData.java
@@ -18,9 +18,9 @@ package com.l2jmobius.gameserver.data.xml.impl;
 
 import java.io.File;
 import java.util.ArrayList;
-import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
+import java.util.concurrent.ConcurrentHashMap;
 import java.util.logging.Logger;
 
 import org.w3c.dom.Document;
@@ -28,7 +28,7 @@ import org.w3c.dom.NamedNodeMap;
 import org.w3c.dom.Node;
 
 import com.l2jmobius.Config;
-import com.l2jmobius.commons.util.IGameXmlReader;
+import com.l2jmobius.commons.util.IXmlReader;
 import com.l2jmobius.gameserver.model.Location;
 import com.l2jmobius.gameserver.model.StatsSet;
 import com.l2jmobius.gameserver.model.actor.templates.PlayerTemplate;
@@ -38,11 +38,11 @@ import com.l2jmobius.gameserver.model.base.ClassId;
  * Loads player's base stats.
  * @author Forsaiken, Zoey76, GKR
  */
-public final class PlayerTemplateData implements IGameXmlReader
+public final class PlayerTemplateData implements IXmlReader
 {
 	private static final Logger LOGGER = Logger.getLogger(PlayerTemplateData.class.getName());
 	
-	private final Map<ClassId, PlayerTemplate> _playerTemplates = new HashMap<>();
+	private final Map<ClassId, PlayerTemplate> _playerTemplates = new ConcurrentHashMap<>();
 	
 	private int _dataCount = 0;
 	private int _autoGeneratedCount = 0;
diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/com/l2jmobius/gameserver/data/xml/impl/PlayerXpPercentLostData.java b/L2J_Mobius_Classic_2.2_Antharas/java/com/l2jmobius/gameserver/data/xml/impl/PlayerXpPercentLostData.java
index 2b867a18e4..816cb7aacf 100644
--- a/L2J_Mobius_Classic_2.2_Antharas/java/com/l2jmobius/gameserver/data/xml/impl/PlayerXpPercentLostData.java
+++ b/L2J_Mobius_Classic_2.2_Antharas/java/com/l2jmobius/gameserver/data/xml/impl/PlayerXpPercentLostData.java
@@ -24,13 +24,13 @@ import org.w3c.dom.Document;
 import org.w3c.dom.NamedNodeMap;
 import org.w3c.dom.Node;
 
-import com.l2jmobius.commons.util.IGameXmlReader;
+import com.l2jmobius.commons.util.IXmlReader;
 
 /**
  * This class holds the Player Xp Percent Lost Data for each level for players.
  * @author Zealar
  */
-public final class PlayerXpPercentLostData implements IGameXmlReader
+public final class PlayerXpPercentLostData implements IXmlReader
 {
 	private static final Logger LOGGER = Logger.getLogger(PlayerXpPercentLostData.class.getName());
 	
diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/com/l2jmobius/gameserver/data/xml/impl/PrimeShopData.java b/L2J_Mobius_Classic_2.2_Antharas/java/com/l2jmobius/gameserver/data/xml/impl/PrimeShopData.java
index 82ddd51f26..650d156194 100644
--- a/L2J_Mobius_Classic_2.2_Antharas/java/com/l2jmobius/gameserver/data/xml/impl/PrimeShopData.java
+++ b/L2J_Mobius_Classic_2.2_Antharas/java/com/l2jmobius/gameserver/data/xml/impl/PrimeShopData.java
@@ -27,7 +27,7 @@ import org.w3c.dom.Document;
 import org.w3c.dom.NamedNodeMap;
 import org.w3c.dom.Node;
 
-import com.l2jmobius.commons.util.IGameXmlReader;
+import com.l2jmobius.commons.util.IXmlReader;
 import com.l2jmobius.gameserver.datatables.ItemTable;
 import com.l2jmobius.gameserver.model.StatsSet;
 import com.l2jmobius.gameserver.model.actor.instance.PlayerInstance;
@@ -39,7 +39,7 @@ import com.l2jmobius.gameserver.network.serverpackets.primeshop.ExBRProductInfo;
 /**
  * @author Gnacik, UnAfraid
  */
-public class PrimeShopData implements IGameXmlReader
+public class PrimeShopData implements IXmlReader
 {
 	private static final Logger LOGGER = Logger.getLogger(PrimeShopData.class.getName());
 	
diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/com/l2jmobius/gameserver/data/xml/impl/RecipeData.java b/L2J_Mobius_Classic_2.2_Antharas/java/com/l2jmobius/gameserver/data/xml/impl/RecipeData.java
index 9c035c1fde..54ce272bd2 100644
--- a/L2J_Mobius_Classic_2.2_Antharas/java/com/l2jmobius/gameserver/data/xml/impl/RecipeData.java
+++ b/L2J_Mobius_Classic_2.2_Antharas/java/com/l2jmobius/gameserver/data/xml/impl/RecipeData.java
@@ -27,7 +27,7 @@ import org.w3c.dom.Document;
 import org.w3c.dom.NamedNodeMap;
 import org.w3c.dom.Node;
 
-import com.l2jmobius.commons.util.IGameXmlReader;
+import com.l2jmobius.commons.util.IXmlReader;
 import com.l2jmobius.gameserver.model.RecipeInstance;
 import com.l2jmobius.gameserver.model.RecipeList;
 import com.l2jmobius.gameserver.model.RecipeStatInstance;
@@ -38,7 +38,7 @@ import com.l2jmobius.gameserver.model.actor.instance.PlayerInstance;
  * The Class RecipeData.
  * @author Zoey76
  */
-public class RecipeData implements IGameXmlReader
+public class RecipeData implements IXmlReader
 {
 	private static final Logger LOGGER = Logger.getLogger(RecipeData.class.getName());
 	
diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/com/l2jmobius/gameserver/data/xml/impl/ResidenceFunctionsData.java b/L2J_Mobius_Classic_2.2_Antharas/java/com/l2jmobius/gameserver/data/xml/impl/ResidenceFunctionsData.java
index 66951e9e59..094ef13149 100644
--- a/L2J_Mobius_Classic_2.2_Antharas/java/com/l2jmobius/gameserver/data/xml/impl/ResidenceFunctionsData.java
+++ b/L2J_Mobius_Classic_2.2_Antharas/java/com/l2jmobius/gameserver/data/xml/impl/ResidenceFunctionsData.java
@@ -28,7 +28,7 @@ import org.w3c.dom.Document;
 import org.w3c.dom.NamedNodeMap;
 import org.w3c.dom.Node;
 
-import com.l2jmobius.commons.util.IGameXmlReader;
+import com.l2jmobius.commons.util.IXmlReader;
 import com.l2jmobius.gameserver.model.StatsSet;
 import com.l2jmobius.gameserver.model.residences.ResidenceFunctionTemplate;
 
@@ -36,7 +36,7 @@ import com.l2jmobius.gameserver.model.residences.ResidenceFunctionTemplate;
  * The residence functions data
  * @author UnAfraid
  */
-public final class ResidenceFunctionsData implements IGameXmlReader
+public final class ResidenceFunctionsData implements IXmlReader
 {
 	private static final Logger LOGGER = Logger.getLogger(ResidenceFunctionsData.class.getName());
 	private final Map<Integer, List<ResidenceFunctionTemplate>> _functions = new HashMap<>();
diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/com/l2jmobius/gameserver/data/xml/impl/SayuneData.java b/L2J_Mobius_Classic_2.2_Antharas/java/com/l2jmobius/gameserver/data/xml/impl/SayuneData.java
index 835bd96930..13b4d33b1e 100644
--- a/L2J_Mobius_Classic_2.2_Antharas/java/com/l2jmobius/gameserver/data/xml/impl/SayuneData.java
+++ b/L2J_Mobius_Classic_2.2_Antharas/java/com/l2jmobius/gameserver/data/xml/impl/SayuneData.java
@@ -26,13 +26,13 @@ import org.w3c.dom.Document;
 import org.w3c.dom.NamedNodeMap;
 import org.w3c.dom.Node;
 
-import com.l2jmobius.commons.util.IGameXmlReader;
+import com.l2jmobius.commons.util.IXmlReader;
 import com.l2jmobius.gameserver.model.SayuneEntry;
 
 /**
  * @author UnAfraid
  */
-public class SayuneData implements IGameXmlReader
+public class SayuneData implements IXmlReader
 {
 	private static final Logger LOGGER = Logger.getLogger(SayuneData.class.getName());
 	
diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/com/l2jmobius/gameserver/data/xml/impl/SecondaryAuthData.java b/L2J_Mobius_Classic_2.2_Antharas/java/com/l2jmobius/gameserver/data/xml/impl/SecondaryAuthData.java
index c0ebd36146..ca85056b10 100644
--- a/L2J_Mobius_Classic_2.2_Antharas/java/com/l2jmobius/gameserver/data/xml/impl/SecondaryAuthData.java
+++ b/L2J_Mobius_Classic_2.2_Antharas/java/com/l2jmobius/gameserver/data/xml/impl/SecondaryAuthData.java
@@ -25,12 +25,12 @@ import java.util.logging.Logger;
 import org.w3c.dom.Document;
 import org.w3c.dom.Node;
 
-import com.l2jmobius.commons.util.IGameXmlReader;
+import com.l2jmobius.commons.util.IXmlReader;
 
 /**
  * @author NosBit
  */
-public class SecondaryAuthData implements IGameXmlReader
+public class SecondaryAuthData implements IXmlReader
 {
 	private static final Logger LOGGER = Logger.getLogger(SecondaryAuthData.class.getName());
 	
diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/com/l2jmobius/gameserver/data/xml/impl/ShuttleData.java b/L2J_Mobius_Classic_2.2_Antharas/java/com/l2jmobius/gameserver/data/xml/impl/ShuttleData.java
index 9454d24d6b..ff26f4f409 100644
--- a/L2J_Mobius_Classic_2.2_Antharas/java/com/l2jmobius/gameserver/data/xml/impl/ShuttleData.java
+++ b/L2J_Mobius_Classic_2.2_Antharas/java/com/l2jmobius/gameserver/data/xml/impl/ShuttleData.java
@@ -27,7 +27,7 @@ import org.w3c.dom.Document;
 import org.w3c.dom.NamedNodeMap;
 import org.w3c.dom.Node;
 
-import com.l2jmobius.commons.util.IGameXmlReader;
+import com.l2jmobius.commons.util.IXmlReader;
 import com.l2jmobius.gameserver.model.Location;
 import com.l2jmobius.gameserver.model.StatsSet;
 import com.l2jmobius.gameserver.model.VehiclePathPoint;
@@ -40,7 +40,7 @@ import com.l2jmobius.gameserver.model.shuttle.ShuttleStop;
 /**
  * @author UnAfraid
  */
-public final class ShuttleData implements IGameXmlReader
+public final class ShuttleData implements IXmlReader
 {
 	private static final Logger LOGGER = Logger.getLogger(ShuttleData.class.getName());
 	
diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/com/l2jmobius/gameserver/data/xml/impl/SiegeScheduleData.java b/L2J_Mobius_Classic_2.2_Antharas/java/com/l2jmobius/gameserver/data/xml/impl/SiegeScheduleData.java
index 265bf7c528..6bff09010b 100644
--- a/L2J_Mobius_Classic_2.2_Antharas/java/com/l2jmobius/gameserver/data/xml/impl/SiegeScheduleData.java
+++ b/L2J_Mobius_Classic_2.2_Antharas/java/com/l2jmobius/gameserver/data/xml/impl/SiegeScheduleData.java
@@ -27,7 +27,7 @@ import org.w3c.dom.Document;
 import org.w3c.dom.NamedNodeMap;
 import org.w3c.dom.Node;
 
-import com.l2jmobius.commons.util.IGameXmlReader;
+import com.l2jmobius.commons.util.IXmlReader;
 import com.l2jmobius.gameserver.model.SiegeScheduleDate;
 import com.l2jmobius.gameserver.model.StatsSet;
 import com.l2jmobius.gameserver.util.Util;
@@ -35,7 +35,7 @@ import com.l2jmobius.gameserver.util.Util;
 /**
  * @author UnAfraid
  */
-public class SiegeScheduleData implements IGameXmlReader
+public class SiegeScheduleData implements IXmlReader
 {
 	private static final Logger LOGGER = Logger.getLogger(SiegeScheduleData.class.getName());
 	
diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/com/l2jmobius/gameserver/data/xml/impl/SkillData.java b/L2J_Mobius_Classic_2.2_Antharas/java/com/l2jmobius/gameserver/data/xml/impl/SkillData.java
index 7a1ae2e15b..64900d4d45 100644
--- a/L2J_Mobius_Classic_2.2_Antharas/java/com/l2jmobius/gameserver/data/xml/impl/SkillData.java
+++ b/L2J_Mobius_Classic_2.2_Antharas/java/com/l2jmobius/gameserver/data/xml/impl/SkillData.java
@@ -25,6 +25,7 @@ import java.util.List;
 import java.util.Map;
 import java.util.Optional;
 import java.util.Set;
+import java.util.concurrent.ConcurrentHashMap;
 import java.util.function.BiConsumer;
 import java.util.function.Function;
 import java.util.logging.Level;
@@ -35,7 +36,7 @@ import org.w3c.dom.Document;
 import org.w3c.dom.NamedNodeMap;
 import org.w3c.dom.Node;
 
-import com.l2jmobius.commons.util.IGameXmlReader;
+import com.l2jmobius.commons.util.IXmlReader;
 import com.l2jmobius.gameserver.handler.EffectHandler;
 import com.l2jmobius.gameserver.handler.SkillConditionHandler;
 import com.l2jmobius.gameserver.model.StatsSet;
@@ -51,12 +52,12 @@ import com.l2jmobius.gameserver.util.exp4j.ExpressionBuilder;
  * Skill data parser.
  * @author NosBit
  */
-public class SkillData implements IGameXmlReader
+public class SkillData implements IXmlReader
 {
 	private static final Logger LOGGER = Logger.getLogger(SkillData.class.getName());
 	
-	private final Map<Long, Skill> _skills = new HashMap<>();
-	private final Map<Integer, Integer> _skillsMaxLevel = new HashMap<>();
+	private final Map<Long, Skill> _skills = new ConcurrentHashMap<>();
+	private final Map<Integer, Integer> _skillsMaxLevel = new ConcurrentHashMap<>();
 	
 	private class NamedParamInfo
 	{
diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/com/l2jmobius/gameserver/data/xml/impl/SkillTreesData.java b/L2J_Mobius_Classic_2.2_Antharas/java/com/l2jmobius/gameserver/data/xml/impl/SkillTreesData.java
index 7f667059db..780e0a1d1c 100644
--- a/L2J_Mobius_Classic_2.2_Antharas/java/com/l2jmobius/gameserver/data/xml/impl/SkillTreesData.java
+++ b/L2J_Mobius_Classic_2.2_Antharas/java/com/l2jmobius/gameserver/data/xml/impl/SkillTreesData.java
@@ -29,6 +29,7 @@ import java.util.List;
 import java.util.Map;
 import java.util.Map.Entry;
 import java.util.Set;
+import java.util.concurrent.ConcurrentHashMap;
 import java.util.concurrent.atomic.AtomicBoolean;
 import java.util.logging.Logger;
 import java.util.stream.Collectors;
@@ -38,7 +39,7 @@ import org.w3c.dom.NamedNodeMap;
 import org.w3c.dom.Node;
 
 import com.l2jmobius.Config;
-import com.l2jmobius.commons.util.IGameXmlReader;
+import com.l2jmobius.commons.util.IXmlReader;
 import com.l2jmobius.gameserver.enums.CategoryType;
 import com.l2jmobius.gameserver.enums.Race;
 import com.l2jmobius.gameserver.enums.SubclassType;
@@ -77,34 +78,34 @@ import com.l2jmobius.gameserver.model.skills.Skill;
  * For XML schema please refer to skillTrees.xsd in datapack in xsd folder and for parameters documentation refer to documentation.txt in skillTrees folder.<br>
  * @author Zoey76
  */
-public final class SkillTreesData implements IGameXmlReader
+public final class SkillTreesData implements IXmlReader
 {
 	private static final Logger LOGGER = Logger.getLogger(SkillTreesData.class.getName());
 	
 	// ClassId, Map of Skill Hash Code, SkillLearn
-	private static final Map<ClassId, Map<Long, SkillLearn>> _classSkillTrees = new HashMap<>();
-	private static final Map<ClassId, Map<Long, SkillLearn>> _transferSkillTrees = new HashMap<>();
-	private static final Map<Race, Map<Long, SkillLearn>> _raceSkillTree = new HashMap<>();
-	private static final Map<SubclassType, Map<Long, SkillLearn>> _revelationSkillTree = new HashMap<>();
-	private static final Map<ClassId, Set<Integer>> _awakeningSaveSkillTree = new HashMap<>();
+	private static final Map<ClassId, Map<Long, SkillLearn>> _classSkillTrees = new ConcurrentHashMap<>();
+	private static final Map<ClassId, Map<Long, SkillLearn>> _transferSkillTrees = new ConcurrentHashMap<>();
+	private static final Map<Race, Map<Long, SkillLearn>> _raceSkillTree = new ConcurrentHashMap<>();
+	private static final Map<SubclassType, Map<Long, SkillLearn>> _revelationSkillTree = new ConcurrentHashMap<>();
+	private static final Map<ClassId, Set<Integer>> _awakeningSaveSkillTree = new ConcurrentHashMap<>();
 	// Skill Hash Code, SkillLearn
-	private static final Map<Long, SkillLearn> _collectSkillTree = new HashMap<>();
-	private static final Map<Long, SkillLearn> _fishingSkillTree = new HashMap<>();
-	private static final Map<Long, SkillLearn> _pledgeSkillTree = new HashMap<>();
-	private static final Map<Long, SkillLearn> _subClassSkillTree = new HashMap<>();
-	private static final Map<Long, SkillLearn> _subPledgeSkillTree = new HashMap<>();
-	private static final Map<Long, SkillLearn> _transformSkillTree = new HashMap<>();
-	private static final Map<Long, SkillLearn> _commonSkillTree = new HashMap<>();
-	private static final Map<Long, SkillLearn> _abilitySkillTree = new HashMap<>();
-	private static final Map<Long, SkillLearn> _alchemySkillTree = new HashMap<>();
-	private static final Map<Long, SkillLearn> _dualClassSkillTree = new HashMap<>();
+	private static final Map<Long, SkillLearn> _collectSkillTree = new ConcurrentHashMap<>();
+	private static final Map<Long, SkillLearn> _fishingSkillTree = new ConcurrentHashMap<>();
+	private static final Map<Long, SkillLearn> _pledgeSkillTree = new ConcurrentHashMap<>();
+	private static final Map<Long, SkillLearn> _subClassSkillTree = new ConcurrentHashMap<>();
+	private static final Map<Long, SkillLearn> _subPledgeSkillTree = new ConcurrentHashMap<>();
+	private static final Map<Long, SkillLearn> _transformSkillTree = new ConcurrentHashMap<>();
+	private static final Map<Long, SkillLearn> _commonSkillTree = new ConcurrentHashMap<>();
+	private static final Map<Long, SkillLearn> _abilitySkillTree = new ConcurrentHashMap<>();
+	private static final Map<Long, SkillLearn> _alchemySkillTree = new ConcurrentHashMap<>();
+	private static final Map<Long, SkillLearn> _dualClassSkillTree = new ConcurrentHashMap<>();
 	// Other skill trees
-	private static final Map<Long, SkillLearn> _nobleSkillTree = new HashMap<>();
-	private static final Map<Long, SkillLearn> _heroSkillTree = new HashMap<>();
-	private static final Map<Long, SkillLearn> _gameMasterSkillTree = new HashMap<>();
-	private static final Map<Long, SkillLearn> _gameMasterAuraSkillTree = new HashMap<>();
+	private static final Map<Long, SkillLearn> _nobleSkillTree = new ConcurrentHashMap<>();
+	private static final Map<Long, SkillLearn> _heroSkillTree = new ConcurrentHashMap<>();
+	private static final Map<Long, SkillLearn> _gameMasterSkillTree = new ConcurrentHashMap<>();
+	private static final Map<Long, SkillLearn> _gameMasterAuraSkillTree = new ConcurrentHashMap<>();
 	// Remove skill tree
-	private static final Map<ClassId, Set<Integer>> _removeSkillCache = new HashMap<>();
+	private static final Map<ClassId, Set<Integer>> _removeSkillCache = new ConcurrentHashMap<>();
 	
 	// Checker, sorted arrays of hash codes
 	private Map<Integer, long[]> _skillsByClassIdHashCodes; // Occupation skills
@@ -112,7 +113,7 @@ public final class SkillTreesData implements IGameXmlReader
 	private long[] _allSkillsHashCodes; // Fishing, Collection, Transformations, Common Skills.
 	
 	/** Parent class Ids are read from XML and stored in this map, to allow easy customization. */
-	private static final Map<ClassId, ClassId> _parentClassMap = new HashMap<>();
+	private static final Map<ClassId, ClassId> _parentClassMap = new ConcurrentHashMap<>();
 	
 	private final AtomicBoolean _isLoading = new AtomicBoolean();
 	
diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/com/l2jmobius/gameserver/data/xml/impl/SpawnsData.java b/L2J_Mobius_Classic_2.2_Antharas/java/com/l2jmobius/gameserver/data/xml/impl/SpawnsData.java
index dc41b02109..806d00902a 100644
--- a/L2J_Mobius_Classic_2.2_Antharas/java/com/l2jmobius/gameserver/data/xml/impl/SpawnsData.java
+++ b/L2J_Mobius_Classic_2.2_Antharas/java/com/l2jmobius/gameserver/data/xml/impl/SpawnsData.java
@@ -19,9 +19,10 @@ package com.l2jmobius.gameserver.data.xml.impl;
 import java.io.File;
 import java.util.ArrayList;
 import java.util.Collections;
-import java.util.LinkedList;
 import java.util.List;
 import java.util.Map;
+import java.util.concurrent.CopyOnWriteArrayList;
+import java.util.concurrent.ScheduledFuture;
 import java.util.function.Predicate;
 import java.util.logging.Level;
 import java.util.logging.Logger;
@@ -31,7 +32,7 @@ import org.w3c.dom.Document;
 import org.w3c.dom.Node;
 
 import com.l2jmobius.Config;
-import com.l2jmobius.commons.util.IGameXmlReader;
+import com.l2jmobius.commons.concurrent.ThreadPool;
 import com.l2jmobius.commons.util.IXmlReader;
 import com.l2jmobius.gameserver.model.ChanceLocation;
 import com.l2jmobius.gameserver.model.StatsSet;
@@ -49,11 +50,11 @@ import com.l2jmobius.gameserver.model.zone.type.SpawnTerritory;
 /**
  * @author UnAfraid
  */
-public class SpawnsData implements IGameXmlReader
+public class SpawnsData implements IXmlReader
 {
 	protected static final Logger LOGGER = Logger.getLogger(SpawnsData.class.getName());
 	
-	private final List<SpawnTemplate> _spawns = new LinkedList<>();
+	private final List<SpawnTemplate> _spawns = new CopyOnWriteArrayList<>();
 	
 	protected SpawnsData()
 	{
@@ -94,11 +95,28 @@ public class SpawnsData implements IGameXmlReader
 		}
 		
 		LOGGER.info(getClass().getSimpleName() + ": Initializing spawns...");
-		_spawns.stream().filter(SpawnTemplate::isSpawningByDefault).forEach(template ->
+		final List<ScheduledFuture<?>> jobs = new CopyOnWriteArrayList<>();
+		for (SpawnTemplate template : _spawns)
 		{
-			template.spawnAll(null);
-			template.notifyActivate();
-		});
+			if (template.isSpawningByDefault())
+			{
+				jobs.add(ThreadPool.schedule(() ->
+				{
+					template.spawnAll(null);
+					template.notifyActivate();
+				}, 0));
+			}
+		}
+		while (!jobs.isEmpty())
+		{
+			for (ScheduledFuture<?> job : jobs)
+			{
+				if ((job == null) || job.isDone() || job.isCancelled())
+				{
+					jobs.remove(job);
+				}
+			}
+		}
 		LOGGER.info(getClass().getSimpleName() + ": All spawns has been initialized!");
 	}
 	
diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/com/l2jmobius/gameserver/data/xml/impl/StaticObjectData.java b/L2J_Mobius_Classic_2.2_Antharas/java/com/l2jmobius/gameserver/data/xml/impl/StaticObjectData.java
index 8af86bec88..5e88dd66fb 100644
--- a/L2J_Mobius_Classic_2.2_Antharas/java/com/l2jmobius/gameserver/data/xml/impl/StaticObjectData.java
+++ b/L2J_Mobius_Classic_2.2_Antharas/java/com/l2jmobius/gameserver/data/xml/impl/StaticObjectData.java
@@ -26,7 +26,7 @@ import org.w3c.dom.Document;
 import org.w3c.dom.NamedNodeMap;
 import org.w3c.dom.Node;
 
-import com.l2jmobius.commons.util.IGameXmlReader;
+import com.l2jmobius.commons.util.IXmlReader;
 import com.l2jmobius.gameserver.model.StatsSet;
 import com.l2jmobius.gameserver.model.actor.instance.StaticObjectInstance;
 import com.l2jmobius.gameserver.model.actor.templates.CreatureTemplate;
@@ -35,7 +35,7 @@ import com.l2jmobius.gameserver.model.actor.templates.CreatureTemplate;
  * This class loads and holds all static object data.
  * @author UnAfraid
  */
-public final class StaticObjectData implements IGameXmlReader
+public final class StaticObjectData implements IXmlReader
 {
 	private static final Logger LOGGER = Logger.getLogger(StaticObjectData.class.getName());
 	
diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/com/l2jmobius/gameserver/data/xml/impl/TeleportersData.java b/L2J_Mobius_Classic_2.2_Antharas/java/com/l2jmobius/gameserver/data/xml/impl/TeleportersData.java
index 1d039725ad..5afec008f7 100644
--- a/L2J_Mobius_Classic_2.2_Antharas/java/com/l2jmobius/gameserver/data/xml/impl/TeleportersData.java
+++ b/L2J_Mobius_Classic_2.2_Antharas/java/com/l2jmobius/gameserver/data/xml/impl/TeleportersData.java
@@ -20,12 +20,13 @@ import java.io.File;
 import java.util.Collections;
 import java.util.HashMap;
 import java.util.Map;
+import java.util.concurrent.ConcurrentHashMap;
 import java.util.logging.Logger;
 
 import org.w3c.dom.Document;
 import org.w3c.dom.NamedNodeMap;
 
-import com.l2jmobius.commons.util.IGameXmlReader;
+import com.l2jmobius.commons.util.IXmlReader;
 import com.l2jmobius.gameserver.enums.TeleportType;
 import com.l2jmobius.gameserver.model.StatsSet;
 import com.l2jmobius.gameserver.model.teleporter.TeleportHolder;
@@ -33,12 +34,12 @@ import com.l2jmobius.gameserver.model.teleporter.TeleportHolder;
 /**
  * @author UnAfraid
  */
-public class TeleportersData implements IGameXmlReader
+public class TeleportersData implements IXmlReader
 {
 	// Logger instance
 	private static final Logger LOGGER = Logger.getLogger(TeleportersData.class.getName());
 	// Teleporter data
-	private final Map<Integer, Map<String, TeleportHolder>> _teleporters = new HashMap<>();
+	private final Map<Integer, Map<String, TeleportHolder>> _teleporters = new ConcurrentHashMap<>();
 	
 	protected TeleportersData()
 	{
diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/com/l2jmobius/gameserver/data/xml/impl/TransformData.java b/L2J_Mobius_Classic_2.2_Antharas/java/com/l2jmobius/gameserver/data/xml/impl/TransformData.java
index 896111de87..d917c7e46f 100644
--- a/L2J_Mobius_Classic_2.2_Antharas/java/com/l2jmobius/gameserver/data/xml/impl/TransformData.java
+++ b/L2J_Mobius_Classic_2.2_Antharas/java/com/l2jmobius/gameserver/data/xml/impl/TransformData.java
@@ -17,15 +17,15 @@
 package com.l2jmobius.gameserver.data.xml.impl;
 
 import java.io.File;
-import java.util.HashMap;
 import java.util.Map;
+import java.util.concurrent.ConcurrentHashMap;
 import java.util.logging.Logger;
 
 import org.w3c.dom.Document;
 import org.w3c.dom.NamedNodeMap;
 import org.w3c.dom.Node;
 
-import com.l2jmobius.commons.util.IGameXmlReader;
+import com.l2jmobius.commons.util.IXmlReader;
 import com.l2jmobius.gameserver.model.StatsSet;
 import com.l2jmobius.gameserver.model.actor.transform.Transform;
 import com.l2jmobius.gameserver.model.actor.transform.TransformLevelData;
@@ -39,11 +39,11 @@ import com.l2jmobius.gameserver.network.serverpackets.ExBasicActionList;
  * Transformation data.
  * @author UnAfraid
  */
-public final class TransformData implements IGameXmlReader
+public final class TransformData implements IXmlReader
 {
 	private static final Logger LOGGER = Logger.getLogger(TransformData.class.getName());
 	
-	private final Map<Integer, Transform> _transformData = new HashMap<>();
+	private final Map<Integer, Transform> _transformData = new ConcurrentHashMap<>();
 	
 	protected TransformData()
 	{
diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/com/l2jmobius/gameserver/data/xml/impl/VariationData.java b/L2J_Mobius_Classic_2.2_Antharas/java/com/l2jmobius/gameserver/data/xml/impl/VariationData.java
index 13b41c6359..542acc971b 100644
--- a/L2J_Mobius_Classic_2.2_Antharas/java/com/l2jmobius/gameserver/data/xml/impl/VariationData.java
+++ b/L2J_Mobius_Classic_2.2_Antharas/java/com/l2jmobius/gameserver/data/xml/impl/VariationData.java
@@ -22,11 +22,12 @@ import java.util.Collections;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
+import java.util.concurrent.ConcurrentHashMap;
 import java.util.logging.Logger;
 
 import org.w3c.dom.Document;
 
-import com.l2jmobius.commons.util.IGameXmlReader;
+import com.l2jmobius.commons.util.IXmlReader;
 import com.l2jmobius.gameserver.datatables.ItemTable;
 import com.l2jmobius.gameserver.model.VariationInstance;
 import com.l2jmobius.gameserver.model.items.instance.ItemInstance;
@@ -40,12 +41,12 @@ import com.l2jmobius.gameserver.model.options.VariationWeaponType;
 /**
  * @author Pere
  */
-public class VariationData implements IGameXmlReader
+public class VariationData implements IXmlReader
 {
 	private static final Logger LOGGER = Logger.getLogger(VariationData.class.getSimpleName());
 	
-	private final Map<Integer, Variation> _variations = new HashMap<>();
-	private final Map<Integer, Map<Integer, VariationFee>> _fees = new HashMap<>();
+	private final Map<Integer, Variation> _variations = new ConcurrentHashMap<>();
+	private final Map<Integer, Map<Integer, VariationFee>> _fees = new ConcurrentHashMap<>();
 	
 	protected VariationData()
 	{
diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/com/l2jmobius/gameserver/engines/DocumentEngine.java b/L2J_Mobius_Classic_2.2_Antharas/java/com/l2jmobius/gameserver/engines/DocumentEngine.java
index d787488757..10f04f4fb3 100644
--- a/L2J_Mobius_Classic_2.2_Antharas/java/com/l2jmobius/gameserver/engines/DocumentEngine.java
+++ b/L2J_Mobius_Classic_2.2_Antharas/java/com/l2jmobius/gameserver/engines/DocumentEngine.java
@@ -17,11 +17,14 @@
 package com.l2jmobius.gameserver.engines;
 
 import java.io.File;
-import java.util.LinkedList;
+import java.util.ArrayList;
 import java.util.List;
+import java.util.concurrent.CopyOnWriteArrayList;
+import java.util.concurrent.ScheduledFuture;
 import java.util.logging.Logger;
 
 import com.l2jmobius.Config;
+import com.l2jmobius.commons.concurrent.ThreadPool;
 import com.l2jmobius.commons.util.file.filter.XMLFilter;
 import com.l2jmobius.gameserver.engines.items.DocumentItem;
 import com.l2jmobius.gameserver.model.items.Item;
@@ -33,34 +36,29 @@ public class DocumentEngine
 {
 	private static final Logger LOGGER = Logger.getLogger(DocumentEngine.class.getName());
 	
-	private final List<File> _itemFiles = new LinkedList<>();
-	
-	public static DocumentEngine getInstance()
-	{
-		return SingletonHolder._instance;
-	}
+	private final List<File> _itemFiles = new ArrayList<>();
 	
 	protected DocumentEngine()
 	{
-		hashFiles("data/stats/items", _itemFiles);
+		processDirectory("data/stats/items", _itemFiles);
 		if (Config.CUSTOM_ITEMS_LOAD)
 		{
-			hashFiles("data/stats/items/custom", _itemFiles);
+			processDirectory("data/stats/items/custom", _itemFiles);
 		}
 	}
 	
-	private void hashFiles(String dirname, List<File> hash)
+	private void processDirectory(String dirName, List<File> list)
 	{
-		final File dir = new File(Config.DATAPACK_ROOT, dirname);
+		final File dir = new File(Config.DATAPACK_ROOT, dirName);
 		if (!dir.exists())
 		{
-			LOGGER.warning("Dir " + dir.getAbsolutePath() + " not exists");
+			LOGGER.warning("Dir " + dir.getAbsolutePath() + " does not exist.");
 			return;
 		}
 		final File[] files = dir.listFiles(new XMLFilter());
-		for (File f : files)
+		for (File file : files)
 		{
-			hash.add(f);
+			list.add(file);
 		}
 	}
 	
@@ -70,12 +68,26 @@ public class DocumentEngine
 	 */
 	public List<Item> loadItems()
 	{
-		final List<Item> list = new LinkedList<>();
-		for (File f : _itemFiles)
+		final List<Item> list = new CopyOnWriteArrayList<>();
+		final List<ScheduledFuture<?>> jobs = new CopyOnWriteArrayList<>();
+		for (File file : _itemFiles)
 		{
-			final DocumentItem document = new DocumentItem(f);
-			document.parse();
-			list.addAll(document.getItemList());
+			jobs.add(ThreadPool.schedule(() ->
+			{
+				final DocumentItem document = new DocumentItem(file);
+				document.parse();
+				list.addAll(document.getItemList());
+			}, 0));
+		}
+		while (!jobs.isEmpty())
+		{
+			for (ScheduledFuture<?> job : jobs)
+			{
+				if ((job == null) || job.isDone() || job.isCancelled())
+				{
+					jobs.remove(job);
+				}
+			}
 		}
 		return list;
 	}
@@ -84,4 +96,9 @@ public class DocumentEngine
 	{
 		protected static final DocumentEngine _instance = new DocumentEngine();
 	}
+	
+	public static DocumentEngine getInstance()
+	{
+		return SingletonHolder._instance;
+	}
 }
diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/com/l2jmobius/gameserver/engines/items/DocumentItem.java b/L2J_Mobius_Classic_2.2_Antharas/java/com/l2jmobius/gameserver/engines/items/DocumentItem.java
index 8aaaed2cb4..4ea960563d 100644
--- a/L2J_Mobius_Classic_2.2_Antharas/java/com/l2jmobius/gameserver/engines/items/DocumentItem.java
+++ b/L2J_Mobius_Classic_2.2_Antharas/java/com/l2jmobius/gameserver/engines/items/DocumentItem.java
@@ -19,7 +19,7 @@ package com.l2jmobius.gameserver.engines.items;
 import java.io.File;
 import java.lang.reflect.Constructor;
 import java.lang.reflect.InvocationTargetException;
-import java.util.LinkedList;
+import java.util.ArrayList;
 import java.util.List;
 import java.util.logging.Level;
 import java.util.logging.Logger;
@@ -27,7 +27,7 @@ import java.util.logging.Logger;
 import org.w3c.dom.Document;
 import org.w3c.dom.Node;
 
-import com.l2jmobius.commons.util.IGameXmlReader;
+import com.l2jmobius.commons.util.IXmlReader;
 import com.l2jmobius.gameserver.engines.DocumentBase;
 import com.l2jmobius.gameserver.enums.ItemSkillType;
 import com.l2jmobius.gameserver.model.ExtractableProduct;
@@ -41,12 +41,12 @@ import com.l2jmobius.gameserver.model.stats.functions.FuncTemplate;
 /**
  * @author mkizub, JIV
  */
-public final class DocumentItem extends DocumentBase implements IGameXmlReader
+public final class DocumentItem extends DocumentBase implements IXmlReader
 {
 	Logger LOGGER = Logger.getLogger(DocumentItem.class.getName());
 	
 	private ItemDataHolder _currentItem = null;
-	private final List<Item> _itemsInFile = new LinkedList<>();
+	private final List<Item> _itemsInFile = new ArrayList<>();
 	
 	/**
 	 * @param file
diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/com/l2jmobius/gameserver/handler/ConditionHandler.java b/L2J_Mobius_Classic_2.2_Antharas/java/com/l2jmobius/gameserver/handler/ConditionHandler.java
index c92ef368b3..4e20d5e720 100644
--- a/L2J_Mobius_Classic_2.2_Antharas/java/com/l2jmobius/gameserver/handler/ConditionHandler.java
+++ b/L2J_Mobius_Classic_2.2_Antharas/java/com/l2jmobius/gameserver/handler/ConditionHandler.java
@@ -50,7 +50,7 @@ public final class ConditionHandler
 	{
 		try
 		{
-			ScriptEngineManager.getInstance().executeConditionMasterHandler();
+			ScriptEngineManager.getInstance().executeScript(ScriptEngineManager.CONDITION_HANDLER_FILE);
 		}
 		catch (Exception e)
 		{
diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/com/l2jmobius/gameserver/handler/DailyMissionHandler.java b/L2J_Mobius_Classic_2.2_Antharas/java/com/l2jmobius/gameserver/handler/DailyMissionHandler.java
index 9a80c1db8f..6b6248da49 100644
--- a/L2J_Mobius_Classic_2.2_Antharas/java/com/l2jmobius/gameserver/handler/DailyMissionHandler.java
+++ b/L2J_Mobius_Classic_2.2_Antharas/java/com/l2jmobius/gameserver/handler/DailyMissionHandler.java
@@ -49,7 +49,7 @@ public class DailyMissionHandler
 	{
 		try
 		{
-			ScriptEngineManager.getInstance().executeDailyMissionMasterHandler();
+			ScriptEngineManager.getInstance().executeScript(ScriptEngineManager.ONE_DAY_REWARD_MASTER_HANDLER);
 		}
 		catch (Exception e)
 		{
diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/com/l2jmobius/gameserver/handler/EffectHandler.java b/L2J_Mobius_Classic_2.2_Antharas/java/com/l2jmobius/gameserver/handler/EffectHandler.java
index 0bf5350cb8..cab6562421 100644
--- a/L2J_Mobius_Classic_2.2_Antharas/java/com/l2jmobius/gameserver/handler/EffectHandler.java
+++ b/L2J_Mobius_Classic_2.2_Antharas/java/com/l2jmobius/gameserver/handler/EffectHandler.java
@@ -50,7 +50,7 @@ public final class EffectHandler
 	{
 		try
 		{
-			ScriptEngineManager.getInstance().executeEffectMasterHandler();
+			ScriptEngineManager.getInstance().executeScript(ScriptEngineManager.EFFECT_MASTER_HANDLER_FILE);
 		}
 		catch (Exception e)
 		{
diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/com/l2jmobius/gameserver/handler/SkillConditionHandler.java b/L2J_Mobius_Classic_2.2_Antharas/java/com/l2jmobius/gameserver/handler/SkillConditionHandler.java
index b764410ba1..8685b0279a 100644
--- a/L2J_Mobius_Classic_2.2_Antharas/java/com/l2jmobius/gameserver/handler/SkillConditionHandler.java
+++ b/L2J_Mobius_Classic_2.2_Antharas/java/com/l2jmobius/gameserver/handler/SkillConditionHandler.java
@@ -50,7 +50,7 @@ public final class SkillConditionHandler
 	{
 		try
 		{
-			ScriptEngineManager.getInstance().executeSkillConditionMasterHandler();
+			ScriptEngineManager.getInstance().executeScript(ScriptEngineManager.SKILL_CONDITION_HANDLER_FILE);
 		}
 		catch (Exception e)
 		{
diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/com/l2jmobius/gameserver/instancemanager/CastleManorManager.java b/L2J_Mobius_Classic_2.2_Antharas/java/com/l2jmobius/gameserver/instancemanager/CastleManorManager.java
index 48d04d3f38..212d1a043c 100644
--- a/L2J_Mobius_Classic_2.2_Antharas/java/com/l2jmobius/gameserver/instancemanager/CastleManorManager.java
+++ b/L2J_Mobius_Classic_2.2_Antharas/java/com/l2jmobius/gameserver/instancemanager/CastleManorManager.java
@@ -40,7 +40,7 @@ import org.w3c.dom.Node;
 import com.l2jmobius.Config;
 import com.l2jmobius.commons.concurrent.ThreadPool;
 import com.l2jmobius.commons.database.DatabaseFactory;
-import com.l2jmobius.commons.util.IGameXmlReader;
+import com.l2jmobius.commons.util.IXmlReader;
 import com.l2jmobius.commons.util.Rnd;
 import com.l2jmobius.gameserver.enums.ManorMode;
 import com.l2jmobius.gameserver.model.CropProcure;
@@ -58,7 +58,7 @@ import com.l2jmobius.gameserver.network.SystemMessageId;
  * Castle manor system.
  * @author malyelfik
  */
-public final class CastleManorManager implements IGameXmlReader, IStorable
+public final class CastleManorManager implements IXmlReader, IStorable
 {
 	private static final Logger LOGGER = Logger.getLogger(CastleManorManager.class.getName());
 	
diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/com/l2jmobius/gameserver/instancemanager/CursedWeaponsManager.java b/L2J_Mobius_Classic_2.2_Antharas/java/com/l2jmobius/gameserver/instancemanager/CursedWeaponsManager.java
index d123b41ef6..835d961c56 100644
--- a/L2J_Mobius_Classic_2.2_Antharas/java/com/l2jmobius/gameserver/instancemanager/CursedWeaponsManager.java
+++ b/L2J_Mobius_Classic_2.2_Antharas/java/com/l2jmobius/gameserver/instancemanager/CursedWeaponsManager.java
@@ -35,7 +35,7 @@ import org.w3c.dom.Node;
 
 import com.l2jmobius.Config;
 import com.l2jmobius.commons.database.DatabaseFactory;
-import com.l2jmobius.commons.util.IGameXmlReader;
+import com.l2jmobius.commons.util.IXmlReader;
 import com.l2jmobius.gameserver.model.CursedWeapon;
 import com.l2jmobius.gameserver.model.actor.Attackable;
 import com.l2jmobius.gameserver.model.actor.Creature;
@@ -54,7 +54,7 @@ import com.l2jmobius.gameserver.util.Broadcast;
  * UnAfraid: TODO: Rewrite with DocumentParser
  * @author Micht
  */
-public final class CursedWeaponsManager implements IGameXmlReader
+public final class CursedWeaponsManager implements IXmlReader
 {
 	private static final Logger LOGGER = Logger.getLogger(CursedWeaponsManager.class.getName());
 	
diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/com/l2jmobius/gameserver/instancemanager/FakePlayerChatManager.java b/L2J_Mobius_Classic_2.2_Antharas/java/com/l2jmobius/gameserver/instancemanager/FakePlayerChatManager.java
index 7101927e48..39c239a762 100644
--- a/L2J_Mobius_Classic_2.2_Antharas/java/com/l2jmobius/gameserver/instancemanager/FakePlayerChatManager.java
+++ b/L2J_Mobius_Classic_2.2_Antharas/java/com/l2jmobius/gameserver/instancemanager/FakePlayerChatManager.java
@@ -25,7 +25,7 @@ import org.w3c.dom.Document;
 
 import com.l2jmobius.Config;
 import com.l2jmobius.commons.concurrent.ThreadPool;
-import com.l2jmobius.commons.util.IGameXmlReader;
+import com.l2jmobius.commons.util.IXmlReader;
 import com.l2jmobius.commons.util.Rnd;
 import com.l2jmobius.gameserver.data.xml.impl.FakePlayerData;
 import com.l2jmobius.gameserver.datatables.SpawnTable;
@@ -41,7 +41,7 @@ import com.l2jmobius.gameserver.network.serverpackets.CreatureSay;
 /**
  * @author Mobius
  */
-public final class FakePlayerChatManager implements IGameXmlReader
+public final class FakePlayerChatManager implements IXmlReader
 {
 	private static Logger LOGGER = Logger.getLogger(FakePlayerChatManager.class.getName());
 	final List<FakePlayerChatHolder> MESSAGES = new ArrayList<>();
diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/com/l2jmobius/gameserver/instancemanager/InstanceManager.java b/L2J_Mobius_Classic_2.2_Antharas/java/com/l2jmobius/gameserver/instancemanager/InstanceManager.java
index f300213c49..5ea229cf1b 100644
--- a/L2J_Mobius_Classic_2.2_Antharas/java/com/l2jmobius/gameserver/instancemanager/InstanceManager.java
+++ b/L2J_Mobius_Classic_2.2_Antharas/java/com/l2jmobius/gameserver/instancemanager/InstanceManager.java
@@ -40,7 +40,6 @@ import org.w3c.dom.Node;
 
 import com.l2jmobius.Config;
 import com.l2jmobius.commons.database.DatabaseFactory;
-import com.l2jmobius.commons.util.IGameXmlReader;
 import com.l2jmobius.commons.util.IXmlReader;
 import com.l2jmobius.gameserver.data.xml.impl.DoorData;
 import com.l2jmobius.gameserver.data.xml.impl.SpawnsData;
@@ -61,7 +60,7 @@ import com.l2jmobius.gameserver.model.spawns.SpawnTemplate;
  * Instance manager.
  * @author evill33t, GodKratos, malyelfik
  */
-public final class InstanceManager implements IGameXmlReader
+public final class InstanceManager implements IXmlReader
 {
 	private static final Logger LOGGER = Logger.getLogger(InstanceManager.class.getName());
 	// Database query
diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/com/l2jmobius/gameserver/instancemanager/ItemAuctionManager.java b/L2J_Mobius_Classic_2.2_Antharas/java/com/l2jmobius/gameserver/instancemanager/ItemAuctionManager.java
index f819adf93b..752bcfdd3f 100644
--- a/L2J_Mobius_Classic_2.2_Antharas/java/com/l2jmobius/gameserver/instancemanager/ItemAuctionManager.java
+++ b/L2J_Mobius_Classic_2.2_Antharas/java/com/l2jmobius/gameserver/instancemanager/ItemAuctionManager.java
@@ -34,13 +34,13 @@ import org.w3c.dom.Node;
 
 import com.l2jmobius.Config;
 import com.l2jmobius.commons.database.DatabaseFactory;
-import com.l2jmobius.commons.util.IGameXmlReader;
+import com.l2jmobius.commons.util.IXmlReader;
 import com.l2jmobius.gameserver.model.itemauction.ItemAuctionInstance;
 
 /**
  * @author Forsaiken
  */
-public final class ItemAuctionManager implements IGameXmlReader
+public final class ItemAuctionManager implements IXmlReader
 {
 	private static final Logger LOGGER = Logger.getLogger(ItemAuctionManager.class.getName());
 	
diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/com/l2jmobius/gameserver/instancemanager/MapRegionManager.java b/L2J_Mobius_Classic_2.2_Antharas/java/com/l2jmobius/gameserver/instancemanager/MapRegionManager.java
index 255d4340ff..8f68a4bdf5 100644
--- a/L2J_Mobius_Classic_2.2_Antharas/java/com/l2jmobius/gameserver/instancemanager/MapRegionManager.java
+++ b/L2J_Mobius_Classic_2.2_Antharas/java/com/l2jmobius/gameserver/instancemanager/MapRegionManager.java
@@ -27,7 +27,7 @@ import org.w3c.dom.NamedNodeMap;
 import org.w3c.dom.Node;
 
 import com.l2jmobius.Config;
-import com.l2jmobius.commons.util.IGameXmlReader;
+import com.l2jmobius.commons.util.IXmlReader;
 import com.l2jmobius.gameserver.data.xml.impl.ClanHallData;
 import com.l2jmobius.gameserver.model.Location;
 import com.l2jmobius.gameserver.model.MapRegion;
@@ -47,7 +47,7 @@ import com.l2jmobius.gameserver.model.zone.type.RespawnZone;
  * Map Region Manager.
  * @author Nyaran
  */
-public final class MapRegionManager implements IGameXmlReader
+public final class MapRegionManager implements IXmlReader
 {
 	private static final Logger LOGGER = Logger.getLogger(MapRegionManager.class.getName());
 	
diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/com/l2jmobius/gameserver/instancemanager/SellBuffsManager.java b/L2J_Mobius_Classic_2.2_Antharas/java/com/l2jmobius/gameserver/instancemanager/SellBuffsManager.java
index dcf1bae346..0c4e94f449 100644
--- a/L2J_Mobius_Classic_2.2_Antharas/java/com/l2jmobius/gameserver/instancemanager/SellBuffsManager.java
+++ b/L2J_Mobius_Classic_2.2_Antharas/java/com/l2jmobius/gameserver/instancemanager/SellBuffsManager.java
@@ -26,7 +26,7 @@ import org.w3c.dom.Element;
 import org.w3c.dom.NodeList;
 
 import com.l2jmobius.Config;
-import com.l2jmobius.commons.util.IGameXmlReader;
+import com.l2jmobius.commons.util.IXmlReader;
 import com.l2jmobius.gameserver.cache.HtmCache;
 import com.l2jmobius.gameserver.data.xml.impl.SkillData;
 import com.l2jmobius.gameserver.datatables.ItemTable;
@@ -46,7 +46,7 @@ import com.l2jmobius.gameserver.util.Util;
  * Sell Buffs Manager
  * @author St3eT
  */
-public final class SellBuffsManager implements IGameXmlReader
+public final class SellBuffsManager implements IXmlReader
 {
 	private static final Logger LOGGER = Logger.getLogger(SellBuffsManager.class.getName());
 	private static final List<Integer> ALLOWED_BUFFS = new ArrayList<>();
diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/com/l2jmobius/gameserver/instancemanager/WalkingManager.java b/L2J_Mobius_Classic_2.2_Antharas/java/com/l2jmobius/gameserver/instancemanager/WalkingManager.java
index d1bba35f7c..423cbe0447 100644
--- a/L2J_Mobius_Classic_2.2_Antharas/java/com/l2jmobius/gameserver/instancemanager/WalkingManager.java
+++ b/L2J_Mobius_Classic_2.2_Antharas/java/com/l2jmobius/gameserver/instancemanager/WalkingManager.java
@@ -28,7 +28,7 @@ import org.w3c.dom.NamedNodeMap;
 import org.w3c.dom.Node;
 
 import com.l2jmobius.commons.concurrent.ThreadPool;
-import com.l2jmobius.commons.util.IGameXmlReader;
+import com.l2jmobius.commons.util.IXmlReader;
 import com.l2jmobius.gameserver.ai.CtrlIntention;
 import com.l2jmobius.gameserver.data.xml.impl.NpcData;
 import com.l2jmobius.gameserver.enums.ChatType;
@@ -47,7 +47,7 @@ import com.l2jmobius.gameserver.network.NpcStringId;
  * This class manages walking monsters.
  * @author GKR
  */
-public final class WalkingManager implements IGameXmlReader
+public final class WalkingManager implements IXmlReader
 {
 	private static final Logger LOGGER = Logger.getLogger(WalkingManager.class.getName());
 	
diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/com/l2jmobius/gameserver/instancemanager/ZoneManager.java b/L2J_Mobius_Classic_2.2_Antharas/java/com/l2jmobius/gameserver/instancemanager/ZoneManager.java
index b698f51a03..9a0bd870f2 100644
--- a/L2J_Mobius_Classic_2.2_Antharas/java/com/l2jmobius/gameserver/instancemanager/ZoneManager.java
+++ b/L2J_Mobius_Classic_2.2_Antharas/java/com/l2jmobius/gameserver/instancemanager/ZoneManager.java
@@ -26,6 +26,7 @@ import java.util.List;
 import java.util.Map;
 import java.util.Optional;
 import java.util.OptionalInt;
+import java.util.concurrent.ConcurrentHashMap;
 import java.util.logging.Level;
 import java.util.logging.Logger;
 
@@ -33,7 +34,7 @@ import org.w3c.dom.Document;
 import org.w3c.dom.NamedNodeMap;
 import org.w3c.dom.Node;
 
-import com.l2jmobius.commons.util.IGameXmlReader;
+import com.l2jmobius.commons.util.IXmlReader;
 import com.l2jmobius.gameserver.model.World;
 import com.l2jmobius.gameserver.model.WorldObject;
 import com.l2jmobius.gameserver.model.actor.Creature;
@@ -55,7 +56,7 @@ import com.l2jmobius.gameserver.model.zone.type.SpawnTerritory;
  * This class manages the zones
  * @author durgus
  */
-public final class ZoneManager implements IGameXmlReader
+public final class ZoneManager implements IXmlReader
 {
 	private static final Logger LOGGER = Logger.getLogger(ZoneManager.class.getName());
 	
@@ -65,9 +66,9 @@ public final class ZoneManager implements IGameXmlReader
 	private static final int OFFSET_X = Math.abs(World.MAP_MIN_X >> SHIFT_BY);
 	private static final int OFFSET_Y = Math.abs(World.MAP_MIN_Y >> SHIFT_BY);
 	
-	private final Map<Class<? extends ZoneType>, Map<Integer, ? extends ZoneType>> _classZones = new HashMap<>();
-	private final Map<String, SpawnTerritory> _spawnTerritories = new HashMap<>();
-	private int _lastDynamicId = 300000;
+	private final Map<Class<? extends ZoneType>, ConcurrentHashMap<Integer, ? extends ZoneType>> _classZones = new ConcurrentHashMap<>();
+	private final Map<String, SpawnTerritory> _spawnTerritories = new ConcurrentHashMap<>();
+	private volatile int _lastDynamicId = 300000;
 	private List<ItemInstance> _debugItems;
 	
 	private final ZoneRegion[][] _zoneRegions = new ZoneRegion[(World.MAP_MAX_X >> SHIFT_BY) + OFFSET_X + 1][(World.MAP_MAX_Y >> SHIFT_BY) + OFFSET_Y + 1];
@@ -365,7 +366,7 @@ public final class ZoneManager implements IGameXmlReader
 						}
 						if (checkId(zoneId))
 						{
-							LOGGER.config(getClass().getSimpleName() + ": Caution: Zone (" + zoneId + ") from file: " + f.getName() + " overrides previos definition.");
+							LOGGER.config(getClass().getSimpleName() + ": Caution: Zone (" + zoneId + ") from file: " + f.getName() + " overrides previuos definition.");
 						}
 						
 						if ((zoneName != null) && !zoneName.isEmpty())
@@ -453,10 +454,10 @@ public final class ZoneManager implements IGameXmlReader
 	@SuppressWarnings("unchecked")
 	private <T extends ZoneType> void addZone(Integer id, T zone)
 	{
-		Map<Integer, T> map = (Map<Integer, T>) _classZones.get(zone.getClass());
+		ConcurrentHashMap<Integer, T> map = (ConcurrentHashMap<Integer, T>) _classZones.get(zone.getClass());
 		if (map == null)
 		{
-			map = new HashMap<>();
+			map = new ConcurrentHashMap<>();
 			map.put(id, zone);
 			_classZones.put(zone.getClass(), map);
 		}
diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/com/l2jmobius/gameserver/model/quest/LongTimeEvent.java b/L2J_Mobius_Classic_2.2_Antharas/java/com/l2jmobius/gameserver/model/quest/LongTimeEvent.java
index cc71991407..0fa020eb5d 100644
--- a/L2J_Mobius_Classic_2.2_Antharas/java/com/l2jmobius/gameserver/model/quest/LongTimeEvent.java
+++ b/L2J_Mobius_Classic_2.2_Antharas/java/com/l2jmobius/gameserver/model/quest/LongTimeEvent.java
@@ -32,7 +32,7 @@ import org.w3c.dom.Node;
 
 import com.l2jmobius.commons.concurrent.ThreadPool;
 import com.l2jmobius.commons.database.DatabaseFactory;
-import com.l2jmobius.commons.util.IGameXmlReader;
+import com.l2jmobius.commons.util.IXmlReader;
 import com.l2jmobius.gameserver.data.sql.impl.AnnouncementsTable;
 import com.l2jmobius.gameserver.data.xml.impl.NpcData;
 import com.l2jmobius.gameserver.datatables.EventDroplist;
@@ -117,7 +117,7 @@ public class LongTimeEvent extends Quest
 	 */
 	private void loadConfig()
 	{
-		new IGameXmlReader()
+		new IXmlReader()
 		{
 			@Override
 			public void load()
diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/com/l2jmobius/gameserver/model/stats/BaseStats.java b/L2J_Mobius_Classic_2.2_Antharas/java/com/l2jmobius/gameserver/model/stats/BaseStats.java
index 1cb9ebbe1e..b692107007 100644
--- a/L2J_Mobius_Classic_2.2_Antharas/java/com/l2jmobius/gameserver/model/stats/BaseStats.java
+++ b/L2J_Mobius_Classic_2.2_Antharas/java/com/l2jmobius/gameserver/model/stats/BaseStats.java
@@ -23,7 +23,6 @@ import java.util.logging.Logger;
 import org.w3c.dom.Document;
 import org.w3c.dom.NamedNodeMap;
 
-import com.l2jmobius.commons.util.IGameXmlReader;
 import com.l2jmobius.commons.util.IXmlReader;
 import com.l2jmobius.gameserver.model.actor.Creature;
 
@@ -103,7 +102,7 @@ public enum BaseStats
 	
 	static
 	{
-		new IGameXmlReader()
+		new IXmlReader()
 		{
 			final Logger LOGGER = Logger.getLogger(BaseStats.class.getName());
 			
diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/com/l2jmobius/gameserver/scripting/ScriptEngineManager.java b/L2J_Mobius_Classic_2.2_Antharas/java/com/l2jmobius/gameserver/scripting/ScriptEngineManager.java
index 9eb6d85b69..95409c567a 100644
--- a/L2J_Mobius_Classic_2.2_Antharas/java/com/l2jmobius/gameserver/scripting/ScriptEngineManager.java
+++ b/L2J_Mobius_Classic_2.2_Antharas/java/com/l2jmobius/gameserver/scripting/ScriptEngineManager.java
@@ -28,8 +28,6 @@ import java.nio.file.attribute.BasicFileAttributes;
 import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.Iterator;
-import java.util.LinkedHashMap;
-import java.util.LinkedList;
 import java.util.List;
 import java.util.Map;
 import java.util.Map.Entry;
@@ -42,14 +40,14 @@ import java.util.logging.Logger;
 import org.w3c.dom.Document;
 
 import com.l2jmobius.Config;
-import com.l2jmobius.commons.util.IGameXmlReader;
+import com.l2jmobius.commons.util.IXmlReader;
 import com.l2jmobius.gameserver.scripting.java.JavaScriptingEngine;
 
 /**
  * Caches script engines and provides functionality for executing and managing scripts.
  * @author KenM, HorridoJoho
  */
-public final class ScriptEngineManager implements IGameXmlReader
+public final class ScriptEngineManager implements IXmlReader
 {
 	private static final Logger LOGGER = Logger.getLogger(ScriptEngineManager.class.getName());
 	public static final Path SCRIPT_FOLDER = Paths.get(Config.DATAPACK_ROOT.getAbsolutePath(), "data", "scripts");
@@ -59,8 +57,7 @@ public final class ScriptEngineManager implements IGameXmlReader
 	public static final Path CONDITION_HANDLER_FILE = Paths.get(SCRIPT_FOLDER.toString(), "handlers", "ConditionMasterHandler.java");
 	public static final Path ONE_DAY_REWARD_MASTER_HANDLER = Paths.get(SCRIPT_FOLDER.toString(), "handlers", "DailyMissionMasterHandler.java");
 	
-	private final Map<String, IExecutionContext> _extEngines = new HashMap<>();
-	private IExecutionContext _currentExecutionContext = null;
+	private IExecutionContext _javaExecutionContext = null;
 	static final List<String> _exclusions = new ArrayList<>();
 	
 	protected ScriptEngineManager()
@@ -166,12 +163,7 @@ public final class ScriptEngineManager implements IGameXmlReader
 	private void registerEngine(IScriptingEngine engine, Properties props)
 	{
 		maybeSetProperties("language." + engine.getLanguageName() + ".", props, engine);
-		final IExecutionContext context = engine.createExecutionContext();
-		for (String commonExtension : engine.getCommonFileExtensions())
-		{
-			_extEngines.put(commonExtension, context);
-		}
-		
+		_javaExecutionContext = engine.createExecutionContext();
 		LOGGER.info("ScriptEngine: " + engine.getEngineName() + " " + engine.getEngineVersion() + " (" + engine.getLanguageName() + " " + engine.getLanguageVersion() + ")");
 	}
 	
@@ -200,66 +192,6 @@ public final class ScriptEngineManager implements IGameXmlReader
 		}
 	}
 	
-	private IExecutionContext getEngineByExtension(String ext)
-	{
-		return _extEngines.get(ext);
-	}
-	
-	private String getFileExtension(Path p)
-	{
-		final String name = p.getFileName().toString();
-		final int lastDotIdx = name.lastIndexOf('.');
-		if (lastDotIdx == -1)
-		{
-			return null;
-		}
-		
-		final String extension = name.substring(lastDotIdx + 1);
-		if (extension.isEmpty())
-		{
-			return null;
-		}
-		
-		return extension;
-	}
-	
-	private void checkExistingFile(String messagePre, Path filePath) throws Exception
-	{
-		if (!Files.exists(filePath))
-		{
-			throw new Exception(messagePre + ": " + filePath + " does not exists!");
-		}
-		else if (!Files.isRegularFile(filePath))
-		{
-			throw new Exception(messagePre + ": " + filePath + " is not a file!");
-		}
-	}
-	
-	public void executeMasterHandler() throws Exception
-	{
-		executeScript(MASTER_HANDLER_FILE);
-	}
-	
-	public void executeEffectMasterHandler() throws Exception
-	{
-		executeScript(EFFECT_MASTER_HANDLER_FILE);
-	}
-	
-	public void executeSkillConditionMasterHandler() throws Exception
-	{
-		executeScript(SKILL_CONDITION_HANDLER_FILE);
-	}
-	
-	public void executeConditionMasterHandler() throws Exception
-	{
-		executeScript(CONDITION_HANDLER_FILE);
-	}
-	
-	public void executeDailyMissionMasterHandler() throws Exception
-	{
-		executeScript(ONE_DAY_REWARD_MASTER_HANDLER);
-	}
-	
 	public void executeScriptList() throws Exception
 	{
 		if (Config.ALT_DEV_NO_QUESTS)
@@ -267,77 +199,35 @@ public final class ScriptEngineManager implements IGameXmlReader
 			return;
 		}
 		
-		final Map<IExecutionContext, List<Path>> files = new LinkedHashMap<>();
+		final List<Path> files = new ArrayList<>();
 		processDirectory(SCRIPT_FOLDER.toFile(), files);
 		
-		for (Entry<IExecutionContext, List<Path>> entry : files.entrySet())
+		final Map<Path, Throwable> invokationErrors = _javaExecutionContext.executeScripts(files);
+		for (Entry<Path, Throwable> entry : invokationErrors.entrySet())
 		{
-			_currentExecutionContext = entry.getKey();
-			try
-			{
-				final Map<Path, Throwable> invokationErrors = entry.getKey().executeScripts(entry.getValue());
-				for (Entry<Path, Throwable> entry2 : invokationErrors.entrySet())
-				{
-					LOGGER.log(Level.WARNING, "ScriptEngine: " + entry2.getKey() + " failed execution!", entry2.getValue());
-				}
-			}
-			finally
-			{
-				_currentExecutionContext = null;
-			}
+			LOGGER.log(Level.WARNING, "ScriptEngine: " + entry.getKey() + " failed execution!", entry.getValue());
 		}
 	}
 	
-	private void processDirectory(File dir, Map<IExecutionContext, List<Path>> files)
+	private void processDirectory(File dir, List<Path> files)
 	{
 		for (File file : dir.listFiles())
 		{
-			if (file.isDirectory())
+			if (file.isFile())
+			{
+				final String fileName = file.getName();
+				if (fileName.endsWith(".java") && !_exclusions.contains(fileName))
+				{
+					files.add(file.toPath().toAbsolutePath());
+				}
+			}
+			else if (file.isDirectory())
 			{
 				processDirectory(file, files);
 			}
-			else
-			{
-				processFile(file, files);
-			}
 		}
 	}
 	
-	private void processFile(File file, Map<IExecutionContext, List<Path>> files)
-	{
-		if (_exclusions.contains(file.getName()))
-		{
-			return;
-		}
-		
-		Path sourceFile = file.toPath();
-		try
-		{
-			checkExistingFile("ScriptFile", sourceFile);
-		}
-		catch (Exception e)
-		{
-			LOGGER.warning(e.getMessage());
-			return;
-		}
-		
-		sourceFile = sourceFile.toAbsolutePath();
-		final String ext = getFileExtension(sourceFile);
-		if (ext == null)
-		{
-			LOGGER.warning("ScriptFile: " + sourceFile + " does not have an extension to determine the script engine!");
-			return;
-		}
-		
-		final IExecutionContext engine = getEngineByExtension(ext);
-		if (engine == null)
-		{
-			return;
-		}
-		
-		files.computeIfAbsent(engine, k -> new LinkedList<>()).add(sourceFile);
-	}
-	
 	public void executeScript(Path sourceFile) throws Exception
 	{
 		Objects.requireNonNull(sourceFile);
@@ -347,34 +237,19 @@ public final class ScriptEngineManager implements IGameXmlReader
 			sourceFile = SCRIPT_FOLDER.resolve(sourceFile);
 		}
 		
-		// throws exception if not exists or not file
-		checkExistingFile("ScriptFile", sourceFile);
-		
 		sourceFile = sourceFile.toAbsolutePath();
-		final String ext = getFileExtension(sourceFile);
 		Objects.requireNonNull(sourceFile, "ScriptFile: " + sourceFile + " does not have an extension to determine the script engine!");
 		
-		final IExecutionContext engine = getEngineByExtension(ext);
-		Objects.requireNonNull(engine, "ScriptEngine: No engine registered for extension " + ext + "!");
-		
-		_currentExecutionContext = engine;
-		try
+		final Entry<Path, Throwable> error = _javaExecutionContext.executeScript(sourceFile);
+		if (error != null)
 		{
-			final Entry<Path, Throwable> error = engine.executeScript(sourceFile);
-			if (error != null)
-			{
-				throw new Exception("ScriptEngine: " + error.getKey() + " failed execution!", error.getValue());
-			}
-		}
-		finally
-		{
-			_currentExecutionContext = null;
+			throw new Exception("ScriptEngine: " + error.getKey() + " failed execution!", error.getValue());
 		}
 	}
 	
 	public Path getCurrentLoadingScript()
 	{
-		return _currentExecutionContext != null ? _currentExecutionContext.getCurrentExecutingScript() : null;
+		return _javaExecutionContext.getCurrentExecutingScript();
 	}
 	
 	public static ScriptEngineManager getInstance()
diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/com/l2jmobius/loginserver/GameServerTable.java b/L2J_Mobius_Classic_2.2_Antharas/java/com/l2jmobius/loginserver/GameServerTable.java
index 456224d78c..4269e47969 100644
--- a/L2J_Mobius_Classic_2.2_Antharas/java/com/l2jmobius/loginserver/GameServerTable.java
+++ b/L2J_Mobius_Classic_2.2_Antharas/java/com/l2jmobius/loginserver/GameServerTable.java
@@ -36,8 +36,8 @@ import org.w3c.dom.Document;
 import org.w3c.dom.NodeList;
 
 import com.l2jmobius.commons.database.DatabaseFactory;
-import com.l2jmobius.commons.util.IGameXmlReader;
 import com.l2jmobius.commons.util.IPSubnet;
+import com.l2jmobius.commons.util.IXmlReader;
 import com.l2jmobius.commons.util.Rnd;
 import com.l2jmobius.loginserver.network.gameserverpackets.ServerStatus;
 
@@ -45,7 +45,7 @@ import com.l2jmobius.loginserver.network.gameserverpackets.ServerStatus;
  * The Class GameServerTable loads the game server names and initialize the game server tables.
  * @author KenM, Zoey76
  */
-public final class GameServerTable implements IGameXmlReader
+public final class GameServerTable implements IXmlReader
 {
 	private static final Logger LOGGER = Logger.getLogger(GameServerTable.class.getName());
 	
diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/config/Scripts.xml b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/config/Scripts.xml
index 284aa0a31f..54d05b241f 100644
--- a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/config/Scripts.xml
+++ b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/config/Scripts.xml
@@ -2,11 +2,7 @@
 <list xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../data/xsd/Scripts.xsd">
 	<!-- Skip these filenames from script loading, because they are already loaded using a different way. -->
 	<exclude file="package-info.java" />
-	<exclude file="MasterHandler.java" />
-	<exclude file="EffectMasterHandler.java" />
-	<exclude file="SkillConditionMasterHandler.java" />
-	<exclude file="ConditionMasterHandler.java" />
-	<exclude file="DailyMissionMasterHandler.java" />
+	<exclude file="handlers" />
 	
 	<!--
 	With this file you can exclude/include specific folders/files from within the scripts directory.
diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/ai/others/ClassMaster/ClassMaster.java b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/ai/others/ClassMaster/ClassMaster.java
index b4aa56887e..64b38902b0 100644
--- a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/ai/others/ClassMaster/ClassMaster.java
+++ b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/ai/others/ClassMaster/ClassMaster.java
@@ -30,7 +30,7 @@ import org.w3c.dom.NamedNodeMap;
 import org.w3c.dom.Node;
 
 import com.l2jmobius.Config;
-import com.l2jmobius.commons.util.IGameXmlReader;
+import com.l2jmobius.commons.util.IXmlReader;
 import com.l2jmobius.gameserver.data.xml.impl.CategoryData;
 import com.l2jmobius.gameserver.data.xml.impl.ClassListData;
 import com.l2jmobius.gameserver.data.xml.impl.SkillData;
@@ -63,7 +63,7 @@ import ai.AbstractNpcAI;
  * Class Master AI.
  * @author Nik
  */
-public final class ClassMaster extends AbstractNpcAI implements IGameXmlReader
+public final class ClassMaster extends AbstractNpcAI implements IXmlReader
 {
 	// NPCs
 	private static final List<Integer> CLASS_MASTERS = new ArrayList<>();
diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/admincommandhandlers/AdminQuest.java b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/admincommandhandlers/AdminQuest.java
index 228cc1668d..a771c4ab90 100644
--- a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/admincommandhandlers/AdminQuest.java
+++ b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/admincommandhandlers/AdminQuest.java
@@ -320,7 +320,7 @@ public class AdminQuest implements IAdminCommandHandler
 				{
 					sb.append("<a action=\"bypass -h admin_script_dir " + c + "\">" + c + "</a><br1>");
 				}
-				else if (c.endsWith(".java") || c.endsWith(".py"))
+				else if (c.endsWith(".java"))
 				{
 					sb.append("<a action=\"bypass -h admin_script_load " + c + "\"><font color=\"LEVEL\">" + c + "</font></a><br1>");
 				}
@@ -352,7 +352,7 @@ public class AdminQuest implements IAdminCommandHandler
 				{
 					sb.append("<a action=\"bypass -h admin_script_dir " + currentPath + "/" + c + "\">" + (questReducedNames ? getQuestName(c) : c) + "</a><br1>");
 				}
-				else if (c.endsWith(".java") || c.endsWith(".py"))
+				else if (c.endsWith(".java"))
 				{
 					sb.append("<a action=\"bypass -h admin_script_load " + currentPath + "/" + c + "\"><font color=\"LEVEL\">" + c + "</font></a><br1>");
 				}
diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/admincommandhandlers/AdminReload.java b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/admincommandhandlers/AdminReload.java
index 466ed146cd..b89bd7cbcd 100644
--- a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/admincommandhandlers/AdminReload.java
+++ b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/admincommandhandlers/AdminReload.java
@@ -221,7 +221,7 @@ public class AdminReload implements IAdminCommandHandler
 				{
 					try
 					{
-						ScriptEngineManager.getInstance().executeEffectMasterHandler();
+						ScriptEngineManager.getInstance().executeScript(ScriptEngineManager.EFFECT_MASTER_HANDLER_FILE);
 						AdminData.getInstance().broadcastMessageToGMs(activeChar.getName() + ": Reloaded effect master handler.");
 					}
 					catch (Exception e)
@@ -235,7 +235,7 @@ public class AdminReload implements IAdminCommandHandler
 				{
 					try
 					{
-						ScriptEngineManager.getInstance().executeMasterHandler();
+						ScriptEngineManager.getInstance().executeScript(ScriptEngineManager.MASTER_HANDLER_FILE);
 						AdminData.getInstance().broadcastMessageToGMs(activeChar.getName() + ": Reloaded master handler.");
 					}
 					catch (Exception e)
diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/telnethandlers/server/Reload.java b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/telnethandlers/server/Reload.java
index d679ea1212..491b10cc62 100644
--- a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/telnethandlers/server/Reload.java
+++ b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/telnethandlers/server/Reload.java
@@ -181,7 +181,7 @@ public class Reload implements ITelnetCommand
 			{
 				try
 				{
-					ScriptEngineManager.getInstance().executeEffectMasterHandler();
+					ScriptEngineManager.getInstance().executeScript(ScriptEngineManager.EFFECT_MASTER_HANDLER_FILE);
 					return AdminData.getInstance().broadcastMessageToGMs("Telnet Admin: Reloaded effect master handler.");
 				}
 				catch (Exception e)
@@ -194,7 +194,7 @@ public class Reload implements ITelnetCommand
 			{
 				try
 				{
-					ScriptEngineManager.getInstance().executeMasterHandler();
+					ScriptEngineManager.getInstance().executeScript(ScriptEngineManager.MASTER_HANDLER_FILE);
 					return AdminData.getInstance().broadcastMessageToGMs("Telnet Admin: Reloaded master handler.");
 				}
 				catch (Exception e)
diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/com/l2jmobius/Config.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/com/l2jmobius/Config.java
index 5a8a6b731d..4069e1357d 100644
--- a/L2J_Mobius_Classic_2.3_SevenSigns/java/com/l2jmobius/Config.java
+++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/com/l2jmobius/Config.java
@@ -54,7 +54,7 @@ import org.w3c.dom.Document;
 import org.w3c.dom.NamedNodeMap;
 import org.w3c.dom.Node;
 
-import com.l2jmobius.commons.util.IGameXmlReader;
+import com.l2jmobius.commons.util.IXmlReader;
 import com.l2jmobius.commons.util.PropertiesParser;
 import com.l2jmobius.commons.util.StringUtil;
 import com.l2jmobius.gameserver.enums.ChatType;
@@ -2999,7 +2999,7 @@ public final class Config
 		return result;
 	}
 	
-	private static class IPConfigData implements IGameXmlReader
+	private static class IPConfigData implements IXmlReader
 	{
 		private static final List<String> _subnets = new ArrayList<>(5);
 		private static final List<String> _hosts = new ArrayList<>(5);
diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/com/l2jmobius/commons/util/IGameXmlReader.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/com/l2jmobius/commons/util/IGameXmlReader.java
deleted file mode 100644
index b29089db77..0000000000
--- a/L2J_Mobius_Classic_2.3_SevenSigns/java/com/l2jmobius/commons/util/IGameXmlReader.java
+++ /dev/null
@@ -1,118 +0,0 @@
-/*
- * This file is part of the L2J Mobius project.
- * 
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- * 
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * General Public License for more details.
- * 
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- */
-package com.l2jmobius.commons.util;
-
-import java.io.File;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
-import org.w3c.dom.NamedNodeMap;
-import org.w3c.dom.Node;
-
-import com.l2jmobius.Config;
-import com.l2jmobius.gameserver.model.Location;
-import com.l2jmobius.gameserver.model.holders.MinionHolder;
-import com.l2jmobius.gameserver.model.holders.SkillHolder;
-
-/**
- * Interface for XML parsers.
- * @author Zoey76
- */
-public interface IGameXmlReader extends IXmlReader
-{
-	/**
-	 * Wrapper for {@link #parseFile(File)} method.
-	 * @param path the relative path to the datapack root of the XML file to parse.
-	 */
-	default void parseDatapackFile(String path)
-	{
-		parseFile(new File(Config.DATAPACK_ROOT, path));
-	}
-	
-	/**
-	 * Wrapper for {@link #parseDirectory(File, boolean)}.
-	 * @param path the path to the directory where the XML files are
-	 * @param recursive parses all sub folders if there is
-	 * @return {@code false} if it fails to find the directory, {@code true} otherwise
-	 */
-	default boolean parseDatapackDirectory(String path, boolean recursive)
-	{
-		return parseDirectory(new File(Config.DATAPACK_ROOT, path), recursive);
-	}
-	
-	/**
-	 * @param n
-	 * @return a map of parameters
-	 */
-	default Map<String, Object> parseParameters(Node n)
-	{
-		final Map<String, Object> parameters = new HashMap<>();
-		for (Node parameters_node = n.getFirstChild(); parameters_node != null; parameters_node = parameters_node.getNextSibling())
-		{
-			NamedNodeMap attrs = parameters_node.getAttributes();
-			switch (parameters_node.getNodeName().toLowerCase())
-			{
-				case "param":
-				{
-					parameters.put(parseString(attrs, "name"), parseString(attrs, "value"));
-					break;
-				}
-				case "skill":
-				{
-					parameters.put(parseString(attrs, "name"), new SkillHolder(parseInteger(attrs, "id"), parseInteger(attrs, "level")));
-					break;
-				}
-				case "location":
-				{
-					parameters.put(parseString(attrs, "name"), new Location(parseInteger(attrs, "x"), parseInteger(attrs, "y"), parseInteger(attrs, "z"), parseInteger(attrs, "heading", 0)));
-					break;
-				}
-				case "minions":
-				{
-					final List<MinionHolder> minions = new ArrayList<>(1);
-					for (Node minions_node = parameters_node.getFirstChild(); minions_node != null; minions_node = minions_node.getNextSibling())
-					{
-						if (minions_node.getNodeName().equalsIgnoreCase("npc"))
-						{
-							attrs = minions_node.getAttributes();
-							minions.add(new MinionHolder(parseInteger(attrs, "id"), parseInteger(attrs, "count"), parseInteger(attrs, "respawnTime"), parseInteger(attrs, "weightPoint")));
-						}
-					}
-					
-					if (!minions.isEmpty())
-					{
-						parameters.put(parseString(parameters_node.getAttributes(), "name"), minions);
-					}
-					break;
-				}
-			}
-		}
-		return parameters;
-	}
-	
-	default Location parseLocation(Node n)
-	{
-		final NamedNodeMap attrs = n.getAttributes();
-		final int x = parseInteger(attrs, "x");
-		final int y = parseInteger(attrs, "y");
-		final int z = parseInteger(attrs, "z");
-		final int heading = parseInteger(attrs, "heading", 0);
-		return new Location(x, y, z, heading);
-	}
-}
diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/com/l2jmobius/commons/util/IXmlReader.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/com/l2jmobius/commons/util/IXmlReader.java
index 0317816fd8..4bfed2396e 100644
--- a/L2J_Mobius_Classic_2.3_SevenSigns/java/com/l2jmobius/commons/util/IXmlReader.java
+++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/com/l2jmobius/commons/util/IXmlReader.java
@@ -18,8 +18,13 @@ package com.l2jmobius.commons.util;
 
 import java.io.File;
 import java.io.FileFilter;
+import java.util.ArrayList;
+import java.util.HashMap;
 import java.util.LinkedHashMap;
+import java.util.List;
 import java.util.Map;
+import java.util.concurrent.CopyOnWriteArrayList;
+import java.util.concurrent.ScheduledFuture;
 import java.util.function.Consumer;
 import java.util.function.Predicate;
 import java.util.logging.Level;
@@ -35,7 +40,12 @@ import org.w3c.dom.NodeList;
 import org.xml.sax.ErrorHandler;
 import org.xml.sax.SAXParseException;
 
+import com.l2jmobius.Config;
+import com.l2jmobius.commons.concurrent.ThreadPool;
 import com.l2jmobius.commons.util.file.filter.XMLFilter;
+import com.l2jmobius.gameserver.model.Location;
+import com.l2jmobius.gameserver.model.holders.MinionHolder;
+import com.l2jmobius.gameserver.model.holders.SkillHolder;
 
 /**
  * Interface for XML parsers.
@@ -56,6 +66,15 @@ public interface IXmlReader
 	 */
 	void load();
 	
+	/**
+	 * Wrapper for {@link #parseFile(File)} method.
+	 * @param path the relative path to the datapack root of the XML file to parse.
+	 */
+	default void parseDatapackFile(String path)
+	{
+		parseFile(new File(Config.DATAPACK_ROOT, path));
+	}
+	
 	/**
 	 * Parses a single XML file.<br>
 	 * If the file was successfully parsed, call {@link #parseDocument(Document, File)} for the parsed document.<br>
@@ -121,6 +140,17 @@ public interface IXmlReader
 		return parseDirectory(file, false);
 	}
 	
+	/**
+	 * Wrapper for {@link #parseDirectory(File, boolean)}.
+	 * @param path the path to the directory where the XML files are
+	 * @param recursive parses all sub folders if there is
+	 * @return {@code false} if it fails to find the directory, {@code true} otherwise
+	 */
+	default boolean parseDatapackDirectory(String path, boolean recursive)
+	{
+		return parseDirectory(new File(Config.DATAPACK_ROOT, path), recursive);
+	}
+	
 	/**
 	 * Loads all XML files from {@code path} and calls {@link #parseFile(File)} for each one of them.
 	 * @param dir the directory object to scan.
@@ -135,6 +165,7 @@ public interface IXmlReader
 			return false;
 		}
 		
+		final List<ScheduledFuture<?>> jobs = new CopyOnWriteArrayList<>();
 		final File[] listOfFiles = dir.listFiles();
 		for (File f : listOfFiles)
 		{
@@ -144,9 +175,23 @@ public interface IXmlReader
 			}
 			else if (getCurrentFileFilter().accept(f))
 			{
-				parseFile(f);
+				jobs.add(ThreadPool.schedule(() ->
+				{
+					parseFile(f);
+				}, 0));
 			}
 		}
+		while (!jobs.isEmpty())
+		{
+			for (ScheduledFuture<?> job : jobs)
+			{
+				if ((job == null) || job.isDone() || job.isCancelled())
+				{
+					jobs.remove(job);
+				}
+			}
+		}
+		
 		return true;
 	}
 	
@@ -531,6 +576,16 @@ public interface IXmlReader
 		return parseString(attrs.getNamedItem(name), defaultValue);
 	}
 	
+	default Location parseLocation(Node n)
+	{
+		final NamedNodeMap attrs = n.getAttributes();
+		final int x = parseInteger(attrs, "x");
+		final int y = parseInteger(attrs, "y");
+		final int z = parseInteger(attrs, "z");
+		final int heading = parseInteger(attrs, "heading", 0);
+		return new Location(x, y, z, heading);
+	}
+	
 	/**
 	 * Parses an enumerated value.
 	 * @param <T> the enumerated type
@@ -612,6 +667,56 @@ public interface IXmlReader
 		return map;
 	}
 	
+	/**
+	 * @param n
+	 * @return a map of parameters
+	 */
+	default Map<String, Object> parseParameters(Node n)
+	{
+		final Map<String, Object> parameters = new HashMap<>();
+		for (Node parameters_node = n.getFirstChild(); parameters_node != null; parameters_node = parameters_node.getNextSibling())
+		{
+			NamedNodeMap attrs = parameters_node.getAttributes();
+			switch (parameters_node.getNodeName().toLowerCase())
+			{
+				case "param":
+				{
+					parameters.put(parseString(attrs, "name"), parseString(attrs, "value"));
+					break;
+				}
+				case "skill":
+				{
+					parameters.put(parseString(attrs, "name"), new SkillHolder(parseInteger(attrs, "id"), parseInteger(attrs, "level")));
+					break;
+				}
+				case "location":
+				{
+					parameters.put(parseString(attrs, "name"), new Location(parseInteger(attrs, "x"), parseInteger(attrs, "y"), parseInteger(attrs, "z"), parseInteger(attrs, "heading", 0)));
+					break;
+				}
+				case "minions":
+				{
+					final List<MinionHolder> minions = new ArrayList<>(1);
+					for (Node minions_node = parameters_node.getFirstChild(); minions_node != null; minions_node = minions_node.getNextSibling())
+					{
+						if (minions_node.getNodeName().equalsIgnoreCase("npc"))
+						{
+							attrs = minions_node.getAttributes();
+							minions.add(new MinionHolder(parseInteger(attrs, "id"), parseInteger(attrs, "count"), parseInteger(attrs, "respawnTime"), parseInteger(attrs, "weightPoint")));
+						}
+					}
+					
+					if (!minions.isEmpty())
+					{
+						parameters.put(parseString(parameters_node.getAttributes(), "name"), minions);
+					}
+					break;
+				}
+			}
+		}
+		return parameters;
+	}
+	
 	/**
 	 * Executes action for each child of node
 	 * @param node
diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/com/l2jmobius/gameserver/GameServer.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/com/l2jmobius/gameserver/GameServer.java
index 0276cda81d..10c150f549 100644
--- a/L2J_Mobius_Classic_2.3_SevenSigns/java/com/l2jmobius/gameserver/GameServer.java
+++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/com/l2jmobius/gameserver/GameServer.java
@@ -358,7 +358,7 @@ public class GameServer
 		try
 		{
 			LOGGER.info(getClass().getSimpleName() + ": Loading server scripts:");
-			ScriptEngineManager.getInstance().executeMasterHandler();
+			ScriptEngineManager.getInstance().executeScript(ScriptEngineManager.MASTER_HANDLER_FILE);
 			ScriptEngineManager.getInstance().executeScriptList();
 		}
 		catch (Exception e)
diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/com/l2jmobius/gameserver/data/xml/impl/ActionData.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/com/l2jmobius/gameserver/data/xml/impl/ActionData.java
index 0bffdc5bb1..a322dad1d9 100644
--- a/L2J_Mobius_Classic_2.3_SevenSigns/java/com/l2jmobius/gameserver/data/xml/impl/ActionData.java
+++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/com/l2jmobius/gameserver/data/xml/impl/ActionData.java
@@ -23,14 +23,14 @@ import java.util.logging.Logger;
 
 import org.w3c.dom.Document;
 
-import com.l2jmobius.commons.util.IGameXmlReader;
+import com.l2jmobius.commons.util.IXmlReader;
 import com.l2jmobius.gameserver.model.ActionDataHolder;
 import com.l2jmobius.gameserver.model.StatsSet;
 
 /**
  * @author UnAfraid
  */
-public class ActionData implements IGameXmlReader
+public class ActionData implements IXmlReader
 {
 	private static final Logger LOGGER = Logger.getLogger(ActionData.class.getName());
 	
diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/com/l2jmobius/gameserver/data/xml/impl/AdminData.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/com/l2jmobius/gameserver/data/xml/impl/AdminData.java
index 0b1d3e3245..9e359b1521 100644
--- a/L2J_Mobius_Classic_2.3_SevenSigns/java/com/l2jmobius/gameserver/data/xml/impl/AdminData.java
+++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/com/l2jmobius/gameserver/data/xml/impl/AdminData.java
@@ -29,7 +29,7 @@ import org.w3c.dom.Document;
 import org.w3c.dom.NamedNodeMap;
 import org.w3c.dom.Node;
 
-import com.l2jmobius.commons.util.IGameXmlReader;
+import com.l2jmobius.commons.util.IXmlReader;
 import com.l2jmobius.gameserver.model.AccessLevel;
 import com.l2jmobius.gameserver.model.AdminCommandAccessRight;
 import com.l2jmobius.gameserver.model.StatsSet;
@@ -42,7 +42,7 @@ import com.l2jmobius.gameserver.network.serverpackets.SystemMessage;
  * Loads administrator access levels and commands.
  * @author UnAfraid
  */
-public final class AdminData implements IGameXmlReader
+public final class AdminData implements IXmlReader
 {
 	private static final Logger LOGGER = Logger.getLogger(AdminData.class.getName());
 	
diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/com/l2jmobius/gameserver/data/xml/impl/AppearanceItemData.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/com/l2jmobius/gameserver/data/xml/impl/AppearanceItemData.java
index 089004322a..801c66340d 100644
--- a/L2J_Mobius_Classic_2.3_SevenSigns/java/com/l2jmobius/gameserver/data/xml/impl/AppearanceItemData.java
+++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/com/l2jmobius/gameserver/data/xml/impl/AppearanceItemData.java
@@ -24,7 +24,7 @@ import java.util.logging.Logger;
 import org.w3c.dom.Document;
 import org.w3c.dom.Node;
 
-import com.l2jmobius.commons.util.IGameXmlReader;
+import com.l2jmobius.commons.util.IXmlReader;
 import com.l2jmobius.gameserver.datatables.ItemTable;
 import com.l2jmobius.gameserver.enums.Race;
 import com.l2jmobius.gameserver.model.StatsSet;
@@ -36,7 +36,7 @@ import com.l2jmobius.gameserver.model.items.type.CrystalType;
 /**
  * @author UnAfraid
  */
-public class AppearanceItemData implements IGameXmlReader
+public class AppearanceItemData implements IXmlReader
 {
 	private static final Logger LOGGER = Logger.getLogger(AppearanceItemData.class.getName());
 	
diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/com/l2jmobius/gameserver/data/xml/impl/ArmorSetsData.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/com/l2jmobius/gameserver/data/xml/impl/ArmorSetsData.java
index 54e8f6b82e..b0475692fd 100644
--- a/L2J_Mobius_Classic_2.3_SevenSigns/java/com/l2jmobius/gameserver/data/xml/impl/ArmorSetsData.java
+++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/com/l2jmobius/gameserver/data/xml/impl/ArmorSetsData.java
@@ -19,9 +19,9 @@ package com.l2jmobius.gameserver.data.xml.impl;
 import java.io.File;
 import java.util.ArrayList;
 import java.util.Collections;
-import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
+import java.util.concurrent.ConcurrentHashMap;
 import java.util.logging.Logger;
 import java.util.stream.Stream;
 
@@ -29,7 +29,7 @@ import org.w3c.dom.Document;
 import org.w3c.dom.NamedNodeMap;
 import org.w3c.dom.Node;
 
-import com.l2jmobius.commons.util.IGameXmlReader;
+import com.l2jmobius.commons.util.IXmlReader;
 import com.l2jmobius.gameserver.datatables.ItemTable;
 import com.l2jmobius.gameserver.model.ArmorSet;
 import com.l2jmobius.gameserver.model.holders.ArmorsetSkillHolder;
@@ -40,12 +40,12 @@ import com.l2jmobius.gameserver.model.stats.BaseStats;
  * Loads armor set bonuses.
  * @author godson, Luno, UnAfraid
  */
-public final class ArmorSetsData implements IGameXmlReader
+public final class ArmorSetsData implements IXmlReader
 {
 	private static final Logger LOGGER = Logger.getLogger(ArmorSetsData.class.getName());
 	
-	private final Map<Integer, ArmorSet> _armorSets = new HashMap<>();
-	private final Map<Integer, List<ArmorSet>> _armorSetItems = new HashMap<>();
+	private final Map<Integer, ArmorSet> _armorSets = new ConcurrentHashMap<>();
+	private final Map<Integer, List<ArmorSet>> _armorSetItems = new ConcurrentHashMap<>();
 	
 	protected ArmorSetsData()
 	{
diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/com/l2jmobius/gameserver/data/xml/impl/AttendanceRewardData.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/com/l2jmobius/gameserver/data/xml/impl/AttendanceRewardData.java
index c60afbd78a..24e402e706 100644
--- a/L2J_Mobius_Classic_2.3_SevenSigns/java/com/l2jmobius/gameserver/data/xml/impl/AttendanceRewardData.java
+++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/com/l2jmobius/gameserver/data/xml/impl/AttendanceRewardData.java
@@ -24,7 +24,7 @@ import java.util.logging.Logger;
 import org.w3c.dom.Document;
 
 import com.l2jmobius.Config;
-import com.l2jmobius.commons.util.IGameXmlReader;
+import com.l2jmobius.commons.util.IXmlReader;
 import com.l2jmobius.gameserver.datatables.ItemTable;
 import com.l2jmobius.gameserver.model.StatsSet;
 import com.l2jmobius.gameserver.model.holders.ItemHolder;
@@ -32,7 +32,7 @@ import com.l2jmobius.gameserver.model.holders.ItemHolder;
 /**
  * @author Mobius
  */
-public class AttendanceRewardData implements IGameXmlReader
+public class AttendanceRewardData implements IXmlReader
 {
 	private static Logger LOGGER = Logger.getLogger(AttendanceRewardData.class.getName());
 	private final List<ItemHolder> _rewards = new ArrayList<>();
diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/com/l2jmobius/gameserver/data/xml/impl/BeautyShopData.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/com/l2jmobius/gameserver/data/xml/impl/BeautyShopData.java
index 133f11d978..d88ccc7747 100644
--- a/L2J_Mobius_Classic_2.3_SevenSigns/java/com/l2jmobius/gameserver/data/xml/impl/BeautyShopData.java
+++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/com/l2jmobius/gameserver/data/xml/impl/BeautyShopData.java
@@ -24,7 +24,7 @@ import org.w3c.dom.Document;
 import org.w3c.dom.NamedNodeMap;
 import org.w3c.dom.Node;
 
-import com.l2jmobius.commons.util.IGameXmlReader;
+import com.l2jmobius.commons.util.IXmlReader;
 import com.l2jmobius.gameserver.enums.Race;
 import com.l2jmobius.gameserver.enums.Sex;
 import com.l2jmobius.gameserver.model.StatsSet;
@@ -34,7 +34,7 @@ import com.l2jmobius.gameserver.model.beautyshop.BeautyItem;
 /**
  * @author Sdw
  */
-public final class BeautyShopData implements IGameXmlReader
+public final class BeautyShopData implements IXmlReader
 {
 	private final Map<Race, Map<Sex, BeautyData>> _beautyList = new HashMap<>();
 	private final Map<Sex, BeautyData> _beautyData = new HashMap<>();
diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/com/l2jmobius/gameserver/data/xml/impl/BuyListData.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/com/l2jmobius/gameserver/data/xml/impl/BuyListData.java
index de298ef358..8ab9ea8097 100644
--- a/L2J_Mobius_Classic_2.3_SevenSigns/java/com/l2jmobius/gameserver/data/xml/impl/BuyListData.java
+++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/com/l2jmobius/gameserver/data/xml/impl/BuyListData.java
@@ -21,8 +21,8 @@ import java.io.FileFilter;
 import java.sql.Connection;
 import java.sql.ResultSet;
 import java.sql.Statement;
-import java.util.HashMap;
 import java.util.Map;
+import java.util.concurrent.ConcurrentHashMap;
 import java.util.logging.Level;
 import java.util.logging.Logger;
 
@@ -31,7 +31,7 @@ import org.w3c.dom.NamedNodeMap;
 
 import com.l2jmobius.Config;
 import com.l2jmobius.commons.database.DatabaseFactory;
-import com.l2jmobius.commons.util.IGameXmlReader;
+import com.l2jmobius.commons.util.IXmlReader;
 import com.l2jmobius.commons.util.file.filter.NumericNameFilter;
 import com.l2jmobius.gameserver.datatables.ItemTable;
 import com.l2jmobius.gameserver.model.buylist.Product;
@@ -42,11 +42,11 @@ import com.l2jmobius.gameserver.model.items.Item;
  * Loads buy lists for NPCs.
  * @author NosBit
  */
-public final class BuyListData implements IGameXmlReader
+public final class BuyListData implements IXmlReader
 {
 	private static final Logger LOGGER = Logger.getLogger(BuyListData.class.getName());
 	
-	private final Map<Integer, ProductList> _buyLists = new HashMap<>();
+	private final Map<Integer, ProductList> _buyLists = new ConcurrentHashMap<>();
 	private static final FileFilter NUMERIC_FILTER = new NumericNameFilter();
 	
 	protected BuyListData()
diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/com/l2jmobius/gameserver/data/xml/impl/CastleData.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/com/l2jmobius/gameserver/data/xml/impl/CastleData.java
index 6618dcdf1d..792afbfa0b 100644
--- a/L2J_Mobius_Classic_2.3_SevenSigns/java/com/l2jmobius/gameserver/data/xml/impl/CastleData.java
+++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/com/l2jmobius/gameserver/data/xml/impl/CastleData.java
@@ -19,16 +19,16 @@ package com.l2jmobius.gameserver.data.xml.impl;
 import java.io.File;
 import java.util.ArrayList;
 import java.util.Collections;
-import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
+import java.util.concurrent.ConcurrentHashMap;
 import java.util.stream.Collectors;
 
 import org.w3c.dom.Document;
 import org.w3c.dom.NamedNodeMap;
 import org.w3c.dom.Node;
 
-import com.l2jmobius.commons.util.IGameXmlReader;
+import com.l2jmobius.commons.util.IXmlReader;
 import com.l2jmobius.gameserver.enums.CastleSide;
 import com.l2jmobius.gameserver.enums.SiegeGuardType;
 import com.l2jmobius.gameserver.model.holders.CastleSpawnHolder;
@@ -37,10 +37,10 @@ import com.l2jmobius.gameserver.model.holders.SiegeGuardHolder;
 /**
  * @author St3eT
  */
-public final class CastleData implements IGameXmlReader
+public final class CastleData implements IXmlReader
 {
-	private final Map<Integer, List<CastleSpawnHolder>> _spawns = new HashMap<>();
-	private static final Map<Integer, List<SiegeGuardHolder>> _siegeGuards = new HashMap<>();
+	private final Map<Integer, List<CastleSpawnHolder>> _spawns = new ConcurrentHashMap<>();
+	private static final Map<Integer, List<SiegeGuardHolder>> _siegeGuards = new ConcurrentHashMap<>();
 	
 	protected CastleData()
 	{
diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/com/l2jmobius/gameserver/data/xml/impl/CategoryData.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/com/l2jmobius/gameserver/data/xml/impl/CategoryData.java
index f851aa6703..df7d390dfb 100644
--- a/L2J_Mobius_Classic_2.3_SevenSigns/java/com/l2jmobius/gameserver/data/xml/impl/CategoryData.java
+++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/com/l2jmobius/gameserver/data/xml/impl/CategoryData.java
@@ -27,14 +27,14 @@ import org.w3c.dom.Document;
 import org.w3c.dom.NamedNodeMap;
 import org.w3c.dom.Node;
 
-import com.l2jmobius.commons.util.IGameXmlReader;
+import com.l2jmobius.commons.util.IXmlReader;
 import com.l2jmobius.gameserver.enums.CategoryType;
 
 /**
  * Loads the category data with Class or NPC IDs.
  * @author NosBit, xban1x
  */
-public final class CategoryData implements IGameXmlReader
+public final class CategoryData implements IXmlReader
 {
 	private static final Logger LOGGER = Logger.getLogger(CategoryData.class.getName());
 	
diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/com/l2jmobius/gameserver/data/xml/impl/ClanHallData.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/com/l2jmobius/gameserver/data/xml/impl/ClanHallData.java
index 511cc7f4f7..90a1a51029 100644
--- a/L2J_Mobius_Classic_2.3_SevenSigns/java/com/l2jmobius/gameserver/data/xml/impl/ClanHallData.java
+++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/com/l2jmobius/gameserver/data/xml/impl/ClanHallData.java
@@ -20,9 +20,9 @@ import java.io.File;
 import java.util.ArrayList;
 import java.util.Collection;
 import java.util.Comparator;
-import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
+import java.util.concurrent.ConcurrentHashMap;
 import java.util.logging.Logger;
 import java.util.stream.Collectors;
 
@@ -30,7 +30,7 @@ import org.w3c.dom.Document;
 import org.w3c.dom.NamedNodeMap;
 import org.w3c.dom.Node;
 
-import com.l2jmobius.commons.util.IGameXmlReader;
+import com.l2jmobius.commons.util.IXmlReader;
 import com.l2jmobius.gameserver.enums.ClanHallGrade;
 import com.l2jmobius.gameserver.enums.ClanHallType;
 import com.l2jmobius.gameserver.model.Location;
@@ -43,10 +43,10 @@ import com.l2jmobius.gameserver.model.holders.ClanHallTeleportHolder;
 /**
  * @author St3eT
  */
-public final class ClanHallData implements IGameXmlReader
+public final class ClanHallData implements IXmlReader
 {
 	private static final Logger LOGGER = Logger.getLogger(ClanHallData.class.getName());
-	private static final Map<Integer, ClanHall> _clanHalls = new HashMap<>();
+	private static final Map<Integer, ClanHall> _clanHalls = new ConcurrentHashMap<>();
 	
 	protected ClanHallData()
 	{
diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/com/l2jmobius/gameserver/data/xml/impl/ClanRewardData.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/com/l2jmobius/gameserver/data/xml/impl/ClanRewardData.java
index 252bba1c64..d5938ee964 100644
--- a/L2J_Mobius_Classic_2.3_SevenSigns/java/com/l2jmobius/gameserver/data/xml/impl/ClanRewardData.java
+++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/com/l2jmobius/gameserver/data/xml/impl/ClanRewardData.java
@@ -28,7 +28,6 @@ import org.w3c.dom.Document;
 import org.w3c.dom.NamedNodeMap;
 import org.w3c.dom.Node;
 
-import com.l2jmobius.commons.util.IGameXmlReader;
 import com.l2jmobius.commons.util.IXmlReader;
 import com.l2jmobius.gameserver.enums.ClanRewardType;
 import com.l2jmobius.gameserver.model.clan.ClanRewardBonus;
@@ -38,7 +37,7 @@ import com.l2jmobius.gameserver.model.holders.SkillHolder;
 /**
  * @author UnAfraid
  */
-public class ClanRewardData implements IGameXmlReader
+public class ClanRewardData implements IXmlReader
 {
 	private static final Logger LOGGER = Logger.getLogger(ClanRewardData.class.getName());
 	private final Map<ClanRewardType, List<ClanRewardBonus>> _clanRewards = new ConcurrentHashMap<>();
diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/com/l2jmobius/gameserver/data/xml/impl/ClassListData.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/com/l2jmobius/gameserver/data/xml/impl/ClassListData.java
index a40f726d50..6e99aeabfa 100644
--- a/L2J_Mobius_Classic_2.3_SevenSigns/java/com/l2jmobius/gameserver/data/xml/impl/ClassListData.java
+++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/com/l2jmobius/gameserver/data/xml/impl/ClassListData.java
@@ -17,15 +17,15 @@
 package com.l2jmobius.gameserver.data.xml.impl;
 
 import java.io.File;
-import java.util.HashMap;
 import java.util.Map;
+import java.util.concurrent.ConcurrentHashMap;
 import java.util.logging.Logger;
 
 import org.w3c.dom.Document;
 import org.w3c.dom.NamedNodeMap;
 import org.w3c.dom.Node;
 
-import com.l2jmobius.commons.util.IGameXmlReader;
+import com.l2jmobius.commons.util.IXmlReader;
 import com.l2jmobius.gameserver.model.base.ClassId;
 import com.l2jmobius.gameserver.model.base.ClassInfo;
 
@@ -33,11 +33,11 @@ import com.l2jmobius.gameserver.model.base.ClassInfo;
  * Loads the the list of classes and it's info.
  * @author Zoey76
  */
-public final class ClassListData implements IGameXmlReader
+public final class ClassListData implements IXmlReader
 {
 	private static final Logger LOGGER = Logger.getLogger(ClassListData.class.getName());
 	
-	private final Map<ClassId, ClassInfo> _classData = new HashMap<>();
+	private final Map<ClassId, ClassInfo> _classData = new ConcurrentHashMap<>();
 	
 	/**
 	 * Instantiates a new class list data.
diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/com/l2jmobius/gameserver/data/xml/impl/CombinationItemsData.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/com/l2jmobius/gameserver/data/xml/impl/CombinationItemsData.java
index a7e90d5f89..c2ce205300 100644
--- a/L2J_Mobius_Classic_2.3_SevenSigns/java/com/l2jmobius/gameserver/data/xml/impl/CombinationItemsData.java
+++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/com/l2jmobius/gameserver/data/xml/impl/CombinationItemsData.java
@@ -24,7 +24,7 @@ import java.util.stream.Collectors;
 
 import org.w3c.dom.Document;
 
-import com.l2jmobius.commons.util.IGameXmlReader;
+import com.l2jmobius.commons.util.IXmlReader;
 import com.l2jmobius.gameserver.datatables.ItemTable;
 import com.l2jmobius.gameserver.model.StatsSet;
 import com.l2jmobius.gameserver.model.items.combination.CombinationItem;
@@ -34,7 +34,7 @@ import com.l2jmobius.gameserver.model.items.combination.CombinationItemType;
 /**
  * @author UnAfraid
  */
-public class CombinationItemsData implements IGameXmlReader
+public class CombinationItemsData implements IXmlReader
 {
 	private static final Logger LOGGER = Logger.getLogger(CombinationItemsData.class.getName());
 	private final List<CombinationItem> _items = new ArrayList<>();
diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/com/l2jmobius/gameserver/data/xml/impl/CubicData.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/com/l2jmobius/gameserver/data/xml/impl/CubicData.java
index f682509217..ef46a08a7f 100644
--- a/L2J_Mobius_Classic_2.3_SevenSigns/java/com/l2jmobius/gameserver/data/xml/impl/CubicData.java
+++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/com/l2jmobius/gameserver/data/xml/impl/CubicData.java
@@ -20,12 +20,12 @@ import java.io.File;
 import java.util.Collections;
 import java.util.HashMap;
 import java.util.Map;
+import java.util.concurrent.ConcurrentHashMap;
 import java.util.logging.Logger;
 
 import org.w3c.dom.Document;
 import org.w3c.dom.Node;
 
-import com.l2jmobius.commons.util.IGameXmlReader;
 import com.l2jmobius.commons.util.IXmlReader;
 import com.l2jmobius.gameserver.model.StatsSet;
 import com.l2jmobius.gameserver.model.actor.templates.CubicTemplate;
@@ -39,11 +39,11 @@ import com.l2jmobius.gameserver.model.cubic.conditions.RangeCondition;
 /**
  * @author UnAfraid
  */
-public class CubicData implements IGameXmlReader
+public class CubicData implements IXmlReader
 {
 	private static final Logger LOGGER = Logger.getLogger(CubicData.class.getName());
 	
-	private final Map<Integer, Map<Integer, CubicTemplate>> _cubics = new HashMap<>();
+	private final Map<Integer, Map<Integer, CubicTemplate>> _cubics = new ConcurrentHashMap<>();
 	
 	protected CubicData()
 	{
diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/com/l2jmobius/gameserver/data/xml/impl/DailyMissionData.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/com/l2jmobius/gameserver/data/xml/impl/DailyMissionData.java
index 53519f2492..1e275049d9 100644
--- a/L2J_Mobius_Classic_2.3_SevenSigns/java/com/l2jmobius/gameserver/data/xml/impl/DailyMissionData.java
+++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/com/l2jmobius/gameserver/data/xml/impl/DailyMissionData.java
@@ -27,7 +27,7 @@ import java.util.stream.Collectors;
 
 import org.w3c.dom.Document;
 
-import com.l2jmobius.commons.util.IGameXmlReader;
+import com.l2jmobius.commons.util.IXmlReader;
 import com.l2jmobius.gameserver.model.DailyMissionDataHolder;
 import com.l2jmobius.gameserver.model.StatsSet;
 import com.l2jmobius.gameserver.model.actor.instance.PlayerInstance;
@@ -37,7 +37,7 @@ import com.l2jmobius.gameserver.model.holders.ItemHolder;
 /**
  * @author Sdw
  */
-public class DailyMissionData implements IGameXmlReader
+public class DailyMissionData implements IXmlReader
 {
 	private static final Logger LOGGER = Logger.getLogger(DailyMissionData.class.getName());
 	private final Map<Integer, List<DailyMissionDataHolder>> _dailyMissionRewards = new LinkedHashMap<>();
diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/com/l2jmobius/gameserver/data/xml/impl/DoorData.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/com/l2jmobius/gameserver/data/xml/impl/DoorData.java
index e8b1ff7bfa..5dd43e98eb 100644
--- a/L2J_Mobius_Classic_2.3_SevenSigns/java/com/l2jmobius/gameserver/data/xml/impl/DoorData.java
+++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/com/l2jmobius/gameserver/data/xml/impl/DoorData.java
@@ -32,7 +32,6 @@ import org.w3c.dom.Document;
 import org.w3c.dom.NamedNodeMap;
 import org.w3c.dom.Node;
 
-import com.l2jmobius.commons.util.IGameXmlReader;
 import com.l2jmobius.commons.util.IXmlReader;
 import com.l2jmobius.gameserver.instancemanager.MapRegionManager;
 import com.l2jmobius.gameserver.model.Location;
@@ -45,7 +44,7 @@ import com.l2jmobius.gameserver.model.instancezone.Instance;
  * This class loads and hold info about doors.
  * @author JIV, GodKratos, UnAfraid
  */
-public final class DoorData implements IGameXmlReader
+public final class DoorData implements IXmlReader
 {
 	private static final Logger LOGGER = Logger.getLogger(DoorData.class.getName());
 	
diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/com/l2jmobius/gameserver/data/xml/impl/EnchantItemData.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/com/l2jmobius/gameserver/data/xml/impl/EnchantItemData.java
index 24e12d1218..342b4cde07 100644
--- a/L2J_Mobius_Classic_2.3_SevenSigns/java/com/l2jmobius/gameserver/data/xml/impl/EnchantItemData.java
+++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/com/l2jmobius/gameserver/data/xml/impl/EnchantItemData.java
@@ -25,7 +25,7 @@ import org.w3c.dom.Document;
 import org.w3c.dom.NamedNodeMap;
 import org.w3c.dom.Node;
 
-import com.l2jmobius.commons.util.IGameXmlReader;
+import com.l2jmobius.commons.util.IXmlReader;
 import com.l2jmobius.gameserver.model.StatsSet;
 import com.l2jmobius.gameserver.model.items.enchant.EnchantScroll;
 import com.l2jmobius.gameserver.model.items.enchant.EnchantSupportItem;
@@ -35,7 +35,7 @@ import com.l2jmobius.gameserver.model.items.instance.ItemInstance;
  * Loads item enchant data.
  * @author UnAfraid
  */
-public class EnchantItemData implements IGameXmlReader
+public class EnchantItemData implements IXmlReader
 {
 	private static final Logger LOGGER = Logger.getLogger(EnchantItemData.class.getName());
 	
diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/com/l2jmobius/gameserver/data/xml/impl/EnchantItemGroupsData.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/com/l2jmobius/gameserver/data/xml/impl/EnchantItemGroupsData.java
index 666d821e42..44582a7dd4 100644
--- a/L2J_Mobius_Classic_2.3_SevenSigns/java/com/l2jmobius/gameserver/data/xml/impl/EnchantItemGroupsData.java
+++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/com/l2jmobius/gameserver/data/xml/impl/EnchantItemGroupsData.java
@@ -25,7 +25,7 @@ import org.w3c.dom.Document;
 import org.w3c.dom.NamedNodeMap;
 import org.w3c.dom.Node;
 
-import com.l2jmobius.commons.util.IGameXmlReader;
+import com.l2jmobius.commons.util.IXmlReader;
 import com.l2jmobius.gameserver.datatables.ItemTable;
 import com.l2jmobius.gameserver.model.holders.RangeChanceHolder;
 import com.l2jmobius.gameserver.model.items.Item;
@@ -37,7 +37,7 @@ import com.l2jmobius.gameserver.util.Util;
 /**
  * @author UnAfraid
  */
-public final class EnchantItemGroupsData implements IGameXmlReader
+public final class EnchantItemGroupsData implements IXmlReader
 {
 	private static final Logger LOGGER = Logger.getLogger(EnchantItemGroupsData.class.getName());
 	
diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/com/l2jmobius/gameserver/data/xml/impl/EnchantItemHPBonusData.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/com/l2jmobius/gameserver/data/xml/impl/EnchantItemHPBonusData.java
index d2ce1096b5..868b1f95f6 100644
--- a/L2J_Mobius_Classic_2.3_SevenSigns/java/com/l2jmobius/gameserver/data/xml/impl/EnchantItemHPBonusData.java
+++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/com/l2jmobius/gameserver/data/xml/impl/EnchantItemHPBonusData.java
@@ -26,7 +26,7 @@ import java.util.logging.Logger;
 import org.w3c.dom.Document;
 import org.w3c.dom.Node;
 
-import com.l2jmobius.commons.util.IGameXmlReader;
+import com.l2jmobius.commons.util.IXmlReader;
 import com.l2jmobius.gameserver.model.items.Item;
 import com.l2jmobius.gameserver.model.items.instance.ItemInstance;
 import com.l2jmobius.gameserver.model.items.type.CrystalType;
@@ -35,7 +35,7 @@ import com.l2jmobius.gameserver.model.items.type.CrystalType;
  * This class holds the Enchant HP Bonus Data.
  * @author MrPoke, Zoey76
  */
-public class EnchantItemHPBonusData implements IGameXmlReader
+public class EnchantItemHPBonusData implements IXmlReader
 {
 	private static final Logger LOGGER = Logger.getLogger(EnchantItemHPBonusData.class.getName());
 	
diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/com/l2jmobius/gameserver/data/xml/impl/EnchantItemOptionsData.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/com/l2jmobius/gameserver/data/xml/impl/EnchantItemOptionsData.java
index f6e9946b94..b8d805132f 100644
--- a/L2J_Mobius_Classic_2.3_SevenSigns/java/com/l2jmobius/gameserver/data/xml/impl/EnchantItemOptionsData.java
+++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/com/l2jmobius/gameserver/data/xml/impl/EnchantItemOptionsData.java
@@ -24,7 +24,7 @@ import java.util.logging.Logger;
 import org.w3c.dom.Document;
 import org.w3c.dom.Node;
 
-import com.l2jmobius.commons.util.IGameXmlReader;
+import com.l2jmobius.commons.util.IXmlReader;
 import com.l2jmobius.gameserver.model.items.instance.ItemInstance;
 import com.l2jmobius.gameserver.model.options.EnchantOptions;
 import com.l2jmobius.gameserver.util.Util;
@@ -32,7 +32,7 @@ import com.l2jmobius.gameserver.util.Util;
 /**
  * @author UnAfraid
  */
-public class EnchantItemOptionsData implements IGameXmlReader
+public class EnchantItemOptionsData implements IXmlReader
 {
 	private static final Logger LOGGER = Logger.getLogger(EnchantItemOptionsData.class.getName());
 	
diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/com/l2jmobius/gameserver/data/xml/impl/EnchantSkillGroupsData.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/com/l2jmobius/gameserver/data/xml/impl/EnchantSkillGroupsData.java
index 0b557ced04..45127fe5f6 100644
--- a/L2J_Mobius_Classic_2.3_SevenSigns/java/com/l2jmobius/gameserver/data/xml/impl/EnchantSkillGroupsData.java
+++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/com/l2jmobius/gameserver/data/xml/impl/EnchantSkillGroupsData.java
@@ -18,16 +18,15 @@ package com.l2jmobius.gameserver.data.xml.impl;
 
 import java.io.File;
 import java.util.Collections;
-import java.util.HashMap;
 import java.util.HashSet;
-import java.util.LinkedHashMap;
 import java.util.Map;
 import java.util.Set;
+import java.util.concurrent.ConcurrentHashMap;
 import java.util.logging.Logger;
 
 import org.w3c.dom.Document;
 
-import com.l2jmobius.commons.util.IGameXmlReader;
+import com.l2jmobius.commons.util.IXmlReader;
 import com.l2jmobius.gameserver.enums.SkillEnchantType;
 import com.l2jmobius.gameserver.model.StatsSet;
 import com.l2jmobius.gameserver.model.holders.EnchantSkillHolder;
@@ -39,12 +38,12 @@ import com.l2jmobius.gameserver.model.skills.Skill;
  * This class holds the Enchant Groups information.
  * @author Micr0
  */
-public class EnchantSkillGroupsData implements IGameXmlReader
+public class EnchantSkillGroupsData implements IXmlReader
 {
 	private static final Logger LOGGER = Logger.getLogger(EnchantSkillGroupsData.class.getName());
 	
-	private final Map<Integer, EnchantSkillHolder> _enchantSkillHolders = new LinkedHashMap<>();
-	private final Map<SkillHolder, Set<Integer>> _enchantSkillTrees = new HashMap<>();
+	private final Map<Integer, EnchantSkillHolder> _enchantSkillHolders = new ConcurrentHashMap<>();
+	private final Map<SkillHolder, Set<Integer>> _enchantSkillTrees = new ConcurrentHashMap<>();
 	
 	public static int MAX_ENCHANT_LEVEL;
 	
diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/com/l2jmobius/gameserver/data/xml/impl/EnsoulData.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/com/l2jmobius/gameserver/data/xml/impl/EnsoulData.java
index 0881f3aaec..bea9592527 100644
--- a/L2J_Mobius_Classic_2.3_SevenSigns/java/com/l2jmobius/gameserver/data/xml/impl/EnsoulData.java
+++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/com/l2jmobius/gameserver/data/xml/impl/EnsoulData.java
@@ -19,16 +19,14 @@ package com.l2jmobius.gameserver.data.xml.impl;
 import java.io.File;
 import java.util.Collection;
 import java.util.Collections;
-import java.util.EnumMap;
-import java.util.HashMap;
 import java.util.Map;
+import java.util.concurrent.ConcurrentHashMap;
 import java.util.logging.Logger;
 
 import org.w3c.dom.Document;
 import org.w3c.dom.NamedNodeMap;
 import org.w3c.dom.Node;
 
-import com.l2jmobius.commons.util.IGameXmlReader;
 import com.l2jmobius.commons.util.IXmlReader;
 import com.l2jmobius.gameserver.model.ensoul.EnsoulFee;
 import com.l2jmobius.gameserver.model.ensoul.EnsoulOption;
@@ -39,12 +37,12 @@ import com.l2jmobius.gameserver.model.items.type.CrystalType;
 /**
  * @author UnAfraid
  */
-public class EnsoulData implements IGameXmlReader
+public class EnsoulData implements IXmlReader
 {
 	private static final Logger LOGGER = Logger.getLogger(EnsoulData.class.getName());
-	private final Map<CrystalType, EnsoulFee> _ensoulFees = new EnumMap<>(CrystalType.class);
-	private final Map<Integer, EnsoulOption> _ensoulOptions = new HashMap<>();
-	private final Map<Integer, EnsoulStone> _ensoulStones = new HashMap<>();
+	private final Map<CrystalType, EnsoulFee> _ensoulFees = new ConcurrentHashMap<>();
+	private final Map<Integer, EnsoulOption> _ensoulOptions = new ConcurrentHashMap<>();
+	private final Map<Integer, EnsoulStone> _ensoulStones = new ConcurrentHashMap<>();
 	
 	protected EnsoulData()
 	{
diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/com/l2jmobius/gameserver/data/xml/impl/EventEngineData.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/com/l2jmobius/gameserver/data/xml/impl/EventEngineData.java
index c43970ea31..144e2d5599 100644
--- a/L2J_Mobius_Classic_2.3_SevenSigns/java/com/l2jmobius/gameserver/data/xml/impl/EventEngineData.java
+++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/com/l2jmobius/gameserver/data/xml/impl/EventEngineData.java
@@ -32,7 +32,6 @@ import org.w3c.dom.Document;
 import org.w3c.dom.NamedNodeMap;
 import org.w3c.dom.Node;
 
-import com.l2jmobius.commons.util.IGameXmlReader;
 import com.l2jmobius.commons.util.IXmlReader;
 import com.l2jmobius.gameserver.model.Location;
 import com.l2jmobius.gameserver.model.StatsSet;
@@ -54,7 +53,7 @@ import com.l2jmobius.gameserver.model.holders.SkillHolder;
 /**
  * @author UnAfraid
  */
-public final class EventEngineData implements IGameXmlReader
+public final class EventEngineData implements IXmlReader
 {
 	private static final Logger LOGGER = Logger.getLogger(EventEngineData.class.getName());
 	
diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/com/l2jmobius/gameserver/data/xml/impl/ExperienceData.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/com/l2jmobius/gameserver/data/xml/impl/ExperienceData.java
index 2daaf16220..ea9d13c2aa 100644
--- a/L2J_Mobius_Classic_2.3_SevenSigns/java/com/l2jmobius/gameserver/data/xml/impl/ExperienceData.java
+++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/com/l2jmobius/gameserver/data/xml/impl/ExperienceData.java
@@ -26,13 +26,13 @@ import org.w3c.dom.NamedNodeMap;
 import org.w3c.dom.Node;
 
 import com.l2jmobius.Config;
-import com.l2jmobius.commons.util.IGameXmlReader;
+import com.l2jmobius.commons.util.IXmlReader;
 
 /**
  * This class holds the Experience points for each level for players and pets.
  * @author mrTJO
  */
-public final class ExperienceData implements IGameXmlReader
+public final class ExperienceData implements IXmlReader
 {
 	private static final Logger LOGGER = Logger.getLogger(ExperienceData.class.getName());
 	
diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/com/l2jmobius/gameserver/data/xml/impl/ExtendDropData.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/com/l2jmobius/gameserver/data/xml/impl/ExtendDropData.java
index 00af3a4f77..09da39ad14 100644
--- a/L2J_Mobius_Classic_2.3_SevenSigns/java/com/l2jmobius/gameserver/data/xml/impl/ExtendDropData.java
+++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/com/l2jmobius/gameserver/data/xml/impl/ExtendDropData.java
@@ -28,7 +28,7 @@ import java.util.logging.Logger;
 import org.w3c.dom.Document;
 import org.w3c.dom.Node;
 
-import com.l2jmobius.commons.util.IGameXmlReader;
+import com.l2jmobius.commons.util.IXmlReader;
 import com.l2jmobius.gameserver.handler.ConditionHandler;
 import com.l2jmobius.gameserver.model.StatsSet;
 import com.l2jmobius.gameserver.model.conditions.ICondition;
@@ -39,7 +39,7 @@ import com.l2jmobius.gameserver.network.SystemMessageId;
 /**
  * @author Sdw
  */
-public class ExtendDropData implements IGameXmlReader
+public class ExtendDropData implements IXmlReader
 {
 	private static final Logger LOGGER = Logger.getLogger(ExtendDropData.class.getName());
 	private final Map<Integer, ExtendDropDataHolder> _extendDrop = new HashMap<>();
diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/com/l2jmobius/gameserver/data/xml/impl/FakePlayerData.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/com/l2jmobius/gameserver/data/xml/impl/FakePlayerData.java
index afb92c06d5..74b7957fd9 100644
--- a/L2J_Mobius_Classic_2.3_SevenSigns/java/com/l2jmobius/gameserver/data/xml/impl/FakePlayerData.java
+++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/com/l2jmobius/gameserver/data/xml/impl/FakePlayerData.java
@@ -26,7 +26,7 @@ import java.util.logging.Logger;
 import org.w3c.dom.Document;
 
 import com.l2jmobius.Config;
-import com.l2jmobius.commons.util.IGameXmlReader;
+import com.l2jmobius.commons.util.IXmlReader;
 import com.l2jmobius.gameserver.data.sql.impl.CharNameTable;
 import com.l2jmobius.gameserver.model.StatsSet;
 import com.l2jmobius.gameserver.model.actor.templates.NpcTemplate;
@@ -35,7 +35,7 @@ import com.l2jmobius.gameserver.model.holders.FakePlayerHolder;
 /**
  * @author Mobius
  */
-public class FakePlayerData implements IGameXmlReader
+public class FakePlayerData implements IXmlReader
 {
 	private static Logger LOGGER = Logger.getLogger(FakePlayerData.class.getName());
 	
diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/com/l2jmobius/gameserver/data/xml/impl/FenceData.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/com/l2jmobius/gameserver/data/xml/impl/FenceData.java
index f51175e5fa..d36ab2e16b 100644
--- a/L2J_Mobius_Classic_2.3_SevenSigns/java/com/l2jmobius/gameserver/data/xml/impl/FenceData.java
+++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/com/l2jmobius/gameserver/data/xml/impl/FenceData.java
@@ -28,7 +28,7 @@ import java.util.logging.Logger;
 import org.w3c.dom.Document;
 import org.w3c.dom.Node;
 
-import com.l2jmobius.commons.util.IGameXmlReader;
+import com.l2jmobius.commons.util.IXmlReader;
 import com.l2jmobius.gameserver.enums.FenceState;
 import com.l2jmobius.gameserver.model.StatsSet;
 import com.l2jmobius.gameserver.model.World;
@@ -39,7 +39,7 @@ import com.l2jmobius.gameserver.model.instancezone.Instance;
 /**
  * @author HoridoJoho / FBIagent
  */
-public final class FenceData implements IGameXmlReader
+public final class FenceData implements IXmlReader
 {
 	private static final Logger LOGGER = Logger.getLogger(FenceData.class.getSimpleName());
 	
diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/com/l2jmobius/gameserver/data/xml/impl/FishingData.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/com/l2jmobius/gameserver/data/xml/impl/FishingData.java
index bacf1ed08c..16436a2f5c 100644
--- a/L2J_Mobius_Classic_2.3_SevenSigns/java/com/l2jmobius/gameserver/data/xml/impl/FishingData.java
+++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/com/l2jmobius/gameserver/data/xml/impl/FishingData.java
@@ -26,7 +26,7 @@ import org.w3c.dom.NamedNodeMap;
 import org.w3c.dom.Node;
 
 import com.l2jmobius.Config;
-import com.l2jmobius.commons.util.IGameXmlReader;
+import com.l2jmobius.commons.util.IXmlReader;
 import com.l2jmobius.gameserver.datatables.ItemTable;
 import com.l2jmobius.gameserver.model.fishing.FishingBait;
 import com.l2jmobius.gameserver.model.fishing.FishingCatch;
@@ -36,7 +36,7 @@ import com.l2jmobius.gameserver.model.fishing.FishingRod;
  * This class holds the Fishing information.
  * @author bit
  */
-public final class FishingData implements IGameXmlReader
+public final class FishingData implements IXmlReader
 {
 	private static final Logger LOGGER = Logger.getLogger(FishingData.class.getName());
 	private final Map<Integer, FishingBait> _baitData = new HashMap<>();
diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/com/l2jmobius/gameserver/data/xml/impl/HennaData.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/com/l2jmobius/gameserver/data/xml/impl/HennaData.java
index e27e186193..d3ac163f3c 100644
--- a/L2J_Mobius_Classic_2.3_SevenSigns/java/com/l2jmobius/gameserver/data/xml/impl/HennaData.java
+++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/com/l2jmobius/gameserver/data/xml/impl/HennaData.java
@@ -27,7 +27,7 @@ import org.w3c.dom.Document;
 import org.w3c.dom.NamedNodeMap;
 import org.w3c.dom.Node;
 
-import com.l2jmobius.commons.util.IGameXmlReader;
+import com.l2jmobius.commons.util.IXmlReader;
 import com.l2jmobius.gameserver.model.StatsSet;
 import com.l2jmobius.gameserver.model.base.ClassId;
 import com.l2jmobius.gameserver.model.items.Henna;
@@ -40,7 +40,7 @@ import com.l2jmobius.gameserver.model.skills.Skill;
  * Allowed classes to wear each henna.
  * @author Zoey76, Mobius
  */
-public final class HennaData implements IGameXmlReader
+public final class HennaData implements IXmlReader
 {
 	private static final Logger LOGGER = Logger.getLogger(HennaData.class.getName());
 	
diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/com/l2jmobius/gameserver/data/xml/impl/HitConditionBonusData.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/com/l2jmobius/gameserver/data/xml/impl/HitConditionBonusData.java
index e9f2f9a87d..2d6ccf0467 100644
--- a/L2J_Mobius_Classic_2.3_SevenSigns/java/com/l2jmobius/gameserver/data/xml/impl/HitConditionBonusData.java
+++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/com/l2jmobius/gameserver/data/xml/impl/HitConditionBonusData.java
@@ -23,7 +23,7 @@ import org.w3c.dom.Document;
 import org.w3c.dom.NamedNodeMap;
 import org.w3c.dom.Node;
 
-import com.l2jmobius.commons.util.IGameXmlReader;
+import com.l2jmobius.commons.util.IXmlReader;
 import com.l2jmobius.gameserver.GameTimeController;
 import com.l2jmobius.gameserver.enums.Position;
 import com.l2jmobius.gameserver.model.actor.Creature;
@@ -32,7 +32,7 @@ import com.l2jmobius.gameserver.model.actor.Creature;
  * This class load, holds and calculates the hit condition bonuses.
  * @author Nik
  */
-public final class HitConditionBonusData implements IGameXmlReader
+public final class HitConditionBonusData implements IXmlReader
 {
 	private static final Logger LOGGER = Logger.getLogger(HitConditionBonusData.class.getName());
 	
diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/com/l2jmobius/gameserver/data/xml/impl/InitialEquipmentData.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/com/l2jmobius/gameserver/data/xml/impl/InitialEquipmentData.java
index 247ea4b46d..275a23f28f 100644
--- a/L2J_Mobius_Classic_2.3_SevenSigns/java/com/l2jmobius/gameserver/data/xml/impl/InitialEquipmentData.java
+++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/com/l2jmobius/gameserver/data/xml/impl/InitialEquipmentData.java
@@ -28,7 +28,7 @@ import org.w3c.dom.NamedNodeMap;
 import org.w3c.dom.Node;
 
 import com.l2jmobius.Config;
-import com.l2jmobius.commons.util.IGameXmlReader;
+import com.l2jmobius.commons.util.IXmlReader;
 import com.l2jmobius.gameserver.model.StatsSet;
 import com.l2jmobius.gameserver.model.base.ClassId;
 import com.l2jmobius.gameserver.model.items.PlayerItemTemplate;
@@ -38,7 +38,7 @@ import com.l2jmobius.gameserver.model.items.PlayerItemTemplate;
  * What items get each newly created character and if this item is equipped upon creation (<b>Requires the item to be equippable</b>).
  * @author Zoey76
  */
-public final class InitialEquipmentData implements IGameXmlReader
+public final class InitialEquipmentData implements IXmlReader
 {
 	private static final Logger LOGGER = Logger.getLogger(InitialEquipmentData.class.getName());
 	
diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/com/l2jmobius/gameserver/data/xml/impl/InitialShortcutData.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/com/l2jmobius/gameserver/data/xml/impl/InitialShortcutData.java
index 5f886bafa8..3b9e976607 100644
--- a/L2J_Mobius_Classic_2.3_SevenSigns/java/com/l2jmobius/gameserver/data/xml/impl/InitialShortcutData.java
+++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/com/l2jmobius/gameserver/data/xml/impl/InitialShortcutData.java
@@ -27,7 +27,7 @@ import org.w3c.dom.Document;
 import org.w3c.dom.NamedNodeMap;
 import org.w3c.dom.Node;
 
-import com.l2jmobius.commons.util.IGameXmlReader;
+import com.l2jmobius.commons.util.IXmlReader;
 import com.l2jmobius.gameserver.enums.MacroType;
 import com.l2jmobius.gameserver.enums.ShortcutType;
 import com.l2jmobius.gameserver.model.Macro;
@@ -43,7 +43,7 @@ import com.l2jmobius.gameserver.network.serverpackets.ShortCutRegister;
  * What shortcuts get each newly created character.
  * @author Zoey76
  */
-public final class InitialShortcutData implements IGameXmlReader
+public final class InitialShortcutData implements IXmlReader
 {
 	private static final Logger LOGGER = Logger.getLogger(InitialShortcutData.class.getName());
 	
diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/com/l2jmobius/gameserver/data/xml/impl/ItemCrystallizationData.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/com/l2jmobius/gameserver/data/xml/impl/ItemCrystallizationData.java
index 86454b2b71..aa7742afa1 100644
--- a/L2J_Mobius_Classic_2.3_SevenSigns/java/com/l2jmobius/gameserver/data/xml/impl/ItemCrystallizationData.java
+++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/com/l2jmobius/gameserver/data/xml/impl/ItemCrystallizationData.java
@@ -28,7 +28,7 @@ import org.w3c.dom.Document;
 import org.w3c.dom.NamedNodeMap;
 import org.w3c.dom.Node;
 
-import com.l2jmobius.commons.util.IGameXmlReader;
+import com.l2jmobius.commons.util.IXmlReader;
 import com.l2jmobius.gameserver.datatables.ItemTable;
 import com.l2jmobius.gameserver.enums.CrystallizationType;
 import com.l2jmobius.gameserver.model.holders.CrystallizationDataHolder;
@@ -42,7 +42,7 @@ import com.l2jmobius.gameserver.model.items.type.CrystalType;
 /**
  * @author UnAfraid
  */
-public final class ItemCrystallizationData implements IGameXmlReader
+public final class ItemCrystallizationData implements IXmlReader
 {
 	private static final Logger LOGGER = Logger.getLogger(ItemCrystallizationData.class.getName());
 	
diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/com/l2jmobius/gameserver/data/xml/impl/KarmaData.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/com/l2jmobius/gameserver/data/xml/impl/KarmaData.java
index ca826eba2e..bd68c38748 100644
--- a/L2J_Mobius_Classic_2.3_SevenSigns/java/com/l2jmobius/gameserver/data/xml/impl/KarmaData.java
+++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/com/l2jmobius/gameserver/data/xml/impl/KarmaData.java
@@ -26,12 +26,12 @@ import org.w3c.dom.NamedNodeMap;
 import org.w3c.dom.Node;
 
 import com.l2jmobius.Config;
-import com.l2jmobius.commons.util.IGameXmlReader;
+import com.l2jmobius.commons.util.IXmlReader;
 
 /**
  * @author UnAfraid
  */
-public class KarmaData implements IGameXmlReader
+public class KarmaData implements IXmlReader
 {
 	private static final Logger LOGGER = Logger.getLogger(KarmaData.class.getName());
 	
diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/com/l2jmobius/gameserver/data/xml/impl/LuckyGameData.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/com/l2jmobius/gameserver/data/xml/impl/LuckyGameData.java
index 6759bfec3f..41c0d0fc31 100644
--- a/L2J_Mobius_Classic_2.3_SevenSigns/java/com/l2jmobius/gameserver/data/xml/impl/LuckyGameData.java
+++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/com/l2jmobius/gameserver/data/xml/impl/LuckyGameData.java
@@ -23,7 +23,7 @@ import java.util.concurrent.atomic.AtomicInteger;
 
 import org.w3c.dom.Document;
 
-import com.l2jmobius.commons.util.IGameXmlReader;
+import com.l2jmobius.commons.util.IXmlReader;
 import com.l2jmobius.gameserver.model.StatsSet;
 import com.l2jmobius.gameserver.model.holders.ItemChanceHolder;
 import com.l2jmobius.gameserver.model.holders.ItemPointHolder;
@@ -32,7 +32,7 @@ import com.l2jmobius.gameserver.model.holders.LuckyGameDataHolder;
 /**
  * @author Sdw
  */
-public class LuckyGameData implements IGameXmlReader
+public class LuckyGameData implements IXmlReader
 {
 	private final Map<Integer, LuckyGameDataHolder> _luckyGame = new HashMap<>();
 	private final AtomicInteger _serverPlay = new AtomicInteger();
diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/com/l2jmobius/gameserver/data/xml/impl/MultisellData.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/com/l2jmobius/gameserver/data/xml/impl/MultisellData.java
index 796cd9b6f1..e9c494b91e 100644
--- a/L2J_Mobius_Classic_2.3_SevenSigns/java/com/l2jmobius/gameserver/data/xml/impl/MultisellData.java
+++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/com/l2jmobius/gameserver/data/xml/impl/MultisellData.java
@@ -19,11 +19,11 @@ package com.l2jmobius.gameserver.data.xml.impl;
 import java.io.File;
 import java.io.FileFilter;
 import java.util.ArrayList;
-import java.util.HashMap;
 import java.util.HashSet;
 import java.util.List;
 import java.util.Map;
 import java.util.Set;
+import java.util.concurrent.ConcurrentHashMap;
 import java.util.logging.Level;
 import java.util.logging.Logger;
 
@@ -31,7 +31,7 @@ import org.w3c.dom.Document;
 import org.w3c.dom.Node;
 
 import com.l2jmobius.Config;
-import com.l2jmobius.commons.util.IGameXmlReader;
+import com.l2jmobius.commons.util.IXmlReader;
 import com.l2jmobius.commons.util.file.filter.NumericNameFilter;
 import com.l2jmobius.gameserver.datatables.ItemTable;
 import com.l2jmobius.gameserver.enums.SpecialItemType;
@@ -46,14 +46,14 @@ import com.l2jmobius.gameserver.model.holders.PreparedMultisellListHolder;
 import com.l2jmobius.gameserver.model.items.Item;
 import com.l2jmobius.gameserver.network.serverpackets.MultiSellList;
 
-public final class MultisellData implements IGameXmlReader
+public final class MultisellData implements IXmlReader
 {
 	private static final Logger LOGGER = Logger.getLogger(MultisellData.class.getName());
 	
 	public static final int PAGE_SIZE = 40;
 	private static final FileFilter NUMERIC_FILTER = new NumericNameFilter();
 	
-	private final Map<Integer, MultisellListHolder> _multisells = new HashMap<>();
+	private final Map<Integer, MultisellListHolder> _multisells = new ConcurrentHashMap<>();
 	
 	protected MultisellData()
 	{
diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/com/l2jmobius/gameserver/data/xml/impl/NpcData.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/com/l2jmobius/gameserver/data/xml/impl/NpcData.java
index 277495ca9d..3bcdb58f40 100644
--- a/L2J_Mobius_Classic_2.3_SevenSigns/java/com/l2jmobius/gameserver/data/xml/impl/NpcData.java
+++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/com/l2jmobius/gameserver/data/xml/impl/NpcData.java
@@ -26,6 +26,8 @@ import java.util.List;
 import java.util.Map;
 import java.util.Map.Entry;
 import java.util.Set;
+import java.util.concurrent.ConcurrentHashMap;
+import java.util.concurrent.CopyOnWriteArrayList;
 import java.util.function.Predicate;
 import java.util.logging.Logger;
 import java.util.stream.Collectors;
@@ -36,7 +38,7 @@ import org.w3c.dom.Node;
 
 import com.l2jmobius.Config;
 import com.l2jmobius.commons.util.CommonUtil;
-import com.l2jmobius.commons.util.IGameXmlReader;
+import com.l2jmobius.commons.util.IXmlReader;
 import com.l2jmobius.gameserver.datatables.ItemTable;
 import com.l2jmobius.gameserver.enums.AISkillScope;
 import com.l2jmobius.gameserver.enums.DropType;
@@ -52,13 +54,13 @@ import com.l2jmobius.gameserver.model.skills.Skill;
  * NPC data parser.
  * @author NosBit
  */
-public class NpcData implements IGameXmlReader
+public class NpcData implements IXmlReader
 {
 	protected static final Logger LOGGER = Logger.getLogger(NpcData.class.getName());
 	
-	private final Map<Integer, NpcTemplate> _npcs = new HashMap<>();
-	private final Map<String, Integer> _clans = new HashMap<>();
-	private static final List<Integer> _masterMonsterIDs = new ArrayList<>();
+	private final Map<Integer, NpcTemplate> _npcs = new ConcurrentHashMap<>();
+	private final Map<String, Integer> _clans = new ConcurrentHashMap<>();
+	private static final List<Integer> _masterMonsterIDs = new CopyOnWriteArrayList<>();
 	
 	protected NpcData()
 	{
diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/com/l2jmobius/gameserver/data/xml/impl/OptionData.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/com/l2jmobius/gameserver/data/xml/impl/OptionData.java
index bffa2b107c..424e2b27ad 100644
--- a/L2J_Mobius_Classic_2.3_SevenSigns/java/com/l2jmobius/gameserver/data/xml/impl/OptionData.java
+++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/com/l2jmobius/gameserver/data/xml/impl/OptionData.java
@@ -18,13 +18,12 @@ package com.l2jmobius.gameserver.data.xml.impl;
 
 import java.io.File;
 import java.util.Collections;
-import java.util.HashMap;
 import java.util.Map;
+import java.util.concurrent.ConcurrentHashMap;
 import java.util.logging.Logger;
 
 import org.w3c.dom.Document;
 
-import com.l2jmobius.commons.util.IGameXmlReader;
 import com.l2jmobius.commons.util.IXmlReader;
 import com.l2jmobius.gameserver.handler.EffectHandler;
 import com.l2jmobius.gameserver.model.StatsSet;
@@ -36,11 +35,11 @@ import com.l2jmobius.gameserver.model.options.OptionsSkillType;
 /**
  * @author UnAfraid
  */
-public class OptionData implements IGameXmlReader
+public class OptionData implements IXmlReader
 {
 	private static final Logger LOGGER = Logger.getLogger(OptionData.class.getName());
 	
-	private final Map<Integer, Options> _optionData = new HashMap<>();
+	private final Map<Integer, Options> _optionData = new ConcurrentHashMap<>();
 	
 	protected OptionData()
 	{
diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/com/l2jmobius/gameserver/data/xml/impl/PetDataTable.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/com/l2jmobius/gameserver/data/xml/impl/PetDataTable.java
index 65afb75d7d..aa6975cd72 100644
--- a/L2J_Mobius_Classic_2.3_SevenSigns/java/com/l2jmobius/gameserver/data/xml/impl/PetDataTable.java
+++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/com/l2jmobius/gameserver/data/xml/impl/PetDataTable.java
@@ -17,15 +17,15 @@
 package com.l2jmobius.gameserver.data.xml.impl;
 
 import java.io.File;
-import java.util.HashMap;
 import java.util.Map;
+import java.util.concurrent.ConcurrentHashMap;
 import java.util.logging.Logger;
 
 import org.w3c.dom.Document;
 import org.w3c.dom.NamedNodeMap;
 import org.w3c.dom.Node;
 
-import com.l2jmobius.commons.util.IGameXmlReader;
+import com.l2jmobius.commons.util.IXmlReader;
 import com.l2jmobius.gameserver.enums.MountType;
 import com.l2jmobius.gameserver.model.PetData;
 import com.l2jmobius.gameserver.model.PetLevelData;
@@ -36,11 +36,11 @@ import com.l2jmobius.gameserver.model.StatsSet;
  * TODO: load and use all pet parameters.
  * @author Zoey76 (rework)
  */
-public final class PetDataTable implements IGameXmlReader
+public final class PetDataTable implements IXmlReader
 {
 	private static final Logger LOGGER = Logger.getLogger(PetDataTable.class.getName());
 	
-	private final Map<Integer, PetData> _pets = new HashMap<>();
+	private final Map<Integer, PetData> _pets = new ConcurrentHashMap<>();
 	
 	/**
 	 * Instantiates a new pet data table.
diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/com/l2jmobius/gameserver/data/xml/impl/PetSkillData.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/com/l2jmobius/gameserver/data/xml/impl/PetSkillData.java
index 4872dde773..5b2f9a4408 100644
--- a/L2J_Mobius_Classic_2.3_SevenSigns/java/com/l2jmobius/gameserver/data/xml/impl/PetSkillData.java
+++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/com/l2jmobius/gameserver/data/xml/impl/PetSkillData.java
@@ -27,14 +27,14 @@ import org.w3c.dom.Document;
 import org.w3c.dom.NamedNodeMap;
 import org.w3c.dom.Node;
 
-import com.l2jmobius.commons.util.IGameXmlReader;
+import com.l2jmobius.commons.util.IXmlReader;
 import com.l2jmobius.gameserver.model.actor.Summon;
 import com.l2jmobius.gameserver.model.holders.SkillHolder;
 
 /**
  * @author Mobius
  */
-public class PetSkillData implements IGameXmlReader
+public class PetSkillData implements IXmlReader
 {
 	private static Logger LOGGER = Logger.getLogger(PetSkillData.class.getName());
 	private final Map<Integer, Map<Long, SkillHolder>> _skillTrees = new HashMap<>();
diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/com/l2jmobius/gameserver/data/xml/impl/PlayerTemplateData.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/com/l2jmobius/gameserver/data/xml/impl/PlayerTemplateData.java
index 031fab8027..7a7c230b72 100644
--- a/L2J_Mobius_Classic_2.3_SevenSigns/java/com/l2jmobius/gameserver/data/xml/impl/PlayerTemplateData.java
+++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/com/l2jmobius/gameserver/data/xml/impl/PlayerTemplateData.java
@@ -18,9 +18,9 @@ package com.l2jmobius.gameserver.data.xml.impl;
 
 import java.io.File;
 import java.util.ArrayList;
-import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
+import java.util.concurrent.ConcurrentHashMap;
 import java.util.logging.Logger;
 
 import org.w3c.dom.Document;
@@ -28,7 +28,7 @@ import org.w3c.dom.NamedNodeMap;
 import org.w3c.dom.Node;
 
 import com.l2jmobius.Config;
-import com.l2jmobius.commons.util.IGameXmlReader;
+import com.l2jmobius.commons.util.IXmlReader;
 import com.l2jmobius.gameserver.model.Location;
 import com.l2jmobius.gameserver.model.StatsSet;
 import com.l2jmobius.gameserver.model.actor.templates.PlayerTemplate;
@@ -38,11 +38,11 @@ import com.l2jmobius.gameserver.model.base.ClassId;
  * Loads player's base stats.
  * @author Forsaiken, Zoey76, GKR
  */
-public final class PlayerTemplateData implements IGameXmlReader
+public final class PlayerTemplateData implements IXmlReader
 {
 	private static final Logger LOGGER = Logger.getLogger(PlayerTemplateData.class.getName());
 	
-	private final Map<ClassId, PlayerTemplate> _playerTemplates = new HashMap<>();
+	private final Map<ClassId, PlayerTemplate> _playerTemplates = new ConcurrentHashMap<>();
 	
 	private int _dataCount = 0;
 	private int _autoGeneratedCount = 0;
diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/com/l2jmobius/gameserver/data/xml/impl/PlayerXpPercentLostData.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/com/l2jmobius/gameserver/data/xml/impl/PlayerXpPercentLostData.java
index 2b867a18e4..816cb7aacf 100644
--- a/L2J_Mobius_Classic_2.3_SevenSigns/java/com/l2jmobius/gameserver/data/xml/impl/PlayerXpPercentLostData.java
+++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/com/l2jmobius/gameserver/data/xml/impl/PlayerXpPercentLostData.java
@@ -24,13 +24,13 @@ import org.w3c.dom.Document;
 import org.w3c.dom.NamedNodeMap;
 import org.w3c.dom.Node;
 
-import com.l2jmobius.commons.util.IGameXmlReader;
+import com.l2jmobius.commons.util.IXmlReader;
 
 /**
  * This class holds the Player Xp Percent Lost Data for each level for players.
  * @author Zealar
  */
-public final class PlayerXpPercentLostData implements IGameXmlReader
+public final class PlayerXpPercentLostData implements IXmlReader
 {
 	private static final Logger LOGGER = Logger.getLogger(PlayerXpPercentLostData.class.getName());
 	
diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/com/l2jmobius/gameserver/data/xml/impl/PrimeShopData.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/com/l2jmobius/gameserver/data/xml/impl/PrimeShopData.java
index 82ddd51f26..650d156194 100644
--- a/L2J_Mobius_Classic_2.3_SevenSigns/java/com/l2jmobius/gameserver/data/xml/impl/PrimeShopData.java
+++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/com/l2jmobius/gameserver/data/xml/impl/PrimeShopData.java
@@ -27,7 +27,7 @@ import org.w3c.dom.Document;
 import org.w3c.dom.NamedNodeMap;
 import org.w3c.dom.Node;
 
-import com.l2jmobius.commons.util.IGameXmlReader;
+import com.l2jmobius.commons.util.IXmlReader;
 import com.l2jmobius.gameserver.datatables.ItemTable;
 import com.l2jmobius.gameserver.model.StatsSet;
 import com.l2jmobius.gameserver.model.actor.instance.PlayerInstance;
@@ -39,7 +39,7 @@ import com.l2jmobius.gameserver.network.serverpackets.primeshop.ExBRProductInfo;
 /**
  * @author Gnacik, UnAfraid
  */
-public class PrimeShopData implements IGameXmlReader
+public class PrimeShopData implements IXmlReader
 {
 	private static final Logger LOGGER = Logger.getLogger(PrimeShopData.class.getName());
 	
diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/com/l2jmobius/gameserver/data/xml/impl/RecipeData.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/com/l2jmobius/gameserver/data/xml/impl/RecipeData.java
index 9c035c1fde..54ce272bd2 100644
--- a/L2J_Mobius_Classic_2.3_SevenSigns/java/com/l2jmobius/gameserver/data/xml/impl/RecipeData.java
+++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/com/l2jmobius/gameserver/data/xml/impl/RecipeData.java
@@ -27,7 +27,7 @@ import org.w3c.dom.Document;
 import org.w3c.dom.NamedNodeMap;
 import org.w3c.dom.Node;
 
-import com.l2jmobius.commons.util.IGameXmlReader;
+import com.l2jmobius.commons.util.IXmlReader;
 import com.l2jmobius.gameserver.model.RecipeInstance;
 import com.l2jmobius.gameserver.model.RecipeList;
 import com.l2jmobius.gameserver.model.RecipeStatInstance;
@@ -38,7 +38,7 @@ import com.l2jmobius.gameserver.model.actor.instance.PlayerInstance;
  * The Class RecipeData.
  * @author Zoey76
  */
-public class RecipeData implements IGameXmlReader
+public class RecipeData implements IXmlReader
 {
 	private static final Logger LOGGER = Logger.getLogger(RecipeData.class.getName());
 	
diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/com/l2jmobius/gameserver/data/xml/impl/ResidenceFunctionsData.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/com/l2jmobius/gameserver/data/xml/impl/ResidenceFunctionsData.java
index 66951e9e59..094ef13149 100644
--- a/L2J_Mobius_Classic_2.3_SevenSigns/java/com/l2jmobius/gameserver/data/xml/impl/ResidenceFunctionsData.java
+++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/com/l2jmobius/gameserver/data/xml/impl/ResidenceFunctionsData.java
@@ -28,7 +28,7 @@ import org.w3c.dom.Document;
 import org.w3c.dom.NamedNodeMap;
 import org.w3c.dom.Node;
 
-import com.l2jmobius.commons.util.IGameXmlReader;
+import com.l2jmobius.commons.util.IXmlReader;
 import com.l2jmobius.gameserver.model.StatsSet;
 import com.l2jmobius.gameserver.model.residences.ResidenceFunctionTemplate;
 
@@ -36,7 +36,7 @@ import com.l2jmobius.gameserver.model.residences.ResidenceFunctionTemplate;
  * The residence functions data
  * @author UnAfraid
  */
-public final class ResidenceFunctionsData implements IGameXmlReader
+public final class ResidenceFunctionsData implements IXmlReader
 {
 	private static final Logger LOGGER = Logger.getLogger(ResidenceFunctionsData.class.getName());
 	private final Map<Integer, List<ResidenceFunctionTemplate>> _functions = new HashMap<>();
diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/com/l2jmobius/gameserver/data/xml/impl/SayuneData.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/com/l2jmobius/gameserver/data/xml/impl/SayuneData.java
index 835bd96930..13b4d33b1e 100644
--- a/L2J_Mobius_Classic_2.3_SevenSigns/java/com/l2jmobius/gameserver/data/xml/impl/SayuneData.java
+++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/com/l2jmobius/gameserver/data/xml/impl/SayuneData.java
@@ -26,13 +26,13 @@ import org.w3c.dom.Document;
 import org.w3c.dom.NamedNodeMap;
 import org.w3c.dom.Node;
 
-import com.l2jmobius.commons.util.IGameXmlReader;
+import com.l2jmobius.commons.util.IXmlReader;
 import com.l2jmobius.gameserver.model.SayuneEntry;
 
 /**
  * @author UnAfraid
  */
-public class SayuneData implements IGameXmlReader
+public class SayuneData implements IXmlReader
 {
 	private static final Logger LOGGER = Logger.getLogger(SayuneData.class.getName());
 	
diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/com/l2jmobius/gameserver/data/xml/impl/SecondaryAuthData.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/com/l2jmobius/gameserver/data/xml/impl/SecondaryAuthData.java
index c0ebd36146..ca85056b10 100644
--- a/L2J_Mobius_Classic_2.3_SevenSigns/java/com/l2jmobius/gameserver/data/xml/impl/SecondaryAuthData.java
+++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/com/l2jmobius/gameserver/data/xml/impl/SecondaryAuthData.java
@@ -25,12 +25,12 @@ import java.util.logging.Logger;
 import org.w3c.dom.Document;
 import org.w3c.dom.Node;
 
-import com.l2jmobius.commons.util.IGameXmlReader;
+import com.l2jmobius.commons.util.IXmlReader;
 
 /**
  * @author NosBit
  */
-public class SecondaryAuthData implements IGameXmlReader
+public class SecondaryAuthData implements IXmlReader
 {
 	private static final Logger LOGGER = Logger.getLogger(SecondaryAuthData.class.getName());
 	
diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/com/l2jmobius/gameserver/data/xml/impl/ShuttleData.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/com/l2jmobius/gameserver/data/xml/impl/ShuttleData.java
index 9454d24d6b..ff26f4f409 100644
--- a/L2J_Mobius_Classic_2.3_SevenSigns/java/com/l2jmobius/gameserver/data/xml/impl/ShuttleData.java
+++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/com/l2jmobius/gameserver/data/xml/impl/ShuttleData.java
@@ -27,7 +27,7 @@ import org.w3c.dom.Document;
 import org.w3c.dom.NamedNodeMap;
 import org.w3c.dom.Node;
 
-import com.l2jmobius.commons.util.IGameXmlReader;
+import com.l2jmobius.commons.util.IXmlReader;
 import com.l2jmobius.gameserver.model.Location;
 import com.l2jmobius.gameserver.model.StatsSet;
 import com.l2jmobius.gameserver.model.VehiclePathPoint;
@@ -40,7 +40,7 @@ import com.l2jmobius.gameserver.model.shuttle.ShuttleStop;
 /**
  * @author UnAfraid
  */
-public final class ShuttleData implements IGameXmlReader
+public final class ShuttleData implements IXmlReader
 {
 	private static final Logger LOGGER = Logger.getLogger(ShuttleData.class.getName());
 	
diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/com/l2jmobius/gameserver/data/xml/impl/SiegeScheduleData.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/com/l2jmobius/gameserver/data/xml/impl/SiegeScheduleData.java
index 265bf7c528..6bff09010b 100644
--- a/L2J_Mobius_Classic_2.3_SevenSigns/java/com/l2jmobius/gameserver/data/xml/impl/SiegeScheduleData.java
+++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/com/l2jmobius/gameserver/data/xml/impl/SiegeScheduleData.java
@@ -27,7 +27,7 @@ import org.w3c.dom.Document;
 import org.w3c.dom.NamedNodeMap;
 import org.w3c.dom.Node;
 
-import com.l2jmobius.commons.util.IGameXmlReader;
+import com.l2jmobius.commons.util.IXmlReader;
 import com.l2jmobius.gameserver.model.SiegeScheduleDate;
 import com.l2jmobius.gameserver.model.StatsSet;
 import com.l2jmobius.gameserver.util.Util;
@@ -35,7 +35,7 @@ import com.l2jmobius.gameserver.util.Util;
 /**
  * @author UnAfraid
  */
-public class SiegeScheduleData implements IGameXmlReader
+public class SiegeScheduleData implements IXmlReader
 {
 	private static final Logger LOGGER = Logger.getLogger(SiegeScheduleData.class.getName());
 	
diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/com/l2jmobius/gameserver/data/xml/impl/SkillData.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/com/l2jmobius/gameserver/data/xml/impl/SkillData.java
index 7a1ae2e15b..64900d4d45 100644
--- a/L2J_Mobius_Classic_2.3_SevenSigns/java/com/l2jmobius/gameserver/data/xml/impl/SkillData.java
+++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/com/l2jmobius/gameserver/data/xml/impl/SkillData.java
@@ -25,6 +25,7 @@ import java.util.List;
 import java.util.Map;
 import java.util.Optional;
 import java.util.Set;
+import java.util.concurrent.ConcurrentHashMap;
 import java.util.function.BiConsumer;
 import java.util.function.Function;
 import java.util.logging.Level;
@@ -35,7 +36,7 @@ import org.w3c.dom.Document;
 import org.w3c.dom.NamedNodeMap;
 import org.w3c.dom.Node;
 
-import com.l2jmobius.commons.util.IGameXmlReader;
+import com.l2jmobius.commons.util.IXmlReader;
 import com.l2jmobius.gameserver.handler.EffectHandler;
 import com.l2jmobius.gameserver.handler.SkillConditionHandler;
 import com.l2jmobius.gameserver.model.StatsSet;
@@ -51,12 +52,12 @@ import com.l2jmobius.gameserver.util.exp4j.ExpressionBuilder;
  * Skill data parser.
  * @author NosBit
  */
-public class SkillData implements IGameXmlReader
+public class SkillData implements IXmlReader
 {
 	private static final Logger LOGGER = Logger.getLogger(SkillData.class.getName());
 	
-	private final Map<Long, Skill> _skills = new HashMap<>();
-	private final Map<Integer, Integer> _skillsMaxLevel = new HashMap<>();
+	private final Map<Long, Skill> _skills = new ConcurrentHashMap<>();
+	private final Map<Integer, Integer> _skillsMaxLevel = new ConcurrentHashMap<>();
 	
 	private class NamedParamInfo
 	{
diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/com/l2jmobius/gameserver/data/xml/impl/SkillTreesData.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/com/l2jmobius/gameserver/data/xml/impl/SkillTreesData.java
index 7f667059db..780e0a1d1c 100644
--- a/L2J_Mobius_Classic_2.3_SevenSigns/java/com/l2jmobius/gameserver/data/xml/impl/SkillTreesData.java
+++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/com/l2jmobius/gameserver/data/xml/impl/SkillTreesData.java
@@ -29,6 +29,7 @@ import java.util.List;
 import java.util.Map;
 import java.util.Map.Entry;
 import java.util.Set;
+import java.util.concurrent.ConcurrentHashMap;
 import java.util.concurrent.atomic.AtomicBoolean;
 import java.util.logging.Logger;
 import java.util.stream.Collectors;
@@ -38,7 +39,7 @@ import org.w3c.dom.NamedNodeMap;
 import org.w3c.dom.Node;
 
 import com.l2jmobius.Config;
-import com.l2jmobius.commons.util.IGameXmlReader;
+import com.l2jmobius.commons.util.IXmlReader;
 import com.l2jmobius.gameserver.enums.CategoryType;
 import com.l2jmobius.gameserver.enums.Race;
 import com.l2jmobius.gameserver.enums.SubclassType;
@@ -77,34 +78,34 @@ import com.l2jmobius.gameserver.model.skills.Skill;
  * For XML schema please refer to skillTrees.xsd in datapack in xsd folder and for parameters documentation refer to documentation.txt in skillTrees folder.<br>
  * @author Zoey76
  */
-public final class SkillTreesData implements IGameXmlReader
+public final class SkillTreesData implements IXmlReader
 {
 	private static final Logger LOGGER = Logger.getLogger(SkillTreesData.class.getName());
 	
 	// ClassId, Map of Skill Hash Code, SkillLearn
-	private static final Map<ClassId, Map<Long, SkillLearn>> _classSkillTrees = new HashMap<>();
-	private static final Map<ClassId, Map<Long, SkillLearn>> _transferSkillTrees = new HashMap<>();
-	private static final Map<Race, Map<Long, SkillLearn>> _raceSkillTree = new HashMap<>();
-	private static final Map<SubclassType, Map<Long, SkillLearn>> _revelationSkillTree = new HashMap<>();
-	private static final Map<ClassId, Set<Integer>> _awakeningSaveSkillTree = new HashMap<>();
+	private static final Map<ClassId, Map<Long, SkillLearn>> _classSkillTrees = new ConcurrentHashMap<>();
+	private static final Map<ClassId, Map<Long, SkillLearn>> _transferSkillTrees = new ConcurrentHashMap<>();
+	private static final Map<Race, Map<Long, SkillLearn>> _raceSkillTree = new ConcurrentHashMap<>();
+	private static final Map<SubclassType, Map<Long, SkillLearn>> _revelationSkillTree = new ConcurrentHashMap<>();
+	private static final Map<ClassId, Set<Integer>> _awakeningSaveSkillTree = new ConcurrentHashMap<>();
 	// Skill Hash Code, SkillLearn
-	private static final Map<Long, SkillLearn> _collectSkillTree = new HashMap<>();
-	private static final Map<Long, SkillLearn> _fishingSkillTree = new HashMap<>();
-	private static final Map<Long, SkillLearn> _pledgeSkillTree = new HashMap<>();
-	private static final Map<Long, SkillLearn> _subClassSkillTree = new HashMap<>();
-	private static final Map<Long, SkillLearn> _subPledgeSkillTree = new HashMap<>();
-	private static final Map<Long, SkillLearn> _transformSkillTree = new HashMap<>();
-	private static final Map<Long, SkillLearn> _commonSkillTree = new HashMap<>();
-	private static final Map<Long, SkillLearn> _abilitySkillTree = new HashMap<>();
-	private static final Map<Long, SkillLearn> _alchemySkillTree = new HashMap<>();
-	private static final Map<Long, SkillLearn> _dualClassSkillTree = new HashMap<>();
+	private static final Map<Long, SkillLearn> _collectSkillTree = new ConcurrentHashMap<>();
+	private static final Map<Long, SkillLearn> _fishingSkillTree = new ConcurrentHashMap<>();
+	private static final Map<Long, SkillLearn> _pledgeSkillTree = new ConcurrentHashMap<>();
+	private static final Map<Long, SkillLearn> _subClassSkillTree = new ConcurrentHashMap<>();
+	private static final Map<Long, SkillLearn> _subPledgeSkillTree = new ConcurrentHashMap<>();
+	private static final Map<Long, SkillLearn> _transformSkillTree = new ConcurrentHashMap<>();
+	private static final Map<Long, SkillLearn> _commonSkillTree = new ConcurrentHashMap<>();
+	private static final Map<Long, SkillLearn> _abilitySkillTree = new ConcurrentHashMap<>();
+	private static final Map<Long, SkillLearn> _alchemySkillTree = new ConcurrentHashMap<>();
+	private static final Map<Long, SkillLearn> _dualClassSkillTree = new ConcurrentHashMap<>();
 	// Other skill trees
-	private static final Map<Long, SkillLearn> _nobleSkillTree = new HashMap<>();
-	private static final Map<Long, SkillLearn> _heroSkillTree = new HashMap<>();
-	private static final Map<Long, SkillLearn> _gameMasterSkillTree = new HashMap<>();
-	private static final Map<Long, SkillLearn> _gameMasterAuraSkillTree = new HashMap<>();
+	private static final Map<Long, SkillLearn> _nobleSkillTree = new ConcurrentHashMap<>();
+	private static final Map<Long, SkillLearn> _heroSkillTree = new ConcurrentHashMap<>();
+	private static final Map<Long, SkillLearn> _gameMasterSkillTree = new ConcurrentHashMap<>();
+	private static final Map<Long, SkillLearn> _gameMasterAuraSkillTree = new ConcurrentHashMap<>();
 	// Remove skill tree
-	private static final Map<ClassId, Set<Integer>> _removeSkillCache = new HashMap<>();
+	private static final Map<ClassId, Set<Integer>> _removeSkillCache = new ConcurrentHashMap<>();
 	
 	// Checker, sorted arrays of hash codes
 	private Map<Integer, long[]> _skillsByClassIdHashCodes; // Occupation skills
@@ -112,7 +113,7 @@ public final class SkillTreesData implements IGameXmlReader
 	private long[] _allSkillsHashCodes; // Fishing, Collection, Transformations, Common Skills.
 	
 	/** Parent class Ids are read from XML and stored in this map, to allow easy customization. */
-	private static final Map<ClassId, ClassId> _parentClassMap = new HashMap<>();
+	private static final Map<ClassId, ClassId> _parentClassMap = new ConcurrentHashMap<>();
 	
 	private final AtomicBoolean _isLoading = new AtomicBoolean();
 	
diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/com/l2jmobius/gameserver/data/xml/impl/SpawnsData.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/com/l2jmobius/gameserver/data/xml/impl/SpawnsData.java
index dc41b02109..806d00902a 100644
--- a/L2J_Mobius_Classic_2.3_SevenSigns/java/com/l2jmobius/gameserver/data/xml/impl/SpawnsData.java
+++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/com/l2jmobius/gameserver/data/xml/impl/SpawnsData.java
@@ -19,9 +19,10 @@ package com.l2jmobius.gameserver.data.xml.impl;
 import java.io.File;
 import java.util.ArrayList;
 import java.util.Collections;
-import java.util.LinkedList;
 import java.util.List;
 import java.util.Map;
+import java.util.concurrent.CopyOnWriteArrayList;
+import java.util.concurrent.ScheduledFuture;
 import java.util.function.Predicate;
 import java.util.logging.Level;
 import java.util.logging.Logger;
@@ -31,7 +32,7 @@ import org.w3c.dom.Document;
 import org.w3c.dom.Node;
 
 import com.l2jmobius.Config;
-import com.l2jmobius.commons.util.IGameXmlReader;
+import com.l2jmobius.commons.concurrent.ThreadPool;
 import com.l2jmobius.commons.util.IXmlReader;
 import com.l2jmobius.gameserver.model.ChanceLocation;
 import com.l2jmobius.gameserver.model.StatsSet;
@@ -49,11 +50,11 @@ import com.l2jmobius.gameserver.model.zone.type.SpawnTerritory;
 /**
  * @author UnAfraid
  */
-public class SpawnsData implements IGameXmlReader
+public class SpawnsData implements IXmlReader
 {
 	protected static final Logger LOGGER = Logger.getLogger(SpawnsData.class.getName());
 	
-	private final List<SpawnTemplate> _spawns = new LinkedList<>();
+	private final List<SpawnTemplate> _spawns = new CopyOnWriteArrayList<>();
 	
 	protected SpawnsData()
 	{
@@ -94,11 +95,28 @@ public class SpawnsData implements IGameXmlReader
 		}
 		
 		LOGGER.info(getClass().getSimpleName() + ": Initializing spawns...");
-		_spawns.stream().filter(SpawnTemplate::isSpawningByDefault).forEach(template ->
+		final List<ScheduledFuture<?>> jobs = new CopyOnWriteArrayList<>();
+		for (SpawnTemplate template : _spawns)
 		{
-			template.spawnAll(null);
-			template.notifyActivate();
-		});
+			if (template.isSpawningByDefault())
+			{
+				jobs.add(ThreadPool.schedule(() ->
+				{
+					template.spawnAll(null);
+					template.notifyActivate();
+				}, 0));
+			}
+		}
+		while (!jobs.isEmpty())
+		{
+			for (ScheduledFuture<?> job : jobs)
+			{
+				if ((job == null) || job.isDone() || job.isCancelled())
+				{
+					jobs.remove(job);
+				}
+			}
+		}
 		LOGGER.info(getClass().getSimpleName() + ": All spawns has been initialized!");
 	}
 	
diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/com/l2jmobius/gameserver/data/xml/impl/StaticObjectData.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/com/l2jmobius/gameserver/data/xml/impl/StaticObjectData.java
index 8af86bec88..5e88dd66fb 100644
--- a/L2J_Mobius_Classic_2.3_SevenSigns/java/com/l2jmobius/gameserver/data/xml/impl/StaticObjectData.java
+++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/com/l2jmobius/gameserver/data/xml/impl/StaticObjectData.java
@@ -26,7 +26,7 @@ import org.w3c.dom.Document;
 import org.w3c.dom.NamedNodeMap;
 import org.w3c.dom.Node;
 
-import com.l2jmobius.commons.util.IGameXmlReader;
+import com.l2jmobius.commons.util.IXmlReader;
 import com.l2jmobius.gameserver.model.StatsSet;
 import com.l2jmobius.gameserver.model.actor.instance.StaticObjectInstance;
 import com.l2jmobius.gameserver.model.actor.templates.CreatureTemplate;
@@ -35,7 +35,7 @@ import com.l2jmobius.gameserver.model.actor.templates.CreatureTemplate;
  * This class loads and holds all static object data.
  * @author UnAfraid
  */
-public final class StaticObjectData implements IGameXmlReader
+public final class StaticObjectData implements IXmlReader
 {
 	private static final Logger LOGGER = Logger.getLogger(StaticObjectData.class.getName());
 	
diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/com/l2jmobius/gameserver/data/xml/impl/TeleportersData.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/com/l2jmobius/gameserver/data/xml/impl/TeleportersData.java
index 1d039725ad..5afec008f7 100644
--- a/L2J_Mobius_Classic_2.3_SevenSigns/java/com/l2jmobius/gameserver/data/xml/impl/TeleportersData.java
+++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/com/l2jmobius/gameserver/data/xml/impl/TeleportersData.java
@@ -20,12 +20,13 @@ import java.io.File;
 import java.util.Collections;
 import java.util.HashMap;
 import java.util.Map;
+import java.util.concurrent.ConcurrentHashMap;
 import java.util.logging.Logger;
 
 import org.w3c.dom.Document;
 import org.w3c.dom.NamedNodeMap;
 
-import com.l2jmobius.commons.util.IGameXmlReader;
+import com.l2jmobius.commons.util.IXmlReader;
 import com.l2jmobius.gameserver.enums.TeleportType;
 import com.l2jmobius.gameserver.model.StatsSet;
 import com.l2jmobius.gameserver.model.teleporter.TeleportHolder;
@@ -33,12 +34,12 @@ import com.l2jmobius.gameserver.model.teleporter.TeleportHolder;
 /**
  * @author UnAfraid
  */
-public class TeleportersData implements IGameXmlReader
+public class TeleportersData implements IXmlReader
 {
 	// Logger instance
 	private static final Logger LOGGER = Logger.getLogger(TeleportersData.class.getName());
 	// Teleporter data
-	private final Map<Integer, Map<String, TeleportHolder>> _teleporters = new HashMap<>();
+	private final Map<Integer, Map<String, TeleportHolder>> _teleporters = new ConcurrentHashMap<>();
 	
 	protected TeleportersData()
 	{
diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/com/l2jmobius/gameserver/data/xml/impl/TransformData.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/com/l2jmobius/gameserver/data/xml/impl/TransformData.java
index 896111de87..d917c7e46f 100644
--- a/L2J_Mobius_Classic_2.3_SevenSigns/java/com/l2jmobius/gameserver/data/xml/impl/TransformData.java
+++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/com/l2jmobius/gameserver/data/xml/impl/TransformData.java
@@ -17,15 +17,15 @@
 package com.l2jmobius.gameserver.data.xml.impl;
 
 import java.io.File;
-import java.util.HashMap;
 import java.util.Map;
+import java.util.concurrent.ConcurrentHashMap;
 import java.util.logging.Logger;
 
 import org.w3c.dom.Document;
 import org.w3c.dom.NamedNodeMap;
 import org.w3c.dom.Node;
 
-import com.l2jmobius.commons.util.IGameXmlReader;
+import com.l2jmobius.commons.util.IXmlReader;
 import com.l2jmobius.gameserver.model.StatsSet;
 import com.l2jmobius.gameserver.model.actor.transform.Transform;
 import com.l2jmobius.gameserver.model.actor.transform.TransformLevelData;
@@ -39,11 +39,11 @@ import com.l2jmobius.gameserver.network.serverpackets.ExBasicActionList;
  * Transformation data.
  * @author UnAfraid
  */
-public final class TransformData implements IGameXmlReader
+public final class TransformData implements IXmlReader
 {
 	private static final Logger LOGGER = Logger.getLogger(TransformData.class.getName());
 	
-	private final Map<Integer, Transform> _transformData = new HashMap<>();
+	private final Map<Integer, Transform> _transformData = new ConcurrentHashMap<>();
 	
 	protected TransformData()
 	{
diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/com/l2jmobius/gameserver/data/xml/impl/VariationData.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/com/l2jmobius/gameserver/data/xml/impl/VariationData.java
index 13b41c6359..542acc971b 100644
--- a/L2J_Mobius_Classic_2.3_SevenSigns/java/com/l2jmobius/gameserver/data/xml/impl/VariationData.java
+++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/com/l2jmobius/gameserver/data/xml/impl/VariationData.java
@@ -22,11 +22,12 @@ import java.util.Collections;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
+import java.util.concurrent.ConcurrentHashMap;
 import java.util.logging.Logger;
 
 import org.w3c.dom.Document;
 
-import com.l2jmobius.commons.util.IGameXmlReader;
+import com.l2jmobius.commons.util.IXmlReader;
 import com.l2jmobius.gameserver.datatables.ItemTable;
 import com.l2jmobius.gameserver.model.VariationInstance;
 import com.l2jmobius.gameserver.model.items.instance.ItemInstance;
@@ -40,12 +41,12 @@ import com.l2jmobius.gameserver.model.options.VariationWeaponType;
 /**
  * @author Pere
  */
-public class VariationData implements IGameXmlReader
+public class VariationData implements IXmlReader
 {
 	private static final Logger LOGGER = Logger.getLogger(VariationData.class.getSimpleName());
 	
-	private final Map<Integer, Variation> _variations = new HashMap<>();
-	private final Map<Integer, Map<Integer, VariationFee>> _fees = new HashMap<>();
+	private final Map<Integer, Variation> _variations = new ConcurrentHashMap<>();
+	private final Map<Integer, Map<Integer, VariationFee>> _fees = new ConcurrentHashMap<>();
 	
 	protected VariationData()
 	{
diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/com/l2jmobius/gameserver/engines/DocumentEngine.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/com/l2jmobius/gameserver/engines/DocumentEngine.java
index d787488757..10f04f4fb3 100644
--- a/L2J_Mobius_Classic_2.3_SevenSigns/java/com/l2jmobius/gameserver/engines/DocumentEngine.java
+++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/com/l2jmobius/gameserver/engines/DocumentEngine.java
@@ -17,11 +17,14 @@
 package com.l2jmobius.gameserver.engines;
 
 import java.io.File;
-import java.util.LinkedList;
+import java.util.ArrayList;
 import java.util.List;
+import java.util.concurrent.CopyOnWriteArrayList;
+import java.util.concurrent.ScheduledFuture;
 import java.util.logging.Logger;
 
 import com.l2jmobius.Config;
+import com.l2jmobius.commons.concurrent.ThreadPool;
 import com.l2jmobius.commons.util.file.filter.XMLFilter;
 import com.l2jmobius.gameserver.engines.items.DocumentItem;
 import com.l2jmobius.gameserver.model.items.Item;
@@ -33,34 +36,29 @@ public class DocumentEngine
 {
 	private static final Logger LOGGER = Logger.getLogger(DocumentEngine.class.getName());
 	
-	private final List<File> _itemFiles = new LinkedList<>();
-	
-	public static DocumentEngine getInstance()
-	{
-		return SingletonHolder._instance;
-	}
+	private final List<File> _itemFiles = new ArrayList<>();
 	
 	protected DocumentEngine()
 	{
-		hashFiles("data/stats/items", _itemFiles);
+		processDirectory("data/stats/items", _itemFiles);
 		if (Config.CUSTOM_ITEMS_LOAD)
 		{
-			hashFiles("data/stats/items/custom", _itemFiles);
+			processDirectory("data/stats/items/custom", _itemFiles);
 		}
 	}
 	
-	private void hashFiles(String dirname, List<File> hash)
+	private void processDirectory(String dirName, List<File> list)
 	{
-		final File dir = new File(Config.DATAPACK_ROOT, dirname);
+		final File dir = new File(Config.DATAPACK_ROOT, dirName);
 		if (!dir.exists())
 		{
-			LOGGER.warning("Dir " + dir.getAbsolutePath() + " not exists");
+			LOGGER.warning("Dir " + dir.getAbsolutePath() + " does not exist.");
 			return;
 		}
 		final File[] files = dir.listFiles(new XMLFilter());
-		for (File f : files)
+		for (File file : files)
 		{
-			hash.add(f);
+			list.add(file);
 		}
 	}
 	
@@ -70,12 +68,26 @@ public class DocumentEngine
 	 */
 	public List<Item> loadItems()
 	{
-		final List<Item> list = new LinkedList<>();
-		for (File f : _itemFiles)
+		final List<Item> list = new CopyOnWriteArrayList<>();
+		final List<ScheduledFuture<?>> jobs = new CopyOnWriteArrayList<>();
+		for (File file : _itemFiles)
 		{
-			final DocumentItem document = new DocumentItem(f);
-			document.parse();
-			list.addAll(document.getItemList());
+			jobs.add(ThreadPool.schedule(() ->
+			{
+				final DocumentItem document = new DocumentItem(file);
+				document.parse();
+				list.addAll(document.getItemList());
+			}, 0));
+		}
+		while (!jobs.isEmpty())
+		{
+			for (ScheduledFuture<?> job : jobs)
+			{
+				if ((job == null) || job.isDone() || job.isCancelled())
+				{
+					jobs.remove(job);
+				}
+			}
 		}
 		return list;
 	}
@@ -84,4 +96,9 @@ public class DocumentEngine
 	{
 		protected static final DocumentEngine _instance = new DocumentEngine();
 	}
+	
+	public static DocumentEngine getInstance()
+	{
+		return SingletonHolder._instance;
+	}
 }
diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/com/l2jmobius/gameserver/engines/items/DocumentItem.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/com/l2jmobius/gameserver/engines/items/DocumentItem.java
index 8aaaed2cb4..4ea960563d 100644
--- a/L2J_Mobius_Classic_2.3_SevenSigns/java/com/l2jmobius/gameserver/engines/items/DocumentItem.java
+++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/com/l2jmobius/gameserver/engines/items/DocumentItem.java
@@ -19,7 +19,7 @@ package com.l2jmobius.gameserver.engines.items;
 import java.io.File;
 import java.lang.reflect.Constructor;
 import java.lang.reflect.InvocationTargetException;
-import java.util.LinkedList;
+import java.util.ArrayList;
 import java.util.List;
 import java.util.logging.Level;
 import java.util.logging.Logger;
@@ -27,7 +27,7 @@ import java.util.logging.Logger;
 import org.w3c.dom.Document;
 import org.w3c.dom.Node;
 
-import com.l2jmobius.commons.util.IGameXmlReader;
+import com.l2jmobius.commons.util.IXmlReader;
 import com.l2jmobius.gameserver.engines.DocumentBase;
 import com.l2jmobius.gameserver.enums.ItemSkillType;
 import com.l2jmobius.gameserver.model.ExtractableProduct;
@@ -41,12 +41,12 @@ import com.l2jmobius.gameserver.model.stats.functions.FuncTemplate;
 /**
  * @author mkizub, JIV
  */
-public final class DocumentItem extends DocumentBase implements IGameXmlReader
+public final class DocumentItem extends DocumentBase implements IXmlReader
 {
 	Logger LOGGER = Logger.getLogger(DocumentItem.class.getName());
 	
 	private ItemDataHolder _currentItem = null;
-	private final List<Item> _itemsInFile = new LinkedList<>();
+	private final List<Item> _itemsInFile = new ArrayList<>();
 	
 	/**
 	 * @param file
diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/com/l2jmobius/gameserver/handler/ConditionHandler.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/com/l2jmobius/gameserver/handler/ConditionHandler.java
index c92ef368b3..4e20d5e720 100644
--- a/L2J_Mobius_Classic_2.3_SevenSigns/java/com/l2jmobius/gameserver/handler/ConditionHandler.java
+++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/com/l2jmobius/gameserver/handler/ConditionHandler.java
@@ -50,7 +50,7 @@ public final class ConditionHandler
 	{
 		try
 		{
-			ScriptEngineManager.getInstance().executeConditionMasterHandler();
+			ScriptEngineManager.getInstance().executeScript(ScriptEngineManager.CONDITION_HANDLER_FILE);
 		}
 		catch (Exception e)
 		{
diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/com/l2jmobius/gameserver/handler/DailyMissionHandler.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/com/l2jmobius/gameserver/handler/DailyMissionHandler.java
index 9a80c1db8f..6b6248da49 100644
--- a/L2J_Mobius_Classic_2.3_SevenSigns/java/com/l2jmobius/gameserver/handler/DailyMissionHandler.java
+++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/com/l2jmobius/gameserver/handler/DailyMissionHandler.java
@@ -49,7 +49,7 @@ public class DailyMissionHandler
 	{
 		try
 		{
-			ScriptEngineManager.getInstance().executeDailyMissionMasterHandler();
+			ScriptEngineManager.getInstance().executeScript(ScriptEngineManager.ONE_DAY_REWARD_MASTER_HANDLER);
 		}
 		catch (Exception e)
 		{
diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/com/l2jmobius/gameserver/handler/EffectHandler.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/com/l2jmobius/gameserver/handler/EffectHandler.java
index 0bf5350cb8..cab6562421 100644
--- a/L2J_Mobius_Classic_2.3_SevenSigns/java/com/l2jmobius/gameserver/handler/EffectHandler.java
+++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/com/l2jmobius/gameserver/handler/EffectHandler.java
@@ -50,7 +50,7 @@ public final class EffectHandler
 	{
 		try
 		{
-			ScriptEngineManager.getInstance().executeEffectMasterHandler();
+			ScriptEngineManager.getInstance().executeScript(ScriptEngineManager.EFFECT_MASTER_HANDLER_FILE);
 		}
 		catch (Exception e)
 		{
diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/com/l2jmobius/gameserver/handler/SkillConditionHandler.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/com/l2jmobius/gameserver/handler/SkillConditionHandler.java
index b764410ba1..8685b0279a 100644
--- a/L2J_Mobius_Classic_2.3_SevenSigns/java/com/l2jmobius/gameserver/handler/SkillConditionHandler.java
+++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/com/l2jmobius/gameserver/handler/SkillConditionHandler.java
@@ -50,7 +50,7 @@ public final class SkillConditionHandler
 	{
 		try
 		{
-			ScriptEngineManager.getInstance().executeSkillConditionMasterHandler();
+			ScriptEngineManager.getInstance().executeScript(ScriptEngineManager.SKILL_CONDITION_HANDLER_FILE);
 		}
 		catch (Exception e)
 		{
diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/com/l2jmobius/gameserver/instancemanager/CastleManorManager.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/com/l2jmobius/gameserver/instancemanager/CastleManorManager.java
index 48d04d3f38..212d1a043c 100644
--- a/L2J_Mobius_Classic_2.3_SevenSigns/java/com/l2jmobius/gameserver/instancemanager/CastleManorManager.java
+++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/com/l2jmobius/gameserver/instancemanager/CastleManorManager.java
@@ -40,7 +40,7 @@ import org.w3c.dom.Node;
 import com.l2jmobius.Config;
 import com.l2jmobius.commons.concurrent.ThreadPool;
 import com.l2jmobius.commons.database.DatabaseFactory;
-import com.l2jmobius.commons.util.IGameXmlReader;
+import com.l2jmobius.commons.util.IXmlReader;
 import com.l2jmobius.commons.util.Rnd;
 import com.l2jmobius.gameserver.enums.ManorMode;
 import com.l2jmobius.gameserver.model.CropProcure;
@@ -58,7 +58,7 @@ import com.l2jmobius.gameserver.network.SystemMessageId;
  * Castle manor system.
  * @author malyelfik
  */
-public final class CastleManorManager implements IGameXmlReader, IStorable
+public final class CastleManorManager implements IXmlReader, IStorable
 {
 	private static final Logger LOGGER = Logger.getLogger(CastleManorManager.class.getName());
 	
diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/com/l2jmobius/gameserver/instancemanager/CursedWeaponsManager.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/com/l2jmobius/gameserver/instancemanager/CursedWeaponsManager.java
index d123b41ef6..835d961c56 100644
--- a/L2J_Mobius_Classic_2.3_SevenSigns/java/com/l2jmobius/gameserver/instancemanager/CursedWeaponsManager.java
+++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/com/l2jmobius/gameserver/instancemanager/CursedWeaponsManager.java
@@ -35,7 +35,7 @@ import org.w3c.dom.Node;
 
 import com.l2jmobius.Config;
 import com.l2jmobius.commons.database.DatabaseFactory;
-import com.l2jmobius.commons.util.IGameXmlReader;
+import com.l2jmobius.commons.util.IXmlReader;
 import com.l2jmobius.gameserver.model.CursedWeapon;
 import com.l2jmobius.gameserver.model.actor.Attackable;
 import com.l2jmobius.gameserver.model.actor.Creature;
@@ -54,7 +54,7 @@ import com.l2jmobius.gameserver.util.Broadcast;
  * UnAfraid: TODO: Rewrite with DocumentParser
  * @author Micht
  */
-public final class CursedWeaponsManager implements IGameXmlReader
+public final class CursedWeaponsManager implements IXmlReader
 {
 	private static final Logger LOGGER = Logger.getLogger(CursedWeaponsManager.class.getName());
 	
diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/com/l2jmobius/gameserver/instancemanager/FakePlayerChatManager.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/com/l2jmobius/gameserver/instancemanager/FakePlayerChatManager.java
index 7101927e48..39c239a762 100644
--- a/L2J_Mobius_Classic_2.3_SevenSigns/java/com/l2jmobius/gameserver/instancemanager/FakePlayerChatManager.java
+++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/com/l2jmobius/gameserver/instancemanager/FakePlayerChatManager.java
@@ -25,7 +25,7 @@ import org.w3c.dom.Document;
 
 import com.l2jmobius.Config;
 import com.l2jmobius.commons.concurrent.ThreadPool;
-import com.l2jmobius.commons.util.IGameXmlReader;
+import com.l2jmobius.commons.util.IXmlReader;
 import com.l2jmobius.commons.util.Rnd;
 import com.l2jmobius.gameserver.data.xml.impl.FakePlayerData;
 import com.l2jmobius.gameserver.datatables.SpawnTable;
@@ -41,7 +41,7 @@ import com.l2jmobius.gameserver.network.serverpackets.CreatureSay;
 /**
  * @author Mobius
  */
-public final class FakePlayerChatManager implements IGameXmlReader
+public final class FakePlayerChatManager implements IXmlReader
 {
 	private static Logger LOGGER = Logger.getLogger(FakePlayerChatManager.class.getName());
 	final List<FakePlayerChatHolder> MESSAGES = new ArrayList<>();
diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/com/l2jmobius/gameserver/instancemanager/InstanceManager.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/com/l2jmobius/gameserver/instancemanager/InstanceManager.java
index f300213c49..5ea229cf1b 100644
--- a/L2J_Mobius_Classic_2.3_SevenSigns/java/com/l2jmobius/gameserver/instancemanager/InstanceManager.java
+++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/com/l2jmobius/gameserver/instancemanager/InstanceManager.java
@@ -40,7 +40,6 @@ import org.w3c.dom.Node;
 
 import com.l2jmobius.Config;
 import com.l2jmobius.commons.database.DatabaseFactory;
-import com.l2jmobius.commons.util.IGameXmlReader;
 import com.l2jmobius.commons.util.IXmlReader;
 import com.l2jmobius.gameserver.data.xml.impl.DoorData;
 import com.l2jmobius.gameserver.data.xml.impl.SpawnsData;
@@ -61,7 +60,7 @@ import com.l2jmobius.gameserver.model.spawns.SpawnTemplate;
  * Instance manager.
  * @author evill33t, GodKratos, malyelfik
  */
-public final class InstanceManager implements IGameXmlReader
+public final class InstanceManager implements IXmlReader
 {
 	private static final Logger LOGGER = Logger.getLogger(InstanceManager.class.getName());
 	// Database query
diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/com/l2jmobius/gameserver/instancemanager/ItemAuctionManager.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/com/l2jmobius/gameserver/instancemanager/ItemAuctionManager.java
index f819adf93b..752bcfdd3f 100644
--- a/L2J_Mobius_Classic_2.3_SevenSigns/java/com/l2jmobius/gameserver/instancemanager/ItemAuctionManager.java
+++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/com/l2jmobius/gameserver/instancemanager/ItemAuctionManager.java
@@ -34,13 +34,13 @@ import org.w3c.dom.Node;
 
 import com.l2jmobius.Config;
 import com.l2jmobius.commons.database.DatabaseFactory;
-import com.l2jmobius.commons.util.IGameXmlReader;
+import com.l2jmobius.commons.util.IXmlReader;
 import com.l2jmobius.gameserver.model.itemauction.ItemAuctionInstance;
 
 /**
  * @author Forsaiken
  */
-public final class ItemAuctionManager implements IGameXmlReader
+public final class ItemAuctionManager implements IXmlReader
 {
 	private static final Logger LOGGER = Logger.getLogger(ItemAuctionManager.class.getName());
 	
diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/com/l2jmobius/gameserver/instancemanager/MapRegionManager.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/com/l2jmobius/gameserver/instancemanager/MapRegionManager.java
index 255d4340ff..8f68a4bdf5 100644
--- a/L2J_Mobius_Classic_2.3_SevenSigns/java/com/l2jmobius/gameserver/instancemanager/MapRegionManager.java
+++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/com/l2jmobius/gameserver/instancemanager/MapRegionManager.java
@@ -27,7 +27,7 @@ import org.w3c.dom.NamedNodeMap;
 import org.w3c.dom.Node;
 
 import com.l2jmobius.Config;
-import com.l2jmobius.commons.util.IGameXmlReader;
+import com.l2jmobius.commons.util.IXmlReader;
 import com.l2jmobius.gameserver.data.xml.impl.ClanHallData;
 import com.l2jmobius.gameserver.model.Location;
 import com.l2jmobius.gameserver.model.MapRegion;
@@ -47,7 +47,7 @@ import com.l2jmobius.gameserver.model.zone.type.RespawnZone;
  * Map Region Manager.
  * @author Nyaran
  */
-public final class MapRegionManager implements IGameXmlReader
+public final class MapRegionManager implements IXmlReader
 {
 	private static final Logger LOGGER = Logger.getLogger(MapRegionManager.class.getName());
 	
diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/com/l2jmobius/gameserver/instancemanager/SellBuffsManager.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/com/l2jmobius/gameserver/instancemanager/SellBuffsManager.java
index dcf1bae346..0c4e94f449 100644
--- a/L2J_Mobius_Classic_2.3_SevenSigns/java/com/l2jmobius/gameserver/instancemanager/SellBuffsManager.java
+++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/com/l2jmobius/gameserver/instancemanager/SellBuffsManager.java
@@ -26,7 +26,7 @@ import org.w3c.dom.Element;
 import org.w3c.dom.NodeList;
 
 import com.l2jmobius.Config;
-import com.l2jmobius.commons.util.IGameXmlReader;
+import com.l2jmobius.commons.util.IXmlReader;
 import com.l2jmobius.gameserver.cache.HtmCache;
 import com.l2jmobius.gameserver.data.xml.impl.SkillData;
 import com.l2jmobius.gameserver.datatables.ItemTable;
@@ -46,7 +46,7 @@ import com.l2jmobius.gameserver.util.Util;
  * Sell Buffs Manager
  * @author St3eT
  */
-public final class SellBuffsManager implements IGameXmlReader
+public final class SellBuffsManager implements IXmlReader
 {
 	private static final Logger LOGGER = Logger.getLogger(SellBuffsManager.class.getName());
 	private static final List<Integer> ALLOWED_BUFFS = new ArrayList<>();
diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/com/l2jmobius/gameserver/instancemanager/WalkingManager.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/com/l2jmobius/gameserver/instancemanager/WalkingManager.java
index d1bba35f7c..423cbe0447 100644
--- a/L2J_Mobius_Classic_2.3_SevenSigns/java/com/l2jmobius/gameserver/instancemanager/WalkingManager.java
+++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/com/l2jmobius/gameserver/instancemanager/WalkingManager.java
@@ -28,7 +28,7 @@ import org.w3c.dom.NamedNodeMap;
 import org.w3c.dom.Node;
 
 import com.l2jmobius.commons.concurrent.ThreadPool;
-import com.l2jmobius.commons.util.IGameXmlReader;
+import com.l2jmobius.commons.util.IXmlReader;
 import com.l2jmobius.gameserver.ai.CtrlIntention;
 import com.l2jmobius.gameserver.data.xml.impl.NpcData;
 import com.l2jmobius.gameserver.enums.ChatType;
@@ -47,7 +47,7 @@ import com.l2jmobius.gameserver.network.NpcStringId;
  * This class manages walking monsters.
  * @author GKR
  */
-public final class WalkingManager implements IGameXmlReader
+public final class WalkingManager implements IXmlReader
 {
 	private static final Logger LOGGER = Logger.getLogger(WalkingManager.class.getName());
 	
diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/com/l2jmobius/gameserver/instancemanager/ZoneManager.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/com/l2jmobius/gameserver/instancemanager/ZoneManager.java
index b698f51a03..9a0bd870f2 100644
--- a/L2J_Mobius_Classic_2.3_SevenSigns/java/com/l2jmobius/gameserver/instancemanager/ZoneManager.java
+++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/com/l2jmobius/gameserver/instancemanager/ZoneManager.java
@@ -26,6 +26,7 @@ import java.util.List;
 import java.util.Map;
 import java.util.Optional;
 import java.util.OptionalInt;
+import java.util.concurrent.ConcurrentHashMap;
 import java.util.logging.Level;
 import java.util.logging.Logger;
 
@@ -33,7 +34,7 @@ import org.w3c.dom.Document;
 import org.w3c.dom.NamedNodeMap;
 import org.w3c.dom.Node;
 
-import com.l2jmobius.commons.util.IGameXmlReader;
+import com.l2jmobius.commons.util.IXmlReader;
 import com.l2jmobius.gameserver.model.World;
 import com.l2jmobius.gameserver.model.WorldObject;
 import com.l2jmobius.gameserver.model.actor.Creature;
@@ -55,7 +56,7 @@ import com.l2jmobius.gameserver.model.zone.type.SpawnTerritory;
  * This class manages the zones
  * @author durgus
  */
-public final class ZoneManager implements IGameXmlReader
+public final class ZoneManager implements IXmlReader
 {
 	private static final Logger LOGGER = Logger.getLogger(ZoneManager.class.getName());
 	
@@ -65,9 +66,9 @@ public final class ZoneManager implements IGameXmlReader
 	private static final int OFFSET_X = Math.abs(World.MAP_MIN_X >> SHIFT_BY);
 	private static final int OFFSET_Y = Math.abs(World.MAP_MIN_Y >> SHIFT_BY);
 	
-	private final Map<Class<? extends ZoneType>, Map<Integer, ? extends ZoneType>> _classZones = new HashMap<>();
-	private final Map<String, SpawnTerritory> _spawnTerritories = new HashMap<>();
-	private int _lastDynamicId = 300000;
+	private final Map<Class<? extends ZoneType>, ConcurrentHashMap<Integer, ? extends ZoneType>> _classZones = new ConcurrentHashMap<>();
+	private final Map<String, SpawnTerritory> _spawnTerritories = new ConcurrentHashMap<>();
+	private volatile int _lastDynamicId = 300000;
 	private List<ItemInstance> _debugItems;
 	
 	private final ZoneRegion[][] _zoneRegions = new ZoneRegion[(World.MAP_MAX_X >> SHIFT_BY) + OFFSET_X + 1][(World.MAP_MAX_Y >> SHIFT_BY) + OFFSET_Y + 1];
@@ -365,7 +366,7 @@ public final class ZoneManager implements IGameXmlReader
 						}
 						if (checkId(zoneId))
 						{
-							LOGGER.config(getClass().getSimpleName() + ": Caution: Zone (" + zoneId + ") from file: " + f.getName() + " overrides previos definition.");
+							LOGGER.config(getClass().getSimpleName() + ": Caution: Zone (" + zoneId + ") from file: " + f.getName() + " overrides previuos definition.");
 						}
 						
 						if ((zoneName != null) && !zoneName.isEmpty())
@@ -453,10 +454,10 @@ public final class ZoneManager implements IGameXmlReader
 	@SuppressWarnings("unchecked")
 	private <T extends ZoneType> void addZone(Integer id, T zone)
 	{
-		Map<Integer, T> map = (Map<Integer, T>) _classZones.get(zone.getClass());
+		ConcurrentHashMap<Integer, T> map = (ConcurrentHashMap<Integer, T>) _classZones.get(zone.getClass());
 		if (map == null)
 		{
-			map = new HashMap<>();
+			map = new ConcurrentHashMap<>();
 			map.put(id, zone);
 			_classZones.put(zone.getClass(), map);
 		}
diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/com/l2jmobius/gameserver/model/quest/LongTimeEvent.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/com/l2jmobius/gameserver/model/quest/LongTimeEvent.java
index cc71991407..0fa020eb5d 100644
--- a/L2J_Mobius_Classic_2.3_SevenSigns/java/com/l2jmobius/gameserver/model/quest/LongTimeEvent.java
+++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/com/l2jmobius/gameserver/model/quest/LongTimeEvent.java
@@ -32,7 +32,7 @@ import org.w3c.dom.Node;
 
 import com.l2jmobius.commons.concurrent.ThreadPool;
 import com.l2jmobius.commons.database.DatabaseFactory;
-import com.l2jmobius.commons.util.IGameXmlReader;
+import com.l2jmobius.commons.util.IXmlReader;
 import com.l2jmobius.gameserver.data.sql.impl.AnnouncementsTable;
 import com.l2jmobius.gameserver.data.xml.impl.NpcData;
 import com.l2jmobius.gameserver.datatables.EventDroplist;
@@ -117,7 +117,7 @@ public class LongTimeEvent extends Quest
 	 */
 	private void loadConfig()
 	{
-		new IGameXmlReader()
+		new IXmlReader()
 		{
 			@Override
 			public void load()
diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/com/l2jmobius/gameserver/model/stats/BaseStats.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/com/l2jmobius/gameserver/model/stats/BaseStats.java
index 1cb9ebbe1e..b692107007 100644
--- a/L2J_Mobius_Classic_2.3_SevenSigns/java/com/l2jmobius/gameserver/model/stats/BaseStats.java
+++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/com/l2jmobius/gameserver/model/stats/BaseStats.java
@@ -23,7 +23,6 @@ import java.util.logging.Logger;
 import org.w3c.dom.Document;
 import org.w3c.dom.NamedNodeMap;
 
-import com.l2jmobius.commons.util.IGameXmlReader;
 import com.l2jmobius.commons.util.IXmlReader;
 import com.l2jmobius.gameserver.model.actor.Creature;
 
@@ -103,7 +102,7 @@ public enum BaseStats
 	
 	static
 	{
-		new IGameXmlReader()
+		new IXmlReader()
 		{
 			final Logger LOGGER = Logger.getLogger(BaseStats.class.getName());
 			
diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/com/l2jmobius/gameserver/scripting/ScriptEngineManager.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/com/l2jmobius/gameserver/scripting/ScriptEngineManager.java
index 9eb6d85b69..95409c567a 100644
--- a/L2J_Mobius_Classic_2.3_SevenSigns/java/com/l2jmobius/gameserver/scripting/ScriptEngineManager.java
+++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/com/l2jmobius/gameserver/scripting/ScriptEngineManager.java
@@ -28,8 +28,6 @@ import java.nio.file.attribute.BasicFileAttributes;
 import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.Iterator;
-import java.util.LinkedHashMap;
-import java.util.LinkedList;
 import java.util.List;
 import java.util.Map;
 import java.util.Map.Entry;
@@ -42,14 +40,14 @@ import java.util.logging.Logger;
 import org.w3c.dom.Document;
 
 import com.l2jmobius.Config;
-import com.l2jmobius.commons.util.IGameXmlReader;
+import com.l2jmobius.commons.util.IXmlReader;
 import com.l2jmobius.gameserver.scripting.java.JavaScriptingEngine;
 
 /**
  * Caches script engines and provides functionality for executing and managing scripts.
  * @author KenM, HorridoJoho
  */
-public final class ScriptEngineManager implements IGameXmlReader
+public final class ScriptEngineManager implements IXmlReader
 {
 	private static final Logger LOGGER = Logger.getLogger(ScriptEngineManager.class.getName());
 	public static final Path SCRIPT_FOLDER = Paths.get(Config.DATAPACK_ROOT.getAbsolutePath(), "data", "scripts");
@@ -59,8 +57,7 @@ public final class ScriptEngineManager implements IGameXmlReader
 	public static final Path CONDITION_HANDLER_FILE = Paths.get(SCRIPT_FOLDER.toString(), "handlers", "ConditionMasterHandler.java");
 	public static final Path ONE_DAY_REWARD_MASTER_HANDLER = Paths.get(SCRIPT_FOLDER.toString(), "handlers", "DailyMissionMasterHandler.java");
 	
-	private final Map<String, IExecutionContext> _extEngines = new HashMap<>();
-	private IExecutionContext _currentExecutionContext = null;
+	private IExecutionContext _javaExecutionContext = null;
 	static final List<String> _exclusions = new ArrayList<>();
 	
 	protected ScriptEngineManager()
@@ -166,12 +163,7 @@ public final class ScriptEngineManager implements IGameXmlReader
 	private void registerEngine(IScriptingEngine engine, Properties props)
 	{
 		maybeSetProperties("language." + engine.getLanguageName() + ".", props, engine);
-		final IExecutionContext context = engine.createExecutionContext();
-		for (String commonExtension : engine.getCommonFileExtensions())
-		{
-			_extEngines.put(commonExtension, context);
-		}
-		
+		_javaExecutionContext = engine.createExecutionContext();
 		LOGGER.info("ScriptEngine: " + engine.getEngineName() + " " + engine.getEngineVersion() + " (" + engine.getLanguageName() + " " + engine.getLanguageVersion() + ")");
 	}
 	
@@ -200,66 +192,6 @@ public final class ScriptEngineManager implements IGameXmlReader
 		}
 	}
 	
-	private IExecutionContext getEngineByExtension(String ext)
-	{
-		return _extEngines.get(ext);
-	}
-	
-	private String getFileExtension(Path p)
-	{
-		final String name = p.getFileName().toString();
-		final int lastDotIdx = name.lastIndexOf('.');
-		if (lastDotIdx == -1)
-		{
-			return null;
-		}
-		
-		final String extension = name.substring(lastDotIdx + 1);
-		if (extension.isEmpty())
-		{
-			return null;
-		}
-		
-		return extension;
-	}
-	
-	private void checkExistingFile(String messagePre, Path filePath) throws Exception
-	{
-		if (!Files.exists(filePath))
-		{
-			throw new Exception(messagePre + ": " + filePath + " does not exists!");
-		}
-		else if (!Files.isRegularFile(filePath))
-		{
-			throw new Exception(messagePre + ": " + filePath + " is not a file!");
-		}
-	}
-	
-	public void executeMasterHandler() throws Exception
-	{
-		executeScript(MASTER_HANDLER_FILE);
-	}
-	
-	public void executeEffectMasterHandler() throws Exception
-	{
-		executeScript(EFFECT_MASTER_HANDLER_FILE);
-	}
-	
-	public void executeSkillConditionMasterHandler() throws Exception
-	{
-		executeScript(SKILL_CONDITION_HANDLER_FILE);
-	}
-	
-	public void executeConditionMasterHandler() throws Exception
-	{
-		executeScript(CONDITION_HANDLER_FILE);
-	}
-	
-	public void executeDailyMissionMasterHandler() throws Exception
-	{
-		executeScript(ONE_DAY_REWARD_MASTER_HANDLER);
-	}
-	
 	public void executeScriptList() throws Exception
 	{
 		if (Config.ALT_DEV_NO_QUESTS)
@@ -267,77 +199,35 @@ public final class ScriptEngineManager implements IGameXmlReader
 			return;
 		}
 		
-		final Map<IExecutionContext, List<Path>> files = new LinkedHashMap<>();
+		final List<Path> files = new ArrayList<>();
 		processDirectory(SCRIPT_FOLDER.toFile(), files);
 		
-		for (Entry<IExecutionContext, List<Path>> entry : files.entrySet())
+		final Map<Path, Throwable> invokationErrors = _javaExecutionContext.executeScripts(files);
+		for (Entry<Path, Throwable> entry : invokationErrors.entrySet())
 		{
-			_currentExecutionContext = entry.getKey();
-			try
-			{
-				final Map<Path, Throwable> invokationErrors = entry.getKey().executeScripts(entry.getValue());
-				for (Entry<Path, Throwable> entry2 : invokationErrors.entrySet())
-				{
-					LOGGER.log(Level.WARNING, "ScriptEngine: " + entry2.getKey() + " failed execution!", entry2.getValue());
-				}
-			}
-			finally
-			{
-				_currentExecutionContext = null;
-			}
+			LOGGER.log(Level.WARNING, "ScriptEngine: " + entry.getKey() + " failed execution!", entry.getValue());
 		}
 	}
 	
-	private void processDirectory(File dir, Map<IExecutionContext, List<Path>> files)
+	private void processDirectory(File dir, List<Path> files)
 	{
 		for (File file : dir.listFiles())
 		{
-			if (file.isDirectory())
+			if (file.isFile())
+			{
+				final String fileName = file.getName();
+				if (fileName.endsWith(".java") && !_exclusions.contains(fileName))
+				{
+					files.add(file.toPath().toAbsolutePath());
+				}
+			}
+			else if (file.isDirectory())
 			{
 				processDirectory(file, files);
 			}
-			else
-			{
-				processFile(file, files);
-			}
 		}
 	}
 	
-	private void processFile(File file, Map<IExecutionContext, List<Path>> files)
-	{
-		if (_exclusions.contains(file.getName()))
-		{
-			return;
-		}
-		
-		Path sourceFile = file.toPath();
-		try
-		{
-			checkExistingFile("ScriptFile", sourceFile);
-		}
-		catch (Exception e)
-		{
-			LOGGER.warning(e.getMessage());
-			return;
-		}
-		
-		sourceFile = sourceFile.toAbsolutePath();
-		final String ext = getFileExtension(sourceFile);
-		if (ext == null)
-		{
-			LOGGER.warning("ScriptFile: " + sourceFile + " does not have an extension to determine the script engine!");
-			return;
-		}
-		
-		final IExecutionContext engine = getEngineByExtension(ext);
-		if (engine == null)
-		{
-			return;
-		}
-		
-		files.computeIfAbsent(engine, k -> new LinkedList<>()).add(sourceFile);
-	}
-	
 	public void executeScript(Path sourceFile) throws Exception
 	{
 		Objects.requireNonNull(sourceFile);
@@ -347,34 +237,19 @@ public final class ScriptEngineManager implements IGameXmlReader
 			sourceFile = SCRIPT_FOLDER.resolve(sourceFile);
 		}
 		
-		// throws exception if not exists or not file
-		checkExistingFile("ScriptFile", sourceFile);
-		
 		sourceFile = sourceFile.toAbsolutePath();
-		final String ext = getFileExtension(sourceFile);
 		Objects.requireNonNull(sourceFile, "ScriptFile: " + sourceFile + " does not have an extension to determine the script engine!");
 		
-		final IExecutionContext engine = getEngineByExtension(ext);
-		Objects.requireNonNull(engine, "ScriptEngine: No engine registered for extension " + ext + "!");
-		
-		_currentExecutionContext = engine;
-		try
+		final Entry<Path, Throwable> error = _javaExecutionContext.executeScript(sourceFile);
+		if (error != null)
 		{
-			final Entry<Path, Throwable> error = engine.executeScript(sourceFile);
-			if (error != null)
-			{
-				throw new Exception("ScriptEngine: " + error.getKey() + " failed execution!", error.getValue());
-			}
-		}
-		finally
-		{
-			_currentExecutionContext = null;
+			throw new Exception("ScriptEngine: " + error.getKey() + " failed execution!", error.getValue());
 		}
 	}
 	
 	public Path getCurrentLoadingScript()
 	{
-		return _currentExecutionContext != null ? _currentExecutionContext.getCurrentExecutingScript() : null;
+		return _javaExecutionContext.getCurrentExecutingScript();
 	}
 	
 	public static ScriptEngineManager getInstance()
diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/com/l2jmobius/loginserver/GameServerTable.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/com/l2jmobius/loginserver/GameServerTable.java
index 456224d78c..4269e47969 100644
--- a/L2J_Mobius_Classic_2.3_SevenSigns/java/com/l2jmobius/loginserver/GameServerTable.java
+++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/com/l2jmobius/loginserver/GameServerTable.java
@@ -36,8 +36,8 @@ import org.w3c.dom.Document;
 import org.w3c.dom.NodeList;
 
 import com.l2jmobius.commons.database.DatabaseFactory;
-import com.l2jmobius.commons.util.IGameXmlReader;
 import com.l2jmobius.commons.util.IPSubnet;
+import com.l2jmobius.commons.util.IXmlReader;
 import com.l2jmobius.commons.util.Rnd;
 import com.l2jmobius.loginserver.network.gameserverpackets.ServerStatus;
 
@@ -45,7 +45,7 @@ import com.l2jmobius.loginserver.network.gameserverpackets.ServerStatus;
  * The Class GameServerTable loads the game server names and initialize the game server tables.
  * @author KenM, Zoey76
  */
-public final class GameServerTable implements IGameXmlReader
+public final class GameServerTable implements IXmlReader
 {
 	private static final Logger LOGGER = Logger.getLogger(GameServerTable.class.getName());