diff --git a/WeaponPaints.cs b/WeaponPaints.cs
index 2ff9d54f..28a0a8a0 100644
--- a/WeaponPaints.cs
+++ b/WeaponPaints.cs
@@ -12,10 +12,50 @@ public class WeaponPaints : BasePlugin
     public override string ModuleName => "WeaponPaints";
     public override string ModuleDescription => "Connector for web-based player chosen wepaon paints.";
     public override string ModuleAuthor => "Nereziel";
-    public override string ModuleVersion => "0.5";
+    public override string ModuleVersion => "0.6";
     MySqlDb? MySql = null;
     public DateTime[] commandCooldown = new DateTime[Server.MaxPlayers];
     private Dictionary<ulong, Dictionary<nint, int>> g_playersSkins = new Dictionary<ulong, Dictionary<nint, int>>();
+    private static Dictionary<string, string> knifeTypes = new Dictionary<string, string>()
+    {
+        { "m9", "weapon_knife_m9_bayonet" },
+        { "karambit", "weapon_knife_karambit" },
+        { "bayonet", "weapon_bayonet" },
+        { "bowie", "weapon_knife_survival_bowie" },
+        { "butterfly", "weapon_knife_butterfly" },
+        { "falchion", "weapon_knife_falchion" },
+        { "flip", "weapon_knife_flip" },
+        { "gut", "weapon_knife_gut" },
+        { "tactical", "weapon_knife_tactical" },
+        { "shadow", "weapon_knife_push" },
+        { "navaja", "weapon_knife_gypsy_jackknife" },
+        { "stiletto", "weapon_knife_stiletto" },
+        { "talon", "weapon_knife_widowmaker" },
+        { "ursus", "weapon_knife_ursus" },
+        { "css", "weapon_knife_css" },
+        { "paracord", "weapon_knife_cord" },
+        { "survival", "weapon_knife_canis" },
+        { "nomad", "weapon_knife_outdoor" },
+        { "skeleton", "weapon_knife_skeleton" },
+        { "default", "weapon_knife" }
+    };
+    private static List<string> weaponList = new List<string>()
+    {
+        "weapon_deagle",        "weapon_elite",        "weapon_fiveseven",        "weapon_glock",
+        "weapon_ak47",        "weapon_aug",        "weapon_awp",        "weapon_famas",
+        "weapon_g3sg1",        "weapon_galilar",        "weapon_m249",        "weapon_m4a1",
+        "weapon_mac10",        "weapon_p90",        "weapon_mp5sd",        "weapon_ump45",
+        "weapon_xm1014",        "weapon_bizon",        "weapon_mag7",        "weapon_negev",
+        "weapon_sawedoff",        "weapon_tec9",        "weapon_hkp2000",        "weapon_mp7",
+        "weapon_mp9",        "weapon_nova",        "weapon_p250",        "weapon_scar20",
+        "weapon_sg556",        "weapon_ssg08",        "weapon_m4a1_silencer",        "weapon_usp_silencer",
+        "weapon_cz75a",        "weapon_revolver",        "weapon_bayonet",        "weapon_knife_css",
+        "weapon_knife_flip",        "weapon_knife_gut",        "weapon_knife_karambit",        "weapon_knife_m9_bayonet",
+        "weapon_knife_tactical",        "weapon_knife_falchion",        "weapon_knife_survival_bowie",        "weapon_knife_butterfly",
+        "weapon_knife_push",        "weapon_knife_cord",        "weapon_knife_canis",        "weapon_knife_ursus",
+        "weapon_knife_gypsy_jackknife",        "weapon_knife_outdoor",        "weapon_knife_stiletto",        "weapon_knife_widowmaker",
+        "weapon_knife_skeleton"
+    };
 
     public override void Load(bool hotReload)
     {
@@ -40,15 +80,18 @@ public class WeaponPaints : BasePlugin
     private void OnEntitySpawned(CEntityInstance entity)
     {
         var designerName = entity.DesignerName;
-        if (!designerName.Contains("weapon_")) return;
-        if (designerName.Contains("knife")) return;
-        if (designerName.Contains("bayonet")) return;
+        if (!weaponList.Contains(designerName)) return;
+        bool isKnife = false;
         var weapon = new CBasePlayerWeapon(entity.Handle);
+        if (designerName.Contains("knife") || designerName.Contains("bayonet"))
+        {
+            isKnife = true;
+        }
         Server.NextFrame(() =>
         {
             if (!weapon.IsValid || !weapon.OwnerEntity.IsValid) return;
             var pawn = new CBasePlayerPawn(NativeAPI.GetEntityFromIndex((int)weapon.OwnerEntity.Value.EntityIndex!.Value.Value));
-            if (!pawn.IsValid) return;
+            if (!pawn.IsValid || !pawn.Controller.Value.IsValid) return;
             var playerIndex = (int)pawn.Controller.Value.EntityIndex!.Value.Value;
             CCSPlayerController player = Utilities.GetPlayerFromIndex(playerIndex);
             if (player == null || !player.IsValid) return;
@@ -62,7 +105,7 @@ public class WeaponPaints : BasePlugin
                     weapon.FallbackPaintKit = weaponPaint;
                     weapon.FallbackSeed = 0;
                     weapon.FallbackWear = 0.0001f;
-                    if (weapon.AttributeManager.Item.AccountID > 0 && weapon.CBodyComponent != null && weapon.CBodyComponent.SceneNode != null)
+                    if (!isKnife && weapon.CBodyComponent != null && weapon.CBodyComponent.SceneNode != null)
                     {
                         var skeleton = GetSkeletonInstance(weapon.CBodyComponent.SceneNode);
                         skeleton.ModelState.MeshGroupMask = 2;
@@ -95,7 +138,7 @@ public class WeaponPaints : BasePlugin
         try
         {
             CCSPlayerController player = Utilities.GetPlayerFromSlot(playerSlot);
-            if (player == null || !player.IsValid) return;
+            if (player == null || !player.IsValid || player.IsBot) return;
             var steamId = new SteamID(player.SteamID);
 
             MySqlQueryCondition conditions = new MySqlQueryCondition()
diff --git a/WeaponPaints.csproj b/WeaponPaints.csproj
index 05156a5c..a0742fad 100644
--- a/WeaponPaints.csproj
+++ b/WeaponPaints.csproj
@@ -8,7 +8,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="CounterStrikeSharp.API" Version="1.0.28" />
+    <PackageReference Include="CounterStrikeSharp.API" Version="1.0.30" />
     <PackageReference Include="Nexd.MySQL" Version="1.0.1" />
   </ItemGroup>