diff --git a/src/Orchard.Web/Core/Common/Migrations.cs b/src/Orchard.Web/Core/Common/Migrations.cs
index 0ba7d18ce..f66d75518 100644
--- a/src/Orchard.Web/Core/Common/Migrations.cs
+++ b/src/Orchard.Web/Core/Common/Migrations.cs
@@ -1,64 +1,40 @@
 using System;
-using System.Collections.Generic;
-using Orchard.ContentManagement.Drivers;
 using Orchard.ContentManagement.MetaData;
-using Orchard.ContentManagement.MetaData.Builders;
-using Orchard.Core.Common.Models;
 using Orchard.Core.Contents.Extensions;
 using Orchard.Data.Migration;
 
 namespace Orchard.Core.Common {
     public class Migrations : DataMigrationImpl {
         public int Create() {
-            //CREATE TABLE Common_BodyPartRecord (Id INTEGER not null, Text TEXT, Format TEXT, ContentItemRecord_id INTEGER, primary key (Id));
-            SchemaBuilder.CreateTable("BodyPartRecord", table => table
-                .ContentPartVersionRecord()
-                .Column<string>("Text", column => column.Unlimited())
-                .Column<string>("Format")
+            SchemaBuilder.CreateTable("BodyPartRecord", 
+                table => table
+                    .ContentPartVersionRecord()
+                    .Column<string>("Text", column => column.Unlimited())
+                    .Column<string>("Format")
                 );
 
-            //CREATE TABLE Common_CommonPartRecord (Id INTEGER not null, OwnerId INTEGER, CreatedUtc DATETIME, PublishedUtc DATETIME, ModifiedUtc DATETIME, Container_id INTEGER, primary key (Id));
-            SchemaBuilder.CreateTable("CommonPartRecord", table => table
-                .ContentPartRecord()
-                .Column<int>("OwnerId")
-                .Column<DateTime>("CreatedUtc")
-                .Column<DateTime>("PublishedUtc")
-                .Column<DateTime>("ModifiedUtc")
-                .Column<int>("Container_id")
+            SchemaBuilder.CreateTable("CommonPartRecord", 
+                table => table
+                    .ContentPartRecord()
+                    .Column<int>("OwnerId")
+                    .Column<DateTime>("CreatedUtc")
+                    .Column<DateTime>("PublishedUtc")
+                    .Column<DateTime>("ModifiedUtc")
+                    .Column<int>("Container_id")
                 );
             
-            //CREATE TABLE Common_CommonPartVersionRecord (Id INTEGER not null, CreatedUtc DATETIME, PublishedUtc DATETIME, ModifiedUtc DATETIME, ContentItemRecord_id INTEGER, primary key (Id));
-            SchemaBuilder.CreateTable("CommonPartVersionRecord", table => table
-                .ContentPartVersionRecord()
-                .Column<DateTime>("CreatedUtc")
-                .Column<DateTime>("PublishedUtc")
-                .Column<DateTime>("ModifiedUtc")
+            SchemaBuilder.CreateTable("CommonPartVersionRecord", 
+                table => table
+                    .ContentPartVersionRecord()
+                    .Column<DateTime>("CreatedUtc")
+                    .Column<DateTime>("PublishedUtc")
+                    .Column<DateTime>("ModifiedUtc")
                 );
 
+            ContentDefinitionManager.AlterPartDefinition("BodyPart", builder => builder.Attachable());
+            ContentDefinitionManager.AlterPartDefinition("CommonPart", builder => builder.Attachable());
+
             return 1;
         }
-
-        public int UpdateFrom1() {
-            ContentDefinitionManager.AlterPartDefinition(typeof(BodyPart).Name, cfg => cfg
-                .WithLocation(new Dictionary<string, ContentLocation> {
-                    {"Default", new ContentLocation { Zone = "Primary", Position = "5" }},
-                }));
-            return 2;
-        }
-
-        public int UpdateFrom2() {
-            ContentDefinitionManager.AlterPartDefinition(typeof(CommonPart).Name, cfg => cfg
-                .WithLocation(new Dictionary<string, ContentLocation> {
-                    {"Default", new ContentLocation { Zone = "metadata", Position = "5" }},
-                    {"Editor", new ContentLocation { Zone = "Primary", Position = "20" }},
-                }));
-            return 3;
-        }
-
-        public int UpdateFrom3() {
-            ContentDefinitionManager.AlterPartDefinition("BodyPart", builder => builder.Attachable());
-            ContentDefinitionManager.AlterPartDefinition("CommonPart", builder => builder.Attachable());
-            return 4;
-        }
     }
 }
\ No newline at end of file
diff --git a/src/Orchard.Web/Core/Localization/Migrations.cs b/src/Orchard.Web/Core/Localization/Migrations.cs
index 9671367df..822427bbb 100644
--- a/src/Orchard.Web/Core/Localization/Migrations.cs
+++ b/src/Orchard.Web/Core/Localization/Migrations.cs
@@ -1,36 +1,21 @@
-using System.Collections.Generic;
-using Orchard.ContentManagement.Drivers;
-using Orchard.ContentManagement.MetaData;
-using Orchard.ContentManagement.MetaData.Builders;
+using Orchard.ContentManagement.MetaData;
 using Orchard.Core.Contents.Extensions;
-using Orchard.Core.Localization.Models;
 using Orchard.Data.Migration;
 
 namespace Orchard.Core.Localization {
     public class Migrations : DataMigrationImpl {
 
         public int Create() {
-            //CREATE TABLE Localization_LocalizedRecord (Id INTEGER not null, CultureId INTEGER, MasterContentItemId INTEGER, primary key (Id));
-            SchemaBuilder.CreateTable("LocalizationPartRecord", table => table
-                .ContentPartRecord()
-                .Column<int>("CultureId")
-                .Column<int>("MasterContentItemId")
+            SchemaBuilder.CreateTable("LocalizationPartRecord", 
+                table => table
+                    .ContentPartRecord()
+                    .Column<int>("CultureId")
+                    .Column<int>("MasterContentItemId")
                 );
 
+            ContentDefinitionManager.AlterPartDefinition("LocalizationPart", builder => builder.Attachable());
+
             return 1;
         }
-        public int UpdateFrom1() {
-            ContentDefinitionManager.AlterPartDefinition(typeof(LocalizationPart).Name, cfg => cfg
-                .WithLocation(new Dictionary<string, ContentLocation> {
-                    {"Default", new ContentLocation { Zone = "Primary", Position = "5" }},
-                    {"Editor", new ContentLocation { Zone = "Primary", Position = "1" }},
-                }));
-            return 2;
-        }
-
-        public int UpdateFrom2() {
-            ContentDefinitionManager.AlterPartDefinition("LocalizationPart", builder => builder.Attachable());
-            return 3;
-        }
     }
 }
\ No newline at end of file
diff --git a/src/Orchard.Web/Core/Navigation/Migrations.cs b/src/Orchard.Web/Core/Navigation/Migrations.cs
index cbd7e1394..16eaee1e3 100644
--- a/src/Orchard.Web/Core/Navigation/Migrations.cs
+++ b/src/Orchard.Web/Core/Navigation/Migrations.cs
@@ -1,52 +1,32 @@
-using System.Collections.Generic;
-using Orchard.ContentManagement.Drivers;
-using Orchard.ContentManagement.MetaData;
-using Orchard.ContentManagement.MetaData.Builders;
+using Orchard.ContentManagement.MetaData;
 using Orchard.Core.Contents.Extensions;
-using Orchard.Core.Navigation.Models;
 using Orchard.Data.Migration;
 
 namespace Orchard.Core.Navigation {
     public class Migrations : DataMigrationImpl {
 
         public int Create() {
-            //CREATE TABLE Navigation_MenuItemRecord (Id INTEGER not null, Url TEXT, primary key (Id));
-            SchemaBuilder.CreateTable("MenuItemPartRecord", table => table
-                .ContentPartRecord()
-                .Column<string>("Url")
+            SchemaBuilder.CreateTable("MenuItemPartRecord", 
+                table => table
+                    .ContentPartRecord()
+                    .Column<string>("Url", column => column.WithLength(1024))
                 );
 
-            //CREATE TABLE Navigation_MenuPartRecord (Id INTEGER not null, MenuText TEXT, MenuPosition TEXT, OnMainMenu INTEGER, primary key (Id));
-            SchemaBuilder.CreateTable("MenuPartRecord", table => table
-                .ContentPartRecord()
-                .Column<string>("MenuText")
-                .Column<string>("MenuPosition")
-                .Column<bool>("OnMainMenu")
+            SchemaBuilder.CreateTable("MenuPartRecord", 
+                table => table
+                    .ContentPartRecord()
+                    .Column<string>("MenuText")
+                    .Column<string>("MenuPosition")
+                    .Column<bool>("OnMainMenu")
                 );
 
-            return 1;
-        }
-
-        public int UpdateFrom1() {
-
             ContentDefinitionManager.AlterTypeDefinition("Blog", cfg => cfg.WithPart("MenuPart"));
             ContentDefinitionManager.AlterTypeDefinition("Page", cfg => cfg.WithPart("MenuPart"));
             ContentDefinitionManager.AlterTypeDefinition("MenuItem", cfg => cfg.WithPart("MenuPart"));
-
-            return 2;
-        }
-
-        public int UpdateFrom2() {
-            ContentDefinitionManager.AlterPartDefinition(typeof(MenuPart).Name, cfg => cfg
-                .WithLocation(new Dictionary<string, ContentLocation> {
-                    {"Editor", new ContentLocation { Zone = "Primary", Position = "9" }}
-                }));
-            return 3;
-        }
-
-        public int UpdateFrom3() {
             ContentDefinitionManager.AlterPartDefinition("MenuPart", builder => builder.Attachable());
-            return 4;
+            
+            return 1;
         }
+
     }
 }
\ No newline at end of file
diff --git a/src/Orchard.Web/Core/PublishLater/Migrations.cs b/src/Orchard.Web/Core/PublishLater/Migrations.cs
index 8dd9f9522..061975733 100644
--- a/src/Orchard.Web/Core/PublishLater/Migrations.cs
+++ b/src/Orchard.Web/Core/PublishLater/Migrations.cs
@@ -1,9 +1,5 @@
-using System.Collections.Generic;
-using Orchard.ContentManagement.Drivers;
-using Orchard.ContentManagement.MetaData;
-using Orchard.ContentManagement.MetaData.Builders;
+using Orchard.ContentManagement.MetaData;
 using Orchard.Core.Contents.Extensions;
-using Orchard.Core.PublishLater.Models;
 using Orchard.Data.Migration;
 
 namespace Orchard.Core.PublishLater {
diff --git a/src/Orchard.Web/Core/Routable/Migrations.cs b/src/Orchard.Web/Core/Routable/Migrations.cs
index 3a13ba07d..4105ca610 100644
--- a/src/Orchard.Web/Core/Routable/Migrations.cs
+++ b/src/Orchard.Web/Core/Routable/Migrations.cs
@@ -1,38 +1,22 @@
-using System.Collections.Generic;
-using Orchard.ContentManagement.Drivers;
-using Orchard.ContentManagement.MetaData;
-using Orchard.ContentManagement.MetaData.Builders;
+using Orchard.ContentManagement.MetaData;
 using Orchard.Core.Contents.Extensions;
-using Orchard.Core.Routable.Models;
 using Orchard.Data.Migration;
 
 namespace Orchard.Core.Routable {
     public class Migrations : DataMigrationImpl {
 
         public int Create() {
-            //CREATE TABLE Routable_RoutableRecord (Id INTEGER not null, Title TEXT, Slug TEXT, Path TEXT, ContentItemRecord_id INTEGER, primary key (Id));
-            SchemaBuilder.CreateTable("RoutePartRecord", table => table
-                .ContentPartVersionRecord()
-                .Column<string>("Title", column => column.WithLength(1024))
-                .Column<string>("Slug")
-                .Column<string>("Path", column => column.WithLength(2048))
+            SchemaBuilder.CreateTable("RoutePartRecord", 
+                table => table
+                    .ContentPartVersionRecord()
+                    .Column<string>("Title", column => column.WithLength(1024))
+                    .Column<string>("Slug")
+                    .Column<string>("Path", column => column.WithLength(2048))
                 );
 
+            ContentDefinitionManager.AlterPartDefinition("RoutePart", builder => builder.Attachable());
+
             return 1;
         }
-
-        public int UpdateFrom1() {
-            ContentDefinitionManager.AlterPartDefinition(typeof(RoutePart).Name, cfg => cfg
-                .WithLocation(new Dictionary<string, ContentLocation> {
-                    {"Editor", new ContentLocation { Zone = "Primary", Position = "before.5" }}
-                } ));
-
-            return 2;
-        }
-
-        public int UpdateFrom2() {
-            ContentDefinitionManager.AlterPartDefinition("RoutePart", builder => builder.Attachable());
-            return 3;
-        }
     }
 }
\ No newline at end of file
diff --git a/src/Orchard.Web/Core/Scheduling/Migrations.cs b/src/Orchard.Web/Core/Scheduling/Migrations.cs
index 94b452c15..2c8faab07 100644
--- a/src/Orchard.Web/Core/Scheduling/Migrations.cs
+++ b/src/Orchard.Web/Core/Scheduling/Migrations.cs
@@ -5,12 +5,13 @@ namespace Orchard.Core.Scheduling {
     public class Migrations : 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().Identity())
-                .Column<string>("TaskType")
-                .Column<DateTime>("ScheduledUtc")
-                .Column<int>("ContentItemVersionRecord_id")
+            
+            SchemaBuilder.CreateTable("ScheduledTaskRecord", 
+                table => table
+                    .Column<int>("Id", column => column.PrimaryKey().Identity())
+                    .Column<string>("TaskType")
+                    .Column<DateTime>("ScheduledUtc")
+                    .Column<int>("ContentItemVersionRecord_id")
                 );
 
             return 1;
diff --git a/src/Orchard.Web/Core/Settings/Migrations.cs b/src/Orchard.Web/Core/Settings/Migrations.cs
index b1c2f86ee..17c0b9561 100644
--- a/src/Orchard.Web/Core/Settings/Migrations.cs
+++ b/src/Orchard.Web/Core/Settings/Migrations.cs
@@ -1,105 +1,98 @@
-using System.Data;
-using Orchard.Data.Migration;
+using Orchard.Data.Migration;
 
 namespace Orchard.Core.Settings {
     public class Migrations : 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().Identity())
-                .Column<string>("Name")
+            SchemaBuilder.CreateTable("ContentFieldDefinitionRecord", 
+                table => table
+                    .Column<int>("Id", column => column.PrimaryKey().Identity())
+                    .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().Identity())
-                .Column<string>("Name")
-                .Column<bool>("Hidden")
-                .Column<string>("Settings", column => column.Unlimited())
+            SchemaBuilder.CreateTable("ContentPartDefinitionRecord", 
+                table => table
+                    .Column<int>("Id", column => column.PrimaryKey().Identity())
+                    .Column<string>("Name")
+                    .Column<bool>("Hidden")
+                    .Column<string>("Settings", column => column.Unlimited())
                 );
 
-            //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().Identity())
-                .Column<string>("Name")
-                .Column<string>("Settings", column => column.Unlimited())
-                .Column<int>("ContentFieldDefinitionRecord_id")
-                .Column<int>("ContentPartDefinitionRecord_Id")
+            SchemaBuilder.CreateTable("ContentPartFieldDefinitionRecord", 
+                table => table
+                    .Column<int>("Id", column => column.PrimaryKey().Identity())
+                    .Column<string>("Name")
+                    .Column<string>("Settings", column => column.Unlimited())
+                    .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().Identity())
-                .Column<string>("Name")
-                .Column<string>("DisplayName")
-                .Column<bool>("Hidden")
-                .Column<string>("Settings", column => column.Unlimited())
+            SchemaBuilder.CreateTable("ContentTypeDefinitionRecord", 
+                table => table
+                    .Column<int>("Id", column => column.PrimaryKey().Identity())
+                    .Column<string>("Name")
+                    .Column<string>("DisplayName")
+                    .Column<bool>("Hidden")
+                    .Column<string>("Settings", column => column.Unlimited())
                 );
 
-            //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().Identity())
-                .Column<string>("Settings", column => column.Unlimited())
-                .Column<int>("ContentPartDefinitionRecord_id")
-                .Column<int>("ContentTypeDefinitionRecord_Id")
+            SchemaBuilder.CreateTable("ContentTypePartDefinitionRecord", 
+                table => table
+                    .Column<int>("Id", column => column.PrimaryKey().Identity())
+                    .Column<string>("Settings", column => column.Unlimited())
+                    .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().Identity())
-                .Column<int>("SerialNumber")
+            SchemaBuilder.CreateTable("ShellDescriptorRecord", 
+                table => table
+                    .Column<int>("Id", column => column.PrimaryKey().Identity())
+                    .Column<int>("SerialNumber")
                 );
 
-            //CREATE TABLE Settings_ShellFeatureRecord (Id  integer, Name TEXT, ShellDescriptorRecord_id INTEGER, primary key (Id));
-            SchemaBuilder.CreateTable("ShellFeatureRecord", table => table
+            SchemaBuilder.CreateTable("ShellFeatureRecord", 
+                table => table
                     .Column<int>("Id", column => column.PrimaryKey().Identity())
                     .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().Identity())
-                .Column<string>("Name")
-                .Column<string>("InstallState")
-                .Column<string>("EnableState")
-                .Column<int>("ShellStateRecord_Id")
+            SchemaBuilder.CreateTable("ShellFeatureStateRecord", 
+                table => table
+                    .Column<int>("Id", column => column.PrimaryKey().Identity())
+                    .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().Identity())
-                .Column<string>("Component")
-                .Column<string>("Name")
-                .Column<string>("Value")
-                .Column<int>("ShellDescriptorRecord_id")
+            SchemaBuilder.CreateTable("ShellParameterRecord", 
+                table => table
+                    .Column<int>("Id", column => column.PrimaryKey().Identity())
+                    .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().Identity())
-                .Column<string>("Unused")
+            SchemaBuilder.CreateTable("ShellStateRecord", 
+                table => table
+                    .Column<int>("Id", column => column.PrimaryKey().Identity())
+                    .Column<string>("Unused")
                 );
 
-            //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("SiteSettingsPartRecord", table => table
-                .ContentPartRecord()
-                .Column<string>("SiteSalt")
-                .Column<string>("SiteName")
-                .Column<string>("SuperUser")
-                .Column<string>("PageTitleSeparator")
-                .Column<string>("HomePage")
-                .Column<string>("SiteCulture")
+            SchemaBuilder.CreateTable("SiteSettingsPartRecord", 
+                table => table
+                    .ContentPartRecord()
+                    .Column<string>("SiteSalt")
+                    .Column<string>("SiteName")
+                    .Column<string>("SuperUser")
+                    .Column<string>("PageTitleSeparator")
+                    .Column<string>("HomePage")
+                    .Column<string>("SiteCulture")
+                    .Column<string>("ResourceDebugMode", c => c.WithDefault("FromAppSetting"))
                 );
 
             return 1;
         }
-
-        public int UpdateFrom1() {
-            SchemaBuilder.AlterTable("SiteSettingsPartRecord", table => table
-                .AddColumn("ResourceDebugMode", DbType.String, column => column.WithDefault("FromAppSetting"))
-                );
-            return 2;
-        }
     }
 }
\ No newline at end of file
diff --git a/src/Orchard.Web/Modules/Orchard.Blogs/Migrations.cs b/src/Orchard.Web/Modules/Orchard.Blogs/Migrations.cs
index 1c1babfdf..47605d5ba 100644
--- a/src/Orchard.Web/Modules/Orchard.Blogs/Migrations.cs
+++ b/src/Orchard.Web/Modules/Orchard.Blogs/Migrations.cs
@@ -1,43 +1,49 @@
-using System.Collections.Generic;
-using System.Data;
-using Orchard.Blogs.Models;
-using Orchard.ContentManagement.Drivers;
+using System.Data;
 using Orchard.ContentManagement.MetaData;
-using Orchard.ContentManagement.MetaData.Builders;
 using Orchard.Data.Migration;
 
 namespace Orchard.Blogs {
     public class Migrations : DataMigrationImpl {
 
         public int Create() {
-            //CREATE TABLE Orchard_Blogs_BlogPartArchiveRecord (Id  integer, Year INTEGER, Month INTEGER, PostCount INTEGER, Blog_id INTEGER, primary key (Id));
-            SchemaBuilder.CreateTable("BlogPartArchiveRecord", table => table
-                .Column<int>("Id", column => column.PrimaryKey().Identity())
-                .Column<int>("Year")
-                .Column<int>("Month")
-                .Column<int>("PostCount")
-                .Column<int>("BlogPart_id")
+            SchemaBuilder.CreateTable("BlogPartArchiveRecord", 
+                table => table
+                    .Column<int>("Id", column => column.PrimaryKey().Identity())
+                    .Column<int>("Year")
+                    .Column<int>("Month")
+                    .Column<int>("PostCount")
+                    .Column<int>("BlogPart_id")
                 );
 
-            //CREATE TABLE Orchard_Blogs_BlogPartRecord (Id INTEGER not null, Description TEXT, PostCount INTEGER, primary key (Id));
-            SchemaBuilder.CreateTable("BlogPartRecord", table => table
-                .ContentPartRecord()
-                .Column<string>("Description")
-                .Column<int>("PostCount")
+            SchemaBuilder.CreateTable("BlogPartRecord", 
+                table => table
+                    .ContentPartRecord()
+                    .Column<string>("Description", c => c.Unlimited())
+                    .Column<int>("PostCount")
                 );
 
-            return 1;
-        }
+            SchemaBuilder.CreateTable("RecentBlogPostsPartRecord", 
+                table => table
+                    .ContentPartRecord()
+                    .Column<string>("BlogSlug")
+                    .Column<int>("Count")
+                );
+
+            SchemaBuilder.CreateTable("BlogArchivesPartRecord", 
+                table => table
+                    .ContentPartRecord()
+                    .Column<string>("BlogSlug", c => c.WithLength(255))
+                );
 
-        public int UpdateFrom1() {
             ContentDefinitionManager.AlterTypeDefinition("Blog",
                 cfg => cfg
                     .WithPart("BlogPart")
                     .WithPart("CommonPart")
                     .WithPart("RoutePart")
+                    .WithPart("BlogPagerPart")
                 );
 
-            ContentDefinitionManager.AlterTypeDefinition("BlogPost", 
+            ContentDefinitionManager.AlterTypeDefinition("BlogPost",
                 cfg => cfg
                     .WithPart("BlogPostPart")
                     .WithPart("CommonPart")
@@ -45,25 +51,7 @@ namespace Orchard.Blogs {
                     .WithPart("RoutePart")
                     .WithPart("BodyPart")
                 );
-
-            return 2;
-        }
-        
-        public int UpdateFrom2() {
-            ContentDefinitionManager.AlterPartDefinition(typeof(BlogPart).Name, cfg => cfg
-                .WithLocation(new Dictionary<string, ContentLocation> {
-                    {"Editor", new ContentLocation { Zone = "Primary", Position = "1" }}
-                }));
-            return 3;
-        }
-
-        public int UpdateFrom3() {
-            SchemaBuilder.CreateTable("RecentBlogPostsPartRecord", table => table
-                .ContentPartRecord()
-                .Column<string>("BlogSlug")
-                .Column<int>("Count")
-                );
-
+            
             ContentDefinitionManager.AlterTypeDefinition("RecentBlogPosts",
                 cfg => cfg
                     .WithPart("RecentBlogPostsPart")
@@ -71,14 +59,6 @@ namespace Orchard.Blogs {
                     .WithPart("WidgetPart")
                     .WithSetting("Stereotype", "Widget")
                 );
-            return 4;
-        }
-
-        public int UpdateFrom4() {
-            SchemaBuilder.CreateTable("BlogArchivesPartRecord", table => table
-                .ContentPartRecord()
-                .Column<string>("BlogSlug", c => c.WithLength(255))
-                );
 
             ContentDefinitionManager.AlterTypeDefinition("BlogArchives",
                 cfg => cfg
@@ -87,22 +67,8 @@ namespace Orchard.Blogs {
                     .WithPart("WidgetPart")
                     .WithSetting("Stereotype", "Widget")
                 );
-            
-            return 5;
-        }
 
-        public int UpdateFrom5() {
-            ContentDefinitionManager.AlterTypeDefinition("Blog",
-                cfg => cfg.WithPart("BlogPagerPart"));
-            return 6;
-        }
-
-        public int UpdateFrom6() {
-            SchemaBuilder.AlterTable("BlogPartRecord", table => table
-                .AlterColumn("Description", c => c.WithType(DbType.String).Unlimited())
-                );
-
-            return 7;
+            return 1;
         }
     }
 }
\ No newline at end of file
diff --git a/src/Orchard.Web/Modules/Orchard.Comments/Migrations.cs b/src/Orchard.Web/Modules/Orchard.Comments/Migrations.cs
index 047fecf2a..8297c3fa3 100644
--- a/src/Orchard.Web/Modules/Orchard.Comments/Migrations.cs
+++ b/src/Orchard.Web/Modules/Orchard.Comments/Migrations.cs
@@ -1,9 +1,5 @@
 using System;
-using System.Collections.Generic;
-using Orchard.Comments.Models;
-using Orchard.ContentManagement.Drivers;
 using Orchard.ContentManagement.MetaData;
-using Orchard.ContentManagement.MetaData.Builders;
 using Orchard.Core.Contents.Extensions;
 using Orchard.Data.Migration;
 
@@ -11,13 +7,11 @@ namespace Orchard.Comments {
     public class Migrations : 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().Identity())
                 .Column<int>("ContentItemId")
                 );
 
-            //CREATE TABLE Orchard_Comments_CommentPartRecord (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("CommentPartRecord", table => table
                 .ContentPartRecord()
                 .Column<string>("Author")
@@ -31,7 +25,6 @@ namespace Orchard.Comments {
                 .Column<int>("CommentedOnContainer")
                 );
 
-            //CREATE TABLE Orchard_Comments_CommentSettingsPartRecord (Id INTEGER not null, ModerateComments INTEGER, EnableSpamProtection INTEGER, AkismetKey TEXT, AkismetUrl TEXT, primary key (Id));
             SchemaBuilder.CreateTable("CommentSettingsPartRecord", table => table
                 .ContentPartRecord()
                 .Column<bool>("ModerateComments")
@@ -40,17 +33,12 @@ namespace Orchard.Comments {
                 .Column<string>("AkismetUrl")
                );
 
-            //CREATE TABLE Orchard_Comments_CommentsPartRecord (Id INTEGER not null, CommentsShown INTEGER, CommentsActive INTEGER, primary key (Id));
             SchemaBuilder.CreateTable("CommentsPartRecord", table => table
                 .ContentPartRecord()
                 .Column<bool>("CommentsShown")
                 .Column<bool>("CommentsActive")
                 );
 
-            return 1;
-        }
-
-        public int UpdateFrom1() {
             ContentDefinitionManager.AlterTypeDefinition("Comment",
                cfg => cfg
                    .WithPart("CommentPart")
@@ -62,31 +50,9 @@ namespace Orchard.Comments {
                    .WithPart("CommentsContainerPart")
                 );
 
-            return 2;
-        }
-
-        public int UpdateFrom2() {
-            ContentDefinitionManager.AlterPartDefinition(typeof(CommentsPart).Name, cfg => cfg
-                .WithLocation(new Dictionary<string, ContentLocation> {
-                    {"Default", new ContentLocation { Zone = "Primary", Position = "before.5" }},
-                    {"Detail", new ContentLocation { Zone = "Primary", Position = "after.5" }},
-                    {"SummaryAdmin", new ContentLocation { Zone = "meta", Position = null }},
-                    {"Summary", new ContentLocation { Zone = "meta", Position = "5" }},
-                    {"Editor", new ContentLocation { Zone = "Primary", Position = "10" }},
-                }));
-
-            ContentDefinitionManager.AlterPartDefinition(typeof(CommentsContainerPart).Name, cfg => cfg
-                .WithLocation(new Dictionary<string, ContentLocation> {
-                    {"SummaryAdmin", new ContentLocation { Zone = "meta", Position = null }},
-                    {"Summary", new ContentLocation { Zone = "meta", Position = null }},
-                }));
-
-            return 3;
-        }
-
-        public int UpdateFrom3() {
             ContentDefinitionManager.AlterPartDefinition("CommentsPart", builder => builder.Attachable());
-            return 4;
+
+            return 1;
         }
     }
 }
\ No newline at end of file
diff --git a/src/Orchard.Web/Modules/Orchard.Email/Migrations.cs b/src/Orchard.Web/Modules/Orchard.Email/Migrations.cs
index 5bbf3f693..6cbc8aa28 100644
--- a/src/Orchard.Web/Modules/Orchard.Email/Migrations.cs
+++ b/src/Orchard.Web/Modules/Orchard.Email/Migrations.cs
@@ -5,15 +5,16 @@ namespace Orchard.Email {
 
         public int Create() {
 
-            SchemaBuilder.CreateTable("SmtpSettingsPartRecord", table => table
-                .ContentPartRecord()
-                .Column<string>("Address")
-                .Column<string>("Host")
-                .Column<int>("Port")
-                .Column<bool>("EnableSsl")
-                .Column<bool>("RequireCredentials")
-                .Column<string>("UserName")
-                .Column<string>("Password")
+            SchemaBuilder.CreateTable("SmtpSettingsPartRecord", 
+                table => table
+                    .ContentPartRecord()
+                    .Column<string>("Address")
+                    .Column<string>("Host")
+                    .Column<int>("Port")
+                    .Column<bool>("EnableSsl")
+                    .Column<bool>("RequireCredentials")
+                    .Column<string>("UserName")
+                    .Column<string>("Password")
                 );
 
             return 1;
diff --git a/src/Orchard.Web/Modules/Orchard.Indexing/Migrations.cs b/src/Orchard.Web/Modules/Orchard.Indexing/Migrations.cs
index b1ac79896..596cf9959 100644
--- a/src/Orchard.Web/Modules/Orchard.Indexing/Migrations.cs
+++ b/src/Orchard.Web/Modules/Orchard.Indexing/Migrations.cs
@@ -5,11 +5,12 @@ namespace Orchard.Indexing {
     public class Migrations : DataMigrationImpl {
 
         public int Create() {
-            SchemaBuilder.CreateTable("IndexingTaskRecord", table => table
-                .Column<int>("Id", column => column.PrimaryKey().Identity())
-                .Column<int>("Action")
-                .Column<DateTime>("CreatedUtc")
-                .Column<int>("ContentItemRecord_id")
+            SchemaBuilder.CreateTable("IndexingTaskRecord", 
+                table => table
+                    .Column<int>("Id", column => column.PrimaryKey().Identity())
+                    .Column<int>("Action")
+                    .Column<DateTime>("CreatedUtc")
+                    .Column<int>("ContentItemRecord_id")
                 );
 
             return 1;
diff --git a/src/Orchard.Web/Modules/Orchard.Roles/Migrations.cs b/src/Orchard.Web/Modules/Orchard.Roles/Migrations.cs
index 2fe54e503..e4e7c228c 100644
--- a/src/Orchard.Web/Modules/Orchard.Roles/Migrations.cs
+++ b/src/Orchard.Web/Modules/Orchard.Roles/Migrations.cs
@@ -4,33 +4,33 @@ namespace Orchard.Roles {
     public class RolesDataMigration : DataMigrationImpl {
 
         public int Create() {
-            //CREATE TABLE Orchard_Roles_PermissionRecord (Id  integer, Name TEXT, FeatureName TEXT, Description TEXT, primary key (Id));
-            SchemaBuilder.CreateTable("PermissionRecord", table => table
-                .Column<int>("Id", column => column.PrimaryKey().Identity())
-                .Column<string>("Name")
-                .Column<string>("FeatureName")
-                .Column<string>("Description")
+            SchemaBuilder.CreateTable("PermissionRecord", 
+                table => table
+                    .Column<int>("Id", column => column.PrimaryKey().Identity())
+                    .Column<string>("Name")
+                    .Column<string>("FeatureName")
+                    .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().Identity())
-                .Column<string>("Name")
+            SchemaBuilder.CreateTable("RoleRecord", 
+                table => table
+                    .Column<int>("Id", column => column.PrimaryKey().Identity())
+                    .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().Identity())
-                .Column<int>("Role_id")
-                .Column<int>("Permission_id")
-                .Column<int>("RoleRecord_Id")
+            SchemaBuilder.CreateTable("RolesPermissionsRecord", 
+                table => table
+                    .Column<int>("Id", column => column.PrimaryKey().Identity())
+                    .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("UserRolesPartRecord", table => table
-                .Column<int>("Id", column => column.PrimaryKey().Identity())
-                .Column<int>("UserId")
-                .Column<int>("Role_id")
+            SchemaBuilder.CreateTable("UserRolesPartRecord", 
+                table => table
+                    .Column<int>("Id", column => column.PrimaryKey().Identity())
+                    .Column<int>("UserId")
+                    .Column<int>("Role_id")
                 );
 
             return 1;
diff --git a/src/Orchard.Web/Modules/Orchard.Search/Migrations.cs b/src/Orchard.Web/Modules/Orchard.Search/Migrations.cs
index 5a9748a31..42aa6f327 100644
--- a/src/Orchard.Web/Modules/Orchard.Search/Migrations.cs
+++ b/src/Orchard.Web/Modules/Orchard.Search/Migrations.cs
@@ -8,14 +8,10 @@ namespace Orchard.Search {
 
             SchemaBuilder.CreateTable("SearchSettingsPartRecord", table => table
                 .ContentPartRecord()
-                .Column<bool>("FilterCulture")
-                .Column<string>("SearchedFields")
+                    .Column<bool>("FilterCulture")
+                    .Column<string>("SearchedFields", c => c.Unlimited())
                 );
 
-            return 1;
-        }
-
-        public int UpdateFrom1() {
             ContentDefinitionManager.AlterTypeDefinition("SearchForm",
                 cfg => cfg
                     .WithPart("SearchFormPart")
@@ -24,7 +20,7 @@ namespace Orchard.Search {
                     .WithSetting("Stereotype", "Widget")
                 );
 
-            return 2;
+            return 1;
         }
     }
 }
\ No newline at end of file
diff --git a/src/Orchard.Web/Modules/Orchard.Tags/Migrations.cs b/src/Orchard.Web/Modules/Orchard.Tags/Migrations.cs
index 2e8e30e5f..7e8e93a82 100644
--- a/src/Orchard.Web/Modules/Orchard.Tags/Migrations.cs
+++ b/src/Orchard.Web/Modules/Orchard.Tags/Migrations.cs
@@ -1,42 +1,27 @@
-using System.Collections.Generic;
-using Orchard.ContentManagement.Drivers;
-using Orchard.ContentManagement.MetaData;
-using Orchard.ContentManagement.MetaData.Builders;
+using Orchard.ContentManagement.MetaData;
 using Orchard.Core.Contents.Extensions;
 using Orchard.Data.Migration;
-using Orchard.Tags.Models;
 
 namespace Orchard.Tags {
     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().Identity())
-                .Column<string>("TagName")
+            SchemaBuilder.CreateTable("Tag", 
+                table => table
+                    .Column<int>("Id", column => column.PrimaryKey().Identity())
+                    .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().Identity())
-                .Column<int>("TagId")
-                .Column<int>("ContentItemId")
+            SchemaBuilder.CreateTable("TagsContentItems", 
+                table => table
+                    .Column<int>("Id", column => column.PrimaryKey().Identity())
+                    .Column<int>("TagId")
+                    .Column<int>("ContentItemId")
                 );
 
+            ContentDefinitionManager.AlterPartDefinition("TagsPart", builder => builder.Attachable());
+
             return 1;
         }
-        public int UpdateFrom1() {
-            ContentDefinitionManager.AlterPartDefinition(typeof(TagsPart).Name, cfg => cfg
-                .WithLocation(new Dictionary<string, ContentLocation> {
-                    {"Default", new ContentLocation { Zone = "Primary", Position = "49" }},
-                    {"Editor", new ContentLocation { Zone = "Primary", Position = "9" }},
-                }));
-            return 2;
-        }
-
-        public int UpdateFrom2() {
-            ContentDefinitionManager.AlterPartDefinition("TagsPart", builder => builder.Attachable());
-            return 3;
-        }
     }
 }
\ No newline at end of file
diff --git a/src/Orchard.Web/Modules/Orchard.Themes/Migrations.cs b/src/Orchard.Web/Modules/Orchard.Themes/Migrations.cs
index f2e6d2c3d..e57020226 100644
--- a/src/Orchard.Web/Modules/Orchard.Themes/Migrations.cs
+++ b/src/Orchard.Web/Modules/Orchard.Themes/Migrations.cs
@@ -4,10 +4,10 @@ namespace Orchard.Themes {
     public class ThemesDataMigration : DataMigrationImpl {
 
         public int Create() {
-            //CREATE TABLE Orchard_Themes_ThemeSiteSettingsRecord (Id INTEGER not null, CurrentThemeName TEXT, primary key (Id));
-            SchemaBuilder.CreateTable("ThemeSiteSettingsPartRecord", table => table
-                .ContentPartRecord()
-                .Column<string>("CurrentThemeName")
+            SchemaBuilder.CreateTable("ThemeSiteSettingsPartRecord", 
+                table => table
+                    .ContentPartRecord()
+                    .Column<string>("CurrentThemeName")
                 );
 
             return 1;
diff --git a/src/Orchard.Web/Modules/Orchard.Users/Migrations.cs b/src/Orchard.Web/Modules/Orchard.Users/Migrations.cs
index 0445c94ab..7c4725cd8 100644
--- a/src/Orchard.Web/Modules/Orchard.Users/Migrations.cs
+++ b/src/Orchard.Web/Modules/Orchard.Users/Migrations.cs
@@ -4,39 +4,31 @@ namespace Orchard.Users {
     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("UserPartRecord", table => table
-                .ContentPartRecord()
-                .Column<string>("UserName")
-                .Column<string>("Email")
-                .Column<string>("NormalizedUserName")
-                .Column<string>("Password")
-                .Column<string>("PasswordFormat")
-                .Column<string>("HashAlgorithm")
-                .Column<string>("PasswordSalt")
+            SchemaBuilder.CreateTable("UserPartRecord", 
+                table => table
+                    .ContentPartRecord()
+                    .Column<string>("UserName")
+                    .Column<string>("Email")
+                    .Column<string>("NormalizedUserName")
+                    .Column<string>("Password")
+                    .Column<string>("PasswordFormat")
+                    .Column<string>("HashAlgorithm")
+                    .Column<string>("PasswordSalt")
+                    .Column<string>("RegistrationStatus", c => c.WithDefault("Approved"))
+                    .Column<string>("EmailStatus", c => c.WithDefault("Approved"))
+                    .Column<string>("EmailChallengeToken")
+                );
+
+            SchemaBuilder.CreateTable("RegistrationSettingsPartRecord", 
+                table => table
+                    .ContentPartRecord()
+                    .Column<bool>("UsersCanRegister", c => c.WithDefault(false))
+                    .Column<bool>("UsersMustValidateEmail", c => c.WithDefault(false))
+                    .Column<bool>("UsersAreModerated", c => c.WithDefault(false))
+                    .Column<bool>("NotifyModeration", c => c.WithDefault(false))
                 );
 
             return 1;
         }
-
-        public int UpdateFrom1() {
-
-            // Adds registration fields to previous versions
-            SchemaBuilder
-                .AlterTable("UserPartRecord", table => table.AddColumn<string>("RegistrationStatus", c => c.WithDefault("Approved")))
-                .AlterTable("UserPartRecord", table => table.AddColumn<string>("EmailStatus", c => c.WithDefault("Approved")))
-                .AlterTable("UserPartRecord", table => table.AddColumn<string>("EmailChallengeToken"));
-
-            // Site Settings record
-            SchemaBuilder.CreateTable("RegistrationSettingsPartRecord", table => table
-                .ContentPartRecord()
-                .Column<bool>("UsersCanRegister", c => c.WithDefault(false))
-                .Column<bool>("UsersMustValidateEmail", c => c.WithDefault(false))
-                .Column<bool>("UsersAreModerated", c => c.WithDefault(false))
-                .Column<bool>("NotifyModeration", c => c.WithDefault(false))
-            );
-
-            return 2;
-        }
     }
 }
\ No newline at end of file
diff --git a/src/Orchard.Web/Modules/Orchard.Widgets/Migrations.cs b/src/Orchard.Web/Modules/Orchard.Widgets/Migrations.cs
index c36a59214..c763dcbb7 100644
--- a/src/Orchard.Web/Modules/Orchard.Widgets/Migrations.cs
+++ b/src/Orchard.Web/Modules/Orchard.Widgets/Migrations.cs
@@ -1,11 +1,7 @@
-using System.Collections.Generic;
-using Orchard.ContentManagement;
-using Orchard.ContentManagement.Drivers;
+using Orchard.ContentManagement;
 using Orchard.ContentManagement.MetaData;
-using Orchard.ContentManagement.MetaData.Builders;
 using Orchard.Core.Contents.Extensions;
 using Orchard.Data.Migration;
-using Orchard.Events;
 using Orchard.Widgets.Models;
 
 namespace Orchard.Widgets {
@@ -32,18 +28,20 @@ namespace Orchard.Widgets {
 
     public class WidgetsDataMigration : DataMigrationImpl {
         public int Create() {
-            SchemaBuilder.CreateTable("LayerPartRecord", table => table
-                .ContentPartRecord()
-                .Column<string>("Name")
-                .Column<string>("Description")
-                .Column<string>("LayerRule")
+            SchemaBuilder.CreateTable("LayerPartRecord", 
+                table => table
+                    .ContentPartRecord()
+                    .Column<string>("Name")
+                    .Column<string>("Description", c => c.Unlimited())
+                    .Column<string>("LayerRule", c => c.Unlimited())
                 );
 
-            SchemaBuilder.CreateTable("WidgetPartRecord", table => table
-                .ContentPartRecord()
-                .Column<string>("Title")
-                .Column<string>("Position")
-                .Column<string>("Zone")
+            SchemaBuilder.CreateTable("WidgetPartRecord", 
+                table => table
+                    .ContentPartRecord()
+                    .Column<string>("Title")
+                    .Column<string>("Position")
+                    .Column<string>("Zone")
                 );
 
             ContentDefinitionManager.AlterTypeDefinition("Layer",
@@ -60,10 +58,6 @@ namespace Orchard.Widgets {
                     .WithSetting("Stereotype", "Widget")
                 );
 
-            return 1;
-        }
-
-        public int UpdateFrom1() {
             ContentDefinitionManager.AlterTypeDefinition("WidgetPage",
                 cfg => cfg
                     .WithPart("CommonPart")
@@ -71,7 +65,8 @@ namespace Orchard.Widgets {
                     .WithPart("WidgetBagPart")
                     .Creatable()
                 );
-            return 2;
+
+            return 1;
         }
     }
 }
\ No newline at end of file
diff --git a/src/Orchard/ContentManagement/DataMigrations/FrameworkDataMigration.cs b/src/Orchard/ContentManagement/DataMigrations/FrameworkDataMigration.cs
index 5cdaaf79f..344ec7b3e 100644
--- a/src/Orchard/ContentManagement/DataMigrations/FrameworkDataMigration.cs
+++ b/src/Orchard/ContentManagement/DataMigrations/FrameworkDataMigration.cs
@@ -1,48 +1,40 @@
-using System.Data;
-using Orchard.Data.Migration;
+using Orchard.Data.Migration;
 
 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().Identity())
-                .Column<string>("Data")
-                .Column<int>("ContentType_id")
+            SchemaBuilder.CreateTable("ContentItemRecord", 
+                table => table
+                    .Column<int>("Id", column => column.PrimaryKey().Identity())
+                    .Column<string>("Data", c => c.Unlimited())
+                    .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().Identity())
-                .Column<int>("Number")
-                .Column<bool>("Published")
-                .Column<bool>("Latest")
-                .Column<string>("Data")
-                .Column<int>("ContentItemRecord_id")
+            SchemaBuilder.CreateTable("ContentItemVersionRecord", 
+                table => table
+                    .Column<int>("Id", column => column.PrimaryKey().Identity())
+                    .Column<int>("Number")
+                    .Column<bool>("Published")
+                    .Column<bool>("Latest")
+                    .Column<string>("Data", c => c.Unlimited())
+                    .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().Identity())
-                .Column<string>("Name")
+            SchemaBuilder.CreateTable("ContentTypeRecord", 
+                table => table
+                    .Column<int>("Id", column => column.PrimaryKey().Identity())
+                    .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().Identity())
-                .Column<string>("Culture")
+            SchemaBuilder.CreateTable("CultureRecord", 
+                table => table
+                    .Column<int>("Id", column => column.PrimaryKey().Identity())
+                    .Column<string>("Culture")
                 );
 
             return 1;
         }
 
-        public int UpdateFrom1() {
-            SchemaBuilder
-                .AlterTable("ContentItemRecord", table => table
-                    .AlterColumn("Data", column => column.WithType(DbType.String).Unlimited()));
-
-            return 2;
-        }
     }
 }
\ No newline at end of file