--- trunk/lib/Frey/ClassLoader.pm	2008/11/25 17:15:18	519
+++ trunk/lib/Frey/ClassLoader.pm	2008/11/28 13:27:34	586
@@ -8,6 +8,7 @@
 =cut
 
 extends 'Frey';
+with 'Frey::Session';
 
 use Data::Dump qw/dump/;
 use File::Find;
@@ -34,6 +35,10 @@
 		$class =~ s{^lib/}{};
 		$class =~ s{\.pm$}{};
 		$class =~ s{/}{::}g;
+		if ( $class =~ m{Mojo} ) {
+			$self->TODO( "Mojo support" );
+			return;
+		}
 		$class_path->{ $class } = $_;
 	} }, 'lib');
 	warn "## class_path = ",dump( $class_path ) if $self->debug;
@@ -163,7 +168,7 @@
 
 sub class_runnable {
 	my ( $self, $class ) = @_;
-	my @methods = grep { m{^as_} } $self->class_methods( $class );
+	my @methods = grep { m{^as_} || m{_as_} } $self->class_methods( $class );
 	return @methods if wantarray;
 	return \@methods;
 }
@@ -217,7 +222,12 @@
 		warn "# apply as_sponge role to $class";
 	}
 
-	$self->add_status({ $class => $params }) if $self->can('add_status');
+	if ( ! $instance->can('add_status') ) {
+		Frey::Web->meta->apply( $instance );
+		warn "# apply Frey::Web role to $class";
+	}
+
+	$self->add_status({ $class => $params });
 	return $instance;
 }