diff --git a/VkCppGenerator.cpp b/VkCppGenerator.cpp
index 2ac294f..efcb3af 100644
--- a/VkCppGenerator.cpp
+++ b/VkCppGenerator.cpp
@@ -603,7 +603,7 @@ size_t findTemplateIndex(CommandData const& commandData, std::map<size_t, size_t
 {
   for (size_t i = 0; i < commandData.arguments.size(); i++)
   {
-    if (commandData.arguments[i].name == "pData")
+    if ((commandData.arguments[i].name == "pData") || (commandData.arguments[i].name == "pValues"))
     {
       assert(vectorParameters.find(i) != vectorParameters.end());
       return i;
diff --git a/vulkan/vk_cpp.h b/vulkan/vk_cpp.h
index bdae130..b94e85c 100644
--- a/vulkan/vk_cpp.h
+++ b/vulkan/vk_cpp.h
@@ -18231,14 +18231,16 @@ namespace vk
     }
 
 #ifdef VKCPP_ENHANCED_MODE
-    void pushConstants( PipelineLayout layout, ShaderStageFlags stageFlags, uint32_t offset, std::vector<uint8_t> const & values ) const
+    template <typename T>
+    void pushConstants( PipelineLayout layout, ShaderStageFlags stageFlags, uint32_t offset, std::vector<T> const & values ) const
     {
-      vkCmdPushConstants( m_commandBuffer, static_cast<VkPipelineLayout>( layout ), static_cast<VkShaderStageFlags>( stageFlags ), offset, static_cast<uint32_t>( values.size() ), values.data() );
+      vkCmdPushConstants( m_commandBuffer, static_cast<VkPipelineLayout>( layout ), static_cast<VkShaderStageFlags>( stageFlags ), offset, static_cast<uint32_t>( values.size() * sizeof( T ) ), reinterpret_cast<const void*>( values.data() ) );
     }
 
-    void pushConstant( PipelineLayout layout, ShaderStageFlags stageFlags, uint32_t offset, std::vector<uint8_t> const & value ) const
+    template <typename T>
+    void pushConstant( PipelineLayout layout, ShaderStageFlags stageFlags, uint32_t offset, T const & value ) const
     {
-      vkCmdPushConstants( m_commandBuffer, static_cast<VkPipelineLayout>( layout ), static_cast<VkShaderStageFlags>( stageFlags ), offset, 1, &value );
+      vkCmdPushConstants( m_commandBuffer, static_cast<VkPipelineLayout>( layout ), static_cast<VkShaderStageFlags>( stageFlags ), offset, static_cast<uint32_t>( sizeof( T ) ), reinterpret_cast<const void*>( &value ) );
     }
 #endif /*VKCPP_ENHANCED_MODE*/