diff --git a/include/sqlpp11/assignment_list.h b/include/sqlpp11/assignment_list.h
index 756a2436..3cf598fd 100644
--- a/include/sqlpp11/assignment_list.h
+++ b/include/sqlpp11/assignment_list.h
@@ -27,29 +27,13 @@
 #ifndef SQLPP_ASSIGNMENT_LIST_H
 #define SQLPP_ASSIGNMENT_LIST_H
 
-#include <vector>
 #include <sqlpp11/type_traits.h>
 #include <sqlpp11/detail/set.h>
 #include <sqlpp11/detail/serialize_tuple.h>
-#include <sqlpp11/detail/serializable.h>
+#include <sqlpp11/detail/serializable_list.h>
 
 namespace sqlpp
 {
-	namespace detail
-	{
-		template<typename Db>
-			struct dynamic_assignment_list
-			{
-				using type = std::vector<detail::serializable_t<Db>>;
-			};
-
-		template<>
-			struct dynamic_assignment_list<void>
-			{
-				using type = std::vector<noop>;
-			};
-	};
-
 	template<typename Database, template<typename> class ProhibitPredicate, typename... Assignments>
 		struct assignment_list_t
 		{
@@ -75,7 +59,7 @@ namespace sqlpp
 				{
 					static_assert(is_assignment_t<typename std::decay<Assignment>::type>::value, "set() arguments require to be assigments");
 					static_assert(not ProhibitPredicate<typename std::decay<Assignment>::type::column_type>::value, "set() argument must not be updated");
-					_dynamic_assignments.push_back(std::forward<Assignment>(assignment));
+					_dynamic_assignments.emplace_back(std::forward<Assignment>(assignment));
 				}
 
 			template<typename Db>
@@ -83,18 +67,11 @@ namespace sqlpp
 				{
 					os << " SET ";
 					detail::serialize_tuple(os, db, _assignments, ',');
-					bool first = sizeof...(Assignments) == 0;
-					for (const auto& assignment : _dynamic_assignments)
-					{
-						if (not first)
-							os << ',';
-						assignment.serialize(os, db);
-						first = false;
-					}
+					_dynamic_assignments.serialize(os, db, sizeof...(Assignments) == 0);
 				}
 
-			std::tuple<Assignments...> _assignments;
-			typename detail::dynamic_assignment_list<Database>::type _dynamic_assignments;
+			std::tuple<typename std::decay<Assignments>::type...> _assignments;
+			typename detail::serializable_list<Database> _dynamic_assignments;
 		};
 
 }
diff --git a/include/sqlpp11/insert_list.h b/include/sqlpp11/insert_list.h
index 78feb6e0..e7e02270 100644
--- a/include/sqlpp11/insert_list.h
+++ b/include/sqlpp11/insert_list.h
@@ -27,11 +27,10 @@
 #ifndef SQLPP_INSERT_LIST_H
 #define SQLPP_INSERT_LIST_H
 
-#include <vector>
 #include <sqlpp11/type_traits.h>
 #include <sqlpp11/detail/set.h>
 #include <sqlpp11/detail/serialize_tuple.h>
-#include <sqlpp11/detail/serializable.h>
+#include <sqlpp11/detail/serializable_list.h>
 
 namespace sqlpp
 {
@@ -47,18 +46,6 @@ namespace sqlpp
 					os << " DEFAULT VALUES";
 			}
 
-		template<typename Db>
-			struct dynamic_column_list
-			{
-				using type = std::vector<detail::serializable_t<Db>>;
-			};
-
-		template<>
-			struct dynamic_column_list<void>
-			{
-				using type = std::vector<noop>;
-			};
-
 		template<typename Column>
 			struct insert_column
 			{
@@ -107,8 +94,8 @@ namespace sqlpp
 				{
 					static_assert(is_assignment_t<typename std::decay<Assignment>::type>::value, "set() arguments require to be assigments");
 					static_assert(not ProhibitPredicate<typename std::decay<Assignment>::type>::value, "set() argument must not be used in insert");
-					_dynamic_columns.push_back(std::forward<typename Assignment::column_type>(assignment._lhs));
-					_dynamic_values.push_back(std::forward<typename Assignment::value_type>(assignment._rhs));
+					_dynamic_columns.emplace_back(detail::insert_column<typename Assignment::column_type>{std::forward<typename Assignment::column_type>(assignment._lhs)});
+					_dynamic_values.emplace_back(std::forward<typename Assignment::value_type>(assignment._rhs));
 				}
 
 			template<typename Db>
@@ -120,38 +107,22 @@ namespace sqlpp
 					}
 					else
 					{
+						constexpr bool first = sizeof...(Assignments) == 0;
+
 						os << " (";
 						detail::serialize_tuple(os, db, _columns, ',');
-						{
-							bool first = sizeof...(Assignments) == 0;
-							for (const auto column : _dynamic_columns)
-							{
-								if (not first)
-									os << ',';
-								column.serialize(os, db);
-								first = false;
-							}
-						}
+						_dynamic_columns.serialize(os, db, first);
 						os << ") VALUES (";
 						detail::serialize_tuple(os, db, _values, ',');
-						{
-							bool first = sizeof...(Assignments) == 0;
-							for (const auto column : _dynamic_values)
-							{
-								if (not first)
-									os << ',';
-								column.serialize(os, db);
-								first = false;
-							}
-						}
+						_dynamic_values.serialize(os, db, first);
 						os << ")";
 					}
 				}
 
 			std::tuple<detail::insert_column<typename Assignments::column_type>...> _columns;
 			std::tuple<typename Assignments::value_type...> _values;
-			typename detail::dynamic_column_list<Database>::type _dynamic_columns;
-			typename detail::dynamic_column_list<Database>::type _dynamic_values;
+			typename detail::serializable_list<Database> _dynamic_columns;
+			typename detail::serializable_list<Database> _dynamic_values;
 		};
 
 }