diff --git a/DRAMSys/simulator/library.pro b/DRAMSys/simulator/library.pro
index 8a17d847..c225875c 100644
--- a/DRAMSys/simulator/library.pro
+++ b/DRAMSys/simulator/library.pro
@@ -114,7 +114,9 @@ SOURCES += \
     src/simulation/Setup.cpp \
     src/error/ECC/Bit.cpp \
     src/error/ECC/ECC.cpp \
-    src/error/ECC/Word.cpp
+    src/error/ECC/Word.cpp \
+    src/error/eccbaseclass.cpp \
+    src/error/ecchamming.cpp
 
 HEADERS += \
     src/common/third_party/tinyxml2/tinyxml2.h \
@@ -178,10 +180,11 @@ HEADERS += \
     src/simulation/TraceSetup.h \
     src/simulation/DRAMSys.h \
     src/simulation/Setup.h \
-    src/error/controllerECC.h \
     src/error/ECC/Bit.h \
     src/error/ECC/ECC.h \
-    src/error/ECC/Word.h
+    src/error/ECC/Word.h \
+    src/error/eccbaseclass.h \
+    src/error/ecchamming.h
 
 thermalsim = $$(THERMALSIM)
 isEmpty(thermalsim) {
diff --git a/DRAMSys/simulator/resources/configs/simulator/ddr3-single-device.xml b/DRAMSys/simulator/resources/configs/simulator/ddr3-single-device.xml
index 0a19ff35..354ad0d5 100644
--- a/DRAMSys/simulator/resources/configs/simulator/ddr3-single-device.xml
+++ b/DRAMSys/simulator/resources/configs/simulator/ddr3-single-device.xml
@@ -11,6 +11,7 @@
     <NumberOfDevicesOnDIMM value = "8" />
     <CheckTLM2Protocol value = "0" />
     <AddressOffset value = "0" />
+    <ECCControllerMode value = "Disabled" />
     <ErrorChipSeed value="42" />
     <ErrorCSVFile value="" />
     <!-- Modes:
diff --git a/DRAMSys/simulator/resources/configs/simulator/ddr3.xml b/DRAMSys/simulator/resources/configs/simulator/ddr3.xml
index 155ab0ff..d48f6a8d 100644
--- a/DRAMSys/simulator/resources/configs/simulator/ddr3.xml
+++ b/DRAMSys/simulator/resources/configs/simulator/ddr3.xml
@@ -11,6 +11,7 @@
     <NumberOfDevicesOnDIMM value = "8" />
     <CheckTLM2Protocol value = "0" />
     <AddressOffset value = "0" />
+    <ECCControllerMode value = "Disabled" />
     <ErrorChipSeed value="42" />
     <ErrorCSVFile value="" />
     <!-- Modes:
diff --git a/DRAMSys/simulator/resources/configs/simulator/ddr3_ecc.xml b/DRAMSys/simulator/resources/configs/simulator/ddr3_ecc.xml
index f22a1f9c..70a766c4 100644
--- a/DRAMSys/simulator/resources/configs/simulator/ddr3_ecc.xml
+++ b/DRAMSys/simulator/resources/configs/simulator/ddr3_ecc.xml
@@ -11,7 +11,7 @@
     <NumberOfDevicesOnDIMM value = "8" />
     <CheckTLM2Protocol value = "0" />
     <AddressOffset value = "0" />
-    <EnableControllerECC value = "1" />
+    <ECCControllerMode value = "Hamming" />
     <ErrorChipSeed value="42" />
     <ErrorCSVFile value="" />
     <!-- Modes:
diff --git a/DRAMSys/simulator/resources/configs/simulator/wideio.xml b/DRAMSys/simulator/resources/configs/simulator/wideio.xml
index ba435056..34c328c3 100644
--- a/DRAMSys/simulator/resources/configs/simulator/wideio.xml
+++ b/DRAMSys/simulator/resources/configs/simulator/wideio.xml
@@ -10,6 +10,7 @@
     <NumberOfMemChannels value="4"/>
     <NumberOfDevicesOnDIMM value = "1" />
     <CheckTLM2Protocol value = "0" />
+    <ECCControllerMode value = "Disabled" />
     <ErrorChipSeed value="42" />
     <ErrorCSVFile value="../../DRAMSys/simulator/resources/error/wideio.csv" />
     <!-- Modes:
diff --git a/DRAMSys/simulator/resources/configs/simulator/wideio_ecc.xml b/DRAMSys/simulator/resources/configs/simulator/wideio_ecc.xml
index 3a7c43e5..49967b58 100644
--- a/DRAMSys/simulator/resources/configs/simulator/wideio_ecc.xml
+++ b/DRAMSys/simulator/resources/configs/simulator/wideio_ecc.xml
@@ -10,7 +10,7 @@
     <NumberOfMemChannels value="1"/>
     <NumberOfDevicesOnDIMM value = "1" />
     <CheckTLM2Protocol value = "0" />
-    <EnableControllerECC value = "1" />
+    <ECCControllerMode value = "Hamming" />
     <ErrorChipSeed value="42" />
     <ErrorCSVFile value="../../DRAMSys/simulator/resources/error/wideio.csv" />
     <!-- Modes:
diff --git a/DRAMSys/simulator/resources/configs/simulator/wideio_thermal.xml b/DRAMSys/simulator/resources/configs/simulator/wideio_thermal.xml
index 880e573d..f3a99d72 100644
--- a/DRAMSys/simulator/resources/configs/simulator/wideio_thermal.xml
+++ b/DRAMSys/simulator/resources/configs/simulator/wideio_thermal.xml
@@ -10,6 +10,7 @@
     <NumberOfMemChannels value="1"/>
     <NumberOfDevicesOnDIMM value = "1" />
     <CheckTLM2Protocol value = "0" />
+    <ECCControllerMode value = "Disabled" />
     <ErrorChipSeed value="42" />
     <ErrorCSVFile value="../../DRAMSys/simulator/resources/error/wideio.csv" />
     <!-- Modes:
diff --git a/DRAMSys/simulator/src/controller/core/configuration/Configuration.cpp b/DRAMSys/simulator/src/controller/core/configuration/Configuration.cpp
index 3598217b..c77fe1f6 100644
--- a/DRAMSys/simulator/src/controller/core/configuration/Configuration.cpp
+++ b/DRAMSys/simulator/src/controller/core/configuration/Configuration.cpp
@@ -110,6 +110,19 @@ EPowerDownMode string2PDNMode(string s)
     }
 }
 
+ECCControllerMode string2ECCControllerMode(string s)
+{
+	if(s == "Disabled")
+		return ECCControllerMode::Disabled;
+	else if(s == "Hamming")
+		return ECCControllerMode::Hamming;
+	else
+	{
+		SC_REPORT_FATAL("Configuration", ("Unknown ECCControllerMode: " + s).c_str());
+		throw;
+	}
+}
+
 enum sc_time_unit string2TimeUnit(string s)
 {
     if (s == "s")
@@ -201,8 +214,8 @@ void Configuration::setParameter(std::string name, std::string value)
     }
     else if(name == "CheckTLM2Protocol")
         CheckTLM2Protocol = string2bool(value);
-    else if(name == "EnableControllerECC")
-        EnableControllerECC = string2bool(value);
+	else if(name == "ECCControllerMode")
+		ECCMode = string2ECCControllerMode(value);
     // Specification for ErrorChipSeed, ErrorCSVFile path and StoreMode
     else if(name == "ErrorChipSeed")
         ErrorChipSeed = string2int(value);
@@ -311,3 +324,15 @@ unsigned int Configuration::getBytesPerBurst()
     return bytesPerBurst;
 }
 
+// Changes the number of bytes depeding on the ECC Controller. This function is needed for modules which get data directly or indirectly from the ECC Controller
+unsigned int Configuration::adjustNumBytesAfterECC(unsigned nBytes)
+{
+	// Manipulate the number of bytes only if there is an ECC Controller selected
+	if(ECCMode == ECCControllerMode::Disabled)
+		return nBytes;
+	else
+	{
+		assert(pECC != nullptr);
+		return pECC->AllocationSize(nBytes);
+	}
+}
diff --git a/DRAMSys/simulator/src/controller/core/configuration/Configuration.h b/DRAMSys/simulator/src/controller/core/configuration/Configuration.h
index 1e5326c9..6823e590 100644
--- a/DRAMSys/simulator/src/controller/core/configuration/Configuration.h
+++ b/DRAMSys/simulator/src/controller/core/configuration/Configuration.h
@@ -45,10 +45,14 @@
 #include "thermalSimConfig.h"
 #include "../../../common/Utils.h"
 
+#include "../../../error/eccbaseclass.h"
+
 enum class StorageMode{NoStorage, Store, ErrorModel};
 
 enum class EPowerDownMode{NoPowerDown, Staggered, TimeoutPDN, TimeoutSREF};
 
+enum class ECCControllerMode{Disabled, Hamming};
+
 struct  Configuration
 {
     static std::string memspecUri;
@@ -81,7 +85,8 @@ struct  Configuration
     bool SimulationProgressBar = false;
     unsigned int NumberOfDevicesOnDIMM = 1;
     bool CheckTLM2Protocol = false;
-    bool EnableControllerECC = false;
+	ECCControllerMode ECCMode = ECCControllerMode::Disabled;
+	ECCBaseClass* pECC = nullptr;
     bool gem5 = false;
     unsigned long long int AddressOffset = 0;
 
@@ -102,6 +107,7 @@ struct  Configuration
     std::uint64_t getSimMemSizeInBytes();
     unsigned int getDataBusWidth();
     unsigned int getBytesPerBurst();
+	unsigned int adjustNumBytesAfterECC(unsigned bytes);
     void setPathToResources(std::string path);
     std::string getPathToResources();
 
diff --git a/DRAMSys/simulator/src/error/ECC/Word.cpp b/DRAMSys/simulator/src/error/ECC/Word.cpp
index f260d76c..fbf82ef3 100644
--- a/DRAMSys/simulator/src/error/ECC/Word.cpp
+++ b/DRAMSys/simulator/src/error/ECC/Word.cpp
@@ -1,6 +1,8 @@
 #include "Word.h"
 
+#include <math.h>
 #include <iostream>
+#include <string.h>
 
 using std::cout;
 
@@ -47,7 +49,7 @@ void CWord::Set(unsigned data)
 	}
 }
 
-void CWord::Set(unsigned char* data, unsigned lengthInBits)
+void CWord::Set(const unsigned char* data, unsigned lengthInBits)
 {
 	deque<CBit>::iterator it;
 	if (m_nBitLength < lengthInBits)
@@ -143,6 +145,9 @@ void CWord::Print()
 
 void CWord::Copy(unsigned char* ptr)
 {
+    unsigned len = ceil(m_word.size()/8);
+    memset(ptr, 0, len);
+
 	unsigned pos = 0;
 	for(auto it = m_word.begin(); it != m_word.end(); it++)
 	{
diff --git a/DRAMSys/simulator/src/error/ECC/Word.h b/DRAMSys/simulator/src/error/ECC/Word.h
index f21432cb..efcdd981 100644
--- a/DRAMSys/simulator/src/error/ECC/Word.h
+++ b/DRAMSys/simulator/src/error/ECC/Word.h
@@ -21,7 +21,7 @@ public:
 	CBit* GetAt(unsigned nBitPos);
 
 	void Set(unsigned data);
-	void Set(unsigned char* data, unsigned lengthInBits);
+    void Set(const unsigned char* data, unsigned lengthInBits);
 	void Rotate();
 
 	bool Insert(unsigned npos, CBit b);
diff --git a/DRAMSys/simulator/src/error/controllerECC.h b/DRAMSys/simulator/src/error/controllerECC.h
deleted file mode 100644
index 53dc469a..00000000
--- a/DRAMSys/simulator/src/error/controllerECC.h
+++ /dev/null
@@ -1,239 +0,0 @@
-#ifndef CONTROLLERECC_H
-#define CONTROLLERECC_H
-
-#include <systemc.h>
-
-#include "ECC/ECC.h"
-
-#include "../common/xmlAddressdecoder.h"
-#include "../common/DebugManager.h"
-
-using namespace std;
-using namespace tlm;
-
-struct ControllerECC: sc_module
-{
-private:
-	map<unsigned char*, unsigned char*> m_mDataPointer;
-
-public:
-	tlm_utils::multi_passthrough_target_socket<ControllerECC>    t_socket;
-	tlm_utils::multi_passthrough_initiator_socket<ControllerECC> i_socket;
-
-	SC_CTOR(ControllerECC)
-		: t_socket("t_socket")
-		, i_socket("i_socket")
-	{
-		t_socket.register_nb_transport_fw(this, &ControllerECC::nb_transport_fw);
-		i_socket.register_nb_transport_bw(this, &ControllerECC::nb_transport_bw);
-	}
-
-	// Forward interface
-	virtual tlm::tlm_sync_enum nb_transport_fw( int id, tlm::tlm_generic_payload& trans, tlm::tlm_phase& phase, sc_time& delay )
-	{
-        if(trans.get_command() == TLM_WRITE_COMMAND && phase == BEGIN_REQ)
-		{
-			// Get data and length
-			unsigned nDataLength = trans.get_data_length();
-			unsigned char* pData = trans.get_data_ptr();
-
-			// Calculate how many 64 bit blocks are there
-			unsigned nBlocks = nDataLength>>3;
-
-			// Create new data array for data with ECC
-			unsigned char* pDataECC = new unsigned char[nBlocks*9];
-			memset(pDataECC, 0x0, nBlocks*9*sizeof(unsigned char));
-
-			// Create ECC data for every block
-			for(unsigned i = 0; i < nBlocks; i++)
-			{
-				// Create all variables needed for calulation
-				CWord dataword(64);
-				CWord checkbits(8);
-
-				// Fill in current data block
-				dataword.Set(&pData[i<<3], 64);
-
-				// Extend data word
-				ECC::ExtendWord(dataword);
-
-				checkbits = 0;
-
-				// Calculate Checkbits
-				ECC::CalculateCheckbits(dataword, checkbits);
-				ECC::InsertCheckbits(dataword, checkbits);
-
-				// Calculate Parity
-				ECC::CalculateParityBit(dataword, checkbits[7]);
-
-				// Copy old data
-				memcpy(&pDataECC[i*9], &pData[i<<3], 8);
-
-                // Save hamming code + parity bit in the last byte
-				checkbits.Copy(&pDataECC[i*9+8]);
-			}
-
-			// Change transport data length
-			trans.set_data_length(nBlocks*9);
-
-            // store old data
-			m_mDataPointer[pDataECC] = trans.get_data_ptr();
-
-			// Set new data
-			trans.set_data_ptr(pDataECC);
-        }
-        else if(trans.get_command() == TLM_READ_COMMAND && phase == BEGIN_REQ)
-        {
-            // 64 -> 72
-
-            // Get data length
-            unsigned nDataLength = trans.get_data_length();
-
-			// Create new pointer
-			nDataLength += nDataLength>>3;
-			unsigned char* new_ptr = new unsigned char [nDataLength];
-
-			// store old data ptr
-			m_mDataPointer[new_ptr] = trans.get_data_ptr();
-
-			// Set new data
-			trans.set_data_ptr(new_ptr);
-
-            // Change transport data length
-            trans.set_data_length(nDataLength);
-        }
-
-        return i_socket[id]->nb_transport_fw( trans, phase, delay );
-	}
-
-
-	// Backward interface
-	virtual tlm::tlm_sync_enum nb_transport_bw( int id, tlm::tlm_generic_payload& trans, tlm::tlm_phase& phase, sc_time& delay )
-	{
-        if(trans.get_command() == TLM_READ_COMMAND && phase == BEGIN_RESP)
-        {
-			// Get data and length
-			unsigned nDataLength = trans.get_data_length();
-			unsigned char* pData = trans.get_data_ptr();
-
-			// Calculate how many 72 bit blocks are there
-			unsigned nBlocks = nDataLength/9;
-
-			// Verify ECC data for every block
-			for(unsigned i = 0; i < nBlocks; i++)
-			{
-				// Create all variables needed for calulation
-				CWord dataword(64);
-				CWord checkbits(8);
-
-				// Fill in current data block
-				dataword.Set(&pData[i*9], 64);
-				checkbits.Set(&pData[i*9+8], 8);
-
-				// Extend data word
-				ECC::ExtendWord(dataword);
-
-				// Insert old  checkbits
-				ECC::InsertCheckbits(dataword, checkbits);
-				ECC::InsertParityBit(dataword, checkbits[7]);
-
-				checkbits = 0;
-
-				// Calculate Checkbits
-				ECC::CalculateCheckbits(dataword, checkbits);
-
-				// Calculate Parity
-				ECC::CalculateParityBit(dataword, checkbits[7]);
-
-				// Translate Checkbits
-				bool bParity = checkbits[7] == CBit::ONE;
-
-				unsigned char c = 0;
-				checkbits.Rotate();
-				checkbits.Copy(&c);
-				c &= 0x7F;
-
-				// Parity Error?
-				if(bParity)
-				{
-					// Parity Error
-
-					if(c == 0)
-					{
-						// Only Parity Bit broken - continue
-						cout << "Parity Bit error" << endl;
-						continue;
-					}
-					else
-					{
-						// Data or Hamming Code Bit broken
-						cout << "Single Error Detected" << endl;
-						continue;
-					}
-				}
-				else
-				{
-					// No Parity Error
-
-					if(c == 0)
-					{
-						// No error at all - continue
-						continue;
-					}
-					else
-					{
-						// Double error detected
-						cout << "Double Error Detected (Block " << i << ")." << endl;
-						continue;
-					}
-				}
-			}
-			// Change transport data length
-			trans.set_data_length(nBlocks<<3);
-
-            // load data pointer
-			auto it = m_mDataPointer.find(trans.get_data_ptr());
-            assert(it != m_mDataPointer.end());
-
-            unsigned char* pDataECC = it->second;
-
-			// delete data pointer from map
-			m_mDataPointer.erase(it);
-
-			// Copy data
-			memcpy(pDataECC, pData, nBlocks<<3);
-
-			// delete old data
-			delete[] trans.get_data_ptr();
-
-			// Set new data
-			trans.set_data_ptr(pDataECC);
-		}
-        else if(trans.get_command() == TLM_WRITE_COMMAND && phase == BEGIN_RESP)
-        {
-            // 72 -> 64
-
-            // delete old data
-            delete[] trans.get_data_ptr();
-
-            // Get data length
-            unsigned nDataLength = trans.get_data_length();
-
-            // load data pointer
-			auto it = m_mDataPointer.find(trans.get_data_ptr());
-            assert(it != m_mDataPointer.end());
-
-            trans.set_data_ptr(it->second);
-
-			// delete data pointer from map
-			m_mDataPointer.erase(it);
-
-			// Change transport data length
-            trans.set_data_length((nDataLength/9)<<3);
-        }
-
-		return t_socket[id]->nb_transport_bw( trans, phase, delay );
-	}
-};
-
-#endif // CONTROLLERECC_H
diff --git a/DRAMSys/simulator/src/error/eccbaseclass.cpp b/DRAMSys/simulator/src/error/eccbaseclass.cpp
new file mode 100644
index 00000000..10deaa02
--- /dev/null
+++ b/DRAMSys/simulator/src/error/eccbaseclass.cpp
@@ -0,0 +1,83 @@
+#include "eccbaseclass.h"
+
+tlm::tlm_sync_enum ECCBaseClass::nb_transport_fw( int id, tlm::tlm_generic_payload& trans, tlm::tlm_phase& phase, sc_time& delay )
+{
+    if(trans.get_command() == TLM_WRITE_COMMAND && phase == BEGIN_REQ)
+    {
+        // Allocate memory for encoded data using the size provided by AllocationEncode
+        unsigned nEncodedDataSize = AllocationSize(trans.get_data_length());
+        assert(nEncodedDataSize != 0);
+        unsigned char* pEncodedData = new unsigned char[nEncodedDataSize];
+
+        // Save memory pointer and size
+        m_mDataPointer[pEncodedData].pData = trans.get_data_ptr();
+        m_mDataPointer[pEncodedData].nDataSize = trans.get_data_length();
+
+        // Data Encoding
+        Encode(trans.get_data_ptr(), trans.get_data_length(), pEncodedData, nEncodedDataSize);
+
+        // Change transport data length and pointer
+        trans.set_data_length(nEncodedDataSize);
+        trans.set_data_ptr(pEncodedData);
+    }
+    else if(trans.get_command() == TLM_READ_COMMAND && phase == BEGIN_REQ)
+    {
+        // Allocate memory for reading data using the size provided by AllocationEncode
+        unsigned nReadDataSize = AllocationSize(trans.get_data_length());
+        assert(nReadDataSize != 0);
+        unsigned char* pReadData = new unsigned char[nReadDataSize];
+
+        // Save memory pointer and size
+        m_mDataPointer[pReadData].pData = trans.get_data_ptr();
+        m_mDataPointer[pReadData].nDataSize = trans.get_data_length();
+
+        // Change transport data length and pointer
+        trans.set_data_length(nReadDataSize);
+        trans.set_data_ptr(pReadData);
+    }
+
+    return i_socket[id]->nb_transport_fw( trans, phase, delay );
+}
+
+
+// Backward interface
+tlm::tlm_sync_enum ECCBaseClass::nb_transport_bw( int id, tlm::tlm_generic_payload& trans, tlm::tlm_phase& phase, sc_time& delay )
+{
+    if(trans.get_command() == TLM_READ_COMMAND && phase == BEGIN_RESP)
+    {
+        //Look for the corresponding data pointer for decoding
+        auto it = m_mDataPointer.find(trans.get_data_ptr());
+        assert(it != m_mDataPointer.end());
+
+        // Data Decoding
+        Decode(trans.get_data_ptr(), trans.get_data_length(), it->second.pData, it->second.nDataSize);
+
+        // delete data pointer from map
+        m_mDataPointer.erase(it);
+
+        // Delete data pointer used for encoded data
+        delete[] trans.get_data_ptr();
+
+        // Set data pointer and size for decoded data
+        trans.set_data_ptr(it->second.pData);
+        trans.set_data_length(it->second.nDataSize);
+    }
+    else if(trans.get_command() == TLM_WRITE_COMMAND && phase == BEGIN_RESP)
+    {
+        //Look for the corresponding data pointer for decoding
+        auto it = m_mDataPointer.find(trans.get_data_ptr());
+        assert(it != m_mDataPointer.end());
+
+        // delete data pointer from map
+        m_mDataPointer.erase(it);
+
+        // Delete data pointer used for encoded data
+        delete[] trans.get_data_ptr();
+
+        // Set data pointer and size for decoded data
+        trans.set_data_ptr(it->second.pData);
+        trans.set_data_length(it->second.nDataSize);
+    }
+
+    return t_socket[id]->nb_transport_bw( trans, phase, delay );
+}
diff --git a/DRAMSys/simulator/src/error/eccbaseclass.h b/DRAMSys/simulator/src/error/eccbaseclass.h
new file mode 100644
index 00000000..1c64f51d
--- /dev/null
+++ b/DRAMSys/simulator/src/error/eccbaseclass.h
@@ -0,0 +1,67 @@
+#ifndef ECCBASECLASS_H
+#define ECCBASECLASS_H
+
+#include <systemc.h>
+#include <tlm.h>
+#include <tlm_utils/multi_passthrough_initiator_socket.h>
+#include <tlm_utils/multi_passthrough_target_socket.h>
+
+#include "ECC/ECC.h"
+
+#include "../common/xmlAddressdecoder.h"
+#include "../common/DebugManager.h"
+
+using namespace std;
+using namespace tlm;
+
+class ECCBaseClass : sc_module
+{
+public:
+    struct DataStruct
+    {
+        unsigned char* pData;
+        unsigned int nDataSize;
+    };
+
+private:
+    map<unsigned char*, DataStruct> m_mDataPointer;
+
+public:
+    // Function prototype for calculated the size of memory needed for saving the encoded data
+    // Input nBytes: Number of bytes which have to be encoded
+    // Return value: Number of bytes which have to be allocated for storing the encoded data
+    virtual unsigned AllocationSize(unsigned nBytes) = 0;
+
+protected:
+    // Function prototype for encoding data.
+    // Data pointer is provided in pDataIn, length in Bytes provided in nDataIn
+    // Result should be written in pDataOut, which has a size of nDataOut.
+    // pDataOut is already allocated with a size given by function AllocationEncode
+    virtual void Encode(const unsigned char* pDataIn, const unsigned nDataIn, unsigned char* pDataOut, const unsigned nDataOut) = 0;
+
+
+    // Function prototype for decoding data.
+    // Data pointer is provided in pDataIn, length in Bytes provided in nDataIn
+    // Result should be written in pDataOut, which has a size of nDataOut.
+    // pDataOut is already allocated with a size given by function AllocationDecode
+    virtual void Decode(const unsigned char* pDataIn, const unsigned nDataIn, unsigned char* pDataOut, const unsigned nDataOut) = 0;
+
+public:
+    tlm_utils::multi_passthrough_target_socket<ECCBaseClass>    t_socket;
+    tlm_utils::multi_passthrough_initiator_socket<ECCBaseClass> i_socket;
+
+    SC_CTOR(ECCBaseClass)
+        : t_socket("t_socket")
+        , i_socket("i_socket")
+    {
+        t_socket.register_nb_transport_fw(this, &ECCBaseClass::nb_transport_fw);
+        i_socket.register_nb_transport_bw(this, &ECCBaseClass::nb_transport_bw);
+    }
+    // Forward interface
+    tlm::tlm_sync_enum nb_transport_fw( int id, tlm::tlm_generic_payload& trans, tlm::tlm_phase& phase, sc_time& delay );
+
+    // Backward interface
+    tlm::tlm_sync_enum nb_transport_bw( int id, tlm::tlm_generic_payload& trans, tlm::tlm_phase& phase, sc_time& delay );
+};
+
+#endif // ECCBASECLASS_H
diff --git a/DRAMSys/simulator/src/error/ecchamming.cpp b/DRAMSys/simulator/src/error/ecchamming.cpp
new file mode 100644
index 00000000..d2d1e466
--- /dev/null
+++ b/DRAMSys/simulator/src/error/ecchamming.cpp
@@ -0,0 +1,134 @@
+#include "ecchamming.h"
+
+#include "ECC/ECC.h"
+
+unsigned ECCHamming::AllocationSize(unsigned nBytes)
+{
+    // For this hamming for 8 bytes one extra byte is needed:l
+    return nBytes + ceil(nBytes / m_nDatawordSize) * m_nCodewordSize;
+}
+
+void ECCHamming::Encode(const unsigned char* pDataIn, const unsigned nDataIn, unsigned char* pDataOut, const unsigned nDataOut)
+{
+    // Calculate how many 8 byte blocks are there
+    unsigned nBlocks = nDataIn/m_nDatawordSize;
+
+    // No partly filled blocks are supported
+    assert(nDataIn % m_nDatawordSize == 0);
+
+    // Create ECC data for every block
+    for(unsigned i = 0; i < nBlocks; i++)
+    {
+        // Create all variables needed for calulation
+        CWord dataword(InBits(m_nDatawordSize));    // Size in bits
+        CWord codeword(InBits(m_nCodewordSize));   // Size in bits
+
+        // Fill in current data block
+        dataword.Set(&pDataIn[i*m_nDatawordSize], InBits(m_nDatawordSize));
+
+        // Extend data word. It grows from m_nDatawordSize to m_nDatawordSize + m_nCodewordSize
+        ECC::ExtendWord(dataword);
+
+        // Initialize the codeword with zeros
+        codeword = 0;
+
+        // Calculate Checkbits
+        ECC::CalculateCheckbits(dataword, codeword);
+        ECC::InsertCheckbits(dataword, codeword);
+
+        // Calculate Parity
+        ECC::CalculateParityBit(dataword, codeword[7]);
+
+        // Check if there is enough space in the output array (should always be)
+        assert((i+1)*(m_nDatawordSize + m_nCodewordSize) <= nDataOut);
+
+        // Copy old data
+        memcpy(&pDataOut[i*(m_nDatawordSize + m_nCodewordSize)], &pDataIn[i*m_nDatawordSize], m_nDatawordSize);
+
+        // Save hamming code + parity bit in the last byte
+        codeword.Copy(&pDataOut[i*(m_nDatawordSize + m_nCodewordSize)+m_nDatawordSize]);
+    }
+}
+
+void ECCHamming::Decode(const unsigned char* pDataIn, const unsigned nDataIn, unsigned char* pDataOut, const unsigned nDataOut)
+{
+    // Calculate how many 9 byte blocks are there
+    unsigned nBlocks = nDataIn/(m_nDatawordSize + m_nCodewordSize);
+
+    // No partly filled blocks are supported
+    assert(nDataIn % (m_nDatawordSize + m_nCodewordSize) == 0);
+
+    // Verify ECC data for every block
+    for(unsigned i = 0; i < nBlocks; i++)
+    {
+        // Create all variables needed for calulation
+        CWord dataword(InBits(m_nDatawordSize));    // Size in bits
+        CWord codeword(InBits(m_nCodewordSize));   // Size in bits
+
+        // Fill in current data block
+        dataword.Set(&pDataIn[i*(m_nDatawordSize + m_nCodewordSize)], InBits(m_nDatawordSize));
+        codeword.Set(&pDataIn[i*(m_nDatawordSize + m_nCodewordSize)+m_nDatawordSize], InBits(m_nCodewordSize));
+
+        // Extend data word. It grows from m_nDatawordSize to m_nDatawordSize + m_nCodewordSize
+        ECC::ExtendWord(dataword);
+
+        // Insert old codeword
+        ECC::InsertCheckbits(dataword, codeword);
+        ECC::InsertParityBit(dataword, codeword[7]);
+
+		// Reset codeword
+        codeword = 0;
+
+        // Calculate Checkbits again
+        ECC::CalculateCheckbits(dataword, codeword);
+
+        // Calculate Parity again
+        ECC::CalculateParityBit(dataword, codeword[7]);
+
+        // Translate codeword
+        bool bParity = codeword[7] == CBit::ONE;
+
+        // calculate syndrome
+        unsigned char c = 0;
+        codeword.Rotate();
+        codeword.Copy(&c);
+        c &= 0x7F;
+
+        // Parity Error?
+        if(bParity)
+        {
+            // Parity Error
+
+            if(c == 0)
+            {
+                // Only Parity Bit broken - continue
+                cout << "Parity Bit error" << endl;
+            }
+            else
+            {
+                // Data or Hamming Code Bit broken
+                cout << "Single Error Detected" << endl;
+            }
+        }
+        else
+        {
+            // No Parity Error
+
+            if(c == 0)
+            {
+                // No error at all - continue
+            }
+            else
+            {
+                // Double error detected
+                cout << "Double Error Detected (Block " << i << ")." << endl;
+            }
+        }
+
+        // Check if there is enough space in the output array (should always be)
+        assert((i+1)*(m_nDatawordSize) <= nDataOut);
+
+        // Copy data
+        memcpy(&pDataOut[i*m_nDatawordSize], &pDataIn[i*(m_nDatawordSize + m_nCodewordSize)], m_nDatawordSize);
+    }
+}
diff --git a/DRAMSys/simulator/src/error/ecchamming.h b/DRAMSys/simulator/src/error/ecchamming.h
new file mode 100644
index 00000000..99c548fb
--- /dev/null
+++ b/DRAMSys/simulator/src/error/ecchamming.h
@@ -0,0 +1,41 @@
+#ifndef ECCHAMMIMG_H
+#define ECCHAMMIMG_H
+
+#include "eccbaseclass.h"
+
+
+class ECCHamming : public ECCBaseClass
+{
+private:
+    // Hamming constants for this special implementation
+    const unsigned m_nDatawordSize = 8;     // bytes
+    const unsigned m_nCodewordSize = 1;     // bytes
+
+    inline unsigned InBits(unsigned n){return n<<3;};    // use this if constants are needed in bits
+
+public:
+    // Function prototype for calculated the size of memory needed for saving the encoded data
+    // Input nBytes: Number of bytes which have to be encoded
+    // Return value: Number of bytes which have to be allocated for storing the encoded data
+    virtual unsigned AllocationSize(unsigned nBytes);
+
+protected:
+    // Function prototype for encoding data.
+    // Data pointer is provided in pDataIn, length in Bytes provided in nDataIn
+    // Result should be written in pDataOut, which has a size of nDataOut.
+    // pDataOut is already allocated with a size given by function AllocationEncode
+    virtual void Encode(const unsigned char* pDataIn, const unsigned nDataIn, unsigned char* pDataOut, const unsigned nDataOut);
+
+
+    // Function prototype for decoding data.
+    // Data pointer is provided in pDataIn, length in Bytes provided in nDataIn
+    // Result should be written in pDataOut, which has a size of nDataOut.
+    // pDataOut is already allocated with a size given by function AllocationDecode
+    virtual void Decode(const unsigned char* pDataIn, const unsigned nDataIn, unsigned char* pDataOut, const unsigned nDataOut);
+
+public:
+    ECCHamming(::sc_core::sc_module_name name) : ECCBaseClass(name)
+    {};
+};
+
+#endif // ECCHAMMIMG_H
diff --git a/DRAMSys/simulator/src/error/errormodel.cpp b/DRAMSys/simulator/src/error/errormodel.cpp
index 499d16f2..e1010f6a 100644
--- a/DRAMSys/simulator/src/error/errormodel.cpp
+++ b/DRAMSys/simulator/src/error/errormodel.cpp
@@ -49,10 +49,9 @@ void errorModel::init()
     burstLenght = Configuration::getInstance().memSpec.BurstLength;
     numberOfColumns = Configuration::getInstance().memSpec.NumberOfColumns;
     bytesPerColumn = xmlAddressDecoder::getInstance().amount["bytes"];
-	if(Configuration::getInstance().EnableControllerECC)
-	{
-		bytesPerColumn += bytesPerColumn>>3;
-	}
+
+	// Adjust number of bytes per column dynamically to the selected ecc controller
+	bytesPerColumn = Configuration::getInstance().adjustNumBytesAfterECC(bytesPerColumn);
 
 	numberOfRows = Configuration::getInstance().memSpec.NumberOfRows;
     numberOfBitErrorEvents = 0;
diff --git a/DRAMSys/simulator/src/simulation/DRAMSys.cpp b/DRAMSys/simulator/src/simulation/DRAMSys.cpp
index 0cb5bbc5..ac75db5b 100644
--- a/DRAMSys/simulator/src/simulation/DRAMSys.cpp
+++ b/DRAMSys/simulator/src/simulation/DRAMSys.cpp
@@ -51,6 +51,7 @@
 #include "../common/Utils.h"
 #include "../simulation/TemperatureController.h"
 #include "../controller/Controller.h"
+#include "../error/ecchamming.h"
 
 using namespace std;
 
@@ -59,7 +60,7 @@ DRAMSys::DRAMSys(sc_module_name __attribute__((unused)) name,
                  string pathToResources) : tSocket("DRAMSys_tSocket")
 {
     // Initialize ecc pointer
-    ecc = 0;
+	ecc = nullptr;
 
     logo();
 
@@ -188,13 +189,25 @@ void DRAMSys::instantiateModules(const string &traceName,
     // They need to be ready before creating some modules.
     setupTlmRecorders(traceName, pathToResources);
 
-    // Initialize ECC Controller is enabled
-    if(Configuration::getInstance().EnableControllerECC)
-        ecc = new ControllerECC("ControllerECC");
+	// Create new ECC Controller
+	switch (Configuration::getInstance().ECCMode)
+	{
+		case ECCControllerMode::Hamming:
+            ecc = new ECCHamming("ECCHamming");
+			break;
+		default:
+			ecc = nullptr;
+			break;
+	}
 
+	// Save ECC Controller into the configuration struct to adjust it dynamically
+	Configuration::getInstance().pECC = ecc;
+
+	// Create arbiter
     arbiter = new Arbiter("arbiter");
     arbiter->setTlmRecorders(tlmRecorders);
 
+	// Create DRAM
     for (size_t i = 0;
          i < Configuration::getInstance().NumberOfMemChannels;
          i++)
@@ -222,8 +235,9 @@ void DRAMSys::instantiateModules(const string &traceName,
 void DRAMSys::bindSockets()
 {
     // If ECC Controller enabled, put it between Trace and arbiter
-    if(Configuration::getInstance().EnableControllerECC)
+	if(Configuration::getInstance().ECCMode != ECCControllerMode::Disabled)
     {
+		assert(ecc != nullptr);
         tSocket.bind(ecc->t_socket);
         ecc->i_socket.bind(arbiter->tSocket);
     }
@@ -260,6 +274,7 @@ DRAMSys::~DRAMSys()
 {
     if(ecc)
         delete ecc;
+
     delete arbiter;
 
     for (auto controller : controllers)
diff --git a/DRAMSys/simulator/src/simulation/DRAMSys.h b/DRAMSys/simulator/src/simulation/DRAMSys.h
index 2b01e65b..63ea9052 100644
--- a/DRAMSys/simulator/src/simulation/DRAMSys.h
+++ b/DRAMSys/simulator/src/simulation/DRAMSys.h
@@ -51,7 +51,7 @@
 #include "../controller/Controller.h"
 #include "../common/third_party/tinyxml2/tinyxml2.h"
 #include "../common/tlm2_base_protocol_checker.h"
-#include "../error/controllerECC.h"
+#include "../error/eccbaseclass.h"
 
 class DRAMSys: public sc_module
 {
@@ -80,7 +80,7 @@ private:
         controllersTlmCheckers;
 
     // All transactions pass first through the ECC Controller
-    ControllerECC *ecc;
+    ECCBaseClass *ecc;
     // All transactions pass through the same arbiter
     Arbiter *arbiter;
     // Each DRAM unit has a controller
diff --git a/DRAMSys/simulator/src/simulation/Dram.h b/DRAMSys/simulator/src/simulation/Dram.h
index d641afcb..a1156096 100644
--- a/DRAMSys/simulator/src/simulation/Dram.h
+++ b/DRAMSys/simulator/src/simulation/Dram.h
@@ -92,8 +92,8 @@ struct Dram : sc_module
 
     SC_CTOR(Dram) : tSocket("socket")
     {
-		if(Configuration::getInstance().EnableControllerECC)
-			bytesPerBurst += bytesPerBurst>>3;
+		// Adjust number of bytes per burst dynamically to the selected ecc controller
+		bytesPerBurst = Configuration::getInstance().adjustNumBytesAfterECC(bytesPerBurst);
 
         std::uint64_t memorySize = Configuration::getInstance().getSimMemSizeInBytes();
         // allocate and model storage of one DRAM channel using memory map
diff --git a/README.md b/README.md
index 06e96cb6..75ce2bc9 100644
--- a/README.md
+++ b/README.md
@@ -544,7 +544,7 @@ Below, the sub-configurations are listed and explained.
       <SimulationProgressBar value="1"/>
       <NumberOfMemChannels value="1"/>
       <NumberOfDevicesOnDIMM value = "8" />
-      <EnableControllerECC value = "0" />
+      <ECCControllerMode value = "Disabled" />
   </simconfig>
   ```
 
@@ -579,9 +579,9 @@ Below, the sub-configurations are listed and explained.
   - *CheckTLM2Protocol* (boolean)
     - "1": enables the TLM 2.0 Protocol Checking 
     - "0": disables the TLM 2.0 Protocol Checking 
-  - *EnableControllerECC* (boolean)
-    - "1": enables the ECC Controller with classic SECDED implementation
-    - "0": disables the ECC Controller with classic SECDED implementation
+  - *ECCControllerMode* (string)
+    - "Disabled": No ECC Controller is used
+    - "Hamming": Enables an ECC Controller with classic SECDED implementation using Hamming Code
 
 - **Temperature Simulator Configuration**