diff --git a/dDatabase/Tables/CDBehaviorParameterTable.cpp b/dDatabase/Tables/CDBehaviorParameterTable.cpp
index bbbdb2b6..05f39016 100644
--- a/dDatabase/Tables/CDBehaviorParameterTable.cpp
+++ b/dDatabase/Tables/CDBehaviorParameterTable.cpp
@@ -9,14 +9,20 @@ CDBehaviorParameterTable::CDBehaviorParameterTable(void) {
 		hash = 0;
 		CDBehaviorParameter entry;
 		entry.behaviorID = tableData.getIntField(0, -1);
-		entry.parameterID = tableData.getStringField(1, "");
+		auto candidateStringToAdd = std::string(tableData.getStringField(1, ""));
+		auto parameter = m_ParametersList.find(candidateStringToAdd);
+		if (parameter != m_ParametersList.end()) {
+			entry.parameterID = parameter;
+		} else {
+			entry.parameterID = m_ParametersList.insert(candidateStringToAdd).first;
+		}
 		entry.value = tableData.getFloatField(2, -1.0f);
 
 		GeneralUtils::hash_combine(hash, entry.behaviorID);
-		GeneralUtils::hash_combine(hash, entry.parameterID);
+		GeneralUtils::hash_combine(hash, *entry.parameterID);
 
 		auto it = m_Entries.find(entry.behaviorID);
-		m_ParametersList.insert(entry.parameterID);
+		m_ParametersList.insert(*entry.parameterID);
 		m_Entries.insert(std::make_pair(hash, entry));
 
 		tableData.nextRow();
@@ -36,7 +42,7 @@ CDBehaviorParameter CDBehaviorParameterTable::GetEntry(const uint32_t behaviorID
 {
 	CDBehaviorParameter returnValue;
 	returnValue.behaviorID = 0;
-	returnValue.parameterID = "";
+	returnValue.parameterID = m_ParametersList.end();
 	returnValue.value = defaultValue;
 
 	size_t hash = 0;
@@ -57,7 +63,7 @@ std::map<std::string, float> CDBehaviorParameterTable::GetParametersByBehaviorID
 		GeneralUtils::hash_combine(hash, parameterCandidate);
 		auto infoCandidate = m_Entries.find(hash);
 		if (infoCandidate != m_Entries.end()) {
-			returnInfo.insert(std::make_pair(infoCandidate->second.parameterID, infoCandidate->second.value));
+			returnInfo.insert(std::make_pair(*(infoCandidate->second.parameterID), infoCandidate->second.value));
 		}
 	}
 	return returnInfo;
diff --git a/dDatabase/Tables/CDBehaviorParameterTable.h b/dDatabase/Tables/CDBehaviorParameterTable.h
index 17605636..c45d287b 100644
--- a/dDatabase/Tables/CDBehaviorParameterTable.h
+++ b/dDatabase/Tables/CDBehaviorParameterTable.h
@@ -12,9 +12,9 @@
 
 //! BehaviorParameter Entry Struct
 struct CDBehaviorParameter {
-    unsigned int behaviorID;            //!< The Behavior ID
-    std::string parameterID;       //!< The Parameter ID
-    float value;                 //!< The value of the behavior template
+    unsigned int behaviorID;                                    //!< The Behavior ID
+    std::unordered_set<std::string>::iterator parameterID;      //!< The Parameter ID
+    float value;                                                //!< The value of the behavior template
 };
 
 //! BehaviorParameter table
diff --git a/dDatabase/Tables/CDBehaviorTemplateTable.cpp b/dDatabase/Tables/CDBehaviorTemplateTable.cpp
index c79f4177..b832400d 100644
--- a/dDatabase/Tables/CDBehaviorTemplateTable.cpp
+++ b/dDatabase/Tables/CDBehaviorTemplateTable.cpp
@@ -24,7 +24,13 @@ CDBehaviorTemplateTable::CDBehaviorTemplateTable(void) {
         entry.behaviorID = tableData.getIntField(0, -1);
         entry.templateID = tableData.getIntField(1, -1);
         entry.effectID = tableData.getIntField(2, -1);
-        entry.effectHandle = tableData.getStringField(3, "");
+        auto candidateToAdd = tableData.getStringField(3, "");
+        auto parameter = m_EffectHandles.find(candidateToAdd);
+        if (parameter != m_EffectHandles.end()) {
+            entry.effectHandle = parameter;
+        } else {
+            entry.effectHandle = m_EffectHandles.insert(candidateToAdd).first;
+        }
         
         this->entries.push_back(entry);
         this->entriesMappedByBehaviorID.insert(std::make_pair(entry.behaviorID, entry));
@@ -62,7 +68,8 @@ const CDBehaviorTemplate CDBehaviorTemplateTable::GetByBehaviorID(uint32_t behav
     if (entry == this->entriesMappedByBehaviorID.end()) {
         CDBehaviorTemplate entryToReturn;
         entryToReturn.behaviorID = 0;
-        entryToReturn.effectHandle = "";
+        entryToReturn.effectHandle = m_EffectHandles.end();
+        entryToReturn.effectID = 0;
         return entryToReturn;
     } else {
         return entry->second;
diff --git a/dDatabase/Tables/CDBehaviorTemplateTable.h b/dDatabase/Tables/CDBehaviorTemplateTable.h
index 36424c12..170da854 100644
--- a/dDatabase/Tables/CDBehaviorTemplateTable.h
+++ b/dDatabase/Tables/CDBehaviorTemplateTable.h
@@ -3,6 +3,7 @@
 // Custom Classes
 #include "CDTable.h"
 #include <unordered_map>
+#include <unordered_set>
 
 /*!
  \file CDBehaviorTemplateTable.hpp
@@ -11,10 +12,10 @@
 
 //! BehaviorTemplate Entry Struct
 struct CDBehaviorTemplate {
-    unsigned int behaviorID;                //!< The Behavior ID
-    unsigned int templateID;                //!< The Template ID (LOT)
-    unsigned int effectID;                  //!< The Effect ID attached
-    std::string effectHandle;          //!< The effect handle
+    unsigned int behaviorID;                                         //!< The Behavior ID
+    unsigned int templateID;                                         //!< The Template ID (LOT)
+    unsigned int effectID;                                           //!< The Effect ID attached
+    std::unordered_set<std::string>::iterator effectHandle;          //!< The effect handle
 };
 
 
@@ -23,6 +24,7 @@ class CDBehaviorTemplateTable : public CDTable {
 private:
     std::vector<CDBehaviorTemplate> entries;
     std::unordered_map<uint32_t, CDBehaviorTemplate> entriesMappedByBehaviorID;
+    std::unordered_set<std::string> m_EffectHandles;
 public:
     
     //! Constructor
diff --git a/dGame/dBehaviors/Behavior.cpp b/dGame/dBehaviors/Behavior.cpp
index ac1ab7de..a2329f96 100644
--- a/dGame/dBehaviors/Behavior.cpp
+++ b/dGame/dBehaviors/Behavior.cpp
@@ -445,7 +445,7 @@ Behavior::Behavior(const uint32_t behaviorId)
 
 	this->m_effectId = templateInDatabase.effectID;
 
-	this->m_effectHandle = templateInDatabase.effectHandle != "" ? new std::string(templateInDatabase.effectHandle) : nullptr;
+	this->m_effectHandle = *templateInDatabase.effectHandle != "" ? new std::string(*templateInDatabase.effectHandle) : nullptr;
 }