diff --git a/.hgignore b/.hgignore
index 3472a64ec..9782256f0 100644
--- a/.hgignore
+++ b/.hgignore
@@ -12,6 +12,6 @@ glob:src/Orchard.Web/Media/*
 glob:desktop.ini
 glob:log.xml
 glob:profiling
-glob:src/*.suo
 glob:src/*.ReSharper
 glob:*.orig
+glob:*.suo
diff --git a/src/Orchard.Azure/Orchard.Azure.CloudService/ServiceConfiguration.cscfg b/src/Orchard.Azure/Orchard.Azure.CloudService/ServiceConfiguration.cscfg
index 5fd08b040..16eda749c 100644
--- a/src/Orchard.Azure/Orchard.Azure.CloudService/ServiceConfiguration.cscfg
+++ b/src/Orchard.Azure/Orchard.Azure.CloudService/ServiceConfiguration.cscfg
@@ -1,3 +1,10 @@
 <?xml version="1.0"?>
 <ServiceConfiguration serviceName="OrchardCloudService" xmlns="http://schemas.microsoft.com/ServiceHosting/2008/10/ServiceConfiguration">
+  <Role name="Orchard.Azure.Web">
+    <Instances count="1" />
+    <ConfigurationSettings>
+      <Setting name="DiagnosticsConnectionString" value="UseDevelopmentStorage=true" />
+      <Setting name="DataConnectionString" value="UseDevelopmentStorage=true" />
+    </ConfigurationSettings>
+  </Role>
 </ServiceConfiguration>
\ No newline at end of file
diff --git a/src/Orchard.Azure/Orchard.Azure.CloudService/ServiceDefinition.csdef b/src/Orchard.Azure/Orchard.Azure.CloudService/ServiceDefinition.csdef
index 8d96b8830..c1f66c33a 100644
--- a/src/Orchard.Azure/Orchard.Azure.CloudService/ServiceDefinition.csdef
+++ b/src/Orchard.Azure/Orchard.Azure.CloudService/ServiceDefinition.csdef
@@ -1,3 +1,12 @@
 <?xml version="1.0" encoding="utf-8"?>
 <ServiceDefinition name="OrchardCloudService" xmlns="http://schemas.microsoft.com/ServiceHosting/2008/10/ServiceDefinition">
+  <WebRole name="Orchard.Azure.Web">
+    <InputEndpoints>
+      <InputEndpoint name="HttpIn" protocol="http" port="80" />
+    </InputEndpoints>
+    <ConfigurationSettings>
+      <Setting name="DiagnosticsConnectionString" />
+      <Setting name="DataConnectionString" />
+    </ConfigurationSettings>
+  </WebRole>
 </ServiceDefinition>
\ No newline at end of file
diff --git a/src/Orchard.Azure/Orchard.Azure.Web/Config/Diagnostics.config b/src/Orchard.Azure/Orchard.Azure.Web/Config/Diagnostics.config
index d603238d2..300bdf236 100644
--- a/src/Orchard.Azure/Orchard.Azure.Web/Config/Diagnostics.config
+++ b/src/Orchard.Azure/Orchard.Azure.Web/Config/Diagnostics.config
@@ -4,24 +4,20 @@
     <source name="Default" switchValue="Verbose">
       <listeners>
         <add name="AzureDiagnostics" />
-        <add name="WebPageTrace"/>
       </listeners>
     </source>
-    <source name="Orchard.Localization" switchValue="Warning">
+    <source name="Orchard.Localization" switchValue="Verbose">
       <listeners>
         <add name="AzureDiagnostics" />
-        <add name="WebPageTrace"/>
       </listeners>
     </source>
-    <source name="Orchard.Data.SessionLocator" switchValue="Information">
+    <source name="Orchard.Data.SessionLocator" switchValue="Verbose">
       <listeners>
         <add name="AzureDiagnostics" />
-        <add name="WebPageTrace"/>
       </listeners>
     </source>
   </sources>
   <sharedListeners>
     <add name="AzureDiagnostics" type="Microsoft.WindowsAzure.Diagnostics.DiagnosticMonitorTraceListener, Microsoft.WindowsAzure.Diagnostics, Version=1.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35" />
-    <add name="WebPageTrace" type="System.Web.WebPageTraceListener, System.Web, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
   </sharedListeners>
 </system.diagnostics>
diff --git a/src/Orchard.Azure/Orchard.Azure.Web/Config/Host.config b/src/Orchard.Azure/Orchard.Azure.Web/Config/Host.config
index 1a081a020..f43c28564 100644
--- a/src/Orchard.Azure/Orchard.Azure.Web/Config/Host.config
+++ b/src/Orchard.Azure/Orchard.Azure.Web/Config/Host.config
@@ -18,12 +18,6 @@
                  service="Orchard.FileSystems.Media.IStorageProvider">
       </component>
 
-      <component instance-scope="single-instance"
-                 type="Orchard.Azure.FileSystems.AppData.AzureAppDataFolder, Orchard.Azure"
-                 service="Orchard.FileSystems.AppData.IAppDataFolder">
-      </component>
-
-      
     </components>
   </autofac>
 
diff --git a/src/Orchard.Azure/Orchard.Azure.Web/Orchard.Azure.Web.csproj b/src/Orchard.Azure/Orchard.Azure.Web/Orchard.Azure.Web.csproj
index 2517da264..140a03b09 100644
--- a/src/Orchard.Azure/Orchard.Azure.Web/Orchard.Azure.Web.csproj
+++ b/src/Orchard.Azure/Orchard.Azure.Web/Orchard.Azure.Web.csproj
@@ -56,7 +56,9 @@
       <HintPath>..\..\..\lib\Castle Windsor 2.0\bin\Castle.DynamicProxy2.dll</HintPath>
     </Reference>
     <Reference Include="Microsoft.WindowsAzure.Diagnostics, Version=1.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL" />
-    <Reference Include="Microsoft.WindowsAzure.ServiceRuntime, Version=1.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL" />
+    <Reference Include="Microsoft.WindowsAzure.ServiceRuntime, Version=1.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
+      <Private>True</Private>
+    </Reference>
     <Reference Include="Microsoft.WindowsAzure.StorageClient, Version=1.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL" />
     <Reference Include="System" />
     <Reference Include="System.Data" />
@@ -92,354 +94,13 @@
     <Compile Include="WebRole.cs" />
   </ItemGroup>
   <ItemGroup>
-    <Content Include="Core\Common\Module.txt" />
-    <Content Include="Core\Common\Scripts\jquery.slugify.js" />
-    <Content Include="Core\Common\Views\DisplayTemplates\Parts\Common.Body.ascx" />
-    <Content Include="Core\Common\Views\DisplayTemplates\Parts\Common.Body.Manage.ascx" />
-    <Content Include="Core\Common\Views\DisplayTemplates\Parts\Common.Body.ManageWrapperPost.ascx" />
-    <Content Include="Core\Common\Views\DisplayTemplates\Parts\Common.Body.ManageWrapperPre.ascx" />
-    <Content Include="Core\Common\Views\DisplayTemplates\Parts\Common.Body.Summary.ascx" />
-    <Content Include="Core\Common\Views\EditorTemplates\Parts\Common.Body.ascx" />
-    <Content Include="Core\Common\Views\EditorTemplates\Parts\Common.Container.ascx" />
-    <Content Include="Core\Common\Views\EditorTemplates\Parts\Common.Owner.ascx" />
-    <Content Include="Core\Common\Views\EditorTemplates\Parts\Common.Routable.ascx" />
-    <Content Include="Core\Contents\Module.txt" />
-    <Content Include="Core\Contents\Views\Admin\CreatableTypeList.aspx" />
-    <Content Include="Core\Contents\Views\Admin\Create.aspx" />
-    <Content Include="Core\Contents\Views\Admin\Edit.aspx" />
-    <Content Include="Core\Contents\Views\Admin\List.aspx" />
-    <Content Include="Core\Contents\Views\Admin\Types.aspx" />
-    <Content Include="Core\Contents\Views\DisplayTemplates\Items\Contents.Item.ascx" />
-    <Content Include="Core\Contents\Views\EditorTemplates\Items\Contents.Item.ascx" />
-    <Content Include="Core\Contents\Views\Item\Display.aspx" />
-    <Content Include="Core\Contents\Views\Item\Preview.aspx" />
-    <Content Include="Core\Dashboard\Module.txt" />
-    <Content Include="Core\Dashboard\Views\Admin\Index.ascx" />
-    <Content Include="Core\Feeds\Module.txt" />
-    <Content Include="Core\HomePage\Module.txt" />
-    <Content Include="Core\Indexing\Module.txt" />
-    <Content Include="Core\Localization\Module.txt" />
-    <Content Include="Core\Navigation\Module.txt" />
-    <Content Include="Core\Navigation\Views\Admin\Index.ascx" />
-    <Content Include="Core\Navigation\Views\EditorTemplates\Parts\Navigation.EditMenuPart.ascx" />
-    <Content Include="Core\Routable\Module.txt" />
-    <Content Include="Core\Routable\Scripts\jquery.slugify.js" />
-    <Content Include="Core\Routable\Views\EditorTemplates\Parts\Routable.IsRoutable.ascx" />
-    <Content Include="Core\Routable\Views\Item\Display.aspx" />
-    <Content Include="Core\Scheduling\Module.txt" />
-    <Content Include="Core\Settings\Module.txt" />
-    <Content Include="Core\Settings\Styles\admin.css" />
-    <Content Include="Core\Settings\Views\Admin\Culture.ascx" />
-    <Content Include="Core\Settings\Views\Admin\Index.ascx" />
-    <Content Include="Core\Settings\Views\DisplayTemplates\CurrentCulture.ascx" />
-    <Content Include="Core\Settings\Views\DisplayTemplates\RemovableCulture.ascx" />
-    <Content Include="Core\Settings\Views\EditorTemplates\Items\Settings.Site.ascx" />
-    <Content Include="Core\XmlRpc\Module.txt" />
-    <Content Include="Core\XmlRpc\Views\Home\Index.aspx" />
     <Content Include="Global.asax" />
-    <Content Include="Modules\Futures.Widgets\Module.txt" />
-    <Content Include="Modules\Futures.Widgets\Views\Admin\Edit.ascx" />
-    <Content Include="Modules\Orchard.Blogs\Content\Admin\images\draft.gif" />
-    <Content Include="Modules\Orchard.Blogs\Content\Admin\images\offline.gif" />
-    <Content Include="Modules\Orchard.Blogs\Content\Admin\images\online.gif" />
-    <Content Include="Modules\Orchard.Blogs\Content\Admin\images\published.gif" />
-    <Content Include="Modules\Orchard.Blogs\Content\Admin\images\scheduled.gif" />
-    <Content Include="Modules\Orchard.Blogs\Module.txt" />
-    <Content Include="Modules\Orchard.Blogs\Scripts\archives.js" />
-    <Content Include="Modules\Orchard.Blogs\Scripts\jquery.ui.core.js" />
-    <Content Include="Modules\Orchard.Blogs\Scripts\jquery.ui.datepicker.js" />
-    <Content Include="Modules\Orchard.Blogs\Scripts\jquery.ui.widget.js" />
-    <Content Include="Modules\Orchard.Blogs\Scripts\jquery.utils.js" />
-    <Content Include="Modules\Orchard.Blogs\Scripts\ui.timepickr.js" />
-    <Content Include="Modules\Orchard.Blogs\Styles\admin.css" />
-    <Content Include="Modules\Orchard.Blogs\Styles\archives.css" />
-    <Content Include="Modules\Orchard.Blogs\Styles\datetime.css" />
-    <Content Include="Modules\Orchard.Blogs\Styles\images\ui-bg_flat_0_aaaaaa_40x100.png" />
-    <Content Include="Modules\Orchard.Blogs\Styles\images\ui-bg_flat_75_ffffff_40x100.png" />
-    <Content Include="Modules\Orchard.Blogs\Styles\images\ui-bg_glass_55_fbf9ee_1x400.png" />
-    <Content Include="Modules\Orchard.Blogs\Styles\images\ui-bg_glass_65_ffffff_1x400.png" />
-    <Content Include="Modules\Orchard.Blogs\Styles\images\ui-bg_glass_75_dadada_1x400.png" />
-    <Content Include="Modules\Orchard.Blogs\Styles\images\ui-bg_glass_75_e6e6e6_1x400.png" />
-    <Content Include="Modules\Orchard.Blogs\Styles\images\ui-bg_glass_95_fef1ec_1x400.png" />
-    <Content Include="Modules\Orchard.Blogs\Styles\images\ui-bg_highlight-soft_75_cccccc_1x100.png" />
-    <Content Include="Modules\Orchard.Blogs\Styles\images\ui-icons_222222_256x240.png" />
-    <Content Include="Modules\Orchard.Blogs\Styles\images\ui-icons_2e83ff_256x240.png" />
-    <Content Include="Modules\Orchard.Blogs\Styles\images\ui-icons_454545_256x240.png" />
-    <Content Include="Modules\Orchard.Blogs\Styles\images\ui-icons_888888_256x240.png" />
-    <Content Include="Modules\Orchard.Blogs\Styles\images\ui-icons_cd0a0a_256x240.png" />
-    <Content Include="Modules\Orchard.Blogs\Styles\jquery-ui-1.7.2.custom.css" />
-    <Content Include="Modules\Orchard.Blogs\Styles\ui.datepicker.css" />
-    <Content Include="Modules\Orchard.Blogs\Styles\ui.timepickr.css" />
-    <Content Include="Modules\Orchard.Blogs\Views\Archives.ascx" />
-    <Content Include="Modules\Orchard.Blogs\Views\BlogAdmin\Create.ascx" />
-    <Content Include="Modules\Orchard.Blogs\Views\BlogAdmin\Edit.ascx" />
-    <Content Include="Modules\Orchard.Blogs\Views\BlogAdmin\Item.ascx" />
-    <Content Include="Modules\Orchard.Blogs\Views\BlogAdmin\List.ascx" />
-    <Content Include="Modules\Orchard.Blogs\Views\BlogPostAdmin\Create.ascx" />
-    <Content Include="Modules\Orchard.Blogs\Views\BlogPostAdmin\Edit.ascx" />
-    <Content Include="Modules\Orchard.Blogs\Views\BlogPost\Item.ascx" />
-    <Content Include="Modules\Orchard.Blogs\Views\BlogPost\ListByArchive.ascx" />
-    <Content Include="Modules\Orchard.Blogs\Views\Blog\Item.ascx" />
-    <Content Include="Modules\Orchard.Blogs\Views\Blog\List.ascx" />
-    <Content Include="Modules\Orchard.Blogs\Views\DisplayTemplates\Items\Blogs.Blog.ascx" />
-    <Content Include="Modules\Orchard.Blogs\Views\DisplayTemplates\Items\Blogs.Blog.DetailAdmin.ascx" />
-    <Content Include="Modules\Orchard.Blogs\Views\DisplayTemplates\Items\Blogs.Blog.Summary.ascx" />
-    <Content Include="Modules\Orchard.Blogs\Views\DisplayTemplates\Items\Blogs.Blog.SummaryAdmin.ascx" />
-    <Content Include="Modules\Orchard.Blogs\Views\DisplayTemplates\Items\Blogs.BlogPost.ascx" />
-    <Content Include="Modules\Orchard.Blogs\Views\DisplayTemplates\Items\Blogs.BlogPost.Summary.ascx" />
-    <Content Include="Modules\Orchard.Blogs\Views\DisplayTemplates\Items\Blogs.BlogPost.SummaryAdmin.ascx" />
-    <Content Include="Modules\Orchard.Blogs\Views\DisplayTemplates\Parts\Blogs.Blog.Description.ascx" />
-    <Content Include="Modules\Orchard.Blogs\Views\DisplayTemplates\Parts\Blogs.Blog.Manage.ascx" />
-    <Content Include="Modules\Orchard.Blogs\Views\DisplayTemplates\Parts\Blogs.Blog.Metadata.ascx" />
-    <Content Include="Modules\Orchard.Blogs\Views\DisplayTemplates\Parts\Blogs.BlogPost.List.ascx" />
-    <Content Include="Modules\Orchard.Blogs\Views\DisplayTemplates\Parts\Blogs.BlogPost.Metadata.ascx" />
-    <Content Include="Modules\Orchard.Blogs\Views\DisplayTemplates\Parts\Blogs.BlogPost.Metadata.Summary.ascx" />
-    <Content Include="Modules\Orchard.Blogs\Views\DisplayTemplates\Parts\Blogs.BlogPost.Metadata.SummaryAdmin.ascx" />
-    <Content Include="Modules\Orchard.Blogs\Views\EditorTemplates\Items\Blogs.Blog.ascx" />
-    <Content Include="Modules\Orchard.Blogs\Views\EditorTemplates\Items\Blogs.BlogPost.ascx" />
-    <Content Include="Modules\Orchard.Blogs\Views\EditorTemplates\Parts\Blogs.Blog.Fields.ascx" />
-    <Content Include="Modules\Orchard.Blogs\Views\EditorTemplates\Parts\Blogs.BlogPost.Publish.ascx" />
-    <Content Include="Modules\Orchard.Comments\Module.txt" />
-    <Content Include="Modules\Orchard.Comments\Views\Admin\Details.aspx" />
-    <Content Include="Modules\Orchard.Comments\Views\Admin\Edit.aspx" />
-    <Content Include="Modules\Orchard.Comments\Views\Admin\Index.aspx" />
-    <Content Include="Modules\Orchard.Comments\Views\DisplayTemplates\Parts\Comments.Count.ascx" />
-    <Content Include="Modules\Orchard.Comments\Views\DisplayTemplates\Parts\Comments.CountAdmin.ascx" />
-    <Content Include="Modules\Orchard.Comments\Views\DisplayTemplates\Parts\Comments.HasComments.ascx" />
-    <Content Include="Modules\Orchard.Comments\Views\EditorTemplates\Parts\Comments.HasComments.ascx" />
-    <Content Include="Modules\Orchard.Comments\Views\EditorTemplates\Parts\Comments.SiteSettings.ascx" />
-    <Content Include="Modules\Orchard.Comments\Views\ListOfComments.ascx" />
-    <Content Include="Modules\Orchard.DevTools\Module.txt" />
-    <Content Include="Modules\Orchard.DevTools\Views\Content\Details.aspx" />
-    <Content Include="Modules\Orchard.DevTools\Views\Content\Index.aspx" />
-    <Content Include="Modules\Orchard.DevTools\Views\DisplayTemplates\Parts\DevTools.ShowDebugLink.ascx" />
-    <Content Include="Modules\Orchard.DevTools\Views\EditorTemplates\Parts\DevTools.ShowDebugLink.ascx" />
-    <Content Include="Modules\Orchard.DevTools\Views\Home\Index.aspx" />
-    <Content Include="Modules\Orchard.DevTools\Views\Home\Simple.aspx" />
-    <Content Include="Modules\Orchard.DevTools\Views\Home\_RenderableAction.ascx" />
-    <Content Include="Modules\Orchard.DevTools\Views\Metadata\Index.aspx" />
-    <Content Include="Modules\Orchard.Media\Content\Admin\images\folder.gif" />
-    <Content Include="Modules\Orchard.Media\Content\Site.css" />
-    <Content Include="Modules\Orchard.Media\Module.txt" />
-    <Content Include="Modules\Orchard.Media\Styles\admin.css" />
-    <Content Include="Modules\Orchard.Media\Views\Admin\Add.aspx" />
-    <Content Include="Modules\Orchard.Media\Views\Admin\Create.aspx" />
-    <Content Include="Modules\Orchard.Media\Views\Admin\Edit.aspx" />
-    <Content Include="Modules\Orchard.Media\Views\Admin\EditMedia.aspx" />
-    <Content Include="Modules\Orchard.Media\Views\Admin\EditProperties.aspx" />
-    <Content Include="Modules\Orchard.Media\Views\Admin\Index.aspx" />
-    <Content Include="Modules\Orchard.Media\Views\EditorTemplates\Parts\Media.SiteSettings.ascx" />
-    <Content Include="Modules\Orchard.MetaData\Module.txt" />
-    <Content Include="Modules\Orchard.MetaData\Styles\ContentTypes.css" />
-    <Content Include="Modules\Orchard.MetaData\Views\Admin\ContentTypeList.ascx" />
-    <Content Include="Modules\Orchard.Modules\Content\Admin\images\disabled.gif" />
-    <Content Include="Modules\Orchard.Modules\Content\Admin\images\enabled.gif" />
-    <Content Include="Modules\Orchard.Modules\Module.txt" />
-    <Content Include="Modules\Orchard.Modules\scripts\jquery.switchable.js" />
-    <Content Include="Modules\Orchard.Modules\styles\admin.css" />
-    <Content Include="Modules\Orchard.Modules\styles\images\detail-view-on.gif" />
-    <Content Include="Modules\Orchard.Modules\styles\images\detail-view.gif" />
-    <Content Include="Modules\Orchard.Modules\styles\images\summary-view-on.gif" />
-    <Content Include="Modules\Orchard.Modules\styles\images\summary-view.gif" />
-    <Content Include="Modules\Orchard.Modules\styles\jquery.switchable.css" />
-    <Content Include="Modules\Orchard.Modules\Views\Admin\Add.ascx" />
-    <Content Include="Modules\Orchard.Modules\Views\Admin\Features.ascx" />
-    <Content Include="Modules\Orchard.Modules\Views\Admin\Index.ascx" />
-    <Content Include="Modules\Orchard.MultiTenancy\Content\Admin\images\disabled.gif" />
-    <Content Include="Modules\Orchard.MultiTenancy\Content\Admin\images\enabled.gif" />
-    <Content Include="Modules\Orchard.MultiTenancy\Module.txt" />
-    <Content Include="Modules\Orchard.MultiTenancy\Views\Admin\Add.ascx" />
-    <Content Include="Modules\Orchard.MultiTenancy\Views\Admin\DisplayTemplates\ActionsForDisabled.ascx" />
-    <Content Include="Modules\Orchard.MultiTenancy\Views\Admin\DisplayTemplates\ActionsForInvalid.ascx" />
-    <Content Include="Modules\Orchard.MultiTenancy\Views\Admin\DisplayTemplates\ActionsForRunning.ascx" />
-    <Content Include="Modules\Orchard.MultiTenancy\Views\Admin\DisplayTemplates\ActionsForUninitialized.ascx" />
-    <Content Include="Modules\Orchard.MultiTenancy\Views\Admin\Edit.ascx" />
-    <Content Include="Modules\Orchard.MultiTenancy\Views\Admin\Index.ascx" />
-    <Content Include="Modules\Orchard.Pages\Content\Admin\images\draft.gif" />
-    <Content Include="Modules\Orchard.Pages\Content\Admin\images\offline.gif" />
-    <Content Include="Modules\Orchard.Pages\Content\Admin\images\online.gif" />
-    <Content Include="Modules\Orchard.Pages\Content\Admin\images\published.gif" />
-    <Content Include="Modules\Orchard.Pages\Content\Admin\images\scheduled.gif" />
-    <Content Include="Modules\Orchard.Pages\Content\Site.css" />
-    <Content Include="Modules\Orchard.Pages\Module.txt" />
-    <Content Include="Modules\Orchard.Pages\Scripts\jquery.ui.core.js" />
-    <Content Include="Modules\Orchard.Pages\Scripts\jquery.ui.datepicker.js" />
-    <Content Include="Modules\Orchard.Pages\Scripts\jquery.ui.widget.js" />
-    <Content Include="Modules\Orchard.Pages\Scripts\jquery.utils.js" />
-    <Content Include="Modules\Orchard.Pages\Scripts\ui.timepickr.js" />
-    <Content Include="Modules\Orchard.Pages\Styles\admin.css" />
-    <Content Include="Modules\Orchard.Pages\Styles\datetime.css" />
-    <Content Include="Modules\Orchard.Pages\Styles\images\ui-bg_flat_0_aaaaaa_40x100.png" />
-    <Content Include="Modules\Orchard.Pages\Styles\images\ui-bg_flat_75_ffffff_40x100.png" />
-    <Content Include="Modules\Orchard.Pages\Styles\images\ui-bg_glass_55_fbf9ee_1x400.png" />
-    <Content Include="Modules\Orchard.Pages\Styles\images\ui-bg_glass_65_ffffff_1x400.png" />
-    <Content Include="Modules\Orchard.Pages\Styles\images\ui-bg_glass_75_dadada_1x400.png" />
-    <Content Include="Modules\Orchard.Pages\Styles\images\ui-bg_glass_75_e6e6e6_1x400.png" />
-    <Content Include="Modules\Orchard.Pages\Styles\images\ui-bg_glass_95_fef1ec_1x400.png" />
-    <Content Include="Modules\Orchard.Pages\Styles\images\ui-bg_highlight-soft_75_cccccc_1x100.png" />
-    <Content Include="Modules\Orchard.Pages\Styles\images\ui-icons_222222_256x240.png" />
-    <Content Include="Modules\Orchard.Pages\Styles\images\ui-icons_2e83ff_256x240.png" />
-    <Content Include="Modules\Orchard.Pages\Styles\images\ui-icons_454545_256x240.png" />
-    <Content Include="Modules\Orchard.Pages\Styles\images\ui-icons_888888_256x240.png" />
-    <Content Include="Modules\Orchard.Pages\Styles\images\ui-icons_cd0a0a_256x240.png" />
-    <Content Include="Modules\Orchard.Pages\Styles\jquery-ui-1.7.2.custom.css" />
-    <Content Include="Modules\Orchard.Pages\Styles\ui.datepicker.css" />
-    <Content Include="Modules\Orchard.Pages\Styles\ui.timepickr.css" />
-    <Content Include="Modules\Orchard.Pages\Views\Admin\Create.ascx" />
-    <Content Include="Modules\Orchard.Pages\Views\Admin\Edit.ascx" />
-    <Content Include="Modules\Orchard.Pages\Views\Admin\List.aspx" />
-    <Content Include="Modules\Orchard.Pages\Views\DisplayTemplates\Items\Pages.Page.ascx" />
-    <Content Include="Modules\Orchard.Pages\Views\DisplayTemplates\Items\Pages.Page.Summary.ascx" />
-    <Content Include="Modules\Orchard.Pages\Views\DisplayTemplates\Parts\Pages.Page.Metadata.ascx" />
-    <Content Include="Modules\Orchard.Pages\Views\EditorTemplates\Items\Pages.Page.ascx" />
-    <Content Include="Modules\Orchard.Pages\Views\EditorTemplates\Parts\Pages.Page.Publish.ascx" />
-    <Content Include="Modules\Orchard.Pages\Views\Page\Item.ascx" />
-    <Content Include="Modules\Orchard.Roles\Content\Site.css" />
-    <Content Include="Modules\Orchard.Roles\Module.txt" />
-    <Content Include="Modules\Orchard.Roles\Views\Admin\Create.aspx" />
-    <Content Include="Modules\Orchard.Roles\Views\Admin\Edit.aspx" />
-    <Content Include="Modules\Orchard.Roles\Views\Admin\Index.aspx" />
-    <Content Include="Modules\Orchard.Roles\Views\EditorTemplates\Parts\Roles.UserRoles.ascx" />
-    <Content Include="Modules\Orchard.Sandbox\Module.txt" />
-    <Content Include="Modules\Orchard.Sandbox\Views\DisplayTemplates\Items\Sandbox.Page.ascx" />
-    <Content Include="Modules\Orchard.Sandbox\Views\DisplayTemplates\Items\Sandbox.Page.Summary.ascx" />
-    <Content Include="Modules\Orchard.Sandbox\Views\DisplayTemplates\Parts\Sandbox.Page.Title.ascx" />
-    <Content Include="Modules\Orchard.Sandbox\Views\EditorTemplates\Items\Sandbox.Page.ascx" />
-    <Content Include="Modules\Orchard.Sandbox\Views\EditorTemplates\Parts\Sandbox.SiteSettings.ascx" />
-    <Content Include="Modules\Orchard.Sandbox\Views\Page\Create.aspx" />
-    <Content Include="Modules\Orchard.Sandbox\Views\Page\Edit.aspx" />
-    <Content Include="Modules\Orchard.Sandbox\Views\Page\Index.aspx" />
-    <Content Include="Modules\Orchard.Sandbox\Views\Page\Show.aspx" />
-    <Content Include="Modules\Orchard.Search\Module.txt" />
-    <Content Include="Modules\Orchard.Search\Styles\admin.css" />
-    <Content Include="Modules\Orchard.Search\Styles\search.css" />
-    <Content Include="Modules\Orchard.Search\Views\Admin\Index.ascx" />
-    <Content Include="Modules\Orchard.Search\Views\SearchForm.ascx" />
-    <Content Include="Modules\Orchard.Search\Views\Search\Index.ascx" />
-    <Content Include="Modules\Orchard.Setup\Module.txt" />
-    <Content Include="Modules\Orchard.Setup\Views\Setup\Index.ascx" />
-    <Content Include="Modules\Orchard.Tags\Module.txt" />
-    <Content Include="Modules\Orchard.Tags\Views\Admin\Create.aspx" />
-    <Content Include="Modules\Orchard.Tags\Views\Admin\Edit.aspx" />
-    <Content Include="Modules\Orchard.Tags\Views\Admin\Index.aspx" />
-    <Content Include="Modules\Orchard.Tags\Views\Admin\Search.aspx" />
-    <Content Include="Modules\Orchard.Tags\Views\DisplayTemplates\Parts\Tags.ShowTags.ascx" />
-    <Content Include="Modules\Orchard.Tags\Views\EditorTemplates\Parts\Tags.EditTags.ascx" />
-    <Content Include="Modules\Orchard.Tags\Views\Home\Index.ascx" />
-    <Content Include="Modules\Orchard.Tags\Views\Home\Search.ascx" />
-    <Content Include="Modules\Orchard.Themes\Content\orchard.ico" />
-    <Content Include="Modules\Orchard.Themes\Module.txt" />
-    <Content Include="Modules\Orchard.Themes\Scripts\base.js" />
-    <Content Include="Modules\Orchard.Themes\Scripts\jquery-1.4.2.js" />
-    <Content Include="Modules\Orchard.Themes\Scripts\jquery-1.4.2.min.js" />
-    <Content Include="Modules\Orchard.Themes\Styles\admin.css" />
-    <Content Include="Modules\Orchard.Themes\Styles\Images\toolBarActiveButtonBackground.gif" />
-    <Content Include="Modules\Orchard.Themes\Styles\Images\toolBarBackground.gif" />
-    <Content Include="Modules\Orchard.Themes\Styles\Images\toolBarHoverButtonBackground.gif" />
-    <Content Include="Modules\Orchard.Themes\Styles\special.css" />
-    <Content Include="Modules\Orchard.Themes\Views\Admin\Index.aspx" />
-    <Content Include="Modules\Orchard.Themes\Views\Admin\Install.aspx" />
-    <Content Include="Modules\Orchard.Themes\Views\Admin\ThemePreview.ascx" />
-    <Content Include="Modules\Orchard.Themes\Views\DisplayTemplates\Items\ContentItem.ascx" />
-    <Content Include="Modules\Orchard.Themes\Views\Document.aspx" />
-    <Content Include="Modules\Orchard.Themes\Views\EditorTemplates\Items\ContentItem.ascx" />
-    <Content Include="Modules\Orchard.Themes\Views\Header.ascx" />
-    <Content Include="Modules\Orchard.Themes\Views\HeadPreload.ascx" />
-    <Content Include="Modules\Orchard.Themes\Views\Layout.ascx" />
-    <Content Include="Modules\Orchard.Themes\Views\Menu.ascx" />
-    <Content Include="Modules\Orchard.Themes\Views\Messages.ascx" />
-    <Content Include="Modules\Orchard.Themes\Views\NotFound.ascx" />
-    <Content Include="Modules\Orchard.Themes\Views\User.ascx" />
-    <Content Include="Modules\Orchard.Users\Module.txt" />
-    <Content Include="Modules\Orchard.Users\Views\Account\AccessDenied.ascx" />
-    <Content Include="Modules\Orchard.Users\Views\Account\ChangePassword.ascx" />
-    <Content Include="Modules\Orchard.Users\Views\Account\ChangePasswordSuccess.ascx" />
-    <Content Include="Modules\Orchard.Users\Views\Account\LogOn.ascx" />
-    <Content Include="Modules\Orchard.Users\Views\Account\Register.ascx" />
-    <Content Include="Modules\Orchard.Users\Views\Admin\Create.aspx" />
-    <Content Include="Modules\Orchard.Users\Views\Admin\Edit.aspx" />
-    <Content Include="Modules\Orchard.Users\Views\Admin\EditorTemplates\inputPasswordLarge.ascx" />
-    <Content Include="Modules\Orchard.Users\Views\Admin\EditorTemplates\inputTextLarge.ascx" />
-    <Content Include="Modules\Orchard.Users\Views\Admin\Index.aspx" />
-    <Content Include="Modules\TinyMce\Module.txt" />
-    <Content Include="Modules\TinyMce\Scripts\langs\en.js" />
-    <Content Include="Modules\TinyMce\Scripts\license.txt" />
-    <Content Include="Modules\TinyMce\Scripts\plugins\addmedia\addmedia.htm" />
-    <Content Include="Modules\TinyMce\Scripts\plugins\addmedia\editor_plugin.js" />
-    <Content Include="Modules\TinyMce\Scripts\plugins\addmedia\editor_plugin_src.js" />
-    <Content Include="Modules\TinyMce\Scripts\plugins\addmedia\img\picture_add.png" />
-    <Content Include="Modules\TinyMce\Scripts\plugins\addmedia\js\addmedia.js" />
-    <Content Include="Modules\TinyMce\Scripts\plugins\addmedia\langs\en.js" />
-    <Content Include="Modules\TinyMce\Scripts\plugins\addmedia\langs\en_dlg.js" />
-    <Content Include="Modules\TinyMce\Scripts\plugins\autoresize\editor_plugin.js" />
-    <Content Include="Modules\TinyMce\Scripts\plugins\autoresize\editor_plugin_src.js" />
-    <Content Include="Modules\TinyMce\Scripts\plugins\fullscreen\editor_plugin.js" />
-    <Content Include="Modules\TinyMce\Scripts\plugins\fullscreen\editor_plugin_src.js" />
-    <Content Include="Modules\TinyMce\Scripts\plugins\fullscreen\fullscreen.htm" />
-    <Content Include="Modules\TinyMce\Scripts\plugins\searchreplace\css\searchreplace.css" />
-    <Content Include="Modules\TinyMce\Scripts\plugins\searchreplace\editor_plugin.js" />
-    <Content Include="Modules\TinyMce\Scripts\plugins\searchreplace\editor_plugin_src.js" />
-    <Content Include="Modules\TinyMce\Scripts\plugins\searchreplace\js\searchreplace.js" />
-    <Content Include="Modules\TinyMce\Scripts\plugins\searchreplace\langs\en_dlg.js" />
-    <Content Include="Modules\TinyMce\Scripts\plugins\searchreplace\searchreplace.htm" />
-    <Content Include="Modules\TinyMce\Scripts\themes\advanced\about.htm" />
-    <Content Include="Modules\TinyMce\Scripts\themes\advanced\anchor.htm" />
-    <Content Include="Modules\TinyMce\Scripts\themes\advanced\charmap.htm" />
-    <Content Include="Modules\TinyMce\Scripts\themes\advanced\color_picker.htm" />
-    <Content Include="Modules\TinyMce\Scripts\themes\advanced\editor_template.js" />
-    <Content Include="Modules\TinyMce\Scripts\themes\advanced\editor_template_src.js" />
-    <Content Include="Modules\TinyMce\Scripts\themes\advanced\image.htm" />
-    <Content Include="Modules\TinyMce\Scripts\themes\advanced\img\colorpicker.jpg" />
-    <Content Include="Modules\TinyMce\Scripts\themes\advanced\img\icons.gif" />
-    <Content Include="Modules\TinyMce\Scripts\themes\advanced\js\about.js" />
-    <Content Include="Modules\TinyMce\Scripts\themes\advanced\js\anchor.js" />
-    <Content Include="Modules\TinyMce\Scripts\themes\advanced\js\charmap.js" />
-    <Content Include="Modules\TinyMce\Scripts\themes\advanced\js\color_picker.js" />
-    <Content Include="Modules\TinyMce\Scripts\themes\advanced\js\image.js" />
-    <Content Include="Modules\TinyMce\Scripts\themes\advanced\js\link.js" />
-    <Content Include="Modules\TinyMce\Scripts\themes\advanced\js\source_editor.js" />
-    <Content Include="Modules\TinyMce\Scripts\themes\advanced\langs\en.js" />
-    <Content Include="Modules\TinyMce\Scripts\themes\advanced\langs\en_dlg.js" />
-    <Content Include="Modules\TinyMce\Scripts\themes\advanced\link.htm" />
-    <Content Include="Modules\TinyMce\Scripts\themes\advanced\skins\default\content.css" />
-    <Content Include="Modules\TinyMce\Scripts\themes\advanced\skins\default\dialog.css" />
-    <Content Include="Modules\TinyMce\Scripts\themes\advanced\skins\default\img\buttons.png" />
-    <Content Include="Modules\TinyMce\Scripts\themes\advanced\skins\default\img\items.gif" />
-    <Content Include="Modules\TinyMce\Scripts\themes\advanced\skins\default\img\menu_arrow.gif" />
-    <Content Include="Modules\TinyMce\Scripts\themes\advanced\skins\default\img\menu_check.gif" />
-    <Content Include="Modules\TinyMce\Scripts\themes\advanced\skins\default\img\progress.gif" />
-    <Content Include="Modules\TinyMce\Scripts\themes\advanced\skins\default\img\tabs.gif" />
-    <Content Include="Modules\TinyMce\Scripts\themes\advanced\skins\default\ui.css" />
-    <Content Include="Modules\TinyMce\Scripts\themes\advanced\skins\o2k7\content.css" />
-    <Content Include="Modules\TinyMce\Scripts\themes\advanced\skins\o2k7\dialog.css" />
-    <Content Include="Modules\TinyMce\Scripts\themes\advanced\skins\o2k7\img\button_bg.png" />
-    <Content Include="Modules\TinyMce\Scripts\themes\advanced\skins\o2k7\img\button_bg_black.png" />
-    <Content Include="Modules\TinyMce\Scripts\themes\advanced\skins\o2k7\img\button_bg_silver.png" />
-    <Content Include="Modules\TinyMce\Scripts\themes\advanced\skins\o2k7\ui.css" />
-    <Content Include="Modules\TinyMce\Scripts\themes\advanced\skins\o2k7\ui_black.css" />
-    <Content Include="Modules\TinyMce\Scripts\themes\advanced\skins\o2k7\ui_silver.css" />
-    <Content Include="Modules\TinyMce\Scripts\themes\advanced\source_editor.htm" />
-    <Content Include="Modules\TinyMce\Scripts\themes\simple\editor_template.js" />
-    <Content Include="Modules\TinyMce\Scripts\themes\simple\editor_template_src.js" />
-    <Content Include="Modules\TinyMce\Scripts\themes\simple\img\icons.gif" />
-    <Content Include="Modules\TinyMce\Scripts\themes\simple\langs\en.js" />
-    <Content Include="Modules\TinyMce\Scripts\themes\simple\skins\default\content.css" />
-    <Content Include="Modules\TinyMce\Scripts\themes\simple\skins\default\ui.css" />
-    <Content Include="Modules\TinyMce\Scripts\themes\simple\skins\o2k7\content.css" />
-    <Content Include="Modules\TinyMce\Scripts\themes\simple\skins\o2k7\img\button_bg.png" />
-    <Content Include="Modules\TinyMce\Scripts\themes\simple\skins\o2k7\ui.css" />
-    <Content Include="Modules\TinyMce\Scripts\tiny_mce.js" />
-    <Content Include="Modules\TinyMce\Scripts\tiny_mce_popup.js" />
-    <Content Include="Modules\TinyMce\Scripts\tiny_mce_src.js" />
-    <Content Include="Modules\TinyMce\Scripts\utils\editable_selects.js" />
-    <Content Include="Modules\TinyMce\Scripts\utils\form_utils.js" />
-    <Content Include="Modules\TinyMce\Scripts\utils\mctabs.js" />
-    <Content Include="Modules\TinyMce\Scripts\utils\validate.js" />
-    <Content Include="Modules\TinyMce\Views\EditorTemplates\TinyMceTextEditor.ascx" />
     <Content Include="Web.config" />
   </ItemGroup>
   <ItemGroup>
-    <Content Include="Config\Diagnostics.config" />
+    <Content Include="Config\Diagnostics.config">
+      <SubType>Designer</SubType>
+    </Content>
   </ItemGroup>
   <ItemGroup>
     <Content Include="Config\Host.config">
@@ -464,52 +125,6 @@
       <Name>Orchard.Azure</Name>
     </ProjectReference>
   </ItemGroup>
-  <ItemGroup>
-    <Content Include="Modules\Futures.Widgets\Views\Web.config" />
-    <Content Include="Modules\Futures.Widgets\Web.config" />
-    <Content Include="Modules\Orchard.Blogs\Views\Web.config" />
-    <Content Include="Modules\Orchard.Blogs\Web.config" />
-    <Content Include="Modules\Orchard.Comments\Views\Web.config" />
-    <Content Include="Modules\Orchard.Comments\Web.config" />
-    <Content Include="Modules\Orchard.DevTools\Views\Web.config" />
-    <Content Include="Modules\Orchard.DevTools\Web.config" />
-    <Content Include="Modules\Orchard.Media\Views\Web.config" />
-    <Content Include="Modules\Orchard.Media\Web.config" />
-    <Content Include="Modules\Orchard.MetaData\Views\Web.config" />
-    <Content Include="Modules\Orchard.MetaData\Web.config" />
-    <Content Include="Modules\Orchard.Modules\Views\Web.config" />
-    <Content Include="Modules\Orchard.Modules\Web.config" />
-    <Content Include="Modules\Orchard.MultiTenancy\Views\Web.config" />
-    <Content Include="Modules\Orchard.MultiTenancy\Web.config" />
-    <Content Include="Modules\Orchard.Pages\Views\Web.config" />
-    <Content Include="Modules\Orchard.Pages\Web.config" />
-    <Content Include="Modules\Orchard.Roles\Views\Web.config" />
-    <Content Include="Modules\Orchard.Roles\Web.config" />
-    <Content Include="Modules\Orchard.Sandbox\Views\Web.config" />
-    <Content Include="Modules\Orchard.Sandbox\Web.config" />
-    <Content Include="Modules\Orchard.Search\Views\Web.config" />
-    <Content Include="Modules\Orchard.Search\Web.config" />
-    <Content Include="Modules\Orchard.Setup\Views\Web.config" />
-    <Content Include="Modules\Orchard.Setup\Web.config" />
-    <Content Include="Modules\Orchard.Tags\Views\Web.config" />
-    <Content Include="Modules\Orchard.Tags\Web.config" />
-    <Content Include="Modules\Orchard.Themes\Views\Web.config" />
-    <Content Include="Modules\Orchard.Themes\Web.config" />
-    <Content Include="Modules\Orchard.Users\Views\Web.config" />
-    <Content Include="Modules\Orchard.Users\Web.config" />
-    <Content Include="Modules\TinyMce\Views\Web.config" />
-    <Content Include="Modules\TinyMce\Web.config" />
-  </ItemGroup>
-  <ItemGroup>
-    <Content Include="Core\Common\Views\Web.config" />
-    <Content Include="Core\Contents\Views\Web.config" />
-    <Content Include="Core\Dashboard\Views\Web.config" />
-    <Content Include="Core\Navigation\Views\Web.config" />
-    <Content Include="Core\Routable\Views\Web.config" />
-    <Content Include="Core\Settings\Views\Web.config" />
-    <Content Include="Core\Web.config" />
-    <Content Include="Core\XmlRpc\Views\Web.config" />
-  </ItemGroup>
   <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
   <Import Project="$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v10.0\WebApplications\Microsoft.WebApplication.targets" />
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
diff --git a/src/Orchard.Specs/Hosting/Orchard.Web/Config/Diagnostics.config b/src/Orchard.Specs/Hosting/Orchard.Web/Config/Diagnostics.config
index a44c108d4..e3bc6cb6f 100644
--- a/src/Orchard.Specs/Hosting/Orchard.Web/Config/Diagnostics.config
+++ b/src/Orchard.Specs/Hosting/Orchard.Web/Config/Diagnostics.config
@@ -21,7 +21,7 @@
         <add name="CaptureTraceMessages" />
       </listeners>
     </source>
-    <source name="Orchard.Mvc.ViewEngines.WebFormsViewEngineProvider" switchValue="Warning">
+    <source name="Orchard.Mvc.ViewEngines.WebFormViewEngineProvider" switchValue="Warning">
       <listeners>
         <add name="CaptureTraceMessages" />
       </listeners>
diff --git a/src/Orchard.Tests.Modules/Indexing/LuceneIndexProviderTests.cs b/src/Orchard.Tests.Modules/Indexing/LuceneIndexProviderTests.cs
index 07a35fb47..250df2ff6 100644
--- a/src/Orchard.Tests.Modules/Indexing/LuceneIndexProviderTests.cs
+++ b/src/Orchard.Tests.Modules/Indexing/LuceneIndexProviderTests.cs
@@ -249,5 +249,45 @@ namespace Orchard.Tests.Modules.Indexing {
             Assert.That(doc.IsDirty, Is.True);
 
         }
+
+        [Test]
+        public void DocumentsShouldBeDeleted() {
+            _provider.CreateIndex("default");
+            _provider.Store("default", _provider.New(1).Add("field", "value1"));
+            _provider.Store("default", _provider.New(11).Add("field", "value11"));
+            _provider.Store("default", _provider.New(111).Add("field", "value111"));
+
+            var searchBuilder = _provider.CreateSearchBuilder("default");
+
+            Assert.That(searchBuilder.Get(1).ContentItemId, Is.EqualTo(1));
+            Assert.That(searchBuilder.Get(11).ContentItemId, Is.EqualTo(11));
+            Assert.That(searchBuilder.Get(111).ContentItemId, Is.EqualTo(111));
+
+            _provider.Delete("default", 1);
+
+            Assert.That(searchBuilder.Get(1), Is.Null);
+            Assert.That(searchBuilder.Get(11).ContentItemId, Is.EqualTo(11));
+            Assert.That(searchBuilder.Get(111).ContentItemId, Is.EqualTo(111));
+
+            _provider.Delete("default", new int[] {1, 11, 111 });
+
+            Assert.That(searchBuilder.Get(1), Is.Null);
+            Assert.That(searchBuilder.Get(11), Is.Null);
+            Assert.That(searchBuilder.Get(111), Is.Null);
+
+        }
+
+        [Test]
+        public void SameContentItemShouldNotBeIndexedTwice() {
+            _provider.CreateIndex("default");
+
+            var searchBuilder = _provider.CreateSearchBuilder("default");
+
+            _provider.Store("default", _provider.New(1).Add("field", "value1"));
+            Assert.That(searchBuilder.WithField("id", "1").Count(), Is.EqualTo(1));
+
+            _provider.Store("default", _provider.New(1).Add("field", "value2"));
+            Assert.That(searchBuilder.WithField("id", "1").Count(), Is.EqualTo(1));
+        }
     }
 }
diff --git a/src/Orchard.Tests/ContentManagement/Drivers/FieldStorage/InfosetFieldStorageProviderTests.cs b/src/Orchard.Tests/ContentManagement/Drivers/FieldStorage/InfosetFieldStorageProviderTests.cs
index 740e433cc..ad2e8493b 100644
--- a/src/Orchard.Tests/ContentManagement/Drivers/FieldStorage/InfosetFieldStorageProviderTests.cs
+++ b/src/Orchard.Tests/ContentManagement/Drivers/FieldStorage/InfosetFieldStorageProviderTests.cs
@@ -46,6 +46,10 @@ namespace Orchard.Tests.ContentManagement.Drivers.FieldStorage {
                 TypePartDefinition = typeDefinition.Parts.Single()
             };
             contentItem.Weld(contentPart);
+            contentItem.Weld(new InfosetPart {
+                Infoset = contentItem.Record.Infoset,
+                VersionInfoset = contentItem.VersionRecord.Infoset
+            });
             return contentPart;
         }
 
@@ -60,9 +64,9 @@ namespace Orchard.Tests.ContentManagement.Drivers.FieldStorage {
         public void GettingUnsetNamedAndUnnamedValueIsSafeAndNull() {
             var part = CreateContentItemPart();
             var storage = _provider.BindStorage(part, part.PartDefinition.Fields.Single());
-            Assert.That(storage.Getter(null), Is.Null);
-            Assert.That(storage.Getter("value"), Is.Null);
-            Assert.That(storage.Getter("This is a test"), Is.Null);
+            Assert.That(storage.Get<string>(null), Is.Null);
+            Assert.That(storage.Get<string>("value"), Is.Null);
+            Assert.That(storage.Get<string>("This is a test"), Is.Null);
         }
 
         [Test]
@@ -70,10 +74,10 @@ namespace Orchard.Tests.ContentManagement.Drivers.FieldStorage {
             var part = CreateContentItemPart();
             var storage = _provider.BindStorage(part, part.PartDefinition.Fields.Single());
 
-            Assert.That(storage.Getter("alpha"), Is.Null);
-            storage.Setter("alpha", "one");
-            Assert.That(storage.Getter("alpha"), Is.Not.Null);
-            Assert.That(storage.Getter("alpha"), Is.EqualTo("one"));
+            Assert.That(storage.Get<string>("alpha"), Is.Null);
+            storage.Set("alpha", "one");
+            Assert.That(storage.Get<string>("alpha"), Is.Not.Null);
+            Assert.That(storage.Get<string>("alpha"), Is.EqualTo("one"));
         }
 
         [Test]
@@ -81,14 +85,14 @@ namespace Orchard.Tests.ContentManagement.Drivers.FieldStorage {
             var part = CreateContentItemPart();
             var storage = _provider.BindStorage(part, part.PartDefinition.Fields.Single());
 
-            Assert.That(storage.Getter(null), Is.Null);
-            Assert.That(storage.Getter(""), Is.Null);
-            storage.Setter(null, "one");
-            Assert.That(storage.Getter(null), Is.EqualTo("one"));
-            Assert.That(storage.Getter(""), Is.EqualTo("one"));
-            storage.Setter(null, "two");
-            Assert.That(storage.Getter(null), Is.EqualTo("two"));
-            Assert.That(storage.Getter(""), Is.EqualTo("two"));
+            Assert.That(storage.Get<string>(null), Is.Null);
+            Assert.That(storage.Get<string>(""), Is.Null);
+            storage.Set(null, "one");
+            Assert.That(storage.Get<string>(null), Is.EqualTo("one"));
+            Assert.That(storage.Get<string>(""), Is.EqualTo("one"));
+            storage.Set(null, "two");
+            Assert.That(storage.Get<string>(null), Is.EqualTo("two"));
+            Assert.That(storage.Get<string>(""), Is.EqualTo("two"));
         }
 
         [Test]
@@ -96,8 +100,8 @@ namespace Orchard.Tests.ContentManagement.Drivers.FieldStorage {
             var part = CreateContentItemPart();
             var storage = _provider.BindStorage(part, part.PartDefinition.Fields.Single());
 
-            storage.Setter(null, "one");
-            storage.Setter("alpha", "two");
+            storage.Set(null, "one");
+            storage.Set("alpha", "two");
 
             Assert.That(part.ContentItem.Record.Data, Is.EqualTo("<Data><Foo><Bar alpha=\"two\">one</Bar></Foo></Data>"));
         }
@@ -107,17 +111,17 @@ namespace Orchard.Tests.ContentManagement.Drivers.FieldStorage {
             var part = CreateContentItemPart();
             var storage = _provider.BindStorage(part, part.PartDefinition.Fields.Single());
 
-            storage.Setter(null, "one");
-            storage.Setter("alpha", "two");
+            storage.Set(null, "one");
+            storage.Set("alpha", "two");
 
             Assert.That(part.ContentItem.Record.Data, Is.EqualTo("<Data><Foo><Bar alpha=\"two\">one</Bar></Foo></Data>"));
             part.ContentItem.Record.Data = "<Data><Foo><Bar alpha=\"four\">three</Bar></Foo></Data>";
 
-            storage.Setter(null, "three");
-            storage.Setter("alpha", "four");
+            storage.Set(null, "three");
+            storage.Set("alpha", "four");
         }
 
-        [Test]
+        [Test, Ignore("implementation pending")]
         public void VersionedSettingOnInfosetField() {
             Assert.Fail("todo");
         }
diff --git a/src/Orchard.Tests/DataMigration/DataMigrationTests.cs b/src/Orchard.Tests/DataMigration/DataMigrationTests.cs
index f151226ca..bc3c89cc2 100644
--- a/src/Orchard.Tests/DataMigration/DataMigrationTests.cs
+++ b/src/Orchard.Tests/DataMigration/DataMigrationTests.cs
@@ -7,13 +7,16 @@ using NHibernate;
 using NUnit.Framework;
 using Orchard.ContentManagement.Records;
 using Orchard.Data;
-using Orchard.DataMigration.Interpreters;
+using Orchard.Data.Migration;
+using Orchard.Data.Migration.Interpreters;
+using Orchard.Data.Migration.Records;
 using Orchard.Environment.Configuration;
 using Orchard.Environment.Extensions;
 using Orchard.Environment.Extensions.Folders;
 using Orchard.Environment.Extensions.Models;
 using Orchard.Tests.ContentManagement;
-using Orchard.DataMigration;
+using Orchard.Data.Migration;
+using Orchard.Data.Providers;
 
 namespace Orchard.Tests.DataMigration {
     [TestFixture]
@@ -50,7 +53,9 @@ namespace Orchard.Tests.DataMigration {
             _folders = new StubFolders();
             
             builder.RegisterInstance(new ShellSettings { DataTablePrefix = "TEST_"});
-
+            
+            builder.RegisterType<SqlServerDataServicesProvider>().As<IDataServicesProvider>();
+            builder.RegisterType<DataServicesProviderFactory>().As<IDataServicesProviderFactory>();
             builder.RegisterType<NullInterpreter>().As<IDataMigrationInterpreter>();
             builder.RegisterInstance(_folders).As<IExtensionFolders>();
             builder.RegisterType<ExtensionManager>().As<IExtensionManager>();
@@ -87,20 +92,20 @@ namespace Orchard.Tests.DataMigration {
         }
 
         public class DataMigrationEmpty : IDataMigration {
-            public string Feature {
-                get { return "Feature1"; }
+            public Feature Feature {
+                get { return new Feature() {Descriptor = new FeatureDescriptor() {Name = "Feature1"}}; }
             }
         }
 
         public class DataMigration11 : IDataMigration {
-            public string Feature {
-                get { return "Feature1"; }
+            public Feature Feature {
+                get { return new Feature() {Descriptor = new FeatureDescriptor() {Name = "Feature1"}}; }
             }
         }
 
         public class DataMigration11Create : IDataMigration {
-            public string Feature {
-                get { return "Feature1"; }
+            public Feature Feature {
+                get { return new Feature() {Descriptor = new FeatureDescriptor() {Name = "Feature1"}}; }
             }
 
             public int Create() {
@@ -109,8 +114,8 @@ namespace Orchard.Tests.DataMigration {
         }
 
         public class DataMigrationCreateCanBeFollowedByUpdates : IDataMigration {
-            public string Feature {
-                get { return "Feature1"; }
+            public Feature Feature {
+                get { return new Feature() { Descriptor = new FeatureDescriptor() { Name = "Feature1" } }; }
             }
 
             public int Create() {
@@ -123,8 +128,8 @@ namespace Orchard.Tests.DataMigration {
         }
 
         public class DataMigrationSameMigrationClassCanEvolve : IDataMigration {
-            public string Feature {
-                get { return "Feature1"; }
+            public Feature Feature {
+                get { return new Feature() { Descriptor = new FeatureDescriptor() { Name = "Feature1" } }; }
             }
 
             public int Create() {
@@ -141,8 +146,8 @@ namespace Orchard.Tests.DataMigration {
         }
 
         public class DataMigrationDependenciesModule1 : IDataMigration {
-            public string Feature {
-                get { return "Feature1"; }
+            public Feature Feature {
+                get { return new Feature() {Descriptor = new FeatureDescriptor() {Name = "Feature1"}}; }
             }
 
             public int Create() {
@@ -151,8 +156,8 @@ namespace Orchard.Tests.DataMigration {
         }
 
         public class DataMigrationDependenciesModule2 : IDataMigration {
-            public string Feature {
-                get { return "Feature2"; }
+            public Feature Feature {
+                get { return new Feature() { Descriptor = new FeatureDescriptor() { Name = "Feature2" } }; }
             }
 
             public int Create() {
@@ -161,8 +166,8 @@ namespace Orchard.Tests.DataMigration {
         }
 
         public class DataMigrationWithSchemaBuilder : DataMigrationImpl {
-            public override string Feature {
-                get { return "Feature1"; }
+            public override Feature Feature {
+                get { return new Feature() { Descriptor = new FeatureDescriptor() { Name = "Feature1" } }; }
             }
 
             public int Create() {
@@ -172,14 +177,14 @@ namespace Orchard.Tests.DataMigration {
         }
 
         public class DataMigrationFeatureNeedUpdate1 : IDataMigration {
-            public string Feature {
-                get { return "Feature1"; }
+            public Feature Feature {
+                get { return new Feature() { Descriptor = new FeatureDescriptor() { Name = "Feature1" } }; }
             }
         }
 
         public class DataMigrationFeatureNeedUpdate2 : IDataMigration {
-            public string Feature {
-                get { return "Feature2"; }
+            public Feature Feature {
+                get { return new Feature() { Descriptor = new FeatureDescriptor() { Name = "Feature2" } }; }
             }
 
             public int Create() {
@@ -188,8 +193,8 @@ namespace Orchard.Tests.DataMigration {
         }
 
         public class DataMigrationFeatureNeedUpdate3 : IDataMigration {
-            public string Feature {
-                get { return "Feature3"; }
+            public Feature Feature {
+                get { return new Feature() { Descriptor = new FeatureDescriptor() { Name = "Feature3" } }; }
             }
 
             public int Create() {
@@ -202,8 +207,8 @@ namespace Orchard.Tests.DataMigration {
         }
         
         public class DataMigrationSimpleBuilder : DataMigrationImpl {
-            public override string Feature {
-                get { return "Feature1"; }
+            public override Feature Feature {
+                get { return new Feature() { Descriptor = new FeatureDescriptor() { Name = "Feature1" } }; }
             }
 
             public int Create() {
diff --git a/src/Orchard.Tests/DataMigration/SchemaBuilderTests.cs b/src/Orchard.Tests/DataMigration/SchemaBuilderTests.cs
index 870b02421..2053bffc1 100644
--- a/src/Orchard.Tests/DataMigration/SchemaBuilderTests.cs
+++ b/src/Orchard.Tests/DataMigration/SchemaBuilderTests.cs
@@ -4,8 +4,8 @@ using Autofac;
 using NHibernate;
 using NUnit.Framework;
 using Orchard.Data;
-using Orchard.DataMigration.Interpreters;
-using Orchard.DataMigration.Schema;
+using Orchard.Data.Migration.Interpreters;
+using Orchard.Data.Migration.Schema;
 using Orchard.Environment.Configuration;
 using Orchard.Tests.ContentManagement;
 using System.IO;
@@ -65,7 +65,7 @@ namespace Orchard.Tests.DataMigration {
                     .CreateIndex("IDX_XYZ", "NickName"))
                 .AlterTable("User", table => table
                     .DropIndex("IDX_XYZ"))
-                .DropForeignKey("Addresse", "User_Address")
+                .DropForeignKey("Address", "User_Address")
                 .DropTable("Address")
                 .ExecuteSql("drop database", statement => statement.ForProvider("SQLite"))
                 .ExecuteSql("DROP DATABASE", statement => statement.ForProvider("SQLServer"));
diff --git a/src/Orchard.Tests/DataMigration/Utilities/NullInterpreter.cs b/src/Orchard.Tests/DataMigration/Utilities/NullInterpreter.cs
index 46cadd57d..6e87a8f40 100644
--- a/src/Orchard.Tests/DataMigration/Utilities/NullInterpreter.cs
+++ b/src/Orchard.Tests/DataMigration/Utilities/NullInterpreter.cs
@@ -1,10 +1,9 @@
-
-using System;
-using Orchard.DataMigration.Interpreters;
-using Orchard.DataMigration.Schema;
+using Orchard.Data.Migration.Interpreters;
+using Orchard.Data.Migration.Schema;
 
 public class NullInterpreter : IDataMigrationInterpreter {
-    public void Visit(SchemaCommand command) {
+
+    public void Visit(ISchemaBuilderCommand command) {
     }
 
     public void Visit(CreateTableCommand command) {
diff --git a/src/Orchard.Web/Config/Diagnostics.config b/src/Orchard.Web/Config/Diagnostics.config
index 124536a7d..ee34eaabf 100644
--- a/src/Orchard.Web/Config/Diagnostics.config
+++ b/src/Orchard.Web/Config/Diagnostics.config
@@ -1,7 +1,7 @@
 <system.diagnostics>
   <trace autoflush="true"/>
   <sources>
-    <source name="Default" switchValue="Verbose">
+    <source name="Default" switchValue="Warning">
       <listeners>
         <add name="OrchardDebugTextLog" />
         <add name="WebPageTrace"/>
diff --git a/src/Orchard.Web/Core/Common/DataMigrations/CommonDataMigration.cs b/src/Orchard.Web/Core/Common/DataMigrations/CommonDataMigration.cs
new file mode 100644
index 000000000..f1fa72627
--- /dev/null
+++ b/src/Orchard.Web/Core/Common/DataMigrations/CommonDataMigration.cs
@@ -0,0 +1,47 @@
+using System;
+using Orchard.Data.Migration;
+
+namespace Orchard.Core.Common.DataMigrations {
+    public class CommonDataMigration : DataMigrationImpl {
+
+        public int Create() {
+            //CREATE TABLE Common_BodyRecord (Id INTEGER not null, Text TEXT, Format TEXT, ContentItemRecord_id INTEGER, primary key (Id));
+            SchemaBuilder.CreateTable("BodyRecord", table => table
+                .Column<int>("Id", column => column.PrimaryKey())
+                .Column<string>("Text")
+                .Column<string>("Format")
+                .Column<int>("ContentItemRecord_id")
+                );
+
+            //CREATE TABLE Common_CommonRecord (Id INTEGER not null, OwnerId INTEGER, CreatedUtc DATETIME, PublishedUtc DATETIME, ModifiedUtc DATETIME, Container_id INTEGER, primary key (Id));
+            SchemaBuilder.CreateTable("CommonRecord", table => table
+                .Column<int>("Id", column => column.PrimaryKey())
+                .Column<int>("OwnerId")
+                .Column<DateTime>("CreatedUtc")
+                .Column<DateTime>("PublishedUtc")
+                .Column<DateTime>("ModifiedUtc")
+                .Column<int>("Container_id")
+                );
+            
+            //CREATE TABLE Common_CommonVersionRecord (Id INTEGER not null, CreatedUtc DATETIME, PublishedUtc DATETIME, ModifiedUtc DATETIME, ContentItemRecord_id INTEGER, primary key (Id));
+            SchemaBuilder.CreateTable("CommonVersionRecord", table => table
+                .Column<int>("Id", column => column.PrimaryKey())
+                .Column<DateTime>("CreatedUtc")
+                .Column<DateTime>("PublishedUtc")
+                .Column<DateTime>("ModifiedUtc")
+                .Column<int>("ContentItemRecord_id")
+                );
+            
+            //CREATE TABLE Common_RoutableRecord (Id INTEGER not null, Title TEXT, Slug TEXT, Path TEXT, ContentItemRecord_id INTEGER, primary key (Id));
+            SchemaBuilder.CreateTable("RoutableRecord", table => table
+                .Column<int>("Id", column => column.PrimaryKey())
+                .Column<string>("Title")
+                .Column<string>("Slug")
+                .Column<string>("Path")
+                .Column<int>("ContentItemRecord_id")
+                );
+
+            return 0010;
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/Orchard.Web/Core/Common/Drivers/BodyDriver.cs b/src/Orchard.Web/Core/Common/Drivers/BodyDriver.cs
index f7a0a0264..4d5437b42 100644
--- a/src/Orchard.Web/Core/Common/Drivers/BodyDriver.cs
+++ b/src/Orchard.Web/Core/Common/Drivers/BodyDriver.cs
@@ -4,6 +4,7 @@ using Orchard.ContentManagement;
 using Orchard.ContentManagement.Aspects;
 using Orchard.ContentManagement.Drivers;
 using Orchard.Core.Common.Models;
+using Orchard.Core.Common.Settings;
 using Orchard.Core.Common.ViewModels;
 
 namespace Orchard.Core.Common.Drivers {
@@ -12,6 +13,7 @@ namespace Orchard.Core.Common.Drivers {
         public IOrchardServices Services { get; set; }
         private const string TemplateName = "Parts/Common.Body";
         private const string DefaultTextEditorTemplate = "TinyMceTextEditor";
+        private const string PlainTextEditorTemplate = "PlainTextEditor";
 
         public BodyDriver(IOrchardServices services) {
             Services = services;
@@ -21,7 +23,7 @@ namespace Orchard.Core.Common.Drivers {
             get { return "Body"; }
         }
 
-        // \/\/ Haackalicious on many accounts - don't copy what has been done here for the wrapper \/\/
+        // \/\/ Hackalicious on many accounts - don't copy what has been done here for the wrapper \/\/
         protected override DriverResult Display(BodyAspect part, string displayType) {
             var model = new BodyDisplayViewModel { BodyAspect = part, Text = BbcodeReplace(part.Text) };
 
@@ -40,16 +42,29 @@ namespace Orchard.Core.Common.Drivers {
         protected override DriverResult Editor(BodyAspect part, IUpdateModel updater) {
             var model = BuildEditorViewModel(part);
             updater.TryUpdateModel(model, Prefix, null, null);
+
+            // only set the format if it has not yet been set to preserve the initial format type - might want to change this later to support changing body formats but...later
+            if (string.IsNullOrWhiteSpace(model.Format))
+                model.Format = GetFlavor(part);
+
             return ContentPartTemplate(model, TemplateName, Prefix).Location("primary", "5");
         }
 
         private static BodyEditorViewModel BuildEditorViewModel(BodyAspect part) {
             return new BodyEditorViewModel {
                 BodyAspect = part,
-                TextEditorTemplate = DefaultTextEditorTemplate,
+                TextEditorTemplate = GetFlavor(part) == "html" ? DefaultTextEditorTemplate : PlainTextEditorTemplate,
                 AddMediaPath= new PathBuilder(part).AddContentType().AddContainerSlug().AddSlug().ToString()
             };
         }
+
+        private static string GetFlavor(BodyAspect part) {
+            var typePartSettings = part.Settings.GetModel<BodyTypePartSettings>();
+            return (typePartSettings != null && !string.IsNullOrWhiteSpace(typePartSettings.Flavor))
+                       ? typePartSettings.Flavor
+                       : part.PartDefinition.Settings.GetModel<BodyPartSettings>().FlavorDefault;
+        }
+
         class PathBuilder {
             private readonly IContent _content;
             private string _path;
diff --git a/src/Orchard.Web/Core/Common/Fields/TextField.cs b/src/Orchard.Web/Core/Common/Fields/TextField.cs
index a7df68bd4..1a26a10da 100644
--- a/src/Orchard.Web/Core/Common/Fields/TextField.cs
+++ b/src/Orchard.Web/Core/Common/Fields/TextField.cs
@@ -1,10 +1,11 @@
 using Orchard.ContentManagement;
+using Orchard.ContentManagement.FieldStorage;
 
 namespace Orchard.Core.Common.Fields {
     public class TextField : ContentField {
         public string Value {
-            get { return Getter(null); }
-            set { Setter(null, value); }
+            get { return Storage.Get<string>(); }
+            set { Storage.Set(value); }
         }
     }
 }
diff --git a/src/Orchard.Web/Core/Common/Settings/BodySettings.cs b/src/Orchard.Web/Core/Common/Settings/BodySettings.cs
new file mode 100644
index 000000000..2e951ee00
--- /dev/null
+++ b/src/Orchard.Web/Core/Common/Settings/BodySettings.cs
@@ -0,0 +1,67 @@
+using System.Collections.Generic;
+using Orchard.ContentManagement;
+using Orchard.ContentManagement.MetaData;
+using Orchard.ContentManagement.MetaData.Builders;
+using Orchard.ContentManagement.MetaData.Models;
+using Orchard.ContentManagement.ViewModels;
+
+namespace Orchard.Core.Common.Settings {
+    public class BodyPartSettings {
+        public const string FlavorDefaultDefault = "html";
+        private string _flavorDefault;
+        public string FlavorDefault {
+            get { return !string.IsNullOrWhiteSpace(_flavorDefault)
+                           ? _flavorDefault
+                           : FlavorDefaultDefault; }
+            set { _flavorDefault = value; }
+        }
+    }
+
+    public class BodyTypePartSettings {
+        public string Flavor { get; set; }
+    }
+
+    public class BodySettingsHooks : ContentDefinitionEditorEventsBase {
+        public override IEnumerable<TemplateViewModel> TypePartEditor(ContentTypeDefinition.Part definition) {
+            if (definition.PartDefinition.Name != "BodyAspect")
+                yield break;
+
+            var model = definition.Settings.GetModel<BodyTypePartSettings>();
+
+            if (string.IsNullOrWhiteSpace(model.Flavor)) {
+                var partModel = definition.PartDefinition.Settings.GetModel<BodyPartSettings>();
+                model.Flavor = partModel.FlavorDefault;
+            }
+
+            yield return DefinitionTemplate(model);
+        }
+
+        public override IEnumerable<TemplateViewModel> PartEditor(ContentPartDefinition definition) {
+            if (definition.Name != "BodyAspect")
+                yield break;
+
+            var model = definition.Settings.GetModel<BodyPartSettings>();
+            yield return DefinitionTemplate(model);
+        }
+
+        public override IEnumerable<TemplateViewModel> TypePartEditorUpdate(ContentTypeDefinitionBuilder.PartConfigurer builder, IUpdateModel updateModel) {
+            if (builder.Name != "BodyAspect")
+                yield break;
+
+            var model = new BodyTypePartSettings();
+            updateModel.TryUpdateModel(model, "BodyTypePartSettings", null, null);
+            builder.WithSetting("BodyTypePartSettings.Flavor", !string.IsNullOrWhiteSpace(model.Flavor) ? model.Flavor : null);
+            yield return DefinitionTemplate(model);
+        }
+
+        public override IEnumerable<TemplateViewModel> PartEditorUpdate(ContentPartDefinitionBuilder builder, IUpdateModel updateModel) {
+            if (builder.Name != "BodyAspect")
+                yield break;
+
+            var model = new BodyPartSettings();
+            updateModel.TryUpdateModel(model, "BodyPartSettings", null, null);
+            builder.WithSetting("BodyPartSettings.FlavorDefault", !string.IsNullOrWhiteSpace(model.FlavorDefault) ? model.FlavorDefault : null);
+            yield return DefinitionTemplate(model);
+        }
+    }
+}
diff --git a/src/Orchard.Web/Core/Common/Views/DefinitionTemplates/BodyPartSettings.ascx b/src/Orchard.Web/Core/Common/Views/DefinitionTemplates/BodyPartSettings.ascx
new file mode 100644
index 000000000..b4a75d0f0
--- /dev/null
+++ b/src/Orchard.Web/Core/Common/Views/DefinitionTemplates/BodyPartSettings.ascx
@@ -0,0 +1,6 @@
+<%@ Control Language="C#" Inherits="Orchard.Mvc.ViewUserControl<Orchard.Core.Common.Settings.BodyPartSettings>" %>
+<fieldset>
+    <label for="<%:Html.FieldIdFor(m => m.FlavorDefault) %>"><%:T("Default flavor") %></label>
+    <%:Html.EditorFor(m => m.FlavorDefault)%>
+    <%:Html.ValidationMessageFor(m => m.FlavorDefault)%>
+</fieldset>
diff --git a/src/Orchard.Web/Core/Common/Views/DefinitionTemplates/BodyTypePartSettings.ascx b/src/Orchard.Web/Core/Common/Views/DefinitionTemplates/BodyTypePartSettings.ascx
new file mode 100644
index 000000000..e1b503fa4
--- /dev/null
+++ b/src/Orchard.Web/Core/Common/Views/DefinitionTemplates/BodyTypePartSettings.ascx
@@ -0,0 +1,6 @@
+<%@ Control Language="C#" Inherits="Orchard.Mvc.ViewUserControl<Orchard.Core.Common.Settings.BodyTypePartSettings>" %>
+<fieldset>
+    <label for="<%:Html.FieldIdFor(m => m.Flavor) %>"><%:T("Flavor") %></label>
+    <%:Html.EditorFor(m => m.Flavor) %>
+    <%:Html.ValidationMessageFor(m => m.Flavor) %>
+</fieldset>
diff --git a/src/Orchard.Web/Core/Common/Views/EditorTemplates/PlainTextEditor.ascx b/src/Orchard.Web/Core/Common/Views/EditorTemplates/PlainTextEditor.ascx
new file mode 100644
index 000000000..fa8ace6e0
--- /dev/null
+++ b/src/Orchard.Web/Core/Common/Views/EditorTemplates/PlainTextEditor.ascx
@@ -0,0 +1,3 @@
+<%@ Control Language="C#" Inherits="Orchard.Mvc.ViewUserControl<BodyEditorViewModel>" %>
+<%@ Import Namespace="Orchard.Core.Common.ViewModels"%>
+<%: Html.TextArea("Text", Model.Text, 25, 80, new { @class = Model.Format }) %>
\ No newline at end of file
diff --git a/src/Orchard.Web/Core/Localization/DataMigrations/LocalizationDataMigration.cs b/src/Orchard.Web/Core/Localization/DataMigrations/LocalizationDataMigration.cs
new file mode 100644
index 000000000..1eed07b70
--- /dev/null
+++ b/src/Orchard.Web/Core/Localization/DataMigrations/LocalizationDataMigration.cs
@@ -0,0 +1,17 @@
+using Orchard.Data.Migration;
+
+namespace Orchard.Core.Localization.DataMigrations {
+    public class LocalizationDataMigration : DataMigrationImpl {
+
+        public int Create() {
+            //CREATE TABLE Localization_LocalizedRecord (Id INTEGER not null, CultureId INTEGER, MasterContentItemId INTEGER, primary key (Id));
+            SchemaBuilder.CreateTable("LocalizedRecord", table => table
+                .Column<int>("Id", column => column.PrimaryKey())
+                .Column<int>("CultureId")
+                .Column<int>("MasterContentItemId")
+                );
+
+            return 0010;
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/Orchard.Web/Core/Navigation/DataMigrations/NavigationDataMigration.cs b/src/Orchard.Web/Core/Navigation/DataMigrations/NavigationDataMigration.cs
new file mode 100644
index 000000000..2910c823b
--- /dev/null
+++ b/src/Orchard.Web/Core/Navigation/DataMigrations/NavigationDataMigration.cs
@@ -0,0 +1,24 @@
+using Orchard.Data.Migration;
+
+namespace Orchard.Core.Navigation.DataMigrations {
+    public class NavigationDataMigration : DataMigrationImpl {
+
+        public int Create() {
+            //CREATE TABLE Navigation_MenuItemRecord (Id INTEGER not null, Url TEXT, primary key (Id));
+            SchemaBuilder.CreateTable("MenuItemRecord", table => table
+                .Column<int>("Id", column => column.PrimaryKey())
+                .Column<string>("Url")
+                );
+
+            //CREATE TABLE Navigation_MenuPartRecord (Id INTEGER not null, MenuText TEXT, MenuPosition TEXT, OnMainMenu INTEGER, primary key (Id));
+            SchemaBuilder.CreateTable("MenuPartRecord", table => table
+                .Column<int>("Id", column => column.PrimaryKey())
+                .Column<string>("MenuText")
+                .Column<string>("MenuPosition")
+                .Column<bool>("OnMainMenu")
+                );
+
+            return 0010;
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/Orchard.Web/Core/Orchard.Core.csproj b/src/Orchard.Web/Core/Orchard.Core.csproj
index 85758fffe..4e2b96d72 100644
--- a/src/Orchard.Web/Core/Orchard.Core.csproj
+++ b/src/Orchard.Web/Core/Orchard.Core.csproj
@@ -61,6 +61,7 @@
     <Reference Include="System.Xml.Linq" />
   </ItemGroup>
   <ItemGroup>
+    <Compile Include="Common\DataMigrations\CommonDataMigration.cs" />
     <Compile Include="Common\Drivers\BodyDriver.cs" />
     <Compile Include="Common\Drivers\CommonDriver.cs" />
     <Compile Include="Common\Drivers\RoutableDriver.cs" />
@@ -68,6 +69,7 @@
     <Compile Include="Common\Drivers\TextFieldDriver.cs" />
     <Compile Include="Common\Fields\TextField.cs" />
     <Compile Include="Common\Handlers\RoutableAspectHandler.cs" />
+    <Compile Include="Common\Settings\BodySettings.cs" />
     <Compile Include="Common\ViewModels\ContainerEditorViewModel.cs" />
     <Compile Include="Common\ViewModels\TextContentFieldDisplayViewModel.cs" />
     <Compile Include="Common\ViewModels\TextContentFieldEditorViewModel.cs" />
@@ -76,7 +78,9 @@
     <Compile Include="Contents\ViewModels\EditItemViewModel.cs" />
     <Compile Include="Contents\ViewModels\ListContentsViewModel.cs" />
     <Compile Include="Contents\ViewModels\ListContentTypesViewModel.cs" />
+    <Compile Include="Localization\DataMigrations\LocalizationDataMigration.cs" />
     <Compile Include="Localization\Drivers\LocalizedDriver.cs" />
+    <Compile Include="Navigation\DataMigrations\NavigationDataMigration.cs" />
     <Compile Include="Routable\Controllers\ItemController.cs" />
     <Compile Include="Routable\Drivers\RoutableDriver.cs" />
     <Compile Include="Routable\Handlers\RoutableHandler.cs" />
@@ -153,12 +157,14 @@
     <Compile Include="Routable\Services\RoutableService.cs" />
     <Compile Include="Routable\ViewModels\RoutableEditorViewModel.cs" />
     <Compile Include="Routable\ViewModels\RoutableDisplayViewModel.cs" />
+    <Compile Include="Scheduling\DataMigrations\SchedulingDataMigration.cs" />
     <Compile Include="Scheduling\Models\ScheduledTaskRecord.cs" />
     <Compile Include="Scheduling\Services\PublishingTaskHandler.cs" />
     <Compile Include="Scheduling\Services\PublishingTaskManager.cs" />
     <Compile Include="Scheduling\Services\ScheduledTaskManager.cs" />
     <Compile Include="Scheduling\Services\ScheduledTaskExecutor.cs" />
     <Compile Include="Scheduling\Models\Task.cs" />
+    <Compile Include="Settings\DataMigrations\SettingsDataMigration.cs" />
     <Compile Include="Settings\ViewModels\SiteCulturesViewModel.cs" />
     <Compile Include="Settings\Drivers\SiteSettingsDriver.cs" />
     <Compile Include="Settings\Metadata\ContentDefinitionManager.cs" />
@@ -197,9 +203,12 @@
   </ItemGroup>
   <ItemGroup>
     <Content Include="Common\Module.txt" />
+    <Content Include="Common\Views\DefinitionTemplates\BodyTypePartSettings.ascx" />
+    <Content Include="Common\Views\DefinitionTemplates\BodyPartSettings.ascx" />
     <Content Include="Common\Views\DisplayTemplates\Fields\Common.TextField.ascx" />
     <Content Include="Common\Views\EditorTemplates\Fields\Common.TextField.ascx" />
     <Content Include="Common\Views\EditorTemplates\Parts\Common.Container.ascx" />
+    <Content Include="Common\Views\EditorTemplates\PlainTextEditor.ascx" />
     <Content Include="Contents\Module.txt" />
     <Content Include="Contents\Views\Admin\List.aspx" />
     <Content Include="Contents\Views\Admin\Edit.aspx" />
diff --git a/src/Orchard.Web/Core/Scheduling/DataMigrations/SchedulingDataMigration.cs b/src/Orchard.Web/Core/Scheduling/DataMigrations/SchedulingDataMigration.cs
new file mode 100644
index 000000000..2cea744d1
--- /dev/null
+++ b/src/Orchard.Web/Core/Scheduling/DataMigrations/SchedulingDataMigration.cs
@@ -0,0 +1,19 @@
+using System;
+using Orchard.Data.Migration;
+
+namespace Orchard.Core.Scheduling.DataMigrations {
+    public class SchedulingDataMigration : DataMigrationImpl {
+
+        public int Create() {
+            //CREATE TABLE Scheduling_ScheduledTaskRecord (Id  integer, TaskType TEXT, ScheduledUtc DATETIME, ContentItemVersionRecord_id INTEGER, primary key (Id));
+            SchemaBuilder.CreateTable("ScheduledTaskRecord", table => table
+                .Column<int>("Id", column => column.PrimaryKey())
+                .Column<string>("TaskType")
+                .Column<DateTime>("ScheduledUtc")
+                .Column<int>("ContentItemVersionRecord_id")
+                );
+
+            return 0010;
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/Orchard.Web/Core/Settings/DataMigrations/SettingsDataMigration.cs b/src/Orchard.Web/Core/Settings/DataMigrations/SettingsDataMigration.cs
new file mode 100644
index 000000000..2116c1ca8
--- /dev/null
+++ b/src/Orchard.Web/Core/Settings/DataMigrations/SettingsDataMigration.cs
@@ -0,0 +1,97 @@
+using Orchard.Data.Migration;
+
+namespace Orchard.Core.Settings.DataMigrations {
+    public class SettingsDataMigration : DataMigrationImpl {
+
+        public int Create() {
+            //CREATE TABLE Settings_ContentFieldDefinitionRecord (Id  integer, Name TEXT, primary key (Id));
+            SchemaBuilder.CreateTable("ContentFieldDefinitionRecord", table => table
+                .Column<int>("Id", column => column.PrimaryKey())
+                .Column<string>("Name")
+                );
+
+            //CREATE TABLE Settings_ContentPartDefinitionRecord (Id  integer, Name TEXT, Hidden INTEGER, Settings TEXT, primary key (Id));
+            SchemaBuilder.CreateTable("ContentPartDefinitionRecord", table => table
+                .Column<int>("Id", column => column.PrimaryKey())
+                .Column<string>("Name")
+                .Column<bool>("Hidden")
+                .Column<string>("Settings")
+                );
+
+            //CREATE TABLE Settings_ContentPartFieldDefinitionRecord (Id  integer, Name TEXT, Settings TEXT, ContentFieldDefinitionRecord_id INTEGER,  INTEGER, primary key (Id));
+            SchemaBuilder.CreateTable("ContentPartFieldDefinitionRecord", table => table
+                .Column<int>("Id", column => column.PrimaryKey())
+                .Column<string>("Name")
+                .Column<string>("Settings")
+                .Column<int>("ContentFieldDefinitionRecord_id")
+                .Column<int>("ContentPartDefinitionRecord_Id")
+                );
+
+            //CREATE TABLE Settings_ContentTypeDefinitionRecord (Id  integer, Name TEXT, DisplayName TEXT, Hidden INTEGER, Settings TEXT, primary key (Id));
+            SchemaBuilder.CreateTable("ContentTypeDefinitionRecord", table => table
+                .Column<int>("Id", column => column.PrimaryKey())
+                .Column<string>("Name")
+                .Column<string>("DisplayName")
+                .Column<bool>("Hidden")
+                .Column<string>("Settings")
+                );
+
+            //CREATE TABLE Settings_ContentTypePartDefinitionRecord (Id  integer, Settings TEXT, ContentPartDefinitionRecord_id INTEGER, ContentTypeDefinitionRecord_Id INTEGER, primary key (Id));
+            SchemaBuilder.CreateTable("ContentTypePartDefinitionRecord", table => table
+                .Column<int>("Id", column => column.PrimaryKey())
+                .Column<string>("Settings")
+                .Column<int>("ContentPartDefinitionRecord_id")
+                .Column<int>("ContentTypeDefinitionRecord_Id")
+                );
+
+            //CREATE TABLE Settings_ShellDescriptorRecord (Id  integer, SerialNumber INTEGER, primary key (Id));
+            SchemaBuilder.CreateTable("ShellDescriptorRecord", table => table
+                .Column<int>("Id", column => column.PrimaryKey())
+                .Column<int>("SerialNumber")
+                );
+
+            //CREATE TABLE Settings_ShellFeatureRecord (Id  integer, Name TEXT, ShellDescriptorRecord_id INTEGER, primary key (Id));
+            SchemaBuilder.CreateTable("ShellFeatureRecord", table => table
+                    .Column<int>("Id", column => column.PrimaryKey())
+                    .Column<string>("Name")
+                    .Column<int>("ShellDescriptorRecord_id"));
+
+            //CREATE TABLE Settings_ShellFeatureStateRecord (Id  integer, Name TEXT, InstallState TEXT, EnableState TEXT, ShellStateRecord_Id INTEGER, primary key (Id));
+            SchemaBuilder.CreateTable("ShellFeatureStateRecord", table => table
+                .Column<int>("Id", column => column.PrimaryKey())
+                .Column<string>("Name")
+                .Column<string>("InstallState")
+                .Column<string>("EnableState")
+                .Column<int>("ShellStateRecord_Id")
+                );
+
+            //CREATE TABLE Settings_ShellParameterRecord (Id  integer, Component TEXT, Name TEXT, Value TEXT, ShellDescriptorRecord_id INTEGER, primary key (Id));
+            SchemaBuilder.CreateTable("ShellParameterRecord", table => table
+                .Column<int>("Id", column => column.PrimaryKey())
+                .Column<string>("Component")
+                .Column<string>("Name")
+                .Column<string>("Value")
+                .Column<int>("ShellDescriptorRecord_id")
+                );
+
+            //CREATE TABLE Settings_ShellStateRecord (Id  integer, primary key (Id));
+            SchemaBuilder.CreateTable("ShellStateRecord", table => table
+                .Column<int>("Id", column => column.PrimaryKey())
+                .Column<string>("Name")
+                );
+
+            //CREATE TABLE Settings_SiteSettingsRecord (Id INTEGER not null, SiteSalt TEXT, SiteName TEXT, SuperUser TEXT, PageTitleSeparator TEXT, HomePage TEXT, SiteCulture TEXT, primary key (Id));
+            SchemaBuilder.CreateTable("SiteSettingsRecord", table => table
+                .Column<int>("Id", column => column.PrimaryKey())
+                .Column<string>("SiteSalt")
+                .Column<string>("SiteName")
+                .Column<string>("SuperUser")
+                .Column<string>("PageTitleSeparator")
+                .Column<string>("HomePage")
+                .Column<string>("SiteCulture")
+                );
+
+            return 0010;
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/Orchard.Web/Modules/Futures.Widgets/DataMigrations/WidgetsDataMigration.cs b/src/Orchard.Web/Modules/Futures.Widgets/DataMigrations/WidgetsDataMigration.cs
new file mode 100644
index 000000000..6e06cd0ae
--- /dev/null
+++ b/src/Orchard.Web/Modules/Futures.Widgets/DataMigrations/WidgetsDataMigration.cs
@@ -0,0 +1,23 @@
+using Orchard.Data.Migration;
+
+namespace Futures.Widgets.DataMigrations {
+    public class WidgetsDataMigration : DataMigrationImpl {
+
+        public int Create() {
+            //CREATE TABLE Futures_Widgets_HasWidgetsRecord (Id INTEGER not null, primary key (Id));
+            SchemaBuilder.CreateTable("HasWidgetsRecord", table => table
+                .Column<int>("Id", column => column.PrimaryKey())
+                );
+
+            //CREATE TABLE Futures_Widgets_WidgetRecord (Id INTEGER not null, Zone TEXT, Position TEXT, Scope_id INTEGER, primary key (Id));
+            SchemaBuilder.CreateTable("WidgetRecord", table => table
+                .Column<int>("Id", column => column.PrimaryKey())
+                .Column<string>("Zone")
+                .Column<string>("Position")
+                .Column<int>("Scope_id")
+                );
+
+            return 0010;
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/Orchard.Web/Modules/Futures.Widgets/Futures.Widgets.csproj b/src/Orchard.Web/Modules/Futures.Widgets/Futures.Widgets.csproj
index b4442b16c..290b659e8 100644
--- a/src/Orchard.Web/Modules/Futures.Widgets/Futures.Widgets.csproj
+++ b/src/Orchard.Web/Modules/Futures.Widgets/Futures.Widgets.csproj
@@ -59,6 +59,7 @@
   <ItemGroup>
     <Compile Include="Controllers\AdminController.cs" />
     <Compile Include="Controllers\WidgetHandler.cs" />
+    <Compile Include="DataMigrations\WidgetsDataMigration.cs" />
     <Compile Include="Models\HasWidgets.cs" />
     <Compile Include="Models\Widget.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
diff --git a/src/Orchard.Web/Modules/Orchard.Blogs/DataMigrations/BlogsDataMigration.cs b/src/Orchard.Web/Modules/Orchard.Blogs/DataMigrations/BlogsDataMigration.cs
new file mode 100644
index 000000000..8756eb989
--- /dev/null
+++ b/src/Orchard.Web/Modules/Orchard.Blogs/DataMigrations/BlogsDataMigration.cs
@@ -0,0 +1,26 @@
+using Orchard.Data.Migration;
+
+namespace Orchard.Blogs.DataMigrations {
+    public class BlogsDataMigration : DataMigrationImpl {
+
+        public int Create() {
+            //CREATE TABLE Orchard_Blogs_BlogArchiveRecord (Id  integer, Year INTEGER, Month INTEGER, PostCount INTEGER, Blog_id INTEGER, primary key (Id));
+            SchemaBuilder.CreateTable("BlogArchiveRecord", table => table
+                .Column<int>("Id", column => column.PrimaryKey())
+                .Column<int>("Year")
+                .Column<int>("Month")
+                .Column<int>("PostCount")
+                .Column<int>("Blog_id")
+                );
+
+            //CREATE TABLE Orchard_Blogs_BlogRecord (Id INTEGER not null, Description TEXT, PostCount INTEGER, primary key (Id));
+            SchemaBuilder.CreateTable("BlogRecord", table => table
+                .Column<int>("Id", column => column.PrimaryKey())
+                .Column<string>("Description")
+                .Column<int>("PostCount")
+                );
+
+            return 0010;
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/Orchard.Web/Modules/Orchard.Blogs/Orchard.Blogs.csproj b/src/Orchard.Web/Modules/Orchard.Blogs/Orchard.Blogs.csproj
index a27f9f0af..5016b362b 100644
--- a/src/Orchard.Web/Modules/Orchard.Blogs/Orchard.Blogs.csproj
+++ b/src/Orchard.Web/Modules/Orchard.Blogs/Orchard.Blogs.csproj
@@ -68,6 +68,7 @@
     <Compile Include="AdminMenu.cs" />
     <Compile Include="Commands\BlogCommands.cs" />
     <Compile Include="Controllers\BlogAdminController.cs" />
+    <Compile Include="DataMigrations\BlogsDataMigration.cs" />
     <Compile Include="Drivers\BlogDriver.cs" />
     <Compile Include="Controllers\BlogPostAdminController.cs" />
     <Compile Include="Controllers\BlogPostController.cs" />
diff --git a/src/Orchard.Web/Modules/Orchard.Comments/DataMigrations/CommentsDataMigration.cs b/src/Orchard.Web/Modules/Orchard.Comments/DataMigrations/CommentsDataMigration.cs
new file mode 100644
index 000000000..7b7f1d689
--- /dev/null
+++ b/src/Orchard.Web/Modules/Orchard.Comments/DataMigrations/CommentsDataMigration.cs
@@ -0,0 +1,47 @@
+using System;
+using Orchard.Data.Migration;
+
+namespace Orchard.Comments.DataMigrations {
+    public class CommentsDataMigration : DataMigrationImpl {
+    
+        public int Create() {
+            //CREATE TABLE Orchard_Comments_ClosedCommentsRecord (Id  integer, ContentItemId INTEGER, primary key (Id));
+            SchemaBuilder.CreateTable("ClosedCommentsRecord", table => table
+                .Column<int>("Id", column => column.PrimaryKey())
+                .Column<int>("ContentItemId")
+                );
+
+            //CREATE TABLE Orchard_Comments_CommentRecord (Id INTEGER not null, Author TEXT, SiteName TEXT, UserName TEXT, Email TEXT, Status TEXT, CommentDateUtc DATETIME, CommentText TEXT, CommentedOn INTEGER, CommentedOnContainer INTEGER, primary key (Id));
+            SchemaBuilder.CreateTable("CommentRecord", table => table
+                .Column<int>("Id", column => column.PrimaryKey())
+                .Column<string>("Author")
+                .Column<string>("SiteName")
+                .Column<string>("UserName")
+                .Column<string>("Email")
+                .Column<string>("Status")
+                .Column<DateTime>("CommentDateUtc")
+                .Column<string>("CommentText")
+                .Column<int>("CommentedOn")
+                .Column<int>("CommentedOnContainer")
+                );
+
+            //CREATE TABLE Orchard_Comments_CommentSettingsRecord (Id INTEGER not null, ModerateComments INTEGER, EnableSpamProtection INTEGER, AkismetKey TEXT, AkismetUrl TEXT, primary key (Id));
+            SchemaBuilder.CreateTable("CommentSettingsRecord", table => table
+                .Column<int>("Id", column => column.PrimaryKey())
+                .Column<bool>("ModerateComments")
+                .Column<bool>("EnableSpamProtection")
+                .Column<string>("AkismetKey")
+                .Column<string>("AkismetUrl")
+               );
+
+            //CREATE TABLE Orchard_Comments_HasCommentsRecord (Id INTEGER not null, CommentsShown INTEGER, CommentsActive INTEGER, primary key (Id));
+            SchemaBuilder.CreateTable("HasCommentsRecord", table => table
+                .Column<int>("Id", column => column.PrimaryKey())
+                .Column<bool>("CommentsShown")
+                .Column<bool>("CommentsActive")
+                );
+
+            return 0010;
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/Orchard.Web/Modules/Orchard.Comments/Orchard.Comments.csproj b/src/Orchard.Web/Modules/Orchard.Comments/Orchard.Comments.csproj
index 391eb11c5..5291a071d 100644
--- a/src/Orchard.Web/Modules/Orchard.Comments/Orchard.Comments.csproj
+++ b/src/Orchard.Web/Modules/Orchard.Comments/Orchard.Comments.csproj
@@ -72,6 +72,7 @@
     <Compile Include="AdminMenu.cs" />
     <Compile Include="Controllers\AdminController.cs" />
     <Compile Include="Controllers\CommentController.cs" />
+    <Compile Include="DataMigrations\CommentsDataMigration.cs" />
     <Compile Include="Drivers\CommentDriver.cs" />
     <Compile Include="Drivers\HasCommentsContainerDriver.cs" />
     <Compile Include="Drivers\HasCommentsDriver.cs" />
diff --git a/src/Orchard.Web/Modules/Orchard.ContentTypes/Controllers/AdminController.cs b/src/Orchard.Web/Modules/Orchard.ContentTypes/Controllers/AdminController.cs
index 9bfc9cf20..00c33ec29 100644
--- a/src/Orchard.Web/Modules/Orchard.ContentTypes/Controllers/AdminController.cs
+++ b/src/Orchard.Web/Modules/Orchard.ContentTypes/Controllers/AdminController.cs
@@ -1,50 +1,35 @@
 using System;
-using System.Collections.Generic;
 using System.Linq;
 using System.Web.Mvc;
 using Orchard.ContentManagement;
 using Orchard.ContentManagement.MetaData;
 using Orchard.ContentManagement.MetaData.Models;
-using Orchard.ContentManagement.ViewModels;
 using Orchard.ContentTypes.Services;
 using Orchard.ContentTypes.ViewModels;
-using Orchard.Data;
 using Orchard.Localization;
-using Orchard.Logging;
 using Orchard.Mvc.Results;
 using Orchard.UI.Notify;
 
 namespace Orchard.ContentTypes.Controllers {
     public class AdminController : Controller {
-        private readonly INotifier _notifier;
         private readonly IContentDefinitionService _contentDefinitionService;
         private readonly IContentDefinitionManager _contentDefinitionManager;
-        private readonly IContentManager _contentManager;
-        private readonly ITransactionManager _transactionManager;
         private readonly IContentDefinitionEditorEvents _extendViewModels;
 
         public AdminController(
             IOrchardServices orchardServices,
-            INotifier notifier,
             IContentDefinitionService contentDefinitionService,
             IContentDefinitionManager contentDefinitionManager,
-            IContentManager contentManager,
-            ITransactionManager transactionManager,
             IContentDefinitionEditorEvents extendViewModels) {
             Services = orchardServices;
-            _notifier = notifier;
             _contentDefinitionService = contentDefinitionService;
             _contentDefinitionManager = contentDefinitionManager;
-            _contentManager = contentManager;
-            _transactionManager = transactionManager;
             _extendViewModels = extendViewModels;
             T = NullLocalizer.Instance;
-            Logger = NullLogger.Instance;
         }
 
         public IOrchardServices Services { get; private set; }
         public Localizer T { get; set; }
-        public ILogger Logger { get; set; }
         public ActionResult Index() {
             return List();
         }
@@ -69,32 +54,14 @@ namespace Orchard.ContentTypes.Controllers {
             if (!Services.Authorizer.Authorize(Permissions.CreateContentTypes, T("Not allowed to create a content type.")))
                 return new HttpUnauthorizedResult();
 
-            var model = new ContentTypeDefinition("");
-            TryUpdateModel(model);
-
-            if (!ModelState.IsValid) {
-                Services.TransactionManager.Cancel();
+            if (!ModelState.IsValid)
                 return View(viewModel);
-            }
 
-            _contentDefinitionService.AddTypeDefinition(model);
+            _contentDefinitionService.AddTypeDefinition(viewModel.DisplayName);
 
             return RedirectToAction("Index");
         }
 
-        class Updater : IUpdateModel {
-            public AdminController Thunk { get; set; }
-            public Func<string, string> _prefix = x => x;
-
-            public bool TryUpdateModel<TModel>(TModel model, string prefix, string[] includeProperties, string[] excludeProperties) where TModel : class {
-                return Thunk.TryUpdateModel(model, _prefix(prefix), includeProperties, excludeProperties);
-            }
-
-            public void AddModelError(string key, LocalizedString errorMessage) {
-                Thunk.ModelState.AddModelError(_prefix(key), errorMessage.ToString());
-            }
-        }
-
         public ActionResult Edit(string id) {
             if (!Services.Authorizer.Authorize(Permissions.CreateContentTypes, T("Not allowed to edit a content type.")))
                 return new HttpUnauthorizedResult();
@@ -106,36 +73,57 @@ namespace Orchard.ContentTypes.Controllers {
 
             var viewModel = new EditTypeViewModel(contentTypeDefinition);
             viewModel.Parts = viewModel.Parts.ToArray();
-
             viewModel.Templates = _extendViewModels.TypeEditor(contentTypeDefinition);
+
             var entries = viewModel.Parts.Join(contentTypeDefinition.Parts,
-                m => m.PartDefinition.Name,
-                                                  d => d.PartDefinition.Name,
-                                                  (model, definition) => new { model, definition });
+                                               m => m.PartDefinition.Name,
+                                               d => d.PartDefinition.Name,
+                                               (model, definition) => new {model, definition});
             foreach (var entry in entries) {
+                entry.model.PartDefinition.Fields = entry.model.PartDefinition.Fields.ToArray();
                 entry.model.Templates = _extendViewModels.TypePartEditor(entry.definition);
+
+                var fields = entry.model.PartDefinition.Fields.Join(entry.definition.PartDefinition.Fields,
+                                   m => m.FieldDefinition.Name,
+                                   d => d.FieldDefinition.Name,
+                                   (model, definition) => new { model, definition });
+
+                foreach (var field in fields) {
+                    field.model.Templates = _extendViewModels.PartFieldEditor(field.definition);
+                }
             }
 
+
+            //Oy, this action is getting massive :(
+            //todo: put this action on a diet
+            var contentPartDefinition = _contentDefinitionService.GetPartDefinition(id);
+            if (contentPartDefinition != null) {
+                viewModel.Fields = viewModel.Fields.ToArray();
+                var fields = viewModel.Fields.Join(contentPartDefinition.Fields,
+                                    m => m.FieldDefinition.Name,
+                                    d => d.FieldDefinition.Name,
+                                    (model, definition) => new { model, definition });
+
+                foreach (var field in fields) {
+                    field.model.Templates = _extendViewModels.PartFieldEditor(field.definition);
+                }
+            }
+            
             return View(viewModel);
         }
 
         [HttpPost, ActionName("Edit")]
-        public ActionResult EditPOST(string id) {
+        public ActionResult EditPOST(EditTypeViewModel viewModel) {
             if (!Services.Authorizer.Authorize(Permissions.CreateContentTypes, T("Not allowed to edit a content type.")))
                 return new HttpUnauthorizedResult();
 
-            var contentTypeDefinition = _contentDefinitionService.GetTypeDefinition(id);
+            var contentTypeDefinition = _contentDefinitionService.GetTypeDefinition(viewModel.Name);
 
             if (contentTypeDefinition == null)
                 return new NotFoundResult();
 
-            var updater = new Updater { Thunk = this };
-
-            var viewModel = new EditTypeViewModel();
-            TryUpdateModel(viewModel);
-
-
-            _contentDefinitionManager.AlterTypeDefinition(id, typeBuilder => {
+            var updater = new Updater(this);
+            _contentDefinitionManager.AlterTypeDefinition(viewModel.Name, typeBuilder => {
 
                 typeBuilder.DisplayedAs(viewModel.DisplayName);
 
@@ -146,6 +134,7 @@ namespace Orchard.ContentTypes.Controllers {
                     var partViewModel = entry.part;
 
                     // enable updater to be aware of changing part prefix
+                    // todo: stick this info on the view model so the strings don't need to be in code & view
                     var firstHalf = "Parts[" + entry.index + "].";
                     updater._prefix = secondHalf => firstHalf + secondHalf;
 
@@ -153,66 +142,102 @@ namespace Orchard.ContentTypes.Controllers {
                     typeBuilder.WithPart(entry.part.PartDefinition.Name, typePartBuilder => {
                         partViewModel.Templates = _extendViewModels.TypePartEditorUpdate(typePartBuilder, updater);
                     });
+
+                    if (!partViewModel.PartDefinition.Fields.Any())
+                        continue;
+
+                    _contentDefinitionManager.AlterPartDefinition(partViewModel.PartDefinition.Name, partBuilder => {
+                        foreach (var fieldEntry in partViewModel.PartDefinition.Fields.Select((field, index) => new { field, index })) {
+                            partViewModel.PartDefinition.Fields = partViewModel.PartDefinition.Fields.ToArray();
+                            var fieldViewModel = fieldEntry.field;
+
+                            // enable updater to be aware of changing field prefix
+                            var firstHalfFieldName = firstHalf + "PartDefinition.Fields[" + fieldEntry.index + "].";
+                            updater._prefix = secondHalf => firstHalfFieldName + secondHalf;
+
+                            // allow extensions to alter partField configuration
+                            partBuilder.WithField(fieldViewModel.Name, partFieldBuilder => {
+                                fieldViewModel.Templates = _extendViewModels.PartFieldEditorUpdate(partFieldBuilder, updater);
+                            });
+                        }
+                    });
+                }
+
+                if (viewModel.Fields.Any()) {
+                    _contentDefinitionManager.AlterPartDefinition(viewModel.Name, partBuilder => {
+                        viewModel.Fields = viewModel.Fields.ToArray();
+                        foreach (var fieldEntry in viewModel.Fields.Select((field, index) => new { field, index })) {
+                            var fieldViewModel = fieldEntry.field;
+
+                            // enable updater to be aware of changing field prefix
+                            var firstHalfFieldName = "Fields[" + fieldEntry.index + "].";
+                            updater._prefix = secondHalf => firstHalfFieldName + secondHalf;
+
+                            // allow extensions to alter partField configuration
+                            partBuilder.WithField(fieldViewModel.Name, partFieldBuilder => {
+                                fieldViewModel.Templates = _extendViewModels.PartFieldEditorUpdate(partFieldBuilder, updater);
+                            });
+                        }
+                    });
                 }
             });
 
-
             if (!ModelState.IsValid) {
-                _transactionManager.Cancel();
+                Services.TransactionManager.Cancel();
                 return View(viewModel);
             }
 
-            //var contentTypeDefinitionParts = viewModel.Parts.Select(GenerateTypePart).ToList();
-            //if (viewModel.Fields.Any())
-            //    contentTypeDefinitionParts.Add(GenerateTypePart(viewModel));
-
-            ////todo: apply the changes along the lines of but definately not resembling
-            //// for now this _might_ just get a little messy -> 
-            //_contentDefinitionService.AlterTypeDefinition(
-            //    new ContentTypeDefinition(
-            //        viewModel.Name,
-            //        viewModel.DisplayName,
-            //        contentTypeDefinitionParts,
-            //        viewModel.Settings
-            //        )
-            //    );
+            Services.Notifier.Information(T("\"{0}\" settings have been saved.", viewModel.DisplayName));
 
             return RedirectToAction("Index");
         }
 
-        private static ContentTypeDefinition.Part GenerateTypePart(EditTypePartViewModel viewModel) {
-            return new ContentTypeDefinition.Part(
-                new ContentPartDefinition(
-                    viewModel.PartDefinition.Name,
-                    viewModel.PartDefinition.Fields.Select(
-                        f => new ContentPartDefinition.Field(
-                                 new ContentFieldDefinition(f.FieldDefinition.Name),
-                                 f.Name,
-                                 f.Settings
-                                 )
-                        ),
-                    viewModel.PartDefinition.Settings
-                    ),
-                viewModel.Settings
-                );
+        public ActionResult AddPartsTo(string id) {
+            if (!Services.Authorizer.Authorize(Permissions.CreateContentTypes, T("Not allowed to edit a content type.")))
+                return new HttpUnauthorizedResult();
+
+            var contentTypeDefinition = _contentDefinitionService.GetTypeDefinition(id);
+
+            if (contentTypeDefinition == null)
+                return new NotFoundResult();
+
+            var viewModel = new AddPartsViewModel {
+                Type = new EditTypeViewModel(contentTypeDefinition),
+                PartSelections = _contentDefinitionService.GetPartDefinitions()
+                    .Where(cpd => !contentTypeDefinition.Parts.Any(p => p.PartDefinition.Name == cpd.Name))
+                    .Select(cpd => new PartSelectionViewModel {PartName = cpd.Name})
+            };
+
+            return View(viewModel);
         }
 
-        private static ContentTypeDefinition.Part GenerateTypePart(EditTypeViewModel viewModel) {
-            return new ContentTypeDefinition.Part(
-                new ContentPartDefinition(
-                    viewModel.Name,
-                    viewModel.Fields.Select(
-                        f => new ContentPartDefinition.Field(
-                                 new ContentFieldDefinition(f.FieldDefinition.Name),
-                                 f.Name,
-                                 f.Settings
-                                 )
-                        ),
-                    null
-                    ),
-                null
-                );
+        [HttpPost, ActionName("AddPartsTo")]
+        public ActionResult AddPartsToPOST(string id) {
+            if (!Services.Authorizer.Authorize(Permissions.CreateContentTypes, T("Not allowed to edit a content type.")))
+                return new HttpUnauthorizedResult();
+
+            var contentTypeDefinition = _contentDefinitionService.GetTypeDefinition(id);
+
+            if (contentTypeDefinition == null)
+                return new NotFoundResult();
+
+            var viewModel = new AddPartsViewModel();
+            TryUpdateModel(viewModel);
+
+            if (!ModelState.IsValid) {
+                viewModel.Type = new EditTypeViewModel(contentTypeDefinition);
+                return View(viewModel);
+            }
+
+            _contentDefinitionManager.AlterTypeDefinition(contentTypeDefinition.Name, typeBuilder => {
+                var partsToAdd = viewModel.PartSelections.Where(ps => ps.IsSelected).Select(ps => ps.PartName);
+                foreach (var partToAdd in partsToAdd)
+                    typeBuilder.WithPart(partToAdd);
+            });
+
+            return RedirectToAction("Edit", new {id});
         }
+
         #endregion
 
         #region Parts
@@ -226,28 +251,33 @@ namespace Orchard.ContentTypes.Controllers {
             if (contentPartDefinition == null)
                 return new NotFoundResult();
 
-            return View(new EditPartViewModel(contentPartDefinition));
+            var viewModel = new EditPartViewModel(contentPartDefinition) {
+                Templates = _extendViewModels.PartEditor(contentPartDefinition)
+            };
+
+            return View(viewModel);
         }
 
         [HttpPost, ActionName("EditPart")]
-        public ActionResult EditPartPOST(string id) {
+        public ActionResult EditPartPOST(EditPartViewModel viewModel) {
             if (!Services.Authorizer.Authorize(Permissions.CreateContentTypes, T("Not allowed to edit a part.")))
                 return new HttpUnauthorizedResult();
 
-            var contentPartDefinition = _contentDefinitionService.GetPartDefinition(id);
+            var contentPartDefinition = _contentDefinitionService.GetPartDefinition(viewModel.Name);
 
             if (contentPartDefinition == null)
                 return new NotFoundResult();
 
-            var viewModel = new EditPartViewModel();
-            TryUpdateModel(viewModel);
+            var updater = new Updater(this);
+            _contentDefinitionManager.AlterPartDefinition(viewModel.Name, partBuilder => {
+                // allow extensions to alter part configuration
+                viewModel.Templates = _extendViewModels.PartEditorUpdate(partBuilder, updater);
+            });
 
-            if (!ModelState.IsValid)
-                return EditPart(id);
-
-            //todo: apply the changes along the lines of but definately not resembling
-            // for now this _might_ just get a little messy -> 
-            _contentDefinitionService.AlterPartDefinition(GeneratePart(viewModel));
+            if (!ModelState.IsValid) {
+                Services.TransactionManager.Cancel();
+                return View(viewModel);
+            }
 
             return RedirectToAction("Index");
         }
@@ -313,27 +343,33 @@ namespace Orchard.ContentTypes.Controllers {
             contentPartFields.Add(new ContentPartDefinition.Field(new ContentFieldDefinition(viewModel.FieldTypeName), viewModel.DisplayName, null));
             _contentDefinitionService.AlterPartDefinition(new ContentPartDefinition(contentPartDefinition.Name, contentPartFields, contentPartDefinition.Settings));
 
+            Services.Notifier.Information(T("The \"{0}\" field has been added.", viewModel.DisplayName));
+
             if (contentTypeDefinition != null)
                 return RedirectToAction("Edit", new { id });
 
             return RedirectToAction("EditPart", new { id });
         }
 
-        private static ContentPartDefinition GeneratePart(EditPartViewModel viewModel) {
-            return new ContentPartDefinition(
-                viewModel.Name,
-                viewModel.Fields.Select(
-                    f => new ContentPartDefinition.Field(
-                             new ContentFieldDefinition(f.FieldDefinition.Name),
-                             f.Name,
-                             f.Settings
-                             )
-                    ),
-                viewModel.Settings
-                );
-        }
-
         #endregion
 
+        class Updater : IUpdateModel {
+            private readonly AdminController _thunk;
+
+            public Updater(AdminController thunk) {
+                _thunk = thunk;
+            }
+
+            public Func<string, string> _prefix = x => x;
+
+            public bool TryUpdateModel<TModel>(TModel model, string prefix, string[] includeProperties, string[] excludeProperties) where TModel : class {
+                return _thunk.TryUpdateModel(model, _prefix(prefix), includeProperties, excludeProperties);
+            }
+
+            public void AddModelError(string key, LocalizedString errorMessage) {
+                _thunk.ModelState.AddModelError(_prefix(key), errorMessage.ToString());
+            }
+        }
+
     }
 }
diff --git a/src/Orchard.Web/Modules/Orchard.ContentTypes/Orchard.ContentTypes.csproj b/src/Orchard.Web/Modules/Orchard.ContentTypes/Orchard.ContentTypes.csproj
index 77e7c5269..5cbef0319 100644
--- a/src/Orchard.Web/Modules/Orchard.ContentTypes/Orchard.ContentTypes.csproj
+++ b/src/Orchard.Web/Modules/Orchard.ContentTypes/Orchard.ContentTypes.csproj
@@ -70,6 +70,7 @@
   </ItemGroup>
   <ItemGroup>
     <Compile Include="AdminMenu.cs" />
+    <Compile Include="ViewModels\AddPartsViewModel.cs" />
     <Compile Include="Controllers\AdminController.cs" />
     <Compile Include="Permissions.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
@@ -85,6 +86,7 @@
     <Content Include="Module.txt" />
     <Content Include="Styles\admin.css" />
     <Content Include="Views\Admin\AddFieldTo.ascx" />
+    <Content Include="Views\Admin\AddPartsTo.ascx" />
     <Content Include="Views\Admin\Create.ascx" />
     <Content Include="Views\Admin\EditPart.ascx" />
     <Content Include="Views\Admin\Edit.ascx" />
diff --git a/src/Orchard.Web/Modules/Orchard.ContentTypes/Services/ContentDefinitionService.cs b/src/Orchard.Web/Modules/Orchard.ContentTypes/Services/ContentDefinitionService.cs
index 5b1eb378f..374bc0a6e 100644
--- a/src/Orchard.Web/Modules/Orchard.ContentTypes/Services/ContentDefinitionService.cs
+++ b/src/Orchard.Web/Modules/Orchard.ContentTypes/Services/ContentDefinitionService.cs
@@ -31,23 +31,21 @@ namespace Orchard.ContentTypes.Services {
             return _contentDefinitionManager.GetTypeDefinition(name);
         }
 
-        public void AddTypeDefinition(ContentTypeDefinition contentTypeDefinition) {
-            var typeName = string.IsNullOrWhiteSpace(contentTypeDefinition.Name)
-                ? GenerateTypeName(contentTypeDefinition.DisplayName)
-                : contentTypeDefinition.Name;
+        public void AddTypeDefinition(string displayName) {
+            var name = GenerateTypeName(displayName);
 
-            while (_contentDefinitionManager.GetTypeDefinition(typeName) != null)
-                typeName = VersionTypeName(typeName);
+            while (_contentDefinitionManager.GetTypeDefinition(name) != null)
+                name = VersionTypeName(name);
 
             //just giving the new type some default parts for now
+            _contentDefinitionManager.StoreTypeDefinition(new ContentTypeDefinition(name) {DisplayName = displayName});
             _contentDefinitionManager.AlterTypeDefinition(
-                typeName,
-                cfg => cfg.DisplayedAs(contentTypeDefinition.DisplayName)
-                           .WithPart("CommonAspect")
+                name,
+                cfg => cfg.WithPart("CommonAspect")
                            //.WithPart("RoutableAspect") //need to go the new routable route
                            .WithPart("BodyAspect"));
              
-            Services.Notifier.Information(T("Created content type: {0}", contentTypeDefinition.DisplayName));
+            Services.Notifier.Information(T("The \"{0}\" content type has created.", displayName));
         }
 
         public void AlterTypeDefinition(ContentTypeDefinition contentTypeDefinition) {
@@ -63,6 +61,11 @@ namespace Orchard.ContentTypes.Services {
             throw new NotImplementedException();
         }
 
+        public IEnumerable<ContentPartDefinition> GetPartDefinitions() {
+            var typeNames = GetTypeDefinitions().Select(ctd => ctd.Name);
+            return _contentDefinitionManager.ListPartDefinitions().Where(cpd => !typeNames.Contains(cpd.Name));
+        }
+
         public ContentPartDefinition GetPartDefinition(string name) {
             return _contentDefinitionManager.GetPartDefinition(name);
         }
diff --git a/src/Orchard.Web/Modules/Orchard.ContentTypes/Services/IContentDefinitionService.cs b/src/Orchard.Web/Modules/Orchard.ContentTypes/Services/IContentDefinitionService.cs
index 575c8fd4e..13e6e56da 100644
--- a/src/Orchard.Web/Modules/Orchard.ContentTypes/Services/IContentDefinitionService.cs
+++ b/src/Orchard.Web/Modules/Orchard.ContentTypes/Services/IContentDefinitionService.cs
@@ -6,10 +6,11 @@ namespace Orchard.ContentTypes.Services {
     public interface IContentDefinitionService : IDependency {
         IEnumerable<ContentTypeDefinition> GetTypeDefinitions();
         ContentTypeDefinition GetTypeDefinition(string name);
-        void AddTypeDefinition(ContentTypeDefinition contentTypeDefinition);
+        void AddTypeDefinition(string displayName);
         void AlterTypeDefinition(ContentTypeDefinition contentTypeDefinition);
         void RemoveTypeDefinition(string name);
 
+        IEnumerable<ContentPartDefinition> GetPartDefinitions();
         ContentPartDefinition GetPartDefinition(string name);
         void AddPartDefinition(ContentPartDefinition contentPartDefinition);
         void AlterPartDefinition(ContentPartDefinition contentPartDefinition);
diff --git a/src/Orchard.Web/Modules/Orchard.ContentTypes/ViewModels/AddPartsViewModel.cs b/src/Orchard.Web/Modules/Orchard.ContentTypes/ViewModels/AddPartsViewModel.cs
new file mode 100644
index 000000000..cf4e4e945
--- /dev/null
+++ b/src/Orchard.Web/Modules/Orchard.ContentTypes/ViewModels/AddPartsViewModel.cs
@@ -0,0 +1,18 @@
+using System.Collections.Generic;
+using Orchard.Mvc.ViewModels;
+
+namespace Orchard.ContentTypes.ViewModels {
+    public class AddPartsViewModel : BaseViewModel {
+        public AddPartsViewModel() {
+            PartSelections = new List<PartSelectionViewModel>();
+        }
+
+        public EditTypeViewModel Type { get; set; }
+        public IEnumerable<PartSelectionViewModel> PartSelections { get; set; }
+    }
+
+    public class PartSelectionViewModel {
+        public string PartName { get; set; }
+        public bool IsSelected { get; set; }
+    }
+}
diff --git a/src/Orchard.Web/Modules/Orchard.ContentTypes/ViewModels/EditTypeViewModel.cs b/src/Orchard.Web/Modules/Orchard.ContentTypes/ViewModels/EditTypeViewModel.cs
index 89203c4aa..f912eb7f1 100644
--- a/src/Orchard.Web/Modules/Orchard.ContentTypes/ViewModels/EditTypeViewModel.cs
+++ b/src/Orchard.Web/Modules/Orchard.ContentTypes/ViewModels/EditTypeViewModel.cs
@@ -66,6 +66,7 @@ namespace Orchard.ContentTypes.ViewModels {
         }
 
         public string Name { get; set; }
+        public IEnumerable<TemplateViewModel> Templates { get; set; }
         public IEnumerable<EditPartFieldViewModel> Fields { get; set; }
         public SettingsDictionary Settings { get; set; }
     }
@@ -81,6 +82,7 @@ namespace Orchard.ContentTypes.ViewModels {
         }
 
         public string Name { get; set; }
+        public IEnumerable<TemplateViewModel> Templates { get; set; }
         public EditFieldViewModel FieldDefinition { get; set; }
         public SettingsDictionary Settings { get; set; }
     }
diff --git a/src/Orchard.Web/Modules/Orchard.ContentTypes/Views/Admin/AddFieldTo.ascx b/src/Orchard.Web/Modules/Orchard.ContentTypes/Views/Admin/AddFieldTo.ascx
index df62568da..8436c27fd 100644
--- a/src/Orchard.Web/Modules/Orchard.ContentTypes/Views/Admin/AddFieldTo.ascx
+++ b/src/Orchard.Web/Modules/Orchard.ContentTypes/Views/Admin/AddFieldTo.ascx
@@ -1,7 +1,7 @@
 <%@ Control Language="C#" Inherits="Orchard.Mvc.ViewUserControl<Orchard.ContentTypes.ViewModels.AddFieldViewModel>" %>
 <%
 Html.RegisterStyle("admin.css"); %>
-<h1><%:Html.TitleForPage(T("Add a new field to {0}", Model.Part.Name).ToString())%></h1><%
+<h1><%:Html.TitleForPage(T("Add a new field to \"{0}\"", Model.Part.Name).ToString())%></h1><%
 using (Html.BeginFormAntiForgeryPost()) { %>
     <%:Html.ValidationSummary() %>
     <fieldset>
diff --git a/src/Orchard.Web/Modules/Orchard.ContentTypes/Views/Admin/AddPartsTo.ascx b/src/Orchard.Web/Modules/Orchard.ContentTypes/Views/Admin/AddPartsTo.ascx
new file mode 100644
index 000000000..7f70491e7
--- /dev/null
+++ b/src/Orchard.Web/Modules/Orchard.ContentTypes/Views/Admin/AddPartsTo.ascx
@@ -0,0 +1,25 @@
+<%@ Control Language="C#" Inherits="Orchard.Mvc.ViewUserControl<Orchard.ContentTypes.ViewModels.AddPartsViewModel>" %>
+<%
+Html.RegisterStyle("admin.css"); %>
+<h1><%:Html.TitleForPage(T("Add parts to \"{0}\"", Model.Type.DisplayName).ToString())%></h1><%
+using (Html.BeginFormAntiForgeryPost()) { %>
+    <%:Html.ValidationSummary() %>
+    <fieldset>
+        <%:Html.UnorderedList(
+            Model.PartSelections,
+            (partSelection, i) => {
+                var fieldNameStart = "PartSelections[" + i + "].";
+                return MvcHtmlString.Create(
+                    string.Format(
+                        "{0} <label for=\"{1}\" class=\"forcheckbox\">{2}</label>{3}",
+                        Html.CheckBox(fieldNameStart + "IsSelected"),
+                        fieldNameStart + "IsSelected",
+                        partSelection.PartName,
+                        Html.Hidden(fieldNameStart + "PartName", partSelection.PartName)));
+            },
+            "available-parts")%>
+    </fieldset>
+    <fieldset>
+        <button class="primaryAction" type="submit"><%:T("Save") %></button>
+    </fieldset><%
+} %>
diff --git a/src/Orchard.Web/Modules/Orchard.ContentTypes/Views/Admin/Edit.ascx b/src/Orchard.Web/Modules/Orchard.ContentTypes/Views/Admin/Edit.ascx
index 13f50be98..e438597b9 100644
--- a/src/Orchard.Web/Modules/Orchard.ContentTypes/Views/Admin/Edit.ascx
+++ b/src/Orchard.Web/Modules/Orchard.ContentTypes/Views/Admin/Edit.ascx
@@ -14,7 +14,7 @@ using (Html.BeginFormAntiForgeryPost()) { %>
     </fieldset>
     <% Html.RenderTemplates(Model.Templates); %>
     <h2><%:T("Parts") %></h2>
-    <div class="manage add-to-type"><%: Html.ActionLink(T("Add").Text, "AddPart", new { }, new { @class = "button" }) %></div>
+    <div class="manage add-to-type"><%: Html.ActionLink(T("Add").Text, "AddPartsTo", new { area = "Orchard.ContentTypes", id = Model.Name }, new { @class = "button" })%></div>
     <%:Html.EditorFor(m => m.Parts, "Parts", "") %>
     <h2><%:T("Fields") %></h2>
     <div class="manage add-to-type"><%: Html.ActionLink(T("Add").Text, "AddFieldTo", new { area = "Orchard.ContentTypes", id = Model.Name }, new { @class = "button" }) %></div>
diff --git a/src/Orchard.Web/Modules/Orchard.ContentTypes/Views/Admin/EditPart.ascx b/src/Orchard.Web/Modules/Orchard.ContentTypes/Views/Admin/EditPart.ascx
index 34901350b..c79f8fc14 100644
--- a/src/Orchard.Web/Modules/Orchard.ContentTypes/Views/Admin/EditPart.ascx
+++ b/src/Orchard.Web/Modules/Orchard.ContentTypes/Views/Admin/EditPart.ascx
@@ -9,7 +9,7 @@ using (Html.BeginFormAntiForgeryPost()) { %>
         <%--// has unintended consequences (renamging the part) - changing the name creates a new part of that name--%>
         <%:Html.TextBoxFor(m => m.Name, new {@class = "textMedium"}) %>
     </fieldset>
-    <%:Html.EditorFor(m => m.Settings, "Settings", "") %>
+    <% Html.RenderTemplates(Model.Templates); %>
     <h2><%:T("Fields") %></h2>
     <div class="manage add-to-type"><%: Html.ActionLink(T("Add").Text, "AddFieldTo", new { area = "Orchard.ContentTypes", id = Model.Name }, new { @class = "button" }) %></div>
     <%:Html.EditorFor(m => m.Fields, "Fields", "") %>
diff --git a/src/Orchard.Web/Modules/Orchard.ContentTypes/Views/EditorTemplates/Field.ascx b/src/Orchard.Web/Modules/Orchard.ContentTypes/Views/EditorTemplates/Field.ascx
index fba1ccaf2..af061a2a1 100644
--- a/src/Orchard.Web/Modules/Orchard.ContentTypes/Views/EditorTemplates/Field.ascx
+++ b/src/Orchard.Web/Modules/Orchard.ContentTypes/Views/EditorTemplates/Field.ascx
@@ -10,7 +10,7 @@
             <button type="submit" title="<%:T("Remove") %>"><%:T("Remove") %></button>
         <% } %> --%>
         </div>
-        <%:Html.EditorFor(m => m.Settings, "Settings", "") %>
+        <% Html.RenderTemplates(Model.Templates); %>
         <%:Html.HiddenFor(m => m.Name) %>
         <%:Html.HiddenFor(m => m.FieldDefinition.Name) %>
     </fieldset>
\ No newline at end of file
diff --git a/src/Orchard.Web/Modules/Orchard.ContentTypes/Views/EditorTemplates/Part.ascx b/src/Orchard.Web/Modules/Orchard.ContentTypes/Views/EditorTemplates/Part.ascx
index c66916f20..78cb2e201 100644
--- a/src/Orchard.Web/Modules/Orchard.ContentTypes/Views/EditorTemplates/Part.ascx
+++ b/src/Orchard.Web/Modules/Orchard.ContentTypes/Views/EditorTemplates/Part.ascx
@@ -15,6 +15,6 @@
         <h4><%:T("Global configuration") %></h4>
         <div class="manage minor"><%:Html.ActionLink(T("Edit").Text, "EditPart", new { area = "Orchard.ContentTypes", id = Model.PartDefinition.Name }) %></div>
         <%:Html.DisplayFor(m => m.PartDefinition.Settings, "Settings", "PartDefinition") %>
-        <%:Html.DisplayFor(m => m.PartDefinition.Fields, "Fields") %>
+        <%:Html.EditorFor(m => m.PartDefinition.Fields, "Fields", "PartDefinition") %>
         <%:Html.Hidden("PartDefinition.Name", Model.PartDefinition.Name) %>
     </fieldset>
\ No newline at end of file
diff --git a/src/Orchard.Web/Modules/Orchard.Indexing/DataMigrations/IndexingDataMigration.cs b/src/Orchard.Web/Modules/Orchard.Indexing/DataMigrations/IndexingDataMigration.cs
new file mode 100644
index 000000000..c1c11bd9d
--- /dev/null
+++ b/src/Orchard.Web/Modules/Orchard.Indexing/DataMigrations/IndexingDataMigration.cs
@@ -0,0 +1,19 @@
+using System;
+using Orchard.Data.Migration;
+
+namespace Orchard.Indexing.DataMigrations {
+    public class IndexingDataMigration : DataMigrationImpl {
+
+        public int Create() {
+
+            SchemaBuilder.CreateTable("IndexingTaskRecord", table => table
+                .Column<int>("Id", column => column.PrimaryKey())
+                .Column<int>("Action")
+                .Column<DateTime>("CreatedUtc")
+                .Column<int>("ContentItemRecord_id")
+                );
+
+            return 0010;
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/Orchard.Web/Modules/Orchard.Indexing/Orchard.Indexing.csproj b/src/Orchard.Web/Modules/Orchard.Indexing/Orchard.Indexing.csproj
index 179e2bb84..ccc3e3f4d 100644
--- a/src/Orchard.Web/Modules/Orchard.Indexing/Orchard.Indexing.csproj
+++ b/src/Orchard.Web/Modules/Orchard.Indexing/Orchard.Indexing.csproj
@@ -56,12 +56,15 @@
   <ItemGroup>
     <Content Include="Module.txt" />
     <Content Include="Views\Admin\Index.ascx" />
+    <Content Include="Views\DefinitionTemplates\FieldIndexing.ascx" />
+    <Content Include="Views\DefinitionTemplates\TypeIndexing.ascx" />
     <Content Include="Web.config" />
   </ItemGroup>
   <ItemGroup>
     <Compile Include="AdminMenu.cs" />
     <Compile Include="Commands\IndexingCommands.cs" />
     <Compile Include="Controllers\AdminController.cs" />
+    <Compile Include="DataMigrations\IndexingDataMigration.cs" />
     <Compile Include="Handlers\CreateIndexingTaskHandler.cs" />
     <Compile Include="Models\IndexingTask.cs" />
     <Compile Include="Models\IndexingTaskRecord.cs" />
@@ -77,6 +80,9 @@
     <Compile Include="Models\LuceneSearchHit.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
     <Compile Include="Services\IndexService.cs" />
+    <Compile Include="Settings\EditorEvents.cs" />
+    <Compile Include="Settings\FieldIndexing.cs" />
+    <Compile Include="Settings\TypeIndexing.cs" />
     <Compile Include="ViewModels\IndexViewModel.cs" />
   </ItemGroup>
   <ItemGroup>
diff --git a/src/Orchard.Web/Modules/Orchard.Indexing/Services/IndexingTaskExecutor.cs b/src/Orchard.Web/Modules/Orchard.Indexing/Services/IndexingTaskExecutor.cs
index 27e48f6bd..2bc384b61 100644
--- a/src/Orchard.Web/Modules/Orchard.Indexing/Services/IndexingTaskExecutor.cs
+++ b/src/Orchard.Web/Modules/Orchard.Indexing/Services/IndexingTaskExecutor.cs
@@ -5,6 +5,7 @@ using JetBrains.Annotations;
 using Orchard.ContentManagement;
 using Orchard.Data;
 using Orchard.Indexing.Models;
+using Orchard.Indexing.Settings;
 using Orchard.Logging;
 using Orchard.Services;
 using Orchard.Tasks.Indexing;
@@ -23,7 +24,7 @@ namespace Orchard.Indexing.Services {
         private readonly IContentManager _contentManager;
         private readonly IIndexSynLock _indexSynLock;
         private const string SearchIndexName = "Search";
-        
+
         public IndexingTaskExecutor(
             IClock clock,
             IRepository<IndexingTaskRecord> repository,
@@ -45,7 +46,7 @@ namespace Orchard.Indexing.Services {
         public void UpdateIndex(string indexName) {
             var synLock = _indexSynLock.GetSynLock(SearchIndexName);
 
-            if ( !System.Threading.Monitor.TryEnter(synLock) ) {
+            if (!System.Threading.Monitor.TryEnter(synLock)) {
                 Logger.Information("Index was requested but was already running");
                 return;
             }
@@ -70,10 +71,15 @@ namespace Orchard.Indexing.Services {
                     // get every existing content item to index it
                     foreach (var contentItem in _contentManager.Query(VersionOptions.Published).List()) {
                         try {
-                            var documentIndex =  _indexProvider.New(contentItem.Id);
+                            // skip items which are not indexed
+                            var settings = GetTypeIndexingSettings(contentItem);
+                            if (!settings.Included)
+                                continue;
+
+                            var documentIndex = _indexProvider.New(contentItem.Id);
 
                             _contentManager.Index(contentItem, documentIndex);
-                            if(documentIndex.IsDirty) {
+                            if (documentIndex.IsDirty) {
                                 updateIndexDocuments.Add(documentIndex);
                             }
                         }
@@ -91,8 +97,10 @@ namespace Orchard.Indexing.Services {
                 _indexProvider.SetLastIndexUtc(SearchIndexName, _clock.UtcNow);
 
                 // retrieve not yet processed tasks
-                var taskRecords = _repository.Fetch(x => x.CreatedUtc > lastIndexing)
-                    .ToArray();
+                var taskRecords = lastIndexing == DateTime.MinValue
+                    ? _repository.Fetch(x => true).ToArray()
+                    : _repository.Fetch(x => x.CreatedUtc > lastIndexing).ToArray();
+
 
                 // nothing to do ?
                 if (taskRecords.Length + updateIndexDocuments.Count == 0)
@@ -116,11 +124,15 @@ namespace Orchard.Indexing.Services {
                 foreach (var taskRecord in taskRecords.Where(t => t.Action == IndexingTaskRecord.Update)) {
                     var task = new IndexingTask(_contentManager, taskRecord);
 
+                    // skip items which are not indexed
+                    var settings = GetTypeIndexingSettings(task.ContentItem);
+                    if (!settings.Included)
+                        continue;
+
                     try {
                         var documentIndex = _indexProvider.New(task.ContentItem.Id);
-
                         _contentManager.Index(task.ContentItem, documentIndex);
-                        if ( documentIndex.IsDirty ) {
+                        if (documentIndex.IsDirty) {
                             updateIndexDocuments.Add(documentIndex);
                         }
 
@@ -143,5 +155,14 @@ namespace Orchard.Indexing.Services {
                 System.Threading.Monitor.Exit(synLock);
             }
         }
+
+        static TypeIndexing GetTypeIndexingSettings(ContentItem contentItem) {
+            if (contentItem == null ||
+                contentItem.TypeDefinition == null ||
+                contentItem.TypeDefinition.Settings == null) {
+                return new TypeIndexing { Included = false };
+            }
+            return contentItem.TypeDefinition.Settings.GetModel<TypeIndexing>();
+        }
     }
 }
diff --git a/src/Orchard.Web/Modules/Orchard.Indexing/Services/LuceneIndexProvider.cs b/src/Orchard.Web/Modules/Orchard.Indexing/Services/LuceneIndexProvider.cs
index e2271a8ec..0333687fb 100644
--- a/src/Orchard.Web/Modules/Orchard.Indexing/Services/LuceneIndexProvider.cs
+++ b/src/Orchard.Web/Modules/Orchard.Indexing/Services/LuceneIndexProvider.cs
@@ -6,6 +6,7 @@ using Lucene.Net.Analysis;
 using Lucene.Net.Analysis.Standard;
 using Lucene.Net.Documents;
 using Lucene.Net.Index;
+using Lucene.Net.Search;
 using Lucene.Net.Store;
 using Orchard.Environment.Configuration;
 using Orchard.FileSystems.AppData;
@@ -141,13 +142,18 @@ namespace Orchard.Indexing.Services {
                 return;
             }
 
+            // Remove any previous document for these content items
+            Delete(indexName, indexDocuments.Select(i => i.ContentItemId));
+
             var writer = new IndexWriter(GetDirectory(indexName), _analyzer, false, IndexWriter.MaxFieldLength.UNLIMITED);
             LuceneDocumentIndex current = null;
 
             try {
+
                 foreach ( var indexDocument in indexDocuments ) {
                     current = indexDocument;
                     var doc = CreateDocument(indexDocument);
+                    
                     writer.AddDocument(doc);
                     Logger.Debug("Document [{0}] indexed", indexDocument.ContentItemId);
                 }
@@ -166,30 +172,28 @@ namespace Orchard.Indexing.Services {
         }
 
         public void Delete(string indexName, IEnumerable<int> documentIds) {
-            if ( documentIds.AsQueryable().Count() == 0 ) {
+            if (!documentIds.Any()) {
                 return;
             }
-            
-            var reader = IndexReader.Open(GetDirectory(indexName), false);
+
+            var writer = new IndexWriter(GetDirectory(indexName), _analyzer, false, IndexWriter.MaxFieldLength.UNLIMITED);
 
             try {
-                foreach (var id in documentIds) {
-                    try {
-                        var term = new Term("id", id.ToString());
-                        if (reader.DeleteDocuments(term) != 0) {
-                            Logger.Error("The document [{0}] could not be removed from the index [{1}]", id, indexName);
-                        }
-                        else {
-                            Logger.Debug("Document [{0}] removed from index", id);
-                        }
-                    }
-                    catch (Exception ex) {
-                        Logger.Error(ex, "An unexpected error occured while removing the document [{0}] from the index [{1}].", id, indexName);
+                var query = new BooleanQuery();
+
+                try {
+                    foreach (var id in documentIds) {
+                        query.Add(new BooleanClause(new TermQuery(new Term("id", id.ToString())), BooleanClause.Occur.SHOULD));
                     }
+
+                    writer.DeleteDocuments(query);
+                }
+                catch (Exception ex) {
+                    Logger.Error(ex, "An unexpected error occured while removing the documents [{0}] from the index [{1}].", String.Join(", ", documentIds), indexName);
                 }
             }
             finally {
-                reader.Close();
+                writer.Close();
             }
         }
 
diff --git a/src/Orchard.Web/Modules/Orchard.Indexing/Settings/EditorEvents.cs b/src/Orchard.Web/Modules/Orchard.Indexing/Settings/EditorEvents.cs
new file mode 100644
index 000000000..6ffd62caf
--- /dev/null
+++ b/src/Orchard.Web/Modules/Orchard.Indexing/Settings/EditorEvents.cs
@@ -0,0 +1,34 @@
+using System.Collections.Generic;
+using Orchard.ContentManagement;
+using Orchard.ContentManagement.MetaData;
+using Orchard.ContentManagement.MetaData.Builders;
+using Orchard.ContentManagement.MetaData.Models;
+using Orchard.ContentManagement.ViewModels;
+
+namespace Orchard.Indexing.Settings {
+    public class EditorEvents : ContentDefinitionEditorEventsBase {
+        public override IEnumerable<TemplateViewModel> TypeEditor(ContentTypeDefinition definition) {
+            var model = definition.Settings.GetModel<TypeIndexing>();
+            yield return DefinitionTemplate(model);
+        }
+
+        public override IEnumerable<TemplateViewModel> TypeEditorUpdate(ContentTypeDefinitionBuilder builder, IUpdateModel updateModel) {
+            var model = new TypeIndexing();
+            updateModel.TryUpdateModel(model, "TypeIndexing", null, null);
+            builder.WithSetting("TypeIndexing.Included", model.Included ? true.ToString() : null);
+            yield return DefinitionTemplate(model);
+        }
+
+        public override IEnumerable<TemplateViewModel> PartFieldEditor(ContentPartDefinition.Field definition) {
+            var model = definition.Settings.GetModel<FieldIndexing>();
+            yield return DefinitionTemplate(model);
+        }
+
+        public override IEnumerable<TemplateViewModel> PartFieldEditorUpdate(ContentPartDefinitionBuilder.FieldConfigurer builder, IUpdateModel updateModel) {
+            var model = new FieldIndexing();
+            updateModel.TryUpdateModel(model, "FieldIndexing", null, null);
+            builder.WithSetting("FieldIndexing.Included", model.Included ? true.ToString() : null);
+            yield return DefinitionTemplate(model);
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/Orchard.Web/Modules/Orchard.Indexing/Settings/FieldIndexing.cs b/src/Orchard.Web/Modules/Orchard.Indexing/Settings/FieldIndexing.cs
new file mode 100644
index 000000000..5d8c6783a
--- /dev/null
+++ b/src/Orchard.Web/Modules/Orchard.Indexing/Settings/FieldIndexing.cs
@@ -0,0 +1,5 @@
+namespace Orchard.Indexing.Settings {
+    public class FieldIndexing {
+        public bool Included { get; set; }
+    }
+}
diff --git a/src/Orchard.Web/Modules/Orchard.Indexing/Settings/TypeIndexing.cs b/src/Orchard.Web/Modules/Orchard.Indexing/Settings/TypeIndexing.cs
new file mode 100644
index 000000000..45e90a4e7
--- /dev/null
+++ b/src/Orchard.Web/Modules/Orchard.Indexing/Settings/TypeIndexing.cs
@@ -0,0 +1,5 @@
+namespace Orchard.Indexing.Settings {
+    public class TypeIndexing {
+        public bool Included { get; set; }
+    }
+}
diff --git a/src/Orchard.Web/Modules/Orchard.Indexing/Views/DefinitionTemplates/FieldIndexing.ascx b/src/Orchard.Web/Modules/Orchard.Indexing/Views/DefinitionTemplates/FieldIndexing.ascx
new file mode 100644
index 000000000..2f4404622
--- /dev/null
+++ b/src/Orchard.Web/Modules/Orchard.Indexing/Views/DefinitionTemplates/FieldIndexing.ascx
@@ -0,0 +1,7 @@
+<%@ Control Language="C#" Inherits="Orchard.Mvc.ViewUserControl<Orchard.Indexing.Settings.FieldIndexing>" %>
+<%@ Import Namespace="Orchard.Mvc.Html" %>
+<fieldset>
+    <%:Html.EditorFor(m=>m.Included) %>
+    <label for="<%:Html.FieldIdFor(m => m.Included) %>" class="forcheckbox"><%:T("Include in the index") %></label>
+    <%:Html.ValidationMessageFor(m => m.Included)%>
+</fieldset>
diff --git a/src/Orchard.Web/Modules/Orchard.Indexing/Views/DefinitionTemplates/TypeIndexing.ascx b/src/Orchard.Web/Modules/Orchard.Indexing/Views/DefinitionTemplates/TypeIndexing.ascx
new file mode 100644
index 000000000..2dc8a7721
--- /dev/null
+++ b/src/Orchard.Web/Modules/Orchard.Indexing/Views/DefinitionTemplates/TypeIndexing.ascx
@@ -0,0 +1,7 @@
+<%@ Control Language="C#" Inherits="Orchard.Mvc.ViewUserControl<Orchard.Indexing.Settings.TypeIndexing>" %>
+<%@ Import Namespace="Orchard.Mvc.Html" %>
+<fieldset>
+    <%:Html.EditorFor(m=>m.Included) %>
+    <label for="<%:Html.FieldIdFor(m => m.Included) %>" class="forcheckbox"><%:T("Index this content type for search") %></label>
+    <%:Html.ValidationMessageFor(m=>m.Included) %>
+</fieldset>
diff --git a/src/Orchard.Web/Modules/Orchard.Media/DataMigrations/MediaDataMigration.cs b/src/Orchard.Web/Modules/Orchard.Media/DataMigrations/MediaDataMigration.cs
new file mode 100644
index 000000000..e46870480
--- /dev/null
+++ b/src/Orchard.Web/Modules/Orchard.Media/DataMigrations/MediaDataMigration.cs
@@ -0,0 +1,16 @@
+using Orchard.Data.Migration;
+
+namespace Orchard.Media.DataMigrations {
+    public class MediaDataMigration : DataMigrationImpl {
+
+        public int Create() {
+            //CREATE TABLE Orchard_Media_MediaSettingsRecord (Id INTEGER not null, RootMediaFolder TEXT, primary key (Id));
+            SchemaBuilder.CreateTable("MediaSettingsRecord", table => table
+                .Column<int>("Id", column => column.PrimaryKey())
+                .Column<string>("RootMediaFolder")
+                );
+
+            return 0010;
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/Orchard.Web/Modules/Orchard.Media/Orchard.Media.csproj b/src/Orchard.Web/Modules/Orchard.Media/Orchard.Media.csproj
index 88f02adab..778f23a1c 100644
--- a/src/Orchard.Web/Modules/Orchard.Media/Orchard.Media.csproj
+++ b/src/Orchard.Web/Modules/Orchard.Media/Orchard.Media.csproj
@@ -71,6 +71,7 @@
   <ItemGroup>
     <Compile Include="AdminMenu.cs" />
     <Compile Include="Controllers\AdminController.cs" />
+    <Compile Include="DataMigrations\MediaDataMigration.cs" />
     <Compile Include="Helpers\MediaHelpers.cs" />
     <Compile Include="Models\MediaSettings.cs" />
     <Compile Include="Handlers\MediaSettingsHandler.cs" />
diff --git a/src/Orchard.Web/Modules/Orchard.Roles/DataMigrations/RolesDataMigration.cs b/src/Orchard.Web/Modules/Orchard.Roles/DataMigrations/RolesDataMigration.cs
new file mode 100644
index 000000000..9a676640e
--- /dev/null
+++ b/src/Orchard.Web/Modules/Orchard.Roles/DataMigrations/RolesDataMigration.cs
@@ -0,0 +1,39 @@
+using Orchard.Data.Migration;
+
+namespace Orchard.Roles.DataMigrations {
+    public class RolesDataMigration : DataMigrationImpl {
+
+        public int Create() {
+            //CREATE TABLE Orchard_Roles_PermissionRecord (Id  integer, Name TEXT, ModuleName TEXT, Description TEXT, primary key (Id));
+            SchemaBuilder.CreateTable("PermissionRecord", table => table
+                .Column<int>("Id", column => column.PrimaryKey())
+                .Column<string>("Name")
+                .Column<string>("ModuleName")
+                .Column<string>("Description")
+                );
+
+            //CREATE TABLE Orchard_Roles_RoleRecord (Id  integer, Name TEXT, primary key (Id));
+            SchemaBuilder.CreateTable("RoleRecord", table => table
+                .Column<int>("Id", column => column.PrimaryKey())
+                .Column<string>("Name")
+                );
+
+            //CREATE TABLE Orchard_Roles_RolesPermissionsRecord (Id  integer, Role_id INTEGER, Permission_id INTEGER, RoleRecord_Id INTEGER, primary key (Id));
+            SchemaBuilder.CreateTable("RolesPermissionsRecord", table => table
+                .Column<int>("Id", column => column.PrimaryKey())
+                .Column<int>("Role_id")
+                .Column<int>("Permission_id")
+                .Column<int>("RoleRecord_Id")
+                );
+
+            //CREATE TABLE Orchard_Roles_UserRolesRecord (Id  integer, UserId INTEGER, Role_id INTEGER, primary key (Id));
+            SchemaBuilder.CreateTable("UserRolesRecord", table => table
+                .Column<int>("Id", column => column.PrimaryKey())
+                .Column<int>("UserId")
+                .Column<int>("Role_id")
+                );
+
+            return 0010;
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/Orchard.Web/Modules/Orchard.Roles/Orchard.Roles.csproj b/src/Orchard.Web/Modules/Orchard.Roles/Orchard.Roles.csproj
index 671501046..4a61ae7a5 100644
--- a/src/Orchard.Web/Modules/Orchard.Roles/Orchard.Roles.csproj
+++ b/src/Orchard.Web/Modules/Orchard.Roles/Orchard.Roles.csproj
@@ -67,6 +67,7 @@
   <ItemGroup>
     <Compile Include="AdminMenu.cs" />
     <Compile Include="Controllers\AdminController.cs" />
+    <Compile Include="DataMigrations\RolesDataMigration.cs" />
     <Compile Include="Drivers\UserRolesDriver.cs" />
     <Compile Include="DefaultRoleUpdater.cs" />
     <Compile Include="Models\IUserRoles.cs" />
diff --git a/src/Orchard.Web/Modules/Orchard.Sandbox/DataMigrations/SandBoxDataMigration.cs b/src/Orchard.Web/Modules/Orchard.Sandbox/DataMigrations/SandBoxDataMigration.cs
new file mode 100644
index 000000000..88a9aafce
--- /dev/null
+++ b/src/Orchard.Web/Modules/Orchard.Sandbox/DataMigrations/SandBoxDataMigration.cs
@@ -0,0 +1,20 @@
+using Orchard.Data.Migration;
+
+namespace Orchard.Sandbox.DataMigrations {
+    public class SandboxDataMigration : DataMigrationImpl {
+
+        public int Create() {
+            SchemaBuilder.CreateTable("SandboxPageRecord", table => table
+                .Column<int>("Id", column => column.PrimaryKey())
+                .Column<string>("Name")
+                );
+
+            SchemaBuilder.CreateTable("SandboxSettingsRecord", table => table
+                .Column<int>("Id", column => column.PrimaryKey())
+                .Column<bool>("AllowAnonymousEdits")
+                );
+
+            return 0010;
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/Orchard.Web/Modules/Orchard.Sandbox/Orchard.Sandbox.csproj b/src/Orchard.Web/Modules/Orchard.Sandbox/Orchard.Sandbox.csproj
index 54b613b8f..9588858fa 100644
--- a/src/Orchard.Web/Modules/Orchard.Sandbox/Orchard.Sandbox.csproj
+++ b/src/Orchard.Web/Modules/Orchard.Sandbox/Orchard.Sandbox.csproj
@@ -67,6 +67,7 @@
   <ItemGroup>
     <Compile Include="Controllers\HomeController.cs" />
     <Compile Include="Controllers\PageController.cs" />
+    <Compile Include="DataMigrations\SandBoxDataMigration.cs" />
     <Compile Include="Drivers\SandboxPageDriver.cs" />
     <Compile Include="Models\SandboxPage.cs" />
     <Compile Include="Handlers\SandboxContentHandler.cs" />
diff --git a/src/Orchard.Web/Modules/Orchard.Search/DataMigrations/SearchDataMigration.cs b/src/Orchard.Web/Modules/Orchard.Search/DataMigrations/SearchDataMigration.cs
new file mode 100644
index 000000000..7c53b4e43
--- /dev/null
+++ b/src/Orchard.Web/Modules/Orchard.Search/DataMigrations/SearchDataMigration.cs
@@ -0,0 +1,17 @@
+using Orchard.Data.Migration;
+
+namespace Orchard.Search.DataMigrations {
+    public class SearchDataMigration : DataMigrationImpl {
+
+        public int Create() {
+
+            SchemaBuilder.CreateTable("SearchSettingsRecord", table => table
+                .Column<int>("Id", column => column.PrimaryKey())
+                .Column<bool>("FilterCulture")
+                .Column<string>("SearchedFields")
+                );
+
+            return 0010;
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/Orchard.Web/Modules/Orchard.Search/Orchard.Search.csproj b/src/Orchard.Web/Modules/Orchard.Search/Orchard.Search.csproj
index 725a6ece2..c99916558 100644
--- a/src/Orchard.Web/Modules/Orchard.Search/Orchard.Search.csproj
+++ b/src/Orchard.Web/Modules/Orchard.Search/Orchard.Search.csproj
@@ -66,6 +66,7 @@
   </ItemGroup>
   <ItemGroup>
     <Compile Include="Controllers\SearchController.cs" />
+    <Compile Include="DataMigrations\SearchDataMigration.cs" />
     <Compile Include="Filters\SearchFilter.cs" />
     <Compile Include="Models\SearchSettings.cs" />
     <Compile Include="Models\SearchSettingsRecord.cs" />
diff --git a/src/Orchard.Web/Modules/Orchard.Setup/Controllers/SetupController.cs b/src/Orchard.Web/Modules/Orchard.Setup/Controllers/SetupController.cs
index 31cee37f2..c5af9b15b 100644
--- a/src/Orchard.Web/Modules/Orchard.Setup/Controllers/SetupController.cs
+++ b/src/Orchard.Web/Modules/Orchard.Setup/Controllers/SetupController.cs
@@ -45,6 +45,10 @@ namespace Orchard.Setup.Controllers {
             if (!model.DatabaseOptions && string.IsNullOrEmpty(model.DatabaseConnectionString))
                 ModelState.AddModelError("DatabaseConnectionString", "A SQL connection string is required");
 
+            if (!String.IsNullOrWhiteSpace(model.ConfirmPassword) && model.AdminPassword != model.ConfirmPassword ) {
+                ModelState.AddModelError("ConfirmPassword", T("Password confirmation must match").ToString());
+            }
+
             if (!ModelState.IsValid) {
                 return IndexViewResult(model);
             }
diff --git a/src/Orchard.Web/Modules/Orchard.Setup/Orchard.Setup.csproj b/src/Orchard.Web/Modules/Orchard.Setup/Orchard.Setup.csproj
index 47e1b5f1d..0c789a699 100644
--- a/src/Orchard.Web/Modules/Orchard.Setup/Orchard.Setup.csproj
+++ b/src/Orchard.Web/Modules/Orchard.Setup/Orchard.Setup.csproj
@@ -43,6 +43,7 @@
       <SpecificVersion>False</SpecificVersion>
       <HintPath>..\..\..\..\lib\autofac\Autofac.dll</HintPath>
     </Reference>
+    <Reference Include="NHibernate, Version=2.1.2.4000, Culture=neutral, PublicKeyToken=aa95f207798dfdb4, processorArchitecture=MSIL" />
     <Reference Include="System" />
     <Reference Include="System.Data" />
     <Reference Include="System.ComponentModel.DataAnnotations">
diff --git a/src/Orchard.Web/Modules/Orchard.Setup/Services/SetupService.cs b/src/Orchard.Web/Modules/Orchard.Setup/Services/SetupService.cs
index 01d642d17..089dca490 100644
--- a/src/Orchard.Web/Modules/Orchard.Setup/Services/SetupService.cs
+++ b/src/Orchard.Web/Modules/Orchard.Setup/Services/SetupService.cs
@@ -5,9 +5,13 @@ using Orchard.Comments.Models;
 using Orchard.ContentManagement;
 using Orchard.ContentManagement.MetaData;
 using Orchard.Core.Common.Models;
+using Orchard.Core.Common.Settings;
 using Orchard.Core.Navigation.Models;
 using Orchard.Core.Settings.Models;
 using Orchard.Data;
+using Orchard.Data.Migration.Interpreters;
+using Orchard.Data.Providers;
+using Orchard.Data.Migration.Schema;
 using Orchard.Environment;
 using Orchard.Environment.Configuration;
 using Orchard.Environment.ShellBuilders;
@@ -19,6 +23,8 @@ using Orchard.Security;
 using Orchard.Settings;
 using Orchard.Themes;
 using Orchard.UI.Notify;
+using Orchard.Environment.State;
+using Orchard.Data.Migration;
 
 namespace Orchard.Setup.Services {
     public class SetupService : ISetupService {
@@ -27,6 +33,7 @@ namespace Orchard.Setup.Services {
         private readonly IShellSettingsManager _shellSettingsManager;
         private readonly IShellContainerFactory _shellContainerFactory;
         private readonly ICompositionStrategy _compositionStrategy;
+        private readonly IProcessingEngine _processingEngine;
 
         public SetupService(
             ShellSettings shellSettings,
@@ -34,12 +41,14 @@ namespace Orchard.Setup.Services {
             IOrchardHost orchardHost,
             IShellSettingsManager shellSettingsManager,
             IShellContainerFactory shellContainerFactory,
-            ICompositionStrategy compositionStrategy) {
+            ICompositionStrategy compositionStrategy,
+            IProcessingEngine processingEngine) {
             _shellSettings = shellSettings;
             _orchardHost = orchardHost;
             _shellSettingsManager = shellSettingsManager;
             _shellContainerFactory = shellContainerFactory;
             _compositionStrategy = compositionStrategy;
+            _processingEngine = processingEngine;
             T = NullLocalizer.Instance;
         }
 
@@ -97,7 +106,17 @@ namespace Orchard.Setup.Services {
             // initialize database explicitly, and store shell descriptor
             var bootstrapLifetimeScope = _shellContainerFactory.CreateContainer(shellSettings, shellToplogy);
             using (var environment = new StandaloneEnvironment(bootstrapLifetimeScope)) {
-                environment.Resolve<ISessionFactoryHolder>().CreateDatabase();
+
+                var schemaBuilder = new SchemaBuilder(environment.Resolve<IDataMigrationInterpreter>() );
+
+                schemaBuilder.CreateTable("Orchard_Framework_DataMigrationRecord", table => table
+                    .Column<int>("Id", column => column.PrimaryKey())
+                    .Column<string>("DataMigrationClass")
+                    .Column<int>("Current"));
+
+                var dataMigrationManager = environment.Resolve<IDataMigrationManager>();
+                dataMigrationManager.Update("Orchard.Framework");
+                dataMigrationManager.Update("Settings");
 
                 environment.Resolve<IShellDescriptorManager>().UpdateShellDescriptor(
                     0,
@@ -105,6 +124,10 @@ namespace Orchard.Setup.Services {
                     shellDescriptor.Parameters);
             }
 
+            // in effect "pump messages" see PostMessage circa 1980
+            while ( _processingEngine.AreTasksPending() )
+                _processingEngine.ExecuteNextTask();
+
 
             // creating a standalone environment. 
             // in theory this environment can be used to resolve any normal components by interface, and those
@@ -150,6 +173,7 @@ namespace Orchard.Setup.Services {
                     contentDefinitionManager.AlterTypeDefinition("BlogPost", cfg => cfg.DisplayedAs("Blog Post").WithPart("HasComments").WithPart("HasTags").WithPart("Localized"));
                     contentDefinitionManager.AlterTypeDefinition("Page", cfg => cfg.DisplayedAs("Page").WithPart("HasComments").WithPart("HasTags").WithPart("Localized"));
                     contentDefinitionManager.AlterTypeDefinition("SandboxPage", cfg => cfg.DisplayedAs("Sandbox Page").WithPart("HasComments").WithPart("HasTags").WithPart("Localized"));
+                    contentDefinitionManager.AlterPartDefinition("BodyAspect", cfg => cfg.WithSetting("BodyPartSettings.FlavorDefault", BodyPartSettings.FlavorDefaultDefault));
 
                     // create home page as a CMS page
                     var page = contentManager.Create("Page", VersionOptions.Draft);
diff --git a/src/Orchard.Web/Modules/Orchard.Setup/SetupMode.cs b/src/Orchard.Web/Modules/Orchard.Setup/SetupMode.cs
index 4c27ad19d..98844455d 100644
--- a/src/Orchard.Web/Modules/Orchard.Setup/SetupMode.cs
+++ b/src/Orchard.Web/Modules/Orchard.Setup/SetupMode.cs
@@ -8,7 +8,9 @@ using Orchard.Commands.Builtin;
 using Orchard.ContentManagement;
 using Orchard.ContentManagement.Handlers;
 using Orchard.ContentManagement.MetaData.Builders;
+using Orchard.Data.Migration.Interpreters;
 using Orchard.Data.Providers;
+using Orchard.Data.Migration;
 using Orchard.Environment.Extensions;
 using Orchard.Localization;
 using Orchard.Mvc;
@@ -16,6 +18,7 @@ using Orchard.Mvc.Filters;
 using Orchard.Mvc.ModelBinders;
 using Orchard.Mvc.Routes;
 using Orchard.Mvc.ViewEngines;
+using Orchard.Mvc.ViewEngines.WebForms;
 using Orchard.Settings;
 using Orchard.Setup.Commands;
 using Orchard.Themes;
@@ -33,7 +36,7 @@ namespace Orchard.Setup {
             builder.RegisterModule(new CommandModule());
             builder.RegisterType<RoutePublisher>().As<IRoutePublisher>().InstancePerLifetimeScope();
             builder.RegisterType<ModelBinderPublisher>().As<IModelBinderPublisher>().InstancePerLifetimeScope();
-            builder.RegisterType<WebFormsViewEngineProvider>().As<IViewEngineProvider>().InstancePerLifetimeScope();
+            builder.RegisterType<WebFormViewEngineProvider>().As<IViewEngineProvider>().InstancePerLifetimeScope();
             builder.RegisterType<ViewEngineFilter>().As<IFilterProvider>().InstancePerLifetimeScope();
             builder.RegisterType<ThemeFilter>().As<IFilterProvider>().InstancePerLifetimeScope();
             builder.RegisterType<PageTitleBuilder>().As<IPageTitleBuilder>().InstancePerLifetimeScope();
@@ -50,6 +53,9 @@ namespace Orchard.Setup {
             builder.RegisterType<SafeModeText>().As<IText>().InstancePerLifetimeScope();
             builder.RegisterType<SafeModeSiteService>().As<ISiteService>().InstancePerLifetimeScope();
 
+            builder.RegisterType<DefaultDataMigrationInterpreter>().As<IDataMigrationInterpreter>().InstancePerLifetimeScope();
+            builder.RegisterType<DataMigrationManager>().As<IDataMigrationManager>().InstancePerLifetimeScope();
+
         }
 
 
diff --git a/src/Orchard.Web/Modules/Orchard.Setup/ViewModels/SetupViewModel.cs b/src/Orchard.Web/Modules/Orchard.Setup/ViewModels/SetupViewModel.cs
index 086aebf52..05bc8a8bb 100644
--- a/src/Orchard.Web/Modules/Orchard.Setup/ViewModels/SetupViewModel.cs
+++ b/src/Orchard.Web/Modules/Orchard.Setup/ViewModels/SetupViewModel.cs
@@ -14,6 +14,8 @@ namespace Orchard.Setup.ViewModels {
         public string AdminUsername { get; set; }
         [Required(ErrorMessage = "Password is required."), StringLengthMin(6, ErrorMessage = "Password must be longer than 6 characters."), StringLength(50, ErrorMessage = "Password can be no longer than 50 characters.")]
         public string AdminPassword { get; set; }
+        [Required(ErrorMessage = "Password confirmation is required.")]
+        public string ConfirmPassword { get; set; }
         public bool DatabaseOptions { get; set; }
         [SqlDatabaseConnectionString]
         public string DatabaseConnectionString { get; set; }
diff --git a/src/Orchard.Web/Modules/Orchard.Setup/Views/Setup/Index.ascx b/src/Orchard.Web/Modules/Orchard.Setup/Views/Setup/Index.ascx
index 7db91a3c0..8f6195891 100644
--- a/src/Orchard.Web/Modules/Orchard.Setup/Views/Setup/Index.ascx
+++ b/src/Orchard.Web/Modules/Orchard.Setup/Views/Setup/Index.ascx
@@ -18,6 +18,10 @@ using (Html.BeginFormAntiForgeryPost()) { %>
         <label for="AdminPassword"><%: T("Choose a password:") %></label>
         <%: Html.PasswordFor(svm => svm.AdminPassword) %>
     </div>
+    <div>
+        <label for="ConfirmAdminPassword"><%: T("Confirm the password:") %></label>
+        <%: Html.PasswordFor(svm => svm.ConfirmPassword)%>
+    </div>
 </fieldset><%
 if (!Model.DatabaseIsPreconfigured) { %>
 <fieldset class="data">
diff --git a/src/Orchard.Web/Modules/Orchard.Tags/DataMigrations/TagsDataMigration.cs b/src/Orchard.Web/Modules/Orchard.Tags/DataMigrations/TagsDataMigration.cs
new file mode 100644
index 000000000..a0d1d6c6e
--- /dev/null
+++ b/src/Orchard.Web/Modules/Orchard.Tags/DataMigrations/TagsDataMigration.cs
@@ -0,0 +1,23 @@
+using Orchard.Data.Migration;
+
+namespace Orchard.Tags.DataMigrations {
+    public class TagsDataMigration : DataMigrationImpl {
+
+        public int Create() {
+            //CREATE TABLE Orchard_Tags_Tag (Id  integer, TagName TEXT, primary key (Id));
+            SchemaBuilder.CreateTable("Tag", table => table
+                .Column<int>("Id", column => column.PrimaryKey())
+                .Column<string>("TagName")
+                );
+
+            //CREATE TABLE Orchard_Tags_TagsContentItems (Id  integer, TagId INTEGER, ContentItemId INTEGER, primary key (Id));
+            SchemaBuilder.CreateTable("TagsContentItems", table => table
+                .Column<int>("Id", column => column.PrimaryKey())
+                .Column<int>("TagId")
+                .Column<int>("ContentItemId")
+                );
+
+            return 0010;
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/Orchard.Web/Modules/Orchard.Tags/Orchard.Tags.csproj b/src/Orchard.Web/Modules/Orchard.Tags/Orchard.Tags.csproj
index 2c93a394a..a698e74a8 100644
--- a/src/Orchard.Web/Modules/Orchard.Tags/Orchard.Tags.csproj
+++ b/src/Orchard.Web/Modules/Orchard.Tags/Orchard.Tags.csproj
@@ -67,6 +67,7 @@
   <ItemGroup>
     <Compile Include="AdminMenu.cs" />
     <Compile Include="Controllers\AdminController.cs" />
+    <Compile Include="DataMigrations\TagsDataMigration.cs" />
     <Compile Include="Models\TagsContentItems.cs" />
     <Compile Include="Services\ITagService.cs" />
     <Compile Include="ViewModels\EditTagsViewModel.cs" />
diff --git a/src/Orchard.Web/Modules/Orchard.Themes/DataMigrations/ThemesDataMigration.cs b/src/Orchard.Web/Modules/Orchard.Themes/DataMigrations/ThemesDataMigration.cs
new file mode 100644
index 000000000..1b79ca51b
--- /dev/null
+++ b/src/Orchard.Web/Modules/Orchard.Themes/DataMigrations/ThemesDataMigration.cs
@@ -0,0 +1,28 @@
+using Orchard.Data.Migration;
+
+namespace Orchard.Themes.DataMigrations {
+    public class ThemesDataMigration : DataMigrationImpl {
+
+        public int Create() {
+            //CREATE TABLE Orchard_Themes_ThemeRecord (Id INTEGER not null, ThemeName TEXT, DisplayName TEXT, Description TEXT, Version TEXT, Author TEXT, HomePage TEXT, Tags TEXT, primary key (Id));
+            SchemaBuilder.CreateTable("ThemeRecord", table => table
+                .Column<int>("Id", column => column.PrimaryKey())
+                .Column<string>("ThemeName")
+                .Column<string>("DisplayName")
+                .Column<string>("Description")
+                .Column<string>("Version")
+                .Column<string>("Author")
+                .Column<string>("HomePage")
+                .Column<string>("Tags")
+                );
+
+            //CREATE TABLE Orchard_Themes_ThemeSiteSettingsRecord (Id INTEGER not null, CurrentThemeName TEXT, primary key (Id));
+            SchemaBuilder.CreateTable("ThemeSiteSettingsRecord", table => table
+                .Column<int>("Id", column => column.PrimaryKey())
+                .Column<string>("CurrentThemeName")
+                );
+
+            return 0010;
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/Orchard.Web/Modules/Orchard.Themes/Orchard.Themes.csproj b/src/Orchard.Web/Modules/Orchard.Themes/Orchard.Themes.csproj
index 2d78f2c16..dea0eb979 100644
--- a/src/Orchard.Web/Modules/Orchard.Themes/Orchard.Themes.csproj
+++ b/src/Orchard.Web/Modules/Orchard.Themes/Orchard.Themes.csproj
@@ -67,6 +67,7 @@
   <ItemGroup>
     <Compile Include="AdminMenu.cs" />
     <Compile Include="Controllers\AdminController.cs" />
+    <Compile Include="DataMigrations\ThemesDataMigration.cs" />
     <Compile Include="DesignerNotes\ZoneManagerEvents.cs" />
     <Compile Include="Handlers\ThemeSiteSettingsHandler.cs" />
     <Compile Include="Models\Theme.cs" />
diff --git a/src/Orchard.Web/Modules/Orchard.Users/DataMigrations/UsersDataMigration.cs b/src/Orchard.Web/Modules/Orchard.Users/DataMigrations/UsersDataMigration.cs
new file mode 100644
index 000000000..d6a00bfeb
--- /dev/null
+++ b/src/Orchard.Web/Modules/Orchard.Users/DataMigrations/UsersDataMigration.cs
@@ -0,0 +1,22 @@
+using Orchard.Data.Migration;
+using Orchard.Data.Migration;
+
+namespace Orchard.Users.DataMigrations {
+    public class UsersDataMigration : DataMigrationImpl {
+
+        public int Create() {
+            //CREATE TABLE Orchard_Users_UserRecord (Id INTEGER not null, UserName TEXT, Email TEXT, NormalizedUserName TEXT, Password TEXT, PasswordFormat TEXT, PasswordSalt TEXT, primary key (Id));
+            SchemaBuilder.CreateTable("UserRecord", table => table
+                .Column<int>("Id", column => column.PrimaryKey())
+                .Column<string>("UserName")
+                .Column<string>("Email")
+                .Column<string>("NormalizedUserName")
+                .Column<string>("Password")
+                .Column<string>("PasswordFormat")
+                .Column<string>("PasswordSalt")
+                );
+
+            return 0010;
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/Orchard.Web/Modules/Orchard.Users/Orchard.Users.csproj b/src/Orchard.Web/Modules/Orchard.Users/Orchard.Users.csproj
index 747a36978..99b6fe9bb 100644
--- a/src/Orchard.Web/Modules/Orchard.Users/Orchard.Users.csproj
+++ b/src/Orchard.Web/Modules/Orchard.Users/Orchard.Users.csproj
@@ -67,6 +67,7 @@
   <ItemGroup>
     <Compile Include="Controllers\AccountController.cs" />
     <Compile Include="Controllers\AdminController.cs" />
+    <Compile Include="DataMigrations\UsersDataMigration.cs" />
     <Compile Include="Drivers\UserDriver.cs" />
     <Compile Include="Models\User.cs" />
     <Compile Include="Handlers\UserHandler.cs" />
diff --git a/src/Orchard/ContentManagement/ContentField.cs b/src/Orchard/ContentManagement/ContentField.cs
index d557c121c..3d3486ac5 100644
--- a/src/Orchard/ContentManagement/ContentField.cs
+++ b/src/Orchard/ContentManagement/ContentField.cs
@@ -1,4 +1,5 @@
 using System;
+using Orchard.ContentManagement.FieldStorage;
 using Orchard.ContentManagement.MetaData.Models;
 
 namespace Orchard.ContentManagement {
@@ -8,7 +9,6 @@ namespace Orchard.ContentManagement {
         public ContentPartDefinition.Field PartFieldDefinition { get; set; }
         public ContentFieldDefinition FieldDefinition { get { return PartFieldDefinition.FieldDefinition; } }
 
-        public Func<string, string> Getter { get; set; }
-        public Action<string, string> Setter { get; set; }
+        public IFieldStorage Storage { protected get; set; }
     }
 }
diff --git a/src/Orchard/ContentManagement/ContentPart.cs b/src/Orchard/ContentManagement/ContentPart.cs
index 47e3d903c..76f90f8eb 100644
--- a/src/Orchard/ContentManagement/ContentPart.cs
+++ b/src/Orchard/ContentManagement/ContentPart.cs
@@ -16,6 +16,7 @@ namespace Orchard.ContentManagement {
         public ContentTypeDefinition TypeDefinition { get { return ContentItem.TypeDefinition; } }
         public ContentTypeDefinition.Part TypePartDefinition { get; set; }
         public ContentPartDefinition PartDefinition { get { return TypePartDefinition.PartDefinition; } }
+        public SettingsDictionary Settings { get { return TypePartDefinition.Settings; } }
 
         public IEnumerable<ContentField> Fields { get { return _fields; } }
 
diff --git a/src/Orchard/ContentManagement/DataMigrations/FrameworkDataMigration.cs b/src/Orchard/ContentManagement/DataMigrations/FrameworkDataMigration.cs
new file mode 100644
index 000000000..3e0ebeabc
--- /dev/null
+++ b/src/Orchard/ContentManagement/DataMigrations/FrameworkDataMigration.cs
@@ -0,0 +1,41 @@
+using Orchard.Data.Migration;
+using Orchard.Data.Migration;
+using Orchard.Environment.Extensions.Models;
+
+namespace Orchard.ContentManagement.DataMigrations {
+    public class FrameworkDataMigration : DataMigrationImpl {
+
+        public int Create() {
+            //CREATE TABLE Orchard_Framework_ContentItemRecord (Id  integer, Data TEXT, ContentType_id INTEGER, primary key (Id));
+            SchemaBuilder.CreateTable("ContentItemRecord", table => table
+                .Column<int>("Id", column => column.PrimaryKey())
+                .Column<string>("Data")
+                .Column<int>("ContentType_id")
+                );
+
+            //CREATE TABLE Orchard_Framework_ContentItemVersionRecord (Id  integer, Number INTEGER, Published INTEGER, Latest INTEGER, Data TEXT, ContentItemRecord_id INTEGER, primary key (Id));
+            SchemaBuilder.CreateTable("ContentItemVersionRecord", table => table
+                .Column<int>("Id", column => column.PrimaryKey())
+                .Column<int>("Number")
+                .Column<bool>("Published")
+                .Column<bool>("Latest")
+                .Column<string>("Data")
+                .Column<int>("ContentItemRecord_id")
+                );
+
+            //CREATE TABLE Orchard_Framework_ContentTypeRecord (Id  integer, Name TEXT, primary key (Id));
+            SchemaBuilder.CreateTable("ContentTypeRecord", table => table
+                .Column<int>("Id", column => column.PrimaryKey())
+                .Column<string>("Name")
+                );
+
+            //CREATE TABLE Orchard_Framework_CultureRecord (Id  integer, Culture TEXT, primary key (Id));
+            SchemaBuilder.CreateTable("CultureRecord", table => table
+                .Column<int>("Id", column => column.PrimaryKey())
+                .Column<string>("Culture")
+                );
+
+            return 0010;
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/Orchard/ContentManagement/Drivers/ContentFieldDriver.cs b/src/Orchard/ContentManagement/Drivers/ContentFieldDriver.cs
index 64139d934..9e98216be 100644
--- a/src/Orchard/ContentManagement/Drivers/ContentFieldDriver.cs
+++ b/src/Orchard/ContentManagement/Drivers/ContentFieldDriver.cs
@@ -34,8 +34,7 @@ namespace Orchard.ContentManagement.Drivers {
                     FieldTypeName = typeof (TField).Name,
                     Factory = (partFieldDefinition, storage) => new TField {
                         PartFieldDefinition = partFieldDefinition,
-                        Getter = storage.Getter,
-                        Setter = storage.Setter,
+                        Storage = storage,
                     }
                 }
             };
diff --git a/src/Orchard/ContentManagement/FieldStorage/IFieldStorage.cs b/src/Orchard/ContentManagement/FieldStorage/IFieldStorage.cs
index 9a5a6edf4..cc82db104 100644
--- a/src/Orchard/ContentManagement/FieldStorage/IFieldStorage.cs
+++ b/src/Orchard/ContentManagement/FieldStorage/IFieldStorage.cs
@@ -2,7 +2,15 @@
 
 namespace Orchard.ContentManagement.FieldStorage {
     public interface IFieldStorage {
-        Func<string, string> Getter { get; }
-        Action<string, string> Setter { get; }
+        T Get<T>(string name);
+        void Set<T>(string name, T value);
+    }
+    public static class FieldStorageExtension{
+        public static T Get<T>(this IFieldStorage storage) {
+            return storage.Get<T>(null);
+        }
+        public static void Set<T>(this IFieldStorage storage, T value) {
+            storage.Set(null, value);
+        }
     }
 }
\ No newline at end of file
diff --git a/src/Orchard/ContentManagement/FieldStorage/InfosetStorage/InfosetStorageProvider.cs b/src/Orchard/ContentManagement/FieldStorage/InfosetStorage/InfosetStorageProvider.cs
index bcff1def3..a0fb51ab9 100644
--- a/src/Orchard/ContentManagement/FieldStorage/InfosetStorage/InfosetStorageProvider.cs
+++ b/src/Orchard/ContentManagement/FieldStorage/InfosetStorage/InfosetStorageProvider.cs
@@ -1,5 +1,4 @@
-using System;
-using System.Xml;
+using System.Xml;
 using System.Xml.Linq;
 using Orchard.ContentManagement.MetaData.Models;
 
@@ -14,10 +13,9 @@ namespace Orchard.ContentManagement.FieldStorage.InfosetStorage {
             var fieldName = XmlConvert.EncodeLocalName(partFieldDefinition.Name);
             var infosetPart = contentPart.As<InfosetPart>();
 
-            return new Storage {
-                Getter = name => Get(infosetPart.Infoset.Element, partName, fieldName, name),
-                Setter = (name, value) => Set(infosetPart.Infoset.Element, partName, fieldName, name, value)
-            };
+            return new SimpleFieldStorage(
+                name => Get(infosetPart.Infoset.Element, partName, fieldName, name),
+                (name, value) => Set(infosetPart.Infoset.Element, partName, fieldName, name, value));
         }
 
         private static string Get(XElement element, string partName, string fieldName, string valueName) {
@@ -57,10 +55,5 @@ namespace Orchard.ContentManagement.FieldStorage.InfosetStorage {
                 fieldElement.SetAttributeValue(XmlConvert.EncodeLocalName(valueName), value);
             }
         }
-
-        class Storage : IFieldStorage {
-            public Func<string, string> Getter { get; set; }
-            public Action<string, string> Setter { get; set; }
-        }
     }
 }
\ No newline at end of file
diff --git a/src/Orchard/ContentManagement/FieldStorage/SimpleFieldStorage.cs b/src/Orchard/ContentManagement/FieldStorage/SimpleFieldStorage.cs
new file mode 100644
index 000000000..2897bf430
--- /dev/null
+++ b/src/Orchard/ContentManagement/FieldStorage/SimpleFieldStorage.cs
@@ -0,0 +1,25 @@
+using System;
+using System.Globalization;
+
+namespace Orchard.ContentManagement.FieldStorage {
+    public class SimpleFieldStorage : IFieldStorage {
+        public SimpleFieldStorage(Func<string, string> getter, Action<string, string> setter) {
+            Getter = getter;
+            Setter = setter;
+        }
+
+        public Func<string, string> Getter { get; set; }
+        public Action<string, string> Setter { get; set; }
+
+        public T Get<T>(string name) {
+            var value = Getter(name);
+            return string.IsNullOrEmpty(value)
+                       ? default(T)
+                       : (T)Convert.ChangeType(value, typeof(T), CultureInfo.InvariantCulture);
+        }
+
+        public void Set<T>(string name, T value) {
+            Setter(name, Convert.ToString(value, CultureInfo.InvariantCulture));
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/Orchard/ContentManagement/MetaData/Builders/ContentPartDefinitionBuilder.cs b/src/Orchard/ContentManagement/MetaData/Builders/ContentPartDefinitionBuilder.cs
index 2b7a0ad73..98f8e71cf 100644
--- a/src/Orchard/ContentManagement/MetaData/Builders/ContentPartDefinitionBuilder.cs
+++ b/src/Orchard/ContentManagement/MetaData/Builders/ContentPartDefinitionBuilder.cs
@@ -25,6 +25,8 @@ namespace Orchard.ContentManagement.MetaData.Builders {
             }
         }
 
+        public string Name { get { return _name; } }
+
         public ContentPartDefinition Build() {
             return new ContentPartDefinition(_name, _fields, _settings);
         }
diff --git a/src/Orchard/ContentManagement/MetaData/IContentDefinitionEditorEvents.cs b/src/Orchard/ContentManagement/MetaData/IContentDefinitionEditorEvents.cs
index fdcd05a87..6fea8af3b 100644
--- a/src/Orchard/ContentManagement/MetaData/IContentDefinitionEditorEvents.cs
+++ b/src/Orchard/ContentManagement/MetaData/IContentDefinitionEditorEvents.cs
@@ -9,9 +9,13 @@ namespace Orchard.ContentManagement.MetaData {
     public interface IContentDefinitionEditorEvents : IEventHandler {
         IEnumerable<TemplateViewModel> TypeEditor(ContentTypeDefinition definition);
         IEnumerable<TemplateViewModel> TypePartEditor(ContentTypeDefinition.Part definition);
+        IEnumerable<TemplateViewModel> PartEditor(ContentPartDefinition definition);
+        IEnumerable<TemplateViewModel> PartFieldEditor(ContentPartDefinition.Field definition);
 
         IEnumerable<TemplateViewModel> TypeEditorUpdate(ContentTypeDefinitionBuilder builder, IUpdateModel updateModel);
         IEnumerable<TemplateViewModel> TypePartEditorUpdate(ContentTypeDefinitionBuilder.PartConfigurer builder, IUpdateModel updateModel);
+        IEnumerable<TemplateViewModel> PartEditorUpdate(ContentPartDefinitionBuilder builder, IUpdateModel updateModel);
+        IEnumerable<TemplateViewModel> PartFieldEditorUpdate(ContentPartDefinitionBuilder.FieldConfigurer builder, IUpdateModel updateModel);
     }
 
     public abstract class ContentDefinitionEditorEventsBase : IContentDefinitionEditorEvents {
@@ -23,6 +27,14 @@ namespace Orchard.ContentManagement.MetaData {
             return Enumerable.Empty<TemplateViewModel>();
         }
 
+        public virtual IEnumerable<TemplateViewModel> PartEditor(ContentPartDefinition definition) {
+            return Enumerable.Empty<TemplateViewModel>();
+        }
+
+        public virtual IEnumerable<TemplateViewModel> PartFieldEditor(ContentPartDefinition.Field definition) {
+            return Enumerable.Empty<TemplateViewModel>();
+        }
+
         public virtual IEnumerable<TemplateViewModel> TypeEditorUpdate(ContentTypeDefinitionBuilder builder, IUpdateModel updateModel) {
             return Enumerable.Empty<TemplateViewModel>();
         }
@@ -31,6 +43,14 @@ namespace Orchard.ContentManagement.MetaData {
             return Enumerable.Empty<TemplateViewModel>();
         }
 
+        public virtual IEnumerable<TemplateViewModel> PartEditorUpdate(ContentPartDefinitionBuilder builder, IUpdateModel updateModel) {
+            return Enumerable.Empty<TemplateViewModel>();
+        }
+
+        public virtual IEnumerable<TemplateViewModel> PartFieldEditorUpdate(ContentPartDefinitionBuilder.FieldConfigurer builder, IUpdateModel updateModel) {
+            return Enumerable.Empty<TemplateViewModel>();
+        }
+
         protected static TemplateViewModel DefinitionTemplate<TModel>(TModel model) {
             return new TemplateViewModel(model, typeof(TModel).Name) {
                 TemplateName = "DefinitionTemplates/" + typeof(TModel).Name
diff --git a/src/Orchard/ContentManagement/Records/ContentItemVersionRecord.cs b/src/Orchard/ContentManagement/Records/ContentItemVersionRecord.cs
index 1eaa00875..9a7b4cf8a 100644
--- a/src/Orchard/ContentManagement/Records/ContentItemVersionRecord.cs
+++ b/src/Orchard/ContentManagement/Records/ContentItemVersionRecord.cs
@@ -1,5 +1,3 @@
-using System;
-using Orchard.ContentManagement.FieldStorage;
 using Orchard.ContentManagement.FieldStorage.InfosetStorage;
 
 namespace Orchard.ContentManagement.Records {
diff --git a/src/Orchard/DataMigration/Commands/DataMigrationCommands.cs b/src/Orchard/Data/Migration/Commands/DataMigrationCommands.cs
similarity index 93%
rename from src/Orchard/DataMigration/Commands/DataMigrationCommands.cs
rename to src/Orchard/Data/Migration/Commands/DataMigrationCommands.cs
index 2beb4a9d9..745b2fffd 100644
--- a/src/Orchard/DataMigration/Commands/DataMigrationCommands.cs
+++ b/src/Orchard/Data/Migration/Commands/DataMigrationCommands.cs
@@ -1,7 +1,7 @@
 using System;
 using Orchard.Commands;
 
-namespace Orchard.DataMigration.Commands {
+namespace Orchard.Data.Migration.Commands {
     public class DataMigrationCommands : DefaultOrchardCommandHandler {
         private readonly IDataMigrationManager _dataMigrationManager;
 
diff --git a/src/Orchard/DataMigration/DataMigration.cs b/src/Orchard/Data/Migration/DataMigration.cs
similarity index 62%
rename from src/Orchard/DataMigration/DataMigration.cs
rename to src/Orchard/Data/Migration/DataMigration.cs
index 8ae3769a7..28ddf9713 100644
--- a/src/Orchard/DataMigration/DataMigration.cs
+++ b/src/Orchard/Data/Migration/DataMigration.cs
@@ -1,11 +1,13 @@
-using Orchard.DataMigration.Schema;
+using Orchard.Data.Migration.Schema;
+using Orchard.Environment.Extensions.Models;
 
-namespace Orchard.DataMigration {
+namespace Orchard.Data.Migration {
     /// <summary>
     /// Data Migration classes can inherit from this class to get a SchemaBuilder instance configured with the current tenant database prefix
     /// </summary>
     public abstract class DataMigrationImpl : IDataMigration {
-        public abstract string Feature { get; }
         public SchemaBuilder SchemaBuilder { get; set; }
+        public virtual Feature Feature { get; set; }
+
     }
 }
diff --git a/src/Orchard/DataMigration/DataMigrationCoordinator.cs b/src/Orchard/Data/Migration/DataMigrationCoordinator.cs
similarity index 86%
rename from src/Orchard/DataMigration/DataMigrationCoordinator.cs
rename to src/Orchard/Data/Migration/DataMigrationCoordinator.cs
index a0f58ca33..bee32f62d 100644
--- a/src/Orchard/DataMigration/DataMigrationCoordinator.cs
+++ b/src/Orchard/Data/Migration/DataMigrationCoordinator.cs
@@ -1,7 +1,7 @@
 using Orchard.Environment;
 using Orchard.Environment.Extensions.Models;
 
-namespace Orchard.DataMigration {
+namespace Orchard.Data.Migration {
     /// <summary>
     /// Responsible for executing data migration tasks when a feature is enabled for the first time
     /// 1) Initial install of a module:
@@ -23,9 +23,7 @@ namespace Orchard.DataMigration {
 
         public void Install(Feature feature) {
             var featureName = feature.Descriptor.Name;
-            if ( !_dataMigrationManager.IsFeatureAlreadyInstalled(featureName) ) {
-                _dataMigrationManager.Update(featureName);
-            }
+            _dataMigrationManager.Update(featureName);
         }
 
         public void Enable(Feature feature) {
diff --git a/src/Orchard/DataMigration/DataMigrationManager.cs b/src/Orchard/Data/Migration/DataMigrationManager.cs
similarity index 90%
rename from src/Orchard/DataMigration/DataMigrationManager.cs
rename to src/Orchard/Data/Migration/DataMigrationManager.cs
index 58fdf2a17..6c258680a 100644
--- a/src/Orchard/DataMigration/DataMigrationManager.cs
+++ b/src/Orchard/Data/Migration/DataMigrationManager.cs
@@ -3,33 +3,30 @@ using System.Collections.Generic;
 using System.Linq;
 using System.Reflection;
 using System.Text.RegularExpressions;
-using Orchard.Data;
-using Orchard.DataMigration.Interpreters;
-using Orchard.DataMigration.Schema;
+using Orchard.Data.Migration.Interpreters;
+using Orchard.Data.Migration.Records;
+using Orchard.Data.Migration.Schema;
 using Orchard.Environment.Extensions;
 using Orchard.Environment.State;
 using Orchard.Logging;
 
-namespace Orchard.DataMigration {
+namespace Orchard.Data.Migration {
     /// <summary>
     /// Reponsible for maintaining the knowledge of data migration in a per tenant table
     /// </summary>
     public class DataMigrationManager : IDataMigrationManager {
         private readonly IEnumerable<IDataMigration> _dataMigrations;
         private readonly IRepository<DataMigrationRecord> _dataMigrationRepository;
-        private readonly IDataMigrationGenerator _dataMigrationGenerator;
         private readonly IExtensionManager _extensionManager;
         private readonly IDataMigrationInterpreter _interpreter;
 
         public DataMigrationManager(
             IEnumerable<IDataMigration> dataMigrations, 
             IRepository<DataMigrationRecord> dataMigrationRepository,
-            IDataMigrationGenerator dataMigrationGenerator,
             IExtensionManager extensionManager,
             IDataMigrationInterpreter interpreter) {
             _dataMigrations = dataMigrations;
             _dataMigrationRepository = dataMigrationRepository;
-            _dataMigrationGenerator = dataMigrationGenerator;
             _extensionManager = extensionManager;
             _interpreter = interpreter;
             Logger = NullLogger.Instance;
@@ -57,7 +54,7 @@ namespace Orchard.DataMigration {
                     
                     // try to resolve a Create method
                     if ( GetCreateMethod(dataMigration) != null ) {
-                        features.Add(dataMigration.Feature);
+                        features.Add(dataMigration.Feature.Descriptor.Name);
                         continue;
                     }
                 }
@@ -65,7 +62,7 @@ namespace Orchard.DataMigration {
                 var lookupTable = CreateUpgradeLookupTable(dataMigration);
 
                 if(lookupTable.ContainsKey(current)) {
-                    features.Add(dataMigration.Feature);
+                    features.Add(dataMigration.Feature.Descriptor.Name);
                 }
             }
 
@@ -80,6 +77,8 @@ namespace Orchard.DataMigration {
 
         public void Update(string feature){
             
+            Logger.Information("Updating {0}", feature);
+
             // proceed with dependent features first, whatever the module it's in
             var dependencies = ShellStateCoordinator.OrderByDependencies(_extensionManager.AvailableExtensions()
                 .SelectMany(ext => ext.Features))
@@ -115,10 +114,6 @@ namespace Orchard.DataMigration {
                     if(createMethod != null) {
                         current = (int)createMethod.Invoke(migration, new object[0]);
                     }
-                    else {
-                        var commands = _dataMigrationGenerator.CreateCommands();
-                        /// TODO: Execute commands and define current version number
-                    }
                 }
 
                 var lookupTable = CreateUpgradeLookupTable(migration);
@@ -175,7 +170,6 @@ namespace Orchard.DataMigration {
 
         }
 
-
         private DataMigrationRecord GetDataMigrationRecord(IDataMigration tempMigration) {
             return _dataMigrationRepository.Table
                 .Where(dm => dm.DataMigrationClass == tempMigration.GetType().FullName)
@@ -187,11 +181,11 @@ namespace Orchard.DataMigration {
         /// </summary>
         private IEnumerable<IDataMigration> GetDataMigrations(string feature) {
             var migrations = _dataMigrations
-                    .Where(dm => String.Equals(dm.Feature, feature, StringComparison.OrdinalIgnoreCase))
+                    .Where(dm => String.Equals(dm.Feature.Descriptor.Name, feature, StringComparison.OrdinalIgnoreCase))
                     .ToList();
 
             foreach (var migration in migrations.OfType<DataMigrationImpl>()) {
-                migration.SchemaBuilder = new SchemaBuilder(_interpreter);
+                migration.SchemaBuilder = new SchemaBuilder(_interpreter, migration.Feature.Descriptor.Name.Replace(".", "_") + "_");
             }
 
             return migrations;
diff --git a/src/Orchard/Data/Migration/DefaultDataMigrationGenerator.cs b/src/Orchard/Data/Migration/DefaultDataMigrationGenerator.cs
new file mode 100644
index 000000000..5aeaea29e
--- /dev/null
+++ b/src/Orchard/Data/Migration/DefaultDataMigrationGenerator.cs
@@ -0,0 +1,14 @@
+using System.Collections.Generic;
+using System.Linq;
+using Orchard.Data.Migration.Schema;
+using Orchard.Environment.ShellBuilders.Models;
+
+namespace Orchard.Data.Migration {
+    public class DefaultDataMigrationGenerator : IDataMigrationGenerator {
+        public IEnumerable<ISchemaBuilderCommand> CreateCommands(IEnumerable<RecordBlueprint> records) {
+
+            
+            return Enumerable.Empty<ISchemaBuilderCommand>();
+        }
+    }
+}
diff --git a/src/Orchard/Data/Migration/IDataMigration.cs b/src/Orchard/Data/Migration/IDataMigration.cs
new file mode 100644
index 000000000..3cb5635ab
--- /dev/null
+++ b/src/Orchard/Data/Migration/IDataMigration.cs
@@ -0,0 +1,7 @@
+using Orchard.Environment.Extensions.Models;
+
+namespace Orchard.Data.Migration {
+    public interface IDataMigration : IDependency {
+        Feature Feature { get; }
+    }
+}
diff --git a/src/Orchard/Data/Migration/IDataMigrationGenerator.cs b/src/Orchard/Data/Migration/IDataMigrationGenerator.cs
new file mode 100644
index 000000000..2ce898dfd
--- /dev/null
+++ b/src/Orchard/Data/Migration/IDataMigrationGenerator.cs
@@ -0,0 +1,11 @@
+using System.Collections.Generic;
+using FluentNHibernate.Cfg;
+using Orchard.Data.Migration.Schema;
+using Orchard.Environment.ShellBuilders.Models;
+
+namespace Orchard.Data.Migration {
+    // Builds and runs the representative migration create calls
+    public interface IDataMigrationGenerator : IDependency {
+        IEnumerable<ISchemaBuilderCommand> CreateCommands(IEnumerable<RecordBlueprint> records);
+    }
+}
diff --git a/src/Orchard/DataMigration/IDataMigrationManager.cs b/src/Orchard/Data/Migration/IDataMigrationManager.cs
similarity index 94%
rename from src/Orchard/DataMigration/IDataMigrationManager.cs
rename to src/Orchard/Data/Migration/IDataMigrationManager.cs
index d0eff7631..509d19877 100644
--- a/src/Orchard/DataMigration/IDataMigrationManager.cs
+++ b/src/Orchard/Data/Migration/IDataMigrationManager.cs
@@ -1,6 +1,6 @@
 using System.Collections.Generic;
 
-namespace Orchard.DataMigration {
+namespace Orchard.Data.Migration {
     public interface IDataMigrationManager : IDependency {
         /// <summary>
         /// Whether a feature has already been installed, i.e. one of its Data Migration class has already been processed
diff --git a/src/Orchard/DataMigration/Interpreters/DefaultDataMigrationInterpreter.cs b/src/Orchard/Data/Migration/Interpreters/DefaultDataMigrationInterpreter.cs
similarity index 88%
rename from src/Orchard/DataMigration/Interpreters/DefaultDataMigrationInterpreter.cs
rename to src/Orchard/Data/Migration/Interpreters/DefaultDataMigrationInterpreter.cs
index 4464a9fdd..fb2db6ee3 100644
--- a/src/Orchard/DataMigration/Interpreters/DefaultDataMigrationInterpreter.cs
+++ b/src/Orchard/Data/Migration/Interpreters/DefaultDataMigrationInterpreter.cs
@@ -6,12 +6,11 @@ using System.Text;
 using NHibernate;
 using NHibernate.Dialect;
 using NHibernate.SqlTypes;
-using Orchard.Data;
-using Orchard.DataMigration.Schema;
+using Orchard.Data.Migration.Schema;
 using Orchard.Environment.Configuration;
 using Orchard.Logging;
 
-namespace Orchard.DataMigration.Interpreters {
+namespace Orchard.Data.Migration.Interpreters {
     public class DefaultDataMigrationInterpreter : IDataMigrationInterpreter {
         private readonly ShellSettings _shellSettings;
         private readonly IEnumerable<ICommandInterpreter> _commandInterpreters;
@@ -35,25 +34,30 @@ namespace Orchard.DataMigration.Interpreters {
             get { return _sqlStatements; }
         }
 
-        public void Visit(SchemaCommand command) {
-            switch (command.Type) {
+        public void Visit(ISchemaBuilderCommand command) {
+            var schemaCommand = command as SchemaCommand;
+            if (schemaCommand == null) {
+                return;
+            }
+
+            switch ( schemaCommand.Type ) {
                 case SchemaCommandType.CreateTable:
-                    Visit((CreateTableCommand)command);
+                    Visit((CreateTableCommand)schemaCommand);
                     break;
                 case SchemaCommandType.AlterTable:
-                    Visit((AlterTableCommand)command);
+                    Visit((AlterTableCommand)schemaCommand);
                     break;
                 case SchemaCommandType.DropTable:
-                    Visit((DropTableCommand)command);
+                    Visit((DropTableCommand)schemaCommand);
                     break;
                 case SchemaCommandType.SqlStatement:
-                    Visit((SqlStatementCommand)command);
+                    Visit((SqlStatementCommand)schemaCommand);
                     break;
                 case SchemaCommandType.CreateForeignKey:
-                    Visit((CreateForeignKeyCommand)command);
+                    Visit((CreateForeignKeyCommand)schemaCommand);
                     break;
                 case SchemaCommandType.DropForeignKey:
-                    Visit((DropForeignKeyCommand)command);
+                    Visit((DropForeignKeyCommand)schemaCommand);
                     break;
             }
         }
@@ -81,6 +85,18 @@ namespace Orchard.DataMigration.Interpreters {
                 Visit(builder, createColumn);
             }
 
+            var primaryKeys = command.TableCommands.OfType<CreateColumnCommand>().Where(ccc => ccc.IsPrimaryKey).Select(ccc=>ccc.ColumnName);
+            if(primaryKeys.Any()) {
+                if ( appendComma ) {
+                    builder.Append(", ");
+                }
+
+                builder.Append(_dialect.PrimaryKeyString)
+                    .Append(" ( ")
+                    .Append(String.Join(", ", primaryKeys.ToArray()))
+                    .Append(" )");
+            }
+
             builder.Append(" )");
             _sqlStatements.Add(builder.ToString());
 
@@ -293,10 +309,6 @@ namespace Orchard.DataMigration.Interpreters {
             if ( command.IsUnique && _dialect.SupportsUnique ) {
                 builder.Append(" unique");
             }
-
-            if ( command.IsPrimaryKey ) {
-                builder.Append(Space).Append(_dialect.PrimaryKeyString);
-            }
         }
 
         private void RunPendingStatements() {
diff --git a/src/Orchard/DataMigration/Interpreters/ICommandInterpreter.cs b/src/Orchard/Data/Migration/Interpreters/ICommandInterpreter.cs
similarity index 78%
rename from src/Orchard/DataMigration/Interpreters/ICommandInterpreter.cs
rename to src/Orchard/Data/Migration/Interpreters/ICommandInterpreter.cs
index 389f3e685..e041abad9 100644
--- a/src/Orchard/DataMigration/Interpreters/ICommandInterpreter.cs
+++ b/src/Orchard/Data/Migration/Interpreters/ICommandInterpreter.cs
@@ -1,6 +1,6 @@
-using Orchard.DataMigration.Schema;
+using Orchard.Data.Migration.Schema;
 
-namespace Orchard.DataMigration.Interpreters {
+namespace Orchard.Data.Migration.Interpreters {
     /// <summary>
     /// This interface can be implemented to provide a data migration behavior
     /// </summary>
diff --git a/src/Orchard/DataMigration/Interpreters/IDataMigrationInterpreter.cs b/src/Orchard/Data/Migration/Interpreters/IDataMigrationInterpreter.cs
similarity index 70%
rename from src/Orchard/DataMigration/Interpreters/IDataMigrationInterpreter.cs
rename to src/Orchard/Data/Migration/Interpreters/IDataMigrationInterpreter.cs
index 63fe47135..a2225b12f 100644
--- a/src/Orchard/DataMigration/Interpreters/IDataMigrationInterpreter.cs
+++ b/src/Orchard/Data/Migration/Interpreters/IDataMigrationInterpreter.cs
@@ -1,8 +1,8 @@
-using Orchard.DataMigration.Schema;
+using Orchard.Data.Migration.Schema;
 
-namespace Orchard.DataMigration.Interpreters {
+namespace Orchard.Data.Migration.Interpreters {
     public interface IDataMigrationInterpreter : IDependency{
-        void Visit(SchemaCommand command);
+        void Visit(ISchemaBuilderCommand command);
         void Visit(CreateTableCommand command);
         void Visit(DropTableCommand command);
         void Visit(AlterTableCommand command);
diff --git a/src/Orchard/DataMigration/Interpreters/SqLiteCommandInterpreter.cs b/src/Orchard/Data/Migration/Interpreters/SqLiteCommandInterpreter.cs
similarity index 80%
rename from src/Orchard/DataMigration/Interpreters/SqLiteCommandInterpreter.cs
rename to src/Orchard/Data/Migration/Interpreters/SqLiteCommandInterpreter.cs
index 74afe885c..0a1a5563f 100644
--- a/src/Orchard/DataMigration/Interpreters/SqLiteCommandInterpreter.cs
+++ b/src/Orchard/Data/Migration/Interpreters/SqLiteCommandInterpreter.cs
@@ -1,14 +1,14 @@
-using Orchard.DataMigration.Schema;
+using Orchard.Data.Migration.Schema;
 
-namespace Orchard.DataMigration.Interpreters {
-    public class SqLiteCommandInterpreter : 
+namespace Orchard.Data.Migration.Interpreters {
+    public class SqLiteCommandInterpreter :
         ICommandInterpreter<DropColumnCommand>,
-        ICommandInterpreter<AlterColumnCommand>,        
+        ICommandInterpreter<AlterColumnCommand>,
         ICommandInterpreter<CreateForeignKeyCommand>,
         ICommandInterpreter<DropForeignKeyCommand>,
         ICommandInterpreter<AddIndexCommand>,
         ICommandInterpreter<DropIndexCommand> {
-        
+
         public string[] CreateStatements(DropColumnCommand command) {
             return new string[0];
         }
@@ -36,5 +36,5 @@ namespace Orchard.DataMigration.Interpreters {
         public string DataProvider {
             get { return "SQLite"; }
         }
-        }
+    }
 }
diff --git a/src/Orchard/DataMigration/DataMigrationRecord.cs b/src/Orchard/Data/Migration/Records/DataMigrationRecord.cs
similarity index 79%
rename from src/Orchard/DataMigration/DataMigrationRecord.cs
rename to src/Orchard/Data/Migration/Records/DataMigrationRecord.cs
index 6f84e7d9e..2635e8cd5 100644
--- a/src/Orchard/DataMigration/DataMigrationRecord.cs
+++ b/src/Orchard/Data/Migration/Records/DataMigrationRecord.cs
@@ -1,4 +1,4 @@
-namespace Orchard.DataMigration {
+namespace Orchard.Data.Migration.Records {
     public class DataMigrationRecord {
         public virtual int Id { get; set; }
         public virtual string DataMigrationClass { get; set; }
diff --git a/src/Orchard/DataMigration/Schema/AddColumnCommand.cs b/src/Orchard/Data/Migration/Schema/AddColumnCommand.cs
similarity index 76%
rename from src/Orchard/DataMigration/Schema/AddColumnCommand.cs
rename to src/Orchard/Data/Migration/Schema/AddColumnCommand.cs
index 4cfd622f8..b036d39e4 100644
--- a/src/Orchard/DataMigration/Schema/AddColumnCommand.cs
+++ b/src/Orchard/Data/Migration/Schema/AddColumnCommand.cs
@@ -1,4 +1,4 @@
-namespace Orchard.DataMigration.Schema {
+namespace Orchard.Data.Migration.Schema {
     public class AddColumnCommand : CreateColumnCommand {
         public AddColumnCommand(string tableName, string name) : base(tableName, name) {
         }
diff --git a/src/Orchard/DataMigration/Schema/AddIndexCommand.cs b/src/Orchard/Data/Migration/Schema/AddIndexCommand.cs
similarity index 86%
rename from src/Orchard/DataMigration/Schema/AddIndexCommand.cs
rename to src/Orchard/Data/Migration/Schema/AddIndexCommand.cs
index 0f88223c2..6caf4da40 100644
--- a/src/Orchard/DataMigration/Schema/AddIndexCommand.cs
+++ b/src/Orchard/Data/Migration/Schema/AddIndexCommand.cs
@@ -1,4 +1,4 @@
-namespace Orchard.DataMigration.Schema {
+namespace Orchard.Data.Migration.Schema {
     public class AddIndexCommand : TableCommand {
         public string IndexName { get; set; }
 
diff --git a/src/Orchard/DataMigration/Schema/AlterColumnCommand.cs b/src/Orchard/Data/Migration/Schema/AlterColumnCommand.cs
similarity index 91%
rename from src/Orchard/DataMigration/Schema/AlterColumnCommand.cs
rename to src/Orchard/Data/Migration/Schema/AlterColumnCommand.cs
index 937019b67..711a309a6 100644
--- a/src/Orchard/DataMigration/Schema/AlterColumnCommand.cs
+++ b/src/Orchard/Data/Migration/Schema/AlterColumnCommand.cs
@@ -1,6 +1,6 @@
 using System.Data;
 
-namespace Orchard.DataMigration.Schema {
+namespace Orchard.Data.Migration.Schema {
     public class AlterColumnCommand : ColumnCommand {
         public AlterColumnCommand(string tableName, string columnName)
             : base(tableName, columnName) {
diff --git a/src/Orchard/DataMigration/Schema/AlterTableCommand.cs b/src/Orchard/Data/Migration/Schema/AlterTableCommand.cs
similarity index 94%
rename from src/Orchard/DataMigration/Schema/AlterTableCommand.cs
rename to src/Orchard/Data/Migration/Schema/AlterTableCommand.cs
index 7c833c908..8c5576e3c 100644
--- a/src/Orchard/DataMigration/Schema/AlterTableCommand.cs
+++ b/src/Orchard/Data/Migration/Schema/AlterTableCommand.cs
@@ -1,7 +1,7 @@
 using System;
 using System.Data;
 
-namespace Orchard.DataMigration.Schema {
+namespace Orchard.Data.Migration.Schema {
     public class AlterTableCommand : SchemaCommand {
         public AlterTableCommand(string name)
             : base(name, SchemaCommandType.AlterTable) {
diff --git a/src/Orchard/DataMigration/Schema/ColumnCommand.cs b/src/Orchard/Data/Migration/Schema/ColumnCommand.cs
similarity index 92%
rename from src/Orchard/DataMigration/Schema/ColumnCommand.cs
rename to src/Orchard/Data/Migration/Schema/ColumnCommand.cs
index 4777805eb..a5fc59f13 100644
--- a/src/Orchard/DataMigration/Schema/ColumnCommand.cs
+++ b/src/Orchard/Data/Migration/Schema/ColumnCommand.cs
@@ -1,6 +1,6 @@
 using System.Data;
 
-namespace Orchard.DataMigration.Schema {
+namespace Orchard.Data.Migration.Schema {
     public class ColumnCommand : TableCommand {
         public string ColumnName { get; set; }
 
diff --git a/src/Orchard/DataMigration/Schema/CreateColumnCommand.cs b/src/Orchard/Data/Migration/Schema/CreateColumnCommand.cs
similarity index 94%
rename from src/Orchard/DataMigration/Schema/CreateColumnCommand.cs
rename to src/Orchard/Data/Migration/Schema/CreateColumnCommand.cs
index 6a5dc5848..3aaf0f0f8 100644
--- a/src/Orchard/DataMigration/Schema/CreateColumnCommand.cs
+++ b/src/Orchard/Data/Migration/Schema/CreateColumnCommand.cs
@@ -1,6 +1,6 @@
 using System.Data;
 
-namespace Orchard.DataMigration.Schema {
+namespace Orchard.Data.Migration.Schema {
     public class CreateColumnCommand : ColumnCommand {
         public CreateColumnCommand(string tableName, string name) : base(tableName, name) {
             IsNotNull = false;
diff --git a/src/Orchard/DataMigration/Schema/CreateForeignKeyCommand.cs b/src/Orchard/Data/Migration/Schema/CreateForeignKeyCommand.cs
similarity index 90%
rename from src/Orchard/DataMigration/Schema/CreateForeignKeyCommand.cs
rename to src/Orchard/Data/Migration/Schema/CreateForeignKeyCommand.cs
index 71a7d8087..09a01e2ed 100644
--- a/src/Orchard/DataMigration/Schema/CreateForeignKeyCommand.cs
+++ b/src/Orchard/Data/Migration/Schema/CreateForeignKeyCommand.cs
@@ -1,4 +1,4 @@
-namespace Orchard.DataMigration.Schema {
+namespace Orchard.Data.Migration.Schema {
     public class CreateForeignKeyCommand : SchemaCommand {
 
         public string[] DestColumns { get; private set; }
diff --git a/src/Orchard/Data/Migration/Schema/CreateTableCommand.cs b/src/Orchard/Data/Migration/Schema/CreateTableCommand.cs
new file mode 100644
index 000000000..5c295e385
--- /dev/null
+++ b/src/Orchard/Data/Migration/Schema/CreateTableCommand.cs
@@ -0,0 +1,54 @@
+using System;
+using System.Data;
+
+namespace Orchard.Data.Migration.Schema {
+    public class CreateTableCommand : SchemaCommand {
+        public CreateTableCommand(string name)
+            : base(name, SchemaCommandType.CreateTable) {
+        }
+
+        public CreateTableCommand Column(string columnName, DbType dbType, Action<CreateColumnCommand> column = null) {
+            var command = new CreateColumnCommand(Name, columnName);
+            command.WithType(dbType);
+
+            if ( column != null ) {
+                column(command);
+            }
+            TableCommands.Add(command);
+            return this;
+        }
+
+        public CreateTableCommand Column<T>(string columnName, Action<CreateColumnCommand> column = null) {
+            var dbType = System.Data.DbType.Object;
+            switch(System.Type.GetTypeCode(typeof(T))) {
+                case TypeCode.String :
+                    dbType = DbType.String;
+                    break;
+                case TypeCode.Int32:
+                    dbType = DbType.Int32;
+                    break;
+                case TypeCode.DateTime:
+                    dbType = DbType.DateTime;
+                    break;
+                case TypeCode.Boolean:
+                    dbType = DbType.Boolean;
+                    break;
+                default:
+                    Enum.TryParse(System.Type.GetTypeCode(typeof (T)).ToString(), true, out dbType);
+                    break;
+            }
+
+            return Column(columnName, dbType, column);
+        }
+
+        public CreateTableCommand ContentPartRecord() {
+            /// TODO: Call Column() with necessary information for content part records
+            return this;
+        }
+
+        public CreateTableCommand VersionedContentPartRecord() {
+            /// TODO: Call Column() with necessary information for content part records
+            return this;
+        }
+    }
+}
diff --git a/src/Orchard/DataMigration/Schema/DropColumnCommand.cs b/src/Orchard/Data/Migration/Schema/DropColumnCommand.cs
similarity index 77%
rename from src/Orchard/DataMigration/Schema/DropColumnCommand.cs
rename to src/Orchard/Data/Migration/Schema/DropColumnCommand.cs
index 84739b096..e12c17d20 100644
--- a/src/Orchard/DataMigration/Schema/DropColumnCommand.cs
+++ b/src/Orchard/Data/Migration/Schema/DropColumnCommand.cs
@@ -1,4 +1,4 @@
-namespace Orchard.DataMigration.Schema {
+namespace Orchard.Data.Migration.Schema {
     public class DropColumnCommand : ColumnCommand {
 
         public DropColumnCommand(string tableName, string columnName)
diff --git a/src/Orchard/DataMigration/Schema/DropForeignKeyCommand.cs b/src/Orchard/Data/Migration/Schema/DropForeignKeyCommand.cs
similarity index 84%
rename from src/Orchard/DataMigration/Schema/DropForeignKeyCommand.cs
rename to src/Orchard/Data/Migration/Schema/DropForeignKeyCommand.cs
index ac7367cba..6ad76dab6 100644
--- a/src/Orchard/DataMigration/Schema/DropForeignKeyCommand.cs
+++ b/src/Orchard/Data/Migration/Schema/DropForeignKeyCommand.cs
@@ -1,4 +1,4 @@
-namespace Orchard.DataMigration.Schema {
+namespace Orchard.Data.Migration.Schema {
     public class DropForeignKeyCommand : SchemaCommand {
         public string SrcTable { get; private set; }
 
diff --git a/src/Orchard/DataMigration/Schema/DropIndexCommand.cs b/src/Orchard/Data/Migration/Schema/DropIndexCommand.cs
similarity index 82%
rename from src/Orchard/DataMigration/Schema/DropIndexCommand.cs
rename to src/Orchard/Data/Migration/Schema/DropIndexCommand.cs
index 57285a0fa..1730d7e66 100644
--- a/src/Orchard/DataMigration/Schema/DropIndexCommand.cs
+++ b/src/Orchard/Data/Migration/Schema/DropIndexCommand.cs
@@ -1,4 +1,4 @@
-namespace Orchard.DataMigration.Schema {
+namespace Orchard.Data.Migration.Schema {
     public class DropIndexCommand : TableCommand {
         public string IndexName { get; set; }
 
diff --git a/src/Orchard/DataMigration/Schema/DropTableCommand.cs b/src/Orchard/Data/Migration/Schema/DropTableCommand.cs
similarity index 76%
rename from src/Orchard/DataMigration/Schema/DropTableCommand.cs
rename to src/Orchard/Data/Migration/Schema/DropTableCommand.cs
index 4a8a67222..aeb6c70ef 100644
--- a/src/Orchard/DataMigration/Schema/DropTableCommand.cs
+++ b/src/Orchard/Data/Migration/Schema/DropTableCommand.cs
@@ -1,4 +1,4 @@
-namespace Orchard.DataMigration.Schema {
+namespace Orchard.Data.Migration.Schema {
     public class DropTableCommand : SchemaCommand {
         public DropTableCommand(string name)
             : base(name, SchemaCommandType.DropTable) {
diff --git a/src/Orchard/DataMigration/Schema/ISchemaBuilderCommand.cs b/src/Orchard/Data/Migration/Schema/ISchemaBuilderCommand.cs
similarity index 51%
rename from src/Orchard/DataMigration/Schema/ISchemaBuilderCommand.cs
rename to src/Orchard/Data/Migration/Schema/ISchemaBuilderCommand.cs
index da422593e..cbc613367 100644
--- a/src/Orchard/DataMigration/Schema/ISchemaBuilderCommand.cs
+++ b/src/Orchard/Data/Migration/Schema/ISchemaBuilderCommand.cs
@@ -1,4 +1,4 @@
-namespace Orchard.DataMigration.Schema {
+namespace Orchard.Data.Migration.Schema {
     public interface ISchemaBuilderCommand {
     }
 }
diff --git a/src/Orchard/DataMigration/Schema/IShellSettings.cs b/src/Orchard/Data/Migration/Schema/IShellSettings.cs
similarity index 100%
rename from src/Orchard/DataMigration/Schema/IShellSettings.cs
rename to src/Orchard/Data/Migration/Schema/IShellSettings.cs
diff --git a/src/Orchard/DataMigration/Schema/SchemaBuilder.cs b/src/Orchard/Data/Migration/Schema/SchemaBuilder.cs
similarity index 62%
rename from src/Orchard/DataMigration/Schema/SchemaBuilder.cs
rename to src/Orchard/Data/Migration/Schema/SchemaBuilder.cs
index c133e59d1..cfe318267 100644
--- a/src/Orchard/DataMigration/Schema/SchemaBuilder.cs
+++ b/src/Orchard/Data/Migration/Schema/SchemaBuilder.cs
@@ -1,29 +1,32 @@
 using System;
-using Orchard.DataMigration.Interpreters;
+using Orchard.Data.Migration.Interpreters;
 
-namespace Orchard.DataMigration.Schema {
+namespace Orchard.Data.Migration.Schema {
     public class SchemaBuilder {
         private readonly IDataMigrationInterpreter _interpreter;
-        public SchemaBuilder(IDataMigrationInterpreter interpreter) {
+        private readonly string _featurePrefix;
+
+        public SchemaBuilder(IDataMigrationInterpreter interpreter, string featurePrefix = null) {
             _interpreter = interpreter;
+            _featurePrefix = featurePrefix;
         }
 
         public SchemaBuilder CreateTable(string name, Action<CreateTableCommand> table) {
-            var createTable = new CreateTableCommand(name);
+            var createTable = new CreateTableCommand(String.Concat(_featurePrefix, name));
             table(createTable);
             Run(createTable);
             return this;
         }
 
         public SchemaBuilder AlterTable(string name, Action<AlterTableCommand> table) {
-            var alterTable = new AlterTableCommand(name);
+            var alterTable = new AlterTableCommand(String.Concat(_featurePrefix, name));
             table(alterTable);
             Run(alterTable);
             return this;
         }
 
         public SchemaBuilder DropTable(string name) {
-            var deleteTable = new DropTableCommand(name);
+            var deleteTable = new DropTableCommand(String.Concat(_featurePrefix, name));
             Run(deleteTable);
             return this;
         }
@@ -37,18 +40,18 @@ namespace Orchard.DataMigration.Schema {
             return this;
         }
 
-        private void Run(SchemaCommand command) {
+        private void Run(ISchemaBuilderCommand command) {
             _interpreter.Visit(command);
         }
 
         public SchemaBuilder CreateForeignKey(string name, string srcTable, string[] srcColumns, string destTable, string[] destColumns) {
-            var command = new CreateForeignKeyCommand(name, srcTable, srcColumns, destTable, destColumns);
+            var command = new CreateForeignKeyCommand(name, String.Concat(_featurePrefix, srcTable), srcColumns, String.Concat(_featurePrefix, destTable), destColumns);
             Run(command);
             return this;
         }
 
         public SchemaBuilder DropForeignKey(string srcTable, string name) {
-            var command = new DropForeignKeyCommand(srcTable, name);
+            var command = new DropForeignKeyCommand(String.Concat(_featurePrefix, srcTable), name);
             Run(command);
             return this;
         }
diff --git a/src/Orchard/DataMigration/Schema/SchemaCommand.cs b/src/Orchard/Data/Migration/Schema/SchemaCommand.cs
similarity index 91%
rename from src/Orchard/DataMigration/Schema/SchemaCommand.cs
rename to src/Orchard/Data/Migration/Schema/SchemaCommand.cs
index 64176e935..d52155768 100644
--- a/src/Orchard/DataMigration/Schema/SchemaCommand.cs
+++ b/src/Orchard/Data/Migration/Schema/SchemaCommand.cs
@@ -1,7 +1,7 @@
 using System.Collections.Generic;
 using JetBrains.Annotations;
 
-namespace Orchard.DataMigration.Schema {
+namespace Orchard.Data.Migration.Schema {
     public abstract class SchemaCommand : ISchemaBuilderCommand {
         protected SchemaCommand(string name, SchemaCommandType type ) {
             TableCommands = new List<TableCommand>();
diff --git a/src/Orchard/DataMigration/Schema/SqlStatementCommand.cs b/src/Orchard/Data/Migration/Schema/SqlStatementCommand.cs
similarity index 90%
rename from src/Orchard/DataMigration/Schema/SqlStatementCommand.cs
rename to src/Orchard/Data/Migration/Schema/SqlStatementCommand.cs
index b730b7863..059fb56d3 100644
--- a/src/Orchard/DataMigration/Schema/SqlStatementCommand.cs
+++ b/src/Orchard/Data/Migration/Schema/SqlStatementCommand.cs
@@ -1,6 +1,6 @@
 using System.Collections.Generic;
 
-namespace Orchard.DataMigration.Schema {
+namespace Orchard.Data.Migration.Schema {
     public class SqlStatementCommand : SchemaCommand {
         protected readonly List<string> _providers;
         public SqlStatementCommand(string sql)
diff --git a/src/Orchard/DataMigration/Schema/TableCommand.cs b/src/Orchard/Data/Migration/Schema/TableCommand.cs
similarity index 79%
rename from src/Orchard/DataMigration/Schema/TableCommand.cs
rename to src/Orchard/Data/Migration/Schema/TableCommand.cs
index 3d4092fec..d62e8599f 100644
--- a/src/Orchard/DataMigration/Schema/TableCommand.cs
+++ b/src/Orchard/Data/Migration/Schema/TableCommand.cs
@@ -1,4 +1,4 @@
-namespace Orchard.DataMigration.Schema {
+namespace Orchard.Data.Migration.Schema {
     public class TableCommand : ISchemaBuilderCommand{
         public string TableName { get; private set; }
 
diff --git a/src/Orchard/Data/Providers/IDataServicesProvider.cs b/src/Orchard/Data/Providers/IDataServicesProvider.cs
index 2d66a4a87..19e5a3176 100644
--- a/src/Orchard/Data/Providers/IDataServicesProvider.cs
+++ b/src/Orchard/Data/Providers/IDataServicesProvider.cs
@@ -1,4 +1,7 @@
-using NHibernate;
+using System;
+using FluentNHibernate.Cfg;
+using NHibernate;
+using NHibernate.Cfg;
 
 namespace Orchard.Data.Providers {
     public interface IDataServicesProvider : ITransientDependency {
diff --git a/src/Orchard/Data/Providers/IDataServicesProviderFactory.cs b/src/Orchard/Data/Providers/IDataServicesProviderFactory.cs
index 082c98dce..e880a5f4d 100644
--- a/src/Orchard/Data/Providers/IDataServicesProviderFactory.cs
+++ b/src/Orchard/Data/Providers/IDataServicesProviderFactory.cs
@@ -2,4 +2,5 @@ namespace Orchard.Data.Providers {
     public interface IDataServicesProviderFactory : IDependency {
         IDataServicesProvider CreateProvider(DataServiceParameters sessionFactoryParameters);
     }
+
 }
diff --git a/src/Orchard/Data/SessionFactoryHolder.cs b/src/Orchard/Data/SessionFactoryHolder.cs
index 8e1e811ae..f462050a1 100644
--- a/src/Orchard/Data/SessionFactoryHolder.cs
+++ b/src/Orchard/Data/SessionFactoryHolder.cs
@@ -67,7 +67,7 @@ namespace Orchard.Data {
         public ISessionFactory GetSessionFactory() {
             lock (this) {
                 if (_sessionFactory == null) {
-                    _sessionFactory = BuildSessionFactory(false /*createDatabase*/, true /*updateSchema*/);
+                    _sessionFactory = BuildSessionFactory(false /*createDatabase*/, false /*updateSchema*/);
                 }
             }
             return _sessionFactory;
diff --git a/src/Orchard/DataMigration/DefaultDataMigrationGenerator.cs b/src/Orchard/DataMigration/DefaultDataMigrationGenerator.cs
deleted file mode 100644
index b9591c28e..000000000
--- a/src/Orchard/DataMigration/DefaultDataMigrationGenerator.cs
+++ /dev/null
@@ -1,10 +0,0 @@
-using System.Collections.Generic;
-using System.Linq;
-
-namespace Orchard.DataMigration {
-    public class DefaultDataMigrationGenerator : IDataMigrationGenerator {
-        public IEnumerable<IDataMigrationCommand> CreateCommands() {
-            return Enumerable.Empty<IDataMigrationCommand>();
-        }
-    }
-}
diff --git a/src/Orchard/DataMigration/IDataMigration.cs b/src/Orchard/DataMigration/IDataMigration.cs
deleted file mode 100644
index 58267f100..000000000
--- a/src/Orchard/DataMigration/IDataMigration.cs
+++ /dev/null
@@ -1,5 +0,0 @@
-namespace Orchard.DataMigration {
-    public interface IDataMigration : IDependency {
-        string Feature { get; }
-    }
-}
diff --git a/src/Orchard/DataMigration/IDataMigrationCommand.cs b/src/Orchard/DataMigration/IDataMigrationCommand.cs
deleted file mode 100644
index cb56b9c63..000000000
--- a/src/Orchard/DataMigration/IDataMigrationCommand.cs
+++ /dev/null
@@ -1,4 +0,0 @@
-namespace Orchard.DataMigration {
-    public interface IDataMigrationCommand {
-    }
-}
diff --git a/src/Orchard/DataMigration/IDataMigrationGenerator.cs b/src/Orchard/DataMigration/IDataMigrationGenerator.cs
deleted file mode 100644
index 72cce65b4..000000000
--- a/src/Orchard/DataMigration/IDataMigrationGenerator.cs
+++ /dev/null
@@ -1,8 +0,0 @@
-using System.Collections.Generic;
-
-namespace Orchard.DataMigration {
-    // Builds and runs the representative migration create calls
-    public interface IDataMigrationGenerator : IDependency {
-        IEnumerable<IDataMigrationCommand> CreateCommands();
-    }
-}
diff --git a/src/Orchard/DataMigration/Schema/CreateTableCommand.cs b/src/Orchard/DataMigration/Schema/CreateTableCommand.cs
deleted file mode 100644
index f6a22ebec..000000000
--- a/src/Orchard/DataMigration/Schema/CreateTableCommand.cs
+++ /dev/null
@@ -1,31 +0,0 @@
-using System;
-using System.Data;
-
-namespace Orchard.DataMigration.Schema {
-    public class CreateTableCommand : SchemaCommand {
-        public CreateTableCommand(string name)
-            : base(name, SchemaCommandType.CreateTable) {
-        }
-
-        public CreateTableCommand Column(string columnName, DbType dbType, Action<CreateColumnCommand> column = null) {
-            var command = new CreateColumnCommand(Name, columnName);
-            command.WithType(dbType);
-
-            if ( column != null ) {
-                column(command);
-            }
-            TableCommands.Add(command);
-            return this;
-        }
-
-        public CreateTableCommand ContentPartRecord() {
-            /// TODO: Call Column() with necessary information for content part records
-            return this;
-        }
-
-        public CreateTableCommand VersionedContentPartRecord() {
-            /// TODO: Call Column() with necessary information for content part records
-            return this;
-        }
-    }
-}
diff --git a/src/Orchard/Environment/DefaultOrchardShell.cs b/src/Orchard/Environment/DefaultOrchardShell.cs
index c4b30cb8c..2a09c992c 100644
--- a/src/Orchard/Environment/DefaultOrchardShell.cs
+++ b/src/Orchard/Environment/DefaultOrchardShell.cs
@@ -41,7 +41,7 @@ namespace Orchard.Environment {
             _routePublisher.Publish(_routeProviders.SelectMany(provider => provider.GetRoutes()));
             _modelBinderPublisher.Publish(_modelBinderProviders.SelectMany(provider => provider.GetModelBinders()));
 
-            AddOrchardLocationsFormats();
+            //AddOrchardLocationsFormats();
 
             using (var events = _eventsFactory()) {
                 events.Value.Activated();
diff --git a/src/Orchard/Mvc/ViewEngines/LayoutViewEngine.cs b/src/Orchard/Mvc/ViewEngines/LayoutViewEngine.cs
index 8ce81a97e..de6401aa6 100644
--- a/src/Orchard/Mvc/ViewEngines/LayoutViewEngine.cs
+++ b/src/Orchard/Mvc/ViewEngines/LayoutViewEngine.cs
@@ -31,7 +31,6 @@ namespace Orchard.Mvc.ViewEngines {
             if (skipLayoutViewEngine)
                 return new ViewEngineResult(Enumerable.Empty<string>());
 
-
             var bodyView = _viewEngines.FindPartialView(controllerContext, viewName);
 
             ViewEngineResult layoutView = null;
@@ -109,7 +108,6 @@ namespace Orchard.Mvc.ViewEngines {
                 return new ViewEngineResult(Enumerable.Empty<string>());
             }
 
-
             public ViewEngineResult FindView(ControllerContext controllerContext, string viewName, string masterName, bool useCache) {
                 var scope = Scope.From(controllerContext);
                 if (scope != null && scope.LayoutViewEngine != null) {
@@ -120,10 +118,7 @@ namespace Orchard.Mvc.ViewEngines {
                 return new ViewEngineResult(Enumerable.Empty<string>());
             }
 
-
-
             public void ReleaseView(ControllerContext controllerContext, IView view) {
-                throw new NotImplementedException();
             }
         }
 
diff --git a/src/Orchard/Mvc/ViewEngines/ViewEngineFilter.cs b/src/Orchard/Mvc/ViewEngines/ViewEngineFilter.cs
index 832eec526..c1fd4b19b 100644
--- a/src/Orchard/Mvc/ViewEngines/ViewEngineFilter.cs
+++ b/src/Orchard/Mvc/ViewEngines/ViewEngineFilter.cs
@@ -63,7 +63,7 @@ namespace Orchard.Mvc.ViewEngines {
             var requestViewEngines = new ViewEngineCollection(
                 themeViewEngines
                     .Concat(moduleViewEngines)
-                    .Concat(_viewEngines.Where(x => x.GetType().Assembly != typeof(LayoutViewEngine).Assembly))
+                    .Concat(_viewEngines.Where(ViewEngineIsForwarded))
                     .ToArray());
 
             var layoutViewEngine = new LayoutViewEngine(requestViewEngines);
@@ -72,6 +72,14 @@ namespace Orchard.Mvc.ViewEngines {
             viewResultBase.ViewEngineCollection.Insert(0, layoutViewEngine);
         }
 
+        static bool ViewEngineIsForwarded(IViewEngine x) {
+            // default view engine, and layout view engine, are not forwarded to 
+            // be used for resolving partials
+            return 
+                x.GetType().Assembly != typeof(LayoutViewEngine).Assembly &&
+                x.GetType() != typeof(WebFormViewEngine);
+        }
+
         public void OnResultExecuted(ResultExecutedContext filterContext) {
 
         }
diff --git a/src/Orchard/Mvc/ViewEngines/ThemeViewLocationCache.cs b/src/Orchard/Mvc/ViewEngines/WebForms/ThemeViewLocationCache.cs
similarity index 88%
rename from src/Orchard/Mvc/ViewEngines/ThemeViewLocationCache.cs
rename to src/Orchard/Mvc/ViewEngines/WebForms/ThemeViewLocationCache.cs
index a5a39f1eb..16e4e76c4 100644
--- a/src/Orchard/Mvc/ViewEngines/ThemeViewLocationCache.cs
+++ b/src/Orchard/Mvc/ViewEngines/WebForms/ThemeViewLocationCache.cs
@@ -1,13 +1,10 @@
 using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
 using System.Web.Mvc;
 using System.Web.Caching;
 using System.Web;
 using System.Web.Hosting;
 
-namespace Orchard.Mvc.ViewEngines {
+namespace Orchard.Mvc.ViewEngines.WebForms {
     public class ThemeViewLocationCache : IViewLocationCache {
         private readonly string _requestTheme;
 
diff --git a/src/Orchard/Mvc/ViewEngines/WebForms/WebFormViewEngineForAspNet4.cs b/src/Orchard/Mvc/ViewEngines/WebForms/WebFormViewEngineForAspNet4.cs
new file mode 100644
index 000000000..1af79428f
--- /dev/null
+++ b/src/Orchard/Mvc/ViewEngines/WebForms/WebFormViewEngineForAspNet4.cs
@@ -0,0 +1,25 @@
+using System.Web;
+using System.Web.Compilation;
+using System.Web.Mvc;
+
+namespace Orchard.Mvc.ViewEngines.WebForms {
+    public class WebFormViewEngineForAspNet4 : WebFormViewEngine {
+        protected override bool FileExists(ControllerContext controllerContext, string virtualPath) {
+            try {
+
+                return BuildManager.GetObjectFactory(virtualPath, false) != null;
+            }
+            catch (HttpException exception) {
+                // Reproducing base class behavior, however these this code path should
+                // not be followed for "not found" cases
+                if (exception is HttpParseException) {
+                    throw;
+                }
+                if ((exception.GetHttpCode() != 0x194) || base.FileExists(controllerContext, virtualPath)) {
+                    throw;
+                }
+                return false;
+            }
+        }
+    }
+}
diff --git a/src/Orchard/Mvc/ViewEngines/WebFormsViewEngineProvider.cs b/src/Orchard/Mvc/ViewEngines/WebForms/WebFormViewEngineProvider.cs
similarity index 71%
rename from src/Orchard/Mvc/ViewEngines/WebFormsViewEngineProvider.cs
rename to src/Orchard/Mvc/ViewEngines/WebForms/WebFormViewEngineProvider.cs
index 6192160fb..28c69eb0c 100644
--- a/src/Orchard/Mvc/ViewEngines/WebFormsViewEngineProvider.cs
+++ b/src/Orchard/Mvc/ViewEngines/WebForms/WebFormViewEngineProvider.cs
@@ -2,9 +2,9 @@
 using System.Web.Mvc;
 using Orchard.Logging;
 
-namespace Orchard.Mvc.ViewEngines {
-    public class WebFormsViewEngineProvider : IViewEngineProvider {
-        public WebFormsViewEngineProvider() {
+namespace Orchard.Mvc.ViewEngines.WebForms {
+    public class WebFormViewEngineProvider : IViewEngineProvider {
+        public WebFormViewEngineProvider() {
             Logger = NullLogger.Instance;
         }
         static string[] DisabledFormats = new[] { "~/Disabled" };
@@ -22,35 +22,35 @@ namespace Orchard.Mvc.ViewEngines {
             // Partial Paths - 
             //   {area}/{controller}/
 
-
-            var viewEngine = new WebFormViewEngine {
-                MasterLocationFormats = DisabledFormats,
-                ViewLocationFormats = DisabledFormats,
-                AreaMasterLocationFormats = DisabledFormats,
-                AreaViewLocationFormats = DisabledFormats,
-                AreaPartialViewLocationFormats = DisabledFormats,
-            };
-
-            viewEngine.ViewLocationCache = new ThemeViewLocationCache(parameters.VirtualPath);
+            // for "routed" request views...
+            // enable /Views/{area}/{controller}/{viewName}
 
             // enable /Views/{partialName}
             // enable /Views/"DisplayTemplates/"+{templateName}
             // enable /Views/"EditorTemplates/+{templateName}
-            viewEngine.PartialViewLocationFormats = new[] {
+            var partialViewLocationFormats = new[] {
                 parameters.VirtualPath + "/Views/{0}.ascx",
                 parameters.VirtualPath + "/Views/{0}.aspx",
             };
 
-            Logger.Debug("PartialViewLocationFormats (theme): \r\n\t-{0}", string.Join("\r\n\t-", viewEngine.PartialViewLocationFormats));
+            //Logger.Debug("PartialViewLocationFormats (theme): \r\n\t-{0}", string.Join("\r\n\t-", partialViewLocationFormats));
 
-            // for "routed" request views...
-            // enable /Views/{area}/{controller}/{viewName}
-            viewEngine.AreaPartialViewLocationFormats = new[] {
+            var areaPartialViewLocationFormats = new[] {
                 parameters.VirtualPath + "/Views/{2}/{1}/{0}.ascx",
                 parameters.VirtualPath + "/Views/{2}/{1}/{0}.aspx",
             };
 
-            Logger.Debug("AreaPartialViewLocationFormats (theme): \r\n\t-{0}", string.Join("\r\n\t-", viewEngine.AreaPartialViewLocationFormats));
+            //Logger.Debug("AreaPartialViewLocationFormats (theme): \r\n\t-{0}", string.Join("\r\n\t-", areaPartialViewLocationFormats));
+
+            var viewEngine = new WebFormViewEngineForAspNet4 {
+                MasterLocationFormats = DisabledFormats,
+                ViewLocationFormats = DisabledFormats,
+                PartialViewLocationFormats = partialViewLocationFormats,
+                AreaMasterLocationFormats = DisabledFormats,
+                AreaViewLocationFormats = DisabledFormats,
+                AreaPartialViewLocationFormats = areaPartialViewLocationFormats,
+                ViewLocationCache = new ThemeViewLocationCache(parameters.VirtualPath),
+            };
 
             return viewEngine;
         }
@@ -63,7 +63,7 @@ namespace Orchard.Mvc.ViewEngines {
                                         "~/Modules/{2}/Views/{1}/{0}.aspx",
                                     };
 
-            Logger.Debug("AreaFormats (module): \r\n\t-{0}", string.Join("\r\n\t-", areaFormats));
+            //Logger.Debug("AreaFormats (module): \r\n\t-{0}", string.Join("\r\n\t-", areaFormats));
 
             var universalFormats = parameters.VirtualPaths
                 .SelectMany(x => new[] {
@@ -72,9 +72,9 @@ namespace Orchard.Mvc.ViewEngines {
                                        })
                 .ToArray();
 
-            Logger.Debug("UniversalFormats (module): \r\n\t-{0}", string.Join("\r\n\t-", universalFormats));
+            //Logger.Debug("UniversalFormats (module): \r\n\t-{0}", string.Join("\r\n\t-", universalFormats));
 
-            var viewEngine = new WebFormViewEngine {
+            var viewEngine = new WebFormViewEngineForAspNet4 {
                 MasterLocationFormats = DisabledFormats,
                 ViewLocationFormats = universalFormats,
                 PartialViewLocationFormats = universalFormats,
diff --git a/src/Orchard/Orchard.Framework.csproj b/src/Orchard/Orchard.Framework.csproj
index 194d3ea19..e736f8e98 100644
--- a/src/Orchard/Orchard.Framework.csproj
+++ b/src/Orchard/Orchard.Framework.csproj
@@ -207,6 +207,7 @@
     </Compile>
     <Compile Include="ContentManagement\FieldStorage\InfosetStorage\InfosetHandler.cs" />
     <Compile Include="ContentManagement\FieldStorage\InfosetStorage\InfosetPart.cs" />
+    <Compile Include="ContentManagement\FieldStorage\SimpleFieldStorage.cs" />
     <Compile Include="ContentManagement\Handlers\ActivatedContentContext.cs">
       <SubType>Code</SubType>
     </Compile>
@@ -356,38 +357,38 @@
     <Compile Include="ContentManagement\ViewModels\TemplateViewModel.cs">
       <SubType>Code</SubType>
     </Compile>
-    <Compile Include="DataMigration\Interpreters\ICommandInterpreter.cs" />
-    <Compile Include="DataMigration\Interpreters\DefaultDataMigrationInterpreter.cs" />
-    <Compile Include="DataMigration\Interpreters\IDataMigrationInterpreter.cs" />
-    <Compile Include="DataMigration\Interpreters\SqLiteCommandInterpreter.cs" />
-    <Compile Include="DataMigration\Schema\AddColumnCommand.cs" />
-    <Compile Include="DataMigration\Schema\ISchemaBuilderCommand.cs" />
-    <Compile Include="DataMigration\Schema\IShellSettings.cs" />
-    <Compile Include="DataMigration\Schema\SqlStatementCommand.cs" />
-    <Compile Include="DataMigration\Schema\CreateColumnCommand.cs" />
-    <Compile Include="DataMigration\Schema\CreateForeignKeyCommand.cs" />
-    <Compile Include="DataMigration\Schema\DropForeignKeyCommand.cs" />
-    <Compile Include="DataMigration\Schema\DropIndexCommand.cs" />
-    <Compile Include="DataMigration\Schema\AddIndexCommand.cs" />
-    <Compile Include="DataMigration\Schema\DropColumnCommand.cs" />
-    <Compile Include="DataMigration\Schema\AlterColumnCommand.cs" />
-    <Compile Include="DataMigration\Schema\DropTableCommand.cs" />
-    <Compile Include="DataMigration\Schema\AlterTableCommand.cs" />
-    <Compile Include="DataMigration\Commands\DataMigrationCommands.cs" />
-    <Compile Include="DataMigration\Schema\SchemaBuilder.cs" />
-    <Compile Include="DataMigration\DataMigrationCoordinator.cs" />
-    <Compile Include="DataMigration\IDataMigrationCommand.cs" />
-    <Compile Include="DataMigration\DefaultDataMigrationGenerator.cs" />
-    <Compile Include="DataMigration\IDataMigrationGenerator.cs" />
-    <Compile Include="DataMigration\DataMigration.cs" />
-    <Compile Include="DataMigration\DataMigrationManager.cs" />
-    <Compile Include="DataMigration\DataMigrationRecord.cs" />
-    <Compile Include="DataMigration\IDataMigration.cs" />
-    <Compile Include="DataMigration\IDataMigrationManager.cs" />
-    <Compile Include="DataMigration\Schema\ColumnCommand.cs" />
-    <Compile Include="DataMigration\Schema\CreateTableCommand.cs" />
-    <Compile Include="DataMigration\Schema\TableCommand.cs" />
-    <Compile Include="DataMigration\Schema\SchemaCommand.cs" />
+    <Compile Include="ContentManagement\DataMigrations\FrameworkDataMigration.cs" />
+    <Compile Include="Data\Migration\Interpreters\ICommandInterpreter.cs" />
+    <Compile Include="Data\Migration\Interpreters\DefaultDataMigrationInterpreter.cs" />
+    <Compile Include="Data\Migration\Interpreters\IDataMigrationInterpreter.cs" />
+    <Compile Include="Data\Migration\Interpreters\SqLiteCommandInterpreter.cs" />
+    <Compile Include="Data\Migration\Schema\AddColumnCommand.cs" />
+    <Compile Include="Data\Migration\Schema\ISchemaBuilderCommand.cs" />
+    <Compile Include="Data\Migration\Schema\IShellSettings.cs" />
+    <Compile Include="Data\Migration\Schema\SqlStatementCommand.cs" />
+    <Compile Include="Data\Migration\Schema\CreateColumnCommand.cs" />
+    <Compile Include="Data\Migration\Schema\CreateForeignKeyCommand.cs" />
+    <Compile Include="Data\Migration\Schema\DropForeignKeyCommand.cs" />
+    <Compile Include="Data\Migration\Schema\DropIndexCommand.cs" />
+    <Compile Include="Data\Migration\Schema\AddIndexCommand.cs" />
+    <Compile Include="Data\Migration\Schema\DropColumnCommand.cs" />
+    <Compile Include="Data\Migration\Schema\AlterColumnCommand.cs" />
+    <Compile Include="Data\Migration\Schema\DropTableCommand.cs" />
+    <Compile Include="Data\Migration\Schema\AlterTableCommand.cs" />
+    <Compile Include="Data\Migration\Commands\DataMigrationCommands.cs" />
+    <Compile Include="Data\Migration\Schema\SchemaBuilder.cs" />
+    <Compile Include="Data\Migration\DataMigrationCoordinator.cs" />
+    <Compile Include="Data\Migration\DefaultDataMigrationGenerator.cs" />
+    <Compile Include="Data\Migration\IDataMigrationGenerator.cs" />
+    <Compile Include="Data\Migration\DataMigration.cs" />
+    <Compile Include="Data\Migration\DataMigrationManager.cs" />
+    <Compile Include="Data\Migration\Records\DataMigrationRecord.cs" />
+    <Compile Include="Data\Migration\IDataMigration.cs" />
+    <Compile Include="Data\Migration\IDataMigrationManager.cs" />
+    <Compile Include="Data\Migration\Schema\ColumnCommand.cs" />
+    <Compile Include="Data\Migration\Schema\CreateTableCommand.cs" />
+    <Compile Include="Data\Migration\Schema\TableCommand.cs" />
+    <Compile Include="Data\Migration\Schema\SchemaCommand.cs" />
     <Compile Include="Data\Providers\DataServiceParameters.cs" />
     <Compile Include="Data\Providers\IDataServicesProvider.cs" />
     <Compile Include="Data\Providers\SessionFactoryParameters.cs" />
@@ -462,6 +463,7 @@
     <Compile Include="Environment\DefaultOrchardHost.cs" />
     <Compile Include="Mvc\OrchardControllerFactory.cs" />
     <Compile Include="Environment\IOrchardHost.cs" />
+    <Compile Include="Mvc\ViewEngines\WebForms\WebFormViewEngineForAspNet4.cs" />
     <Compile Include="OrchardCoreException.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
     <Compile Include="Indexing\IIndexDocument.cs" />
@@ -556,7 +558,7 @@
     <Compile Include="Mvc\Routes\UrlPrefix.cs" />
     <Compile Include="Mvc\Routes\UrlPrefixAdjustedHttpContext.cs" />
     <Compile Include="Mvc\Routes\ShellRoute.cs" />
-    <Compile Include="Mvc\ViewEngines\ThemeViewLocationCache.cs" />
+    <Compile Include="Mvc\ViewEngines\WebForms\ThemeViewLocationCache.cs" />
     <Compile Include="Mvc\ViewModels\AdaptedViewModel.cs" />
     <Compile Include="Mvc\ViewUserControl.cs">
       <SubType>ASPXCodeBehind</SubType>
@@ -643,7 +645,7 @@
     <Compile Include="Mvc\ViewEngines\LayoutViewEngine.cs" />
     <Compile Include="Mvc\ViewEngines\LayoutViewContext.cs" />
     <Compile Include="Mvc\ViewEngines\ViewEngineFilter.cs" />
-    <Compile Include="Mvc\ViewEngines\WebFormsViewEngineProvider.cs" />
+    <Compile Include="Mvc\ViewEngines\WebForms\WebFormViewEngineProvider.cs" />
     <Compile Include="Mvc\ViewModels\BaseViewModel.cs" />
     <Compile Include="UI\Admin\AdminThemeSelector.cs" />
     <Compile Include="UI\Navigation\INavigationManager.cs" />