diff --git a/src/database/updater/DatabaseHighLevelCluster.cpp b/src/database/updater/DatabaseHighLevelCluster.cpp
index 995e106b..60d54918 100644
--- a/src/database/updater/DatabaseHighLevelCluster.cpp
+++ b/src/database/updater/DatabaseHighLevelCluster.cpp
@@ -35,7 +35,7 @@ static Cluster::pointer getCluster(std::string type, std::string value)
 	return cluster;
 }
 
-static std::list<std::string> getClustersFromFeature(Feature::Type& feature, double minProb)
+static std::list<std::string> getClustersFromFeature(boost::property_tree::ptree& feature, double minProb)
 {
 	struct HighLevelNodeDesc
 	{
@@ -181,7 +181,7 @@ HighLevelCluster::handleFilesUpdated(void)
 		std::list<std::string> newClusterNames;
 		if (createTags)
 		{
-			Feature::Type feature;
+			boost::property_tree::ptree feature;
 			if (!Feature::Store::instance().get(UpdaterDboSession(), trackId, "high_level", feature))
 				continue;
 
diff --git a/src/feature/FeatureExtractor.cpp b/src/feature/FeatureExtractor.cpp
index 7f9560cb..48a0a888 100644
--- a/src/feature/FeatureExtractor.cpp
+++ b/src/feature/FeatureExtractor.cpp
@@ -112,7 +112,8 @@ Extractor::getLowLevel(boost::property_tree::ptree& pt, std::string mbid)
 		return false;
 	}
 
-	res.erase("metadata");
+	// Keep metadata to ease debugging
+//	res.erase("metadata");
 
 	pt = res;
 
diff --git a/src/feature/FeatureExtractor.hpp b/src/feature/FeatureExtractor.hpp
index 7696c968..ed7169c2 100644
--- a/src/feature/FeatureExtractor.hpp
+++ b/src/feature/FeatureExtractor.hpp
@@ -25,8 +25,6 @@
 
 namespace Feature {
 
-typedef boost::property_tree::ptree Type;
-
 class Extractor
 {
 	public:
diff --git a/src/feature/FeatureStore.cpp b/src/feature/FeatureStore.cpp
index 4322ac7e..2f52eff8 100644
--- a/src/feature/FeatureStore.cpp
+++ b/src/feature/FeatureStore.cpp
@@ -62,7 +62,7 @@ Store::exists(Wt::Dbo::Session& session, Database::Track::id_type trackId, std::
 }
 
 bool
-Store::get(Wt::Dbo::Session& session, Database::Track::id_type trackId, std::string type, Type& feature)
+Store::get(Wt::Dbo::Session& session, Database::Track::id_type trackId, std::string type, boost::property_tree::ptree& feature)
 {
 	Wt::Dbo::Transaction transaction(session);
 
@@ -94,7 +94,7 @@ Store::get(Wt::Dbo::Session& session, Database::Track::id_type trackId, std::str
 
 
 bool
-Store::set(Wt::Dbo::Session& session, Database::Track::id_type trackId, std::string type, const Type& feature)
+Store::set(Wt::Dbo::Session& session, Database::Track::id_type trackId, std::string type, const boost::property_tree::ptree& feature)
 {
 	Wt::Dbo::Transaction transaction(session);
 
diff --git a/src/feature/FeatureStore.hpp b/src/feature/FeatureStore.hpp
index e1f70bea..a02e1400 100644
--- a/src/feature/FeatureStore.hpp
+++ b/src/feature/FeatureStore.hpp
@@ -20,9 +20,9 @@
 #pragma once
 
 #include <boost/filesystem/path.hpp>
+#include <boost/property_tree/ptree.hpp>
 
 #include "database/Types.hpp"
-#include "FeatureExtractor.hpp"
 
 namespace Feature {
 
@@ -35,9 +35,9 @@ class Store
 		static Store& instance();
 
 		bool	exists(Wt::Dbo::Session& session, Database::Track::id_type trackId, std::string type);
-		bool	get(Wt::Dbo::Session& session, Database::Track::id_type trackId, std::string type, Type& feature);
+		bool	get(Wt::Dbo::Session& session, Database::Track::id_type trackId, std::string type, boost::property_tree::ptree& feature);
 
-		bool	set(Wt::Dbo::Session& session, Database::Track::id_type trackId, std::string type, const Type& feature);
+		bool	set(Wt::Dbo::Session& session, Database::Track::id_type trackId, std::string type, const boost::property_tree::ptree& feature);
 
 	private:
 		Store();
diff --git a/src/main/main.cpp b/src/main/main.cpp
index 7cfafa8a..29830222 100644
--- a/src/main/main.cpp
+++ b/src/main/main.cpp
@@ -23,9 +23,9 @@
 #include <Wt/WServer>
 
 #include "utils/Config.hpp"
+#include "utils/Logger.hpp"
 #include "av/AvInfo.hpp"
 #include "av/AvTranscoder.hpp"
-#include "utils/Logger.hpp"
 #include "image/Image.hpp"
 #include "feature/FeatureExtractor.hpp"