diff --git a/Source/Core/BareMetal/L1Portability/Environment/Windows/ErrorManagement_Gen.cpp b/Source/Core/BareMetal/L1Portability/Environment/Windows/ErrorManagement_Gen.cpp
index 00eacdf4..2bae2d78 100644
--- a/Source/Core/BareMetal/L1Portability/Environment/Windows/ErrorManagement_Gen.cpp
+++ b/Source/Core/BareMetal/L1Portability/Environment/Windows/ErrorManagement_Gen.cpp
@@ -31,6 +31,7 @@
 /*---------------------------------------------------------------------------*/
 
 #include "ErrorManagement.h"
+#include "HardwareI.h"
 #include "HighResolutionTimer.h"
 #include "ErrorInformation.h"
 #include "Sleep.h"
@@ -47,6 +48,8 @@ namespace MARTe {
 
 namespace ErrorManagement {
 
+static ErrorType errorFilter(0xFFFFFFFFu);
+
 void NullErrorProcessFunction(const ErrorInformation &errorInfo,
                               const char8 * const errorDescription) {
 }
@@ -82,6 +85,17 @@ const struct {
         { "NotCompleted", NotCompleted },
         { static_cast<const char8 *>(NULL), NoError }, };
 
+
+void SetErrorFilter (const ErrorType &errorFilterIn){
+    errorFilter = errorFilterIn;
+}
+
+ErrorType GetErrorFilter(){
+    return errorFilter;
+}
+
+
+
 void ErrorCodeToStream(const ErrorType &errorCode,
                        StreamI &stream) {
     //Skip the NoError
@@ -135,6 +149,7 @@ void ReportError(const ErrorType &code,
     errorInfo.functionName = functionName;
     errorInfo.hrtTime = HighResolutionTimer::Counter();
     errorInfo.timeSeconds = Sleep::GetDateSeconds();
+    errorInfo.platformSpecificString = HardwareI::GetPlatformSpecificString();
 #ifndef INTERRUPT_SUPPORTED
 //    errorInfo.threadId = Threads::Id();
 #endif
@@ -157,6 +172,7 @@ void ReportErrorFullContext(const ErrorType &code,
     errorInfo.hrtTime = HighResolutionTimer::Counter();
 //    errorInfo.threadId = Threads::Id();
     errorInfo.timeSeconds = Sleep::GetDateSeconds();
+    errorInfo.platformSpecificString = HardwareI::GetPlatformSpecificString();
     errorMessageProcessFunction(errorInfo, errorDescription);
 }
 
diff --git a/Source/Core/BareMetal/L1Portability/Environment/Windows/HardwareI.cpp b/Source/Core/BareMetal/L1Portability/Environment/Windows/HardwareI.cpp
index eaf2cc50..432b6382 100644
--- a/Source/Core/BareMetal/L1Portability/Environment/Windows/HardwareI.cpp
+++ b/Source/Core/BareMetal/L1Portability/Environment/Windows/HardwareI.cpp
@@ -45,6 +45,11 @@ namespace MARTe {
 
         void InitArchitecture() {
         }
+
+        const char8* GetPlatformSpecificString() {
+            return "Windows";
+        }
+        
     }
 
 }