diff --git a/lib/layers/mvc.rb b/lib/layers/mvc.rb
index c6f6f62..4705107 100644
--- a/lib/layers/mvc.rb
+++ b/lib/layers/mvc.rb
@@ -59,8 +59,8 @@ module Waves
 
         app.auto_eval :Resources do
           const_set( :Default, Class.new( Waves::Resources::Base ) ).module_eval do
-            def controller ; @controller ||= controllers[ singular ].process( @request ) { self } ; end
-            def view ; @view ||= views[ singular ].process( @request ) { self } ; end
+            def controller ; @controller ||= Waves.application.controllers[ singular ].process( @request ) { self } ; end
+            def view ; @view ||= Waves.application.views[ singular ].process( @request ) { self } ; end
             def action( method, *args ) ; @data = controller.send( method, *args ) ; end
             def render( method ) ; view.send( method, ( @data.kind_of?( Enumerable ) ? plural : singular ) => @data ) ; end
             def method_missing( name, *args, &block) ; params[ name.to_s ] ; end
diff --git a/lib/layers/simple.rb b/lib/layers/simple.rb
index 0340139..bbb55dc 100644
--- a/lib/layers/simple.rb
+++ b/lib/layers/simple.rb
@@ -24,9 +24,9 @@ module Waves
         app.auto_create_module( :Configurations ) do
           include AutoCode
           auto_create_class true, Waves::Configurations::Default
+          auto_create_module( :Mapping ) { extend Waves::Mapping }
           auto_load :Mapping, :directories => [:configurations]
           auto_load true, :directories => [:configurations]
-          auto_create_module( :Mapping ) { extend Waves::Mapping }
         end
           
         app.auto_create_module( :Resources ) do