diff --git a/conanfile.py b/conanfile.py
index e2e5f2a..0cb2bb3 100644
--- a/conanfile.py
+++ b/conanfile.py
@@ -45,7 +45,7 @@ class PkmnLibConan(ConanFile):
                 self.options["AngelScript"].link_std_statically = True
 
     def requirements(self):
-            self.requires("CreatureLib/b886f0aebf86945ef333ce0913d1661c2396adf9@creaturelib/master")
+            self.requires("CreatureLib/d4fd7282f5fe52acafae0098168a66e4a613bffd@creaturelib/master")
             if self.options.script_handler == "angelscript":
                 self.requires("AngelScript/2.34@AngelScript/Deukhoofd")
             else:
diff --git a/src/ScriptResolving/AngelScript/AngelScripResolver.cpp b/src/ScriptResolving/AngelScript/AngelScripResolver.cpp
index 8d37ae8..fcc5abc 100644
--- a/src/ScriptResolving/AngelScript/AngelScripResolver.cpp
+++ b/src/ScriptResolving/AngelScript/AngelScripResolver.cpp
@@ -108,14 +108,14 @@ void AngelScripResolver::MessageCallback(const asSMessageInfo* msg, void* param)
     printf("%s (%d, %d) : %s : %s\n", msg->section, msg->row, msg->col, type, msg->message);
 }
 
-static constexpr const char* GetCategoryNamespace(AngelScripResolver::ScriptCategory category) {
+static constexpr const char* GetCategoryNamespace(ScriptCategory category) {
     switch (category) {
-        case CreatureLib::Battling::ScriptResolver::ScriptCategory::Attack: return "Moves";
-        case CreatureLib::Battling::ScriptResolver::ScriptCategory::Talent: return "Abilities";
-        case CreatureLib::Battling::ScriptResolver::ScriptCategory::Status: return "Status";
-        case CreatureLib::Battling::ScriptResolver::ScriptCategory::Creature: return "Pokemon";
-        case CreatureLib::Battling::ScriptResolver::ScriptCategory::Battle: return "Battle";
-        case CreatureLib::Battling::ScriptResolver::ScriptCategory::Side: return "Side";
+        case ScriptCategory::Attack: return "Moves";
+        case ScriptCategory::Talent: return "Abilities";
+        case ScriptCategory::Status: return "Status";
+        case ScriptCategory::Creature: return "Pokemon";
+        case ScriptCategory::Battle: return "Battle";
+        case ScriptCategory::Side: return "Side";
         default: throw CreatureException("Unknown script category");
     }
 }
diff --git a/tests/ScriptTests/BaseScriptClassTests.cpp b/tests/ScriptTests/BaseScriptClassTests.cpp
index 94614f1..138d74a 100644
--- a/tests/ScriptTests/BaseScriptClassTests.cpp
+++ b/tests/ScriptTests/BaseScriptClassTests.cpp
@@ -77,7 +77,7 @@ static AngelScripResolver* GetScriptResolver(PkmnLib::Battling::BattleLibrary* m
 
 static AngelScriptScript* GetScript(PkmnLib::Battling::BattleLibrary* mainLib, const char* scriptName) {
     auto lib = GetScriptResolver(mainLib);
-    auto s = lib->LoadScript(AngelScripResolver::ScriptCategory::Creature, scriptName);
+    auto s = lib->LoadScript(ScriptCategory::Creature, scriptName);
     auto script = dynamic_cast<AngelScriptScript*>(s);
     return script;
 }
diff --git a/tests/ScriptTests/ScriptResolverTests.cpp b/tests/ScriptTests/ScriptResolverTests.cpp
index ea36391..fd49f27 100644
--- a/tests/ScriptTests/ScriptResolverTests.cpp
+++ b/tests/ScriptTests/ScriptResolverTests.cpp
@@ -40,7 +40,7 @@ TEST_CASE("Build script resolver, then create object") {
     lib->CreateScript("testScript1" , _scripts["testScript1"]);
     lib->FinalizeModule();
 
-    auto obj = lib->LoadScript(AngelScripResolver::ScriptCategory::Creature, "testScript1");
+    auto obj = lib->LoadScript(ScriptCategory::Creature, "testScript1");
 
     delete obj;
     delete lib;
@@ -53,7 +53,7 @@ TEST_CASE("Build script resolver, create object, invoke addition method") {
     lib->FinalizeModule();
 
     auto obj =
-        dynamic_cast<AngelScriptScript*>(lib->LoadScript(AngelScripResolver::ScriptCategory::Creature, "testScript1"));
+        dynamic_cast<AngelScriptScript*>(lib->LoadScript(ScriptCategory::Creature, "testScript1"));
     auto ctxPool = obj->GetContextPool();
     auto ctx = ctxPool->RequestContext();
 
diff --git a/tests/ScriptTests/ScriptTypeTests/Battle/PokemonTests.cpp b/tests/ScriptTests/ScriptTypeTests/Battle/PokemonTests.cpp
index a17ceca..2ba6071 100644
--- a/tests/ScriptTests/ScriptTypeTests/Battle/PokemonTests.cpp
+++ b/tests/ScriptTests/ScriptTypeTests/Battle/PokemonTests.cpp
@@ -53,7 +53,7 @@ static AngelScripResolver* GetScriptResolver(PkmnLib::Battling::BattleLibrary* m
 
 static ScriptData GetScript(PkmnLib::Battling::BattleLibrary* mainLib, const char* funcName) {
     auto lib = GetScriptResolver(mainLib);
-    auto s = lib->LoadScript(AngelScripResolver::ScriptCategory::Creature, "testScript1");
+    auto s = lib->LoadScript(ScriptCategory::Creature, "testScript1");
     auto script = dynamic_cast<AngelScriptScript*>(s);
     auto ctxPool = script->GetContextPool();
     auto ctx = ctxPool->RequestContext();
diff --git a/tests/ScriptTests/ScriptTypeTests/Library/FormesTests.cpp b/tests/ScriptTests/ScriptTypeTests/Library/FormesTests.cpp
index 09ed7ed..4f50884 100644
--- a/tests/ScriptTests/ScriptTypeTests/Library/FormesTests.cpp
+++ b/tests/ScriptTests/ScriptTypeTests/Library/FormesTests.cpp
@@ -43,7 +43,7 @@ static AngelScripResolver* GetScriptResolver(PkmnLib::Battling::BattleLibrary* m
 
 static ScriptData GetScript(PkmnLib::Battling::BattleLibrary* mainLib, const char* funcName) {
     auto lib = GetScriptResolver(mainLib);
-    auto s = lib->LoadScript(AngelScripResolver::ScriptCategory::Creature, "testScript1");
+    auto s = lib->LoadScript(ScriptCategory::Creature, "testScript1");
     auto script = dynamic_cast<AngelScriptScript*>(s);
     auto ctxPool = script->GetContextPool();
     auto ctx = ctxPool->RequestContext();
diff --git a/tests/ScriptTests/ScriptTypeTests/Library/ItemDataTests.cpp b/tests/ScriptTests/ScriptTypeTests/Library/ItemDataTests.cpp
index 278964b..cd7e8e5 100644
--- a/tests/ScriptTests/ScriptTypeTests/Library/ItemDataTests.cpp
+++ b/tests/ScriptTests/ScriptTypeTests/Library/ItemDataTests.cpp
@@ -39,7 +39,7 @@ static AngelScripResolver* GetScriptResolver(PkmnLib::Battling::BattleLibrary* m
 
 static ScriptData GetScript(PkmnLib::Battling::BattleLibrary* mainLib, const char* funcName) {
     auto lib = GetScriptResolver(mainLib);
-    auto s = lib->LoadScript(AngelScripResolver::ScriptCategory::Creature, "testScript1");
+    auto s = lib->LoadScript(ScriptCategory::Creature, "testScript1");
     auto script = dynamic_cast<AngelScriptScript*>(s);
     auto ctxPool = script->GetContextPool();
     auto ctx = ctxPool->RequestContext();
diff --git a/tests/ScriptTests/ScriptTypeTests/Library/MoveTests.cpp b/tests/ScriptTests/ScriptTypeTests/Library/MoveTests.cpp
index 82121a4..a1d299d 100644
--- a/tests/ScriptTests/ScriptTypeTests/Library/MoveTests.cpp
+++ b/tests/ScriptTests/ScriptTypeTests/Library/MoveTests.cpp
@@ -43,7 +43,7 @@ static AngelScripResolver* GetScriptResolver(PkmnLib::Battling::BattleLibrary* m
 
 static ScriptData GetScript(PkmnLib::Battling::BattleLibrary* mainLib, const char* funcName) {
     auto lib = GetScriptResolver(mainLib);
-    auto s = lib->LoadScript(AngelScripResolver::ScriptCategory::Creature, "testScript1");
+    auto s = lib->LoadScript(ScriptCategory::Creature, "testScript1");
     auto script = dynamic_cast<AngelScriptScript*>(s);
     auto ctxPool = script->GetContextPool();
     auto ctx = ctxPool->RequestContext();
diff --git a/tests/ScriptTests/ScriptTypeTests/Library/SpeciesTests.cpp b/tests/ScriptTests/ScriptTypeTests/Library/SpeciesTests.cpp
index bc4bb4b..c77972a 100644
--- a/tests/ScriptTests/ScriptTypeTests/Library/SpeciesTests.cpp
+++ b/tests/ScriptTests/ScriptTypeTests/Library/SpeciesTests.cpp
@@ -41,7 +41,7 @@ static AngelScripResolver* GetScriptResolver(PkmnLib::Battling::BattleLibrary* m
 
 static ScriptData GetScript(PkmnLib::Battling::BattleLibrary* mainLib, const char* funcName) {
     auto lib = GetScriptResolver(mainLib);
-    auto s = lib->LoadScript(AngelScripResolver::ScriptCategory::Creature, "testScript1");
+    auto s = lib->LoadScript(ScriptCategory::Creature, "testScript1");
     auto script = dynamic_cast<AngelScriptScript*>(s);
     auto ctxPool = script->GetContextPool();
     auto ctx = ctxPool->RequestContext();
diff --git a/tests/ScriptTests/ScriptTypeTests/Library/StaticLibraryTests.cpp b/tests/ScriptTests/ScriptTypeTests/Library/StaticLibraryTests.cpp
index 379e7f5..07afbc9 100644
--- a/tests/ScriptTests/ScriptTypeTests/Library/StaticLibraryTests.cpp
+++ b/tests/ScriptTests/ScriptTypeTests/Library/StaticLibraryTests.cpp
@@ -42,7 +42,7 @@ static AngelScripResolver* GetScriptResolver(PkmnLib::Battling::BattleLibrary* m
 
 static ScriptData GetScript(PkmnLib::Battling::BattleLibrary* mainLib, const char* funcName) {
     auto lib = GetScriptResolver(mainLib);
-    auto s = lib->LoadScript(AngelScripResolver::ScriptCategory::Creature, "testScript1");
+    auto s = lib->LoadScript(ScriptCategory::Creature, "testScript1");
     auto script = dynamic_cast<AngelScriptScript*>(s);
     auto ctxPool = script->GetContextPool();
     auto ctx = ctxPool->RequestContext();