diff --git a/PkmnLibSharp/Generated/Creaturelibbattling/AttackCategory.cs b/PkmnLibSharp/Generated/Creaturelibbattling/AttackCategory.cs
index a397713..d55645b 100644
--- a/PkmnLibSharp/Generated/Creaturelibbattling/AttackCategory.cs
+++ b/PkmnLibSharp/Generated/Creaturelibbattling/AttackCategory.cs
@@ -4,7 +4,7 @@ using System.Diagnostics.CodeAnalysis;
 namespace Creaturelibbattling
 {
     [SuppressMessage("ReSharper", "InconsistentNaming")]
-    public enum AttackCategory : byte
+    internal enum AttackCategory : byte
     {
         Physical = 0,
         Magical = 1,
diff --git a/PkmnLibSharp/Generated/Creaturelibbattling/AttackLearnMethod.cs b/PkmnLibSharp/Generated/Creaturelibbattling/AttackLearnMethod.cs
index 8869eb7..63e6f94 100644
--- a/PkmnLibSharp/Generated/Creaturelibbattling/AttackLearnMethod.cs
+++ b/PkmnLibSharp/Generated/Creaturelibbattling/AttackLearnMethod.cs
@@ -4,7 +4,7 @@ using System.Diagnostics.CodeAnalysis;
 namespace Creaturelibbattling
 {
     [SuppressMessage("ReSharper", "InconsistentNaming")]
-    public enum AttackLearnMethod : int
+    internal enum AttackLearnMethod : int
     {
         Unknown = 0,
         Level = 1,
diff --git a/PkmnLibSharp/Generated/Creaturelibbattling/AttackTarget.cs b/PkmnLibSharp/Generated/Creaturelibbattling/AttackTarget.cs
index 5fb39ec..470aa03 100644
--- a/PkmnLibSharp/Generated/Creaturelibbattling/AttackTarget.cs
+++ b/PkmnLibSharp/Generated/Creaturelibbattling/AttackTarget.cs
@@ -4,7 +4,7 @@ using System.Diagnostics.CodeAnalysis;
 namespace Creaturelibbattling
 {
     [SuppressMessage("ReSharper", "InconsistentNaming")]
-    public enum AttackTarget : byte
+    internal enum AttackTarget : byte
     {
         Adjacent = 0,
         AdjacentAlly = 1,
diff --git a/PkmnLibSharp/Generated/Creaturelibbattling/BattleItemCategory.cs b/PkmnLibSharp/Generated/Creaturelibbattling/BattleItemCategory.cs
index 6950a3a..df243f1 100644
--- a/PkmnLibSharp/Generated/Creaturelibbattling/BattleItemCategory.cs
+++ b/PkmnLibSharp/Generated/Creaturelibbattling/BattleItemCategory.cs
@@ -4,7 +4,7 @@ using System.Diagnostics.CodeAnalysis;
 namespace Creaturelibbattling
 {
     [SuppressMessage("ReSharper", "InconsistentNaming")]
-    public enum BattleItemCategory : byte
+    internal enum BattleItemCategory : byte
     {
         None = 0,
         Healing = 1,
diff --git a/PkmnLibSharp/Generated/Creaturelibbattling/DamageSource.cs b/PkmnLibSharp/Generated/Creaturelibbattling/DamageSource.cs
index c408d07..c97d9d7 100644
--- a/PkmnLibSharp/Generated/Creaturelibbattling/DamageSource.cs
+++ b/PkmnLibSharp/Generated/Creaturelibbattling/DamageSource.cs
@@ -4,7 +4,7 @@ using System.Diagnostics.CodeAnalysis;
 namespace Creaturelibbattling
 {
     [SuppressMessage("ReSharper", "InconsistentNaming")]
-    public enum DamageSource : byte
+    internal enum DamageSource : byte
     {
         AttackDamage = 0,
     }
diff --git a/PkmnLibSharp/Generated/Creaturelibbattling/EffectParameterType.cs b/PkmnLibSharp/Generated/Creaturelibbattling/EffectParameterType.cs
index 1df825d..0900815 100644
--- a/PkmnLibSharp/Generated/Creaturelibbattling/EffectParameterType.cs
+++ b/PkmnLibSharp/Generated/Creaturelibbattling/EffectParameterType.cs
@@ -4,7 +4,7 @@ using System.Diagnostics.CodeAnalysis;
 namespace Creaturelibbattling
 {
     [SuppressMessage("ReSharper", "InconsistentNaming")]
-    public enum EffectParameterType : byte
+    internal enum EffectParameterType : byte
     {
         None = 0,
         Bool = 1,
diff --git a/PkmnLibSharp/Generated/Creaturelibbattling/EventDataKind.cs b/PkmnLibSharp/Generated/Creaturelibbattling/EventDataKind.cs
index 4263e73..6899b1a 100644
--- a/PkmnLibSharp/Generated/Creaturelibbattling/EventDataKind.cs
+++ b/PkmnLibSharp/Generated/Creaturelibbattling/EventDataKind.cs
@@ -4,7 +4,7 @@ using System.Diagnostics.CodeAnalysis;
 namespace Creaturelibbattling
 {
     [SuppressMessage("ReSharper", "InconsistentNaming")]
-    public enum EventDataKind : byte
+    internal enum EventDataKind : byte
     {
         Damage = 0,
         Heal = 1,
diff --git a/PkmnLibSharp/Generated/Creaturelibbattling/Gender.cs b/PkmnLibSharp/Generated/Creaturelibbattling/Gender.cs
index 33f32b1..5a37535 100644
--- a/PkmnLibSharp/Generated/Creaturelibbattling/Gender.cs
+++ b/PkmnLibSharp/Generated/Creaturelibbattling/Gender.cs
@@ -4,7 +4,7 @@ using System.Diagnostics.CodeAnalysis;
 namespace Creaturelibbattling
 {
     [SuppressMessage("ReSharper", "InconsistentNaming")]
-    public enum Gender : byte
+    internal enum Gender : byte
     {
         Male = 0,
         Female = 1,
diff --git a/PkmnLibSharp/Generated/Creaturelibbattling/ItemCategory.cs b/PkmnLibSharp/Generated/Creaturelibbattling/ItemCategory.cs
index af8c088..99be5c2 100644
--- a/PkmnLibSharp/Generated/Creaturelibbattling/ItemCategory.cs
+++ b/PkmnLibSharp/Generated/Creaturelibbattling/ItemCategory.cs
@@ -4,7 +4,7 @@ using System.Diagnostics.CodeAnalysis;
 namespace Creaturelibbattling
 {
     [SuppressMessage("ReSharper", "InconsistentNaming")]
-    public enum ItemCategory : byte
+    internal enum ItemCategory : byte
     {
         MiscItem = 0,
         CaptureDevice = 1,
diff --git a/PkmnLibSharp/Generated/Creaturelibbattling/ScriptCategory.cs b/PkmnLibSharp/Generated/Creaturelibbattling/ScriptCategory.cs
index 2566175..aca9931 100644
--- a/PkmnLibSharp/Generated/Creaturelibbattling/ScriptCategory.cs
+++ b/PkmnLibSharp/Generated/Creaturelibbattling/ScriptCategory.cs
@@ -4,7 +4,7 @@ using System.Diagnostics.CodeAnalysis;
 namespace Creaturelibbattling
 {
     [SuppressMessage("ReSharper", "InconsistentNaming")]
-    public enum ScriptCategory : byte
+    internal enum ScriptCategory : byte
     {
         Attack = 0,
         Talent = 1,
diff --git a/PkmnLibSharp/Generated/Creaturelibbattling/Statistic.cs b/PkmnLibSharp/Generated/Creaturelibbattling/Statistic.cs
index 157209f..38b521b 100644
--- a/PkmnLibSharp/Generated/Creaturelibbattling/Statistic.cs
+++ b/PkmnLibSharp/Generated/Creaturelibbattling/Statistic.cs
@@ -4,7 +4,7 @@ using System.Diagnostics.CodeAnalysis;
 namespace Creaturelibbattling
 {
     [SuppressMessage("ReSharper", "InconsistentNaming")]
-    public enum Statistic : byte
+    internal enum Statistic : byte
     {
         Health = 0,
         PhysicalAttack = 1,
diff --git a/PkmnLibSharp/Generated/Creaturelibbattling/TurnChoiceKind.cs b/PkmnLibSharp/Generated/Creaturelibbattling/TurnChoiceKind.cs
index 1ca74a9..489aee7 100644
--- a/PkmnLibSharp/Generated/Creaturelibbattling/TurnChoiceKind.cs
+++ b/PkmnLibSharp/Generated/Creaturelibbattling/TurnChoiceKind.cs
@@ -4,7 +4,7 @@ using System.Diagnostics.CodeAnalysis;
 namespace Creaturelibbattling
 {
     [SuppressMessage("ReSharper", "InconsistentNaming")]
-    public enum TurnChoiceKind : byte
+    internal enum TurnChoiceKind : byte
     {
         Pass = 0,
         Attack = 1,
diff --git a/PkmnLibSharp/Generated/Creaturelibbattling/memory_order.cs b/PkmnLibSharp/Generated/Creaturelibbattling/memory_order.cs
index a546b67..9232222 100644
--- a/PkmnLibSharp/Generated/Creaturelibbattling/memory_order.cs
+++ b/PkmnLibSharp/Generated/Creaturelibbattling/memory_order.cs
@@ -4,7 +4,7 @@ using System.Diagnostics.CodeAnalysis;
 namespace Creaturelibbattling
 {
     [SuppressMessage("ReSharper", "InconsistentNaming")]
-    public enum memory_order : int
+    internal enum memory_order : int
     {
         memory_order_relaxed = 0,
         memory_order_consume = 1,
diff --git a/PkmnLibSharp/Generated/Creatureliblibrary/AttackCategory.cs b/PkmnLibSharp/Generated/Creatureliblibrary/AttackCategory.cs
index 042d278..617a005 100644
--- a/PkmnLibSharp/Generated/Creatureliblibrary/AttackCategory.cs
+++ b/PkmnLibSharp/Generated/Creatureliblibrary/AttackCategory.cs
@@ -4,7 +4,7 @@ using System.Diagnostics.CodeAnalysis;
 namespace Creatureliblibrary
 {
     [SuppressMessage("ReSharper", "InconsistentNaming")]
-    public enum AttackCategory : byte
+    internal enum AttackCategory : byte
     {
         Physical = 0,
         Magical = 1,
diff --git a/PkmnLibSharp/Generated/Creatureliblibrary/AttackTarget.cs b/PkmnLibSharp/Generated/Creatureliblibrary/AttackTarget.cs
index b6fa781..cb2a688 100644
--- a/PkmnLibSharp/Generated/Creatureliblibrary/AttackTarget.cs
+++ b/PkmnLibSharp/Generated/Creatureliblibrary/AttackTarget.cs
@@ -4,7 +4,7 @@ using System.Diagnostics.CodeAnalysis;
 namespace Creatureliblibrary
 {
     [SuppressMessage("ReSharper", "InconsistentNaming")]
-    public enum AttackTarget : byte
+    internal enum AttackTarget : byte
     {
         Adjacent = 0,
         AdjacentAlly = 1,
diff --git a/PkmnLibSharp/Generated/Creatureliblibrary/BattleItemCategory.cs b/PkmnLibSharp/Generated/Creatureliblibrary/BattleItemCategory.cs
index d1af9be..c732429 100644
--- a/PkmnLibSharp/Generated/Creatureliblibrary/BattleItemCategory.cs
+++ b/PkmnLibSharp/Generated/Creatureliblibrary/BattleItemCategory.cs
@@ -4,7 +4,7 @@ using System.Diagnostics.CodeAnalysis;
 namespace Creatureliblibrary
 {
     [SuppressMessage("ReSharper", "InconsistentNaming")]
-    public enum BattleItemCategory : byte
+    internal enum BattleItemCategory : byte
     {
         None = 0,
         Healing = 1,
diff --git a/PkmnLibSharp/Generated/Creatureliblibrary/EffectParameterType.cs b/PkmnLibSharp/Generated/Creatureliblibrary/EffectParameterType.cs
index 4b158c9..c002a33 100644
--- a/PkmnLibSharp/Generated/Creatureliblibrary/EffectParameterType.cs
+++ b/PkmnLibSharp/Generated/Creatureliblibrary/EffectParameterType.cs
@@ -4,7 +4,7 @@ using System.Diagnostics.CodeAnalysis;
 namespace Creatureliblibrary
 {
     [SuppressMessage("ReSharper", "InconsistentNaming")]
-    public enum EffectParameterType : byte
+    internal enum EffectParameterType : byte
     {
         None = 0,
         Bool = 1,
diff --git a/PkmnLibSharp/Generated/Creatureliblibrary/Gender.cs b/PkmnLibSharp/Generated/Creatureliblibrary/Gender.cs
index 66056f5..98d03b9 100644
--- a/PkmnLibSharp/Generated/Creatureliblibrary/Gender.cs
+++ b/PkmnLibSharp/Generated/Creatureliblibrary/Gender.cs
@@ -4,7 +4,7 @@ using System.Diagnostics.CodeAnalysis;
 namespace Creatureliblibrary
 {
     [SuppressMessage("ReSharper", "InconsistentNaming")]
-    public enum Gender : byte
+    internal enum Gender : byte
     {
         Male = 0,
         Female = 1,
diff --git a/PkmnLibSharp/Generated/Creatureliblibrary/ItemCategory.cs b/PkmnLibSharp/Generated/Creatureliblibrary/ItemCategory.cs
index d55d9f4..aaedb5b 100644
--- a/PkmnLibSharp/Generated/Creatureliblibrary/ItemCategory.cs
+++ b/PkmnLibSharp/Generated/Creatureliblibrary/ItemCategory.cs
@@ -4,7 +4,7 @@ using System.Diagnostics.CodeAnalysis;
 namespace Creatureliblibrary
 {
     [SuppressMessage("ReSharper", "InconsistentNaming")]
-    public enum ItemCategory : byte
+    internal enum ItemCategory : byte
     {
         MiscItem = 0,
         CaptureDevice = 1,
diff --git a/PkmnLibSharp/Generated/Creatureliblibrary/Statistic.cs b/PkmnLibSharp/Generated/Creatureliblibrary/Statistic.cs
index 7bec221..e74cff6 100644
--- a/PkmnLibSharp/Generated/Creatureliblibrary/Statistic.cs
+++ b/PkmnLibSharp/Generated/Creatureliblibrary/Statistic.cs
@@ -4,7 +4,7 @@ using System.Diagnostics.CodeAnalysis;
 namespace Creatureliblibrary
 {
     [SuppressMessage("ReSharper", "InconsistentNaming")]
-    public enum Statistic : byte
+    internal enum Statistic : byte
     {
         Health = 0,
         PhysicalAttack = 1,
diff --git a/PkmnLibSharp/Generated/Creatureliblibrary/memory_order.cs b/PkmnLibSharp/Generated/Creatureliblibrary/memory_order.cs
index c55f46e..16580a9 100644
--- a/PkmnLibSharp/Generated/Creatureliblibrary/memory_order.cs
+++ b/PkmnLibSharp/Generated/Creatureliblibrary/memory_order.cs
@@ -4,7 +4,7 @@ using System.Diagnostics.CodeAnalysis;
 namespace Creatureliblibrary
 {
     [SuppressMessage("ReSharper", "InconsistentNaming")]
-    public enum memory_order : int
+    internal enum memory_order : int
     {
         memory_order_relaxed = 0,
         memory_order_consume = 1,
diff --git a/PkmnLibSharp/Generated/Pkmnlib/AttackCategory.cs b/PkmnLibSharp/Generated/Pkmnlib/AttackCategory.cs
index 599b5a6..3125c30 100644
--- a/PkmnLibSharp/Generated/Pkmnlib/AttackCategory.cs
+++ b/PkmnLibSharp/Generated/Pkmnlib/AttackCategory.cs
@@ -4,7 +4,7 @@ using System.Diagnostics.CodeAnalysis;
 namespace Pkmnlib
 {
     [SuppressMessage("ReSharper", "InconsistentNaming")]
-    public enum AttackCategory : byte
+    internal enum AttackCategory : byte
     {
         Physical = 0,
         Magical = 1,
diff --git a/PkmnLibSharp/Generated/Pkmnlib/AttackLearnMethod.cs b/PkmnLibSharp/Generated/Pkmnlib/AttackLearnMethod.cs
index 761e232..03dcff8 100644
--- a/PkmnLibSharp/Generated/Pkmnlib/AttackLearnMethod.cs
+++ b/PkmnLibSharp/Generated/Pkmnlib/AttackLearnMethod.cs
@@ -4,7 +4,7 @@ using System.Diagnostics.CodeAnalysis;
 namespace Pkmnlib
 {
     [SuppressMessage("ReSharper", "InconsistentNaming")]
-    public enum AttackLearnMethod : int
+    internal enum AttackLearnMethod : int
     {
         Unknown = 0,
         Level = 1,
diff --git a/PkmnLibSharp/Generated/Pkmnlib/AttackTarget.cs b/PkmnLibSharp/Generated/Pkmnlib/AttackTarget.cs
index 8959613..f626a4b 100644
--- a/PkmnLibSharp/Generated/Pkmnlib/AttackTarget.cs
+++ b/PkmnLibSharp/Generated/Pkmnlib/AttackTarget.cs
@@ -4,7 +4,7 @@ using System.Diagnostics.CodeAnalysis;
 namespace Pkmnlib
 {
     [SuppressMessage("ReSharper", "InconsistentNaming")]
-    public enum AttackTarget : byte
+    internal enum AttackTarget : byte
     {
         Adjacent = 0,
         AdjacentAlly = 1,
diff --git a/PkmnLibSharp/Generated/Pkmnlib/BattleItemCategory.cs b/PkmnLibSharp/Generated/Pkmnlib/BattleItemCategory.cs
index 17ae79c..97fb9e2 100644
--- a/PkmnLibSharp/Generated/Pkmnlib/BattleItemCategory.cs
+++ b/PkmnLibSharp/Generated/Pkmnlib/BattleItemCategory.cs
@@ -4,7 +4,7 @@ using System.Diagnostics.CodeAnalysis;
 namespace Pkmnlib
 {
     [SuppressMessage("ReSharper", "InconsistentNaming")]
-    public enum BattleItemCategory : byte
+    internal enum BattleItemCategory : byte
     {
         None = 0,
         Healing = 1,
diff --git a/PkmnLibSharp/Generated/Pkmnlib/DamageSource.cs b/PkmnLibSharp/Generated/Pkmnlib/DamageSource.cs
index e36d0ed..29277ea 100644
--- a/PkmnLibSharp/Generated/Pkmnlib/DamageSource.cs
+++ b/PkmnLibSharp/Generated/Pkmnlib/DamageSource.cs
@@ -4,7 +4,7 @@ using System.Diagnostics.CodeAnalysis;
 namespace Pkmnlib
 {
     [SuppressMessage("ReSharper", "InconsistentNaming")]
-    public enum DamageSource : byte
+    internal enum DamageSource : byte
     {
         AttackDamage = 0,
     }
diff --git a/PkmnLibSharp/Generated/Pkmnlib/EffectParameterType.cs b/PkmnLibSharp/Generated/Pkmnlib/EffectParameterType.cs
index 39ac1ba..d6408e2 100644
--- a/PkmnLibSharp/Generated/Pkmnlib/EffectParameterType.cs
+++ b/PkmnLibSharp/Generated/Pkmnlib/EffectParameterType.cs
@@ -4,7 +4,7 @@ using System.Diagnostics.CodeAnalysis;
 namespace Pkmnlib
 {
     [SuppressMessage("ReSharper", "InconsistentNaming")]
-    public enum EffectParameterType : byte
+    internal enum EffectParameterType : byte
     {
         None = 0,
         Bool = 1,
diff --git a/PkmnLibSharp/Generated/Pkmnlib/EventDataKind.cs b/PkmnLibSharp/Generated/Pkmnlib/EventDataKind.cs
index ca2c0a1..f4a0639 100644
--- a/PkmnLibSharp/Generated/Pkmnlib/EventDataKind.cs
+++ b/PkmnLibSharp/Generated/Pkmnlib/EventDataKind.cs
@@ -4,7 +4,7 @@ using System.Diagnostics.CodeAnalysis;
 namespace Pkmnlib
 {
     [SuppressMessage("ReSharper", "InconsistentNaming")]
-    public enum EventDataKind : byte
+    internal enum EventDataKind : byte
     {
         Damage = 0,
         Heal = 1,
diff --git a/PkmnLibSharp/Generated/Pkmnlib/EvolutionMethod.cs b/PkmnLibSharp/Generated/Pkmnlib/EvolutionMethod.cs
index f8297ca..dd65d04 100644
--- a/PkmnLibSharp/Generated/Pkmnlib/EvolutionMethod.cs
+++ b/PkmnLibSharp/Generated/Pkmnlib/EvolutionMethod.cs
@@ -4,7 +4,7 @@ using System.Diagnostics.CodeAnalysis;
 namespace Pkmnlib
 {
     [SuppressMessage("ReSharper", "InconsistentNaming")]
-    public enum EvolutionMethod : byte
+    internal enum EvolutionMethod : byte
     {
         Level = 0,
         HighFriendship = 1,
diff --git a/PkmnLibSharp/Generated/Pkmnlib/Gender.cs b/PkmnLibSharp/Generated/Pkmnlib/Gender.cs
index 9af3861..5339113 100644
--- a/PkmnLibSharp/Generated/Pkmnlib/Gender.cs
+++ b/PkmnLibSharp/Generated/Pkmnlib/Gender.cs
@@ -4,7 +4,7 @@ using System.Diagnostics.CodeAnalysis;
 namespace Pkmnlib
 {
     [SuppressMessage("ReSharper", "InconsistentNaming")]
-    public enum Gender : byte
+    internal enum Gender : byte
     {
         Male = 0,
         Female = 1,
diff --git a/PkmnLibSharp/Generated/Pkmnlib/GetLastException.cs b/PkmnLibSharp/Generated/Pkmnlib/GetLastException.cs
deleted file mode 100644
index d7842fc..0000000
--- a/PkmnLibSharp/Generated/Pkmnlib/GetLastException.cs
+++ /dev/null
@@ -1,15 +0,0 @@
-using System;
-using System.Runtime.InteropServices;
-
-namespace Pkmnlib.Generated
-{
-    internal static class GetLastException
-    {
-        /// <summary>
-        /// 
-        /// </summary>
-        /// <returns>const char *</returns>
-        [DllImport("pkmnLib")]
-        internal static extern string PkmnLib_GetLastException();
-    }
-}
diff --git a/PkmnLibSharp/Generated/Pkmnlib/ItemCategory.cs b/PkmnLibSharp/Generated/Pkmnlib/ItemCategory.cs
index 872592b..1169e78 100644
--- a/PkmnLibSharp/Generated/Pkmnlib/ItemCategory.cs
+++ b/PkmnLibSharp/Generated/Pkmnlib/ItemCategory.cs
@@ -4,7 +4,7 @@ using System.Diagnostics.CodeAnalysis;
 namespace Pkmnlib
 {
     [SuppressMessage("ReSharper", "InconsistentNaming")]
-    public enum ItemCategory : byte
+    internal enum ItemCategory : byte
     {
         MiscItem = 0,
         CaptureDevice = 1,
diff --git a/PkmnLibSharp/Generated/Pkmnlib/METADATATYPE.cs b/PkmnLibSharp/Generated/Pkmnlib/METADATATYPE.cs
index 6dabc56..a7ff172 100644
--- a/PkmnLibSharp/Generated/Pkmnlib/METADATATYPE.cs
+++ b/PkmnLibSharp/Generated/Pkmnlib/METADATATYPE.cs
@@ -4,7 +4,7 @@ using System.Diagnostics.CodeAnalysis;
 namespace Pkmnlib
 {
     [SuppressMessage("ReSharper", "InconsistentNaming")]
-    public enum METADATATYPE : int
+    internal enum METADATATYPE : int
     {
         MDT_TYPE = 1,
         MDT_FUNC = 2,
diff --git a/PkmnLibSharp/Generated/Pkmnlib/MoveCategory.cs b/PkmnLibSharp/Generated/Pkmnlib/MoveCategory.cs
index 55cf492..9d71bf8 100644
--- a/PkmnLibSharp/Generated/Pkmnlib/MoveCategory.cs
+++ b/PkmnLibSharp/Generated/Pkmnlib/MoveCategory.cs
@@ -4,7 +4,7 @@ using System.Diagnostics.CodeAnalysis;
 namespace Pkmnlib
 {
     [SuppressMessage("ReSharper", "InconsistentNaming")]
-    public enum MoveCategory : byte
+    internal enum MoveCategory : byte
     {
         Physical = 0,
         Special = 1,
diff --git a/PkmnLibSharp/Generated/Pkmnlib/PkmnDamageSource.cs b/PkmnLibSharp/Generated/Pkmnlib/PkmnDamageSource.cs
index 958c0b3..3a40ee7 100644
--- a/PkmnLibSharp/Generated/Pkmnlib/PkmnDamageSource.cs
+++ b/PkmnLibSharp/Generated/Pkmnlib/PkmnDamageSource.cs
@@ -4,7 +4,7 @@ using System.Diagnostics.CodeAnalysis;
 namespace Pkmnlib
 {
     [SuppressMessage("ReSharper", "InconsistentNaming")]
-    public enum PkmnDamageSource : byte
+    internal enum PkmnDamageSource : byte
     {
         Struggle = 1,
     }
diff --git a/PkmnLibSharp/Generated/Pkmnlib/PkmnEventDataKind.cs b/PkmnLibSharp/Generated/Pkmnlib/PkmnEventDataKind.cs
index d952f6b..c0f62b1 100644
--- a/PkmnLibSharp/Generated/Pkmnlib/PkmnEventDataKind.cs
+++ b/PkmnLibSharp/Generated/Pkmnlib/PkmnEventDataKind.cs
@@ -4,7 +4,7 @@ using System.Diagnostics.CodeAnalysis;
 namespace Pkmnlib
 {
     [SuppressMessage("ReSharper", "InconsistentNaming")]
-    public enum PkmnEventDataKind : byte
+    internal enum PkmnEventDataKind : byte
     {
         WeatherChange = 4,
     }
diff --git a/PkmnLibSharp/Generated/Pkmnlib/PkmnScriptCategory.cs b/PkmnLibSharp/Generated/Pkmnlib/PkmnScriptCategory.cs
index 9b70146..8a78768 100644
--- a/PkmnLibSharp/Generated/Pkmnlib/PkmnScriptCategory.cs
+++ b/PkmnLibSharp/Generated/Pkmnlib/PkmnScriptCategory.cs
@@ -4,7 +4,7 @@ using System.Diagnostics.CodeAnalysis;
 namespace Pkmnlib
 {
     [SuppressMessage("ReSharper", "InconsistentNaming")]
-    public enum PkmnScriptCategory : byte
+    internal enum PkmnScriptCategory : byte
     {
         Weather = 6,
     }
diff --git a/PkmnLibSharp/Generated/Pkmnlib/ScriptCategory.cs b/PkmnLibSharp/Generated/Pkmnlib/ScriptCategory.cs
index 78b9614..d50255d 100644
--- a/PkmnLibSharp/Generated/Pkmnlib/ScriptCategory.cs
+++ b/PkmnLibSharp/Generated/Pkmnlib/ScriptCategory.cs
@@ -4,7 +4,7 @@ using System.Diagnostics.CodeAnalysis;
 namespace Pkmnlib
 {
     [SuppressMessage("ReSharper", "InconsistentNaming")]
-    public enum ScriptCategory : byte
+    internal enum ScriptCategory : byte
     {
         Attack = 0,
         Talent = 1,
diff --git a/PkmnLibSharp/Generated/Pkmnlib/Statistic.cs b/PkmnLibSharp/Generated/Pkmnlib/Statistic.cs
index afa0e15..275d483 100644
--- a/PkmnLibSharp/Generated/Pkmnlib/Statistic.cs
+++ b/PkmnLibSharp/Generated/Pkmnlib/Statistic.cs
@@ -4,7 +4,7 @@ using System.Diagnostics.CodeAnalysis;
 namespace Pkmnlib
 {
     [SuppressMessage("ReSharper", "InconsistentNaming")]
-    public enum Statistic : byte
+    internal enum Statistic : byte
     {
         Health = 0,
         PhysicalAttack = 1,
diff --git a/PkmnLibSharp/Generated/Pkmnlib/TimeOfDay.cs b/PkmnLibSharp/Generated/Pkmnlib/TimeOfDay.cs
index 4e787f9..9b5634a 100644
--- a/PkmnLibSharp/Generated/Pkmnlib/TimeOfDay.cs
+++ b/PkmnLibSharp/Generated/Pkmnlib/TimeOfDay.cs
@@ -4,7 +4,7 @@ using System.Diagnostics.CodeAnalysis;
 namespace Pkmnlib
 {
     [SuppressMessage("ReSharper", "InconsistentNaming")]
-    public enum TimeOfDay : byte
+    internal enum TimeOfDay : byte
     {
         Night = 0,
         Morning = 1,
diff --git a/PkmnLibSharp/Generated/Pkmnlib/TurnChoiceKind.cs b/PkmnLibSharp/Generated/Pkmnlib/TurnChoiceKind.cs
index 80e89f5..954bc7a 100644
--- a/PkmnLibSharp/Generated/Pkmnlib/TurnChoiceKind.cs
+++ b/PkmnLibSharp/Generated/Pkmnlib/TurnChoiceKind.cs
@@ -4,7 +4,7 @@ using System.Diagnostics.CodeAnalysis;
 namespace Pkmnlib
 {
     [SuppressMessage("ReSharper", "InconsistentNaming")]
-    public enum TurnChoiceKind : byte
+    internal enum TurnChoiceKind : byte
     {
         Pass = 0,
         Attack = 1,
diff --git a/PkmnLibSharp/Generated/Pkmnlib/asEBehaviours.cs b/PkmnLibSharp/Generated/Pkmnlib/asEBehaviours.cs
index 44090f1..d634caf 100644
--- a/PkmnLibSharp/Generated/Pkmnlib/asEBehaviours.cs
+++ b/PkmnLibSharp/Generated/Pkmnlib/asEBehaviours.cs
@@ -4,7 +4,7 @@ using System.Diagnostics.CodeAnalysis;
 namespace Pkmnlib
 {
     [SuppressMessage("ReSharper", "InconsistentNaming")]
-    public enum asEBehaviours : int
+    internal enum asEBehaviours : int
     {
         asBEHAVE_CONSTRUCT = 0,
         asBEHAVE_LIST_CONSTRUCT = 1,
diff --git a/PkmnLibSharp/Generated/Pkmnlib/asECallConvTypes.cs b/PkmnLibSharp/Generated/Pkmnlib/asECallConvTypes.cs
index 26433dd..27a5132 100644
--- a/PkmnLibSharp/Generated/Pkmnlib/asECallConvTypes.cs
+++ b/PkmnLibSharp/Generated/Pkmnlib/asECallConvTypes.cs
@@ -4,7 +4,7 @@ using System.Diagnostics.CodeAnalysis;
 namespace Pkmnlib
 {
     [SuppressMessage("ReSharper", "InconsistentNaming")]
-    public enum asECallConvTypes : int
+    internal enum asECallConvTypes : int
     {
         asCALL_CDECL = 0,
         asCALL_STDCALL = 1,
diff --git a/PkmnLibSharp/Generated/Pkmnlib/asEContextState.cs b/PkmnLibSharp/Generated/Pkmnlib/asEContextState.cs
index f950494..ea11589 100644
--- a/PkmnLibSharp/Generated/Pkmnlib/asEContextState.cs
+++ b/PkmnLibSharp/Generated/Pkmnlib/asEContextState.cs
@@ -4,7 +4,7 @@ using System.Diagnostics.CodeAnalysis;
 namespace Pkmnlib
 {
     [SuppressMessage("ReSharper", "InconsistentNaming")]
-    public enum asEContextState : int
+    internal enum asEContextState : int
     {
         asEXECUTION_FINISHED = 0,
         asEXECUTION_SUSPENDED = 1,
diff --git a/PkmnLibSharp/Generated/Pkmnlib/asEEngineProp.cs b/PkmnLibSharp/Generated/Pkmnlib/asEEngineProp.cs
index 76698d7..946c05a 100644
--- a/PkmnLibSharp/Generated/Pkmnlib/asEEngineProp.cs
+++ b/PkmnLibSharp/Generated/Pkmnlib/asEEngineProp.cs
@@ -4,7 +4,7 @@ using System.Diagnostics.CodeAnalysis;
 namespace Pkmnlib
 {
     [SuppressMessage("ReSharper", "InconsistentNaming")]
-    public enum asEEngineProp : int
+    internal enum asEEngineProp : int
     {
         asEP_ALLOW_UNSAFE_REFERENCES = 1,
         asEP_REQUIRE_ENUM_SCOPE = 10,
diff --git a/PkmnLibSharp/Generated/Pkmnlib/asEFuncType.cs b/PkmnLibSharp/Generated/Pkmnlib/asEFuncType.cs
index 24e63b1..ff34129 100644
--- a/PkmnLibSharp/Generated/Pkmnlib/asEFuncType.cs
+++ b/PkmnLibSharp/Generated/Pkmnlib/asEFuncType.cs
@@ -4,7 +4,7 @@ using System.Diagnostics.CodeAnalysis;
 namespace Pkmnlib
 {
     [SuppressMessage("ReSharper", "InconsistentNaming")]
-    public enum asEFuncType : int
+    internal enum asEFuncType : int
     {
         asFUNC_DUMMY = -1,
         asFUNC_SYSTEM = 0,
diff --git a/PkmnLibSharp/Generated/Pkmnlib/asEGMFlags.cs b/PkmnLibSharp/Generated/Pkmnlib/asEGMFlags.cs
index 22b3ded..5fcf491 100644
--- a/PkmnLibSharp/Generated/Pkmnlib/asEGMFlags.cs
+++ b/PkmnLibSharp/Generated/Pkmnlib/asEGMFlags.cs
@@ -4,7 +4,7 @@ using System.Diagnostics.CodeAnalysis;
 namespace Pkmnlib
 {
     [SuppressMessage("ReSharper", "InconsistentNaming")]
-    public enum asEGMFlags : int
+    internal enum asEGMFlags : int
     {
         asGM_ONLY_IF_EXISTS = 0,
         asGM_CREATE_IF_NOT_EXISTS = 1,
diff --git a/PkmnLibSharp/Generated/Pkmnlib/asEMsgType.cs b/PkmnLibSharp/Generated/Pkmnlib/asEMsgType.cs
index 3282600..a75a686 100644
--- a/PkmnLibSharp/Generated/Pkmnlib/asEMsgType.cs
+++ b/PkmnLibSharp/Generated/Pkmnlib/asEMsgType.cs
@@ -4,7 +4,7 @@ using System.Diagnostics.CodeAnalysis;
 namespace Pkmnlib
 {
     [SuppressMessage("ReSharper", "InconsistentNaming")]
-    public enum asEMsgType : int
+    internal enum asEMsgType : int
     {
         asMSGTYPE_ERROR = 0,
         asMSGTYPE_WARNING = 1,
diff --git a/PkmnLibSharp/Generated/Pkmnlib/asEObjTypeFlags.cs b/PkmnLibSharp/Generated/Pkmnlib/asEObjTypeFlags.cs
index aff42b3..bba8182 100644
--- a/PkmnLibSharp/Generated/Pkmnlib/asEObjTypeFlags.cs
+++ b/PkmnLibSharp/Generated/Pkmnlib/asEObjTypeFlags.cs
@@ -4,7 +4,7 @@ using System.Diagnostics.CodeAnalysis;
 namespace Pkmnlib
 {
     [SuppressMessage("ReSharper", "InconsistentNaming")]
-    public enum asEObjTypeFlags : int
+    internal enum asEObjTypeFlags : int
     {
         asOBJ_REF = 1,
         asOBJ_APP_CLASS_DESTRUCTOR = 1024,
diff --git a/PkmnLibSharp/Generated/Pkmnlib/asERetCodes.cs b/PkmnLibSharp/Generated/Pkmnlib/asERetCodes.cs
index 738c2f1..ff393c0 100644
--- a/PkmnLibSharp/Generated/Pkmnlib/asERetCodes.cs
+++ b/PkmnLibSharp/Generated/Pkmnlib/asERetCodes.cs
@@ -4,7 +4,7 @@ using System.Diagnostics.CodeAnalysis;
 namespace Pkmnlib
 {
     [SuppressMessage("ReSharper", "InconsistentNaming")]
-    public enum asERetCodes : int
+    internal enum asERetCodes : int
     {
         asERROR = -1,
         asINVALID_DECLARATION = -10,
diff --git a/PkmnLibSharp/Generated/Pkmnlib/asETokenClass.cs b/PkmnLibSharp/Generated/Pkmnlib/asETokenClass.cs
index 3b1405e..1b74881 100644
--- a/PkmnLibSharp/Generated/Pkmnlib/asETokenClass.cs
+++ b/PkmnLibSharp/Generated/Pkmnlib/asETokenClass.cs
@@ -4,7 +4,7 @@ using System.Diagnostics.CodeAnalysis;
 namespace Pkmnlib
 {
     [SuppressMessage("ReSharper", "InconsistentNaming")]
-    public enum asETokenClass : int
+    internal enum asETokenClass : int
     {
         asTC_UNKNOWN = 0,
         asTC_KEYWORD = 1,
diff --git a/PkmnLibSharp/Generated/Pkmnlib/asETypeIdFlags.cs b/PkmnLibSharp/Generated/Pkmnlib/asETypeIdFlags.cs
index 0be4587..d3acaa8 100644
--- a/PkmnLibSharp/Generated/Pkmnlib/asETypeIdFlags.cs
+++ b/PkmnLibSharp/Generated/Pkmnlib/asETypeIdFlags.cs
@@ -4,7 +4,7 @@ using System.Diagnostics.CodeAnalysis;
 namespace Pkmnlib
 {
     [SuppressMessage("ReSharper", "InconsistentNaming")]
-    public enum asETypeIdFlags : int
+    internal enum asETypeIdFlags : int
     {
         asTYPEID_VOID = 0,
         asTYPEID_BOOL = 1,
diff --git a/PkmnLibSharp/Generated/Pkmnlib/asETypeModifiers.cs b/PkmnLibSharp/Generated/Pkmnlib/asETypeModifiers.cs
index 2da5d3c..740674f 100644
--- a/PkmnLibSharp/Generated/Pkmnlib/asETypeModifiers.cs
+++ b/PkmnLibSharp/Generated/Pkmnlib/asETypeModifiers.cs
@@ -4,7 +4,7 @@ using System.Diagnostics.CodeAnalysis;
 namespace Pkmnlib
 {
     [SuppressMessage("ReSharper", "InconsistentNaming")]
-    public enum asETypeModifiers : int
+    internal enum asETypeModifiers : int
     {
         asTM_NONE = 0,
         asTM_INREF = 1,
diff --git a/PkmnLibSharp/Generated/Pkmnlib/error_type.cs b/PkmnLibSharp/Generated/Pkmnlib/error_type.cs
index 5bdfadf..9d4f4fd 100644
--- a/PkmnLibSharp/Generated/Pkmnlib/error_type.cs
+++ b/PkmnLibSharp/Generated/Pkmnlib/error_type.cs
@@ -4,7 +4,7 @@ using System.Diagnostics.CodeAnalysis;
 namespace Pkmnlib
 {
     [SuppressMessage("ReSharper", "InconsistentNaming")]
-    public enum error_type : int
+    internal enum error_type : int
     {
         _S_error_collate = 0,
         _S_error_ctype = 1,
diff --git a/PkmnLibSharp/Generated/Pkmnlib/match_flag_type.cs b/PkmnLibSharp/Generated/Pkmnlib/match_flag_type.cs
index 191287c..1e9d09e 100644
--- a/PkmnLibSharp/Generated/Pkmnlib/match_flag_type.cs
+++ b/PkmnLibSharp/Generated/Pkmnlib/match_flag_type.cs
@@ -4,7 +4,7 @@ using System.Diagnostics.CodeAnalysis;
 namespace Pkmnlib
 {
     [SuppressMessage("ReSharper", "InconsistentNaming")]
-    public enum match_flag_type : int
+    internal enum match_flag_type : int
     {
     }
 }
diff --git a/PkmnLibSharp/Generated/Pkmnlib/memory_order.cs b/PkmnLibSharp/Generated/Pkmnlib/memory_order.cs
index 3e9565e..f4f137c 100644
--- a/PkmnLibSharp/Generated/Pkmnlib/memory_order.cs
+++ b/PkmnLibSharp/Generated/Pkmnlib/memory_order.cs
@@ -4,7 +4,7 @@ using System.Diagnostics.CodeAnalysis;
 namespace Pkmnlib
 {
     [SuppressMessage("ReSharper", "InconsistentNaming")]
-    public enum memory_order : int
+    internal enum memory_order : int
     {
         memory_order_relaxed = 0,
         memory_order_consume = 1,
diff --git a/PkmnLibSharp/Generated/Pkmnlib/syntax_option_type.cs b/PkmnLibSharp/Generated/Pkmnlib/syntax_option_type.cs
index 26ab24f..7647a87 100644
--- a/PkmnLibSharp/Generated/Pkmnlib/syntax_option_type.cs
+++ b/PkmnLibSharp/Generated/Pkmnlib/syntax_option_type.cs
@@ -4,7 +4,7 @@ using System.Diagnostics.CodeAnalysis;
 namespace Pkmnlib
 {
     [SuppressMessage("ReSharper", "InconsistentNaming")]
-    public enum syntax_option_type : int
+    internal enum syntax_option_type : int
     {
     }
 }
diff --git a/PkmnLibSharp/Library/EffectParameter.cs b/PkmnLibSharp/Library/EffectParameter.cs
index be613ee..a1f388f 100644
--- a/PkmnLibSharp/Library/EffectParameter.cs
+++ b/PkmnLibSharp/Library/EffectParameter.cs
@@ -4,6 +4,15 @@ using PkmnLibSharp.Utilities;
 
 namespace PkmnLibSharp.Library
 {
+    public enum EffectParameterType
+    {
+        None = 0,
+        Bool = 1,
+        Int = 2,
+        Float = 3,
+        String = 4,
+    }
+    
     public class EffectParameter : PointerWrapper
     {
         public EffectParameter(string s) : base(Creatureliblibrary.Generated.EffectParameter.FromString(s.ToPtr()))
diff --git a/PkmnLibSharp/Library/Forme.cs b/PkmnLibSharp/Library/Forme.cs
index a64a322..911dc54 100644
--- a/PkmnLibSharp/Library/Forme.cs
+++ b/PkmnLibSharp/Library/Forme.cs
@@ -40,12 +40,17 @@ namespace PkmnLibSharp.Library
             }
         }
 
-        public uint BaseHealth => SpeciesVariant.GetStatistic(Ptr, Statistic.Health);
-        public uint BaseAttack => SpeciesVariant.GetStatistic(Ptr, Statistic.PhysicalAttack);
-        public uint BaseDefense => SpeciesVariant.GetStatistic(Ptr, Statistic.PhysicalDefense);
-        public uint BaseSpecialAttack => SpeciesVariant.GetStatistic(Ptr, Statistic.MagicalAttack);
-        public uint BaseSpecialDefense => SpeciesVariant.GetStatistic(Ptr, Statistic.MagicalDefense);
-        public uint BaseSpeed => SpeciesVariant.GetStatistic(Ptr, Statistic.Speed);
+        public uint BaseHealth => SpeciesVariant.GetStatistic(Ptr, (byte) Statistic.Health);
+        public uint BaseAttack => SpeciesVariant.GetStatistic(Ptr, (Creatureliblibrary.Statistic) Statistic.Attack);
+        public uint BaseDefense => SpeciesVariant.GetStatistic(Ptr, (Creatureliblibrary.Statistic) Statistic.Defense);
+
+        public uint BaseSpecialAttack =>
+            SpeciesVariant.GetStatistic(Ptr, (Creatureliblibrary.Statistic) Statistic.SpecialAttack);
+
+        public uint BaseSpecialDefense =>
+            SpeciesVariant.GetStatistic(Ptr, (Creatureliblibrary.Statistic) Statistic.SpecialDefense);
+
+        public uint BaseSpeed => SpeciesVariant.GetStatistic(Ptr, (Creatureliblibrary.Statistic) Statistic.Speed);
 
         public ImmutableArray<string> Abilities
         {
@@ -67,6 +72,7 @@ namespace PkmnLibSharp.Library
                 return _abilities;
             }
         }
+
         public ImmutableArray<string> HiddenAbilities
         {
             get
@@ -98,6 +104,7 @@ namespace PkmnLibSharp.Library
                 {
                     _moves = new LearnableMoves(movesPtr);
                 }
+
                 return _moves;
             }
         }
diff --git a/PkmnLibSharp/Library/Items/BattleItemCategory.cs b/PkmnLibSharp/Library/Items/BattleItemCategory.cs
new file mode 100644
index 0000000..a4246c5
--- /dev/null
+++ b/PkmnLibSharp/Library/Items/BattleItemCategory.cs
@@ -0,0 +1,11 @@
+namespace PkmnLibSharp.Library.Items
+{
+    public enum BattleItemCategory
+    {
+        None = 0,
+        Healing = 1,
+        StatusHealing = 2,
+        Pokeball = 3,
+        MiscBattleItem = 4,
+    }
+}
\ No newline at end of file
diff --git a/PkmnLibSharp/Library/Item.cs b/PkmnLibSharp/Library/Items/Item.cs
similarity index 84%
rename from PkmnLibSharp/Library/Item.cs
rename to PkmnLibSharp/Library/Items/Item.cs
index 2a92ab8..31a52c4 100644
--- a/PkmnLibSharp/Library/Item.cs
+++ b/PkmnLibSharp/Library/Items/Item.cs
@@ -1,10 +1,8 @@
 using System;
 using System.Linq;
 using PkmnLibSharp.Utilities;
-using BattleItemCategory = Pkmnlib.BattleItemCategory;
-using ItemCategory = Pkmnlib.ItemCategory;
 
-namespace PkmnLibSharp.Library
+namespace PkmnLibSharp.Library.Items
 {
     public class Item : PointerWrapper
     {
@@ -12,8 +10,10 @@ namespace PkmnLibSharp.Library
 
         public string Name => _name ??= Creatureliblibrary.Generated.Item.GetName(Ptr).PtrString();
         public ItemCategory Category => (ItemCategory) Creatureliblibrary.Generated.Item.GetCategory(Ptr);
+
         public BattleItemCategory BattleCategory =>
             (BattleItemCategory) Creatureliblibrary.Generated.Item.GetBattleCategory(Ptr);
+
         public int Price => Creatureliblibrary.Generated.Item.GetPrice(Ptr);
         public byte FlingPower => Pkmnlib.Generated.Item.GetFlingPower(Ptr);
 
@@ -21,7 +21,7 @@ namespace PkmnLibSharp.Library
         {
             return Creatureliblibrary.Generated.Item.HasFlag(Ptr, s.ToPtr()) == MarshalHelper.True;
         }
-        
+
         internal Item(IntPtr ptr) : base(ptr)
         {
         }
@@ -31,8 +31,8 @@ namespace PkmnLibSharp.Library
             string[] flags, byte flingPower)
         {
             var convertedFlags = flags.Select(x => x.ToPtr()).ToArray().ArrayPtr();
-            var p = Pkmnlib.Generated.Item.Construct(name.ToPtr(), category, battleCategory, price, convertedFlags,
-                (ulong) flags.Length, flingPower);
+            var p = Pkmnlib.Generated.Item.Construct(name.ToPtr(), (Pkmnlib.ItemCategory) category,
+                (Pkmnlib.BattleItemCategory) battleCategory, price, convertedFlags, (ulong) flags.Length, flingPower);
             return new Item(p);
         }
 
diff --git a/PkmnLibSharp/Library/Items/ItemCategory.cs b/PkmnLibSharp/Library/Items/ItemCategory.cs
new file mode 100644
index 0000000..a975396
--- /dev/null
+++ b/PkmnLibSharp/Library/Items/ItemCategory.cs
@@ -0,0 +1,14 @@
+namespace PkmnLibSharp.Library
+{
+    public enum ItemCategory
+    {
+        MiscItem = 0,
+        Pokeball = 1,
+        Medicine = 2,
+        Berry = 3,
+        TechnicalMachine = 4,
+        FormeChanger = 5,
+        KeyItem = 6,
+        Mail = 7,
+    }
+}
\ No newline at end of file
diff --git a/PkmnLibSharp/Library/ItemLibrary.cs b/PkmnLibSharp/Library/Items/ItemLibrary.cs
similarity index 98%
rename from PkmnLibSharp/Library/ItemLibrary.cs
rename to PkmnLibSharp/Library/Items/ItemLibrary.cs
index 8748cb2..3cd01c0 100644
--- a/PkmnLibSharp/Library/ItemLibrary.cs
+++ b/PkmnLibSharp/Library/Items/ItemLibrary.cs
@@ -2,7 +2,7 @@ using System;
 using System.Collections.Generic;
 using PkmnLibSharp.Utilities;
 
-namespace PkmnLibSharp.Library
+namespace PkmnLibSharp.Library.Items
 {
     public class ItemLibrary : PointerWrapper
     {
diff --git a/PkmnLibSharp/Library/LearnableMoves.cs b/PkmnLibSharp/Library/LearnableMoves.cs
index 24106ed..87351b9 100644
--- a/PkmnLibSharp/Library/LearnableMoves.cs
+++ b/PkmnLibSharp/Library/LearnableMoves.cs
@@ -1,5 +1,6 @@
 using System;
 using Creatureliblibrary.Generated;
+using PkmnLibSharp.Library.Moves;
 using PkmnLibSharp.Utilities;
 
 namespace PkmnLibSharp.Library
diff --git a/PkmnLibSharp/Library/Moves/MoveCategory.cs b/PkmnLibSharp/Library/Moves/MoveCategory.cs
new file mode 100644
index 0000000..b5774c2
--- /dev/null
+++ b/PkmnLibSharp/Library/Moves/MoveCategory.cs
@@ -0,0 +1,9 @@
+namespace PkmnLibSharp.Library.Moves
+{
+    public enum MoveCategory
+    {
+        Physical = 0,
+        Special = 1,
+        Status = 2,
+    }
+}
\ No newline at end of file
diff --git a/PkmnLibSharp/Library/MoveData.cs b/PkmnLibSharp/Library/Moves/MoveData.cs
similarity index 89%
rename from PkmnLibSharp/Library/MoveData.cs
rename to PkmnLibSharp/Library/Moves/MoveData.cs
index 3d383e1..99df2b7 100644
--- a/PkmnLibSharp/Library/MoveData.cs
+++ b/PkmnLibSharp/Library/Moves/MoveData.cs
@@ -1,12 +1,11 @@
 using System;
 using System.Linq;
-using System.Runtime.InteropServices;
 using Creatureliblibrary.Generated;
 using Pkmnlib;
 using PkmnLibSharp.Utilities;
 using AttackCategory = Creatureliblibrary.AttackCategory;
 
-namespace PkmnLibSharp.Library
+namespace PkmnLibSharp.Library.Moves
 {
     public class MoveData : PointerWrapper
     {
@@ -19,7 +18,7 @@ namespace PkmnLibSharp.Library
         public byte BasePower => AttackData.GetBasePower(Ptr);
         public byte Accuracy => AttackData.GetAccuracy(Ptr);
         public byte BaseUsages => AttackData.GetBaseUsages(Ptr);
-        public AttackTarget Target => (AttackTarget) AttackData.GetTarget(Ptr);
+        public MoveTarget Target => (MoveTarget) AttackData.GetTarget(Ptr);
         public sbyte Priority => AttackData.GetPriority(Ptr);
         public bool HasSecondaryEffect => AttackData.HasSecondaryEffect(Ptr) == 1;
         public float SecondaryEffectChance => AttackData.GetSecondaryEffectChance(Ptr);
@@ -33,7 +32,7 @@ namespace PkmnLibSharp.Library
         }
 
         public static MoveData Create(string name, byte type, MoveCategory category, byte power, byte accuracy,
-            byte baseUsage, AttackTarget target, sbyte priority, float effectChance, string effectName,
+            byte baseUsage, MoveTarget target, sbyte priority, float effectChance, string effectName,
             EffectParameter[] parameters, string[] flags)
         {
             var ptr = IntPtr.Zero;
diff --git a/PkmnLibSharp/Library/MoveLibrary.cs b/PkmnLibSharp/Library/Moves/MoveLibrary.cs
similarity index 98%
rename from PkmnLibSharp/Library/MoveLibrary.cs
rename to PkmnLibSharp/Library/Moves/MoveLibrary.cs
index d27ac1e..baa1cf7 100644
--- a/PkmnLibSharp/Library/MoveLibrary.cs
+++ b/PkmnLibSharp/Library/Moves/MoveLibrary.cs
@@ -3,7 +3,7 @@ using System.Collections.Generic;
 using Creatureliblibrary.Generated;
 using PkmnLibSharp.Utilities;
 
-namespace PkmnLibSharp.Library
+namespace PkmnLibSharp.Library.Moves
 {
     public class MoveLibrary : PointerWrapper
     {
diff --git a/PkmnLibSharp/Library/Moves/MoveTarget.cs b/PkmnLibSharp/Library/Moves/MoveTarget.cs
new file mode 100644
index 0000000..f64603f
--- /dev/null
+++ b/PkmnLibSharp/Library/Moves/MoveTarget.cs
@@ -0,0 +1,18 @@
+namespace PkmnLibSharp.Library.Moves
+{
+    public enum MoveTarget
+    {
+        Adjacent = 0,
+        AdjacentAlly = 1,
+        AdjacentAllySelf = 2,
+        AdjacentOpponent = 3,
+        All = 4,
+        AllAdjacent = 5,
+        AllAdjacentOpponent = 6,
+        AllAlly = 7,
+        AllOpponent = 8,
+        Any = 9,
+        RandomOpponent = 10,
+        Self = 11,
+    }
+}
\ No newline at end of file
diff --git a/PkmnLibSharp/Library/Nature.cs b/PkmnLibSharp/Library/Nature.cs
new file mode 100644
index 0000000..5f68ca2
--- /dev/null
+++ b/PkmnLibSharp/Library/Nature.cs
@@ -0,0 +1,36 @@
+using System;
+using PkmnLibSharp.Utilities;
+
+namespace PkmnLibSharp.Library
+{
+    public class Nature : PointerWrapper
+    {
+        internal Nature(IntPtr ptr) : base(ptr){}
+        
+        public Nature(Statistic increasedStat, Statistic decreasedStat, float increasedModifier = 1.1f,
+            float decreasedModifier = 0.9f) : base(Pkmnlib.Generated.Nature.Construct((Pkmnlib.Statistic) increasedStat,
+            (Pkmnlib.Statistic) decreasedStat,
+            increasedModifier, decreasedModifier))
+        {
+        }
+
+        public Nature() : this(Statistic.Health, Statistic.Health, 1f, 1f)
+        {
+        }
+
+        public float IncreasedModifier => Pkmnlib.Generated.Nature.GetIncreaseModifier(Ptr);
+        public float DecreasedModifier => Pkmnlib.Generated.Nature.GetDecreaseModifier(Ptr);
+        public Statistic IncreasedStat => (Statistic) Pkmnlib.Generated.Nature.GetIncreasedStat(Ptr);
+        public Statistic DecreasedStat => (Statistic) Pkmnlib.Generated.Nature.GetDecreasedStat(Ptr);
+
+        public float GetStatModifier(Statistic stat)
+        {
+            return Pkmnlib.Generated.Nature.GetStatModifier(Ptr, (Pkmnlib.Statistic) stat);
+        }
+
+        protected override void DeletePtr()
+        {
+            Pkmnlib.Generated.Nature.Destruct(Ptr);
+        }
+    }
+}
\ No newline at end of file
diff --git a/PkmnLibSharp/Library/NatureLibrary.cs b/PkmnLibSharp/Library/NatureLibrary.cs
new file mode 100644
index 0000000..1ae2390
--- /dev/null
+++ b/PkmnLibSharp/Library/NatureLibrary.cs
@@ -0,0 +1,56 @@
+using System;
+using System.Collections.Generic;
+using PkmnLibSharp.Utilities;
+
+namespace PkmnLibSharp.Library
+{
+    public class NatureLibrary : PointerWrapper
+    {
+        private readonly Dictionary<string, Nature> _cache =
+            new Dictionary<string, Nature>(StringComparer.InvariantCultureIgnoreCase);
+        private readonly Dictionary<IntPtr, string> _natureNames = new Dictionary<IntPtr, string>();
+
+        public NatureLibrary(ulong initialCapacity) : base(Pkmnlib.Generated.NatureLibrary.Construct(initialCapacity))
+        {
+        }
+
+        public void LoadNature(string name, Nature nature)
+        {
+            Pkmnlib.Generated.NatureLibrary.LoadNature(Ptr, name.ToPtr(), nature.Ptr).Assert();
+            _cache.Add(name, nature);
+            _natureNames.Add(nature.Ptr, name);
+        }
+
+        public Nature GetNature(string name)
+        {
+            if (_cache.TryGetValue(name, out var nature))
+                return nature;
+            var ptr = IntPtr.Zero;
+            Pkmnlib.Generated.NatureLibrary.GetNatureByName(Ptr, name.ToPtr(), ref ptr).Assert();
+            if (TryResolvePointer(ptr, out nature))
+            {
+                _cache.Add(name, nature);
+                _natureNames.Add(ptr, name);
+                return nature;
+            }
+            nature = new Nature(ptr);
+            _cache.Add(name, nature);
+            _natureNames.Add(ptr, name);
+            return nature;
+        }
+
+        public string GetNatureName(Nature nature)
+        {
+            if (_natureNames.TryGetValue(nature.Ptr, out var s))
+                return s;
+            var ptr = IntPtr.Zero;
+            Pkmnlib.Generated.NatureLibrary.GetNatureName(Ptr, nature.Ptr, ref ptr).Assert();
+            return ptr.PtrString();
+        }
+
+        protected override void DeletePtr()
+        {
+            Pkmnlib.Generated.NatureLibrary.Destruct(Ptr);
+        }
+    }
+}
\ No newline at end of file
diff --git a/PkmnLibSharp/Library/Statistic.cs b/PkmnLibSharp/Library/Statistic.cs
new file mode 100644
index 0000000..50df2fd
--- /dev/null
+++ b/PkmnLibSharp/Library/Statistic.cs
@@ -0,0 +1,12 @@
+namespace PkmnLibSharp.Library
+{
+    public enum Statistic : byte
+    {
+        Health = 0,
+        Attack = 1,
+        Defense = 2,
+        SpecialAttack = 3,
+        SpecialDefense = 4,
+        Speed = 5
+    }
+}
\ No newline at end of file
diff --git a/PkmnLibSharp/generator.py b/PkmnLibSharp/generator.py
index 9ffb68d..a612dcc 100644
--- a/PkmnLibSharp/generator.py
+++ b/PkmnLibSharp/generator.py
@@ -17,7 +17,7 @@ def write_enum(enum, enumNames):
         f.write("using System.Diagnostics.CodeAnalysis;\n\n")
         f.write("namespace {}\n{{\n".format(namespace))
         f.write("    [SuppressMessage(\"ReSharper\", \"InconsistentNaming\")]\n")
-        f.write("    public enum {} : {}\n    {{\n".format(enum["name"], resolve_enum_size(enum["byteSize"]) ))
+        f.write("    internal enum {} : {}\n    {{\n".format(enum["name"], resolve_enum_size(enum["byteSize"]) ))
         for k, v in enum["values"].items():
             f.write("        {} = {},\n".format(v, k))
         f.write("    }\n")
diff --git a/PkmnLibSharpTests/Library/ItemLibraryTests.cs b/PkmnLibSharpTests/Library/ItemLibraryTests.cs
index 8fb7e80..2bb66b4 100644
--- a/PkmnLibSharpTests/Library/ItemLibraryTests.cs
+++ b/PkmnLibSharpTests/Library/ItemLibraryTests.cs
@@ -1,6 +1,7 @@
 using NUnit.Framework;
 using Pkmnlib;
 using PkmnLibSharp.Library;
+using PkmnLibSharp.Library.Items;
 using PkmnLibSharp.Utilities;
 
 namespace PkmnLibSharpTests.Library
diff --git a/PkmnLibSharpTests/Library/ItemTests.cs b/PkmnLibSharpTests/Library/ItemTests.cs
index f0807db..15b196a 100644
--- a/PkmnLibSharpTests/Library/ItemTests.cs
+++ b/PkmnLibSharpTests/Library/ItemTests.cs
@@ -1,6 +1,7 @@
 using NUnit.Framework;
 using Pkmnlib;
 using PkmnLibSharp.Library;
+using PkmnLibSharp.Library.Items;
 
 namespace PkmnLibSharpTests.Library
 {
diff --git a/PkmnLibSharpTests/Library/MoveDataTests.cs b/PkmnLibSharpTests/Library/MoveDataTests.cs
index 423a318..96668db 100644
--- a/PkmnLibSharpTests/Library/MoveDataTests.cs
+++ b/PkmnLibSharpTests/Library/MoveDataTests.cs
@@ -1,6 +1,7 @@
 using NUnit.Framework;
 using Pkmnlib;
 using PkmnLibSharp.Library;
+using PkmnLibSharp.Library.Moves;
 
 namespace PkmnLibSharpTests.Library
 {
@@ -9,7 +10,7 @@ namespace PkmnLibSharpTests.Library
         [Test]
         public void ConstructDestruct()
         {
-            var move = MoveData.Create("foobar", 0, MoveCategory.Physical, 60, 100, 20, AttackTarget.Adjacent, 1,
+            var move = MoveData.Create("foobar", 0, MoveCategory.Physical, 60, 100, 20, MoveTarget.Adjacent, 1,
                 0, "", new EffectParameter[0], new string[0]);
             move.Dispose();
         }
@@ -17,7 +18,7 @@ namespace PkmnLibSharpTests.Library
         [Test]
         public void GetName()
         {
-            var move = MoveData.Create("foobar", 0, MoveCategory.Physical, 60, 100, 20, AttackTarget.Adjacent, 1,
+            var move = MoveData.Create("foobar", 0, MoveCategory.Physical, 60, 100, 20, MoveTarget.Adjacent, 1,
                 0, "", new EffectParameter[0], new string[0]);
             Assert.AreEqual("foobar", move.Name);
             move.Dispose();
@@ -26,7 +27,7 @@ namespace PkmnLibSharpTests.Library
         [Test]
         public void GetType()
         {
-            var move = MoveData.Create("foobar", 0, MoveCategory.Physical, 60, 100, 20, AttackTarget.Adjacent, 1,
+            var move = MoveData.Create("foobar", 0, MoveCategory.Physical, 60, 100, 20, MoveTarget.Adjacent, 1,
                 0, "", new EffectParameter[0], new string[0]);
             Assert.AreEqual(0, move.Type);
             move.Dispose();
@@ -35,7 +36,7 @@ namespace PkmnLibSharpTests.Library
         [Test]
         public void GetCategory()
         {
-            var move = MoveData.Create("foobar", 0, MoveCategory.Physical, 60, 100, 20, AttackTarget.Adjacent, 1,
+            var move = MoveData.Create("foobar", 0, MoveCategory.Physical, 60, 100, 20, MoveTarget.Adjacent, 1,
                 0, "", new EffectParameter[0], new string[0]);
             Assert.AreEqual(MoveCategory.Physical, move.Category);
             move.Dispose();
@@ -44,7 +45,7 @@ namespace PkmnLibSharpTests.Library
         [Test]
         public void GetBasePower()
         {
-            var move = MoveData.Create("foobar", 0, MoveCategory.Physical, 60, 100, 20, AttackTarget.Adjacent, 1,
+            var move = MoveData.Create("foobar", 0, MoveCategory.Physical, 60, 100, 20, MoveTarget.Adjacent, 1,
                 0, "", new EffectParameter[0], new string[0]);
             Assert.AreEqual(60, move.BasePower);
             move.Dispose();
@@ -53,7 +54,7 @@ namespace PkmnLibSharpTests.Library
         [Test]
         public void GetAccuracy()
         {
-            var move = MoveData.Create("foobar", 0, MoveCategory.Physical, 60, 100, 20, AttackTarget.Adjacent, 1,
+            var move = MoveData.Create("foobar", 0, MoveCategory.Physical, 60, 100, 20, MoveTarget.Adjacent, 1,
                 0, "", new EffectParameter[0], new string[0]);
             Assert.AreEqual(100, move.Accuracy);
             move.Dispose();
@@ -62,7 +63,7 @@ namespace PkmnLibSharpTests.Library
         [Test]
         public void GetBaseUsages()
         {
-            var move = MoveData.Create("foobar", 0, MoveCategory.Physical, 60, 100, 20, AttackTarget.Adjacent, 1,
+            var move = MoveData.Create("foobar", 0, MoveCategory.Physical, 60, 100, 20, MoveTarget.Adjacent, 1,
                 0, "", new EffectParameter[0], new string[0]);
             Assert.AreEqual(20, move.BaseUsages);
             move.Dispose();
@@ -71,16 +72,16 @@ namespace PkmnLibSharpTests.Library
         [Test]
         public void GetTarget()
         {
-            var move = MoveData.Create("foobar", 0, MoveCategory.Physical, 60, 100, 20, AttackTarget.Adjacent, 1,
+            var move = MoveData.Create("foobar", 0, MoveCategory.Physical, 60, 100, 20, MoveTarget.Adjacent, 1,
                 0, "", new EffectParameter[0], new string[0]);
-            Assert.AreEqual(AttackTarget.Adjacent, move.Target);
+            Assert.AreEqual(MoveTarget.Adjacent, move.Target);
             move.Dispose();
         }
 
         [Test]
         public void GetPriority()
         {
-            var move = MoveData.Create("foobar", 0, MoveCategory.Physical, 60, 100, 20, AttackTarget.Adjacent, 1,
+            var move = MoveData.Create("foobar", 0, MoveCategory.Physical, 60, 100, 20, MoveTarget.Adjacent, 1,
                 0, "", new EffectParameter[0], new string[0]);
             Assert.AreEqual(1, move.Priority);
             move.Dispose();
@@ -89,7 +90,7 @@ namespace PkmnLibSharpTests.Library
         [Test]
         public void GetEffectChance()
         {
-            var move = MoveData.Create("foobar", 0, MoveCategory.Physical, 60, 100, 20, AttackTarget.Adjacent, 1,
+            var move = MoveData.Create("foobar", 0, MoveCategory.Physical, 60, 100, 20, MoveTarget.Adjacent, 1,
                 0.5f, "", new EffectParameter[0], new string[0]);
             Assert.AreEqual(0.5f, move.SecondaryEffectChance);
             move.Dispose();
@@ -98,7 +99,7 @@ namespace PkmnLibSharpTests.Library
         [Test]
         public void GetEffectChanceName()
         {
-            var move = MoveData.Create("foobar", 0, MoveCategory.Physical, 60, 100, 20, AttackTarget.Adjacent, 1,
+            var move = MoveData.Create("foobar", 0, MoveCategory.Physical, 60, 100, 20, MoveTarget.Adjacent, 1,
                 0.5f, "test", new EffectParameter[0], new string[0]);
             Assert.AreEqual("test", move.SecondaryEffectName);
             move.Dispose();
@@ -107,11 +108,11 @@ namespace PkmnLibSharpTests.Library
         [Test]
         public void HasSecondaryEffect()
         {
-            var move = MoveData.Create("foobar", 0, MoveCategory.Physical, 60, 100, 20, AttackTarget.Adjacent, 1,
+            var move = MoveData.Create("foobar", 0, MoveCategory.Physical, 60, 100, 20, MoveTarget.Adjacent, 1,
                 0.5f, "test", new EffectParameter[0], new string[0]);
             Assert.True(move.HasSecondaryEffect);
             move.Dispose();
-            move = MoveData.Create("foobar", 0, MoveCategory.Physical, 60, 100, 20, AttackTarget.Adjacent, 1,
+            move = MoveData.Create("foobar", 0, MoveCategory.Physical, 60, 100, 20, MoveTarget.Adjacent, 1,
                 0.5f, "", new EffectParameter[0], new string[0]);
             Assert.False(move.HasSecondaryEffect);
             move.Dispose();
@@ -121,7 +122,7 @@ namespace PkmnLibSharpTests.Library
         [Test]
         public void HasFlag()
         {
-            var move = MoveData.Create("foobar", 0, MoveCategory.Physical, 60, 100, 20, AttackTarget.Adjacent, 1,
+            var move = MoveData.Create("foobar", 0, MoveCategory.Physical, 60, 100, 20, MoveTarget.Adjacent, 1,
                 0.5f, "test", new EffectParameter[0], new []{"flag1"});
             Assert.True(move.HasFlag("flag1"));
             Assert.False(move.HasFlag("flag2"));
diff --git a/PkmnLibSharpTests/Library/MoveLibraryTests.cs b/PkmnLibSharpTests/Library/MoveLibraryTests.cs
index cffe1b9..25f3f68 100644
--- a/PkmnLibSharpTests/Library/MoveLibraryTests.cs
+++ b/PkmnLibSharpTests/Library/MoveLibraryTests.cs
@@ -3,6 +3,7 @@ using NUnit.Framework;
 using Pkmnlib;
 using PkmnLibSharp;
 using PkmnLibSharp.Library;
+using PkmnLibSharp.Library.Moves;
 using PkmnLibSharp.Utilities;
 
 namespace PkmnLibSharpTests.Library
@@ -19,7 +20,7 @@ namespace PkmnLibSharpTests.Library
         [Test]
         public void Insert()
         {
-            var move = MoveData.Create("foobar", 0, MoveCategory.Physical, 60, 100, 20, AttackTarget.Adjacent, 1,
+            var move = MoveData.Create("foobar", 0, MoveCategory.Physical, 60, 100, 20, MoveTarget.Adjacent, 1,
                 0.5f, "test", new EffectParameter[0], new string[0]);
             var library = MoveLibrary.Create(100);
             library.Insert("foobar", move);
@@ -30,7 +31,7 @@ namespace PkmnLibSharpTests.Library
         [Test]
         public void Delete()
         {
-            var move = MoveData.Create("foobar", 0, MoveCategory.Physical, 60, 100, 20, AttackTarget.Adjacent, 1,
+            var move = MoveData.Create("foobar", 0, MoveCategory.Physical, 60, 100, 20, MoveTarget.Adjacent, 1,
                 0.5f, "test", new EffectParameter[0], new string[0]);
             var library = MoveLibrary.Create(100);
             library.Insert("foobar", move);
@@ -43,7 +44,7 @@ namespace PkmnLibSharpTests.Library
         [Test]
         public void Get()
         {
-            var move = MoveData.Create("foobar", 0, MoveCategory.Physical, 60, 100, 20, AttackTarget.Adjacent, 1,
+            var move = MoveData.Create("foobar", 0, MoveCategory.Physical, 60, 100, 20, MoveTarget.Adjacent, 1,
                 0.5f, "test", new EffectParameter[0], new string[0]);
             var library = MoveLibrary.Create(100);
             library.Insert("foobar", move);
@@ -60,7 +61,7 @@ namespace PkmnLibSharpTests.Library
         [Test]
         public void TryGet()
         {
-            var move = MoveData.Create("foobar", 0, MoveCategory.Physical, 60, 100, 20, AttackTarget.Adjacent, 1,
+            var move = MoveData.Create("foobar", 0, MoveCategory.Physical, 60, 100, 20, MoveTarget.Adjacent, 1,
                 0.5f, "test", new EffectParameter[0], new string[0]);
             var library = MoveLibrary.Create(100);
             library.Insert("foobar", move);
diff --git a/PkmnLibSharpTests/Library/NatureLibraryTests.cs b/PkmnLibSharpTests/Library/NatureLibraryTests.cs
new file mode 100644
index 0000000..c23e1ff
--- /dev/null
+++ b/PkmnLibSharpTests/Library/NatureLibraryTests.cs
@@ -0,0 +1,43 @@
+using NUnit.Framework;
+using PkmnLibSharp.Library;
+
+namespace PkmnLibSharpTests.Library
+{
+    public class NatureLibraryTests
+    {
+        [Test]
+        public void ConstructDestruct()
+        {
+            var nl = new NatureLibrary(0);
+            nl.Dispose();
+        }
+        
+        [Test]
+        public void LoadNature()
+        {
+            var nl = new NatureLibrary(1);
+            nl.LoadNature("foo", new Nature());
+            nl.Dispose();
+        }
+
+        [Test]
+        public void GetNature()
+        {
+            var nl = new NatureLibrary(1);
+            nl.LoadNature("foo", new Nature(Statistic.SpecialAttack, Statistic.SpecialDefense));
+            Assert.AreEqual(Statistic.SpecialAttack, nl.GetNature("foo").IncreasedStat);
+            nl.Dispose();
+        }
+
+        [Test]
+        public void GetNatureName()
+        {
+            var nl = new NatureLibrary(1);
+            nl.LoadNature("foo", new Nature(Statistic.SpecialAttack, Statistic.SpecialDefense));
+            var nature = nl.GetNature("foo");
+            Assert.AreEqual("foo", nl.GetNatureName(nature));
+            nl.Dispose();
+        }
+
+    }
+}
\ No newline at end of file
diff --git a/PkmnLibSharpTests/Library/NatureTests.cs b/PkmnLibSharpTests/Library/NatureTests.cs
new file mode 100644
index 0000000..a7a14c7
--- /dev/null
+++ b/PkmnLibSharpTests/Library/NatureTests.cs
@@ -0,0 +1,53 @@
+using NUnit.Framework;
+using PkmnLibSharp.Library;
+
+namespace PkmnLibSharpTests.Library
+{
+    public class NatureTests
+    {
+        [Test]
+        public void ConstructDestruct()
+        {
+            var nature = new Nature(Statistic.Attack, Statistic.Defense);
+            nature.Dispose();
+        }
+        
+        [Test]
+        public void GetIncreasedStat()
+        {
+            var nature = new Nature(Statistic.Attack, Statistic.Defense);
+            Assert.AreEqual(Statistic.Attack, nature.IncreasedStat);
+            nature.Dispose();
+        }
+        [Test]
+        public void GetIncreasedModifier()
+        {
+            var nature = new Nature(Statistic.Attack, Statistic.Defense);
+            Assert.AreEqual(1.1f, nature.IncreasedModifier);
+            nature.Dispose();
+        }
+        [Test]
+        public void GetDecreasedStat()
+        {
+            var nature = new Nature(Statistic.Attack, Statistic.Defense);
+            Assert.AreEqual(Statistic.Defense, nature.DecreasedStat);
+            nature.Dispose();
+        }
+        [Test]
+        public void GetDecreasedModifier()
+        {
+            var nature = new Nature(Statistic.Attack, Statistic.Defense);
+            Assert.AreEqual(0.9f, nature.DecreasedModifier);
+            nature.Dispose();
+        }
+        [Test]
+        public void GetStatModifier()
+        {
+            var nature = new Nature(Statistic.Attack, Statistic.Defense);
+            Assert.AreEqual(0.9f, nature.GetStatModifier(Statistic.Defense));
+            Assert.AreEqual(1f, nature.GetStatModifier(Statistic.SpecialAttack));
+            nature.Dispose();
+        }
+
+    }
+}
\ No newline at end of file