diff --git a/lib/decorators/EventPropertiesDecorator.hpp b/lib/decorators/EventPropertiesDecorator.hpp
index 5bb3e927a..de9fd7144 100644
--- a/lib/decorators/EventPropertiesDecorator.hpp
+++ b/lib/decorators/EventPropertiesDecorator.hpp
@@ -13,6 +13,7 @@
 #include <algorithm>
 #include <map>
 #include <string>
+#include <utility>
 
 namespace MAT_NS_BEGIN {
 
@@ -187,11 +188,11 @@ namespace MAT_NS_BEGIN {
                         temp.stringValue = v.to_string();
                         if (v.dataCategory == DataCategory_PartB)
                         {
-                            extPartB[k] = temp;
+                            extPartB[k] = std::move(temp);
                         }
                         else
                         {
-                            ext[k] = temp;
+                            ext[k] = std::move(temp);
                         }
 
                     }
@@ -209,11 +210,11 @@ namespace MAT_NS_BEGIN {
                         temp.stringValue = v.to_string();
                         if (v.dataCategory == DataCategory_PartB)
                         {
-                            extPartB[k] = temp;
+                            extPartB[k] = std::move(temp);
                         }
                         else
                         {
-                            ext[k] = temp;
+                            ext[k] = std::move(temp);
                         }
 #if 0 /* v2 code */
                         if (v.piiKind != PiiKind_None)
@@ -251,11 +252,11 @@ namespace MAT_NS_BEGIN {
                         temp.stringValue = v.to_string();
                         if (v.dataCategory == DataCategory_PartB)
                         {
-                            extPartB[k] = temp;
+                            extPartB[k] = std::move(temp);
                         }
                         else
                         {
-                            ext[k] = temp;
+                            ext[k] = std::move(temp);
                         }
                         break;
                     }
@@ -266,11 +267,11 @@ namespace MAT_NS_BEGIN {
                         temp.longValue = v.as_int64;
                         if (v.dataCategory == DataCategory_PartB)
                         {
-                            extPartB[k] = temp;
+                            extPartB[k] = std::move(temp);
                         }
                         else
                         {
-                            ext[k] = temp;
+                            ext[k] = std::move(temp);
                         }
                         break;
                     }
@@ -281,11 +282,11 @@ namespace MAT_NS_BEGIN {
                         temp.doubleValue = v.as_double;
                         if (v.dataCategory == DataCategory_PartB)
                         {
-                            extPartB[k] = temp;
+                            extPartB[k] = std::move(temp);
                         }
                         else
                         {
-                            ext[k] = temp;
+                            ext[k] = std::move(temp);
                         }
                         break;
                     }
@@ -296,11 +297,11 @@ namespace MAT_NS_BEGIN {
                         temp.longValue = v.as_time_ticks.ticks;
                         if (v.dataCategory == DataCategory_PartB)
                         {
-                            extPartB[k] = temp;
+                            extPartB[k] = std::move(temp);
                         }
                         else
                         {
-                            ext[k] = temp;
+                            ext[k] = std::move(temp);
                         }
                         break;
                     }
@@ -311,11 +312,11 @@ namespace MAT_NS_BEGIN {
                         temp.longValue = v.as_bool;
                         if (v.dataCategory == DataCategory_PartB)
                         {
-                            extPartB[k] = temp;
+                            extPartB[k] = std::move(temp);
                         }
                         else
                         {
-                            ext[k] = temp;
+                            ext[k] = std::move(temp);
                         }
                         break;
                     }
@@ -345,11 +346,11 @@ namespace MAT_NS_BEGIN {
                         temp.longArray.push_back(*v.as_longArray);
                         if (v.dataCategory == DataCategory_PartB)
                         {
-                            extPartB[k] = temp;
+                            extPartB[k] = std::move(temp);
                         }
                         else
                         {
-                            ext[k] = temp;
+                            ext[k] = std::move(temp);
                         }
                         break;
                     }
@@ -360,11 +361,11 @@ namespace MAT_NS_BEGIN {
                         temp.doubleArray.push_back(*v.as_doubleArray);
                         if (v.dataCategory == DataCategory_PartB)
                         {
-                            extPartB[k] = temp;
+                            extPartB[k] = std::move(temp);
                         }
                         else
                         {
-                            ext[k] = temp;
+                            ext[k] = std::move(temp);
                         }
                         break;
                     }
@@ -375,11 +376,11 @@ namespace MAT_NS_BEGIN {
                         temp.stringArray.push_back(*v.as_stringArray);
                         if (v.dataCategory == DataCategory_PartB)
                         {
-                            extPartB[k] = temp;
+                            extPartB[k] = std::move(temp);
                         }
                         else
                         {
-                            ext[k] = temp;
+                            ext[k] = std::move(temp);
                         }
                         break;
                     }
@@ -398,11 +399,11 @@ namespace MAT_NS_BEGIN {
                         temp.guidArray.push_back(values);
                         if (v.dataCategory == DataCategory_PartB)
                         {
-                            extPartB[k] = temp;
+                            extPartB[k] = std::move(temp);
                         }
                         else
                         {
-                            ext[k] = temp;
+                            ext[k] = std::move(temp);
                         }
                         break;
                     }
@@ -413,11 +414,11 @@ namespace MAT_NS_BEGIN {
                         temp.stringValue = v.to_string();
                         if (v.dataCategory == DataCategory_PartB)
                         {
-                            extPartB[k] = temp;
+                            extPartB[k] = std::move(temp);
                         }
                         else
                         {
-                            ext[k] = temp;
+                            ext[k] = std::move(temp);
                         }
                     }
                     }
@@ -427,8 +428,8 @@ namespace MAT_NS_BEGIN {
             if (extPartB.size() > 0)
             {
                 ::CsProtocol::Data partBdata;
-                partBdata.properties = extPartB;
-                record.baseData.push_back(partBdata);
+                partBdata.properties = std::move(extPartB);
+                record.baseData.push_back(std::move(partBdata));
             }
 
             // special case of CorrelationVector value