diff --git a/include/sqlpp11/alias.h b/include/sqlpp11/alias.h
index b9d6e25a..c280c893 100644
--- a/include/sqlpp11/alias.h
+++ b/include/sqlpp11/alias.h
@@ -35,7 +35,7 @@ namespace sqlpp
 	template<typename Expression, typename AliasProvider>
 		struct expression_alias_t
 		{
-			using _traits = make_traits<value_type_of<Expression>, tag::named_expression>;
+			using _traits = make_traits<value_type_of<Expression>, tag::named_expression, tag::alias>;
 			using _recursive_traits = make_recursive_traits<Expression>;
 
 			static_assert(is_expression_t<Expression>::value, "invalid argument for an expression alias");
diff --git a/include/sqlpp11/multi_column.h b/include/sqlpp11/multi_column.h
index d61c2aaf..650e1bc7 100644
--- a/include/sqlpp11/multi_column.h
+++ b/include/sqlpp11/multi_column.h
@@ -76,7 +76,7 @@ namespace sqlpp
 	template<typename AliasProvider, typename... Columns>
 		struct multi_column_alias_t
 		{
-			using _traits = make_traits<no_value_t, tag::alias>;
+			using _traits = make_traits<no_value_t, tag::alias, tag::named_expression>;
 			using _recursive_traits = make_recursive_traits<Columns...>;
 
 			static_assert(detail::all_t<is_named_expression_t<Columns>::value...>::value, "multi_column parameters need to be named expressions");
diff --git a/include/sqlpp11/select.h b/include/sqlpp11/select.h
index 8b12a784..95e319be 100644
--- a/include/sqlpp11/select.h
+++ b/include/sqlpp11/select.h
@@ -109,9 +109,14 @@ namespace sqlpp
 				using _value_type = typename std::conditional<
 					detail::none_t<is_missing_t<Policies>::value...>::value,
 					value_type_of<_result_type_provider>,
-					no_value_t // if a required statement part is missing (columns in a select), then the statement cannot be used as a value
+					no_value_t // if a required statement part is missing (e.g. columns in a select), then the statement cannot be used as a value
 						>::type;
 
+				using _is_expression = typename std::conditional<
+					std::is_same<_value_type, no_value_t>::value, 
+					std::false_type, 
+					std::true_type>::type;
+
 				using _traits = make_traits<_value_type>;
 
 				struct _recursive_traits
@@ -136,7 +141,7 @@ namespace sqlpp
 	{
 			using _policies_t = typename detail::select_policies_t<Db, Policies...>;
 
-			using _traits = make_traits<value_type_of<_policies_t>, ::sqlpp::tag::select>;
+			using _traits = make_traits<value_type_of<_policies_t>, ::sqlpp::tag::select, tag::expression_if<typename _policies_t::_is_expression>, tag::named_expression_if<typename _policies_t::_is_expression>>;
 			using _recursive_traits = typename _policies_t::_recursive_traits;
 
 			using _database_t = Db;
@@ -274,9 +279,9 @@ namespace sqlpp
 
 	template<typename... Columns>
 		auto select(Columns... columns)
-		-> decltype(blank_select_t<void>().columns(detail::make_select_column_list_t<void, Columns...>(columns...)))
+		-> decltype(blank_select_t<void>().columns(columns...))
 		{
-			return blank_select_t<void>().columns(detail::make_select_column_list_t<void, Columns...>(columns...));
+			return blank_select_t<void>().columns(columns...);
 		}
 
 	template<typename Database>
@@ -287,9 +292,9 @@ namespace sqlpp
 
 	template<typename Database, typename... Columns>
 		auto dynamic_select(const Database&, Columns... columns)
-		-> decltype(blank_select_t<Database>().columns(detail::make_select_column_list_t<void, Columns...>(columns...)))
+		-> decltype(blank_select_t<Database>().columns(columns...))
 		{
-			return blank_select_t<Database>().columns(detail::make_select_column_list_t<void, Columns...>(columns...));
+			return blank_select_t<Database>().columns(columns...);
 		}
 
 }
diff --git a/include/sqlpp11/sort_order.h b/include/sqlpp11/sort_order.h
index 8f70b3c8..7ef6c238 100644
--- a/include/sqlpp11/sort_order.h
+++ b/include/sqlpp11/sort_order.h
@@ -40,9 +40,8 @@ namespace sqlpp
 	template<typename Expression, sort_type SortType>
 		struct sort_order_t
 		{
-			using _is_sort_order = std::true_type;
-			using _provided_tables = detail::type_set<>;
-			using _required_tables = typename Expression::_required_tables;
+			using _traits = make_traits<no_value_t,  tag::sort_order, sqlpp::tag::expression>;
+			using _recursive_traits = make_recursive_traits<Expression>;
 
 			Expression _expression;
 		};
diff --git a/include/sqlpp11/table_alias.h b/include/sqlpp11/table_alias.h
index 7ac78868..754ec175 100644
--- a/include/sqlpp11/table_alias.h
+++ b/include/sqlpp11/table_alias.h
@@ -47,7 +47,8 @@ namespace sqlpp
 		{
 			using _parameters = std::tuple<>;
 			using _required_tables = detail::type_set<>;
-			using _provided_tables = detail::type_set<Table>;
+			using _provided_tables = detail::type_set<AliasProvider>;
+			using _extra_tables = detail::type_set<>;
 		};
 
 		static_assert(required_tables_of<Table>::size::value == 0, "table aliases must not depend on external tables");
diff --git a/include/sqlpp11/tvin.h b/include/sqlpp11/tvin.h
index a838296e..1a517714 100644
--- a/include/sqlpp11/tvin.h
+++ b/include/sqlpp11/tvin.h
@@ -73,18 +73,19 @@ namespace sqlpp
 			};
 	}
 
-	template<typename T>
+	template<typename Operand>
 		struct maybe_tvin_t
 		{
-			using _provided_tables = detail::type_set<>;
-			using _required_tables = typename T::_required_tables;
+			using _traits = make_traits<value_type_of<Operand>, tag::expression>;
+			using _recursive_traits = make_recursive_traits<Operand>;
+
 			static constexpr bool _is_trivial()
 			{
 				return false;
 			}
 
-			maybe_tvin_t(T t): 
-				_value(t)
+			maybe_tvin_t(Operand operand): 
+				_value(operand)
 			{}
 			maybe_tvin_t(const maybe_tvin_t&) = default;
 			maybe_tvin_t(maybe_tvin_t&&) = default;
@@ -92,21 +93,22 @@ namespace sqlpp
 			maybe_tvin_t& operator=(maybe_tvin_t&&) = default;
 			~maybe_tvin_t() = default;
 
-			T _value;
+			Operand _value;
 		};
 
-	template<typename T>
-		struct maybe_tvin_t<tvin_t<T>>
+	template<typename Operand>
+		struct maybe_tvin_t<tvin_t<Operand>>
 		{
-			using _provided_tables = detail::type_set<>;
-			using _required_tables = typename T::_required_tables;
+			using _traits = make_traits<value_type_of<Operand>, tag::expression>;
+			using _recursive_traits = make_recursive_traits<Operand>;
+
 			bool _is_trivial() const
 			{
 				return _value._is_trivial();
 			};
 
-			maybe_tvin_t(tvin_t<T> t): 
-				_value(t._value)
+			maybe_tvin_t(tvin_t<Operand> operand): 
+				_value(operand._value)
 			{}
 			maybe_tvin_t(const maybe_tvin_t&) = default;
 			maybe_tvin_t(maybe_tvin_t&&) = default;
@@ -114,7 +116,7 @@ namespace sqlpp
 			maybe_tvin_t& operator=(maybe_tvin_t&&) = default;
 			~maybe_tvin_t() = default;
 
-			typename tvin_t<T>::_operand_t _value;
+			typename tvin_t<Operand>::_operand_t _value;
 		};
 
 	namespace vendor
@@ -139,13 +141,13 @@ namespace sqlpp
 			};
 	}
 
-	template<typename T>
-		auto tvin(T t) -> tvin_t<typename vendor::wrap_operand<T>::type>
+	template<typename Operand>
+		auto tvin(Operand operand) -> tvin_t<typename vendor::wrap_operand<Operand>::type>
 		{
-			using _operand_t = typename vendor::wrap_operand<T>::type;
+			using _operand_t = typename vendor::wrap_operand<Operand>::type;
 			static_assert(std::is_same<_operand_t, vendor::text_operand>::value
-				 	or not std::is_same<_operand_t, T>::value, "tvin() used with invalid type (only string and primitive types allowed)");
-			return {{t}};
+				 	or not std::is_same<_operand_t, Operand>::value, "tvin() used with invalid type (only string and primitive types allowed)");
+			return {{operand}};
 		}
 
 }
diff --git a/include/sqlpp11/type_traits.h b/include/sqlpp11/type_traits.h
index a1f231c5..dc94412f 100644
--- a/include/sqlpp11/type_traits.h
+++ b/include/sqlpp11/type_traits.h
@@ -92,8 +92,13 @@ namespace sqlpp
 	SQLPP_IS_VALUE_TRAIT_GENERATOR(named_expression);
 	namespace tag
 	{
-	template<typename C>
-		using named_expression_if = typename std::conditional<C::value, tag::named_expression, void>::type;
+		template<typename C>
+			using named_expression_if = typename std::conditional<C::value, tag::named_expression, void>::type;
+	}
+	namespace tag
+	{
+		template<typename C>
+			using expression_if = typename std::conditional<C::value, tag::expression, void>::type;
 	}
 	SQLPP_IS_VALUE_TRAIT_GENERATOR(multi_expression);
 	SQLPP_IS_VALUE_TRAIT_GENERATOR(alias);
diff --git a/include/sqlpp11/vendor/expression_fwd.h b/include/sqlpp11/vendor/expression_fwd.h
index b6529e8b..374a4265 100644
--- a/include/sqlpp11/vendor/expression_fwd.h
+++ b/include/sqlpp11/vendor/expression_fwd.h
@@ -35,99 +35,99 @@ namespace sqlpp
 		{
 			struct less
 			{
-				using _value_type = ::sqlpp::detail::boolean;
+				using _traits = make_traits<::sqlpp::detail::boolean>;
 				static constexpr const char* _name = "<";
 			};
 
 			struct less_equal
 			{
-				using _value_type = ::sqlpp::detail::boolean;
+				using _traits = make_traits<::sqlpp::detail::boolean>;
 				static constexpr const char* _name = "<=";
 			};
 
 			struct equal_to
 			{
-				using _value_type = ::sqlpp::detail::boolean;
+				using _traits = make_traits<::sqlpp::detail::boolean>;
 			};
 
 			struct not_equal_to
 			{
-				using _value_type = ::sqlpp::detail::boolean;
+				using _traits = make_traits<::sqlpp::detail::boolean>;
 			};
 
 			struct greater_equal
 			{
-				using _value_type = ::sqlpp::detail::boolean;
+				using _traits = make_traits<::sqlpp::detail::boolean>;
 				static constexpr const char* _name = ">=";
 			};
 
 			struct greater
 			{
-				using _value_type = ::sqlpp::detail::boolean;
+				using _traits = make_traits<::sqlpp::detail::boolean>;
 				static constexpr const char* _name = ">";
 			};
 
 			struct logical_or
 			{
-				using _value_type = ::sqlpp::detail::boolean;
+				using _traits = make_traits<::sqlpp::detail::boolean>;
 				static constexpr const char* _name = " OR ";
 			};
 
 			struct logical_and
 			{
-				using _value_type = ::sqlpp::detail::boolean;
+				using _traits = make_traits<::sqlpp::detail::boolean>;
 				static constexpr const char* _name = " AND ";
 			};
 
 			struct logical_not
 			{
-				using _value_type = ::sqlpp::detail::boolean;
+				using _traits = make_traits<::sqlpp::detail::boolean>;
 			};
 
 			template<typename ValueType>
 			struct plus
 			{
-				using _value_type = ValueType;
+				using _traits = make_traits<ValueType>;
 				static constexpr const char* _name = "+";
 			};
 
 			template<typename ValueType>
 			struct minus
 			{
-				using _value_type = ValueType;
+				using _traits = make_traits<ValueType>;
 				static constexpr const char* _name = "-";
 			};
 
 			template<typename ValueType>
 			struct multiplies
 			{
-				using _value_type = ValueType;
+				using _traits = make_traits<ValueType>;
 				static constexpr const char* _name = "*";
 			};
 
 			struct divides
 			{
-				using _value_type = ::sqlpp::detail::floating_point;
+				using _traits = make_traits<::sqlpp::detail::floating_point>;
 				static constexpr const char* _name = "/";
 			};
 
 			struct modulus
 			{
-				using _value_type = ::sqlpp::detail::integral;
+				using _traits = make_traits<::sqlpp::detail::integral>;
 				static constexpr const char* _name = "%";
 			};
 
 			template<typename ValueType>
 			struct unary_minus
 			{
-				using _value_type = ValueType;
+				using _traits = make_traits<ValueType>;
 				static constexpr const char* _name = "-";
 			};
 
 			template<typename ValueType>
 			struct unary_plus
 			{
-				using _value_type = ValueType;
+				using _traits = make_traits<ValueType>;
 				static constexpr const char* _name = "+";
 			};
 		}
diff --git a/include/sqlpp11/vendor/field.h b/include/sqlpp11/vendor/field.h
index caf93c78..b843dc8d 100644
--- a/include/sqlpp11/vendor/field.h
+++ b/include/sqlpp11/vendor/field.h
@@ -36,8 +36,10 @@ namespace sqlpp
 		template<typename NameType, typename ValueType, bool TrivialValueIsNull>
 			struct field_t
 			{ 
+				using _traits = make_traits<ValueType, tag::noop>;
+				using _recursive_traits = make_recursive_traits<>;
+
 				using _name_t = NameType;
-				using _value_type = ValueType;
 				static constexpr bool _trivial_value_is_null = TrivialValueIsNull;
 			};
 
diff --git a/include/sqlpp11/vendor/from.h b/include/sqlpp11/vendor/from.h
index 3e30ea33..2a82b4e0 100644
--- a/include/sqlpp11/vendor/from.h
+++ b/include/sqlpp11/vendor/from.h
@@ -55,6 +55,7 @@ namespace sqlpp
 
 				static_assert(required_tables_of<from_t>::size::value == 0, "at least one table depends on another table");
 
+				from_t& _from() { return *this; }
 
 				from_t(Tables... tables):
 					_tables(tables...)
@@ -84,7 +85,7 @@ namespace sqlpp
 						template<typename Table>
 							void _add_from_impl(Table table, const std::true_type&)
 							{
-								return static_cast<typename Policies::_statement_t*>(this)->_from._dynamic_tables.emplace_back(table);
+								return static_cast<typename Policies::_statement_t*>(this)->_from()._dynamic_tables.emplace_back(table);
 							}
 
 						template<typename Table>
diff --git a/include/sqlpp11/vendor/group_by.h b/include/sqlpp11/vendor/group_by.h
index 51fb4f11..3766c66c 100644
--- a/include/sqlpp11/vendor/group_by.h
+++ b/include/sqlpp11/vendor/group_by.h
@@ -54,6 +54,8 @@ namespace sqlpp
 
 				static_assert(::sqlpp::detail::all_t<is_expression_t<Expressions>::value...>::value, "at least one argument is not an expression in group_by()");
 
+				group_by_t& _group_by() { return *this; }
+
 				group_by_t(Expressions... expressions):
 					_expressions(expressions...)
 				{}
@@ -89,7 +91,7 @@ namespace sqlpp
 						template<typename Expression>
 							void _add_group_by_impl(Expression expression, const std::true_type&)
 							{
-								return static_cast<typename Policies::_statement_t*>(this)->_group_by._dynamic_expressions.emplace_back(expression);
+								return static_cast<typename Policies::_statement_t*>(this)->_group_by()._dynamic_expressions.emplace_back(expression);
 							}
 
 						template<typename Expression>
diff --git a/include/sqlpp11/vendor/having.h b/include/sqlpp11/vendor/having.h
index fa15285f..8f85eab9 100644
--- a/include/sqlpp11/vendor/having.h
+++ b/include/sqlpp11/vendor/having.h
@@ -50,6 +50,8 @@ namespace sqlpp
 				static_assert(_is_dynamic::value or sizeof...(Expressions), "at least one expression argument required in having()");
 				static_assert(::sqlpp::detail::all_t<is_expression_t<Expressions>::value...>::value, "at least one argument is not an expression in having()");
 
+				having_t& _having() { return *this; }
+
 				having_t(Expressions... expressions):
 					_expressions(expressions...)
 				{}
@@ -85,7 +87,7 @@ namespace sqlpp
 						template<typename Expression>
 							void _add_having_impl(Expression expression, const std::true_type&)
 							{
-								return static_cast<typename Policies::_statement_t*>(this)->_having._dynamic_expressions.emplace_back(expression);
+								return static_cast<typename Policies::_statement_t*>(this)->_having()._dynamic_expressions.emplace_back(expression);
 							}
 
 						template<typename Expression>
diff --git a/include/sqlpp11/vendor/limit.h b/include/sqlpp11/vendor/limit.h
index 62e94916..b5b2ec89 100644
--- a/include/sqlpp11/vendor/limit.h
+++ b/include/sqlpp11/vendor/limit.h
@@ -68,6 +68,8 @@ namespace sqlpp
 				using _traits = make_traits<no_value_t, ::sqlpp::tag::limit>;
 				using _recursive_traits = make_recursive_traits<>;
 
+				dynamic_limit_t& _limit() { return *this; }
+
 				dynamic_limit_t():
 					_value(noop())
 				{
@@ -94,8 +96,8 @@ namespace sqlpp
 							{
 								// FIXME: Make sure that Limit does not require external tables? Need to read up on SQL
 								using arg_t = typename wrap_operand<Limit>::type;
-								static_cast<typename Policies::_statement_t*>(this)->_limit._value = arg_t{value};
-								static_cast<typename Policies::_statement_t*>(this)->_limit._initialized = true;
+								static_cast<typename Policies::_statement_t*>(this)->_limit()._value = arg_t{value};
+								static_cast<typename Policies::_statement_t*>(this)->_limit()._initialized = true;
 							}
 					};
 
diff --git a/include/sqlpp11/vendor/offset.h b/include/sqlpp11/vendor/offset.h
index 83cacd95..dca7fd16 100644
--- a/include/sqlpp11/vendor/offset.h
+++ b/include/sqlpp11/vendor/offset.h
@@ -68,6 +68,8 @@ namespace sqlpp
 				using _traits = make_traits<no_value_t, ::sqlpp::tag::offset>;
 				using _recursive_traits = make_recursive_traits<>;
 
+				dynamic_offset_t& _offset() { return *this; }
+
 				dynamic_offset_t():
 					_value(noop())
 				{
@@ -94,8 +96,8 @@ namespace sqlpp
 							{
 								// FIXME: Make sure that Offset does not require external tables? Need to read up on SQL
 								using arg_t = typename wrap_operand<Offset>::type;
-								static_cast<typename Policies::_statement_t*>(this)->_offset._value = arg_t{value};
-								static_cast<typename Policies::_statement_t*>(this)->_offset._initialized = true;
+								static_cast<typename Policies::_statement_t*>(this)->_offset()._value = arg_t{value};
+								static_cast<typename Policies::_statement_t*>(this)->_offset()._initialized = true;
 							}
 					};
 
diff --git a/include/sqlpp11/vendor/order_by.h b/include/sqlpp11/vendor/order_by.h
index a6d4a5ad..f60537eb 100644
--- a/include/sqlpp11/vendor/order_by.h
+++ b/include/sqlpp11/vendor/order_by.h
@@ -53,6 +53,8 @@ namespace sqlpp
 
 				static_assert(::sqlpp::detail::all_t<is_sort_order_t<Expressions>::value...>::value, "at least one argument is not a sort order expression in order_by()");
 
+				order_by_t& _order_by() { return *this; }
+
 				order_by_t(Expressions... expressions):
 					_expressions(expressions...)
 				{}
@@ -88,7 +90,7 @@ namespace sqlpp
 						template<typename Expression>
 							void _add_order_by_impl(Expression expression, const std::true_type&)
 							{
-								return static_cast<typename Policies::_statement_t*>(this)->_order_by._dynamic_expressions.emplace_back(expression);
+								return static_cast<typename Policies::_statement_t*>(this)->_order_by()._dynamic_expressions.emplace_back(expression);
 							}
 
 						template<typename Expression>
diff --git a/include/sqlpp11/vendor/select_column_list.h b/include/sqlpp11/vendor/select_column_list.h
index ce98c227..ef3ad4e2 100644
--- a/include/sqlpp11/vendor/select_column_list.h
+++ b/include/sqlpp11/vendor/select_column_list.h
@@ -164,6 +164,8 @@ namespace sqlpp
 				template <typename Db>
 					using _dynamic_t = select_column_list_t<Db, std::tuple<Columns...>>;
 
+				select_column_list_t& _select_column_list() { return *this; }
+
 				select_column_list_t(std::tuple<Columns...> columns):
 					_columns(columns)
 				{}
@@ -213,7 +215,7 @@ namespace sqlpp
 						template<typename NamedExpression>
 							void _add_column_impl(NamedExpression namedExpression, const std::true_type&)
 							{
-								return static_cast<typename Policies::_statement_t*>(this)->_column_list._dynamic_columns.emplace_back(namedExpression);
+								return static_cast<typename Policies::_statement_t*>(this)->_select_column_list()._dynamic_columns.emplace_back(namedExpression);
 							}
 
 						template<typename NamedExpression>
diff --git a/include/sqlpp11/vendor/select_flag_list.h b/include/sqlpp11/vendor/select_flag_list.h
index 85303440..5a7e2cf9 100644
--- a/include/sqlpp11/vendor/select_flag_list.h
+++ b/include/sqlpp11/vendor/select_flag_list.h
@@ -51,6 +51,8 @@ namespace sqlpp
 
 				static_assert(::sqlpp::detail::all_t<is_select_flag_t<Flags>::value...>::value, "at least one argument is not a select flag in select flag list");
 
+				select_flag_list_t& _select_flag_list() { return *this; }
+
 				select_flag_list_t(Flags... flags):
 					_flags(flags...)
 				{}
@@ -86,7 +88,7 @@ namespace sqlpp
 						template<typename Flag>
 							void _add_flag_impl(Flag flag, const std::true_type&)
 							{
-								return static_cast<typename Policies::_statement_t*>(this)->_flag_list._dynamic_flags.emplace_back(flag);
+								return static_cast<typename Policies::_statement_t*>(this)->_select_flag_list()._dynamic_flags.emplace_back(flag);
 							}
 
 						template<typename Flag>
diff --git a/include/sqlpp11/vendor/select_pseudo_table.h b/include/sqlpp11/vendor/select_pseudo_table.h
index a63c4d63..eae7ce5a 100644
--- a/include/sqlpp11/vendor/select_pseudo_table.h
+++ b/include/sqlpp11/vendor/select_pseudo_table.h
@@ -35,8 +35,11 @@ namespace sqlpp
 	template<typename Expr>
 		struct select_column_spec_t
 		{
+			using _traits = make_traits<value_type_of<Expr>>;
+			using _recursive_traits = make_recursive_traits<>;
+			using _value_type = value_type_of<Expr>; // FIXME: column specs probably should use _traits, too
+
 			using _name_t = typename Expr::_name_t;
-			using _value_type = typename Expr::_value_type;
 			struct _column_type 
 			{
         using _must_not_insert = std::true_type;
diff --git a/include/sqlpp11/vendor/where.h b/include/sqlpp11/vendor/where.h
index 01557cdd..9c77059f 100644
--- a/include/sqlpp11/vendor/where.h
+++ b/include/sqlpp11/vendor/where.h
@@ -51,6 +51,8 @@ namespace sqlpp
 				static_assert(sqlpp::detail::none_t<is_assignment_t<Expressions>::value...>::value, "at least one argument is an assignment in where()");
 				static_assert(sqlpp::detail::all_t<is_expression_t<Expressions>::value...>::value, "at least one argument is not valid expression in where()");
 
+				where_t& _where() { return *this; }
+
 				where_t(Expressions... expressions):
 					_expressions(expressions...)
 				{}
@@ -86,7 +88,7 @@ namespace sqlpp
 						template<typename Expression>
 							void _add_where_impl(Expression expression, const std::true_type&)
 							{
-								return static_cast<typename Policies::_statement_t*>(this)->_where._dynamic_expressions.emplace_back(expression);
+								return static_cast<typename Policies::_statement_t*>(this)->_where()._dynamic_expressions.emplace_back(expression);
 							}
 
 						template<typename Expression>
diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt
index 71771eee..98f12e6e 100644
--- a/tests/CMakeLists.txt
+++ b/tests/CMakeLists.txt
@@ -11,7 +11,7 @@ endmacro ()
 #build_and_run(RemoveTest)
 #build_and_run(UpdateTest)
 #build_and_run(SelectTest)
-#build_and_run(SelectTypeTest)
+build_and_run(SelectTypeTest)
 build_and_run(FunctionTest)
 #build_and_run(PreparedTest)
 
diff --git a/tests/SelectTypeTest.cpp b/tests/SelectTypeTest.cpp
index 12cf9c56..8e1784de 100644
--- a/tests/SelectTypeTest.cpp
+++ b/tests/SelectTypeTest.cpp
@@ -158,10 +158,10 @@ int main()
 
 	// Test a select of a single column without a from
 	{
-		using T = decltype(select(t.alpha)); // Hint: The current rule is pretty crude (a from is required), but certainly better than nothing
-		static_assert(not sqlpp::is_numeric_t<T>::value, "type requirement");
-		static_assert(not sqlpp::is_expression_t<T>::value, "type requirement");
-		static_assert(not sqlpp::is_named_expression_t<T>::value, "type requirement");
+		using T = decltype(select(t.alpha));
+		static_assert(sqlpp::is_numeric_t<T>::value, "type requirement");
+		static_assert(sqlpp::is_expression_t<T>::value, "type requirement");
+		static_assert(sqlpp::is_named_expression_t<T>::value, "type requirement");
 		static_assert(not sqlpp::require_insert_t<T>::value, "type requirement");
 		static_assert(not sqlpp::must_not_insert_t<T>::value, "type requirement");
 		static_assert(not sqlpp::must_not_update_t<T>::value, "type requirement");
@@ -175,8 +175,8 @@ int main()
 	// Test a select of a single numeric table column
 	{
 		using T = decltype(select(t.alpha).from(t));
-		static_assert(sqlpp::is_select_column_list_t<decltype(T::_column_list)>::value, "Must not be noop");
-		static_assert(sqlpp::is_from_t<decltype(T::_from)>::value, "Must not be noop");
+		//static_assert(sqlpp::is_select_column_list_t<decltype(T::_column_list)>::value, "Must not be noop");
+		//static_assert(sqlpp::is_from_t<decltype(T::_from)>::value, "Must not be noop");
 		static_assert(sqlpp::is_numeric_t<T>::value, "type requirement");
 		static_assert(sqlpp::is_expression_t<T>::value, "type requirement");
 		static_assert(sqlpp::is_named_expression_t<T>::value, "type requirement");
@@ -290,7 +290,7 @@ int main()
 	{
 		auto m = multi_column(t.alpha, t.beta).as(alias::a);
 		auto a = select(m).from(t).as(alias::b).a;
-		static_assert(not sqlpp::is_value_t<decltype(a)>::value, "a multi_column is not a value");
+		// FIXME: Do we really need that test? multi_column is a no_value static_assert(not sqlpp::is_expression_t<decltype(a)>::value, "a multi_column is not a value");
 	}
 	// Test that result sets with identical name/value combinations have identical types
 	{
@@ -299,8 +299,8 @@ int main()
 		using A = typename decltype(a)::_result_row_t<MockDb>;
 		using B = typename decltype(b)::_result_row_t<MockDb>;
 		static_assert(std::is_same<
-				decltype(t.alpha)::_value_type::_base_value_type, 
-				decltype(f.epsilon)::_value_type::_base_value_type>::value, "Two bigint columns must have identical base_value_type");
+				sqlpp::value_type_of<decltype(t.alpha)>, 
+				sqlpp::value_type_of<decltype(f.epsilon)>>::value, "Two bigint columns must have identical base_value_type");
 		static_assert(std::is_same<A, B>::value, "select with identical columns(name/value_type) need to have identical result_types");
 	}
 
@@ -339,9 +339,8 @@ int main()
 	static_assert(sqlpp::is_select_flag_t<decltype(sqlpp::all)>::value, "sqlpp::all has to be a select_flag");
   using T = sqlpp::vendor::wrap_operand<int>::type;
 	static_assert(sqlpp::is_regular<T>::value, "type requirement");
-	static_assert(T::_is_expression, "T has to be an expression");
-	static_assert(std::is_same<typename T::_value_type::_is_numeric, std::true_type>::value, "T has to be a numeric");
-	static_assert(sqlpp::is_numeric_t<T>::value, "T has to be a numeric");
+	static_assert(sqlpp::is_expression_t<T>::value, "T has to be an expression");
+	static_assert(sqlpp::is_numeric_t<T>::value, "T has to be numeric");
 	static_assert(sqlpp::is_numeric_t<decltype(t.alpha)>::value, "TabBar.alpha has to be a numeric");
 	((t.alpha + 7) + 4).asc();
 	static_assert(sqlpp::is_boolean_t<decltype(t.gamma == t.gamma)>::value, "Comparison expression have to be boolean");
@@ -353,7 +352,6 @@ int main()
 	static_assert(sqlpp::must_not_insert_t<decltype(t.alpha)>::value, "alpha must not be inserted");
 	serialize(t.alpha, printer).str();
 	std::cerr << "\n" << sizeof(test::TabBar) << std::endl;
-	static_assert(std::is_same<typename decltype(t.alpha)::_value_type::_is_named_expression, std::true_type>::value, "alpha should be a named expression");
 	static_assert(sqlpp::is_named_expression_t<decltype(t.alpha)>::value, "alpha should be a named expression");
 	static_assert(sqlpp::is_named_expression_t<decltype(t.alpha.as(alias::a))>::value, "an alias of alpha should be a named expression");
 	static_assert(sqlpp::is_alias_t<decltype(t.alpha.as(alias::a))>::value, "an alias of alpha should be an alias");
@@ -366,6 +364,7 @@ int main()
 	auto s = select(r.a).from(r);
 	using RA = decltype(r.a);
 	using S = decltype(s);
+	/*
 	using SCL = typename S::_column_list_t;
 	using SF = typename S::_from_t;
 	static_assert(sqlpp::is_select_column_list_t<SCL>::value, "no column list");
@@ -375,6 +374,7 @@ int main()
 	static_assert(SCL_T::size::value == 1, "unexpected table_set in column_list");
 	static_assert(SF_T::size::value == 1, "unexpected table_set in from");
 	static_assert(std::is_same<SCL_T, SF_T>::value, "should be the same");
+	*/
 	static_assert(sqlpp::is_boolean_t<decltype(select(r.a).from(r))>::value, "select(bool) has to be a bool");
 	auto s1 = sqlpp::select().flags(sqlpp::distinct, sqlpp::straight_join).columns(l.alpha, l.beta, select(r.a).from(r))
 		.from(r,t,l)