diff --git a/build/UmbracoVersion.txt b/build/UmbracoVersion.txt
index 35e273acdc..2a8a3618d4 100644
--- a/build/UmbracoVersion.txt
+++ b/build/UmbracoVersion.txt
@@ -1,3 +1,3 @@
 # Usage: on line 2 put the release version, on line 3 put the version comment (example: beta)
 7.4.0
-beta3
\ No newline at end of file
+beta4
\ No newline at end of file
diff --git a/src/SolutionInfo.cs b/src/SolutionInfo.cs
index e4f169c8af..f385151454 100644
--- a/src/SolutionInfo.cs
+++ b/src/SolutionInfo.cs
@@ -12,4 +12,4 @@ using System.Resources;
 [assembly: AssemblyVersion("1.0.*")]
 
 [assembly: AssemblyFileVersion("7.4.0")]
-[assembly: AssemblyInformationalVersion("7.4.0-beta3")]
\ No newline at end of file
+[assembly: AssemblyInformationalVersion("7.4.0-beta4")]
\ No newline at end of file
diff --git a/src/Umbraco.Core/Configuration/UmbracoVersion.cs b/src/Umbraco.Core/Configuration/UmbracoVersion.cs
index 2d2ba9ad5c..4039ab7db0 100644
--- a/src/Umbraco.Core/Configuration/UmbracoVersion.cs
+++ b/src/Umbraco.Core/Configuration/UmbracoVersion.cs
@@ -24,7 +24,7 @@ namespace Umbraco.Core.Configuration
         /// Gets the version comment (like beta or RC).
         /// </summary>
         /// <value>The version comment.</value>
-        public static string CurrentComment { get { return "beta3"; } }
+        public static string CurrentComment { get { return "beta4"; } }
 
         // Get the version of the umbraco.dll by looking at a class in that dll
         // Had to do it like this due to medium trust issues, see: http://haacked.com/archive/2010/11/04/assembly-location-and-medium-trust.aspx
diff --git a/src/Umbraco.Core/Persistence/Repositories/ContentTypeRepository.cs b/src/Umbraco.Core/Persistence/Repositories/ContentTypeRepository.cs
index a6d9b2b58b..fca0f02811 100644
--- a/src/Umbraco.Core/Persistence/Repositories/ContentTypeRepository.cs
+++ b/src/Umbraco.Core/Persistence/Repositories/ContentTypeRepository.cs
@@ -87,7 +87,30 @@ namespace Umbraco.Core.Persistence.Repositories
         {
             return Database.Fetch<string>("SELECT DISTINCT Alias FROM cmsPropertyType ORDER BY Alias");
         }
-        
+
+        /// <summary>
+        /// Gets all content type aliases
+        /// </summary>
+        /// <param name="objectTypes">
+        /// If this list is empty, it will return all content type aliases for media, members and content, otherwise
+        /// it will only return content type aliases for the object types specified
+        /// </param>
+        /// <returns></returns>
+        public IEnumerable<string> GetAllContentTypeAliases(params Guid[] objectTypes)
+        {
+            var sql = new Sql().Select("cmsContentType.alias")
+                .From<ContentTypeDto>(SqlSyntax)
+                .InnerJoin<NodeDto>(SqlSyntax)
+                .On<ContentTypeDto, NodeDto>(SqlSyntax, dto => dto.NodeId, dto => dto.NodeId);
+
+            if (objectTypes.Any())
+            {
+                sql = sql.Where("umbracoNode.nodeObjectType IN (@objectTypes)", objectTypes);
+            }
+
+            return Database.Fetch<string>(sql);
+        }
+
         protected override Sql GetBaseQuery(bool isCount)
         {
             var sql = new Sql();
diff --git a/src/Umbraco.Core/Persistence/Repositories/Interfaces/IContentTypeRepository.cs b/src/Umbraco.Core/Persistence/Repositories/Interfaces/IContentTypeRepository.cs
index 625023fd9e..df2af380d1 100644
--- a/src/Umbraco.Core/Persistence/Repositories/Interfaces/IContentTypeRepository.cs
+++ b/src/Umbraco.Core/Persistence/Repositories/Interfaces/IContentTypeRepository.cs
@@ -22,5 +22,15 @@ namespace Umbraco.Core.Persistence.Repositories
         IEnumerable<string> GetAllPropertyTypeAliases();
 
         IEnumerable<MoveEventInfo<IContentType>> Move(IContentType toMove, EntityContainer container);
+
+        /// <summary>
+        /// Gets all content type aliases
+        /// </summary>
+        /// <param name="objectTypes">
+        /// If this list is empty, it will return all content type aliases for media, members and content, otherwise
+        /// it will only return content type aliases for the object types specified
+        /// </param>
+        /// <returns></returns>
+        IEnumerable<string> GetAllContentTypeAliases(params Guid[] objectTypes);
     }
 }
\ No newline at end of file
diff --git a/src/Umbraco.Core/Services/ContentTypeService.cs b/src/Umbraco.Core/Services/ContentTypeService.cs
index 48811a566c..be57b9159f 100644
--- a/src/Umbraco.Core/Services/ContentTypeService.cs
+++ b/src/Umbraco.Core/Services/ContentTypeService.cs
@@ -266,6 +266,22 @@ namespace Umbraco.Core.Services
             }
         }
 
+        /// <summary>
+        /// Gets all content type aliases
+        /// </summary>
+        /// <param name="objectTypes">
+        /// If this list is empty, it will return all content type aliases for media, members and content, otherwise
+        /// it will only return content type aliases for the object types specified
+        /// </param>
+        /// <returns></returns>
+        public IEnumerable<string> GetAllContentTypeAliases(params Guid[] objectTypes)
+        {
+            using (var repository = RepositoryFactory.CreateContentTypeRepository(UowProvider.GetUnitOfWork()))
+            {
+                return repository.GetAllContentTypeAliases(objectTypes);
+            }
+        }
+
         /// <summary>
         /// Copies a content type as a child under the specified parent if specified (otherwise to the root)
         /// </summary>
diff --git a/src/Umbraco.Core/Services/IContentTypeService.cs b/src/Umbraco.Core/Services/IContentTypeService.cs
index 21a9225b30..3c6b8404b5 100644
--- a/src/Umbraco.Core/Services/IContentTypeService.cs
+++ b/src/Umbraco.Core/Services/IContentTypeService.cs
@@ -44,6 +44,16 @@ namespace Umbraco.Core.Services
         /// <returns></returns>
         IEnumerable<string> GetAllPropertyTypeAliases();
 
+        /// <summary>
+        /// Gets all content type aliases
+        /// </summary>
+        /// <param name="objectTypes">
+        /// If this list is empty, it will return all content type aliases for media, members and content, otherwise
+        /// it will only return content type aliases for the object types specified
+        /// </param>
+        /// <returns></returns>
+        IEnumerable<string> GetAllContentTypeAliases(params Guid[] objectTypes);
+
         /// <summary>
         /// Copies a content type as a child under the specified parent if specified (otherwise to the root)
         /// </summary>
diff --git a/src/Umbraco.Web.UI.Client/src/common/services/contenttypehelper.service.js b/src/Umbraco.Web.UI.Client/src/common/services/contenttypehelper.service.js
index 047d18c35c..61cb0a7317 100644
--- a/src/Umbraco.Web.UI.Client/src/common/services/contenttypehelper.service.js
+++ b/src/Umbraco.Web.UI.Client/src/common/services/contenttypehelper.service.js
@@ -49,7 +49,7 @@ function contentTypeHelper(contentTypeResource, dataTypeResource, $filter, $inje
         checkModelsBuilderStatus: function () {
             var deferred = $q.defer();
             var modelsResource = $injector.has("modelsBuilderResource") ? $injector.get("modelsBuilderResource") : null;
-            var modelsBuilderEnabled = Umbraco.Sys.ServerVariables.umbracoPlugins.modelsBuilder.enabled;
+            var modelsBuilderEnabled = (Umbraco && Umbraco.Sys && Umbraco.Sys.ServerVariables && Umbraco.Sys.ServerVariables.umbracoPlugins && Umbraco.Sys.ServerVariables.umbracoPlugins.modelsBuilder && Umbraco.Sys.ServerVariables.umbracoPlugins.modelsBuilder.enabled === true);            
             
             if (modelsBuilderEnabled && modelsResource) {
                 modelsResource.getModelsOutOfDateStatus().then(function(result) {
diff --git a/src/Umbraco.Web.UI/Umbraco.Web.UI.csproj b/src/Umbraco.Web.UI/Umbraco.Web.UI.csproj
index 990d01f21b..b8ef4a53a7 100644
--- a/src/Umbraco.Web.UI/Umbraco.Web.UI.csproj
+++ b/src/Umbraco.Web.UI/Umbraco.Web.UI.csproj
@@ -350,12 +350,12 @@
       <Name>umbraco.providers</Name>
     </ProjectReference>
     <Reference Include="System.Xml.Linq" />
-    <Reference Include="Umbraco.ModelsBuilder, Version=3.0.0.72, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\packages\Umbraco.ModelsBuilder.3.0.0-beta003\lib\Umbraco.ModelsBuilder.dll</HintPath>
+    <Reference Include="Umbraco.ModelsBuilder, Version=3.0.0.73, Culture=neutral, processorArchitecture=MSIL">
+      <HintPath>..\packages\Umbraco.ModelsBuilder.3.0.0-beta004\lib\Umbraco.ModelsBuilder.dll</HintPath>
       <Private>True</Private>
     </Reference>
-    <Reference Include="Umbraco.ModelsBuilder.AspNet, Version=3.0.0.72, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\packages\Umbraco.ModelsBuilder.AspNet.3.0.0-beta003\lib\Umbraco.ModelsBuilder.AspNet.dll</HintPath>
+    <Reference Include="Umbraco.ModelsBuilder.AspNet, Version=3.0.0.73, Culture=neutral, processorArchitecture=MSIL">
+      <HintPath>..\packages\Umbraco.ModelsBuilder.AspNet.3.0.0-beta004\lib\Umbraco.ModelsBuilder.AspNet.dll</HintPath>
       <Private>True</Private>
     </Reference>
     <Reference Include="UrlRewritingNet.UrlRewriter, Version=2.0.7.0, Culture=neutral, processorArchitecture=MSIL">
diff --git a/src/Umbraco.Web.UI/config/ClientDependency.config b/src/Umbraco.Web.UI/config/ClientDependency.config
index 99e72e8216..ed53c8ecd8 100644
--- a/src/Umbraco.Web.UI/config/ClientDependency.config
+++ b/src/Umbraco.Web.UI/config/ClientDependency.config
@@ -10,7 +10,7 @@ NOTES:
 * Compression/Combination/Minification is not enabled unless debug="false" is specified on the 'compiliation' element in the web.config
 * A new version will invalidate both client and server cache and create new persisted files
 --> 
-<clientDependency version="1365410531" fileDependencyExtensions=".js,.css" loggerType="Umbraco.Web.UI.CdfLogger, umbraco">
+<clientDependency version="433963333" fileDependencyExtensions=".js,.css" loggerType="Umbraco.Web.UI.CdfLogger, umbraco">
 
   <!-- 
     This section is used for Web Forms only, the enableCompositeFiles="true" is optional and by default is set to true.
diff --git a/src/Umbraco.Web.UI/packages.config b/src/Umbraco.Web.UI/packages.config
index ac8f03b975..66f6d587b6 100644
--- a/src/Umbraco.Web.UI/packages.config
+++ b/src/Umbraco.Web.UI/packages.config
@@ -37,7 +37,7 @@
   <package id="SqlServerCE" version="4.0.0.0" targetFramework="net45" />
   <package id="System.Collections.Immutable" version="1.1.36" targetFramework="net45" />
   <package id="System.Reflection.Metadata" version="1.0.21" targetFramework="net45" />
-  <package id="Umbraco.ModelsBuilder" version="3.0.0-beta003" targetFramework="net45" />
-  <package id="Umbraco.ModelsBuilder.AspNet" version="3.0.0-beta003" targetFramework="net45" />
+  <package id="Umbraco.ModelsBuilder" version="3.0.0-beta004" targetFramework="net45" />
+  <package id="Umbraco.ModelsBuilder.AspNet" version="3.0.0-beta004" targetFramework="net45" />
   <package id="UrlRewritingNet.UrlRewriter" version="2.0.7" targetFramework="net45" />
 </packages>
\ No newline at end of file
diff --git a/src/Umbraco.Web/Editors/ContentTypeController.cs b/src/Umbraco.Web/Editors/ContentTypeController.cs
index 961dcd609f..f9efb4e366 100644
--- a/src/Umbraco.Web/Editors/ContentTypeController.cs
+++ b/src/Umbraco.Web/Editors/ContentTypeController.cs
@@ -178,11 +178,10 @@ namespace Umbraco.Web.Editors
         public ContentTypeDisplay PostSave(ContentTypeSave contentTypeSave)
         {
             var savedCt = PerformPostSave<IContentType, ContentTypeDisplay>(
-                contentTypeSave: contentTypeSave,
-                getContentType: i => Services.ContentTypeService.GetContentType(i),
-                getContentTypeByAlias: alias => Services.ContentTypeService.GetContentType(alias),
-                saveContentType: type => Services.ContentTypeService.Save(type),
-                beforeCreateNew: ctSave =>
+                contentTypeSave:    contentTypeSave,
+                getContentType:     i => Services.ContentTypeService.GetContentType(i),
+                saveContentType:    type => Services.ContentTypeService.Save(type),
+                beforeCreateNew:    ctSave =>
                 {
                     //create a default template if it doesnt exist -but only if default template is == to the content type
                     if (ctSave.DefaultTemplate.IsNullOrWhiteSpace() == false && ctSave.DefaultTemplate == ctSave.Alias)
diff --git a/src/Umbraco.Web/Editors/ContentTypeControllerBase.cs b/src/Umbraco.Web/Editors/ContentTypeControllerBase.cs
index ac58241b4d..de7835e0d5 100644
--- a/src/Umbraco.Web/Editors/ContentTypeControllerBase.cs
+++ b/src/Umbraco.Web/Editors/ContentTypeControllerBase.cs
@@ -184,29 +184,46 @@ namespace Umbraco.Web.Editors
         protected TContentType PerformPostSave<TContentType, TContentTypeDisplay>(
             ContentTypeSave contentTypeSave,
             Func<int, TContentType> getContentType,
-            Func<string, TContentType> getContentTypeByAlias,
             Action<TContentType> saveContentType,
             bool validateComposition = true,
             Action<ContentTypeSave> beforeCreateNew = null)
-            where TContentType : IContentTypeComposition
+            where TContentType : class, IContentTypeComposition
             where TContentTypeDisplay : ContentTypeCompositionDisplay
         {
             var ctId = Convert.ToInt32(contentTypeSave.Id);
-            
-            //Validate that there's no other ct with the same name
-            var exists = getContentTypeByAlias(contentTypeSave.Alias);
-            if (exists != null && exists.Id.ToInvariantString() != contentTypeSave.Id.ToString())
+            var ct = ctId > 0 ? getContentType(ctId) : null;
+            if (ctId > 0 && ct == null) throw new HttpResponseException(HttpStatusCode.NotFound);
+
+            //Validate that there's no other ct with the same alias
+            // it in fact cannot be the same as any content type alias (member, content or media) because
+            // this would interfere with how ModelsBuilder works and also how many of the published caches
+            // works since that is based on aliases.
+            var allAliases = Services.ContentTypeService.GetAllContentTypeAliases();
+            var exists = allAliases.InvariantContains(contentTypeSave.Alias);
+            if ((exists) && (ctId == 0 || ct.Alias != contentTypeSave.Alias))
             {
-                ModelState.AddModelError("Alias", "A content type with this alias already exists");
+                ModelState.AddModelError("Alias", "A content type, media type or member type with this alias already exists");
             }
 
+            //now let the external validators execute
+            ValidationHelper.ValidateEditorModelWithResolver(ModelState, contentTypeSave);
+
             if (ModelState.IsValid == false)
             {
-                var ct = getContentType(ctId);
-                //Required data is invalid so we cannot continue
-                var forDisplay = Mapper.Map<TContentTypeDisplay>(ct);
-                //map the 'save' data on top
-                forDisplay = Mapper.Map(contentTypeSave, forDisplay);
+                TContentTypeDisplay forDisplay;
+                if (ctId > 0)
+                {
+                    //Required data is invalid so we cannot continue
+                    forDisplay = Mapper.Map<TContentTypeDisplay>(ct);
+                    //map the 'save' data on top
+                    forDisplay = Mapper.Map(contentTypeSave, forDisplay);
+                }
+                else
+                {
+                    //map the 'save' data to display
+                    forDisplay = Mapper.Map<TContentTypeDisplay>(contentTypeSave);
+                }
+                
                 forDisplay.Errors = ModelState.ToErrorDictionary();
                 throw new HttpResponseException(Request.CreateValidationErrorResponse(forDisplay));
             }
@@ -220,22 +237,19 @@ namespace Umbraco.Web.Editors
             
             if (ctId > 0)
             {
-                //its an update to an existing
-                var found = getContentType(ctId);
-                if (found == null)
-                    throw new HttpResponseException(HttpStatusCode.NotFound);
+                //its an update to an existing                
 
-                Mapper.Map(contentTypeSave, found);
+                Mapper.Map(contentTypeSave, ct);
 
                 if (validateComposition)
                 {
                     //NOTE: this throws an error response if it is not valid
-                    ValidateComposition(contentTypeSave, found);
+                    ValidateComposition(contentTypeSave, ct);
                 }
 
-                saveContentType(found);
+                saveContentType(ct);
 
-                return found;
+                return ct;
             }
             else
             {
diff --git a/src/Umbraco.Web/Editors/EditorValidationResolver.cs b/src/Umbraco.Web/Editors/EditorValidationResolver.cs
new file mode 100644
index 0000000000..d0c5edf5af
--- /dev/null
+++ b/src/Umbraco.Web/Editors/EditorValidationResolver.cs
@@ -0,0 +1,31 @@
+using System;
+using System.Collections.Generic;
+using System.ComponentModel.DataAnnotations;
+using System.Linq;
+using Umbraco.Core;
+using Umbraco.Core.Logging;
+using Umbraco.Core.ObjectResolution;
+
+namespace Umbraco.Web.Editors
+{
+    internal class EditorValidationResolver : LazyManyObjectsResolverBase<EditorValidationResolver, IEditorValidator>
+    {
+        public EditorValidationResolver(IServiceProvider serviceProvider, ILogger logger, Func<IEnumerable<Type>> migrations)
+            : base(serviceProvider, logger, migrations, ObjectLifetimeScope.Application)
+        {
+        }
+
+        public virtual IEnumerable<IEditorValidator> EditorValidators
+        {
+            get { return Values; }
+        }
+
+        public IEnumerable<ValidationResult> Validate(object model)
+        {
+            return EditorValidators
+                .Where(x => model.GetType() == x.ModelType)
+                .WhereNotNull()
+                .SelectMany(x => x.Validate(model));
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/Umbraco.Web/Editors/EditorValidator.cs b/src/Umbraco.Web/Editors/EditorValidator.cs
new file mode 100644
index 0000000000..d123838f52
--- /dev/null
+++ b/src/Umbraco.Web/Editors/EditorValidator.cs
@@ -0,0 +1,21 @@
+using System;
+using System.Collections.Generic;
+using System.ComponentModel.DataAnnotations;
+
+namespace Umbraco.Web.Editors
+{
+    internal abstract class EditorValidator<T> : IEditorValidator
+    {
+        public Type ModelType
+        {
+            get { return typeof (T); }
+        }
+
+        protected abstract IEnumerable<ValidationResult> PerformValidate(T model);
+
+        public IEnumerable<ValidationResult> Validate(object model)
+        {
+            return PerformValidate((T) model);
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/Umbraco.Web/Editors/IEditorValidator.cs b/src/Umbraco.Web/Editors/IEditorValidator.cs
new file mode 100644
index 0000000000..e1d4e68ed2
--- /dev/null
+++ b/src/Umbraco.Web/Editors/IEditorValidator.cs
@@ -0,0 +1,12 @@
+using System;
+using System.Collections.Generic;
+using System.ComponentModel.DataAnnotations;
+
+namespace Umbraco.Web.Editors
+{
+    internal interface IEditorValidator
+    {
+        Type ModelType { get; }
+        IEnumerable<ValidationResult> Validate(object model);
+    }
+}
\ No newline at end of file
diff --git a/src/Umbraco.Web/Editors/MediaTypeController.cs b/src/Umbraco.Web/Editors/MediaTypeController.cs
index 540c95edc1..611c92e5a3 100644
--- a/src/Umbraco.Web/Editors/MediaTypeController.cs
+++ b/src/Umbraco.Web/Editors/MediaTypeController.cs
@@ -162,7 +162,6 @@ namespace Umbraco.Web.Editors
             var savedCt = PerformPostSave<IMediaType, ContentTypeCompositionDisplay>(
                 contentTypeSave:        contentTypeSave,
                 getContentType:         i => Services.ContentTypeService.GetMediaType(i),
-                getContentTypeByAlias:  alias => Services.ContentTypeService.GetMediaType(alias),
                 saveContentType:        type => Services.ContentTypeService.Save(type));
 
             var display = Mapper.Map<ContentTypeCompositionDisplay>(savedCt);
diff --git a/src/Umbraco.Web/Editors/MemberTypeController.cs b/src/Umbraco.Web/Editors/MemberTypeController.cs
index 924ecb3e05..5b95318dc1 100644
--- a/src/Umbraco.Web/Editors/MemberTypeController.cs
+++ b/src/Umbraco.Web/Editors/MemberTypeController.cs
@@ -134,7 +134,6 @@ namespace Umbraco.Web.Editors
             var savedCt = PerformPostSave<IMemberType, ContentTypeCompositionDisplay>(
                 contentTypeSave:            contentTypeSave,
                 getContentType:             i => Services.MemberTypeService.Get(i),
-                getContentTypeByAlias:      alias => Services.MemberTypeService.Get(alias),
                 saveContentType:            type => Services.MemberTypeService.Save(type),
                 validateComposition:        false);
 
diff --git a/src/Umbraco.Web/Editors/ValidationHelper.cs b/src/Umbraco.Web/Editors/ValidationHelper.cs
index 7bad8ceb8c..e1633fa6bf 100644
--- a/src/Umbraco.Web/Editors/ValidationHelper.cs
+++ b/src/Umbraco.Web/Editors/ValidationHelper.cs
@@ -1,12 +1,31 @@
 using System;
 using System.ComponentModel;
 using System.Linq;
+using System.Web;
+using System.Web.Http.ModelBinding;
+using Umbraco.Core;
 using Umbraco.Core.Models.Validation;
+using Umbraco.Web.Models.ContentEditing;
 
 namespace Umbraco.Web.Editors
 {
     internal class ValidationHelper
     {
+        internal static void ValidateEditorModelWithResolver(ModelStateDictionary modelState, object model)
+        {
+            var validationResult = EditorValidationResolver.Current.Validate(model);
+            foreach (var vr in validationResult
+                .WhereNotNull()
+                .Where(x => x.ErrorMessage.IsNullOrWhiteSpace() == false)
+                .Where(x => x.MemberNames.Any()))
+            {
+                foreach (var memberName in vr.MemberNames)
+                {
+                    modelState.AddModelError(memberName, vr.ErrorMessage);
+                }
+            }
+        }
+
         /// <summary>
         /// This will check if any properties of the model are attributed with the RequiredForPersistenceAttribute attribute and if they are it will 
         /// check if that property validates, if it doesn't it means that the current model cannot be persisted because it doesn't have the necessary information
diff --git a/src/Umbraco.Web/Models/Mapping/ContentTypeModelMapper.cs b/src/Umbraco.Web/Models/Mapping/ContentTypeModelMapper.cs
index c4f2d96f79..6ade23b6d5 100644
--- a/src/Umbraco.Web/Models/Mapping/ContentTypeModelMapper.cs
+++ b/src/Umbraco.Web/Models/Mapping/ContentTypeModelMapper.cs
@@ -185,7 +185,10 @@ namespace Umbraco.Web.Models.Mapping
                     if (destAllowedTemplateAliases.SequenceEqual(source.AllowedTemplates) == false)
                     {
                         var templates = applicationContext.Services.FileService.GetTemplates(source.AllowedTemplates.ToArray());
-                        dest.AllowedTemplates = source.AllowedTemplates.Select(x => Mapper.Map<EntityBasic>(templates.Single(t => t.Alias == x))).ToArray();
+                        dest.AllowedTemplates = source.AllowedTemplates
+                            .Select(x => Mapper.Map<EntityBasic>(templates.SingleOrDefault(t => t.Alias == x)))
+                            .WhereNotNull()
+                            .ToArray();
                     }
 
                     if (source.DefaultTemplate.IsNullOrWhiteSpace() == false)
diff --git a/src/Umbraco.Web/Properties/AssemblyInfo.cs b/src/Umbraco.Web/Properties/AssemblyInfo.cs
index c881ba448a..89499b833e 100644
--- a/src/Umbraco.Web/Properties/AssemblyInfo.cs
+++ b/src/Umbraco.Web/Properties/AssemblyInfo.cs
@@ -35,5 +35,6 @@ using System.Security;
 [assembly: InternalsVisibleTo("Umbraco.Courier.Core")]
 [assembly: InternalsVisibleTo("Umbraco.Courier.Persistence")]
 [assembly: InternalsVisibleTo("Umbraco.VisualStudio")]
-
+[assembly: InternalsVisibleTo("Umbraco.ModelsBuilder")]
+[assembly: InternalsVisibleTo("Umbraco.ModelsBuilder.AspNet")]
 [assembly: InternalsVisibleTo("DynamicProxyGenAssembly2")]
\ No newline at end of file
diff --git a/src/Umbraco.Web/Umbraco.Web.csproj b/src/Umbraco.Web/Umbraco.Web.csproj
index 436186d3d0..67af0ee515 100644
--- a/src/Umbraco.Web/Umbraco.Web.csproj
+++ b/src/Umbraco.Web/Umbraco.Web.csproj
@@ -303,6 +303,9 @@
     <Compile Include="AreaRegistrationContextExtensions.cs" />
     <Compile Include="BatchedDatabaseServerMessengerStartup.cs" />
     <Compile Include="Editors\BackOfficeNotificationsController.cs" />
+    <Compile Include="Editors\EditorValidationResolver.cs" />
+    <Compile Include="Editors\EditorValidator.cs" />
+    <Compile Include="Editors\IEditorValidator.cs" />
     <Compile Include="HtmlHelperBackOfficeExtensions.cs" />
     <Compile Include="Install\InstallSteps\Version73FileCleanup.cs" />
     <Compile Include="Models\ContentEditing\ContentTypeDisplay.cs" />
diff --git a/src/Umbraco.Web/WebBootManager.cs b/src/Umbraco.Web/WebBootManager.cs
index 0757c6c951..1ab96a6a1b 100644
--- a/src/Umbraco.Web/WebBootManager.cs
+++ b/src/Umbraco.Web/WebBootManager.cs
@@ -44,6 +44,7 @@ using Umbraco.Core.Persistence;
 using Umbraco.Core.Persistence.UnitOfWork;
 using Umbraco.Core.Publishing;
 using Umbraco.Core.Services;
+using Umbraco.Web.Editors;
 using GlobalSettings = Umbraco.Core.Configuration.GlobalSettings;
 using ProfilingViewEngine = Umbraco.Core.Profiling.ProfilingViewEngine;
 
@@ -348,7 +349,9 @@ namespace Umbraco.Web
         {
             base.InitializeResolvers();
 
-            XsltExtensionsResolver.Current = new XsltExtensionsResolver(ServiceProvider, LoggerResolver.Current.Logger, () => PluginManager.Current.ResolveXsltExtensions());
+            XsltExtensionsResolver.Current = new XsltExtensionsResolver(ServiceProvider, LoggerResolver.Current.Logger, () => PluginManager.ResolveXsltExtensions());
+
+            EditorValidationResolver.Current= new EditorValidationResolver(ServiceProvider, LoggerResolver.Current.Logger, () => PluginManager.ResolveTypes<IEditorValidator>());
 
             //set the default RenderMvcController
             DefaultRenderMvcControllerResolver.Current = new DefaultRenderMvcControllerResolver(typeof(RenderMvcController));
@@ -436,11 +439,11 @@ namespace Umbraco.Web
 
             SurfaceControllerResolver.Current = new SurfaceControllerResolver(
                 ServiceProvider, LoggerResolver.Current.Logger,
-                PluginManager.Current.ResolveSurfaceControllers());
+                PluginManager.ResolveSurfaceControllers());
 
             UmbracoApiControllerResolver.Current = new UmbracoApiControllerResolver(
                 ServiceProvider, LoggerResolver.Current.Logger,
-                PluginManager.Current.ResolveUmbracoApiControllers());
+                PluginManager.ResolveUmbracoApiControllers());
 
             // both TinyMceValueConverter (in Core) and RteMacroRenderingValueConverter (in Web) will be
             // discovered when CoreBootManager configures the converters. We HAVE to remove one of them
@@ -509,11 +512,11 @@ namespace Umbraco.Web
 
             ThumbnailProvidersResolver.Current = new ThumbnailProvidersResolver(
                 ServiceProvider, LoggerResolver.Current.Logger,
-                PluginManager.Current.ResolveThumbnailProviders());
+                PluginManager.ResolveThumbnailProviders());
 
             ImageUrlProviderResolver.Current = new ImageUrlProviderResolver(
                 ServiceProvider, LoggerResolver.Current.Logger,
-                PluginManager.Current.ResolveImageUrlProviders());
+                PluginManager.ResolveImageUrlProviders());
 
             CultureDictionaryFactoryResolver.Current = new CultureDictionaryFactoryResolver(
                 new DefaultCultureDictionaryFactory());
@@ -528,3 +531,4 @@ namespace Umbraco.Web
         }
     }
 }
+