diff --git a/Config/DefaultGameplayTags.ini b/Config/DefaultGameplayTags.ini
new file mode 100644
index 0000000..ab0d74b
--- /dev/null
+++ b/Config/DefaultGameplayTags.ini
@@ -0,0 +1,25 @@
+[/Script/GameplayTags.GameplayTagsSettings]
+ImportTagsFromConfig=True
+WarnOnInvalidTags=True
+ClearInvalidTags=False
+AllowEditorTagUnloading=True
+AllowGameTagUnloading=False
+FastReplication=False
+InvalidTagCharacters="\"\',"
+NumBitsForContainerSize=6
+NetIndexFirstBitSegment=16
++GameplayTagList=(Tag="Character.Action.Attack.ChargedAttack",DevComment="")
++GameplayTagList=(Tag="Character.Action.Attack.FallingAttack",DevComment="")
++GameplayTagList=(Tag="Character.Action.Attack.HeavyAttack",DevComment="")
++GameplayTagList=(Tag="Character.Action.Attack.LightAttack",DevComment="")
++GameplayTagList=(Tag="Character.Action.Attack.SprintAttck",DevComment="")
++GameplayTagList=(Tag="Character.Action.Dodge",DevComment="")
++GameplayTagList=(Tag="Character.Action.EnterCombat",DevComment="")
++GameplayTagList=(Tag="Character.Action.ExitCombat",DevComment="")
++GameplayTagList=(Tag="Character.Action.GeneralAction",DevComment="")
++GameplayTagList=(Tag="Character.State.Attacking",DevComment="")
++GameplayTagList=(Tag="Character.State.Dead",DevComment="")
++GameplayTagList=(Tag="Character.State.Disabled",DevComment="")
++GameplayTagList=(Tag="Character.State.Dodging",DevComment="")
++GameplayTagList=(Tag="Character.State.GeneralActionState",DevComment="")
+
diff --git a/Content/CombatSystem/Blueprints/Actor/BP_BaseWeapon.uasset b/Content/CombatSystem/Blueprints/Actor/BP_BaseWeapon.uasset
index 86c41a5..f212db0 100644
Binary files a/Content/CombatSystem/Blueprints/Actor/BP_BaseWeapon.uasset and b/Content/CombatSystem/Blueprints/Actor/BP_BaseWeapon.uasset differ
diff --git a/Content/CombatSystem/Blueprints/Actor/BP_GreatSword.uasset b/Content/CombatSystem/Blueprints/Actor/BP_GreatSword.uasset
index d503d36..bc82fb6 100644
Binary files a/Content/CombatSystem/Blueprints/Actor/BP_GreatSword.uasset and b/Content/CombatSystem/Blueprints/Actor/BP_GreatSword.uasset differ
diff --git a/Content/CombatSystem/Blueprints/Actor/BP_ToughSword.uasset b/Content/CombatSystem/Blueprints/Actor/BP_ToughSword.uasset
index cd75d41..5135faf 100644
Binary files a/Content/CombatSystem/Blueprints/Actor/BP_ToughSword.uasset and b/Content/CombatSystem/Blueprints/Actor/BP_ToughSword.uasset differ
diff --git a/Content/CombatSystem/Blueprints/BP_CombatCharacter.uasset b/Content/CombatSystem/Blueprints/BP_CombatCharacter.uasset
index fa55bdf..af741ee 100644
Binary files a/Content/CombatSystem/Blueprints/BP_CombatCharacter.uasset and b/Content/CombatSystem/Blueprints/BP_CombatCharacter.uasset differ
diff --git a/Content/CombatSystem/Blueprints/BP_TestDummyCharacters.uasset b/Content/CombatSystem/Blueprints/BP_TestDummyCharacters.uasset
index 712091b..b4047e6 100644
Binary files a/Content/CombatSystem/Blueprints/BP_TestDummyCharacters.uasset and b/Content/CombatSystem/Blueprints/BP_TestDummyCharacters.uasset differ
diff --git a/Content/CombatSystem/Blueprints/Components/BP_StateManagerComponent.uasset b/Content/CombatSystem/Blueprints/Components/BP_StateManagerComponent.uasset
index 0ac6b87..5a22363 100644
Binary files a/Content/CombatSystem/Blueprints/Components/BP_StateManagerComponent.uasset and b/Content/CombatSystem/Blueprints/Components/BP_StateManagerComponent.uasset differ
diff --git a/Content/CombatSystem/Blueprints/Components/BP_StatsComponent.uasset b/Content/CombatSystem/Blueprints/Components/BP_StatsComponent.uasset
index ef869ca..fc6a925 100644
Binary files a/Content/CombatSystem/Blueprints/Components/BP_StatsComponent.uasset and b/Content/CombatSystem/Blueprints/Components/BP_StatsComponent.uasset differ
diff --git a/Content/CombatSystem/Blueprints/Enums/E_CharacterAction.uasset b/Content/CombatSystem/Blueprints/Enums/E_CharacterAction.uasset
deleted file mode 100644
index de1ff5a..0000000
Binary files a/Content/CombatSystem/Blueprints/Enums/E_CharacterAction.uasset and /dev/null differ
diff --git a/Content/CombatSystem/Blueprints/Enums/E_CharacterState.uasset b/Content/CombatSystem/Blueprints/Enums/E_CharacterState.uasset
deleted file mode 100644
index bc8ffa7..0000000
Binary files a/Content/CombatSystem/Blueprints/Enums/E_CharacterState.uasset and /dev/null differ
diff --git a/Content/__ExternalActors__/Maps/ThirdPersonMap/7/WK/ZO5KCJOBJ60AQZIVVZILXZ.uasset b/Content/__ExternalActors__/Maps/ThirdPersonMap/7/WK/ZO5KCJOBJ60AQZIVVZILXZ.uasset
index 14e5b54..4bb5aa0 100644
Binary files a/Content/__ExternalActors__/Maps/ThirdPersonMap/7/WK/ZO5KCJOBJ60AQZIVVZILXZ.uasset and b/Content/__ExternalActors__/Maps/ThirdPersonMap/7/WK/ZO5KCJOBJ60AQZIVVZILXZ.uasset differ