diff --git a/build/WinStd.vcxproj b/build/WinStd.vcxproj
index 09e03c49..0127bf12 100644
--- a/build/WinStd.vcxproj
+++ b/build/WinStd.vcxproj
@@ -82,6 +82,7 @@
   </ItemGroup>
   <ItemGroup>
     <ClInclude Include="..\include\WinStd\Base64.h" />
+    <ClInclude Include="..\include\WinStd\COM.h" />
     <ClInclude Include="..\include\WinStd\Cred.h" />
     <ClInclude Include="..\include\WinStd\Crypt.h" />
     <ClInclude Include="..\include\WinStd\EAP.h" />
diff --git a/build/WinStd.vcxproj.filters b/build/WinStd.vcxproj.filters
index 4080982b..5f9e0822 100644
--- a/build/WinStd.vcxproj.filters
+++ b/build/WinStd.vcxproj.filters
@@ -52,5 +52,8 @@
     <ClInclude Include="..\include\WinStd\Cred.h">
       <Filter>Header Files</Filter>
     </ClInclude>
+    <ClInclude Include="..\include\WinStd\COM.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
   </ItemGroup>
 </Project>
\ No newline at end of file
diff --git a/include/WinStd/Base64.h b/include/WinStd/Base64.h
index 318d7ee3..5343e9bb 100644
--- a/include/WinStd/Base64.h
+++ b/include/WinStd/Base64.h
@@ -256,4 +256,3 @@ namespace winstd
 
     /// @}
 }
-
diff --git a/include/WinStd/COM.h b/include/WinStd/COM.h
new file mode 100644
index 00000000..6ab69885
--- /dev/null
+++ b/include/WinStd/COM.h
@@ -0,0 +1,107 @@
+/*
+    Copyright 1991-2016 Amebis
+    Copyright 2016 GÉANT
+
+    This file is part of WinStd.
+
+    Setup is free software: you can redistribute it and/or modify
+    it under the terms of the GNU General Public License as published by
+    the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    Setup is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU General Public License for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with Setup. If not, see <http://www.gnu.org/licenses/>.
+*/
+
+#include "Common.h"
+
+namespace winstd
+{
+    template <class T> class com_obj;
+}
+
+#pragma once
+
+
+namespace winstd
+{
+    ///
+    /// \defgroup WinStdCOM COM object management
+    /// Provides helper templates for Windows COM object manipulation
+    ///
+    /// @{
+
+
+    ///
+    /// COM object wrapper template
+    ///
+    template <class T>
+    class com_obj : public handle<T>
+    {
+    public:
+
+        ///
+        /// Initializes a new class instance with the object set to NULL.
+        ///
+        inline com_obj() : handle()
+        {
+        }
+
+
+        ///
+        /// Initializes a new class instance with an available object.
+        ///
+        /// \param[in] h  Initial object value
+        ///
+        inline com_obj(_In_opt_ handle_type h) : handle(h)
+        {
+        }
+
+
+        ///
+        /// Creates a new object and initializes a new class with it.
+        ///
+        /// \sa [CoCreateInstance function](https://msdn.microsoft.com/en-us/library/windows/desktop/ms686615.aspx)
+        ///
+        inline com_obj(_In_ REFCLSID rclsid, _In_opt_ LPUNKNOWN pUnkOuter = NULL, DWORD dwClsContext = CLSCTX_ALL)
+        {
+            CoCreateInstance(rclsid, pUnkOuter, dwClsContext, __uuidof(T), (LPVOID*)&m_h):
+        }
+
+
+        ///
+        /// Creates a new object.
+        ///
+        /// \sa [CoCreateInstance function](https://msdn.microsoft.com/en-us/library/windows/desktop/ms686615.aspx)
+        ///
+        inline HRESULT create(_In_ REFCLSID rclsid, _In_opt_ LPUNKNOWN pUnkOuter = NULL, _In_ DWORD dwClsContext = CLSCTX_ALL)
+        {
+            handle_type h;
+            HRESULT hr = ::CoCreateInstance(rclsid, pUnkOuter, dwClsContext, __uuidof(T), (void**)&h);
+            if (SUCCEEDED(h))
+                attach(h);
+            return hr;
+        }
+
+
+        ///
+        /// Queries the object for another interface.
+        ///
+        /// \sa [CoCreateInstance function](https://msdn.microsoft.com/en-us/library/windows/desktop/ms686615.aspx)
+        ///
+        template <class _Other>
+        HRESULT QueryInterface(_Out_ _Other **h) const
+        {
+            assert(h);
+            assert(m_h);
+            return m_h->QueryInterface(__uuidof(_Other), (void**)h);
+        }
+    };
+
+    /// @}
+}
diff --git a/src/StdAfx.h b/src/StdAfx.h
index 82383df9..c61ec832 100644
--- a/src/StdAfx.h
+++ b/src/StdAfx.h
@@ -21,6 +21,7 @@
 #pragma once
 
 #include "../include/WinStd/Base64.h"
+#include "../include/WinStd/COM.h"
 #include "../include/WinStd/Cred.h"
 #include "../include/WinStd/Crypt.h"
 #include "../include/WinStd/EAP.h"