--- trunk/Makefile.PL	2008/12/25 12:43:13	901
+++ trunk/Makefile.PL	2009/01/24 15:11:20	1008
@@ -10,13 +10,9 @@
 # MooseX::Method
 # MooseX::LogDispatch
 #requires	'MooseX::Storage';	# doesn't work for me, so... Frey::Storage
-requires	'Fey';
-requires	'Fey::ORM';
-requires	'Fey::Loader';
 
 requires	'Time::HiRes';
 requires	'Storable';
-requires	'Data::Page';
 requires	'Data::UUID';
 requires	'YAML'; # Frey::Storage
 requires	'File::Slurp';
@@ -26,26 +22,28 @@
 requires	'Clone';
 requires	'File::Tee';
 requires	'DateTimeX::Easy'; # Frey::SVN
+requires	'Imager'; # Frey::Web::CombineImages
 
 features(
-	'Continuity server (see FIXME)' => [
-		-default => 0,
-		'Continuity',
-		#'Continuity::REPL',
-		'Coro::Generator',
-	],
 	'Mojo server' => [
 		-default => 1,
 		'Mojo' => 0.9,
 	],
-	'HTTP::Engine server (see FIXME)' => [
-		-default => 0,
-		'HTTP::Engine' => '0.0.17',
-		'HTTPx::Dispatcher',
+	'RDBMS support' => [
+		'DBIx::Class',
+		'DBIx::Class::Schema::Loader',
+	],
+	'Frey::ORM (RDBMS support via Fey)' => [
+		-default => 1,
+		'Fey',
+		'Fey::ORM',
+		'Fey::Loader',
+		'MooseX::AttributeHelpers',
+		'Data::Page',
 	],
 	'Development (optional)' => [
 		-default => 1,
-		'Module::Reload',
+#		'Module::Reload',
 #		'Carp::REPL',	# XXX breaks error reporting
 		'Test::HTML::Lint',
 		'Test::WWW::Mechanize',
@@ -64,6 +62,9 @@
 	'Frey::Session' => [
 		'DBM::Deep',
 	],
+	'Frey::Class::Graph' => [
+		'GraphViz',
+	],
 	'Frey::DelIcioUs (import data)' => [
 		-default => 1,
 		'LWP::UserAgent',
@@ -71,7 +72,7 @@
 	],
 	'Frey::Feed (RSS/Atom feed support)' => [
 		-default => 1,
-		'Data::Feed',
+		'XML::FeedPP',
 	],
 	'Frey::Translate' => [
 		-default => 0,
@@ -80,7 +81,6 @@
 	'Frey::SQL (issue SQL queries on sponge results)' => [
 		-default => 1,
 		'DBD::AnyData',
-		'MooseX::Types::Structured',
 	],
 	'Frey::Test::Runner HTML reporting' => [
 		-default => 0,