diff --git a/scripts/mobiles/corellia/bageraset.py b/scripts/mobiles/corellia/bageraset.py
index 0d9175b6..d4996cba 100644
--- a/scripts/mobiles/corellia/bageraset.py
+++ b/scripts/mobiles/corellia/bageraset.py
@@ -1,6 +1,8 @@
 import sys
 from services.spawn import MobileTemplate
 from services.spawn import WeaponTemplate
+from resources.datatables import WeaponType
+from resources.datatables import Difficulty
 from java.util import Vector
 
 def addTemplate(core):
@@ -10,10 +12,7 @@ def addTemplate(core):
 	mobileTemplate.setLevel(29)
 	mobileTemplate.setMinLevel(29)
 	mobileTemplate.setMaxLevel(31)
-	mobileTemplate.setDifficulty(0)
-	mobileTemplate.setAttackRange(5)
-	mobileTemplate.setAttackSpeed(1.0)
-	mobileTemplate.setWeaponType(6)
+	mobileTemplate.setDifficulty(Difficulty.NORMAL)
 	mobileTemplate.setMinSpawnDistance(4)
 	mobileTemplate.setMaxSpawnDistance(8)
 	mobileTemplate.setDeathblow(False)
@@ -33,7 +32,7 @@ def addTemplate(core):
 	mobileTemplate.setTemplates(templates)
 	
 	weaponTemplates = Vector()
-	weapontemplate = WeaponTemplate('object/weapon/melee/unarmed/shared_unarmed_default.iff', 6, 1.0)
+	weapontemplate = WeaponTemplate('object/weapon/melee/unarmed/shared_unarmed_default.iff', WeaponType.UNARMED, 1.0, 5, 'kinetic')
 	weaponTemplates.add(weapontemplate)
 	mobileTemplate.setWeaponTemplateVector(weaponTemplates)
 	
diff --git a/scripts/mobiles/corellia/bageraset_bruiser.py b/scripts/mobiles/corellia/bageraset_bruiser.py
index 23161eba..995fdac4 100644
--- a/scripts/mobiles/corellia/bageraset_bruiser.py
+++ b/scripts/mobiles/corellia/bageraset_bruiser.py
@@ -1,6 +1,8 @@
 import sys
 from services.spawn import MobileTemplate
 from services.spawn import WeaponTemplate
+from resources.datatables import WeaponType
+from resources.datatables import Difficulty
 from java.util import Vector
 
 def addTemplate(core):
@@ -8,10 +10,7 @@ def addTemplate(core):
 	
 	mobileTemplate.setCreatureName('bageraset_bruiser')
 	mobileTemplate.setLevel(9)
-	mobileTemplate.setDifficulty(0)
-	mobileTemplate.setAttackRange(5)
-	mobileTemplate.setAttackSpeed(1.0)
-	mobileTemplate.setWeaponType(6)
+	mobileTemplate.setDifficulty(Difficulty.NORMAL)
 	mobileTemplate.setMinSpawnDistance(4)
 	mobileTemplate.setMaxSpawnDistance(8)
 	mobileTemplate.setDeathblow(False)
@@ -31,7 +30,7 @@ def addTemplate(core):
 	mobileTemplate.setTemplates(templates)
 	
 	weaponTemplates = Vector()
-	weapontemplate = WeaponTemplate('object/weapon/melee/unarmed/shared_unarmed_default.iff', 6, 1.0)
+	weapontemplate = WeaponTemplate('object/weapon/melee/unarmed/shared_unarmed_default.iff', WeaponType.UNARMED, 1.0, 5, 'kinetic')
 	weaponTemplates.add(weapontemplate)
 	mobileTemplate.setWeaponTemplateVector(weaponTemplates)
 	
diff --git a/scripts/mobiles/corellia/beldonnas_league_enforcer.py b/scripts/mobiles/corellia/beldonnas_league_enforcer.py
index 6164ee84..4282aca9 100644
--- a/scripts/mobiles/corellia/beldonnas_league_enforcer.py
+++ b/scripts/mobiles/corellia/beldonnas_league_enforcer.py
@@ -1,6 +1,9 @@
 import sys
 from services.spawn import MobileTemplate
 from services.spawn import WeaponTemplate
+from resources.datatables import WeaponType
+from resources.datatables import Difficulty
+from resources.datatables import Options
 from java.util import Vector
 
 def addTemplate(core):
@@ -8,10 +11,7 @@ def addTemplate(core):
 
 	mobileTemplate.setCreatureName('beldonnas_enforcer')
 	mobileTemplate.setLevel(40)
-	mobileTemplate.setDifficulty(0)
-	mobileTemplate.setAttackRange(15)
-	mobileTemplate.setAttackSpeed(1.0)
-	mobileTemplate.setWeaponType(1)
+	mobileTemplate.setDifficulty(Difficulty.NORMAL)
 	mobileTemplate.setMinSpawnDistance(4)
 	mobileTemplate.setMaxSpawnDistance(8)
 	mobileTemplate.setDeathblow(True)
@@ -19,7 +19,7 @@ def addTemplate(core):
 	mobileTemplate.setSocialGroup("beldonnas league")
 	mobileTemplate.setAssistRange(6)
 	mobileTemplate.setStalker(True)
-	mobileTemplate.setOptionsBitmask(192)
+	mobileTemplate.setOptionsBitmask(Options.AGGRESSIVE + Options.ATTACKABLE)
 
 	templates = Vector()
 	templates.add('object/mobile/shared_dressed_mercenary_elite_hum_f_01.iff')
@@ -27,7 +27,7 @@ def addTemplate(core):
 	mobileTemplate.setTemplates(templates)
 
 	weaponTemplates = Vector()
-	weapontemplate = WeaponTemplate('object/weapon/ranged/carbine/shared_carbine_e5.iff', 1, 1.0)
+	weapontemplate = WeaponTemplate('object/weapon/ranged/carbine/shared_carbine_e5.iff', WeaponType.CARBINE, 1.0, 15, 'energy')
 	weaponTemplates.add(weapontemplate)
 	mobileTemplate.setWeaponTemplateVector(weaponTemplates)