diff --git a/src/Battling/Models/CreateCreature.hpp b/src/Battling/Models/CreateCreature.hpp
index 65a4a7a..5c24191 100644
--- a/src/Battling/Models/CreateCreature.hpp
+++ b/src/Battling/Models/CreateCreature.hpp
@@ -8,7 +8,7 @@
 
 namespace CreatureLib::Battling {
     class CreateCreature {
-        const BattleLibrary* _library;
+        ArbUt::BorrowedPtr<const BattleLibrary> _library;
         ArbUt::CaseInsensitiveConstString _species;
         ArbUt::CaseInsensitiveConstString _variant = "default"_cnc;
         uint8_t _level;
@@ -22,7 +22,8 @@ namespace CreatureLib::Battling {
         ArbUt::List<std::tuple<ArbUt::BorrowedPtr<const Library::AttackData>, AttackLearnMethod>> _attacks;
 
     public:
-        CreateCreature(const BattleLibrary* library, const ArbUt::CaseInsensitiveConstString& species, uint8_t level)
+        CreateCreature(ArbUt::BorrowedPtr<const BattleLibrary> library,
+                       const ArbUt::CaseInsensitiveConstString& species, uint8_t level)
             : _library(library), _species(species), _level(level), _attacks(library->GetSettings()->GetMaximalMoves()) {
         }