diff --git a/src/Umbraco.Core/Composing/CompositionRoots/RepositoryCompositionRoot.cs b/src/Umbraco.Core/Composing/CompositionRoots/RepositoryCompositionRoot.cs
index a4bc34247e..26f4d478e3 100644
--- a/src/Umbraco.Core/Composing/CompositionRoots/RepositoryCompositionRoot.cs
+++ b/src/Umbraco.Core/Composing/CompositionRoots/RepositoryCompositionRoot.cs
@@ -3,7 +3,7 @@ using LightInject;
 using Umbraco.Core.Cache;
 using Umbraco.Core.Persistence;
 using Umbraco.Core.Persistence.Repositories;
-using Umbraco.Core.Persistence.Repositories.Interfaces;
+using Umbraco.Core.Persistence.Repositories.Implement;
 using Umbraco.Core.Persistence.UnitOfWork;
 
 namespace Umbraco.Core.Composing.CompositionRoots
@@ -46,9 +46,9 @@ namespace Umbraco.Core.Composing.CompositionRoots
             container.Register<IExternalLoginRepository, ExternalLoginRepository>();
             container.Register<IPublicAccessRepository, PublicAccessRepository>();
             container.Register<ITagRepository, TagRepository>();
-            container.Register<IContentRepository, ContentRepository>();
+            container.Register<IDocumentRepository, DocumentRepository>();
             container.Register<IContentTypeRepository, ContentTypeRepository>();
-            container.Register<IContentBlueprintRepository, ContentBlueprintRepository>();
+            container.Register<IDocumentBlueprintRepository, DocumentBlueprintRepository>();
             container.Register<IDataTypeDefinitionRepository, DataTypeDefinitionRepository>();
             container.Register<IDictionaryRepository, DictionaryRepository>();
             container.Register<ILanguageRepository, LanguageRepository>();
diff --git a/src/Umbraco.Core/Persistence/Factories/MemberTypeReadOnlyFactory.cs b/src/Umbraco.Core/Persistence/Factories/MemberTypeReadOnlyFactory.cs
index 00dc1a83ce..576f9c2090 100644
--- a/src/Umbraco.Core/Persistence/Factories/MemberTypeReadOnlyFactory.cs
+++ b/src/Umbraco.Core/Persistence/Factories/MemberTypeReadOnlyFactory.cs
@@ -4,6 +4,7 @@ using System.Linq;
 using Umbraco.Core.Models;
 using Umbraco.Core.Models.Rdbms;
 using Umbraco.Core.Persistence.Repositories;
+using Umbraco.Core.Persistence.Repositories.Implement;
 
 namespace Umbraco.Core.Persistence.Factories
 {
diff --git a/src/Umbraco.Core/Persistence/IQueryRepository.cs b/src/Umbraco.Core/Persistence/IQueryRepository.cs
new file mode 100644
index 0000000000..3e23b72186
--- /dev/null
+++ b/src/Umbraco.Core/Persistence/IQueryRepository.cs
@@ -0,0 +1,21 @@
+using System.Collections.Generic;
+using Umbraco.Core.Persistence.Querying;
+
+namespace Umbraco.Core.Persistence
+{
+    /// <summary>
+    /// Defines the base implementation of a querying repository.
+    /// </summary>
+    public interface IQueryRepository<TEntity> : IRepository
+    {
+        /// <summary>
+        /// Gets entities.
+        /// </summary>
+        IEnumerable<TEntity> Get(IQuery<TEntity> query);
+
+        /// <summary>
+        /// Counts entities.
+        /// </summary>
+        int Count(IQuery<TEntity> query);
+    }
+}
diff --git a/src/Umbraco.Core/Persistence/IReadRepository.cs b/src/Umbraco.Core/Persistence/IReadRepository.cs
new file mode 100644
index 0000000000..8b2a4c2533
--- /dev/null
+++ b/src/Umbraco.Core/Persistence/IReadRepository.cs
@@ -0,0 +1,25 @@
+using System.Collections.Generic;
+
+namespace Umbraco.Core.Persistence
+{
+    /// <summary>
+    /// Defines the base implementation of a reading repository.
+    /// </summary>
+    public interface IReadRepository<in TId, out TEntity> : IRepository
+    {
+        /// <summary>
+        /// Gets an entity.
+        /// </summary>
+        TEntity Get(TId id);
+
+        /// <summary>
+        /// Gets entities.
+        /// </summary>
+        IEnumerable<TEntity> GetMany(params TId[] ids);
+
+        /// <summary>
+        /// Gets a value indicating whether an entity exists.
+        /// </summary>
+        bool Exists(TId id);
+    }
+}
\ No newline at end of file
diff --git a/src/Umbraco.Core/Persistence/IReadWriteQueryRepository.cs b/src/Umbraco.Core/Persistence/IReadWriteQueryRepository.cs
new file mode 100644
index 0000000000..aaaf276e0b
--- /dev/null
+++ b/src/Umbraco.Core/Persistence/IReadWriteQueryRepository.cs
@@ -0,0 +1,8 @@
+namespace Umbraco.Core.Persistence
+{
+    /// <summary>
+    /// Defines the base implementation of a reading, writing and querying repository.
+    /// </summary>
+    public interface IReadWriteQueryRepository<in TId, TEntity> : IReadRepository<TId, TEntity>, IWriteRepository<TEntity>, IQueryRepository<TEntity>
+    { }
+}
diff --git a/src/Umbraco.Core/Persistence/IRepository.cs b/src/Umbraco.Core/Persistence/IRepository.cs
new file mode 100644
index 0000000000..9c51a8affd
--- /dev/null
+++ b/src/Umbraco.Core/Persistence/IRepository.cs
@@ -0,0 +1,8 @@
+namespace Umbraco.Core.Persistence
+{
+    /// <summary>
+    /// Defines the base implementation of a repository.
+    /// </summary>
+    public interface IRepository
+    { }
+}
diff --git a/src/Umbraco.Core/Persistence/IWriteRepository.cs b/src/Umbraco.Core/Persistence/IWriteRepository.cs
new file mode 100644
index 0000000000..26687648b9
--- /dev/null
+++ b/src/Umbraco.Core/Persistence/IWriteRepository.cs
@@ -0,0 +1,19 @@
+namespace Umbraco.Core.Persistence
+{
+    /// <summary>
+    /// Defines the base implementation of a writing repository.
+    /// </summary>
+    public interface IWriteRepository<in TEntity> : IRepository
+    {
+        /// <summary>
+        /// Saves an entity.
+        /// </summary>
+        void Save(TEntity entity);
+
+        /// <summary>
+        /// Deletes an entity.
+        /// </summary>
+        /// <param name="entity"></param>
+        void Delete(TEntity entity);
+    }
+}
\ No newline at end of file
diff --git a/src/Umbraco.Core/Persistence/Repositories/Interfaces/IAuditRepository.cs b/src/Umbraco.Core/Persistence/Repositories/IAuditRepository.cs
similarity index 74%
rename from src/Umbraco.Core/Persistence/Repositories/Interfaces/IAuditRepository.cs
rename to src/Umbraco.Core/Persistence/Repositories/IAuditRepository.cs
index 9d8738102f..851fd2fe56 100644
--- a/src/Umbraco.Core/Persistence/Repositories/Interfaces/IAuditRepository.cs
+++ b/src/Umbraco.Core/Persistence/Repositories/IAuditRepository.cs
@@ -3,7 +3,7 @@ using Umbraco.Core.Persistence.UnitOfWork;
 
 namespace Umbraco.Core.Persistence.Repositories
 {
-    public interface IAuditRepository : IUnitOfWorkRepository, IQueryRepository<int, AuditItem>
+    public interface IAuditRepository : IUnitOfWorkRepository, IReadRepository<int, AuditItem>, IWriteRepository<AuditItem>, IQueryRepository<AuditItem>
     {
         void CleanLogs(int maximumAgeOfLogsInMinutes);
     }
diff --git a/src/Umbraco.Core/Persistence/Repositories/IContentRepository.cs b/src/Umbraco.Core/Persistence/Repositories/IContentRepository.cs
new file mode 100644
index 0000000000..8572f7e125
--- /dev/null
+++ b/src/Umbraco.Core/Persistence/Repositories/IContentRepository.cs
@@ -0,0 +1,73 @@
+using System;
+using System.Collections.Generic;
+using Umbraco.Core.Models.EntityBase;
+using Umbraco.Core.Persistence.DatabaseModelDefinitions;
+using Umbraco.Core.Persistence.Querying;
+
+namespace Umbraco.Core.Persistence.Repositories
+{
+    /// <summary>
+    /// Defines the base implementation of a repository for content items.
+    /// </summary>
+    public interface IContentRepository<in TId, TEntity> : IReadWriteQueryRepository<TId, TEntity>
+        where TEntity : IUmbracoEntity
+    {
+        /// <summary>
+        /// Gets versions.
+        /// </summary>
+        /// <remarks>Current version is first, and then versions are ordered with most recent first.</remarks>
+        IEnumerable<TEntity> GetAllVersions(int nodeId);
+
+        /// <summary>
+        /// Gets version identifiers.
+        /// </summary>
+        /// <remarks>Current version is first, and then versions are ordered with most recent first.</remarks>
+        IEnumerable<int> GetVersionIds(int id, int topRows);
+
+        /// <summary>
+        /// Gets a version.
+        /// </summary>
+        TEntity GetVersion(int versionId);
+
+        /// <summary>
+        /// Deletes a version.
+        /// </summary>
+        void DeleteVersion(int versionId);
+
+        /// <summary>
+        /// Deletes all versions older than a date.
+        /// </summary>
+        void DeleteVersions(int nodeId, DateTime versionDate);
+
+        /// <summary>
+        /// Gets the recycle bin identifier.
+        /// </summary>
+        int RecycleBinId { get; }
+
+        /// <summary>
+        /// Gets the recycle bin content.
+        /// </summary>
+        IEnumerable<TEntity> GetRecycleBin();
+
+        /// <summary>
+        /// Gets the count of content items of a given content type.
+        /// </summary>
+        int Count(string contentTypeAlias = null);
+
+        /// <summary>
+        /// Gets the count of child content items of a given parent content, of a given content type.
+        /// </summary>
+        int CountChildren(int parentId, string contentTypeAlias = null);
+
+        /// <summary>
+        /// Gets the count of descendant content items of a given parent content, of a given content type.
+        /// </summary>
+        int CountDescendants(int parentId, string contentTypeAlias = null);
+
+        /// <summary>
+        /// Gets paged content items.
+        /// </summary>
+        IEnumerable<TEntity> GetPage(IQuery<TEntity> query, long pageIndex, int pageSize, out long totalRecords,
+            string orderBy, Direction orderDirection, bool orderBySystemField, IQuery<TEntity> filter = null);
+    }
+}
diff --git a/src/Umbraco.Core/Persistence/Repositories/Interfaces/IContentTypeRepository.cs b/src/Umbraco.Core/Persistence/Repositories/IContentTypeRepository.cs
similarity index 97%
rename from src/Umbraco.Core/Persistence/Repositories/Interfaces/IContentTypeRepository.cs
rename to src/Umbraco.Core/Persistence/Repositories/IContentTypeRepository.cs
index 8a2060ec01..d0fec639fe 100644
--- a/src/Umbraco.Core/Persistence/Repositories/Interfaces/IContentTypeRepository.cs
+++ b/src/Umbraco.Core/Persistence/Repositories/IContentTypeRepository.cs
@@ -1,35 +1,35 @@
-using System;
-using System.Collections.Generic;
-using Umbraco.Core.Models;
-using Umbraco.Core.Persistence.Querying;
-
-namespace Umbraco.Core.Persistence.Repositories
-{
-    public interface IContentTypeRepository : IContentTypeRepositoryBase<IContentType>
-    {
-        /// <summary>
-        /// Gets all entities of the specified <see cref="PropertyType"/> query
-        /// </summary>
-        /// <param name="query"></param>
-        /// <returns>An enumerable list of <see cref="IContentType"/> objects</returns>
-        IEnumerable<IContentType> GetByQuery(IQuery<PropertyType> query);
-
-        /// <summary>
-        /// Gets all property type aliases.
-        /// </summary>
-        /// <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);
-
-        IEnumerable<int> GetAllContentTypeIds(string[] aliases);
-    }
-}
+using System;
+using System.Collections.Generic;
+using Umbraco.Core.Models;
+using Umbraco.Core.Persistence.Querying;
+
+namespace Umbraco.Core.Persistence.Repositories
+{
+    public interface IContentTypeRepository : IContentTypeRepositoryBase<IContentType>
+    {
+        /// <summary>
+        /// Gets all entities of the specified <see cref="PropertyType"/> query
+        /// </summary>
+        /// <param name="query"></param>
+        /// <returns>An enumerable list of <see cref="IContentType"/> objects</returns>
+        IEnumerable<IContentType> GetByQuery(IQuery<PropertyType> query);
+
+        /// <summary>
+        /// Gets all property type aliases.
+        /// </summary>
+        /// <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);
+
+        IEnumerable<int> GetAllContentTypeIds(string[] aliases);
+    }
+}
diff --git a/src/Umbraco.Core/Persistence/Repositories/Interfaces/IContentTypeRepositoryBase.cs b/src/Umbraco.Core/Persistence/Repositories/IContentTypeRepositoryBase.cs
similarity index 89%
rename from src/Umbraco.Core/Persistence/Repositories/Interfaces/IContentTypeRepositoryBase.cs
rename to src/Umbraco.Core/Persistence/Repositories/IContentTypeRepositoryBase.cs
index db134a8a40..f5e9013082 100644
--- a/src/Umbraco.Core/Persistence/Repositories/Interfaces/IContentTypeRepositoryBase.cs
+++ b/src/Umbraco.Core/Persistence/Repositories/IContentTypeRepositoryBase.cs
@@ -5,7 +5,7 @@ using Umbraco.Core.Models;
 
 namespace Umbraco.Core.Persistence.Repositories
 {
-    public interface IContentTypeRepositoryBase<TItem> : IQueryRepository<int, TItem>, IReadRepository<Guid, TItem>
+    public interface IContentTypeRepositoryBase<TItem> : IReadWriteQueryRepository<int, TItem>, IReadRepository<Guid, TItem>
         where TItem : IContentTypeComposition
     {
         TItem Get(string alias);
diff --git a/src/Umbraco.Core/Persistence/Repositories/Interfaces/IDataTypeContainerRepository.cs b/src/Umbraco.Core/Persistence/Repositories/IDataTypeContainerRepository.cs
similarity index 100%
rename from src/Umbraco.Core/Persistence/Repositories/Interfaces/IDataTypeContainerRepository.cs
rename to src/Umbraco.Core/Persistence/Repositories/IDataTypeContainerRepository.cs
diff --git a/src/Umbraco.Core/Persistence/Repositories/Interfaces/IDataTypeDefinitionRepository.cs b/src/Umbraco.Core/Persistence/Repositories/IDataTypeDefinitionRepository.cs
similarity index 72%
rename from src/Umbraco.Core/Persistence/Repositories/Interfaces/IDataTypeDefinitionRepository.cs
rename to src/Umbraco.Core/Persistence/Repositories/IDataTypeDefinitionRepository.cs
index 684fd8be59..20fd586d45 100644
--- a/src/Umbraco.Core/Persistence/Repositories/Interfaces/IDataTypeDefinitionRepository.cs
+++ b/src/Umbraco.Core/Persistence/Repositories/IDataTypeDefinitionRepository.cs
@@ -1,19 +1,17 @@
-using System;
-using System.Collections.Generic;
-using Umbraco.Core.Events;
-using Umbraco.Core.Models;
-using Umbraco.Core.Persistence.UnitOfWork;
-
-namespace Umbraco.Core.Persistence.Repositories
-{
-    public interface IDataTypeDefinitionRepository : IQueryRepository<int, IDataTypeDefinition>
-    {
-
-        PreValueCollection GetPreValuesCollectionByDataTypeId(int dataTypeId);
-        string GetPreValueAsString(int preValueId);
-
-        void AddOrUpdatePreValues(IDataTypeDefinition dataType, IDictionary<string, PreValue> values);
-        void AddOrUpdatePreValues(int dataTypeId, IDictionary<string, PreValue> values);
-        IEnumerable<MoveEventInfo<IDataTypeDefinition>> Move(IDataTypeDefinition toMove, EntityContainer container);
-    }
-}
+using System.Collections.Generic;
+using Umbraco.Core.Events;
+using Umbraco.Core.Models;
+
+namespace Umbraco.Core.Persistence.Repositories
+{
+    public interface IDataTypeDefinitionRepository : IReadWriteQueryRepository<int, IDataTypeDefinition>
+    {
+
+        PreValueCollection GetPreValuesCollectionByDataTypeId(int dataTypeId);
+        string GetPreValueAsString(int preValueId);
+
+        void AddOrUpdatePreValues(IDataTypeDefinition dataType, IDictionary<string, PreValue> values);
+        void AddOrUpdatePreValues(int dataTypeId, IDictionary<string, PreValue> values);
+        IEnumerable<MoveEventInfo<IDataTypeDefinition>> Move(IDataTypeDefinition toMove, EntityContainer container);
+    }
+}
diff --git a/src/Umbraco.Core/Persistence/Repositories/Interfaces/IDictionaryRepository.cs b/src/Umbraco.Core/Persistence/Repositories/IDictionaryRepository.cs
similarity index 79%
rename from src/Umbraco.Core/Persistence/Repositories/Interfaces/IDictionaryRepository.cs
rename to src/Umbraco.Core/Persistence/Repositories/IDictionaryRepository.cs
index 351320395b..6314b01374 100644
--- a/src/Umbraco.Core/Persistence/Repositories/Interfaces/IDictionaryRepository.cs
+++ b/src/Umbraco.Core/Persistence/Repositories/IDictionaryRepository.cs
@@ -1,14 +1,14 @@
-using System;
-using System.Collections.Generic;
-using Umbraco.Core.Models;
-
-namespace Umbraco.Core.Persistence.Repositories
-{
-    public interface IDictionaryRepository : IQueryRepository<int, IDictionaryItem>
-    {
-        IDictionaryItem Get(Guid uniqueId);
-        IDictionaryItem Get(string key);
-        IEnumerable<IDictionaryItem> GetDictionaryItemDescendants(Guid? parentId);
-        Dictionary<string, Guid> GetDictionaryItemKeyMap();
-    }
-}
+using System;
+using System.Collections.Generic;
+using Umbraco.Core.Models;
+
+namespace Umbraco.Core.Persistence.Repositories
+{
+    public interface IDictionaryRepository : IReadWriteQueryRepository<int, IDictionaryItem>
+    {
+        IDictionaryItem Get(Guid uniqueId);
+        IDictionaryItem Get(string key);
+        IEnumerable<IDictionaryItem> GetDictionaryItemDescendants(Guid? parentId);
+        Dictionary<string, Guid> GetDictionaryItemKeyMap();
+    }
+}
diff --git a/src/Umbraco.Core/Persistence/Repositories/IDocumentBlueprintRepository.cs b/src/Umbraco.Core/Persistence/Repositories/IDocumentBlueprintRepository.cs
new file mode 100644
index 0000000000..c52601d629
--- /dev/null
+++ b/src/Umbraco.Core/Persistence/Repositories/IDocumentBlueprintRepository.cs
@@ -0,0 +1,5 @@
+namespace Umbraco.Core.Persistence.Repositories
+{
+    interface IDocumentBlueprintRepository : IDocumentRepository
+    { }
+}
diff --git a/src/Umbraco.Core/Persistence/Repositories/Interfaces/IContentRepository.cs b/src/Umbraco.Core/Persistence/Repositories/IDocumentRepository.cs
similarity index 91%
rename from src/Umbraco.Core/Persistence/Repositories/Interfaces/IContentRepository.cs
rename to src/Umbraco.Core/Persistence/Repositories/IDocumentRepository.cs
index 6f93338f97..bf6fda3758 100644
--- a/src/Umbraco.Core/Persistence/Repositories/Interfaces/IContentRepository.cs
+++ b/src/Umbraco.Core/Persistence/Repositories/IDocumentRepository.cs
@@ -1,56 +1,56 @@
-using System;
-using System.Collections.Generic;
-using Umbraco.Core.Models;
-using Umbraco.Core.Models.Membership;
-
-namespace Umbraco.Core.Persistence.Repositories
-{
-    public interface IContentRepository : IRepositoryVersionable<int, IContent>, IRecycleBinRepository<IContent>, IReadRepository<Guid, IContent>
-    {
-        /// <summary>
-        /// Get the count of published items
-        /// </summary>
-        /// <returns></returns>
-        /// <remarks>
-        /// We require this on the repo because the IQuery{IContent} cannot supply the 'newest' parameter
-        /// </remarks>
-        int CountPublished(string contentTypeAlias = null);
-
-        bool IsPathPublished(IContent content);
-
-        /// <summary>
-        /// Used to bulk update the permissions set for a content item. This will replace all permissions
-        /// assigned to an entity with a list of user id & permission pairs.
-        /// </summary>
-        /// <param name="permissionSet"></param>
-        void ReplaceContentPermissions(EntityPermissionSet permissionSet);
-
-        /// <summary>
-        /// Assigns a single permission to the current content item for the specified user group ids
-        /// </summary>
-        /// <param name="entity"></param>
-        /// <param name="permission"></param>
-        /// <param name="groupIds"></param>
-        void AssignEntityPermission(IContent entity, char permission, IEnumerable<int> groupIds);
-
-        /// <summary>
-        /// Gets the explicit list of permissions for the content item
-        /// </summary>
-        /// <param name="entityId"></param>
-        /// <returns></returns>
-        EntityPermissionCollection GetPermissionsForEntity(int entityId);
-
-        ///// <summary>
-        ///// Gets the implicit/inherited list of permissions for the content item
-        ///// </summary>
-        ///// <param name="path"></param>
-        ///// <returns></returns>
-        //IEnumerable<EntityPermission> GetPermissionsForPath(string path);
-
-        /// <summary>
-        /// Used to add/update a permission for a content item
-        /// </summary>
-        /// <param name="permission"></param>
-        void AddOrUpdatePermissions(ContentPermissionSet permission);
-    }
-}
+using System;
+using System.Collections.Generic;
+using Umbraco.Core.Models;
+using Umbraco.Core.Models.Membership;
+
+namespace Umbraco.Core.Persistence.Repositories
+{
+    public interface IDocumentRepository : IContentRepository<int, IContent>, IReadRepository<Guid, IContent>
+    {
+        /// <summary>
+        /// Get the count of published items
+        /// </summary>
+        /// <returns></returns>
+        /// <remarks>
+        /// We require this on the repo because the IQuery{IContent} cannot supply the 'newest' parameter
+        /// </remarks>
+        int CountPublished(string contentTypeAlias = null);
+
+        bool IsPathPublished(IContent content);
+
+        /// <summary>
+        /// Used to bulk update the permissions set for a content item. This will replace all permissions
+        /// assigned to an entity with a list of user id & permission pairs.
+        /// </summary>
+        /// <param name="permissionSet"></param>
+        void ReplaceContentPermissions(EntityPermissionSet permissionSet);
+
+        /// <summary>
+        /// Assigns a single permission to the current content item for the specified user group ids
+        /// </summary>
+        /// <param name="entity"></param>
+        /// <param name="permission"></param>
+        /// <param name="groupIds"></param>
+        void AssignEntityPermission(IContent entity, char permission, IEnumerable<int> groupIds);
+
+        /// <summary>
+        /// Gets the explicit list of permissions for the content item
+        /// </summary>
+        /// <param name="entityId"></param>
+        /// <returns></returns>
+        EntityPermissionCollection GetPermissionsForEntity(int entityId);
+
+        ///// <summary>
+        ///// Gets the implicit/inherited list of permissions for the content item
+        ///// </summary>
+        ///// <param name="path"></param>
+        ///// <returns></returns>
+        //IEnumerable<EntityPermission> GetPermissionsForPath(string path);
+
+        /// <summary>
+        /// Used to add/update a permission for a content item
+        /// </summary>
+        /// <param name="permission"></param>
+        void AddOrUpdatePermissions(ContentPermissionSet permission);
+    }
+}
diff --git a/src/Umbraco.Core/Persistence/Repositories/Interfaces/IDocumentTypeContainerRepository.cs b/src/Umbraco.Core/Persistence/Repositories/IDocumentTypeContainerRepository.cs
similarity index 100%
rename from src/Umbraco.Core/Persistence/Repositories/Interfaces/IDocumentTypeContainerRepository.cs
rename to src/Umbraco.Core/Persistence/Repositories/IDocumentTypeContainerRepository.cs
diff --git a/src/Umbraco.Core/Persistence/Repositories/Interfaces/IDomainRepository.cs b/src/Umbraco.Core/Persistence/Repositories/IDomainRepository.cs
similarity index 81%
rename from src/Umbraco.Core/Persistence/Repositories/Interfaces/IDomainRepository.cs
rename to src/Umbraco.Core/Persistence/Repositories/IDomainRepository.cs
index 04d748326e..1542f54801 100644
--- a/src/Umbraco.Core/Persistence/Repositories/Interfaces/IDomainRepository.cs
+++ b/src/Umbraco.Core/Persistence/Repositories/IDomainRepository.cs
@@ -3,7 +3,7 @@ using Umbraco.Core.Models;
 
 namespace Umbraco.Core.Persistence.Repositories
 {
-    public interface IDomainRepository : IQueryRepository<int, IDomain>
+    public interface IDomainRepository : IReadWriteQueryRepository<int, IDomain>
     {
         IDomain GetByName(string domainName);
         bool Exists(string domainName);
diff --git a/src/Umbraco.Core/Persistence/Repositories/IEntityContainerRepository.cs b/src/Umbraco.Core/Persistence/Repositories/IEntityContainerRepository.cs
new file mode 100644
index 0000000000..47f0cee52b
--- /dev/null
+++ b/src/Umbraco.Core/Persistence/Repositories/IEntityContainerRepository.cs
@@ -0,0 +1,7 @@
+using Umbraco.Core.Models;
+
+namespace Umbraco.Core.Persistence.Repositories
+{
+    interface IEntityContainerRepository : IReadRepository<int, EntityContainer>, IWriteRepository<EntityContainer>
+    { }
+}
diff --git a/src/Umbraco.Core/Persistence/Repositories/Interfaces/IEntityRepository.cs b/src/Umbraco.Core/Persistence/Repositories/IEntityRepository.cs
similarity index 97%
rename from src/Umbraco.Core/Persistence/Repositories/Interfaces/IEntityRepository.cs
rename to src/Umbraco.Core/Persistence/Repositories/IEntityRepository.cs
index 5a26e126f6..9e9f0c73bd 100644
--- a/src/Umbraco.Core/Persistence/Repositories/Interfaces/IEntityRepository.cs
+++ b/src/Umbraco.Core/Persistence/Repositories/IEntityRepository.cs
@@ -1,57 +1,57 @@
-using System;
-using System.Collections.Generic;
-using Umbraco.Core.Models;
-using Umbraco.Core.Models.EntityBase;
-using Umbraco.Core.Persistence.DatabaseModelDefinitions;
-using Umbraco.Core.Persistence.Querying;
-
-namespace Umbraco.Core.Persistence.Repositories
-{
-    public interface IEntityRepository : IRepository
-    {
-        IUmbracoEntity GetByKey(Guid key);
-        IUmbracoEntity GetByKey(Guid key, Guid objectTypeId);
-        IUmbracoEntity Get(int id);
-        IUmbracoEntity Get(int id, Guid objectTypeId);
-        IEnumerable<IUmbracoEntity> GetAll(Guid objectType, params int[] ids);
-        IEnumerable<IUmbracoEntity> GetAll(Guid objectType, params Guid[] keys);
-        IEnumerable<IUmbracoEntity> GetByQuery(IQuery<IUmbracoEntity> query);
-        IEnumerable<IUmbracoEntity> GetByQuery(IQuery<IUmbracoEntity> query, Guid objectType);
-
-        UmbracoObjectTypes GetObjectType(int id);
-        UmbracoObjectTypes GetObjectType(Guid key);
-
-        IEnumerable<EntityPath> GetAllPaths(Guid objectType, params int[] ids);
-        IEnumerable<EntityPath> GetAllPaths(Guid objectType, params Guid[] keys);
-
-        /// <summary>
-        /// Gets paged results
-        /// </summary>
-        /// <param name="query">Query to excute</param>
-        /// <param name="objectType"></param>
-        /// <param name="pageIndex">Page number</param>
-        /// <param name="pageSize">Page size</param>
-        /// <param name="totalRecords">Total records query would return without paging</param>
-        /// <param name="orderBy">Field to order by</param>
-        /// <param name="orderDirection">Direction to order by</param>
-        /// <param name="filter"></param>
-        /// <returns>An Enumerable list of <see cref="IUmbracoEntity"/> objects</returns>
-        IEnumerable<IUmbracoEntity> GetPagedResultsByQuery(IQuery<IUmbracoEntity> query, Guid objectType, long pageIndex, int pageSize, out long totalRecords,
-            string orderBy, Direction orderDirection, IQuery<IUmbracoEntity> filter = null);
-
-        /// <summary>
-        /// Returns true if the entity exists
-        /// </summary>
-        /// <param name="key"></param>
-        /// <returns></returns>
-        bool Exists(Guid key);
-
-        /// <summary>
-        /// Returns true if the entity exists
-        /// </summary>
-        /// <param name="id"></param>
-        /// <returns></returns>
-        bool Exists(int id);
-
-    }
-}
+using System;
+using System.Collections.Generic;
+using Umbraco.Core.Models;
+using Umbraco.Core.Models.EntityBase;
+using Umbraco.Core.Persistence.DatabaseModelDefinitions;
+using Umbraco.Core.Persistence.Querying;
+
+namespace Umbraco.Core.Persistence.Repositories
+{
+    public interface IEntityRepository : IRepository
+    {
+        IUmbracoEntity GetByKey(Guid key);
+        IUmbracoEntity GetByKey(Guid key, Guid objectTypeId);
+        IUmbracoEntity Get(int id);
+        IUmbracoEntity Get(int id, Guid objectTypeId);
+        IEnumerable<IUmbracoEntity> GetAll(Guid objectType, params int[] ids);
+        IEnumerable<IUmbracoEntity> GetAll(Guid objectType, params Guid[] keys);
+        IEnumerable<IUmbracoEntity> GetByQuery(IQuery<IUmbracoEntity> query);
+        IEnumerable<IUmbracoEntity> GetByQuery(IQuery<IUmbracoEntity> query, Guid objectType);
+
+        UmbracoObjectTypes GetObjectType(int id);
+        UmbracoObjectTypes GetObjectType(Guid key);
+
+        IEnumerable<EntityPath> GetAllPaths(Guid objectType, params int[] ids);
+        IEnumerable<EntityPath> GetAllPaths(Guid objectType, params Guid[] keys);
+
+        /// <summary>
+        /// Gets paged results
+        /// </summary>
+        /// <param name="query">Query to excute</param>
+        /// <param name="objectType"></param>
+        /// <param name="pageIndex">Page number</param>
+        /// <param name="pageSize">Page size</param>
+        /// <param name="totalRecords">Total records query would return without paging</param>
+        /// <param name="orderBy">Field to order by</param>
+        /// <param name="orderDirection">Direction to order by</param>
+        /// <param name="filter"></param>
+        /// <returns>An Enumerable list of <see cref="IUmbracoEntity"/> objects</returns>
+        IEnumerable<IUmbracoEntity> GetPagedResultsByQuery(IQuery<IUmbracoEntity> query, Guid objectType, long pageIndex, int pageSize, out long totalRecords,
+            string orderBy, Direction orderDirection, IQuery<IUmbracoEntity> filter = null);
+
+        /// <summary>
+        /// Returns true if the entity exists
+        /// </summary>
+        /// <param name="key"></param>
+        /// <returns></returns>
+        bool Exists(Guid key);
+
+        /// <summary>
+        /// Returns true if the entity exists
+        /// </summary>
+        /// <param name="id"></param>
+        /// <returns></returns>
+        bool Exists(int id);
+
+    }
+}
diff --git a/src/Umbraco.Core/Persistence/Repositories/Interfaces/IExternalLoginRepository.cs b/src/Umbraco.Core/Persistence/Repositories/IExternalLoginRepository.cs
similarity index 74%
rename from src/Umbraco.Core/Persistence/Repositories/Interfaces/IExternalLoginRepository.cs
rename to src/Umbraco.Core/Persistence/Repositories/IExternalLoginRepository.cs
index 9a765f6259..6d145e9961 100644
--- a/src/Umbraco.Core/Persistence/Repositories/Interfaces/IExternalLoginRepository.cs
+++ b/src/Umbraco.Core/Persistence/Repositories/IExternalLoginRepository.cs
@@ -4,7 +4,7 @@ using Umbraco.Core.Models.Identity;
 
 namespace Umbraco.Core.Persistence.Repositories
 {
-    public interface IExternalLoginRepository : IQueryRepository<int, IIdentityUserLogin>
+    public interface IExternalLoginRepository : IReadWriteQueryRepository<int, IIdentityUserLogin>
     {
         void SaveUserLogins(int memberId, IEnumerable<UserLoginInfo> logins);
         void DeleteUserLogins(int memberId);
diff --git a/src/Umbraco.Core/Persistence/Repositories/Interfaces/ILanguageRepository.cs b/src/Umbraco.Core/Persistence/Repositories/ILanguageRepository.cs
similarity index 69%
rename from src/Umbraco.Core/Persistence/Repositories/Interfaces/ILanguageRepository.cs
rename to src/Umbraco.Core/Persistence/Repositories/ILanguageRepository.cs
index 2c52a6e56d..43f7e9de04 100644
--- a/src/Umbraco.Core/Persistence/Repositories/Interfaces/ILanguageRepository.cs
+++ b/src/Umbraco.Core/Persistence/Repositories/ILanguageRepository.cs
@@ -1,10 +1,10 @@
-using Umbraco.Core.Models;
-
-namespace Umbraco.Core.Persistence.Repositories
-{
-    public interface ILanguageRepository : IQueryRepository<int, ILanguage>
-    {
-        ILanguage GetByCultureName(string cultureName);
-        ILanguage GetByIsoCode(string isoCode);
-    }
-}
+using Umbraco.Core.Models;
+
+namespace Umbraco.Core.Persistence.Repositories
+{
+    public interface ILanguageRepository : IReadWriteQueryRepository<int, ILanguage>
+    {
+        ILanguage GetByCultureName(string cultureName);
+        ILanguage GetByIsoCode(string isoCode);
+    }
+}
diff --git a/src/Umbraco.Core/Persistence/Repositories/Interfaces/IMacroRepository.cs b/src/Umbraco.Core/Persistence/Repositories/IMacroRepository.cs
similarity index 53%
rename from src/Umbraco.Core/Persistence/Repositories/Interfaces/IMacroRepository.cs
rename to src/Umbraco.Core/Persistence/Repositories/IMacroRepository.cs
index 45199aa956..eefb48933e 100644
--- a/src/Umbraco.Core/Persistence/Repositories/Interfaces/IMacroRepository.cs
+++ b/src/Umbraco.Core/Persistence/Repositories/IMacroRepository.cs
@@ -1,13 +1,12 @@
-using System;
-using System.Collections.Generic;
-using Umbraco.Core.Models;
-
-namespace Umbraco.Core.Persistence.Repositories
-{
-    internal interface IMacroRepository : IQueryRepository<int, IMacro>, IReadRepository<Guid, IMacro>
-    {
-
-        //IEnumerable<IMacro> GetAll(params string[] aliases);
-
-    }
-}
+using System;
+using Umbraco.Core.Models;
+
+namespace Umbraco.Core.Persistence.Repositories
+{
+    internal interface IMacroRepository : IReadWriteQueryRepository<int, IMacro>, IReadRepository<Guid, IMacro>
+    {
+
+        //IEnumerable<IMacro> GetAll(params string[] aliases);
+
+    }
+}
diff --git a/src/Umbraco.Core/Persistence/Repositories/Interfaces/IMediaRepository.cs b/src/Umbraco.Core/Persistence/Repositories/IMediaRepository.cs
similarity index 51%
rename from src/Umbraco.Core/Persistence/Repositories/Interfaces/IMediaRepository.cs
rename to src/Umbraco.Core/Persistence/Repositories/IMediaRepository.cs
index 8d9d3ec582..d4ec08a0df 100644
--- a/src/Umbraco.Core/Persistence/Repositories/Interfaces/IMediaRepository.cs
+++ b/src/Umbraco.Core/Persistence/Repositories/IMediaRepository.cs
@@ -1,10 +1,10 @@
-using System;
-using Umbraco.Core.Models;
-
-namespace Umbraco.Core.Persistence.Repositories
-{
-    public interface IMediaRepository : IRepositoryVersionable<int, IMedia>, IRecycleBinRepository<IMedia>, IReadRepository<Guid, IMedia>
-    {
-        IMedia GetMediaByPath(string mediaPath);
-    }
-}
+using System;
+using Umbraco.Core.Models;
+
+namespace Umbraco.Core.Persistence.Repositories
+{
+    public interface IMediaRepository : IContentRepository<int, IMedia>, IReadRepository<Guid, IMedia>
+    {
+        IMedia GetMediaByPath(string mediaPath);
+    }
+}
diff --git a/src/Umbraco.Core/Persistence/Repositories/Interfaces/IMediaTypeContainerRepository.cs b/src/Umbraco.Core/Persistence/Repositories/IMediaTypeContainerRepository.cs
similarity index 100%
rename from src/Umbraco.Core/Persistence/Repositories/Interfaces/IMediaTypeContainerRepository.cs
rename to src/Umbraco.Core/Persistence/Repositories/IMediaTypeContainerRepository.cs
diff --git a/src/Umbraco.Core/Persistence/Repositories/Interfaces/IMediaTypeRepository.cs b/src/Umbraco.Core/Persistence/Repositories/IMediaTypeRepository.cs
similarity index 92%
rename from src/Umbraco.Core/Persistence/Repositories/Interfaces/IMediaTypeRepository.cs
rename to src/Umbraco.Core/Persistence/Repositories/IMediaTypeRepository.cs
index 7f2fc327c1..09059089e7 100644
--- a/src/Umbraco.Core/Persistence/Repositories/Interfaces/IMediaTypeRepository.cs
+++ b/src/Umbraco.Core/Persistence/Repositories/IMediaTypeRepository.cs
@@ -1,17 +1,16 @@
-using System.Collections.Generic;
-using Umbraco.Core.Events;
-using Umbraco.Core.Models;
-using Umbraco.Core.Persistence.Querying;
-
-namespace Umbraco.Core.Persistence.Repositories
-{
-    public interface IMediaTypeRepository : IContentTypeRepositoryBase<IMediaType>
-    {
-        /// <summary>
-        /// Gets all entities of the specified <see cref="PropertyType"/> query
-        /// </summary>
-        /// <param name="query"></param>
-        /// <returns>An enumerable list of <see cref="IContentType"/> objects</returns>
-        IEnumerable<IMediaType> GetByQuery(IQuery<PropertyType> query);
-    }
-}
+using System.Collections.Generic;
+using Umbraco.Core.Models;
+using Umbraco.Core.Persistence.Querying;
+
+namespace Umbraco.Core.Persistence.Repositories
+{
+    public interface IMediaTypeRepository : IContentTypeRepositoryBase<IMediaType>
+    {
+        /// <summary>
+        /// Gets all entities of the specified <see cref="PropertyType"/> query
+        /// </summary>
+        /// <param name="query"></param>
+        /// <returns>An enumerable list of <see cref="IContentType"/> objects</returns>
+        IEnumerable<IMediaType> GetByQuery(IQuery<PropertyType> query);
+    }
+}
diff --git a/src/Umbraco.Core/Persistence/Repositories/Interfaces/IMemberGroupRepository.cs b/src/Umbraco.Core/Persistence/Repositories/IMemberGroupRepository.cs
similarity index 96%
rename from src/Umbraco.Core/Persistence/Repositories/Interfaces/IMemberGroupRepository.cs
rename to src/Umbraco.Core/Persistence/Repositories/IMemberGroupRepository.cs
index ddc568b400..a82dbe76a9 100644
--- a/src/Umbraco.Core/Persistence/Repositories/Interfaces/IMemberGroupRepository.cs
+++ b/src/Umbraco.Core/Persistence/Repositories/IMemberGroupRepository.cs
@@ -4,7 +4,7 @@ using Umbraco.Core.Persistence.UnitOfWork;
 
 namespace Umbraco.Core.Persistence.Repositories
 {
-    public interface IMemberGroupRepository : IUnitOfWorkRepository, IQueryRepository<int, IMemberGroup>
+    public interface IMemberGroupRepository : IUnitOfWorkRepository, IReadWriteQueryRepository<int, IMemberGroup>
     {
         /// <summary>
         /// Gets a member group by it's name
diff --git a/src/Umbraco.Core/Persistence/Repositories/Interfaces/IMemberRepository.cs b/src/Umbraco.Core/Persistence/Repositories/IMemberRepository.cs
similarity index 94%
rename from src/Umbraco.Core/Persistence/Repositories/Interfaces/IMemberRepository.cs
rename to src/Umbraco.Core/Persistence/Repositories/IMemberRepository.cs
index 8f5353bdd6..26583300ce 100644
--- a/src/Umbraco.Core/Persistence/Repositories/Interfaces/IMemberRepository.cs
+++ b/src/Umbraco.Core/Persistence/Repositories/IMemberRepository.cs
@@ -1,40 +1,40 @@
-using System.Collections.Generic;
-using Umbraco.Core.Models;
-using Umbraco.Core.Persistence.Querying;
-using Umbraco.Core.Persistence.UnitOfWork;
-
-namespace Umbraco.Core.Persistence.Repositories
-{
-    public interface IMemberRepository : IUnitOfWorkRepository, IRepositoryVersionable<int, IMember>
-    {
-        /// <summary>
-        /// Finds members in a given role
-        /// </summary>
-        /// <param name="roleName"></param>
-        /// <param name="usernameToMatch"></param>
-        /// <param name="matchType"></param>
-        /// <returns></returns>
-        IEnumerable<IMember> FindMembersInRole(string roleName, string usernameToMatch, StringPropertyMatchType matchType = StringPropertyMatchType.StartsWith);
-
-        /// <summary>
-        /// Get all members in a specific group
-        /// </summary>
-        /// <param name="groupName"></param>
-        /// <returns></returns>
-        IEnumerable<IMember> GetByMemberGroup(string groupName);
-
-        /// <summary>
-        /// Checks if a member with the username exists
-        /// </summary>
-        /// <param name="username"></param>
-        /// <returns></returns>
-        bool Exists(string username);
-
-        /// <summary>
-        /// Gets the count of items based on a complex query
-        /// </summary>
-        /// <param name="query"></param>
-        /// <returns></returns>
-        int GetCountByQuery(IQuery<IMember> query);
-    }
-}
+using System.Collections.Generic;
+using Umbraco.Core.Models;
+using Umbraco.Core.Persistence.Querying;
+using Umbraco.Core.Persistence.UnitOfWork;
+
+namespace Umbraco.Core.Persistence.Repositories
+{
+    public interface IMemberRepository : IUnitOfWorkRepository, IContentRepository<int, IMember>
+    {
+        /// <summary>
+        /// Finds members in a given role
+        /// </summary>
+        /// <param name="roleName"></param>
+        /// <param name="usernameToMatch"></param>
+        /// <param name="matchType"></param>
+        /// <returns></returns>
+        IEnumerable<IMember> FindMembersInRole(string roleName, string usernameToMatch, StringPropertyMatchType matchType = StringPropertyMatchType.StartsWith);
+
+        /// <summary>
+        /// Get all members in a specific group
+        /// </summary>
+        /// <param name="groupName"></param>
+        /// <returns></returns>
+        IEnumerable<IMember> GetByMemberGroup(string groupName);
+
+        /// <summary>
+        /// Checks if a member with the username exists
+        /// </summary>
+        /// <param name="username"></param>
+        /// <returns></returns>
+        bool Exists(string username);
+
+        /// <summary>
+        /// Gets the count of items based on a complex query
+        /// </summary>
+        /// <param name="query"></param>
+        /// <returns></returns>
+        int GetCountByQuery(IQuery<IMember> query);
+    }
+}
diff --git a/src/Umbraco.Core/Persistence/Repositories/Interfaces/IMemberTypeRepository.cs b/src/Umbraco.Core/Persistence/Repositories/IMemberTypeRepository.cs
similarity index 96%
rename from src/Umbraco.Core/Persistence/Repositories/Interfaces/IMemberTypeRepository.cs
rename to src/Umbraco.Core/Persistence/Repositories/IMemberTypeRepository.cs
index 24dd4cfbc8..54a495c181 100644
--- a/src/Umbraco.Core/Persistence/Repositories/Interfaces/IMemberTypeRepository.cs
+++ b/src/Umbraco.Core/Persistence/Repositories/IMemberTypeRepository.cs
@@ -1,8 +1,8 @@
-using Umbraco.Core.Models;
-using Umbraco.Core.Persistence.UnitOfWork;
-
-namespace Umbraco.Core.Persistence.Repositories
-{
-    public interface IMemberTypeRepository : IUnitOfWorkRepository, IContentTypeRepositoryBase<IMemberType>
-    { }
-}
+using Umbraco.Core.Models;
+using Umbraco.Core.Persistence.UnitOfWork;
+
+namespace Umbraco.Core.Persistence.Repositories
+{
+    public interface IMemberTypeRepository : IUnitOfWorkRepository, IContentTypeRepositoryBase<IMemberType>
+    { }
+}
diff --git a/src/Umbraco.Core/Persistence/Repositories/Interfaces/IMigrationEntryRepository.cs b/src/Umbraco.Core/Persistence/Repositories/IMigrationEntryRepository.cs
similarity index 83%
rename from src/Umbraco.Core/Persistence/Repositories/Interfaces/IMigrationEntryRepository.cs
rename to src/Umbraco.Core/Persistence/Repositories/IMigrationEntryRepository.cs
index 27ad825270..0b2d0f3ed9 100644
--- a/src/Umbraco.Core/Persistence/Repositories/Interfaces/IMigrationEntryRepository.cs
+++ b/src/Umbraco.Core/Persistence/Repositories/IMigrationEntryRepository.cs
@@ -4,7 +4,7 @@ using Umbraco.Core.Persistence.UnitOfWork;
 
 namespace Umbraco.Core.Persistence.Repositories
 {
-    public interface IMigrationEntryRepository : IUnitOfWorkRepository, IQueryRepository<int, IMigrationEntry>
+    public interface IMigrationEntryRepository : IUnitOfWorkRepository, IReadWriteQueryRepository<int, IMigrationEntry>
     {
         IMigrationEntry FindEntry(string migrationName, SemVersion version);
     }
diff --git a/src/Umbraco.Core/Persistence/Repositories/Interfaces/INotificationsRepository.cs b/src/Umbraco.Core/Persistence/Repositories/INotificationsRepository.cs
similarity index 100%
rename from src/Umbraco.Core/Persistence/Repositories/Interfaces/INotificationsRepository.cs
rename to src/Umbraco.Core/Persistence/Repositories/INotificationsRepository.cs
diff --git a/src/Umbraco.Core/Persistence/Repositories/Interfaces/IPartialViewMacroRepository.cs b/src/Umbraco.Core/Persistence/Repositories/IPartialViewMacroRepository.cs
similarity index 100%
rename from src/Umbraco.Core/Persistence/Repositories/Interfaces/IPartialViewMacroRepository.cs
rename to src/Umbraco.Core/Persistence/Repositories/IPartialViewMacroRepository.cs
diff --git a/src/Umbraco.Core/Persistence/Repositories/Interfaces/IPartialViewRepository.cs b/src/Umbraco.Core/Persistence/Repositories/IPartialViewRepository.cs
similarity index 78%
rename from src/Umbraco.Core/Persistence/Repositories/Interfaces/IPartialViewRepository.cs
rename to src/Umbraco.Core/Persistence/Repositories/IPartialViewRepository.cs
index 2e27a2bf0f..331d929800 100644
--- a/src/Umbraco.Core/Persistence/Repositories/Interfaces/IPartialViewRepository.cs
+++ b/src/Umbraco.Core/Persistence/Repositories/IPartialViewRepository.cs
@@ -3,7 +3,7 @@ using Umbraco.Core.Models;
 
 namespace Umbraco.Core.Persistence.Repositories
 {
-    internal interface IPartialViewRepository : IRepository<string, IPartialView>
+    internal interface IPartialViewRepository : IReadRepository<string, IPartialView>, IWriteRepository<IPartialView>
     {
         void AddFolder(string folderPath);
         void DeleteFolder(string folderPath);
diff --git a/src/Umbraco.Core/Persistence/Repositories/Interfaces/IPublicAccessRepository.cs b/src/Umbraco.Core/Persistence/Repositories/IPublicAccessRepository.cs
similarity index 78%
rename from src/Umbraco.Core/Persistence/Repositories/Interfaces/IPublicAccessRepository.cs
rename to src/Umbraco.Core/Persistence/Repositories/IPublicAccessRepository.cs
index 405d8f278a..1283271330 100644
--- a/src/Umbraco.Core/Persistence/Repositories/Interfaces/IPublicAccessRepository.cs
+++ b/src/Umbraco.Core/Persistence/Repositories/IPublicAccessRepository.cs
@@ -4,6 +4,6 @@ using Umbraco.Core.Persistence.UnitOfWork;
 
 namespace Umbraco.Core.Persistence.Repositories
 {
-    public interface IPublicAccessRepository : IUnitOfWorkRepository, IQueryRepository<Guid, PublicAccessEntry>
+    public interface IPublicAccessRepository : IUnitOfWorkRepository, IReadWriteQueryRepository<Guid, PublicAccessEntry>
     { }
 }
diff --git a/src/Umbraco.Core/Persistence/Repositories/Interfaces/IRedirectUrlRepository.cs b/src/Umbraco.Core/Persistence/Repositories/IRedirectUrlRepository.cs
similarity index 98%
rename from src/Umbraco.Core/Persistence/Repositories/Interfaces/IRedirectUrlRepository.cs
rename to src/Umbraco.Core/Persistence/Repositories/IRedirectUrlRepository.cs
index 77b9fc3531..071e9d2a93 100644
--- a/src/Umbraco.Core/Persistence/Repositories/Interfaces/IRedirectUrlRepository.cs
+++ b/src/Umbraco.Core/Persistence/Repositories/IRedirectUrlRepository.cs
@@ -8,7 +8,7 @@ namespace Umbraco.Core.Persistence.Repositories
     /// <summary>
     /// Defines the <see cref="IRedirectUrl"/> repository.
     /// </summary>
-    public interface IRedirectUrlRepository : IUnitOfWorkRepository, IQueryRepository<Guid, IRedirectUrl>
+    public interface IRedirectUrlRepository : IUnitOfWorkRepository, IReadWriteQueryRepository<Guid, IRedirectUrl>
     {
         /// <summary>
         /// Gets a redirect url.
diff --git a/src/Umbraco.Core/Persistence/Repositories/Interfaces/IRelationRepository.cs b/src/Umbraco.Core/Persistence/Repositories/IRelationRepository.cs
similarity index 81%
rename from src/Umbraco.Core/Persistence/Repositories/Interfaces/IRelationRepository.cs
rename to src/Umbraco.Core/Persistence/Repositories/IRelationRepository.cs
index 10ead9db46..029077dfee 100644
--- a/src/Umbraco.Core/Persistence/Repositories/Interfaces/IRelationRepository.cs
+++ b/src/Umbraco.Core/Persistence/Repositories/IRelationRepository.cs
@@ -1,10 +1,10 @@
-using Umbraco.Core.Models;
-using Umbraco.Core.Persistence.UnitOfWork;
-
-namespace Umbraco.Core.Persistence.Repositories
-{
-    public interface IRelationRepository : IUnitOfWorkRepository, IQueryRepository<int, IRelation>
-    {
-
-    }
-}
+using Umbraco.Core.Models;
+using Umbraco.Core.Persistence.UnitOfWork;
+
+namespace Umbraco.Core.Persistence.Repositories
+{
+    public interface IRelationRepository : IUnitOfWorkRepository, IReadWriteQueryRepository<int, IRelation>
+    {
+
+    }
+}
diff --git a/src/Umbraco.Core/Persistence/Repositories/Interfaces/IRelationTypeRepository.cs b/src/Umbraco.Core/Persistence/Repositories/IRelationTypeRepository.cs
similarity index 70%
rename from src/Umbraco.Core/Persistence/Repositories/Interfaces/IRelationTypeRepository.cs
rename to src/Umbraco.Core/Persistence/Repositories/IRelationTypeRepository.cs
index 71419cb887..30c8b82125 100644
--- a/src/Umbraco.Core/Persistence/Repositories/Interfaces/IRelationTypeRepository.cs
+++ b/src/Umbraco.Core/Persistence/Repositories/IRelationTypeRepository.cs
@@ -1,9 +1,9 @@
-using System;
-using Umbraco.Core.Models;
-using Umbraco.Core.Persistence.UnitOfWork;
-
-namespace Umbraco.Core.Persistence.Repositories
-{
-    public interface IRelationTypeRepository : IUnitOfWorkRepository, IQueryRepository<int, IRelationType>, IReadRepository<Guid, IRelationType>
-    { }
-}
+using System;
+using Umbraco.Core.Models;
+using Umbraco.Core.Persistence.UnitOfWork;
+
+namespace Umbraco.Core.Persistence.Repositories
+{
+    public interface IRelationTypeRepository : IUnitOfWorkRepository, IReadWriteQueryRepository<int, IRelationType>, IReadRepository<Guid, IRelationType>
+    { }
+}
diff --git a/src/Umbraco.Core/Persistence/Repositories/Interfaces/IScriptRepository.cs b/src/Umbraco.Core/Persistence/Repositories/IScriptRepository.cs
similarity index 76%
rename from src/Umbraco.Core/Persistence/Repositories/Interfaces/IScriptRepository.cs
rename to src/Umbraco.Core/Persistence/Repositories/IScriptRepository.cs
index 26d432702c..ea88cb7618 100644
--- a/src/Umbraco.Core/Persistence/Repositories/Interfaces/IScriptRepository.cs
+++ b/src/Umbraco.Core/Persistence/Repositories/IScriptRepository.cs
@@ -1,13 +1,13 @@
-using System.IO;
-using Umbraco.Core.Models;
-
-namespace Umbraco.Core.Persistence.Repositories
-{
-    public interface IScriptRepository : IRepository<string, Script>
-    {
-        bool ValidateScript(Script script);
-        Stream GetFileContentStream(string filepath);
-        void SetFileContent(string filepath, Stream content);
-        long GetFileSize(string filepath);
-    }
-}
+using System.IO;
+using Umbraco.Core.Models;
+
+namespace Umbraco.Core.Persistence.Repositories
+{
+    public interface IScriptRepository : IReadRepository<string, Script>, IWriteRepository<Script>
+    {
+        bool ValidateScript(Script script);
+        Stream GetFileContentStream(string filepath);
+        void SetFileContent(string filepath, Stream content);
+        long GetFileSize(string filepath);
+    }
+}
diff --git a/src/Umbraco.Core/Persistence/Repositories/Interfaces/IServerRegistrationRepository.cs b/src/Umbraco.Core/Persistence/Repositories/IServerRegistrationRepository.cs
similarity index 81%
rename from src/Umbraco.Core/Persistence/Repositories/Interfaces/IServerRegistrationRepository.cs
rename to src/Umbraco.Core/Persistence/Repositories/IServerRegistrationRepository.cs
index 28f2d48237..8bd3f43c35 100644
--- a/src/Umbraco.Core/Persistence/Repositories/Interfaces/IServerRegistrationRepository.cs
+++ b/src/Umbraco.Core/Persistence/Repositories/IServerRegistrationRepository.cs
@@ -4,7 +4,7 @@ using Umbraco.Core.Persistence.UnitOfWork;
 
 namespace Umbraco.Core.Persistence.Repositories
 {
-    public interface IServerRegistrationRepository : IUnitOfWorkRepository, IQueryRepository<int, IServerRegistration>
+    public interface IServerRegistrationRepository : IUnitOfWorkRepository, IReadWriteQueryRepository<int, IServerRegistration>
     {
         void DeactiveStaleServers(TimeSpan staleTimeout);
     }
diff --git a/src/Umbraco.Core/Persistence/Repositories/Interfaces/IStylesheetRepository.cs b/src/Umbraco.Core/Persistence/Repositories/IStylesheetRepository.cs
similarity index 74%
rename from src/Umbraco.Core/Persistence/Repositories/Interfaces/IStylesheetRepository.cs
rename to src/Umbraco.Core/Persistence/Repositories/IStylesheetRepository.cs
index 8fd14816aa..1643e6e7a7 100644
--- a/src/Umbraco.Core/Persistence/Repositories/Interfaces/IStylesheetRepository.cs
+++ b/src/Umbraco.Core/Persistence/Repositories/IStylesheetRepository.cs
@@ -1,13 +1,13 @@
-using System.IO;
-using Umbraco.Core.Models;
-
-namespace Umbraco.Core.Persistence.Repositories
-{
-    public interface IStylesheetRepository : IRepository<string, Stylesheet>
-    {
-        bool ValidateStylesheet(Stylesheet stylesheet);
-        Stream GetFileContentStream(string filepath);
-        void SetFileContent(string filepath, Stream content);
-        long GetFileSize(string filepath);
-    }
-}
+using System.IO;
+using Umbraco.Core.Models;
+
+namespace Umbraco.Core.Persistence.Repositories
+{
+    public interface IStylesheetRepository : IReadRepository<string, Stylesheet>, IWriteRepository<Stylesheet>
+    {
+        bool ValidateStylesheet(Stylesheet stylesheet);
+        Stream GetFileContentStream(string filepath);
+        void SetFileContent(string filepath, Stream content);
+        long GetFileSize(string filepath);
+    }
+}
diff --git a/src/Umbraco.Core/Persistence/Repositories/Interfaces/ITagRepository.cs b/src/Umbraco.Core/Persistence/Repositories/ITagRepository.cs
similarity index 97%
rename from src/Umbraco.Core/Persistence/Repositories/Interfaces/ITagRepository.cs
rename to src/Umbraco.Core/Persistence/Repositories/ITagRepository.cs
index 4df8c76841..9268cc01bb 100644
--- a/src/Umbraco.Core/Persistence/Repositories/Interfaces/ITagRepository.cs
+++ b/src/Umbraco.Core/Persistence/Repositories/ITagRepository.cs
@@ -5,7 +5,7 @@ using Umbraco.Core.Persistence.UnitOfWork;
 
 namespace Umbraco.Core.Persistence.Repositories
 {
-    public interface ITagRepository : IUnitOfWorkRepository, IQueryRepository<int, ITag>
+    public interface ITagRepository : IUnitOfWorkRepository, IReadWriteQueryRepository<int, ITag>
     {
 
         TaggedEntity GetTaggedEntityByKey(Guid key);
diff --git a/src/Umbraco.Core/Persistence/Repositories/Interfaces/ITaskRepository.cs b/src/Umbraco.Core/Persistence/Repositories/ITaskRepository.cs
similarity index 77%
rename from src/Umbraco.Core/Persistence/Repositories/Interfaces/ITaskRepository.cs
rename to src/Umbraco.Core/Persistence/Repositories/ITaskRepository.cs
index 149968423f..d1ebd1ffe5 100644
--- a/src/Umbraco.Core/Persistence/Repositories/Interfaces/ITaskRepository.cs
+++ b/src/Umbraco.Core/Persistence/Repositories/ITaskRepository.cs
@@ -4,7 +4,7 @@ using Umbraco.Core.Persistence.UnitOfWork;
 
 namespace Umbraco.Core.Persistence.Repositories
 {
-    public interface ITaskRepository : IUnitOfWorkRepository, IQueryRepository<int, Task>
+    public interface ITaskRepository : IUnitOfWorkRepository, IReadWriteQueryRepository<int, Task>
     {
         IEnumerable<Task> GetTasks(int? itemId = null, int? assignedUser = null, int? ownerUser = null, string taskTypeAlias = null, bool includeClosed = false);
     }
diff --git a/src/Umbraco.Core/Persistence/Repositories/Interfaces/ITaskTypeRepository.cs b/src/Umbraco.Core/Persistence/Repositories/ITaskTypeRepository.cs
similarity index 82%
rename from src/Umbraco.Core/Persistence/Repositories/Interfaces/ITaskTypeRepository.cs
rename to src/Umbraco.Core/Persistence/Repositories/ITaskTypeRepository.cs
index 8c396b819c..950dc7e954 100644
--- a/src/Umbraco.Core/Persistence/Repositories/Interfaces/ITaskTypeRepository.cs
+++ b/src/Umbraco.Core/Persistence/Repositories/ITaskTypeRepository.cs
@@ -3,6 +3,6 @@ using Umbraco.Core.Persistence.UnitOfWork;
 
 namespace Umbraco.Core.Persistence.Repositories
 {
-    public interface ITaskTypeRepository : IUnitOfWorkRepository, IQueryRepository<int, TaskType>
+    public interface ITaskTypeRepository : IUnitOfWorkRepository, IReadWriteQueryRepository<int, TaskType>
     { }
 }
diff --git a/src/Umbraco.Core/Persistence/Repositories/Interfaces/ITemplateRepository.cs b/src/Umbraco.Core/Persistence/Repositories/ITemplateRepository.cs
similarity index 95%
rename from src/Umbraco.Core/Persistence/Repositories/Interfaces/ITemplateRepository.cs
rename to src/Umbraco.Core/Persistence/Repositories/ITemplateRepository.cs
index eeda2a0277..83d4148689 100644
--- a/src/Umbraco.Core/Persistence/Repositories/Interfaces/ITemplateRepository.cs
+++ b/src/Umbraco.Core/Persistence/Repositories/ITemplateRepository.cs
@@ -1,78 +1,78 @@
-using System;
-using System.Collections.Generic;
-using System.ComponentModel;
-using System.IO;
-using Umbraco.Core.Models;
-
-namespace Umbraco.Core.Persistence.Repositories
-{
-    public interface ITemplateRepository : IQueryRepository<int, ITemplate>
-    {
-        ITemplate Get(string alias);
-
-        IEnumerable<ITemplate> GetAll(params string[] aliases);
-
-        IEnumerable<ITemplate> GetChildren(int masterTemplateId);
-        IEnumerable<ITemplate> GetChildren(string alias);
-
-        IEnumerable<ITemplate> GetDescendants(int masterTemplateId);
-        IEnumerable<ITemplate> GetDescendants(string alias);
-
-        /// <summary>
-        /// Returns a template as a template node which can be traversed (parent, children)
-        /// </summary>
-        /// <param name="alias"></param>
-        /// <returns></returns>
-        [Obsolete("Use GetDescendants instead")]
-        [EditorBrowsable(EditorBrowsableState.Never)]
-        TemplateNode GetTemplateNode(string alias);
-
-        /// <summary>
-        /// Given a template node in a tree, this will find the template node with the given alias if it is found in the hierarchy, otherwise null
-        /// </summary>
-        /// <param name="anyNode"></param>
-        /// <param name="alias"></param>
-        /// <returns></returns>
-        [Obsolete("Use GetDescendants instead")]
-        [EditorBrowsable(EditorBrowsableState.Never)]
-        TemplateNode FindTemplateInTree(TemplateNode anyNode, string alias);
-
-        /// <summary>
-        /// This checks what the default rendering engine is set in config but then also ensures that there isn't already
-        /// a template that exists in the opposite rendering engine's template folder, then returns the appropriate
-        /// rendering engine to use.
-        /// </summary>
-        /// <returns></returns>
-        /// <remarks>
-        /// The reason this is required is because for example, if you have a master page file already existing under ~/masterpages/Blah.aspx
-        /// and then you go to create a template in the tree called Blah and the default rendering engine is MVC, it will create a Blah.cshtml
-        /// empty template in ~/Views. This means every page that is using Blah will go to MVC and render an empty page.
-        /// This is mostly related to installing packages since packages install file templates to the file system and then create the
-        /// templates in business logic. Without this, it could cause the wrong rendering engine to be used for a package.
-        /// </remarks>
-        RenderingEngine DetermineTemplateRenderingEngine(ITemplate template);
-
-        /// <summary>
-        /// Validates a <see cref="ITemplate"/>
-        /// </summary>
-        /// <param name="template"><see cref="ITemplate"/> to validate</param>
-        /// <returns>True if Script is valid, otherwise false</returns>
-        bool ValidateTemplate(ITemplate template);
-
-        /// <summary>
-        /// Gets the content of a template as a stream.
-        /// </summary>
-        /// <param name="filepath">The filesystem path to the template.</param>
-        /// <returns>The content of the template.</returns>
-        Stream GetFileContentStream(string filepath);
-
-        /// <summary>
-        /// Sets the content of a template.
-        /// </summary>
-        /// <param name="filepath">The filesystem path to the template.</param>
-        /// <param name="content">The content of the template.</param>
-        void SetFileContent(string filepath, Stream content);
-
-        long GetFileSize(string filepath);
-    }
-}
+using System;
+using System.Collections.Generic;
+using System.ComponentModel;
+using System.IO;
+using Umbraco.Core.Models;
+
+namespace Umbraco.Core.Persistence.Repositories
+{
+    public interface ITemplateRepository : IReadWriteQueryRepository<int, ITemplate>
+    {
+        ITemplate Get(string alias);
+
+        IEnumerable<ITemplate> GetAll(params string[] aliases);
+
+        IEnumerable<ITemplate> GetChildren(int masterTemplateId);
+        IEnumerable<ITemplate> GetChildren(string alias);
+
+        IEnumerable<ITemplate> GetDescendants(int masterTemplateId);
+        IEnumerable<ITemplate> GetDescendants(string alias);
+
+        /// <summary>
+        /// Returns a template as a template node which can be traversed (parent, children)
+        /// </summary>
+        /// <param name="alias"></param>
+        /// <returns></returns>
+        [Obsolete("Use GetDescendants instead")]
+        [EditorBrowsable(EditorBrowsableState.Never)]
+        TemplateNode GetTemplateNode(string alias);
+
+        /// <summary>
+        /// Given a template node in a tree, this will find the template node with the given alias if it is found in the hierarchy, otherwise null
+        /// </summary>
+        /// <param name="anyNode"></param>
+        /// <param name="alias"></param>
+        /// <returns></returns>
+        [Obsolete("Use GetDescendants instead")]
+        [EditorBrowsable(EditorBrowsableState.Never)]
+        TemplateNode FindTemplateInTree(TemplateNode anyNode, string alias);
+
+        /// <summary>
+        /// This checks what the default rendering engine is set in config but then also ensures that there isn't already
+        /// a template that exists in the opposite rendering engine's template folder, then returns the appropriate
+        /// rendering engine to use.
+        /// </summary>
+        /// <returns></returns>
+        /// <remarks>
+        /// The reason this is required is because for example, if you have a master page file already existing under ~/masterpages/Blah.aspx
+        /// and then you go to create a template in the tree called Blah and the default rendering engine is MVC, it will create a Blah.cshtml
+        /// empty template in ~/Views. This means every page that is using Blah will go to MVC and render an empty page.
+        /// This is mostly related to installing packages since packages install file templates to the file system and then create the
+        /// templates in business logic. Without this, it could cause the wrong rendering engine to be used for a package.
+        /// </remarks>
+        RenderingEngine DetermineTemplateRenderingEngine(ITemplate template);
+
+        /// <summary>
+        /// Validates a <see cref="ITemplate"/>
+        /// </summary>
+        /// <param name="template"><see cref="ITemplate"/> to validate</param>
+        /// <returns>True if Script is valid, otherwise false</returns>
+        bool ValidateTemplate(ITemplate template);
+
+        /// <summary>
+        /// Gets the content of a template as a stream.
+        /// </summary>
+        /// <param name="filepath">The filesystem path to the template.</param>
+        /// <returns>The content of the template.</returns>
+        Stream GetFileContentStream(string filepath);
+
+        /// <summary>
+        /// Sets the content of a template.
+        /// </summary>
+        /// <param name="filepath">The filesystem path to the template.</param>
+        /// <param name="content">The content of the template.</param>
+        void SetFileContent(string filepath, Stream content);
+
+        long GetFileSize(string filepath);
+    }
+}
diff --git a/src/Umbraco.Core/Persistence/Repositories/Interfaces/IUserGroupRepository.cs b/src/Umbraco.Core/Persistence/Repositories/IUserGroupRepository.cs
similarity index 98%
rename from src/Umbraco.Core/Persistence/Repositories/Interfaces/IUserGroupRepository.cs
rename to src/Umbraco.Core/Persistence/Repositories/IUserGroupRepository.cs
index b5bd7d0f1f..4bebc4ef5b 100644
--- a/src/Umbraco.Core/Persistence/Repositories/Interfaces/IUserGroupRepository.cs
+++ b/src/Umbraco.Core/Persistence/Repositories/IUserGroupRepository.cs
@@ -4,7 +4,7 @@ using Umbraco.Core.Persistence.UnitOfWork;
 
 namespace Umbraco.Core.Persistence.Repositories
 {
-    public interface IUserGroupRepository : IUnitOfWorkRepository, IQueryRepository<int, IUserGroup>
+    public interface IUserGroupRepository : IUnitOfWorkRepository, IReadWriteQueryRepository<int, IUserGroup>
     {
         /// <summary>
         /// Gets a group by it's alias
diff --git a/src/Umbraco.Core/Persistence/Repositories/Interfaces/IUserRepository.cs b/src/Umbraco.Core/Persistence/Repositories/IUserRepository.cs
similarity index 94%
rename from src/Umbraco.Core/Persistence/Repositories/Interfaces/IUserRepository.cs
rename to src/Umbraco.Core/Persistence/Repositories/IUserRepository.cs
index c371070809..a4e7ae65fc 100644
--- a/src/Umbraco.Core/Persistence/Repositories/Interfaces/IUserRepository.cs
+++ b/src/Umbraco.Core/Persistence/Repositories/IUserRepository.cs
@@ -1,90 +1,90 @@
-using System;
-using System.Collections.Generic;
-using System.Linq.Expressions;
-using Umbraco.Core.Models.Membership;
-using Umbraco.Core.Persistence.DatabaseModelDefinitions;
-using Umbraco.Core.Persistence.Querying;
-using Umbraco.Core.Persistence.UnitOfWork;
-
-namespace Umbraco.Core.Persistence.Repositories
-{
-    public interface IUserRepository : IUnitOfWorkRepository, IQueryRepository<int, IUser>
-    {
-        /// <summary>
-        /// Gets the count of items based on a complex query
-        /// </summary>
-        /// <param name="query"></param>
-        /// <returns></returns>
-        int GetCountByQuery(IQuery<IUser> query);
-
-        /// <summary>
-        /// Checks if a user with the username exists
-        /// </summary>
-        /// <param name="username"></param>
-        /// <returns></returns>
-        bool Exists(string username);
-
-        /// <summary>
-        /// Gets a list of <see cref="IUser"/> objects associated with a given group
-        /// </summary>
-        /// <param name="groupId">Id of group</param>
-        IEnumerable<IUser> GetAllInGroup(int groupId);
-
-        /// <summary>
-        /// Gets a list of <see cref="IUser"/> objects not associated with a given group
-        /// </summary>
-        /// <param name="groupId">Id of group</param>
-        IEnumerable<IUser> GetAllNotInGroup(int groupId);
-
-        /// <summary>
-        /// Gets paged user results
-        /// </summary>
-        /// <param name="query"></param>
-        /// <param name="pageIndex"></param>
-        /// <param name="pageSize"></param>
-        /// <param name="totalRecords"></param>
-        /// <param name="orderBy"></param>
-        /// <param name="customFilter"></param>
-        /// <param name="orderDirection"></param>
-        /// <param name="includeUserGroups">
-        /// A filter to only include user that belong to these user groups
-        /// </param>
-        /// <param name="excludeUserGroups">
-        /// A filter to only include users that do not belong to these user groups
-        /// </param>
-        /// <param name="userState">Optional parameter to filter by specfied user state</param>
-        /// <returns></returns>
-        IEnumerable<IUser> GetPagedResultsByQuery(IQuery<IUser> query, long pageIndex, int pageSize, out long totalRecords,
-            Expression<Func<IUser, object>> orderBy, Direction orderDirection = Direction.Ascending,
-            string[] includeUserGroups = null, string[] excludeUserGroups = null, UserState[] userState = null,
-            IQuery<IUser> filter = null);
-
-        /// <summary>
-        /// Returns a user by username
-        /// </summary>
-        /// <param name="username"></param>
-        /// <param name="includeSecurityData">
-        /// This is only used for a shim in order to upgrade to 7.7
-        /// </param>
-        /// <returns>
-        /// A non cached <see cref="IUser"/> instance
-        /// </returns>
-        IUser GetByUsername(string username, bool includeSecurityData);
-
-        /// <summary>
-        /// Returns a user by id
-        /// </summary>
-        /// <param name="id"></param>
-        /// <param name="includeSecurityData">
-        /// This is only used for a shim in order to upgrade to 7.7
-        /// </param>
-        /// <returns>
-        /// A non cached <see cref="IUser"/> instance
-        /// </returns>
-        IUser Get(int id, bool includeSecurityData);
-
-        IProfile GetProfile(string username);
-        IProfile GetProfile(int id);
-        IDictionary<UserState, int> GetUserStates();
-    }
-}
+using System;
+using System.Collections.Generic;
+using System.Linq.Expressions;
+using Umbraco.Core.Models.Membership;
+using Umbraco.Core.Persistence.DatabaseModelDefinitions;
+using Umbraco.Core.Persistence.Querying;
+using Umbraco.Core.Persistence.UnitOfWork;
+
+namespace Umbraco.Core.Persistence.Repositories
+{
+    public interface IUserRepository : IUnitOfWorkRepository, IReadWriteQueryRepository<int, IUser>
+    {
+        /// <summary>
+        /// Gets the count of items based on a complex query
+        /// </summary>
+        /// <param name="query"></param>
+        /// <returns></returns>
+        int GetCountByQuery(IQuery<IUser> query);
+
+        /// <summary>
+        /// Checks if a user with the username exists
+        /// </summary>
+        /// <param name="username"></param>
+        /// <returns></returns>
+        bool Exists(string username);
+
+        /// <summary>
+        /// Gets a list of <see cref="IUser"/> objects associated with a given group
+        /// </summary>
+        /// <param name="groupId">Id of group</param>
+        IEnumerable<IUser> GetAllInGroup(int groupId);
+
+        /// <summary>
+        /// Gets a list of <see cref="IUser"/> objects not associated with a given group
+        /// </summary>
+        /// <param name="groupId">Id of group</param>
+        IEnumerable<IUser> GetAllNotInGroup(int groupId);
+
+        /// <summary>
+        /// Gets paged user results
+        /// </summary>
+        /// <param name="query"></param>
+        /// <param name="pageIndex"></param>
+        /// <param name="pageSize"></param>
+        /// <param name="totalRecords"></param>
+        /// <param name="orderBy"></param>
+        /// <param name="customFilter"></param>
+        /// <param name="orderDirection"></param>
+        /// <param name="includeUserGroups">
+        /// A filter to only include user that belong to these user groups
+        /// </param>
+        /// <param name="excludeUserGroups">
+        /// A filter to only include users that do not belong to these user groups
+        /// </param>
+        /// <param name="userState">Optional parameter to filter by specfied user state</param>
+        /// <returns></returns>
+        IEnumerable<IUser> GetPagedResultsByQuery(IQuery<IUser> query, long pageIndex, int pageSize, out long totalRecords,
+            Expression<Func<IUser, object>> orderBy, Direction orderDirection = Direction.Ascending,
+            string[] includeUserGroups = null, string[] excludeUserGroups = null, UserState[] userState = null,
+            IQuery<IUser> filter = null);
+
+        /// <summary>
+        /// Returns a user by username
+        /// </summary>
+        /// <param name="username"></param>
+        /// <param name="includeSecurityData">
+        /// This is only used for a shim in order to upgrade to 7.7
+        /// </param>
+        /// <returns>
+        /// A non cached <see cref="IUser"/> instance
+        /// </returns>
+        IUser GetByUsername(string username, bool includeSecurityData);
+
+        /// <summary>
+        /// Returns a user by id
+        /// </summary>
+        /// <param name="id"></param>
+        /// <param name="includeSecurityData">
+        /// This is only used for a shim in order to upgrade to 7.7
+        /// </param>
+        /// <returns>
+        /// A non cached <see cref="IUser"/> instance
+        /// </returns>
+        IUser Get(int id, bool includeSecurityData);
+
+        IProfile GetProfile(string username);
+        IProfile GetProfile(int id);
+        IDictionary<UserState, int> GetUserStates();
+    }
+}
diff --git a/src/Umbraco.Core/Persistence/Repositories/Interfaces/IXsltFileRepository.cs b/src/Umbraco.Core/Persistence/Repositories/IXsltFileRepository.cs
similarity index 75%
rename from src/Umbraco.Core/Persistence/Repositories/Interfaces/IXsltFileRepository.cs
rename to src/Umbraco.Core/Persistence/Repositories/IXsltFileRepository.cs
index cb9e74f6ed..2e9e840036 100644
--- a/src/Umbraco.Core/Persistence/Repositories/Interfaces/IXsltFileRepository.cs
+++ b/src/Umbraco.Core/Persistence/Repositories/IXsltFileRepository.cs
@@ -3,7 +3,7 @@ using Umbraco.Core.Models;
 
 namespace Umbraco.Core.Persistence.Repositories
 {
-    public interface IXsltFileRepository : IRepository<string, XsltFile>
+    public interface IXsltFileRepository : IReadRepository<string, XsltFile>, IWriteRepository<XsltFile>
     {
         bool ValidateXsltFile(XsltFile xsltFile);
         Stream GetFileContentStream(string filepath);
diff --git a/src/Umbraco.Core/Persistence/Repositories/AuditRepository.cs b/src/Umbraco.Core/Persistence/Repositories/Implement/AuditRepository.cs
similarity index 98%
rename from src/Umbraco.Core/Persistence/Repositories/AuditRepository.cs
rename to src/Umbraco.Core/Persistence/Repositories/Implement/AuditRepository.cs
index 1c93c5bb15..8535245a6e 100644
--- a/src/Umbraco.Core/Persistence/Repositories/AuditRepository.cs
+++ b/src/Umbraco.Core/Persistence/Repositories/Implement/AuditRepository.cs
@@ -11,7 +11,7 @@ using Umbraco.Core.Models.Rdbms;
 using Umbraco.Core.Persistence.Querying;
 using Umbraco.Core.Persistence.UnitOfWork;
 
-namespace Umbraco.Core.Persistence.Repositories
+namespace Umbraco.Core.Persistence.Repositories.Implement
 {
     internal class AuditRepository : NPocoRepositoryBase<int, AuditItem>, IAuditRepository
     {
diff --git a/src/Umbraco.Core/Persistence/Repositories/VersionableRepositoryBase.cs b/src/Umbraco.Core/Persistence/Repositories/Implement/ContentRepositoryBase.cs
similarity index 96%
rename from src/Umbraco.Core/Persistence/Repositories/VersionableRepositoryBase.cs
rename to src/Umbraco.Core/Persistence/Repositories/Implement/ContentRepositoryBase.cs
index a8b24bbc46..7b852e2c7b 100644
--- a/src/Umbraco.Core/Persistence/Repositories/VersionableRepositoryBase.cs
+++ b/src/Umbraco.Core/Persistence/Repositories/Implement/ContentRepositoryBase.cs
@@ -1,902 +1,914 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text.RegularExpressions;
-using NPoco;
-using Umbraco.Core.Cache;
-using Umbraco.Core.Composing;
-using Umbraco.Core.Events;
-using Umbraco.Core.Logging;
-using Umbraco.Core.Models;
-using Umbraco.Core.Models.Editors;
-using Umbraco.Core.Models.EntityBase;
-using Umbraco.Core.Models.Rdbms;
-using Umbraco.Core.Persistence.DatabaseModelDefinitions;
-using Umbraco.Core.Persistence.Factories;
-using Umbraco.Core.Persistence.Querying;
-using Umbraco.Core.Persistence.UnitOfWork;
-using Umbraco.Core.PropertyEditors;
-using Umbraco.Core.Services;
-using static Umbraco.Core.Persistence.NPocoSqlExtensions.Statics;
-
-namespace Umbraco.Core.Persistence.Repositories
-{
-    internal sealed class VersionableRepositoryBase
-    {
-        /// <summary>
-        /// This is used for unit tests ONLY
-        /// </summary>
-        public static bool ThrowOnWarning = false;
-    }
-
-    internal abstract class VersionableRepositoryBase<TId, TEntity, TRepository> : NPocoRepositoryBase<TId, TEntity>
-        where TEntity : class, IAggregateRoot
-        where TRepository : class, IRepository
-    {
-        protected VersionableRepositoryBase(IScopeUnitOfWork work, CacheHelper cache, ILogger logger)
-            : base(work, cache, logger)
-        { }
-
-        protected abstract TRepository This { get; }
-
-        #region Versions
-
-        // gets a specific version
-        public abstract TEntity GetVersion(int versionId);
-
-        // gets all versions, current first
-        public abstract IEnumerable<TEntity> GetAllVersions(int nodeId);
-
-        // gets all version ids, current first
-        public virtual IEnumerable<int> GetVersionIds(int nodeId, int maxRows)
-        {
-            var template = SqlContext.Templates.Get("Umbraco.Core.VersionableRepository.GetVersionIds", tsql =>
-                tsql.Select<ContentVersionDto>(x => x.Id)
-                    .From<ContentVersionDto>()
-                    .Where<ContentVersionDto>(x => x.NodeId == SqlTemplate.Arg<int>("nodeId"))
-                    .OrderByDescending<ContentVersionDto>(x => x.Current) // current '1' comes before others '0'
-                    .AndByDescending<ContentVersionDto>(x => x.VersionDate) // most recent first
-            );
-            return Database.Fetch<int>(SqlSyntax.SelectTop(template.Sql(nodeId), maxRows));
-        }
-
-        // deletes a specific version
-        public virtual void DeleteVersion(int versionId)
-        {
-            // fixme test object node type?
-
-            // get the version we want to delete
-            var template = SqlContext.Templates.Get("Umbraco.Core.VersionableRepository.GetVersion", tsql =>
-                tsql.Select<ContentVersionDto>().From<ContentVersionDto>().Where<ContentVersionDto>(x => x.Id == SqlTemplate.Arg<int>("versionId"))
-            );
-            var versionDto = Database.Fetch<ContentVersionDto>(template.Sql(new { versionId })).FirstOrDefault();
-
-            // nothing to delete
-            if (versionDto == null)
-                return;
-
-            // don't delete the current version
-            if (versionDto.Current)
-                throw new InvalidOperationException("Cannot delete the current version.");
-
-            PerformDeleteVersion(versionDto.NodeId, versionId);
-        }
-
-        //  deletes all versions of an entity, older than a date.
-        public virtual void DeleteVersions(int nodeId, DateTime versionDate)
-        {
-            // fixme test object node type?
-
-            // get the versions we want to delete, excluding the current one
-            var template = SqlContext.Templates.Get("Umbraco.Core.VersionableRepository.GetVersions", tsql =>
-                tsql.Select<ContentVersionDto>().From<ContentVersionDto>().Where<ContentVersionDto>(x => x.NodeId == SqlTemplate.Arg<int>("nodeId") && !x.Current && x.VersionDate < SqlTemplate.Arg<DateTime>("versionDate"))
-            );
-            var versionDtos = Database.Fetch<ContentVersionDto>(template.Sql(new { nodeId, versionDate }));
-            foreach (var versionDto in versionDtos)
-                PerformDeleteVersion(versionDto.NodeId, versionDto.Id);
-        }
-
-        // actually deletes a version
-        protected abstract void PerformDeleteVersion(int id, int versionId);
-
-        #endregion
-
-        #region Count
-
-        /// <summary>
-        /// Count descendants of an item.
-        /// </summary>
-        public int CountDescendants(int parentId, string contentTypeAlias = null)
-        {
-            var pathMatch = parentId == -1
-                ? "-1,"
-                : "," + parentId + ",";
-
-            var sql = SqlContext.Sql()
-                .SelectCount()
-                .From<NodeDto>();
-
-            if (contentTypeAlias.IsNullOrWhiteSpace())
-            {
-                sql
-                    .Where<NodeDto>(x => x.NodeObjectType == NodeObjectTypeId)
-                    .Where<NodeDto>(x => x.Path.Contains(pathMatch));
-            }
-            else
-            {
-                sql
-                    .InnerJoin<ContentDto>()
-                    .On<NodeDto, ContentDto>(left => left.NodeId, right => right.NodeId)
-                    .InnerJoin<ContentTypeDto>()
-                    .On<ContentTypeDto, ContentDto>(left => left.NodeId, right => right.ContentTypeId)
-                    .Where<NodeDto>(x => x.NodeObjectType == NodeObjectTypeId)
-                    .Where<NodeDto>(x => x.Path.Contains(pathMatch))
-                    .Where<ContentTypeDto>(x => x.Alias == contentTypeAlias);
-            }
-
-            return Database.ExecuteScalar<int>(sql);
-        }
-
-        /// <summary>
-        /// Count children of an item.
-        /// </summary>
-        public int CountChildren(int parentId, string contentTypeAlias = null)
-        {
-            var sql = SqlContext.Sql()
-                .SelectCount()
-                .From<NodeDto>();
-
-            if (contentTypeAlias.IsNullOrWhiteSpace())
-            {
-                sql
-                    .Where<NodeDto>(x => x.NodeObjectType == NodeObjectTypeId)
-                    .Where<NodeDto>(x => x.ParentId == parentId);
-            }
-            else
-            {
-                sql
-                    .InnerJoin<ContentDto>()
-                    .On<NodeDto, ContentDto>(left => left.NodeId, right => right.NodeId)
-                    .InnerJoin<ContentTypeDto>()
-                    .On<ContentTypeDto, ContentDto>(left => left.NodeId, right => right.ContentTypeId)
-                    .Where<NodeDto>(x => x.NodeObjectType == NodeObjectTypeId)
-                    .Where<NodeDto>(x => x.ParentId == parentId)
-                    .Where<ContentTypeDto>(x => x.Alias == contentTypeAlias);
-            }
-
-            return Database.ExecuteScalar<int>(sql);
-        }
-
-        /// <summary>
-        /// Count items.
-        /// </summary>
-        public int Count(string contentTypeAlias = null)
-        {
-            var sql = SqlContext.Sql()
-                .SelectCount()
-                .From<NodeDto>();
-
-            if (contentTypeAlias.IsNullOrWhiteSpace())
-            {
-                sql
-                    .Where<NodeDto>(x => x.NodeObjectType == NodeObjectTypeId);
-            }
-            else
-            {
-                sql
-                    .InnerJoin<ContentDto>()
-                    .On<NodeDto, ContentDto>(left => left.NodeId, right => right.NodeId)
-                    .InnerJoin<ContentTypeDto>()
-                    .On<ContentTypeDto, ContentDto>(left => left.NodeId, right => right.ContentTypeId)
-                    .Where<NodeDto>(x => x.NodeObjectType == NodeObjectTypeId)
-                    .Where<ContentTypeDto>(x => x.Alias == contentTypeAlias);
-            }
-
-            return Database.ExecuteScalar<int>(sql);
-        }
-
-        #endregion
-
-        #region Tags
-
-        /// <summary>
-        /// Clears tags for an item.
-        /// </summary>
-        protected void ClearEntityTags(IContentBase entity, ITagRepository tagRepo)
-        {
-            tagRepo.ClearTagsFromEntity(entity.Id);
-        }
-
-        /// <summary>
-        /// Updates tags for an item.
-        /// </summary>
-        protected void UpdateEntityTags(IContentBase entity, ITagRepository tagRepo)
-        {
-            foreach (var property in entity.Properties.Where(x => x.HasTagChanges))
-            {
-                foreach (var change in property.TagChanges)
-                {
-                    var tags = change.Tags.Select(x => new Tag { Text = x.Item1, Group = x.Item2 });
-                    if (change.Type == PropertyTagChange.ChangeType.Remove)
-                        tagRepo.RemoveTagsFromProperty(entity.Id, property.PropertyTypeId, tags);
-                    else
-                        tagRepo.AssignTagsToProperty(entity.Id, property.PropertyTypeId, tags, change.Type == PropertyTagChange.ChangeType.Replace);
-                }
-            }
-        }
-
-        #endregion
-
-        // sql: the main sql
-        // filterSql: a filtering ? fixme different from v7?
-        // orderBy: the name of an ordering field
-        // orderDirection: direction for orderBy
-        // orderBySystemField: whether orderBy is a system field or a custom field (property value)
-        private Sql<ISqlContext> PrepareSqlForPagedResults(Sql<ISqlContext> sql, Sql<ISqlContext> filterSql, string orderBy, Direction orderDirection, bool orderBySystemField)
-        {
-            if (filterSql == null && string.IsNullOrEmpty(orderBy)) return sql;
-
-            // preserve original
-            var psql = new Sql<ISqlContext>(sql.SqlContext, sql.SQL, sql.Arguments);
-
-            // apply filter
-            if (filterSql != null)
-                psql.Append(filterSql);
-
-            // non-sorting, we're done
-            if (string.IsNullOrEmpty(orderBy))
-                return psql;
-
-            // else apply sort
-            var dbfield = orderBySystemField
-                ? GetOrderBySystemField(ref psql, orderBy)
-                : GetOrderByNonSystemField(ref psql, orderBy);
-
-            if (orderDirection == Direction.Ascending)
-                psql.OrderBy(dbfield);
-            else
-                psql.OrderByDescending(dbfield);
-
-            // no matter what we always MUST order the result also by umbracoNode.id to ensure that all records being ordered by are unique.
-            // if we do not do this then we end up with issues where we are ordering by a field that has duplicate values (i.e. the 'text' column
-            // is empty for many nodes) - see: http://issues.umbraco.org/issue/U4-8831
-
-            dbfield = GetDatabaseFieldNameForOrderBy("umbracoNode", "id");
-            if (orderBySystemField == false || orderBy.InvariantEquals(dbfield) == false)
-            {
-                // get alias, if aliased
-                var matches = VersionableRepositoryBaseAliasRegex.For(SqlContext.SqlSyntax).Matches(sql.SQL);
-                var match = matches.Cast<Match>().FirstOrDefault(m => m.Groups[1].Value.InvariantEquals(dbfield));
-                if (match != null) dbfield = match.Groups[2].Value;
-
-                // add field
-                psql.OrderBy(dbfield);
-            }
-
-            // create prepared sql
-            // ensure it's single-line as NPoco PagingHelper has issues with multi-lines
-            psql = new Sql<ISqlContext>(psql.SqlContext, psql.SQL.ToSingleLine(), psql.Arguments);
-            return psql;
-        }
-
-        private string GetOrderBySystemField(ref Sql<ISqlContext> sql, string orderBy)
-        {
-            // get the database field eg "[table].[column]"
-            var dbfield = GetDatabaseFieldNameForOrderBy(orderBy);
-
-            // for SqlServer pagination to work, the "order by" field needs to be the alias eg if
-            // the select statement has "umbracoNode.text AS NodeDto__Text" then the order field needs
-            // to be "NodeDto__Text" and NOT "umbracoNode.text".
-            // not sure about SqlCE nor MySql, so better do it too. initially thought about patching
-            // NPoco but that would be expensive and not 100% possible, so better give NPoco proper
-            // queries to begin with.
-            // thought about maintaining a map of columns-to-aliases in the sql context but that would
-            // be expensive and most of the time, useless. so instead we parse the SQL looking for the
-            // alias. somewhat expensive too but nothing's free.
-
-            // note: ContentTypeAlias is not properly managed because it's not part of the query to begin with!
-
-            // get alias, if aliased
-            var matches = VersionableRepositoryBaseAliasRegex.For(SqlContext.SqlSyntax).Matches(sql.SQL);
-            var match = matches.Cast<Match>().FirstOrDefault(m => m.Groups[1].Value.InvariantEquals(dbfield));
-            if (match != null) dbfield = match.Groups[2].Value;
-
-            return dbfield;
-        }
-
-        private string GetOrderByNonSystemField(ref Sql<ISqlContext> sql, string orderBy)
-        {
-            // sorting by a custom field, so set-up sub-query for ORDER BY clause to pull through value
-            // from 'current' content version for the given order by field
-            var sortedInt = string.Format(SqlContext.SqlSyntax.ConvertIntegerToOrderableString, "intValue");
-            var sortedDate = string.Format(SqlContext.SqlSyntax.ConvertDateToOrderableString, "dateValue");
-            var sortedString = "COALESCE(varcharValue,'')"; // assuming COALESCE is ok for all syntaxes
-            var sortedDecimal = string.Format(SqlContext.SqlSyntax.ConvertDecimalToOrderableString, "decimalValue");
-
-            // needs to be an outer join since there's no guarantee that any of the nodes have values for this property
-            var innerSql = Sql().Select($@"CASE
-                            WHEN intValue IS NOT NULL THEN {sortedInt}
-                            WHEN decimalValue IS NOT NULL THEN {sortedDecimal}
-                            WHEN dateValue IS NOT NULL THEN {sortedDate}
-                            ELSE {sortedString}
-                        END AS customPropVal,
-                        cver.nodeId AS customPropNodeId")
-                .From<ContentVersionDto>("cver")
-                .InnerJoin<PropertyDataDto>("opdata").On<ContentVersionDto, PropertyDataDto>((left, right) => left.Id == right.Id, "cver", "opdata")
-                .InnerJoin<PropertyTypeDto>("optype").On<PropertyDataDto, PropertyTypeDto>((left, right) => left.PropertyTypeId == right.Id, "opdata", "optype")
-                .Where<ContentVersionDto>(x => x.Current, "cver") // always query on current (edit) values
-                .Where<PropertyTypeDto>(x => x.Alias == "", "optype");
-
-            // @0 is for x.Current ie 'true' = 1
-            // @1 is for x.Alias
-            var innerSqlString = innerSql.SQL.Replace("@0", "1").Replace("@1", "@" + sql.Arguments.Length);
-            var outerJoinTempTable = $@"LEFT OUTER JOIN ({innerSqlString}) AS customPropData
-                ON customPropData.customPropNodeId = {Constants.DatabaseSchema.Tables.Node}.id "; // trailing space is important!
-
-            // insert this just above the last WHERE
-            var pos = sql.SQL.InvariantIndexOf("WHERE");
-            if (pos < 0) throw new Exception("Oops, WHERE not found.");
-            var newSql = sql.SQL.Insert(pos, outerJoinTempTable);
-
-            var newArgs = sql.Arguments.ToList();
-            newArgs.Add(orderBy);
-
-            // insert the SQL selected field, too, else ordering cannot work
-            if (sql.SQL.StartsWith("SELECT ") == false) throw new Exception("Oops: SELECT not found.");
-            newSql = newSql.Insert("SELECT ".Length, "customPropData.customPropVal, ");
-
-            sql = new Sql<ISqlContext>(sql.SqlContext, newSql, newArgs.ToArray());
-
-            // and order by the custom field
-            return "customPropData.customPropVal";
-        }
-
-        protected IEnumerable<TEntity> GetPagedResultsByQuery<TDto>(IQuery<TEntity> query,
-            long pageIndex, int pageSize, out long totalRecords,
-            Func<List<TDto>, IEnumerable<TEntity>> mapDtos,
-            string orderBy, Direction orderDirection, bool orderBySystemField,
-            Sql<ISqlContext> filterSql = null) // fixme filter is different on v7?
-        {
-            if (orderBy == null) throw new ArgumentNullException(nameof(orderBy));
-
-            // start with base query, and apply the supplied IQuery
-            if (query == null) query = UnitOfWork.SqlContext.Query<TEntity>();
-            var sql = new SqlTranslator<TEntity>(GetBaseQuery(QueryType.Many), query).Translate();
-
-            // sort and filter
-            sql = PrepareSqlForPagedResults(sql, filterSql, orderBy, orderDirection, orderBySystemField);
-
-            // get a page of DTOs and the total count
-            var pagedResult = Database.Page<TDto>(pageIndex + 1, pageSize, sql);
-            totalRecords = Convert.ToInt32(pagedResult.TotalItems);
-
-            // map the DTOs and return
-            return mapDtos(pagedResult.Items);
-        }
-
-        protected IDictionary<int, PropertyCollection> GetPropertyCollections<T>(List<TempContent<T>> temps)
-            where T : class, IContentBase
-        {
-            var versions = new List<int>();
-            foreach (var temp in temps)
-            {
-                versions.Add(temp.VersionId);
-                if (temp.PublishedVersionId > 0)
-                    versions.Add(temp.PublishedVersionId);
-            }
-            if (versions.Count == 0) return new Dictionary<int, PropertyCollection>();
-
-            // get all PropertyDataDto for all definitions / versions
-            var allPropertyDataDtos = Database.FetchByGroups<PropertyDataDto, int>(versions, 2000, batch =>
-                SqlContext.Sql()
-                    .Select<PropertyDataDto>()
-                    .From<PropertyDataDto>()
-                    .WhereIn<PropertyDataDto>(x => x.VersionId, batch))
-                .ToList();
-
-            // get PropertyDataDto distinct PropertyTypeDto
-            var allPropertyTypeIds = allPropertyDataDtos.Select(x => x.PropertyTypeId).Distinct().ToList();
-            var allPropertyTypeDtos = Database.FetchByGroups<PropertyTypeDto, int>(allPropertyTypeIds, 2000, batch =>
-                SqlContext.Sql()
-                    .Select<PropertyTypeDto>()
-                    .From<PropertyTypeDto>()
-                    .WhereIn<PropertyTypeDto>(x => x.Id, batch));
-
-            // index the types for perfs, and assign to PropertyDataDto
-            var indexedPropertyTypeDtos = allPropertyTypeDtos.ToDictionary(x => x.Id, x => x);
-            foreach (var a in allPropertyDataDtos)
-                a.PropertyTypeDto = indexedPropertyTypeDtos[a.PropertyTypeId];
-
-            // lazy access to prevalue for data types if any property requires tag support
-            var pre = new Lazy<IEnumerable<DataTypePreValueDto>>(() =>
-            {
-                return Database.FetchByGroups<DataTypePreValueDto, int>(allPropertyTypeIds, 2000, batch =>
-                    SqlContext.Sql()
-                        .Select<DataTypePreValueDto>()
-                        .From<DataTypePreValueDto>()
-                        .WhereIn<DataTypePreValueDto>(x => x.DataTypeNodeId, batch));
-            });
-
-            // now we have
-            // - the definitinos
-            // - all property data dtos
-            // - a lazy access to prevalues
-            // and we need to build the proper property collections
-
-            return GetPropertyCollections(temps, allPropertyDataDtos, pre);
-        }
-
-        private IDictionary<int, PropertyCollection> GetPropertyCollections<T>(List<TempContent<T>> temps, IEnumerable<PropertyDataDto> allPropertyDataDtos, Lazy<IEnumerable<DataTypePreValueDto>> allPreValues)
-            where T : class, IContentBase
-        {
-            var result = new Dictionary<int, PropertyCollection>();
-            var propertiesWithTagSupport = new Dictionary<string, SupportTagsAttribute>();
-            var compositionPropertiesIndex = new Dictionary<int, PropertyType[]>();
-
-            // index PropertyDataDto per versionId for perfs
-            // merge edited and published dtos
-            var indexedPropertyDataDtos = new Dictionary<int, List<PropertyDataDto>>();
-            foreach (var dto in allPropertyDataDtos)
-            {
-                var versionId = dto.VersionId;
-                if (indexedPropertyDataDtos.TryGetValue(versionId, out var list) == false)
-                    indexedPropertyDataDtos[versionId] = list = new List<PropertyDataDto>();
-                list.Add(dto);
-            }
-
-            foreach (var temp in temps)
-            {
-                // compositionProperties is the property types for the entire composition
-                // use an index for perfs
-                if (compositionPropertiesIndex.TryGetValue(temp.ContentType.Id, out var compositionProperties) == false)
-                    compositionPropertiesIndex[temp.ContentType.Id] = compositionProperties = temp.ContentType.CompositionPropertyTypes.ToArray();
-
-                // map the list of PropertyDataDto to a list of Property
-                var propertyDataDtos = new List<PropertyDataDto>();
-                if (indexedPropertyDataDtos.TryGetValue(temp.VersionId, out var propertyDataDtos1))
-                {
-                    propertyDataDtos.AddRange(propertyDataDtos1);
-                    if (temp.VersionId == temp.PublishedVersionId) // dirty corner case
-                        propertyDataDtos.AddRange(propertyDataDtos1.Select(x => x.Clone(-1)));                    
-                }
-                if (temp.VersionId != temp.PublishedVersionId && indexedPropertyDataDtos.TryGetValue(temp.PublishedVersionId, out var propertyDataDtos2))
-                    propertyDataDtos.AddRange(propertyDataDtos2);
-                var properties = PropertyFactory.BuildEntities(compositionProperties, propertyDataDtos, temp.PublishedVersionId).ToList();
-
-                // deal with tags
-                Dictionary<string, object> additionalData = null;
-                foreach (var property in properties)
-                {
-                    // test for support and cache
-                    var editor = Current.PropertyEditors[property.PropertyType.PropertyEditorAlias];
-                    if (propertiesWithTagSupport.TryGetValue(property.PropertyType.PropertyEditorAlias, out var tagSupport) == false)
-                        propertiesWithTagSupport[property.PropertyType.PropertyEditorAlias] = tagSupport = TagExtractor.GetAttribute(editor);
-                    if (tagSupport == null) continue;
-
-                    //this property has tags, so we need to extract them and for that we need the prevals which we've already looked up
-                    // fixme - optimize with index
-                    var preValData = allPreValues.Value.Where(x => x.DataTypeNodeId == property.PropertyType.DataTypeDefinitionId)
-                        .Distinct()
-                        .ToArray();
-
-                    // build and set tags
-                    var asDictionary = preValData.ToDictionary(x => x.Alias, x => new PreValue(x.Id, x.Value, x.SortOrder));
-                    var preVals = new PreValueCollection(asDictionary);
-                    if (additionalData == null) additionalData = new Dictionary<string, object>(); // reduce allocs
-                    // fixme this is totally borked of course for variants
-                    var contentPropData = new ContentPropertyData(property.GetValue(), preVals, additionalData);
-                    TagExtractor.SetPropertyTags(property, contentPropData, property.GetValue(), tagSupport);
-                }
-
-                if (result.ContainsKey(temp.VersionId))
-                {
-                    var msg = $"The query returned multiple property sets for content {temp.Id}, {temp.ContentType.Name}";
-                    if (VersionableRepositoryBase.ThrowOnWarning)
-                        throw new InvalidOperationException(msg);
-                    Logger.Warn<VersionableRepositoryBase<TId, TEntity, TRepository>>(msg);
-                }
-
-                result[temp.VersionId] = new PropertyCollection(properties);
-            }
-
-            return result;
-        }
-
-        protected virtual string GetDatabaseFieldNameForOrderBy(string orderBy)
-        {
-            // translate the supplied "order by" field, which were originally defined for in-memory
-            // object sorting of ContentItemBasic instance, to the actual database field names.
-
-            switch (orderBy.ToUpperInvariant())
-            {
-                case "VERSIONDATE":
-                case "UPDATEDATE":
-                    return GetDatabaseFieldNameForOrderBy("uContentVersion", "versionDate");
-                case "CREATEDATE":
-                    return GetDatabaseFieldNameForOrderBy("umbracoNode", "createDate");
-                case "NAME":
-                    return GetDatabaseFieldNameForOrderBy("umbracoNode", "text");
-                case "PUBLISHED":
-                    return GetDatabaseFieldNameForOrderBy("uDocument", "published");
-                case "OWNER":
-                    //TODO: This isn't going to work very nicely because it's going to order by ID, not by letter
-                    return GetDatabaseFieldNameForOrderBy("umbracoNode", "nodeUser");
-                case "PATH":
-                    return GetDatabaseFieldNameForOrderBy("umbracoNode", "path");
-                case "SORTORDER":
-                    return GetDatabaseFieldNameForOrderBy("umbracoNode", "sortOrder");
-                default:
-                    //ensure invalid SQL cannot be submitted
-                    return Regex.Replace(orderBy, @"[^\w\.,`\[\]@-]", "");
-            }
-        }
-
-        protected string GetDatabaseFieldNameForOrderBy(string tableName, string fieldName)
-        {
-            return SqlContext.SqlSyntax.GetQuotedTableName(tableName) + "." + SqlContext.SqlSyntax.GetQuotedColumnName(fieldName);
-        }
-
-        #region UnitOfWork Events
-
-        public class UnitOfWorkEntityEventArgs : EventArgs
-        {
-            public UnitOfWorkEntityEventArgs(IScopeUnitOfWork unitOfWork, TEntity entity)
-            {
-                UnitOfWork = unitOfWork;
-                Entity = entity;
-            }
-
-            public IScopeUnitOfWork UnitOfWork { get; }
-            public TEntity Entity { get; }
-        }
-
-        public class UnitOfWorkVersionEventArgs : EventArgs
-        {
-            public UnitOfWorkVersionEventArgs(IScopeUnitOfWork unitOfWork, int entityId, int versionId)
-            {
-                UnitOfWork = unitOfWork;
-                EntityId = entityId;
-                VersionId = versionId;
-            }
-
-            public IScopeUnitOfWork UnitOfWork { get; }
-            public int EntityId { get; }
-            public int VersionId { get; }
-        }
-
-        public static event TypedEventHandler<TRepository, UnitOfWorkEntityEventArgs> UowRefreshedEntity;
-        public static event TypedEventHandler<TRepository, UnitOfWorkEntityEventArgs> UowRemovingEntity;
-        public static event TypedEventHandler<TRepository, UnitOfWorkVersionEventArgs> UowRemovingVersion;
-
-        protected void OnUowRefreshedEntity(UnitOfWorkEntityEventArgs args)
-        {
-            UowRefreshedEntity.RaiseEvent(args, This);
-        }
-
-        protected void OnUowRemovingEntity(UnitOfWorkEntityEventArgs args)
-        {
-            UowRemovingEntity.RaiseEvent(args, This);
-        }
-
-        protected void OnUowRemovingVersion(UnitOfWorkVersionEventArgs args)
-        {
-            UowRemovingVersion.RaiseEvent(args, This);
-        }
-
-        #endregion
-
-        #region Classes
-
-        protected class TempContent
-        {
-            public TempContent(int id, int versionId, int publishedVersionId, IContentTypeComposition contentType)
-            {
-                Id = id;
-                VersionId = versionId;
-                PublishedVersionId = publishedVersionId;
-                ContentType = contentType;
-            }
-
-            /// <summary>
-            /// Gets or sets the identifier of the content.
-            /// </summary>
-            public int Id { get; set; }
-
-            /// <summary>
-            /// Gets or sets the version identifier of the content.
-            /// </summary>
-            public int VersionId { get; set; }
-
-            /// <summary>
-            /// Gets or sets the published version identifier of the content.
-            /// </summary>
-            public int PublishedVersionId { get; set; }
-
-            /// <summary>
-            /// Gets or sets the content type.
-            /// </summary>
-            public IContentTypeComposition ContentType { get; set; }
-
-            /// <summary>
-            /// Gets or sets the identifier of the template 1 of the content.
-            /// </summary>
-            public int? Template1Id { get; set; }
-
-            /// <summary>
-            /// Gets or sets the identifier of the template 2 of the content.
-            /// </summary>
-            public int? Template2Id { get; set; }
-        }
-
-        protected class TempContent<T> : TempContent
-            where T : class, IContentBase
-        {
-            public TempContent(int id, int versionId, int publishedVersionId, IContentTypeComposition contentType, T content = null)
-                : base(id, versionId, publishedVersionId, contentType)
-            {
-                Content = content;
-            }
-
-            /// <summary>
-            /// Gets or sets the associated actual content.
-            /// </summary>
-            public T Content { get; set; }
-        }
-
-        // fixme copied from 7.6
-
-        /// <summary>
-        /// For Paging, repositories must support returning different query for the query type specified
-        /// </summary>
-        /// <param name="queryType"></param>
-        /// <returns></returns>
-        protected abstract Sql<ISqlContext> GetBaseQuery(QueryType queryType);
-
-        /*
-        internal class DocumentDefinitionCollection : KeyedCollection<ValueType, DocumentDefinition>
-        {
-            private readonly bool _includeAllVersions;
-
-            /// <summary>
-            /// Constructor specifying if all versions should be allowed, in that case the key for the collection becomes the versionId (GUID)
-            /// </summary>
-            /// <param name="includeAllVersions"></param>
-            public DocumentDefinitionCollection(bool includeAllVersions = false)
-            {
-                _includeAllVersions = includeAllVersions;
-            }
-
-            protected override ValueType GetKeyForItem(DocumentDefinition item)
-            {
-                return _includeAllVersions ? (ValueType)item.Version : item.Id;
-            }
-
-            /// <summary>
-            /// if this key already exists if it does then we need to check
-            /// if the existing item is 'older' than the new item and if that is the case we'll replace the older one
-            /// </summary>
-            /// <param name="item"></param>
-            /// <returns></returns>
-            public bool AddOrUpdate(DocumentDefinition item)
-            {
-                //if we are including all versions then just add, we aren't checking for latest
-                if (_includeAllVersions)
-                {
-                    Add(item);
-                    return true;
-                }
-
-                if (Dictionary == null)
-                {
-                    Add(item);
-                    return true;
-                }
-
-                var key = GetKeyForItem(item);
-                if (TryGetValue(key, out DocumentDefinition found))
-                {
-                    //it already exists and it's older so we need to replace it
-                    if (item.VersionId <= found.VersionId) return false;
-
-                    var currIndex = Items.IndexOf(found);
-                    if (currIndex == -1)
-                        throw new IndexOutOfRangeException("Could not find the item in the list: " + found.Version);
-
-                    //replace the current one with the newer one
-                    SetItem(currIndex, item);
-                    return true;
-                }
-
-                Add(item);
-                return true;
-            }
-
-            public bool TryGetValue(ValueType key, out DocumentDefinition val)
-            {
-                if (Dictionary != null)
-                    return Dictionary.TryGetValue(key, out val);
-
-                val = null;
-                return false;
-            }
-        }
-
-        /// <summary>
-        /// Implements a Guid comparer that respect the Sql engine ordering.
-        /// </summary>
-        /// <remarks>
-        /// MySql sorts Guids as strings, but MSSQL sorts guids based on a weird byte sections order
-        /// This comparer compares Guids using the corresponding Sql syntax method, ie the method of the underlying Sql engine.
-        /// see http://stackoverflow.com/questions/7810602/sql-server-guid-sort-algorithm-why
-        /// see https://blogs.msdn.microsoft.com/sqlprogrammability/2006/11/06/how-are-guids-compared-in-sql-server-2005/
-        /// </remarks>
-        private class DocumentDefinitionComparer : IComparer<Guid>
-        {
-            private readonly bool _mySql;
-
-            public DocumentDefinitionComparer(ISqlSyntaxProvider sqlSyntax)
-            {
-                _mySql = sqlSyntax is MySqlSyntaxProvider;
-            }
-
-            public int Compare(Guid x, Guid y)
-            {
-                // MySql sorts Guids as string (ie normal, same as .NET) whereas MSSQL
-                // sorts them on a weird byte sections order
-                return _mySql ? x.CompareTo(y) : new SqlGuid(x).CompareTo(new SqlGuid(y));
-            }
-        }
-
-        internal class DocumentDefinition
-        {
-            /// <summary>
-            /// Initializes a new instance of the <see cref="T:System.Object"/> class.
-            /// </summary>
-            public DocumentDefinition(DocumentDto dto, IContentTypeComposition composition)
-            {
-                DocumentDto = dto;
-                ContentVersionDto = dto.ContentVersionDto;
-                Composition = composition;
-            }
-
-            public DocumentDefinition(ContentVersionDto dto, IContentTypeComposition composition)
-            {
-                ContentVersionDto = dto;
-                Composition = composition;
-            }
-
-            public DocumentDto DocumentDto { get; }
-            public ContentVersionDto ContentVersionDto { get; }
-
-            public int Id => ContentVersionDto.NodeId;
-
-            public Guid Version => DocumentDto?.VersionId ?? ContentVersionDto.VersionId;
-
-            // This is used to determien which version is the most recent
-            public int VersionId => ContentVersionDto.Id;
-
-            public DateTime VersionDate => ContentVersionDto.VersionDate;
-
-            public DateTime CreateDate => ContentVersionDto.ContentDto.NodeDto.CreateDate;
-
-            public IContentTypeComposition Composition { get; set; }
-        }
-
-        // Represents a query that may contain paging information.
-        internal class PagingSqlQuery
-        {
-            // the original query sql
-            public Sql QuerySql { get; }
-
-            public PagingSqlQuery(Sql querySql)
-            {
-                QuerySql = querySql;
-            }
-
-            protected PagingSqlQuery(Sql querySql, int pageSize)
-                : this(querySql)
-            {
-                HasPaging = pageSize > 0;
-            }
-
-            // whether the paging query is actually paging
-            public bool HasPaging { get; }
-
-            // the paging sql
-            public virtual Sql BuildPagedQuery(string columns)
-            {
-                throw new InvalidOperationException("This query has no paging information.");
-            }
-        }
-
-        /// <summary>
-        /// Represents a query that may contain paging information.
-        /// </summary>
-        /// <typeparam name="T"></typeparam>
-        internal class PagingSqlQuery<T> : PagingSqlQuery // fixme what's <T> here?
-        {
-            private readonly Database _db;
-            private readonly long _pageIndex;
-            private readonly int _pageSize;
-
-            // fixme - don't capture a db instance here!
-            // instead, should have an extension method, so one can do
-            // sql = db.BuildPageQuery(pagingQuery, columns)
-            public PagingSqlQuery(Database db, Sql querySql, long pageIndex, int pageSize)
-                : base(querySql, pageSize)
-            {
-                _db = db;
-                _pageIndex = pageIndex;
-                _pageSize = pageSize;
-            }
-
-            /// <summary>
-            /// Creates a paged query based on the original query and subtitutes the selectColumns specified
-            /// </summary>
-            /// <param name="columns"></param>
-            /// <returns></returns>
-            // build a page query
-            public override Sql BuildPagedQuery(string columns)
-            {
-                if (HasPaging == false)
-                    throw new InvalidOperationException("This query has no paging information.");
-
-                // substitutes the original "SELECT ..." with "SELECT {columns}" ie only
-                // select the specified columns - fixme why?
-                var sql = $"SELECT {columns} {QuerySql.SQL.Substring(QuerySql.SQL.IndexOf("FROM", StringComparison.Ordinal))}";
-
-                // and then build the page query
-                var args = QuerySql.Arguments;
-                _db.BuildPageQueries<T>(_pageIndex * _pageSize, _pageSize, sql, ref args, out string unused, out string sqlPage);
-                return new Sql(sqlPage, args);
-            }
-        }
-        */
-
-        #endregion
-
-        #region Utilities
-
-        protected virtual string EnsureUniqueNodeName(int parentId, string nodeName, int id = 0)
-        {
-            var template = SqlContext.Templates.Get("Umbraco.Core.VersionableRepository.EnsureUniqueNodeName", tsql => tsql
-                .Select<NodeDto>(x => Alias(x.NodeId, "id"), x => Alias(x.Text, "name"))
-                .From<NodeDto>()
-                .Where<NodeDto>(x => x.NodeObjectType == SqlTemplate.Arg<Guid>("nodeObjectType") && x.ParentId == SqlTemplate.Arg<int>("parentId")));
-
-            var sql = template.Sql(NodeObjectTypeId, parentId);
-            var names = Database.Fetch<SimilarNodeName>(sql);
-
-            return SimilarNodeName.GetUniqueName(names, id, nodeName);
-        }
-
-        protected virtual int GetNewChildSortOrder(int parentId, int first)
-        {
-            var template = SqlContext.Templates.Get("Umbraco.Core.VersionableRepository.GetSortOrder", tsql =>
-                tsql.Select($"COALESCE(MAX(sortOrder),{first - 1})").From<NodeDto>().Where<NodeDto>(x => x.ParentId == SqlTemplate.Arg<int>("parentId") && x.NodeObjectType == NodeObjectTypeId)
-            );
-
-            return Database.ExecuteScalar<int>(template.Sql(new { parentId })) + 1;
-        }
-
-        protected virtual NodeDto GetParentNodeDto(int parentId)
-        {
-            var template = SqlContext.Templates.Get("Umbraco.Core.VersionableRepository.GetParentNode", tsql =>
-                tsql.Select<NodeDto>().From<NodeDto>().Where<NodeDto>(x => x.NodeId == SqlTemplate.Arg<int>("parentId"))
-            );
-
-            return Database.Fetch<NodeDto>(template.Sql(parentId)).First();
-        }
-
-        protected virtual int GetReservedId(Guid uniqueId)
-        {
-            var template = SqlContext.Templates.Get("Umbraco.Core.VersionableRepository.GetReservedId", tsql =>
-                tsql.Select<NodeDto>(x => x.NodeId).From<NodeDto>().Where<NodeDto>(x => x.UniqueId == SqlTemplate.Arg<Guid>("uniqueId") && x.NodeObjectType == Constants.ObjectTypes.IdReservation)
-            );
-            var id = Database.ExecuteScalar<int?>(template.Sql(new { uniqueId = uniqueId }));
-            return id ?? 0;
-        }
-
-        #endregion
-    }
-}
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text.RegularExpressions;
+using NPoco;
+using Umbraco.Core.Cache;
+using Umbraco.Core.Composing;
+using Umbraco.Core.Events;
+using Umbraco.Core.Logging;
+using Umbraco.Core.Models;
+using Umbraco.Core.Models.Editors;
+using Umbraco.Core.Models.EntityBase;
+using Umbraco.Core.Models.Rdbms;
+using Umbraco.Core.Persistence.DatabaseModelDefinitions;
+using Umbraco.Core.Persistence.Factories;
+using Umbraco.Core.Persistence.Querying;
+using Umbraco.Core.Persistence.UnitOfWork;
+using Umbraco.Core.PropertyEditors;
+using Umbraco.Core.Services;
+
+namespace Umbraco.Core.Persistence.Repositories.Implement
+{
+    internal sealed class ContentRepositoryBase
+    {
+        /// <summary>
+        /// This is used for unit tests ONLY
+        /// </summary>
+        public static bool ThrowOnWarning = false;
+    }
+
+    internal abstract class ContentRepositoryBase<TId, TEntity, TRepository> : NPocoRepositoryBase<TId, TEntity>, IContentRepository<TId, TEntity>
+        where TEntity : class, IUmbracoEntity
+        where TRepository : class, IRepository
+    {
+        protected ContentRepositoryBase(IScopeUnitOfWork work, CacheHelper cache, ILogger logger)
+            : base(work, cache, logger)
+        { }
+
+        protected abstract TRepository This { get; }
+
+        #region Versions
+
+        // gets a specific version
+        public abstract TEntity GetVersion(int versionId);
+
+        // gets all versions, current first
+        public abstract IEnumerable<TEntity> GetAllVersions(int nodeId);
+
+        // gets all version ids, current first
+        public virtual IEnumerable<int> GetVersionIds(int nodeId, int maxRows)
+        {
+            var template = SqlContext.Templates.Get("Umbraco.Core.VersionableRepository.GetVersionIds", tsql =>
+                tsql.Select<ContentVersionDto>(x => x.Id)
+                    .From<ContentVersionDto>()
+                    .Where<ContentVersionDto>(x => x.NodeId == SqlTemplate.Arg<int>("nodeId"))
+                    .OrderByDescending<ContentVersionDto>(x => x.Current) // current '1' comes before others '0'
+                    .AndByDescending<ContentVersionDto>(x => x.VersionDate) // most recent first
+            );
+            return Database.Fetch<int>(SqlSyntax.SelectTop(template.Sql(nodeId), maxRows));
+        }
+
+        // deletes a specific version
+        public virtual void DeleteVersion(int versionId)
+        {
+            // fixme test object node type?
+
+            // get the version we want to delete
+            var template = SqlContext.Templates.Get("Umbraco.Core.VersionableRepository.GetVersion", tsql =>
+                tsql.Select<ContentVersionDto>().From<ContentVersionDto>().Where<ContentVersionDto>(x => x.Id == SqlTemplate.Arg<int>("versionId"))
+            );
+            var versionDto = Database.Fetch<ContentVersionDto>(template.Sql(new { versionId })).FirstOrDefault();
+
+            // nothing to delete
+            if (versionDto == null)
+                return;
+
+            // don't delete the current version
+            if (versionDto.Current)
+                throw new InvalidOperationException("Cannot delete the current version.");
+
+            PerformDeleteVersion(versionDto.NodeId, versionId);
+        }
+
+        //  deletes all versions of an entity, older than a date.
+        public virtual void DeleteVersions(int nodeId, DateTime versionDate)
+        {
+            // fixme test object node type?
+
+            // get the versions we want to delete, excluding the current one
+            var template = SqlContext.Templates.Get("Umbraco.Core.VersionableRepository.GetVersions", tsql =>
+                tsql.Select<ContentVersionDto>().From<ContentVersionDto>().Where<ContentVersionDto>(x => x.NodeId == SqlTemplate.Arg<int>("nodeId") && !x.Current && x.VersionDate < SqlTemplate.Arg<DateTime>("versionDate"))
+            );
+            var versionDtos = Database.Fetch<ContentVersionDto>(template.Sql(new { nodeId, versionDate }));
+            foreach (var versionDto in versionDtos)
+                PerformDeleteVersion(versionDto.NodeId, versionDto.Id);
+        }
+
+        // actually deletes a version
+        protected abstract void PerformDeleteVersion(int id, int versionId);
+
+        #endregion
+
+        #region Count
+
+        /// <summary>
+        /// Count descendants of an item.
+        /// </summary>
+        public int CountDescendants(int parentId, string contentTypeAlias = null)
+        {
+            var pathMatch = parentId == -1
+                ? "-1,"
+                : "," + parentId + ",";
+
+            var sql = SqlContext.Sql()
+                .SelectCount()
+                .From<NodeDto>();
+
+            if (contentTypeAlias.IsNullOrWhiteSpace())
+            {
+                sql
+                    .Where<NodeDto>(x => x.NodeObjectType == NodeObjectTypeId)
+                    .Where<NodeDto>(x => x.Path.Contains(pathMatch));
+            }
+            else
+            {
+                sql
+                    .InnerJoin<ContentDto>()
+                    .On<NodeDto, ContentDto>(left => left.NodeId, right => right.NodeId)
+                    .InnerJoin<ContentTypeDto>()
+                    .On<ContentTypeDto, ContentDto>(left => left.NodeId, right => right.ContentTypeId)
+                    .Where<NodeDto>(x => x.NodeObjectType == NodeObjectTypeId)
+                    .Where<NodeDto>(x => x.Path.Contains(pathMatch))
+                    .Where<ContentTypeDto>(x => x.Alias == contentTypeAlias);
+            }
+
+            return Database.ExecuteScalar<int>(sql);
+        }
+
+        /// <summary>
+        /// Count children of an item.
+        /// </summary>
+        public int CountChildren(int parentId, string contentTypeAlias = null)
+        {
+            var sql = SqlContext.Sql()
+                .SelectCount()
+                .From<NodeDto>();
+
+            if (contentTypeAlias.IsNullOrWhiteSpace())
+            {
+                sql
+                    .Where<NodeDto>(x => x.NodeObjectType == NodeObjectTypeId)
+                    .Where<NodeDto>(x => x.ParentId == parentId);
+            }
+            else
+            {
+                sql
+                    .InnerJoin<ContentDto>()
+                    .On<NodeDto, ContentDto>(left => left.NodeId, right => right.NodeId)
+                    .InnerJoin<ContentTypeDto>()
+                    .On<ContentTypeDto, ContentDto>(left => left.NodeId, right => right.ContentTypeId)
+                    .Where<NodeDto>(x => x.NodeObjectType == NodeObjectTypeId)
+                    .Where<NodeDto>(x => x.ParentId == parentId)
+                    .Where<ContentTypeDto>(x => x.Alias == contentTypeAlias);
+            }
+
+            return Database.ExecuteScalar<int>(sql);
+        }
+
+        /// <summary>
+        /// Count items.
+        /// </summary>
+        public int Count(string contentTypeAlias = null)
+        {
+            var sql = SqlContext.Sql()
+                .SelectCount()
+                .From<NodeDto>();
+
+            if (contentTypeAlias.IsNullOrWhiteSpace())
+            {
+                sql
+                    .Where<NodeDto>(x => x.NodeObjectType == NodeObjectTypeId);
+            }
+            else
+            {
+                sql
+                    .InnerJoin<ContentDto>()
+                    .On<NodeDto, ContentDto>(left => left.NodeId, right => right.NodeId)
+                    .InnerJoin<ContentTypeDto>()
+                    .On<ContentTypeDto, ContentDto>(left => left.NodeId, right => right.ContentTypeId)
+                    .Where<NodeDto>(x => x.NodeObjectType == NodeObjectTypeId)
+                    .Where<ContentTypeDto>(x => x.Alias == contentTypeAlias);
+            }
+
+            return Database.ExecuteScalar<int>(sql);
+        }
+
+        #endregion
+
+        #region Tags
+
+        /// <summary>
+        /// Clears tags for an item.
+        /// </summary>
+        protected void ClearEntityTags(IContentBase entity, ITagRepository tagRepo)
+        {
+            tagRepo.ClearTagsFromEntity(entity.Id);
+        }
+
+        /// <summary>
+        /// Updates tags for an item.
+        /// </summary>
+        protected void UpdateEntityTags(IContentBase entity, ITagRepository tagRepo)
+        {
+            foreach (var property in entity.Properties.Where(x => x.HasTagChanges))
+            {
+                foreach (var change in property.TagChanges)
+                {
+                    var tags = change.Tags.Select(x => new Tag { Text = x.Item1, Group = x.Item2 });
+                    if (change.Type == PropertyTagChange.ChangeType.Remove)
+                        tagRepo.RemoveTagsFromProperty(entity.Id, property.PropertyTypeId, tags);
+                    else
+                        tagRepo.AssignTagsToProperty(entity.Id, property.PropertyTypeId, tags, change.Type == PropertyTagChange.ChangeType.Replace);
+                }
+            }
+        }
+
+        #endregion
+
+        public abstract IEnumerable<TEntity> GetPage(IQuery<TEntity> query, long pageIndex, int pageSize, out long totalRecords, string orderBy, Direction orderDirection, bool orderBySystemField, IQuery<TEntity> filter = null);
+
+        // sql: the main sql
+        // filterSql: a filtering ? fixme different from v7?
+        // orderBy: the name of an ordering field
+        // orderDirection: direction for orderBy
+        // orderBySystemField: whether orderBy is a system field or a custom field (property value)
+        private Sql<ISqlContext> PrepareSqlForPagedResults(Sql<ISqlContext> sql, Sql<ISqlContext> filterSql, string orderBy, Direction orderDirection, bool orderBySystemField)
+        {
+            if (filterSql == null && string.IsNullOrEmpty(orderBy)) return sql;
+
+            // preserve original
+            var psql = new Sql<ISqlContext>(sql.SqlContext, sql.SQL, sql.Arguments);
+
+            // apply filter
+            if (filterSql != null)
+                psql.Append(filterSql);
+
+            // non-sorting, we're done
+            if (string.IsNullOrEmpty(orderBy))
+                return psql;
+
+            // else apply sort
+            var dbfield = orderBySystemField
+                ? GetOrderBySystemField(ref psql, orderBy)
+                : GetOrderByNonSystemField(ref psql, orderBy);
+
+            if (orderDirection == Direction.Ascending)
+                psql.OrderBy(dbfield);
+            else
+                psql.OrderByDescending(dbfield);
+
+            // no matter what we always MUST order the result also by umbracoNode.id to ensure that all records being ordered by are unique.
+            // if we do not do this then we end up with issues where we are ordering by a field that has duplicate values (i.e. the 'text' column
+            // is empty for many nodes) - see: http://issues.umbraco.org/issue/U4-8831
+
+            dbfield = GetDatabaseFieldNameForOrderBy("umbracoNode", "id");
+            if (orderBySystemField == false || orderBy.InvariantEquals(dbfield) == false)
+            {
+                // get alias, if aliased
+                var matches = VersionableRepositoryBaseAliasRegex.For(SqlContext.SqlSyntax).Matches(sql.SQL);
+                var match = matches.Cast<Match>().FirstOrDefault(m => m.Groups[1].Value.InvariantEquals(dbfield));
+                if (match != null) dbfield = match.Groups[2].Value;
+
+                // add field
+                psql.OrderBy(dbfield);
+            }
+
+            // create prepared sql
+            // ensure it's single-line as NPoco PagingHelper has issues with multi-lines
+            psql = new Sql<ISqlContext>(psql.SqlContext, psql.SQL.ToSingleLine(), psql.Arguments);
+            return psql;
+        }
+
+        private string GetOrderBySystemField(ref Sql<ISqlContext> sql, string orderBy)
+        {
+            // get the database field eg "[table].[column]"
+            var dbfield = GetDatabaseFieldNameForOrderBy(orderBy);
+
+            // for SqlServer pagination to work, the "order by" field needs to be the alias eg if
+            // the select statement has "umbracoNode.text AS NodeDto__Text" then the order field needs
+            // to be "NodeDto__Text" and NOT "umbracoNode.text".
+            // not sure about SqlCE nor MySql, so better do it too. initially thought about patching
+            // NPoco but that would be expensive and not 100% possible, so better give NPoco proper
+            // queries to begin with.
+            // thought about maintaining a map of columns-to-aliases in the sql context but that would
+            // be expensive and most of the time, useless. so instead we parse the SQL looking for the
+            // alias. somewhat expensive too but nothing's free.
+
+            // note: ContentTypeAlias is not properly managed because it's not part of the query to begin with!
+
+            // get alias, if aliased
+            var matches = VersionableRepositoryBaseAliasRegex.For(SqlContext.SqlSyntax).Matches(sql.SQL);
+            var match = matches.Cast<Match>().FirstOrDefault(m => m.Groups[1].Value.InvariantEquals(dbfield));
+            if (match != null) dbfield = match.Groups[2].Value;
+
+            return dbfield;
+        }
+
+        private string GetOrderByNonSystemField(ref Sql<ISqlContext> sql, string orderBy)
+        {
+            // sorting by a custom field, so set-up sub-query for ORDER BY clause to pull through value
+            // from 'current' content version for the given order by field
+            var sortedInt = string.Format(SqlContext.SqlSyntax.ConvertIntegerToOrderableString, "intValue");
+            var sortedDate = string.Format(SqlContext.SqlSyntax.ConvertDateToOrderableString, "dateValue");
+            var sortedString = "COALESCE(varcharValue,'')"; // assuming COALESCE is ok for all syntaxes
+            var sortedDecimal = string.Format(SqlContext.SqlSyntax.ConvertDecimalToOrderableString, "decimalValue");
+
+            // needs to be an outer join since there's no guarantee that any of the nodes have values for this property
+            var innerSql = Sql().Select($@"CASE
+                            WHEN intValue IS NOT NULL THEN {sortedInt}
+                            WHEN decimalValue IS NOT NULL THEN {sortedDecimal}
+                            WHEN dateValue IS NOT NULL THEN {sortedDate}
+                            ELSE {sortedString}
+                        END AS customPropVal,
+                        cver.nodeId AS customPropNodeId")
+                .From<ContentVersionDto>("cver")
+                .InnerJoin<PropertyDataDto>("opdata").On<ContentVersionDto, PropertyDataDto>((left, right) => left.Id == right.Id, "cver", "opdata")
+                .InnerJoin<PropertyTypeDto>("optype").On<PropertyDataDto, PropertyTypeDto>((left, right) => left.PropertyTypeId == right.Id, "opdata", "optype")
+                .Where<ContentVersionDto>(x => x.Current, "cver") // always query on current (edit) values
+                .Where<PropertyTypeDto>(x => x.Alias == "", "optype");
+
+            // @0 is for x.Current ie 'true' = 1
+            // @1 is for x.Alias
+            var innerSqlString = innerSql.SQL.Replace("@0", "1").Replace("@1", "@" + sql.Arguments.Length);
+            var outerJoinTempTable = $@"LEFT OUTER JOIN ({innerSqlString}) AS customPropData
+                ON customPropData.customPropNodeId = {Constants.DatabaseSchema.Tables.Node}.id "; // trailing space is important!
+
+            // insert this just above the last WHERE
+            var pos = sql.SQL.InvariantIndexOf("WHERE");
+            if (pos < 0) throw new Exception("Oops, WHERE not found.");
+            var newSql = sql.SQL.Insert(pos, outerJoinTempTable);
+
+            var newArgs = sql.Arguments.ToList();
+            newArgs.Add(orderBy);
+
+            // insert the SQL selected field, too, else ordering cannot work
+            if (sql.SQL.StartsWith("SELECT ") == false) throw new Exception("Oops: SELECT not found.");
+            newSql = newSql.Insert("SELECT ".Length, "customPropData.customPropVal, ");
+
+            sql = new Sql<ISqlContext>(sql.SqlContext, newSql, newArgs.ToArray());
+
+            // and order by the custom field
+            return "customPropData.customPropVal";
+        }
+
+        protected IEnumerable<TEntity> GetPagedResultsByQuery<TDto>(IQuery<TEntity> query,
+            long pageIndex, int pageSize, out long totalRecords,
+            Func<List<TDto>, IEnumerable<TEntity>> mapDtos,
+            string orderBy, Direction orderDirection, bool orderBySystemField,
+            Sql<ISqlContext> filterSql = null) // fixme filter is different on v7?
+        {
+            if (orderBy == null) throw new ArgumentNullException(nameof(orderBy));
+
+            // start with base query, and apply the supplied IQuery
+            if (query == null) query = UnitOfWork.SqlContext.Query<TEntity>();
+            var sql = new SqlTranslator<TEntity>(GetBaseQuery(QueryType.Many), query).Translate();
+
+            // sort and filter
+            sql = PrepareSqlForPagedResults(sql, filterSql, orderBy, orderDirection, orderBySystemField);
+
+            // get a page of DTOs and the total count
+            var pagedResult = Database.Page<TDto>(pageIndex + 1, pageSize, sql);
+            totalRecords = Convert.ToInt32(pagedResult.TotalItems);
+
+            // map the DTOs and return
+            return mapDtos(pagedResult.Items);
+        }
+
+        protected IDictionary<int, PropertyCollection> GetPropertyCollections<T>(List<TempContent<T>> temps)
+            where T : class, IContentBase
+        {
+            var versions = new List<int>();
+            foreach (var temp in temps)
+            {
+                versions.Add(temp.VersionId);
+                if (temp.PublishedVersionId > 0)
+                    versions.Add(temp.PublishedVersionId);
+            }
+            if (versions.Count == 0) return new Dictionary<int, PropertyCollection>();
+
+            // get all PropertyDataDto for all definitions / versions
+            var allPropertyDataDtos = Database.FetchByGroups<PropertyDataDto, int>(versions, 2000, batch =>
+                SqlContext.Sql()
+                    .Select<PropertyDataDto>()
+                    .From<PropertyDataDto>()
+                    .WhereIn<PropertyDataDto>(x => x.VersionId, batch))
+                .ToList();
+
+            // get PropertyDataDto distinct PropertyTypeDto
+            var allPropertyTypeIds = allPropertyDataDtos.Select(x => x.PropertyTypeId).Distinct().ToList();
+            var allPropertyTypeDtos = Database.FetchByGroups<PropertyTypeDto, int>(allPropertyTypeIds, 2000, batch =>
+                SqlContext.Sql()
+                    .Select<PropertyTypeDto>()
+                    .From<PropertyTypeDto>()
+                    .WhereIn<PropertyTypeDto>(x => x.Id, batch));
+
+            // index the types for perfs, and assign to PropertyDataDto
+            var indexedPropertyTypeDtos = allPropertyTypeDtos.ToDictionary(x => x.Id, x => x);
+            foreach (var a in allPropertyDataDtos)
+                a.PropertyTypeDto = indexedPropertyTypeDtos[a.PropertyTypeId];
+
+            // lazy access to prevalue for data types if any property requires tag support
+            var pre = new Lazy<IEnumerable<DataTypePreValueDto>>(() =>
+            {
+                return Database.FetchByGroups<DataTypePreValueDto, int>(allPropertyTypeIds, 2000, batch =>
+                    SqlContext.Sql()
+                        .Select<DataTypePreValueDto>()
+                        .From<DataTypePreValueDto>()
+                        .WhereIn<DataTypePreValueDto>(x => x.DataTypeNodeId, batch));
+            });
+
+            // now we have
+            // - the definitinos
+            // - all property data dtos
+            // - a lazy access to prevalues
+            // and we need to build the proper property collections
+
+            return GetPropertyCollections(temps, allPropertyDataDtos, pre);
+        }
+
+        private IDictionary<int, PropertyCollection> GetPropertyCollections<T>(List<TempContent<T>> temps, IEnumerable<PropertyDataDto> allPropertyDataDtos, Lazy<IEnumerable<DataTypePreValueDto>> allPreValues)
+            where T : class, IContentBase
+        {
+            var result = new Dictionary<int, PropertyCollection>();
+            var propertiesWithTagSupport = new Dictionary<string, SupportTagsAttribute>();
+            var compositionPropertiesIndex = new Dictionary<int, PropertyType[]>();
+
+            // index PropertyDataDto per versionId for perfs
+            // merge edited and published dtos
+            var indexedPropertyDataDtos = new Dictionary<int, List<PropertyDataDto>>();
+            foreach (var dto in allPropertyDataDtos)
+            {
+                var versionId = dto.VersionId;
+                if (indexedPropertyDataDtos.TryGetValue(versionId, out var list) == false)
+                    indexedPropertyDataDtos[versionId] = list = new List<PropertyDataDto>();
+                list.Add(dto);
+            }
+
+            foreach (var temp in temps)
+            {
+                // compositionProperties is the property types for the entire composition
+                // use an index for perfs
+                if (compositionPropertiesIndex.TryGetValue(temp.ContentType.Id, out var compositionProperties) == false)
+                    compositionPropertiesIndex[temp.ContentType.Id] = compositionProperties = temp.ContentType.CompositionPropertyTypes.ToArray();
+
+                // map the list of PropertyDataDto to a list of Property
+                var propertyDataDtos = new List<PropertyDataDto>();
+                if (indexedPropertyDataDtos.TryGetValue(temp.VersionId, out var propertyDataDtos1))
+                {
+                    propertyDataDtos.AddRange(propertyDataDtos1);
+                    if (temp.VersionId == temp.PublishedVersionId) // dirty corner case
+                        propertyDataDtos.AddRange(propertyDataDtos1.Select(x => x.Clone(-1)));                    
+                }
+                if (temp.VersionId != temp.PublishedVersionId && indexedPropertyDataDtos.TryGetValue(temp.PublishedVersionId, out var propertyDataDtos2))
+                    propertyDataDtos.AddRange(propertyDataDtos2);
+                var properties = PropertyFactory.BuildEntities(compositionProperties, propertyDataDtos, temp.PublishedVersionId).ToList();
+
+                // deal with tags
+                Dictionary<string, object> additionalData = null;
+                foreach (var property in properties)
+                {
+                    // test for support and cache
+                    var editor = Current.PropertyEditors[property.PropertyType.PropertyEditorAlias];
+                    if (propertiesWithTagSupport.TryGetValue(property.PropertyType.PropertyEditorAlias, out var tagSupport) == false)
+                        propertiesWithTagSupport[property.PropertyType.PropertyEditorAlias] = tagSupport = TagExtractor.GetAttribute(editor);
+                    if (tagSupport == null) continue;
+
+                    //this property has tags, so we need to extract them and for that we need the prevals which we've already looked up
+                    // fixme - optimize with index
+                    var preValData = allPreValues.Value.Where(x => x.DataTypeNodeId == property.PropertyType.DataTypeDefinitionId)
+                        .Distinct()
+                        .ToArray();
+
+                    // build and set tags
+                    var asDictionary = preValData.ToDictionary(x => x.Alias, x => new PreValue(x.Id, x.Value, x.SortOrder));
+                    var preVals = new PreValueCollection(asDictionary);
+                    if (additionalData == null) additionalData = new Dictionary<string, object>(); // reduce allocs
+                    // fixme this is totally borked of course for variants
+                    var contentPropData = new ContentPropertyData(property.GetValue(), preVals, additionalData);
+                    TagExtractor.SetPropertyTags(property, contentPropData, property.GetValue(), tagSupport);
+                }
+
+                if (result.ContainsKey(temp.VersionId))
+                {
+                    var msg = $"The query returned multiple property sets for content {temp.Id}, {temp.ContentType.Name}";
+                    if (ContentRepositoryBase.ThrowOnWarning)
+                        throw new InvalidOperationException(msg);
+                    Logger.Warn<ContentRepositoryBase<TId, TEntity, TRepository>>(msg);
+                }
+
+                result[temp.VersionId] = new PropertyCollection(properties);
+            }
+
+            return result;
+        }
+
+        protected virtual string GetDatabaseFieldNameForOrderBy(string orderBy)
+        {
+            // translate the supplied "order by" field, which were originally defined for in-memory
+            // object sorting of ContentItemBasic instance, to the actual database field names.
+
+            switch (orderBy.ToUpperInvariant())
+            {
+                case "VERSIONDATE":
+                case "UPDATEDATE":
+                    return GetDatabaseFieldNameForOrderBy("uContentVersion", "versionDate");
+                case "CREATEDATE":
+                    return GetDatabaseFieldNameForOrderBy("umbracoNode", "createDate");
+                case "NAME":
+                    return GetDatabaseFieldNameForOrderBy("umbracoNode", "text");
+                case "PUBLISHED":
+                    return GetDatabaseFieldNameForOrderBy("uDocument", "published");
+                case "OWNER":
+                    //TODO: This isn't going to work very nicely because it's going to order by ID, not by letter
+                    return GetDatabaseFieldNameForOrderBy("umbracoNode", "nodeUser");
+                case "PATH":
+                    return GetDatabaseFieldNameForOrderBy("umbracoNode", "path");
+                case "SORTORDER":
+                    return GetDatabaseFieldNameForOrderBy("umbracoNode", "sortOrder");
+                default:
+                    //ensure invalid SQL cannot be submitted
+                    return Regex.Replace(orderBy, @"[^\w\.,`\[\]@-]", "");
+            }
+        }
+
+        protected string GetDatabaseFieldNameForOrderBy(string tableName, string fieldName)
+        {
+            return SqlContext.SqlSyntax.GetQuotedTableName(tableName) + "." + SqlContext.SqlSyntax.GetQuotedColumnName(fieldName);
+        }
+
+        #region UnitOfWork Events
+
+        public class UnitOfWorkEntityEventArgs : EventArgs
+        {
+            public UnitOfWorkEntityEventArgs(IScopeUnitOfWork unitOfWork, TEntity entity)
+            {
+                UnitOfWork = unitOfWork;
+                Entity = entity;
+            }
+
+            public IScopeUnitOfWork UnitOfWork { get; }
+            public TEntity Entity { get; }
+        }
+
+        public class UnitOfWorkVersionEventArgs : EventArgs
+        {
+            public UnitOfWorkVersionEventArgs(IScopeUnitOfWork unitOfWork, int entityId, int versionId)
+            {
+                UnitOfWork = unitOfWork;
+                EntityId = entityId;
+                VersionId = versionId;
+            }
+
+            public IScopeUnitOfWork UnitOfWork { get; }
+            public int EntityId { get; }
+            public int VersionId { get; }
+        }
+
+        public static event TypedEventHandler<TRepository, UnitOfWorkEntityEventArgs> UowRefreshedEntity;
+        public static event TypedEventHandler<TRepository, UnitOfWorkEntityEventArgs> UowRemovingEntity;
+        public static event TypedEventHandler<TRepository, UnitOfWorkVersionEventArgs> UowRemovingVersion;
+
+        protected void OnUowRefreshedEntity(UnitOfWorkEntityEventArgs args)
+        {
+            UowRefreshedEntity.RaiseEvent(args, This);
+        }
+
+        protected void OnUowRemovingEntity(UnitOfWorkEntityEventArgs args)
+        {
+            UowRemovingEntity.RaiseEvent(args, This);
+        }
+
+        protected void OnUowRemovingVersion(UnitOfWorkVersionEventArgs args)
+        {
+            UowRemovingVersion.RaiseEvent(args, This);
+        }
+
+        #endregion
+
+        #region Classes
+
+        protected class TempContent
+        {
+            public TempContent(int id, int versionId, int publishedVersionId, IContentTypeComposition contentType)
+            {
+                Id = id;
+                VersionId = versionId;
+                PublishedVersionId = publishedVersionId;
+                ContentType = contentType;
+            }
+
+            /// <summary>
+            /// Gets or sets the identifier of the content.
+            /// </summary>
+            public int Id { get; set; }
+
+            /// <summary>
+            /// Gets or sets the version identifier of the content.
+            /// </summary>
+            public int VersionId { get; set; }
+
+            /// <summary>
+            /// Gets or sets the published version identifier of the content.
+            /// </summary>
+            public int PublishedVersionId { get; set; }
+
+            /// <summary>
+            /// Gets or sets the content type.
+            /// </summary>
+            public IContentTypeComposition ContentType { get; set; }
+
+            /// <summary>
+            /// Gets or sets the identifier of the template 1 of the content.
+            /// </summary>
+            public int? Template1Id { get; set; }
+
+            /// <summary>
+            /// Gets or sets the identifier of the template 2 of the content.
+            /// </summary>
+            public int? Template2Id { get; set; }
+        }
+
+        protected class TempContent<T> : TempContent
+            where T : class, IContentBase
+        {
+            public TempContent(int id, int versionId, int publishedVersionId, IContentTypeComposition contentType, T content = null)
+                : base(id, versionId, publishedVersionId, contentType)
+            {
+                Content = content;
+            }
+
+            /// <summary>
+            /// Gets or sets the associated actual content.
+            /// </summary>
+            public T Content { get; set; }
+        }
+
+        // fixme copied from 7.6
+
+        /// <summary>
+        /// For Paging, repositories must support returning different query for the query type specified
+        /// </summary>
+        /// <param name="queryType"></param>
+        /// <returns></returns>
+        protected abstract Sql<ISqlContext> GetBaseQuery(QueryType queryType);
+
+        /*
+        internal class DocumentDefinitionCollection : KeyedCollection<ValueType, DocumentDefinition>
+        {
+            private readonly bool _includeAllVersions;
+
+            /// <summary>
+            /// Constructor specifying if all versions should be allowed, in that case the key for the collection becomes the versionId (GUID)
+            /// </summary>
+            /// <param name="includeAllVersions"></param>
+            public DocumentDefinitionCollection(bool includeAllVersions = false)
+            {
+                _includeAllVersions = includeAllVersions;
+            }
+
+            protected override ValueType GetKeyForItem(DocumentDefinition item)
+            {
+                return _includeAllVersions ? (ValueType)item.Version : item.Id;
+            }
+
+            /// <summary>
+            /// if this key already exists if it does then we need to check
+            /// if the existing item is 'older' than the new item and if that is the case we'll replace the older one
+            /// </summary>
+            /// <param name="item"></param>
+            /// <returns></returns>
+            public bool AddOrUpdate(DocumentDefinition item)
+            {
+                //if we are including all versions then just add, we aren't checking for latest
+                if (_includeAllVersions)
+                {
+                    Add(item);
+                    return true;
+                }
+
+                if (Dictionary == null)
+                {
+                    Add(item);
+                    return true;
+                }
+
+                var key = GetKeyForItem(item);
+                if (TryGetValue(key, out DocumentDefinition found))
+                {
+                    //it already exists and it's older so we need to replace it
+                    if (item.VersionId <= found.VersionId) return false;
+
+                    var currIndex = Items.IndexOf(found);
+                    if (currIndex == -1)
+                        throw new IndexOutOfRangeException("Could not find the item in the list: " + found.Version);
+
+                    //replace the current one with the newer one
+                    SetItem(currIndex, item);
+                    return true;
+                }
+
+                Add(item);
+                return true;
+            }
+
+            public bool TryGetValue(ValueType key, out DocumentDefinition val)
+            {
+                if (Dictionary != null)
+                    return Dictionary.TryGetValue(key, out val);
+
+                val = null;
+                return false;
+            }
+        }
+
+        /// <summary>
+        /// Implements a Guid comparer that respect the Sql engine ordering.
+        /// </summary>
+        /// <remarks>
+        /// MySql sorts Guids as strings, but MSSQL sorts guids based on a weird byte sections order
+        /// This comparer compares Guids using the corresponding Sql syntax method, ie the method of the underlying Sql engine.
+        /// see http://stackoverflow.com/questions/7810602/sql-server-guid-sort-algorithm-why
+        /// see https://blogs.msdn.microsoft.com/sqlprogrammability/2006/11/06/how-are-guids-compared-in-sql-server-2005/
+        /// </remarks>
+        private class DocumentDefinitionComparer : IComparer<Guid>
+        {
+            private readonly bool _mySql;
+
+            public DocumentDefinitionComparer(ISqlSyntaxProvider sqlSyntax)
+            {
+                _mySql = sqlSyntax is MySqlSyntaxProvider;
+            }
+
+            public int Compare(Guid x, Guid y)
+            {
+                // MySql sorts Guids as string (ie normal, same as .NET) whereas MSSQL
+                // sorts them on a weird byte sections order
+                return _mySql ? x.CompareTo(y) : new SqlGuid(x).CompareTo(new SqlGuid(y));
+            }
+        }
+
+        internal class DocumentDefinition
+        {
+            /// <summary>
+            /// Initializes a new instance of the <see cref="T:System.Object"/> class.
+            /// </summary>
+            public DocumentDefinition(DocumentDto dto, IContentTypeComposition composition)
+            {
+                DocumentDto = dto;
+                ContentVersionDto = dto.ContentVersionDto;
+                Composition = composition;
+            }
+
+            public DocumentDefinition(ContentVersionDto dto, IContentTypeComposition composition)
+            {
+                ContentVersionDto = dto;
+                Composition = composition;
+            }
+
+            public DocumentDto DocumentDto { get; }
+            public ContentVersionDto ContentVersionDto { get; }
+
+            public int Id => ContentVersionDto.NodeId;
+
+            public Guid Version => DocumentDto?.VersionId ?? ContentVersionDto.VersionId;
+
+            // This is used to determien which version is the most recent
+            public int VersionId => ContentVersionDto.Id;
+
+            public DateTime VersionDate => ContentVersionDto.VersionDate;
+
+            public DateTime CreateDate => ContentVersionDto.ContentDto.NodeDto.CreateDate;
+
+            public IContentTypeComposition Composition { get; set; }
+        }
+
+        // Represents a query that may contain paging information.
+        internal class PagingSqlQuery
+        {
+            // the original query sql
+            public Sql QuerySql { get; }
+
+            public PagingSqlQuery(Sql querySql)
+            {
+                QuerySql = querySql;
+            }
+
+            protected PagingSqlQuery(Sql querySql, int pageSize)
+                : this(querySql)
+            {
+                HasPaging = pageSize > 0;
+            }
+
+            // whether the paging query is actually paging
+            public bool HasPaging { get; }
+
+            // the paging sql
+            public virtual Sql BuildPagedQuery(string columns)
+            {
+                throw new InvalidOperationException("This query has no paging information.");
+            }
+        }
+
+        /// <summary>
+        /// Represents a query that may contain paging information.
+        /// </summary>
+        /// <typeparam name="T"></typeparam>
+        internal class PagingSqlQuery<T> : PagingSqlQuery // fixme what's <T> here?
+        {
+            private readonly Database _db;
+            private readonly long _pageIndex;
+            private readonly int _pageSize;
+
+            // fixme - don't capture a db instance here!
+            // instead, should have an extension method, so one can do
+            // sql = db.BuildPageQuery(pagingQuery, columns)
+            public PagingSqlQuery(Database db, Sql querySql, long pageIndex, int pageSize)
+                : base(querySql, pageSize)
+            {
+                _db = db;
+                _pageIndex = pageIndex;
+                _pageSize = pageSize;
+            }
+
+            /// <summary>
+            /// Creates a paged query based on the original query and subtitutes the selectColumns specified
+            /// </summary>
+            /// <param name="columns"></param>
+            /// <returns></returns>
+            // build a page query
+            public override Sql BuildPagedQuery(string columns)
+            {
+                if (HasPaging == false)
+                    throw new InvalidOperationException("This query has no paging information.");
+
+                // substitutes the original "SELECT ..." with "SELECT {columns}" ie only
+                // select the specified columns - fixme why?
+                var sql = $"SELECT {columns} {QuerySql.SQL.Substring(QuerySql.SQL.IndexOf("FROM", StringComparison.Ordinal))}";
+
+                // and then build the page query
+                var args = QuerySql.Arguments;
+                _db.BuildPageQueries<T>(_pageIndex * _pageSize, _pageSize, sql, ref args, out string unused, out string sqlPage);
+                return new Sql(sqlPage, args);
+            }
+        }
+        */
+
+        #endregion
+
+        #region Utilities
+
+        protected virtual string EnsureUniqueNodeName(int parentId, string nodeName, int id = 0)
+        {
+            var template = SqlContext.Templates.Get("Umbraco.Core.VersionableRepository.EnsureUniqueNodeName", tsql => tsql
+                .Select<NodeDto>(x => NPocoSqlExtensions.Statics.Alias(x.NodeId, "id"), x => NPocoSqlExtensions.Statics.Alias(x.Text, "name"))
+                .From<NodeDto>()
+                .Where<NodeDto>(x => x.NodeObjectType == SqlTemplate.Arg<Guid>("nodeObjectType") && x.ParentId == SqlTemplate.Arg<int>("parentId")));
+
+            var sql = template.Sql(NodeObjectTypeId, parentId);
+            var names = Database.Fetch<SimilarNodeName>(sql);
+
+            return SimilarNodeName.GetUniqueName(names, id, nodeName);
+        }
+
+        protected virtual int GetNewChildSortOrder(int parentId, int first)
+        {
+            var template = SqlContext.Templates.Get("Umbraco.Core.VersionableRepository.GetSortOrder", tsql =>
+                tsql.Select($"COALESCE(MAX(sortOrder),{first - 1})").From<NodeDto>().Where<NodeDto>(x => x.ParentId == SqlTemplate.Arg<int>("parentId") && x.NodeObjectType == NodeObjectTypeId)
+            );
+
+            return Database.ExecuteScalar<int>(template.Sql(new { parentId })) + 1;
+        }
+
+        protected virtual NodeDto GetParentNodeDto(int parentId)
+        {
+            var template = SqlContext.Templates.Get("Umbraco.Core.VersionableRepository.GetParentNode", tsql =>
+                tsql.Select<NodeDto>().From<NodeDto>().Where<NodeDto>(x => x.NodeId == SqlTemplate.Arg<int>("parentId"))
+            );
+
+            return Database.Fetch<NodeDto>(template.Sql(parentId)).First();
+        }
+
+        protected virtual int GetReservedId(Guid uniqueId)
+        {
+            var template = SqlContext.Templates.Get("Umbraco.Core.VersionableRepository.GetReservedId", tsql =>
+                tsql.Select<NodeDto>(x => x.NodeId).From<NodeDto>().Where<NodeDto>(x => x.UniqueId == SqlTemplate.Arg<Guid>("uniqueId") && x.NodeObjectType == Constants.ObjectTypes.IdReservation)
+            );
+            var id = Database.ExecuteScalar<int?>(template.Sql(new { uniqueId = uniqueId }));
+            return id ?? 0;
+        }
+
+        #endregion
+
+        #region Recycle bin
+
+        public abstract int RecycleBinId { get; }
+
+        public virtual IEnumerable<TEntity> GetRecycleBin()
+        {
+            return Get(Query<TEntity>().Where(entity => entity.Trashed));
+        }
+
+        #endregion
+    }
+}
diff --git a/src/Umbraco.Core/Persistence/Repositories/ContentTypeRepository.cs b/src/Umbraco.Core/Persistence/Repositories/Implement/ContentTypeRepository.cs
similarity index 92%
rename from src/Umbraco.Core/Persistence/Repositories/ContentTypeRepository.cs
rename to src/Umbraco.Core/Persistence/Repositories/Implement/ContentTypeRepository.cs
index c4c65962ab..6926085a5a 100644
--- a/src/Umbraco.Core/Persistence/Repositories/ContentTypeRepository.cs
+++ b/src/Umbraco.Core/Persistence/Repositories/Implement/ContentTypeRepository.cs
@@ -1,302 +1,301 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using NPoco;
-using Umbraco.Core.Cache;
-using Umbraco.Core.Logging;
-using Umbraco.Core.Models;
-using Umbraco.Core.Models.EntityBase;
-using Umbraco.Core.Models.Rdbms;
-using Umbraco.Core.Persistence.Mappers;
-using Umbraco.Core.Persistence.Querying;
-using Umbraco.Core.Persistence.SqlSyntax;
-using Umbraco.Core.Persistence.UnitOfWork;
-
-namespace Umbraco.Core.Persistence.Repositories
-{
-    /// <summary>
-    /// Represents a repository for doing CRUD operations for <see cref="IContentType"/>
-    /// </summary>
-    internal class ContentTypeRepository : ContentTypeRepositoryBase<IContentType>, IContentTypeRepository
-    {
-        private readonly ITemplateRepository _templateRepository;
-        private IRepositoryCachePolicy<IContentType, int> _cachePolicy;
-
-        public ContentTypeRepository(IScopeUnitOfWork work, CacheHelper cache, ILogger logger, ITemplateRepository templateRepository)
-            : base(work, cache, logger)
-        {
-            _templateRepository = templateRepository;
-        }
-
-        protected override bool IsPublishing => ContentType.IsPublishingConst;
-
-        protected override IRepositoryCachePolicy<IContentType, int> CreateCachePolicy(IRuntimeCacheProvider runtimeCache)
-        {
-            return new FullDataSetRepositoryCachePolicy<IContentType, int>(runtimeCache, GetEntityId, /*expires:*/ true);
-        }
-
-        protected override IContentType PerformGet(int id)
-        {
-            //use the underlying GetAll which will force cache all content types
-            return GetAll().FirstOrDefault(x => x.Id == id);
-        }
-
-        protected override IContentType PerformGet(Guid id)
-        {
-            //use the underlying GetAll which will force cache all content types
-            return GetAll().FirstOrDefault(x => x.Key == id);
-        }
-
-        protected override IContentType PerformGet(string alias)
-        {
-            //use the underlying GetAll which will force cache all content types
-            return GetAll().FirstOrDefault(x => x.Alias.InvariantEquals(alias));
-        }
-
-        protected override bool PerformExists(Guid id)
-        {
-            return GetAll().FirstOrDefault(x => x.Key == id) != null;
-        }
-
-        protected override IEnumerable<IContentType> PerformGetAll(params int[] ids)
-        {
-            if (ids.Any())
-            {
-                //NOTE: This logic should never be executed according to our cache policy
-                return ContentTypeQueryMapper.GetContentTypes(Database, SqlSyntax, IsPublishing, this, _templateRepository)
-                    .Where(x => ids.Contains(x.Id));
-            }
-
-            return ContentTypeQueryMapper.GetContentTypes(Database, SqlSyntax, IsPublishing, this, _templateRepository);
-        }
-
-
-        protected override IEnumerable<IContentType> PerformGetAll(params Guid[] ids)
-        {
-            // use the underlying GetAll which will force cache all content types
-            return ids.Any() ? GetAll().Where(x => ids.Contains(x.Key)) : GetAll();
-        }
-
-        protected override IEnumerable<IContentType> PerformGetByQuery(IQuery<IContentType> query)
-        {
-            var sqlClause = GetBaseQuery(false);
-            var translator = new SqlTranslator<IContentType>(sqlClause, query);
-            var sql = translator.Translate();
-
-            // fixme - insane! GetBaseQuery does not even return a proper??? oh well...
-            var dtos = Database.Fetch<ContentTypeTemplateDto>(sql);
-
-            return
-                //This returns a lookup from the GetAll cached looup
-                (dtos.Any()
-                    ? GetAll(dtos.DistinctBy(x => x.ContentTypeDto.NodeId).Select(x => x.ContentTypeDto.NodeId).ToArray())
-                    : Enumerable.Empty<IContentType>())
-                    //order the result by name
-                    .OrderBy(x => x.Name);
-        }
-
-        /// <summary>
-        /// Gets all entities of the specified <see cref="PropertyType"/> query
-        /// </summary>
-        /// <param name="query"></param>
-        /// <returns>An enumerable list of <see cref="IContentType"/> objects</returns>
-        public IEnumerable<IContentType> GetByQuery(IQuery<PropertyType> query)
-        {
-            var ints = PerformGetByQuery(query).ToArray();
-            return ints.Any()
-                ? GetAll(ints)
-                : Enumerable.Empty<IContentType>();
-        }
-
-        /// <summary>
-        /// Gets all property type aliases.
-        /// </summary>
-        /// <returns></returns>
-        public IEnumerable<string> GetAllPropertyTypeAliases()
-        {
-            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 = Sql()
-                .Select("cmsContentType.alias")
-                .From<ContentTypeDto>()
-                .InnerJoin<NodeDto>()
-                .On<ContentTypeDto, NodeDto>(dto => dto.NodeId, dto => dto.NodeId);
-
-            if (objectTypes.Any())
-            {
-                sql = sql.Where("umbracoNode.nodeObjectType IN (@objectTypes)", objectTypes);
-            }
-
-            return Database.Fetch<string>(sql);
-        }
-
-        public IEnumerable<int> GetAllContentTypeIds(string[] aliases)
-        {
-            if (aliases.Length == 0) return Enumerable.Empty<int>();
-
-            var sql = Sql()
-                .Select("cmsContentType.nodeId")
-                .From<ContentTypeDto>()
-                .InnerJoin<NodeDto>()
-                .On<ContentTypeDto, NodeDto>(dto => dto.NodeId, dto => dto.NodeId)
-                .Where<ContentTypeDto>(dto => aliases.Contains(dto.Alias));
-
-            return Database.Fetch<int>(sql);
-        }
-
-        protected override Sql<ISqlContext> GetBaseQuery(bool isCount)
-        {
-            var sql = Sql();
-
-            sql = isCount
-                ? sql.SelectCount()
-                : sql.Select<ContentTypeTemplateDto>(r => r.Select(x => x.ContentTypeDto, r1 => r1.Select(x => x.NodeDto)));
-
-            sql
-                .From<ContentTypeDto>()
-                .InnerJoin<NodeDto>()
-                .On<ContentTypeDto, NodeDto>(left => left.NodeId, right => right.NodeId)
-                .LeftJoin<ContentTypeTemplateDto>()
-                .On<ContentTypeTemplateDto, ContentTypeDto>(left => left.ContentTypeNodeId, right => right.NodeId)
-                .Where<NodeDto>(x => x.NodeObjectType == NodeObjectTypeId);
-
-            return sql;
-        }
-
-        protected override string GetBaseWhereClause()
-        {
-            return "umbracoNode.id = @id";
-        }
-
-        protected override IEnumerable<string> GetDeleteClauses()
-        {
-            var l = (List<string>) base.GetDeleteClauses(); // we know it's a list
-            l.Add("DELETE FROM cmsDocumentType WHERE contentTypeNodeId = @id");
-            l.Add("DELETE FROM cmsContentType WHERE nodeId = @id");
-            l.Add("DELETE FROM umbracoNode WHERE id = @id");
-            return l;
-        }
-
-        protected override Guid NodeObjectTypeId => Constants.ObjectTypes.DocumentType;
-
-        /// <summary>
-        /// Deletes a content type
-        /// </summary>
-        /// <param name="entity"></param>
-        /// <remarks>
-        /// First checks for children and removes those first
-        /// </remarks>
-        protected override void PersistDeletedItem(IContentType entity)
-        {
-            var query = Query<IContentType>().Where(x => x.ParentId == entity.Id);
-            var children = GetByQuery(query);
-            foreach (var child in children)
-            {
-                //NOTE: We must cast here so that it goes to the outter method to
-                // ensure the cache is updated.
-                PersistDeletedItem((IEntity)child);
-            }
-
-            //Before we call the base class methods to run all delete clauses, we need to first
-            // delete all of the property data associated with this document type. Normally this will
-            // be done in the ContentTypeService by deleting all associated content first, but in some cases
-            // like when we switch a document type, there is property data left over that is linked
-            // to the previous document type. So we need to ensure it's removed.
-            var sql = Sql()
-                .Select("DISTINCT " + Constants.DatabaseSchema.Tables.PropertyData + ".propertytypeid")
-                .From<PropertyDataDto>()
-                .InnerJoin<PropertyTypeDto>()
-                .On<PropertyDataDto, PropertyTypeDto>(dto => dto.PropertyTypeId, dto => dto.Id)
-                .InnerJoin<ContentTypeDto>()
-                .On<ContentTypeDto, PropertyTypeDto>(dto => dto.NodeId, dto => dto.ContentTypeId)
-                .Where<ContentTypeDto>(dto => dto.NodeId == entity.Id);
-
-            //Delete all PropertyData where propertytypeid EXISTS in the subquery above
-            Database.Execute(SqlSyntax.GetDeleteSubquery(Constants.DatabaseSchema.Tables.PropertyData, "propertytypeid", sql));
-
-            base.PersistDeletedItem(entity);
-        }
-
-        protected override void PersistNewItem(IContentType entity)
-        {
-            if (string.IsNullOrWhiteSpace(entity.Alias))
-            {
-                var m = $"ContentType '{entity.Name}' cannot have an empty Alias. This is most likely due to invalid characters stripped from the Alias.";
-                var e = new Exception(m);
-                Logger.Error<ContentTypeRepository>(m, e);
-                throw e;
-            }
-
-            ((ContentType)entity).AddingEntity();
-
-            PersistNewBaseContentType(entity);
-            PersistTemplates(entity, false);
-
-            entity.ResetDirtyProperties();
-        }
-
-        protected void PersistTemplates(IContentType entity, bool clearAll)
-        {
-            // remove and insert, if required
-            Database.Delete<ContentTypeTemplateDto>("WHERE contentTypeNodeId = @Id", new { Id = entity.Id });
-
-            // we could do it all in foreach if we assume that the default template is an allowed template??
-            var defaultTemplateId = ((ContentType) entity).DefaultTemplateId;
-            if (defaultTemplateId > 0)
-            {
-                Database.Insert(new ContentTypeTemplateDto
-                {
-                    ContentTypeNodeId = entity.Id,
-                    TemplateNodeId = defaultTemplateId,
-                    IsDefault = true
-                });
-            }
-            foreach (var template in entity.AllowedTemplates.Where(x => x != null && x.Id != defaultTemplateId))
-            {
-                Database.Insert(new ContentTypeTemplateDto
-                {
-                    ContentTypeNodeId = entity.Id,
-                    TemplateNodeId = template.Id,
-                    IsDefault = false
-                });
-            }
-        }
-
-        protected override void PersistUpdatedItem(IContentType entity)
-        {
-            ValidateAlias(entity);
-
-            //Updates Modified date
-            ((ContentType)entity).UpdatingEntity();
-
-            //Look up parent to get and set the correct Path if ParentId has changed
-            if (entity.IsPropertyDirty("ParentId"))
-            {
-                var parent = Database.First<NodeDto>("WHERE id = @ParentId", new { ParentId = entity.ParentId });
-                entity.Path = string.Concat(parent.Path, ",", entity.Id);
-                entity.Level = parent.Level + 1;
-                var maxSortOrder =
-                    Database.ExecuteScalar<int>(
-                        "SELECT coalesce(max(sortOrder),0) FROM umbracoNode WHERE parentid = @ParentId AND nodeObjectType = @NodeObjectType",
-                        new { ParentId = entity.ParentId, NodeObjectType = NodeObjectTypeId });
-                entity.SortOrder = maxSortOrder + 1;
-            }
-
-            PersistUpdatedBaseContentType(entity);
-            PersistTemplates(entity, true);
-
-            entity.ResetDirtyProperties();
-        }
-    }
-}
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using NPoco;
+using Umbraco.Core.Cache;
+using Umbraco.Core.Logging;
+using Umbraco.Core.Models;
+using Umbraco.Core.Models.EntityBase;
+using Umbraco.Core.Models.Rdbms;
+using Umbraco.Core.Persistence.Querying;
+using Umbraco.Core.Persistence.SqlSyntax;
+using Umbraco.Core.Persistence.UnitOfWork;
+
+namespace Umbraco.Core.Persistence.Repositories.Implement
+{
+    /// <summary>
+    /// Represents a repository for doing CRUD operations for <see cref="IContentType"/>
+    /// </summary>
+    internal class ContentTypeRepository : ContentTypeRepositoryBase<IContentType>, IContentTypeRepository
+    {
+        private readonly ITemplateRepository _templateRepository;
+        private IRepositoryCachePolicy<IContentType, int> _cachePolicy;
+
+        public ContentTypeRepository(IScopeUnitOfWork work, CacheHelper cache, ILogger logger, ITemplateRepository templateRepository)
+            : base(work, cache, logger)
+        {
+            _templateRepository = templateRepository;
+        }
+
+        protected override bool IsPublishing => ContentType.IsPublishingConst;
+
+        protected override IRepositoryCachePolicy<IContentType, int> CreateCachePolicy(IRuntimeCacheProvider runtimeCache)
+        {
+            return new FullDataSetRepositoryCachePolicy<IContentType, int>(runtimeCache, GetEntityId, /*expires:*/ true);
+        }
+
+        protected override IContentType PerformGet(int id)
+        {
+            //use the underlying GetAll which will force cache all content types
+            return GetMany().FirstOrDefault(x => x.Id == id);
+        }
+
+        protected override IContentType PerformGet(Guid id)
+        {
+            //use the underlying GetAll which will force cache all content types
+            return GetMany().FirstOrDefault(x => x.Key == id);
+        }
+
+        protected override IContentType PerformGet(string alias)
+        {
+            //use the underlying GetAll which will force cache all content types
+            return GetMany().FirstOrDefault(x => x.Alias.InvariantEquals(alias));
+        }
+
+        protected override bool PerformExists(Guid id)
+        {
+            return GetMany().FirstOrDefault(x => x.Key == id) != null;
+        }
+
+        protected override IEnumerable<IContentType> PerformGetAll(params int[] ids)
+        {
+            if (ids.Any())
+            {
+                //NOTE: This logic should never be executed according to our cache policy
+                return ContentTypeQueryMapper.GetContentTypes(Database, SqlSyntax, IsPublishing, this, _templateRepository)
+                    .Where(x => ids.Contains(x.Id));
+            }
+
+            return ContentTypeQueryMapper.GetContentTypes(Database, SqlSyntax, IsPublishing, this, _templateRepository);
+        }
+
+
+        protected override IEnumerable<IContentType> PerformGetAll(params Guid[] ids)
+        {
+            // use the underlying GetAll which will force cache all content types
+            return ids.Any() ? GetMany().Where(x => ids.Contains(x.Key)) : GetMany();
+        }
+
+        protected override IEnumerable<IContentType> PerformGetByQuery(IQuery<IContentType> query)
+        {
+            var sqlClause = GetBaseQuery(false);
+            var translator = new SqlTranslator<IContentType>(sqlClause, query);
+            var sql = translator.Translate();
+
+            // fixme - insane! GetBaseQuery does not even return a proper??? oh well...
+            var dtos = Database.Fetch<ContentTypeTemplateDto>(sql);
+
+            return
+                //This returns a lookup from the GetAll cached looup
+                (dtos.Any()
+                    ? GetMany(dtos.DistinctBy(x => x.ContentTypeDto.NodeId).Select(x => x.ContentTypeDto.NodeId).ToArray())
+                    : Enumerable.Empty<IContentType>())
+                    //order the result by name
+                    .OrderBy(x => x.Name);
+        }
+
+        /// <summary>
+        /// Gets all entities of the specified <see cref="PropertyType"/> query
+        /// </summary>
+        /// <param name="query"></param>
+        /// <returns>An enumerable list of <see cref="IContentType"/> objects</returns>
+        public IEnumerable<IContentType> GetByQuery(IQuery<PropertyType> query)
+        {
+            var ints = PerformGetByQuery(query).ToArray();
+            return ints.Any()
+                ? GetMany(ints)
+                : Enumerable.Empty<IContentType>();
+        }
+
+        /// <summary>
+        /// Gets all property type aliases.
+        /// </summary>
+        /// <returns></returns>
+        public IEnumerable<string> GetAllPropertyTypeAliases()
+        {
+            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 = Sql()
+                .Select("cmsContentType.alias")
+                .From<ContentTypeDto>()
+                .InnerJoin<NodeDto>()
+                .On<ContentTypeDto, NodeDto>(dto => dto.NodeId, dto => dto.NodeId);
+
+            if (objectTypes.Any())
+            {
+                sql = sql.Where("umbracoNode.nodeObjectType IN (@objectTypes)", objectTypes);
+            }
+
+            return Database.Fetch<string>(sql);
+        }
+
+        public IEnumerable<int> GetAllContentTypeIds(string[] aliases)
+        {
+            if (aliases.Length == 0) return Enumerable.Empty<int>();
+
+            var sql = Sql()
+                .Select("cmsContentType.nodeId")
+                .From<ContentTypeDto>()
+                .InnerJoin<NodeDto>()
+                .On<ContentTypeDto, NodeDto>(dto => dto.NodeId, dto => dto.NodeId)
+                .Where<ContentTypeDto>(dto => aliases.Contains(dto.Alias));
+
+            return Database.Fetch<int>(sql);
+        }
+
+        protected override Sql<ISqlContext> GetBaseQuery(bool isCount)
+        {
+            var sql = Sql();
+
+            sql = isCount
+                ? sql.SelectCount()
+                : sql.Select<ContentTypeTemplateDto>(r => r.Select(x => x.ContentTypeDto, r1 => r1.Select(x => x.NodeDto)));
+
+            sql
+                .From<ContentTypeDto>()
+                .InnerJoin<NodeDto>()
+                .On<ContentTypeDto, NodeDto>(left => left.NodeId, right => right.NodeId)
+                .LeftJoin<ContentTypeTemplateDto>()
+                .On<ContentTypeTemplateDto, ContentTypeDto>(left => left.ContentTypeNodeId, right => right.NodeId)
+                .Where<NodeDto>(x => x.NodeObjectType == NodeObjectTypeId);
+
+            return sql;
+        }
+
+        protected override string GetBaseWhereClause()
+        {
+            return "umbracoNode.id = @id";
+        }
+
+        protected override IEnumerable<string> GetDeleteClauses()
+        {
+            var l = (List<string>) base.GetDeleteClauses(); // we know it's a list
+            l.Add("DELETE FROM cmsDocumentType WHERE contentTypeNodeId = @id");
+            l.Add("DELETE FROM cmsContentType WHERE nodeId = @id");
+            l.Add("DELETE FROM umbracoNode WHERE id = @id");
+            return l;
+        }
+
+        protected override Guid NodeObjectTypeId => Constants.ObjectTypes.DocumentType;
+
+        /// <summary>
+        /// Deletes a content type
+        /// </summary>
+        /// <param name="entity"></param>
+        /// <remarks>
+        /// First checks for children and removes those first
+        /// </remarks>
+        protected override void PersistDeletedItem(IContentType entity)
+        {
+            var query = Query<IContentType>().Where(x => x.ParentId == entity.Id);
+            var children = Get(query);
+            foreach (var child in children)
+            {
+                //NOTE: We must cast here so that it goes to the outter method to
+                // ensure the cache is updated.
+                PersistDeletedItem((IEntity)child);
+            }
+
+            //Before we call the base class methods to run all delete clauses, we need to first
+            // delete all of the property data associated with this document type. Normally this will
+            // be done in the ContentTypeService by deleting all associated content first, but in some cases
+            // like when we switch a document type, there is property data left over that is linked
+            // to the previous document type. So we need to ensure it's removed.
+            var sql = Sql()
+                .Select("DISTINCT " + Constants.DatabaseSchema.Tables.PropertyData + ".propertytypeid")
+                .From<PropertyDataDto>()
+                .InnerJoin<PropertyTypeDto>()
+                .On<PropertyDataDto, PropertyTypeDto>(dto => dto.PropertyTypeId, dto => dto.Id)
+                .InnerJoin<ContentTypeDto>()
+                .On<ContentTypeDto, PropertyTypeDto>(dto => dto.NodeId, dto => dto.ContentTypeId)
+                .Where<ContentTypeDto>(dto => dto.NodeId == entity.Id);
+
+            //Delete all PropertyData where propertytypeid EXISTS in the subquery above
+            Database.Execute(SqlSyntax.GetDeleteSubquery(Constants.DatabaseSchema.Tables.PropertyData, "propertytypeid", sql));
+
+            base.PersistDeletedItem(entity);
+        }
+
+        protected override void PersistNewItem(IContentType entity)
+        {
+            if (string.IsNullOrWhiteSpace(entity.Alias))
+            {
+                var m = $"ContentType '{entity.Name}' cannot have an empty Alias. This is most likely due to invalid characters stripped from the Alias.";
+                var e = new Exception(m);
+                Logger.Error<ContentTypeRepository>(m, e);
+                throw e;
+            }
+
+            ((ContentType)entity).AddingEntity();
+
+            PersistNewBaseContentType(entity);
+            PersistTemplates(entity, false);
+
+            entity.ResetDirtyProperties();
+        }
+
+        protected void PersistTemplates(IContentType entity, bool clearAll)
+        {
+            // remove and insert, if required
+            Database.Delete<ContentTypeTemplateDto>("WHERE contentTypeNodeId = @Id", new { Id = entity.Id });
+
+            // we could do it all in foreach if we assume that the default template is an allowed template??
+            var defaultTemplateId = ((ContentType) entity).DefaultTemplateId;
+            if (defaultTemplateId > 0)
+            {
+                Database.Insert(new ContentTypeTemplateDto
+                {
+                    ContentTypeNodeId = entity.Id,
+                    TemplateNodeId = defaultTemplateId,
+                    IsDefault = true
+                });
+            }
+            foreach (var template in entity.AllowedTemplates.Where(x => x != null && x.Id != defaultTemplateId))
+            {
+                Database.Insert(new ContentTypeTemplateDto
+                {
+                    ContentTypeNodeId = entity.Id,
+                    TemplateNodeId = template.Id,
+                    IsDefault = false
+                });
+            }
+        }
+
+        protected override void PersistUpdatedItem(IContentType entity)
+        {
+            ValidateAlias(entity);
+
+            //Updates Modified date
+            ((ContentType)entity).UpdatingEntity();
+
+            //Look up parent to get and set the correct Path if ParentId has changed
+            if (entity.IsPropertyDirty("ParentId"))
+            {
+                var parent = Database.First<NodeDto>("WHERE id = @ParentId", new { ParentId = entity.ParentId });
+                entity.Path = string.Concat(parent.Path, ",", entity.Id);
+                entity.Level = parent.Level + 1;
+                var maxSortOrder =
+                    Database.ExecuteScalar<int>(
+                        "SELECT coalesce(max(sortOrder),0) FROM umbracoNode WHERE parentid = @ParentId AND nodeObjectType = @NodeObjectType",
+                        new { ParentId = entity.ParentId, NodeObjectType = NodeObjectTypeId });
+                entity.SortOrder = maxSortOrder + 1;
+            }
+
+            PersistUpdatedBaseContentType(entity);
+            PersistTemplates(entity, true);
+
+            entity.ResetDirtyProperties();
+        }
+    }
+}
diff --git a/src/Umbraco.Core/Persistence/Repositories/ContentTypeRepositoryBase.cs b/src/Umbraco.Core/Persistence/Repositories/Implement/ContentTypeRepositoryBase.cs
similarity index 99%
rename from src/Umbraco.Core/Persistence/Repositories/ContentTypeRepositoryBase.cs
rename to src/Umbraco.Core/Persistence/Repositories/Implement/ContentTypeRepositoryBase.cs
index 74c73bb980..2f82952f2a 100644
--- a/src/Umbraco.Core/Persistence/Repositories/ContentTypeRepositoryBase.cs
+++ b/src/Umbraco.Core/Persistence/Repositories/Implement/ContentTypeRepositoryBase.cs
@@ -3,7 +3,6 @@ using System.Collections.Generic;
 using System.Data;
 using System.Globalization;
 using System.Linq;
-using System.Text;
 using System.Threading.Tasks;
 using NPoco;
 using Umbraco.Core.Cache;
@@ -13,14 +12,13 @@ using Umbraco.Core.Logging;
 using Umbraco.Core.Models;
 using Umbraco.Core.Models.EntityBase;
 using Umbraco.Core.Models.Rdbms;
-
 using Umbraco.Core.Persistence.Factories;
 using Umbraco.Core.Persistence.Querying;
 using Umbraco.Core.Persistence.SqlSyntax;
 using Umbraco.Core.Persistence.UnitOfWork;
 using Umbraco.Core.Services;
 
-namespace Umbraco.Core.Persistence.Repositories
+namespace Umbraco.Core.Persistence.Repositories.Implement
 {
     /// <summary>
     /// Represent an abstract Repository for ContentType based repositories
@@ -65,10 +63,10 @@ namespace Umbraco.Core.Persistence.Repositories
             var movingPath = moving.Path + ","; // save before changing
             moving.Path = (container == null ? Constants.System.Root.ToString() : container.Path) + "," + moving.Id;
             moving.Level = container == null ? 1 : container.Level + 1;
-            AddOrUpdate(moving);
+            Save(moving);
 
             //update all descendants, update in order of level
-            var descendants = GetByQuery(Query<TEntity>().Where(type => type.Path.StartsWith(movingPath)));
+            var descendants = Get(Query<TEntity>().Where(type => type.Path.StartsWith(movingPath)));
             var paths = new Dictionary<int, string>();
             paths[moving.Id] = moving.Path;
 
@@ -79,7 +77,7 @@ namespace Umbraco.Core.Persistence.Repositories
                 descendant.Path = paths[descendant.Id] = paths[descendant.ParentId] + "," + descendant.Id;
                 descendant.Level += levelDelta;
 
-                AddOrUpdate(descendant);
+                Save(descendant);
             }
 
             return moveInfo;
@@ -581,7 +579,7 @@ AND umbracoNode.id <> @id",
                 .Where<ContentType2ContentTypeDto>(x => x.ParentId == id);
             var dtos = Database.Fetch<NodeDto>(sql);
             return dtos.Any()
-                ? GetAll(dtos.DistinctBy(x => x.NodeId).Select(x => x.NodeId).ToArray())
+                ? GetMany(dtos.DistinctBy(x => x.NodeId).Select(x => x.NodeId).ToArray())
                 : Enumerable.Empty<TEntity>();
         }
 
@@ -725,7 +723,7 @@ AND umbracoNode.id <> @id",
                     .ToArray();
 
                 var templates = (templateIds.Any()
-                    ? templateRepository.GetAll(templateIds)
+                    ? templateRepository.GetMany(templateIds)
                     : Enumerable.Empty<ITemplate>()).ToArray();
 
                 foreach (var contentType in contentTypes)
@@ -1203,7 +1201,7 @@ ORDER BY contentTypeId, groupId, id";
         /// <remarks>
         /// Ensure explicit implementation, we don't want to have any accidental calls to this since it is essentially the same signature as the main GetAll when there are no parameters
         /// </remarks>
-        IEnumerable<TEntity> IReadRepository<Guid, TEntity>.GetAll(params Guid[] ids)
+        IEnumerable<TEntity> IReadRepository<Guid, TEntity>.GetMany(params Guid[] ids)
         {
             return PerformGetAll(ids);
         }
diff --git a/src/Umbraco.Core/Persistence/Repositories/DataTypeContainerRepository.cs b/src/Umbraco.Core/Persistence/Repositories/Implement/DataTypeContainerRepository.cs
similarity index 87%
rename from src/Umbraco.Core/Persistence/Repositories/DataTypeContainerRepository.cs
rename to src/Umbraco.Core/Persistence/Repositories/Implement/DataTypeContainerRepository.cs
index da651d2a30..78e5f27d8a 100644
--- a/src/Umbraco.Core/Persistence/Repositories/DataTypeContainerRepository.cs
+++ b/src/Umbraco.Core/Persistence/Repositories/Implement/DataTypeContainerRepository.cs
@@ -2,7 +2,7 @@
 using Umbraco.Core.Logging;
 using Umbraco.Core.Persistence.UnitOfWork;
 
-namespace Umbraco.Core.Persistence.Repositories
+namespace Umbraco.Core.Persistence.Repositories.Implement
 {
     class DataTypeContainerRepository : EntityContainerRepository, IDataTypeContainerRepository
     {
diff --git a/src/Umbraco.Core/Persistence/Repositories/DataTypeDefinitionRepository.cs b/src/Umbraco.Core/Persistence/Repositories/Implement/DataTypeDefinitionRepository.cs
similarity index 95%
rename from src/Umbraco.Core/Persistence/Repositories/DataTypeDefinitionRepository.cs
rename to src/Umbraco.Core/Persistence/Repositories/Implement/DataTypeDefinitionRepository.cs
index 3532370076..b2f6454119 100644
--- a/src/Umbraco.Core/Persistence/Repositories/DataTypeDefinitionRepository.cs
+++ b/src/Umbraco.Core/Persistence/Repositories/Implement/DataTypeDefinitionRepository.cs
@@ -1,615 +1,614 @@
-using System;
-using System.Collections.Generic;
-using System.Data;
-using System.Globalization;
-using System.Linq;
-using NPoco;
-using Umbraco.Core.Cache;
-using Umbraco.Core.Events;
-using Umbraco.Core.Exceptions;
-using Umbraco.Core.Logging;
-using Umbraco.Core.Models;
-using Umbraco.Core.Models.EntityBase;
-using Umbraco.Core.Models.Rdbms;
-using Umbraco.Core.Persistence.Factories;
-using Umbraco.Core.Persistence.Querying;
-using Umbraco.Core.Persistence.UnitOfWork;
-using Umbraco.Core.Services;
-using static Umbraco.Core.Persistence.NPocoSqlExtensions.Statics;
-
-namespace Umbraco.Core.Persistence.Repositories
-{
-    /// <summary>
-    /// Represents a repository for doing CRUD operations for <see cref="DataTypeDefinition"/>
-    /// </summary>
-    internal class DataTypeDefinitionRepository : NPocoRepositoryBase<int, IDataTypeDefinition>, IDataTypeDefinitionRepository
-    {
-        private readonly IContentTypeRepository _contentTypeRepository;
-        private readonly DataTypePreValueRepository _preValRepository;
-
-        public DataTypeDefinitionRepository(IScopeUnitOfWork work, CacheHelper cache, ILogger logger, IContentTypeRepository contentTypeRepository)
-            : base(work, cache, logger)
-        {
-            _contentTypeRepository = contentTypeRepository;
-            _preValRepository = new DataTypePreValueRepository(work, CacheHelper.NoCache, logger);
-        }
-
-        #region Overrides of RepositoryBase<int,DataTypeDefinition>
-
-        protected override IDataTypeDefinition PerformGet(int id)
-        {
-            return GetAll(new[] { id }).FirstOrDefault();
-        }
-
-        protected override IEnumerable<IDataTypeDefinition> PerformGetAll(params int[] ids)
-        {
-            var factory = new DataTypeDefinitionFactory(NodeObjectTypeId);
-            var dataTypeSql = GetBaseQuery(false);
-
-            if (ids.Any())
-            {
-                dataTypeSql.Where("umbracoNode.id in (@ids)", new { ids });
-            }
-            else
-            {
-                dataTypeSql.Where<NodeDto>(x => x.NodeObjectType == NodeObjectTypeId);
-            }
-
-            var dtos = Database.Fetch<DataTypeDto>(dataTypeSql);
-            return dtos.Select(factory.BuildEntity).ToArray();
-        }
-
-        protected override IEnumerable<IDataTypeDefinition> PerformGetByQuery(IQuery<IDataTypeDefinition> query)
-        {
-            var factory = new DataTypeDefinitionFactory(NodeObjectTypeId);
-
-            var sqlClause = GetBaseQuery(false);
-            var translator = new SqlTranslator<IDataTypeDefinition>(sqlClause, query);
-            var sql = translator.Translate();
-
-            var dtos = Database.Fetch<DataTypeDto>(sql);
-
-            return dtos.Select(factory.BuildEntity).ToArray();
-        }
-
-        /// <summary>
-        /// Override the delete method so that we can ensure that all related content type's are updated as part of the overall transaction
-        /// </summary>
-        /// <param name="entity"></param>
-        public override void Delete(IDataTypeDefinition entity)
-        {
-            //Find ContentTypes using this IDataTypeDefinition on a PropertyType
-            var query = Query<PropertyType>().Where(x => x.DataTypeDefinitionId == entity.Id);
-
-            //TODO: Don't we need to be concerned about media and member types here too ?
-            var contentTypes = _contentTypeRepository.GetByQuery(query);
-
-            //Loop through the list of results and remove the PropertyTypes that references the DataTypeDefinition that is being deleted
-            foreach (var contentType in contentTypes)
-            {
-                if (contentType == null) continue;
-
-                foreach (var group in contentType.PropertyGroups)
-                {
-                    var types = @group.PropertyTypes.Where(x => x.DataTypeDefinitionId == entity.Id).ToList();
-                    foreach (var propertyType in types)
-                    {
-                        @group.PropertyTypes.Remove(propertyType);
-                    }
-                }
-
-                // so... we are modifying content types here. the service will trigger Deleted event,
-                // which will propagate to DataTypeCacheRefresher which will clear almost every cache
-                // there is to clear... and in addition published snapshot caches will clear themselves too, so
-                // this is probably safe alghough it looks... weird.
-                //
-                // what IS weird is that a content type is losing a property and we do NOT raise any
-                // content type event... so ppl better listen on the data type events too.
-
-                _contentTypeRepository.AddOrUpdate(contentType);
-            }
-
-            //call the base method to queue the deletion of this data type
-            base.Delete(entity);
-        }
-
-        #endregion
-
-        #region Overrides of NPocoRepositoryBase<int,DataTypeDefinition>
-
-        protected override Sql<ISqlContext> GetBaseQuery(bool isCount)
-        {
-            var sql = Sql();
-
-            sql = isCount
-                ? sql.SelectCount()
-                : sql.Select<DataTypeDto>(r => r.Select(x => x.NodeDto));
-
-            sql
-               .From<DataTypeDto>()
-               .InnerJoin<NodeDto>()
-               .On<DataTypeDto, NodeDto>(left => left.DataTypeId, right => right.NodeId)
-               .Where<NodeDto>(x => x.NodeObjectType == NodeObjectTypeId);
-            return sql;
-        }
-
-        protected override string GetBaseWhereClause()
-        {
-            return "umbracoNode.id = @id";
-        }
-
-        protected override IEnumerable<string> GetDeleteClauses()
-        {
-            return Array.Empty<string>();
-        }
-
-        protected override Guid NodeObjectTypeId => Constants.ObjectTypes.DataType;
-
-        #endregion
-
-        #region Unit of Work Implementation
-
-        protected override void PersistNewItem(IDataTypeDefinition entity)
-        {
-            ((DataTypeDefinition)entity).AddingEntity();
-
-            //ensure a datatype has a unique name before creating it
-            entity.Name = EnsureUniqueNodeName(entity.Name);
-
-            //TODO: should the below be removed?
-            //Cannot add a duplicate data type
-            var exists = Database.ExecuteScalar<int>(@"SELECT COUNT(*) FROM cmsDataType
-INNER JOIN umbracoNode ON cmsDataType.nodeId = umbracoNode.id
-WHERE umbracoNode." + SqlSyntax.GetQuotedColumnName("text") + "= @name", new { name = entity.Name });
-            if (exists > 0)
-            {
-                throw new DuplicateNameException("A data type with the name " + entity.Name + " already exists");
-            }
-
-            var factory = new DataTypeDefinitionFactory(NodeObjectTypeId);
-            var dto = factory.BuildDto(entity);
-
-            //Logic for setting Path, Level and SortOrder
-            var parent = Database.First<NodeDto>("WHERE id = @ParentId", new { ParentId = entity.ParentId });
-            int level = parent.Level + 1;
-            int sortOrder =
-                Database.ExecuteScalar<int>("SELECT COUNT(*) FROM umbracoNode WHERE parentID = @ParentId AND nodeObjectType = @NodeObjectType",
-                                                      new { ParentId = entity.ParentId, NodeObjectType = NodeObjectTypeId });
-
-            //Create the (base) node data - umbracoNode
-            var nodeDto = dto.NodeDto;
-            nodeDto.Path = parent.Path;
-            nodeDto.Level = short.Parse(level.ToString(CultureInfo.InvariantCulture));
-            nodeDto.SortOrder = sortOrder;
-            var o = Database.IsNew<NodeDto>(nodeDto) ? Convert.ToInt32(Database.Insert(nodeDto)) : Database.Update(nodeDto);
-
-            //Update with new correct path
-            nodeDto.Path = string.Concat(parent.Path, ",", nodeDto.NodeId);
-            Database.Update(nodeDto);
-
-            //Update entity with correct values
-            entity.Id = nodeDto.NodeId; //Set Id on entity to ensure an Id is set
-            entity.Path = nodeDto.Path;
-            entity.SortOrder = sortOrder;
-            entity.Level = level;
-
-            dto.DataTypeId = nodeDto.NodeId;
-            Database.Insert(dto);
-
-            entity.ResetDirtyProperties();
-        }
-
-        protected override void PersistUpdatedItem(IDataTypeDefinition entity)
-        {
-
-            entity.Name = EnsureUniqueNodeName(entity.Name, entity.Id);
-
-            //Cannot change to a duplicate alias
-            var exists = Database.ExecuteScalar<int>(@"SELECT COUNT(*) FROM cmsDataType
-INNER JOIN umbracoNode ON cmsDataType.nodeId = umbracoNode.id
-WHERE umbracoNode." + SqlSyntax.GetQuotedColumnName("text") + @"= @name
-AND umbracoNode.id <> @id",
-                    new { id = entity.Id, name = entity.Name });
-            if (exists > 0)
-            {
-                throw new DuplicateNameException("A data type with the name " + entity.Name + " already exists");
-            }
-
-            //Updates Modified date
-            ((DataTypeDefinition)entity).UpdatingEntity();
-
-            //Look up parent to get and set the correct Path if ParentId has changed
-            if (entity.IsPropertyDirty("ParentId"))
-            {
-                var parent = Database.First<NodeDto>("WHERE id = @ParentId", new { ParentId = entity.ParentId });
-                entity.Path = string.Concat(parent.Path, ",", entity.Id);
-                entity.Level = parent.Level + 1;
-                var maxSortOrder =
-                    Database.ExecuteScalar<int>(
-                        "SELECT coalesce(max(sortOrder),0) FROM umbracoNode WHERE parentid = @ParentId AND nodeObjectType = @NodeObjectType",
-                        new { ParentId = entity.ParentId, NodeObjectType = NodeObjectTypeId });
-                entity.SortOrder = maxSortOrder + 1;
-            }
-
-            var factory = new DataTypeDefinitionFactory(NodeObjectTypeId);
-            //Look up DataTypeDefinition entry to get Primary for updating the DTO
-            var dataTypeDto = Database.SingleOrDefault<DataTypeDto>("WHERE nodeId = @Id", new { Id = entity.Id });
-            factory.SetPrimaryKey(dataTypeDto.PrimaryKey);
-            var dto = factory.BuildDto(entity);
-
-            //Updates the (base) node data - umbracoNode
-            var nodeDto = dto.NodeDto;
-            Database.Update(nodeDto);
-            Database.Update(dto);
-
-            //NOTE: This is a special case, we need to clear the custom cache for pre-values here so they are not stale if devs
-            // are querying for them in the Saved event (before the distributed call cache is clearing it)
-            IsolatedCache.ClearCacheItem(GetPrefixedCacheKey(entity.Id));
-
-            entity.ResetDirtyProperties();
-        }
-
-        protected override void PersistDeletedItem(IDataTypeDefinition entity)
-        {
-            //Remove Notifications
-            Database.Delete<User2NodeNotifyDto>("WHERE nodeId = @Id", new { Id = entity.Id });
-
-            //Remove Permissions
-            Database.Delete<UserGroup2NodePermissionDto>("WHERE nodeId = @Id", new { Id = entity.Id });
-
-            //Remove associated tags
-            Database.Delete<TagRelationshipDto>("WHERE nodeId = @Id", new { Id = entity.Id });
-
-            //PropertyTypes containing the DataType being deleted
-            var propertyTypeDtos = Database.Fetch<PropertyTypeDto>("WHERE dataTypeId = @Id", new { Id = entity.Id });
-            //Go through the PropertyTypes and delete referenced PropertyData before deleting the PropertyType
-            foreach (var dto in propertyTypeDtos)
-            {
-                Database.Delete<PropertyDataDto>("WHERE propertytypeid = @Id", new { Id = dto.Id });
-                Database.Delete<PropertyTypeDto>("WHERE id = @Id", new { Id = dto.Id });
-            }
-
-            //Delete the pre-values
-            Database.Delete<DataTypePreValueDto>("WHERE datatypeNodeId = @Id", new { Id = entity.Id });
-
-            //Delete Content specific data
-            Database.Delete<DataTypeDto>("WHERE nodeId = @Id", new { Id = entity.Id });
-
-            //Delete (base) node data
-            Database.Delete<NodeDto>("WHERE uniqueID = @Id", new { Id = entity.Key });
-
-            entity.DeletedDate = DateTime.Now;
-        }
-
-        #endregion
-
-        public PreValueCollection GetPreValuesCollectionByDataTypeId(int dataTypeId)
-        {
-            return GetCachedPreValueCollection(dataTypeId);
-        }
-
-        public string GetPreValueAsString(int preValueId)
-        {
-            var collections = IsolatedCache.GetCacheItemsByKeySearch<PreValueCollection>(CacheKeys.DataTypePreValuesCacheKey + "_");
-
-            var preValue = collections.SelectMany(x => x.FormatAsDictionary().Values).FirstOrDefault(x => x.Id == preValueId);
-            if (preValue != null)
-                return preValue.Value;
-
-            var dto = Database.FirstOrDefault<DataTypePreValueDto>("WHERE id = @preValueId", new { preValueId });
-            if (dto == null)
-                return string.Empty;
-
-            var collection = GetCachedPreValueCollection(dto.DataTypeNodeId);
-            if (collection == null)
-                return string.Empty;
-
-            preValue = collection.FormatAsDictionary().Values.FirstOrDefault(x => x.Id == preValueId);
-            return preValue == null ? string.Empty : preValue.Value;
-        }
-
-        public void AddOrUpdatePreValues(int dataTypeId, IDictionary<string, PreValue> values)
-        {
-            var dtd = Get(dataTypeId);
-            if (dtd == null)
-            {
-                throw new InvalidOperationException("No data type found with id " + dataTypeId);
-            }
-            AddOrUpdatePreValues(dtd, values);
-        }
-
-        public IEnumerable<MoveEventInfo<IDataTypeDefinition>> Move(IDataTypeDefinition toMove, EntityContainer container)
-        {
-            var parentId = -1;
-            if (container != null)
-            {
-                // Check on paths
-                if ((string.Format(",{0},", container.Path)).IndexOf(string.Format(",{0},", toMove.Id), StringComparison.Ordinal) > -1)
-                {
-                    throw new DataOperationException<MoveOperationStatusType>(MoveOperationStatusType.FailedNotAllowedByPath);
-                }
-                parentId = container.Id;
-            }
-
-            //used to track all the moved entities to be given to the event
-            var moveInfo = new List<MoveEventInfo<IDataTypeDefinition>>
-            {
-                new MoveEventInfo<IDataTypeDefinition>(toMove, toMove.Path, parentId)
-            };
-
-            var origPath = toMove.Path;
-
-            //do the move to a new parent
-            toMove.ParentId = parentId;
-
-            //set the updated path
-            toMove.Path = string.Concat(container == null ? parentId.ToInvariantString() : container.Path, ",", toMove.Id);
-
-            //schedule it for updating in the transaction
-            AddOrUpdate(toMove);
-
-            //update all descendants from the original path, update in order of level
-            var descendants = GetByQuery(Query<IDataTypeDefinition>().Where(type => type.Path.StartsWith(origPath + ",")));
-
-            var lastParent = toMove;
-            foreach (var descendant in descendants.OrderBy(x => x.Level))
-            {
-                moveInfo.Add(new MoveEventInfo<IDataTypeDefinition>(descendant, descendant.Path, descendant.ParentId));
-
-                descendant.ParentId = lastParent.Id;
-                descendant.Path = string.Concat(lastParent.Path, ",", descendant.Id);
-
-                //schedule it for updating in the transaction
-                AddOrUpdate(descendant);
-            }
-
-            return moveInfo;
-        }
-
-        public void AddOrUpdatePreValues(IDataTypeDefinition dataType, IDictionary<string, PreValue> values)
-        {
-            var currentVals = new DataTypePreValueDto[] { };
-            if (dataType.HasIdentity)
-            {
-                //first just get all pre-values for this data type so we can compare them to see if we need to insert or update or replace
-                var sql = Sql()
-                    .SelectAll()
-                    .From<DataTypePreValueDto>()
-                    .Where<DataTypePreValueDto>(dto => dto.DataTypeNodeId == dataType.Id)
-                    .OrderBy<DataTypePreValueDto>(dto => dto.SortOrder);
-                currentVals = Database.Fetch<DataTypePreValueDto>(sql).ToArray();
-            }
-
-            //already existing, need to be updated
-            var valueIds = values.Where(x => x.Value.Id > 0).Select(x => x.Value.Id).ToArray();
-            var existingByIds = currentVals.Where(x => valueIds.Contains(x.Id)).ToArray();
-
-            //These ones need to be removed from the db, they no longer exist in the new values
-            var deleteById = currentVals.Where(x => valueIds.Contains(x.Id) == false);
-
-            foreach (var d in deleteById)
-            {
-                _preValRepository.Delete(new PreValueEntity
-                {
-                    Alias = d.Alias,
-                    Id = d.Id,
-                    Value = d.Value,
-                    DataType = dataType,
-                    SortOrder = d.SortOrder
-                });
-            }
-
-            var sortOrder = 1;
-
-            foreach (var pre in values)
-            {
-                var existing = existingByIds.FirstOrDefault(valueDto => valueDto.Id == pre.Value.Id);
-                if (existing != null)
-                {
-                    _preValRepository.AddOrUpdate(new PreValueEntity
-                    {
-                        //setting an id will update it
-                        Id = existing.Id,
-                        DataType = dataType,
-                        //These are the new values to update
-                        Alias = pre.Key,
-                        SortOrder = sortOrder,
-                        Value = pre.Value.Value
-                    });
-                }
-                else
-                {
-                    _preValRepository.AddOrUpdate(new PreValueEntity
-                    {
-                        Alias = pre.Key,
-                        SortOrder = sortOrder,
-                        Value = pre.Value.Value,
-                        DataType = dataType,
-                    });
-                }
-
-                sortOrder++;
-            }
-
-        }
-
-        private static string GetPrefixedCacheKey(int dataTypeId)
-        {
-            return CacheKeys.DataTypePreValuesCacheKey + "_" + dataTypeId;
-        }
-
-        private PreValueCollection GetCachedPreValueCollection(int dataTypeId)
-        {
-            var key = GetPrefixedCacheKey(dataTypeId);
-            return IsolatedCache.GetCacheItem<PreValueCollection>(key, () =>
-            {
-                var dtos = Database.Fetch<DataTypePreValueDto>("WHERE datatypeNodeId = @Id", new { Id = dataTypeId });
-                var list = dtos.Select(x => new Tuple<PreValue, string, int>(new PreValue(x.Id, x.Value, x.SortOrder), x.Alias, x.SortOrder)).ToList();
-                var collection = PreValueConverter.ConvertToPreValuesCollection(list);
-                return collection;
-            }, TimeSpan.FromMinutes(20), isSliding: true);
-        }
-
-        private string EnsureUniqueNodeName(string nodeName, int id = 0)
-        {
-            var template = SqlContext.Templates.Get("Umbraco.Core.DataTypeDefinitionRepository.EnsureUniqueNodeName", tsql => tsql
-                .Select<NodeDto>(x => Alias(x.NodeId, "id"), x => Alias(x.Text, "name"))
-                .From<NodeDto>()
-                .Where<NodeDto>(x => x.NodeObjectType == SqlTemplate.Arg<Guid>("nodeObjectType")));
-
-            var sql = template.Sql(NodeObjectTypeId);
-            var names = Database.Fetch<SimilarNodeName>(sql);
-
-            return SimilarNodeName.GetUniqueName(names, id, nodeName);
-        }
-
-        /// <summary>
-        /// Private class to handle pre-value crud based on units of work with transactions
-        /// </summary>
-        private class PreValueEntity : Entity, IAggregateRoot
-        {
-            public string Value { get; set; }
-            public string Alias { get; set; }
-            public IDataTypeDefinition DataType { get; set; }
-            public int SortOrder { get; set; }
-        }
-
-        /// <summary>
-        /// Private class to handle pre-value crud based on standard principles and units of work with transactions
-        /// </summary>
-        private class DataTypePreValueRepository : NPocoRepositoryBase<int, PreValueEntity>
-        {
-            public DataTypePreValueRepository(IScopeUnitOfWork work, CacheHelper cache, ILogger logger)
-                : base(work, cache, logger)
-            { }
-
-            #region Not implemented (don't need to for the purposes of this repo)
-            protected override PreValueEntity PerformGet(int id)
-            {
-                throw new NotImplementedException();
-            }
-
-            protected override IEnumerable<PreValueEntity> PerformGetAll(params int[] ids)
-            {
-                throw new NotImplementedException();
-            }
-
-            protected override IEnumerable<PreValueEntity> PerformGetByQuery(IQuery<PreValueEntity> query)
-            {
-                throw new NotImplementedException();
-            }
-
-            protected override Sql<ISqlContext> GetBaseQuery(bool isCount)
-            {
-                throw new NotImplementedException();
-            }
-
-            protected override string GetBaseWhereClause()
-            {
-                throw new NotImplementedException();
-            }
-
-            protected override IEnumerable<string> GetDeleteClauses()
-            {
-                return Array.Empty<string>();
-            }
-
-            protected override Guid NodeObjectTypeId
-            {
-                get { throw new NotImplementedException(); }
-            }
-            #endregion
-
-            protected override void PersistDeletedItem(PreValueEntity entity)
-            {
-                Database.Execute("DELETE FROM cmsDataTypePreValues WHERE id=@Id", new { Id = entity.Id });
-
-                entity.DeletedDate = DateTime.Now;
-            }
-
-            protected override void PersistNewItem(PreValueEntity entity)
-            {
-                if (entity.DataType.HasIdentity == false)
-                {
-                    throw new InvalidOperationException("Cannot insert a pre value for a data type that has no identity");
-                }
-
-                //NOTE: We used to check that the Alias was unique for the given DataTypeNodeId prevalues list, BUT
-                // in reality there is no need to check the uniqueness of this alias because the only way that this code executes is
-                // based on an IDictionary<string, PreValue> dictionary being passed to this repository and a dictionary
-                // must have unique aliases by definition, so there is no need for this additional check
-
-                var dto = new DataTypePreValueDto
-                {
-                    DataTypeNodeId = entity.DataType.Id,
-                    Value = entity.Value,
-                    SortOrder = entity.SortOrder,
-                    Alias = entity.Alias
-                };
-                Database.Insert(dto);
-            }
-
-            protected override void PersistUpdatedItem(PreValueEntity entity)
-            {
-                if (entity.DataType.HasIdentity == false)
-                {
-                    throw new InvalidOperationException("Cannot update a pre value for a data type that has no identity");
-                }
-
-                //NOTE: We used to check that the Alias was unique for the given DataTypeNodeId prevalues list, BUT
-                // this causes issues when sorting the pre-values (http://issues.umbraco.org/issue/U4-5670) but in reality
-                // there is no need to check the uniqueness of this alias because the only way that this code executes is
-                // based on an IDictionary<string, PreValue> dictionary being passed to this repository and a dictionary
-                // must have unique aliases by definition, so there is no need for this additional check
-
-                var dto = new DataTypePreValueDto
-                {
-                    DataTypeNodeId = entity.DataType.Id,
-                    Id = entity.Id,
-                    Value = entity.Value,
-                    SortOrder = entity.SortOrder,
-                    Alias = entity.Alias
-                };
-                Database.Update(dto);
-            }
-
-
-        }
-
-        internal static class PreValueConverter
-        {
-            /// <summary>
-            /// Converts the tuple to a pre-value collection
-            /// </summary>
-            /// <param name="list"></param>
-            /// <returns></returns>
-            internal static PreValueCollection ConvertToPreValuesCollection(IEnumerable<Tuple<PreValue, string, int>> list)
-            {
-                //now we need to determine if they are dictionary based, otherwise they have to be array based
-                var dictionary = new Dictionary<string, PreValue>();
-
-                //need to check all of the keys, if there's only one and it is empty then it's an array
-                var keys = list.Select(x => x.Item2).Distinct().ToArray();
-                if (keys.Length == 1 && keys[0].IsNullOrWhiteSpace())
-                {
-                    return new PreValueCollection(list.OrderBy(x => x.Item3).Select(x => x.Item1));
-                }
-
-                foreach (var item in list
-                    .OrderBy(x => x.Item3) //we'll order them first so we maintain the order index in the dictionary
-                    .GroupBy(x => x.Item2)) //group by alias
-                {
-                    if (item.Count() > 1)
-                    {
-                        //if there's more than 1 item per key, then it cannot be a dictionary, just return the array
-                        return new PreValueCollection(list.OrderBy(x => x.Item3).Select(x => x.Item1));
-                    }
-
-                    dictionary.Add(item.Key, item.First().Item1);
-                }
-
-                return new PreValueCollection(dictionary);
-            }
-        }
-    }
-}
+using System;
+using System.Collections.Generic;
+using System.Data;
+using System.Globalization;
+using System.Linq;
+using NPoco;
+using Umbraco.Core.Cache;
+using Umbraco.Core.Events;
+using Umbraco.Core.Exceptions;
+using Umbraco.Core.Logging;
+using Umbraco.Core.Models;
+using Umbraco.Core.Models.EntityBase;
+using Umbraco.Core.Models.Rdbms;
+using Umbraco.Core.Persistence.Factories;
+using Umbraco.Core.Persistence.Querying;
+using Umbraco.Core.Persistence.UnitOfWork;
+using Umbraco.Core.Services;
+
+namespace Umbraco.Core.Persistence.Repositories.Implement
+{
+    /// <summary>
+    /// Represents a repository for doing CRUD operations for <see cref="DataTypeDefinition"/>
+    /// </summary>
+    internal class DataTypeDefinitionRepository : NPocoRepositoryBase<int, IDataTypeDefinition>, IDataTypeDefinitionRepository
+    {
+        private readonly IContentTypeRepository _contentTypeRepository;
+        private readonly DataTypePreValueRepository _preValRepository;
+
+        public DataTypeDefinitionRepository(IScopeUnitOfWork work, CacheHelper cache, ILogger logger, IContentTypeRepository contentTypeRepository)
+            : base(work, cache, logger)
+        {
+            _contentTypeRepository = contentTypeRepository;
+            _preValRepository = new DataTypePreValueRepository(work, CacheHelper.NoCache, logger);
+        }
+
+        #region Overrides of RepositoryBase<int,DataTypeDefinition>
+
+        protected override IDataTypeDefinition PerformGet(int id)
+        {
+            return GetMany(new[] { id }).FirstOrDefault();
+        }
+
+        protected override IEnumerable<IDataTypeDefinition> PerformGetAll(params int[] ids)
+        {
+            var factory = new DataTypeDefinitionFactory(NodeObjectTypeId);
+            var dataTypeSql = GetBaseQuery(false);
+
+            if (ids.Any())
+            {
+                dataTypeSql.Where("umbracoNode.id in (@ids)", new { ids });
+            }
+            else
+            {
+                dataTypeSql.Where<NodeDto>(x => x.NodeObjectType == NodeObjectTypeId);
+            }
+
+            var dtos = Database.Fetch<DataTypeDto>(dataTypeSql);
+            return dtos.Select(factory.BuildEntity).ToArray();
+        }
+
+        protected override IEnumerable<IDataTypeDefinition> PerformGetByQuery(IQuery<IDataTypeDefinition> query)
+        {
+            var factory = new DataTypeDefinitionFactory(NodeObjectTypeId);
+
+            var sqlClause = GetBaseQuery(false);
+            var translator = new SqlTranslator<IDataTypeDefinition>(sqlClause, query);
+            var sql = translator.Translate();
+
+            var dtos = Database.Fetch<DataTypeDto>(sql);
+
+            return dtos.Select(factory.BuildEntity).ToArray();
+        }
+
+        /// <summary>
+        /// Override the delete method so that we can ensure that all related content type's are updated as part of the overall transaction
+        /// </summary>
+        /// <param name="entity"></param>
+        public override void Delete(IDataTypeDefinition entity)
+        {
+            //Find ContentTypes using this IDataTypeDefinition on a PropertyType
+            var query = Query<PropertyType>().Where(x => x.DataTypeDefinitionId == entity.Id);
+
+            //TODO: Don't we need to be concerned about media and member types here too ?
+            var contentTypes = _contentTypeRepository.GetByQuery(query);
+
+            //Loop through the list of results and remove the PropertyTypes that references the DataTypeDefinition that is being deleted
+            foreach (var contentType in contentTypes)
+            {
+                if (contentType == null) continue;
+
+                foreach (var group in contentType.PropertyGroups)
+                {
+                    var types = @group.PropertyTypes.Where(x => x.DataTypeDefinitionId == entity.Id).ToList();
+                    foreach (var propertyType in types)
+                    {
+                        @group.PropertyTypes.Remove(propertyType);
+                    }
+                }
+
+                // so... we are modifying content types here. the service will trigger Deleted event,
+                // which will propagate to DataTypeCacheRefresher which will clear almost every cache
+                // there is to clear... and in addition published snapshot caches will clear themselves too, so
+                // this is probably safe alghough it looks... weird.
+                //
+                // what IS weird is that a content type is losing a property and we do NOT raise any
+                // content type event... so ppl better listen on the data type events too.
+
+                _contentTypeRepository.Save(contentType);
+            }
+
+            //call the base method to queue the deletion of this data type
+            base.Delete(entity);
+        }
+
+        #endregion
+
+        #region Overrides of NPocoRepositoryBase<int,DataTypeDefinition>
+
+        protected override Sql<ISqlContext> GetBaseQuery(bool isCount)
+        {
+            var sql = Sql();
+
+            sql = isCount
+                ? sql.SelectCount()
+                : sql.Select<DataTypeDto>(r => r.Select(x => x.NodeDto));
+
+            sql
+               .From<DataTypeDto>()
+               .InnerJoin<NodeDto>()
+               .On<DataTypeDto, NodeDto>(left => left.DataTypeId, right => right.NodeId)
+               .Where<NodeDto>(x => x.NodeObjectType == NodeObjectTypeId);
+            return sql;
+        }
+
+        protected override string GetBaseWhereClause()
+        {
+            return "umbracoNode.id = @id";
+        }
+
+        protected override IEnumerable<string> GetDeleteClauses()
+        {
+            return Array.Empty<string>();
+        }
+
+        protected override Guid NodeObjectTypeId => Constants.ObjectTypes.DataType;
+
+        #endregion
+
+        #region Unit of Work Implementation
+
+        protected override void PersistNewItem(IDataTypeDefinition entity)
+        {
+            ((DataTypeDefinition)entity).AddingEntity();
+
+            //ensure a datatype has a unique name before creating it
+            entity.Name = EnsureUniqueNodeName(entity.Name);
+
+            //TODO: should the below be removed?
+            //Cannot add a duplicate data type
+            var exists = Database.ExecuteScalar<int>(@"SELECT COUNT(*) FROM cmsDataType
+INNER JOIN umbracoNode ON cmsDataType.nodeId = umbracoNode.id
+WHERE umbracoNode." + SqlSyntax.GetQuotedColumnName("text") + "= @name", new { name = entity.Name });
+            if (exists > 0)
+            {
+                throw new DuplicateNameException("A data type with the name " + entity.Name + " already exists");
+            }
+
+            var factory = new DataTypeDefinitionFactory(NodeObjectTypeId);
+            var dto = factory.BuildDto(entity);
+
+            //Logic for setting Path, Level and SortOrder
+            var parent = Database.First<NodeDto>("WHERE id = @ParentId", new { ParentId = entity.ParentId });
+            int level = parent.Level + 1;
+            int sortOrder =
+                Database.ExecuteScalar<int>("SELECT COUNT(*) FROM umbracoNode WHERE parentID = @ParentId AND nodeObjectType = @NodeObjectType",
+                                                      new { ParentId = entity.ParentId, NodeObjectType = NodeObjectTypeId });
+
+            //Create the (base) node data - umbracoNode
+            var nodeDto = dto.NodeDto;
+            nodeDto.Path = parent.Path;
+            nodeDto.Level = short.Parse(level.ToString(CultureInfo.InvariantCulture));
+            nodeDto.SortOrder = sortOrder;
+            var o = Database.IsNew<NodeDto>(nodeDto) ? Convert.ToInt32(Database.Insert(nodeDto)) : Database.Update(nodeDto);
+
+            //Update with new correct path
+            nodeDto.Path = string.Concat(parent.Path, ",", nodeDto.NodeId);
+            Database.Update(nodeDto);
+
+            //Update entity with correct values
+            entity.Id = nodeDto.NodeId; //Set Id on entity to ensure an Id is set
+            entity.Path = nodeDto.Path;
+            entity.SortOrder = sortOrder;
+            entity.Level = level;
+
+            dto.DataTypeId = nodeDto.NodeId;
+            Database.Insert(dto);
+
+            entity.ResetDirtyProperties();
+        }
+
+        protected override void PersistUpdatedItem(IDataTypeDefinition entity)
+        {
+
+            entity.Name = EnsureUniqueNodeName(entity.Name, entity.Id);
+
+            //Cannot change to a duplicate alias
+            var exists = Database.ExecuteScalar<int>(@"SELECT COUNT(*) FROM cmsDataType
+INNER JOIN umbracoNode ON cmsDataType.nodeId = umbracoNode.id
+WHERE umbracoNode." + SqlSyntax.GetQuotedColumnName("text") + @"= @name
+AND umbracoNode.id <> @id",
+                    new { id = entity.Id, name = entity.Name });
+            if (exists > 0)
+            {
+                throw new DuplicateNameException("A data type with the name " + entity.Name + " already exists");
+            }
+
+            //Updates Modified date
+            ((DataTypeDefinition)entity).UpdatingEntity();
+
+            //Look up parent to get and set the correct Path if ParentId has changed
+            if (entity.IsPropertyDirty("ParentId"))
+            {
+                var parent = Database.First<NodeDto>("WHERE id = @ParentId", new { ParentId = entity.ParentId });
+                entity.Path = string.Concat(parent.Path, ",", entity.Id);
+                entity.Level = parent.Level + 1;
+                var maxSortOrder =
+                    Database.ExecuteScalar<int>(
+                        "SELECT coalesce(max(sortOrder),0) FROM umbracoNode WHERE parentid = @ParentId AND nodeObjectType = @NodeObjectType",
+                        new { ParentId = entity.ParentId, NodeObjectType = NodeObjectTypeId });
+                entity.SortOrder = maxSortOrder + 1;
+            }
+
+            var factory = new DataTypeDefinitionFactory(NodeObjectTypeId);
+            //Look up DataTypeDefinition entry to get Primary for updating the DTO
+            var dataTypeDto = Database.SingleOrDefault<DataTypeDto>("WHERE nodeId = @Id", new { Id = entity.Id });
+            factory.SetPrimaryKey(dataTypeDto.PrimaryKey);
+            var dto = factory.BuildDto(entity);
+
+            //Updates the (base) node data - umbracoNode
+            var nodeDto = dto.NodeDto;
+            Database.Update(nodeDto);
+            Database.Update(dto);
+
+            //NOTE: This is a special case, we need to clear the custom cache for pre-values here so they are not stale if devs
+            // are querying for them in the Saved event (before the distributed call cache is clearing it)
+            IsolatedCache.ClearCacheItem(GetPrefixedCacheKey(entity.Id));
+
+            entity.ResetDirtyProperties();
+        }
+
+        protected override void PersistDeletedItem(IDataTypeDefinition entity)
+        {
+            //Remove Notifications
+            Database.Delete<User2NodeNotifyDto>("WHERE nodeId = @Id", new { Id = entity.Id });
+
+            //Remove Permissions
+            Database.Delete<UserGroup2NodePermissionDto>("WHERE nodeId = @Id", new { Id = entity.Id });
+
+            //Remove associated tags
+            Database.Delete<TagRelationshipDto>("WHERE nodeId = @Id", new { Id = entity.Id });
+
+            //PropertyTypes containing the DataType being deleted
+            var propertyTypeDtos = Database.Fetch<PropertyTypeDto>("WHERE dataTypeId = @Id", new { Id = entity.Id });
+            //Go through the PropertyTypes and delete referenced PropertyData before deleting the PropertyType
+            foreach (var dto in propertyTypeDtos)
+            {
+                Database.Delete<PropertyDataDto>("WHERE propertytypeid = @Id", new { Id = dto.Id });
+                Database.Delete<PropertyTypeDto>("WHERE id = @Id", new { Id = dto.Id });
+            }
+
+            //Delete the pre-values
+            Database.Delete<DataTypePreValueDto>("WHERE datatypeNodeId = @Id", new { Id = entity.Id });
+
+            //Delete Content specific data
+            Database.Delete<DataTypeDto>("WHERE nodeId = @Id", new { Id = entity.Id });
+
+            //Delete (base) node data
+            Database.Delete<NodeDto>("WHERE uniqueID = @Id", new { Id = entity.Key });
+
+            entity.DeletedDate = DateTime.Now;
+        }
+
+        #endregion
+
+        public PreValueCollection GetPreValuesCollectionByDataTypeId(int dataTypeId)
+        {
+            return GetCachedPreValueCollection(dataTypeId);
+        }
+
+        public string GetPreValueAsString(int preValueId)
+        {
+            var collections = IsolatedCache.GetCacheItemsByKeySearch<PreValueCollection>(CacheKeys.DataTypePreValuesCacheKey + "_");
+
+            var preValue = collections.SelectMany(x => x.FormatAsDictionary().Values).FirstOrDefault(x => x.Id == preValueId);
+            if (preValue != null)
+                return preValue.Value;
+
+            var dto = Database.FirstOrDefault<DataTypePreValueDto>("WHERE id = @preValueId", new { preValueId });
+            if (dto == null)
+                return string.Empty;
+
+            var collection = GetCachedPreValueCollection(dto.DataTypeNodeId);
+            if (collection == null)
+                return string.Empty;
+
+            preValue = collection.FormatAsDictionary().Values.FirstOrDefault(x => x.Id == preValueId);
+            return preValue == null ? string.Empty : preValue.Value;
+        }
+
+        public void AddOrUpdatePreValues(int dataTypeId, IDictionary<string, PreValue> values)
+        {
+            var dtd = Get(dataTypeId);
+            if (dtd == null)
+            {
+                throw new InvalidOperationException("No data type found with id " + dataTypeId);
+            }
+            AddOrUpdatePreValues(dtd, values);
+        }
+
+        public IEnumerable<MoveEventInfo<IDataTypeDefinition>> Move(IDataTypeDefinition toMove, EntityContainer container)
+        {
+            var parentId = -1;
+            if (container != null)
+            {
+                // Check on paths
+                if ((string.Format(",{0},", container.Path)).IndexOf(string.Format(",{0},", toMove.Id), StringComparison.Ordinal) > -1)
+                {
+                    throw new DataOperationException<MoveOperationStatusType>(MoveOperationStatusType.FailedNotAllowedByPath);
+                }
+                parentId = container.Id;
+            }
+
+            //used to track all the moved entities to be given to the event
+            var moveInfo = new List<MoveEventInfo<IDataTypeDefinition>>
+            {
+                new MoveEventInfo<IDataTypeDefinition>(toMove, toMove.Path, parentId)
+            };
+
+            var origPath = toMove.Path;
+
+            //do the move to a new parent
+            toMove.ParentId = parentId;
+
+            //set the updated path
+            toMove.Path = string.Concat(container == null ? parentId.ToInvariantString() : container.Path, ",", toMove.Id);
+
+            //schedule it for updating in the transaction
+            Save(toMove);
+
+            //update all descendants from the original path, update in order of level
+            var descendants = Get(Query<IDataTypeDefinition>().Where(type => type.Path.StartsWith(origPath + ",")));
+
+            var lastParent = toMove;
+            foreach (var descendant in descendants.OrderBy(x => x.Level))
+            {
+                moveInfo.Add(new MoveEventInfo<IDataTypeDefinition>(descendant, descendant.Path, descendant.ParentId));
+
+                descendant.ParentId = lastParent.Id;
+                descendant.Path = string.Concat(lastParent.Path, ",", descendant.Id);
+
+                //schedule it for updating in the transaction
+                Save(descendant);
+            }
+
+            return moveInfo;
+        }
+
+        public void AddOrUpdatePreValues(IDataTypeDefinition dataType, IDictionary<string, PreValue> values)
+        {
+            var currentVals = new DataTypePreValueDto[] { };
+            if (dataType.HasIdentity)
+            {
+                //first just get all pre-values for this data type so we can compare them to see if we need to insert or update or replace
+                var sql = Sql()
+                    .SelectAll()
+                    .From<DataTypePreValueDto>()
+                    .Where<DataTypePreValueDto>(dto => dto.DataTypeNodeId == dataType.Id)
+                    .OrderBy<DataTypePreValueDto>(dto => dto.SortOrder);
+                currentVals = Database.Fetch<DataTypePreValueDto>(sql).ToArray();
+            }
+
+            //already existing, need to be updated
+            var valueIds = values.Where(x => x.Value.Id > 0).Select(x => x.Value.Id).ToArray();
+            var existingByIds = currentVals.Where(x => valueIds.Contains(x.Id)).ToArray();
+
+            //These ones need to be removed from the db, they no longer exist in the new values
+            var deleteById = currentVals.Where(x => valueIds.Contains(x.Id) == false);
+
+            foreach (var d in deleteById)
+            {
+                _preValRepository.Delete(new PreValueEntity
+                {
+                    Alias = d.Alias,
+                    Id = d.Id,
+                    Value = d.Value,
+                    DataType = dataType,
+                    SortOrder = d.SortOrder
+                });
+            }
+
+            var sortOrder = 1;
+
+            foreach (var pre in values)
+            {
+                var existing = existingByIds.FirstOrDefault(valueDto => valueDto.Id == pre.Value.Id);
+                if (existing != null)
+                {
+                    _preValRepository.Save(new PreValueEntity
+                    {
+                        //setting an id will update it
+                        Id = existing.Id,
+                        DataType = dataType,
+                        //These are the new values to update
+                        Alias = pre.Key,
+                        SortOrder = sortOrder,
+                        Value = pre.Value.Value
+                    });
+                }
+                else
+                {
+                    _preValRepository.Save(new PreValueEntity
+                    {
+                        Alias = pre.Key,
+                        SortOrder = sortOrder,
+                        Value = pre.Value.Value,
+                        DataType = dataType,
+                    });
+                }
+
+                sortOrder++;
+            }
+
+        }
+
+        private static string GetPrefixedCacheKey(int dataTypeId)
+        {
+            return CacheKeys.DataTypePreValuesCacheKey + "_" + dataTypeId;
+        }
+
+        private PreValueCollection GetCachedPreValueCollection(int dataTypeId)
+        {
+            var key = GetPrefixedCacheKey(dataTypeId);
+            return IsolatedCache.GetCacheItem<PreValueCollection>(key, () =>
+            {
+                var dtos = Database.Fetch<DataTypePreValueDto>("WHERE datatypeNodeId = @Id", new { Id = dataTypeId });
+                var list = dtos.Select(x => new Tuple<PreValue, string, int>(new PreValue(x.Id, x.Value, x.SortOrder), x.Alias, x.SortOrder)).ToList();
+                var collection = PreValueConverter.ConvertToPreValuesCollection(list);
+                return collection;
+            }, TimeSpan.FromMinutes(20), isSliding: true);
+        }
+
+        private string EnsureUniqueNodeName(string nodeName, int id = 0)
+        {
+            var template = SqlContext.Templates.Get("Umbraco.Core.DataTypeDefinitionRepository.EnsureUniqueNodeName", tsql => tsql
+                .Select<NodeDto>(x => NPocoSqlExtensions.Statics.Alias(x.NodeId, "id"), x => NPocoSqlExtensions.Statics.Alias(x.Text, "name"))
+                .From<NodeDto>()
+                .Where<NodeDto>(x => x.NodeObjectType == SqlTemplate.Arg<Guid>("nodeObjectType")));
+
+            var sql = template.Sql(NodeObjectTypeId);
+            var names = Database.Fetch<SimilarNodeName>(sql);
+
+            return SimilarNodeName.GetUniqueName(names, id, nodeName);
+        }
+
+        /// <summary>
+        /// Private class to handle pre-value crud based on units of work with transactions
+        /// </summary>
+        private class PreValueEntity : Entity, IAggregateRoot
+        {
+            public string Value { get; set; }
+            public string Alias { get; set; }
+            public IDataTypeDefinition DataType { get; set; }
+            public int SortOrder { get; set; }
+        }
+
+        /// <summary>
+        /// Private class to handle pre-value crud based on standard principles and units of work with transactions
+        /// </summary>
+        private class DataTypePreValueRepository : NPocoRepositoryBase<int, PreValueEntity>
+        {
+            public DataTypePreValueRepository(IScopeUnitOfWork work, CacheHelper cache, ILogger logger)
+                : base(work, cache, logger)
+            { }
+
+            #region Not implemented (don't need to for the purposes of this repo)
+            protected override PreValueEntity PerformGet(int id)
+            {
+                throw new NotImplementedException();
+            }
+
+            protected override IEnumerable<PreValueEntity> PerformGetAll(params int[] ids)
+            {
+                throw new NotImplementedException();
+            }
+
+            protected override IEnumerable<PreValueEntity> PerformGetByQuery(IQuery<PreValueEntity> query)
+            {
+                throw new NotImplementedException();
+            }
+
+            protected override Sql<ISqlContext> GetBaseQuery(bool isCount)
+            {
+                throw new NotImplementedException();
+            }
+
+            protected override string GetBaseWhereClause()
+            {
+                throw new NotImplementedException();
+            }
+
+            protected override IEnumerable<string> GetDeleteClauses()
+            {
+                return Array.Empty<string>();
+            }
+
+            protected override Guid NodeObjectTypeId
+            {
+                get { throw new NotImplementedException(); }
+            }
+            #endregion
+
+            protected override void PersistDeletedItem(PreValueEntity entity)
+            {
+                Database.Execute("DELETE FROM cmsDataTypePreValues WHERE id=@Id", new { Id = entity.Id });
+
+                entity.DeletedDate = DateTime.Now;
+            }
+
+            protected override void PersistNewItem(PreValueEntity entity)
+            {
+                if (entity.DataType.HasIdentity == false)
+                {
+                    throw new InvalidOperationException("Cannot insert a pre value for a data type that has no identity");
+                }
+
+                //NOTE: We used to check that the Alias was unique for the given DataTypeNodeId prevalues list, BUT
+                // in reality there is no need to check the uniqueness of this alias because the only way that this code executes is
+                // based on an IDictionary<string, PreValue> dictionary being passed to this repository and a dictionary
+                // must have unique aliases by definition, so there is no need for this additional check
+
+                var dto = new DataTypePreValueDto
+                {
+                    DataTypeNodeId = entity.DataType.Id,
+                    Value = entity.Value,
+                    SortOrder = entity.SortOrder,
+                    Alias = entity.Alias
+                };
+                Database.Insert(dto);
+            }
+
+            protected override void PersistUpdatedItem(PreValueEntity entity)
+            {
+                if (entity.DataType.HasIdentity == false)
+                {
+                    throw new InvalidOperationException("Cannot update a pre value for a data type that has no identity");
+                }
+
+                //NOTE: We used to check that the Alias was unique for the given DataTypeNodeId prevalues list, BUT
+                // this causes issues when sorting the pre-values (http://issues.umbraco.org/issue/U4-5670) but in reality
+                // there is no need to check the uniqueness of this alias because the only way that this code executes is
+                // based on an IDictionary<string, PreValue> dictionary being passed to this repository and a dictionary
+                // must have unique aliases by definition, so there is no need for this additional check
+
+                var dto = new DataTypePreValueDto
+                {
+                    DataTypeNodeId = entity.DataType.Id,
+                    Id = entity.Id,
+                    Value = entity.Value,
+                    SortOrder = entity.SortOrder,
+                    Alias = entity.Alias
+                };
+                Database.Update(dto);
+            }
+
+
+        }
+
+        internal static class PreValueConverter
+        {
+            /// <summary>
+            /// Converts the tuple to a pre-value collection
+            /// </summary>
+            /// <param name="list"></param>
+            /// <returns></returns>
+            internal static PreValueCollection ConvertToPreValuesCollection(IEnumerable<Tuple<PreValue, string, int>> list)
+            {
+                //now we need to determine if they are dictionary based, otherwise they have to be array based
+                var dictionary = new Dictionary<string, PreValue>();
+
+                //need to check all of the keys, if there's only one and it is empty then it's an array
+                var keys = list.Select(x => x.Item2).Distinct().ToArray();
+                if (keys.Length == 1 && keys[0].IsNullOrWhiteSpace())
+                {
+                    return new PreValueCollection(list.OrderBy(x => x.Item3).Select(x => x.Item1));
+                }
+
+                foreach (var item in list
+                    .OrderBy(x => x.Item3) //we'll order them first so we maintain the order index in the dictionary
+                    .GroupBy(x => x.Item2)) //group by alias
+                {
+                    if (item.Count() > 1)
+                    {
+                        //if there's more than 1 item per key, then it cannot be a dictionary, just return the array
+                        return new PreValueCollection(list.OrderBy(x => x.Item3).Select(x => x.Item1));
+                    }
+
+                    dictionary.Add(item.Key, item.First().Item1);
+                }
+
+                return new PreValueCollection(dictionary);
+            }
+        }
+    }
+}
diff --git a/src/Umbraco.Core/Persistence/Repositories/DictionaryRepository.cs b/src/Umbraco.Core/Persistence/Repositories/Implement/DictionaryRepository.cs
similarity index 93%
rename from src/Umbraco.Core/Persistence/Repositories/DictionaryRepository.cs
rename to src/Umbraco.Core/Persistence/Repositories/Implement/DictionaryRepository.cs
index 731b1fc6c1..b8a1f30350 100644
--- a/src/Umbraco.Core/Persistence/Repositories/DictionaryRepository.cs
+++ b/src/Umbraco.Core/Persistence/Repositories/Implement/DictionaryRepository.cs
@@ -1,405 +1,403 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using NPoco;
-using Umbraco.Core.Cache;
-using Umbraco.Core.Logging;
-using Umbraco.Core.Models;
-using Umbraco.Core.Models.EntityBase;
-using Umbraco.Core.Models.Rdbms;
-
-using Umbraco.Core.Persistence.Factories;
-using Umbraco.Core.Persistence.Mappers;
-using Umbraco.Core.Persistence.Querying;
-using Umbraco.Core.Persistence.UnitOfWork;
-
-namespace Umbraco.Core.Persistence.Repositories
-{
-    /// <summary>
-    /// Represents a repository for doing CRUD operations for <see cref="DictionaryItem"/>
-    /// </summary>
-    internal class DictionaryRepository : NPocoRepositoryBase<int, IDictionaryItem>, IDictionaryRepository
-    {
-        public DictionaryRepository(IScopeUnitOfWork work, CacheHelper cache, ILogger logger)
-            : base(work, cache, logger)
-        { }
-
-        protected override IRepositoryCachePolicy<IDictionaryItem, int> CreateCachePolicy(IRuntimeCacheProvider runtimeCache)
-        {
-            var options = new RepositoryCachePolicyOptions
-            {
-                //allow zero to be cached
-                GetAllCacheAllowZeroCount = true
-            };
-
-            return new SingleItemsOnlyRepositoryCachePolicy<IDictionaryItem, int>(runtimeCache, options);
-        }
-
-        #region Overrides of RepositoryBase<int,DictionaryItem>
-
-        protected override IDictionaryItem PerformGet(int id)
-        {
-            var sql = GetBaseQuery(false)
-                .Where(GetBaseWhereClause(), new { id = id })
-                .OrderBy<DictionaryDto>(x => x.UniqueId);
-
-            var dto = Database
-                .FetchOneToMany<DictionaryDto>(x => x.LanguageTextDtos, sql)
-                .FirstOrDefault();
-
-            if (dto == null)
-                return null;
-
-            var entity = ConvertFromDto(dto);
-
-            // reset dirty initial properties (U4-1946)
-            ((Entity)entity).ResetDirtyProperties(false);
-
-            return entity;
-        }
-
-        protected override IEnumerable<IDictionaryItem> PerformGetAll(params int[] ids)
-        {
-            var sql = GetBaseQuery(false).Where("cmsDictionary.pk > 0");
-            if (ids.Any())
-            {
-                sql.Where("cmsDictionary.pk in (@ids)", new { /*ids =*/ ids });
-            }
-
-            return Database
-                .FetchOneToMany<DictionaryDto>(x => x.LanguageTextDtos, sql)
-                .Select(ConvertFromDto);
-        }
-
-        protected override IEnumerable<IDictionaryItem> PerformGetByQuery(IQuery<IDictionaryItem> query)
-        {
-            var sqlClause = GetBaseQuery(false);
-            var translator = new SqlTranslator<IDictionaryItem>(sqlClause, query);
-            var sql = translator.Translate();
-            sql.OrderBy<DictionaryDto>(x => x.UniqueId);
-
-            return Database
-                .FetchOneToMany<DictionaryDto>(x => x.LanguageTextDtos, sql)
-                .Select(ConvertFromDto);
-        }
-
-        #endregion
-
-        #region Overrides of NPocoRepositoryBase<int,DictionaryItem>
-
-        protected override Sql<ISqlContext> GetBaseQuery(bool isCount)
-        {
-            var sql = Sql();
-            if (isCount)
-            {
-                sql.SelectCount()
-                    .From<DictionaryDto>();
-            }
-            else
-            {
-                sql.SelectAll()
-                   .From<DictionaryDto>()
-                   .LeftJoin<LanguageTextDto>()
-                   .On<DictionaryDto, LanguageTextDto>(left => left.UniqueId, right => right.UniqueId);
-            }
-            return sql;
-        }
-
-        protected override string GetBaseWhereClause()
-        {
-            return "cmsDictionary.pk = @id";
-        }
-
-        protected override IEnumerable<string> GetDeleteClauses()
-        {
-            return new List<string>();
-        }
-
-        protected override Guid NodeObjectTypeId
-        {
-            get { throw new NotImplementedException(); }
-        }
-
-        #endregion
-
-        #region Unit of Work Implementation
-
-        protected override void PersistNewItem(IDictionaryItem entity)
-        {
-            var dictionaryItem = ((DictionaryItem) entity);
-
-            dictionaryItem.AddingEntity();
-
-            foreach (var translation in dictionaryItem.Translations)
-                translation.Value = translation.Value.ToValidXmlString();
-
-            var factory = new DictionaryItemFactory();
-            var dto = factory.BuildDto(dictionaryItem);
-
-            var id = Convert.ToInt32(Database.Insert(dto));
-            dictionaryItem.Id = id;
-
-            var translationFactory = new DictionaryTranslationFactory(dictionaryItem.Key);
-            foreach (var translation in dictionaryItem.Translations)
-            {
-                var textDto = translationFactory.BuildDto(translation);
-                translation.Id = Convert.ToInt32(Database.Insert(textDto));
-                translation.Key = dictionaryItem.Key;
-            }
-
-            dictionaryItem.ResetDirtyProperties();
-        }
-
-        protected override void PersistUpdatedItem(IDictionaryItem entity)
-        {
-            ((Entity)entity).UpdatingEntity();
-
-            foreach (var translation in entity.Translations)
-                translation.Value = translation.Value.ToValidXmlString();
-
-            var factory = new DictionaryItemFactory();
-            var dto = factory.BuildDto(entity);
-
-            Database.Update(dto);
-
-            var translationFactory = new DictionaryTranslationFactory(entity.Key);
-            foreach (var translation in entity.Translations)
-            {
-                var textDto = translationFactory.BuildDto(translation);
-                if (translation.HasIdentity)
-                {
-                    Database.Update(textDto);
-                }
-                else
-                {
-                    translation.Id = Convert.ToInt32(Database.Insert(textDto));
-                    translation.Key = entity.Key;
-                }
-            }
-
-            entity.ResetDirtyProperties();
-
-            //Clear the cache entries that exist by uniqueid/item key
-            IsolatedCache.ClearCacheItem(GetCacheIdKey<IDictionaryItem>(entity.ItemKey));
-            IsolatedCache.ClearCacheItem(GetCacheIdKey<IDictionaryItem>(entity.Key));
-        }
-
-        protected override void PersistDeletedItem(IDictionaryItem entity)
-        {
-            RecursiveDelete(entity.Key);
-
-            Database.Delete<LanguageTextDto>("WHERE UniqueId = @Id", new { Id = entity.Key });
-            Database.Delete<DictionaryDto>("WHERE id = @Id", new { Id = entity.Key });
-
-            //Clear the cache entries that exist by uniqueid/item key
-            IsolatedCache.ClearCacheItem(GetCacheIdKey<IDictionaryItem>(entity.ItemKey));
-            IsolatedCache.ClearCacheItem(GetCacheIdKey<IDictionaryItem>(entity.Key));
-
-            entity.DeletedDate = DateTime.Now;
-        }
-
-        private void RecursiveDelete(Guid parentId)
-        {
-            var list = Database.Fetch<DictionaryDto>("WHERE parent = @ParentId", new { ParentId = parentId });
-            foreach (var dto in list)
-            {
-                RecursiveDelete(dto.UniqueId);
-
-                Database.Delete<LanguageTextDto>("WHERE UniqueId = @Id", new { Id = dto.UniqueId });
-                Database.Delete<DictionaryDto>("WHERE id = @Id", new { Id = dto.UniqueId });
-
-                //Clear the cache entries that exist by uniqueid/item key
-                IsolatedCache.ClearCacheItem(GetCacheIdKey<IDictionaryItem>(dto.Key));
-                IsolatedCache.ClearCacheItem(GetCacheIdKey<IDictionaryItem>(dto.UniqueId));
-            }
-        }
-
-        #endregion
-
-        protected IDictionaryItem ConvertFromDto(DictionaryDto dto)
-        {
-            var factory = new DictionaryItemFactory();
-            var entity = factory.BuildEntity(dto);
-
-            var f = new DictionaryTranslationFactory(dto.UniqueId);
-            entity.Translations = dto.LanguageTextDtos.EmptyNull()
-                .Where(x => x.LanguageId > 0)
-                .Select(x => f.BuildEntity(x))
-                .ToList();
-
-            return entity;
-        }
-
-        public IDictionaryItem Get(Guid uniqueId)
-        {
-            var uniqueIdRepo = new DictionaryByUniqueIdRepository(this, UnitOfWork, GlobalCache, Logger);
-            return uniqueIdRepo.Get(uniqueId);
-        }
-
-        public IDictionaryItem Get(string key)
-        {
-            var keyRepo = new DictionaryByKeyRepository(this, UnitOfWork, GlobalCache, Logger);
-            return keyRepo.Get(key);
-        }
-
-        private IEnumerable<IDictionaryItem> GetRootDictionaryItems()
-        {
-            var query = Query<IDictionaryItem>().Where(x => x.ParentId == null);
-            return GetByQuery(query);
-        }
-
-        public Dictionary<string, Guid> GetDictionaryItemKeyMap()
-        {
-            var columns = new[] { "key", "id" }.Select(x => (object) SqlSyntax.GetQuotedColumnName(x)).ToArray();
-            var sql = Sql().Select(columns).From<DictionaryDto>();
-            return Database.Fetch<DictionaryItemKeyIdDto>(sql).ToDictionary(x => x.Key, x => x.Id);
-        }
-
-        private class DictionaryItemKeyIdDto
-        {
-            public string Key { get; set; }
-            public Guid Id { get; set; }
-        }
-
-        public IEnumerable<IDictionaryItem> GetDictionaryItemDescendants(Guid? parentId)
-        {
-            //This methods will look up children at each level, since we do not store a path for dictionary (ATM), we need to do a recursive
-            // lookup to get descendants. Currently this is the most efficient way to do it
-
-            Func<Guid[], IEnumerable<IEnumerable<IDictionaryItem>>> getItemsFromParents = guids =>
-            {
-                //needs to be in groups of 2000 because we are doing an IN clause and there's a max parameter count that can be used.
-                return guids.InGroupsOf(2000)
-                    .Select(@group =>
-                    {
-                        var sqlClause = GetBaseQuery(false)
-                            .Where<DictionaryDto>(x => x.Parent != null)
-                            .Where($"{SqlSyntax.GetQuotedColumnName("parent")} IN (@parentIds)", new { parentIds = @group });
-
-                        var translator = new SqlTranslator<IDictionaryItem>(sqlClause, Query<IDictionaryItem>());
-                        var sql = translator.Translate();
-                        sql.OrderBy<DictionaryDto>(x => x.UniqueId);
-
-                        return Database
-                            .FetchOneToMany<DictionaryDto>(x=> x.LanguageTextDtos, sql)
-                            .Select(ConvertFromDto);
-                    });
-            };
-
-            var childItems = parentId.HasValue == false
-                ? new[] { GetRootDictionaryItems() }
-                : getItemsFromParents(new[] { parentId.Value });
-
-            return childItems.SelectRecursive(items => getItemsFromParents(items.Select(x => x.Key).ToArray())).SelectMany(items => items);
-
-        }
-
-        private class DictionaryByUniqueIdRepository : SimpleGetRepository<Guid, IDictionaryItem, DictionaryDto>
-        {
-            private IRepositoryCachePolicy<IDictionaryItem, Guid> _cachePolicy;
-            private readonly DictionaryRepository _dictionaryRepository;
-
-            public DictionaryByUniqueIdRepository(DictionaryRepository dictionaryRepository, IScopeUnitOfWork work, CacheHelper cache, ILogger logger)
-                : base(work, cache, logger)
-            {
-                _dictionaryRepository = dictionaryRepository;
-            }
-
-            protected override IEnumerable<DictionaryDto> PerformFetch(Sql sql)
-            {
-                return Database
-                    .FetchOneToMany<DictionaryDto>(x => x.LanguageTextDtos, sql);
-            }
-
-            protected override Sql<ISqlContext> GetBaseQuery(bool isCount)
-            {
-                return _dictionaryRepository.GetBaseQuery(isCount);
-            }
-
-            protected override string GetBaseWhereClause()
-            {
-                return "cmsDictionary." + SqlSyntax.GetQuotedColumnName("id") + " = @id";
-            }
-
-            protected override IDictionaryItem ConvertToEntity(DictionaryDto dto)
-            {
-                return _dictionaryRepository.ConvertFromDto(dto);
-            }
-
-            protected override object GetBaseWhereClauseArguments(Guid id)
-            {
-                return new { id = id };
-            }
-
-            protected override string GetWhereInClauseForGetAll()
-            {
-                return "cmsDictionary." + SqlSyntax.GetQuotedColumnName("id") + " in (@ids)";
-            }
-
-            protected override IRepositoryCachePolicy<IDictionaryItem, Guid> CreateCachePolicy(IRuntimeCacheProvider runtimeCache)
-            {
-                var options = new RepositoryCachePolicyOptions
-                {
-                    //allow zero to be cached
-                    GetAllCacheAllowZeroCount = true
-                };
-
-                return new SingleItemsOnlyRepositoryCachePolicy<IDictionaryItem, Guid>(runtimeCache, options);
-            }
-        }
-
-        private class DictionaryByKeyRepository : SimpleGetRepository<string, IDictionaryItem, DictionaryDto>
-        {
-            private IRepositoryCachePolicy<IDictionaryItem, string> _cachePolicy;
-            private readonly DictionaryRepository _dictionaryRepository;
-
-            public DictionaryByKeyRepository(DictionaryRepository dictionaryRepository, IScopeUnitOfWork work, CacheHelper cache, ILogger logger)
-                : base(work, cache, logger)
-            {
-                _dictionaryRepository = dictionaryRepository;
-            }
-
-            protected override IEnumerable<DictionaryDto> PerformFetch(Sql sql)
-            {
-                return Database
-                    .FetchOneToMany<DictionaryDto>(x => x.LanguageTextDtos, sql);
-            }
-
-            protected override Sql<ISqlContext> GetBaseQuery(bool isCount)
-            {
-                return _dictionaryRepository.GetBaseQuery(isCount);
-            }
-
-            protected override string GetBaseWhereClause()
-            {
-                return "cmsDictionary." + SqlSyntax.GetQuotedColumnName("key") + " = @id";
-            }
-
-            protected override IDictionaryItem ConvertToEntity(DictionaryDto dto)
-            {
-                return _dictionaryRepository.ConvertFromDto(dto);
-            }
-
-            protected override object GetBaseWhereClauseArguments(string id)
-            {
-                return new { id = id };
-            }
-
-            protected override string GetWhereInClauseForGetAll()
-            {
-                return "cmsDictionary." + SqlSyntax.GetQuotedColumnName("key") + " in (@ids)";
-            }
-
-            protected override IRepositoryCachePolicy<IDictionaryItem, string> CreateCachePolicy(IRuntimeCacheProvider runtimeCache)
-            {
-                var options = new RepositoryCachePolicyOptions
-                {
-                    //allow zero to be cached
-                    GetAllCacheAllowZeroCount = true
-                };
-
-                return new SingleItemsOnlyRepositoryCachePolicy<IDictionaryItem, string>(runtimeCache, options);
-            }
-        }
-    }
-}
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using NPoco;
+using Umbraco.Core.Cache;
+using Umbraco.Core.Logging;
+using Umbraco.Core.Models;
+using Umbraco.Core.Models.EntityBase;
+using Umbraco.Core.Models.Rdbms;
+using Umbraco.Core.Persistence.Factories;
+using Umbraco.Core.Persistence.Querying;
+using Umbraco.Core.Persistence.UnitOfWork;
+
+namespace Umbraco.Core.Persistence.Repositories.Implement
+{
+    /// <summary>
+    /// Represents a repository for doing CRUD operations for <see cref="DictionaryItem"/>
+    /// </summary>
+    internal class DictionaryRepository : NPocoRepositoryBase<int, IDictionaryItem>, IDictionaryRepository
+    {
+        public DictionaryRepository(IScopeUnitOfWork work, CacheHelper cache, ILogger logger)
+            : base(work, cache, logger)
+        { }
+
+        protected override IRepositoryCachePolicy<IDictionaryItem, int> CreateCachePolicy(IRuntimeCacheProvider runtimeCache)
+        {
+            var options = new RepositoryCachePolicyOptions
+            {
+                //allow zero to be cached
+                GetAllCacheAllowZeroCount = true
+            };
+
+            return new SingleItemsOnlyRepositoryCachePolicy<IDictionaryItem, int>(runtimeCache, options);
+        }
+
+        #region Overrides of RepositoryBase<int,DictionaryItem>
+
+        protected override IDictionaryItem PerformGet(int id)
+        {
+            var sql = GetBaseQuery(false)
+                .Where(GetBaseWhereClause(), new { id = id })
+                .OrderBy<DictionaryDto>(x => x.UniqueId);
+
+            var dto = Database
+                .FetchOneToMany<DictionaryDto>(x => x.LanguageTextDtos, sql)
+                .FirstOrDefault();
+
+            if (dto == null)
+                return null;
+
+            var entity = ConvertFromDto(dto);
+
+            // reset dirty initial properties (U4-1946)
+            ((Entity)entity).ResetDirtyProperties(false);
+
+            return entity;
+        }
+
+        protected override IEnumerable<IDictionaryItem> PerformGetAll(params int[] ids)
+        {
+            var sql = GetBaseQuery(false).Where("cmsDictionary.pk > 0");
+            if (ids.Any())
+            {
+                sql.Where("cmsDictionary.pk in (@ids)", new { /*ids =*/ ids });
+            }
+
+            return Database
+                .FetchOneToMany<DictionaryDto>(x => x.LanguageTextDtos, sql)
+                .Select(ConvertFromDto);
+        }
+
+        protected override IEnumerable<IDictionaryItem> PerformGetByQuery(IQuery<IDictionaryItem> query)
+        {
+            var sqlClause = GetBaseQuery(false);
+            var translator = new SqlTranslator<IDictionaryItem>(sqlClause, query);
+            var sql = translator.Translate();
+            sql.OrderBy<DictionaryDto>(x => x.UniqueId);
+
+            return Database
+                .FetchOneToMany<DictionaryDto>(x => x.LanguageTextDtos, sql)
+                .Select(ConvertFromDto);
+        }
+
+        #endregion
+
+        #region Overrides of NPocoRepositoryBase<int,DictionaryItem>
+
+        protected override Sql<ISqlContext> GetBaseQuery(bool isCount)
+        {
+            var sql = Sql();
+            if (isCount)
+            {
+                sql.SelectCount()
+                    .From<DictionaryDto>();
+            }
+            else
+            {
+                sql.SelectAll()
+                   .From<DictionaryDto>()
+                   .LeftJoin<LanguageTextDto>()
+                   .On<DictionaryDto, LanguageTextDto>(left => left.UniqueId, right => right.UniqueId);
+            }
+            return sql;
+        }
+
+        protected override string GetBaseWhereClause()
+        {
+            return "cmsDictionary.pk = @id";
+        }
+
+        protected override IEnumerable<string> GetDeleteClauses()
+        {
+            return new List<string>();
+        }
+
+        protected override Guid NodeObjectTypeId
+        {
+            get { throw new NotImplementedException(); }
+        }
+
+        #endregion
+
+        #region Unit of Work Implementation
+
+        protected override void PersistNewItem(IDictionaryItem entity)
+        {
+            var dictionaryItem = ((DictionaryItem) entity);
+
+            dictionaryItem.AddingEntity();
+
+            foreach (var translation in dictionaryItem.Translations)
+                translation.Value = translation.Value.ToValidXmlString();
+
+            var factory = new DictionaryItemFactory();
+            var dto = factory.BuildDto(dictionaryItem);
+
+            var id = Convert.ToInt32(Database.Insert(dto));
+            dictionaryItem.Id = id;
+
+            var translationFactory = new DictionaryTranslationFactory(dictionaryItem.Key);
+            foreach (var translation in dictionaryItem.Translations)
+            {
+                var textDto = translationFactory.BuildDto(translation);
+                translation.Id = Convert.ToInt32(Database.Insert(textDto));
+                translation.Key = dictionaryItem.Key;
+            }
+
+            dictionaryItem.ResetDirtyProperties();
+        }
+
+        protected override void PersistUpdatedItem(IDictionaryItem entity)
+        {
+            ((Entity)entity).UpdatingEntity();
+
+            foreach (var translation in entity.Translations)
+                translation.Value = translation.Value.ToValidXmlString();
+
+            var factory = new DictionaryItemFactory();
+            var dto = factory.BuildDto(entity);
+
+            Database.Update(dto);
+
+            var translationFactory = new DictionaryTranslationFactory(entity.Key);
+            foreach (var translation in entity.Translations)
+            {
+                var textDto = translationFactory.BuildDto(translation);
+                if (translation.HasIdentity)
+                {
+                    Database.Update(textDto);
+                }
+                else
+                {
+                    translation.Id = Convert.ToInt32(Database.Insert(textDto));
+                    translation.Key = entity.Key;
+                }
+            }
+
+            entity.ResetDirtyProperties();
+
+            //Clear the cache entries that exist by uniqueid/item key
+            IsolatedCache.ClearCacheItem(RepositoryCacheKeys.GetKey<IDictionaryItem>(entity.ItemKey));
+            IsolatedCache.ClearCacheItem(RepositoryCacheKeys.GetKey<IDictionaryItem>(entity.Key));
+        }
+
+        protected override void PersistDeletedItem(IDictionaryItem entity)
+        {
+            RecursiveDelete(entity.Key);
+
+            Database.Delete<LanguageTextDto>("WHERE UniqueId = @Id", new { Id = entity.Key });
+            Database.Delete<DictionaryDto>("WHERE id = @Id", new { Id = entity.Key });
+
+            //Clear the cache entries that exist by uniqueid/item key
+            IsolatedCache.ClearCacheItem(RepositoryCacheKeys.GetKey<IDictionaryItem>(entity.ItemKey));
+            IsolatedCache.ClearCacheItem(RepositoryCacheKeys.GetKey<IDictionaryItem>(entity.Key));
+
+            entity.DeletedDate = DateTime.Now;
+        }
+
+        private void RecursiveDelete(Guid parentId)
+        {
+            var list = Database.Fetch<DictionaryDto>("WHERE parent = @ParentId", new { ParentId = parentId });
+            foreach (var dto in list)
+            {
+                RecursiveDelete(dto.UniqueId);
+
+                Database.Delete<LanguageTextDto>("WHERE UniqueId = @Id", new { Id = dto.UniqueId });
+                Database.Delete<DictionaryDto>("WHERE id = @Id", new { Id = dto.UniqueId });
+
+                //Clear the cache entries that exist by uniqueid/item key
+                IsolatedCache.ClearCacheItem(RepositoryCacheKeys.GetKey<IDictionaryItem>(dto.Key));
+                IsolatedCache.ClearCacheItem(RepositoryCacheKeys.GetKey<IDictionaryItem>(dto.UniqueId));
+            }
+        }
+
+        #endregion
+
+        protected IDictionaryItem ConvertFromDto(DictionaryDto dto)
+        {
+            var factory = new DictionaryItemFactory();
+            var entity = factory.BuildEntity(dto);
+
+            var f = new DictionaryTranslationFactory(dto.UniqueId);
+            entity.Translations = dto.LanguageTextDtos.EmptyNull()
+                .Where(x => x.LanguageId > 0)
+                .Select(x => f.BuildEntity(x))
+                .ToList();
+
+            return entity;
+        }
+
+        public IDictionaryItem Get(Guid uniqueId)
+        {
+            var uniqueIdRepo = new DictionaryByUniqueIdRepository(this, UnitOfWork, GlobalCache, Logger);
+            return uniqueIdRepo.Get(uniqueId);
+        }
+
+        public IDictionaryItem Get(string key)
+        {
+            var keyRepo = new DictionaryByKeyRepository(this, UnitOfWork, GlobalCache, Logger);
+            return keyRepo.Get(key);
+        }
+
+        private IEnumerable<IDictionaryItem> GetRootDictionaryItems()
+        {
+            var query = Query<IDictionaryItem>().Where(x => x.ParentId == null);
+            return Get(query);
+        }
+
+        public Dictionary<string, Guid> GetDictionaryItemKeyMap()
+        {
+            var columns = new[] { "key", "id" }.Select(x => (object) SqlSyntax.GetQuotedColumnName(x)).ToArray();
+            var sql = Sql().Select(columns).From<DictionaryDto>();
+            return Database.Fetch<DictionaryItemKeyIdDto>(sql).ToDictionary(x => x.Key, x => x.Id);
+        }
+
+        private class DictionaryItemKeyIdDto
+        {
+            public string Key { get; set; }
+            public Guid Id { get; set; }
+        }
+
+        public IEnumerable<IDictionaryItem> GetDictionaryItemDescendants(Guid? parentId)
+        {
+            //This methods will look up children at each level, since we do not store a path for dictionary (ATM), we need to do a recursive
+            // lookup to get descendants. Currently this is the most efficient way to do it
+
+            Func<Guid[], IEnumerable<IEnumerable<IDictionaryItem>>> getItemsFromParents = guids =>
+            {
+                //needs to be in groups of 2000 because we are doing an IN clause and there's a max parameter count that can be used.
+                return guids.InGroupsOf(2000)
+                    .Select(@group =>
+                    {
+                        var sqlClause = GetBaseQuery(false)
+                            .Where<DictionaryDto>(x => x.Parent != null)
+                            .Where($"{SqlSyntax.GetQuotedColumnName("parent")} IN (@parentIds)", new { parentIds = @group });
+
+                        var translator = new SqlTranslator<IDictionaryItem>(sqlClause, Query<IDictionaryItem>());
+                        var sql = translator.Translate();
+                        sql.OrderBy<DictionaryDto>(x => x.UniqueId);
+
+                        return Database
+                            .FetchOneToMany<DictionaryDto>(x=> x.LanguageTextDtos, sql)
+                            .Select(ConvertFromDto);
+                    });
+            };
+
+            var childItems = parentId.HasValue == false
+                ? new[] { GetRootDictionaryItems() }
+                : getItemsFromParents(new[] { parentId.Value });
+
+            return childItems.SelectRecursive(items => getItemsFromParents(items.Select(x => x.Key).ToArray())).SelectMany(items => items);
+
+        }
+
+        private class DictionaryByUniqueIdRepository : SimpleGetRepository<Guid, IDictionaryItem, DictionaryDto>
+        {
+            private IRepositoryCachePolicy<IDictionaryItem, Guid> _cachePolicy;
+            private readonly DictionaryRepository _dictionaryRepository;
+
+            public DictionaryByUniqueIdRepository(DictionaryRepository dictionaryRepository, IScopeUnitOfWork work, CacheHelper cache, ILogger logger)
+                : base(work, cache, logger)
+            {
+                _dictionaryRepository = dictionaryRepository;
+            }
+
+            protected override IEnumerable<DictionaryDto> PerformFetch(Sql sql)
+            {
+                return Database
+                    .FetchOneToMany<DictionaryDto>(x => x.LanguageTextDtos, sql);
+            }
+
+            protected override Sql<ISqlContext> GetBaseQuery(bool isCount)
+            {
+                return _dictionaryRepository.GetBaseQuery(isCount);
+            }
+
+            protected override string GetBaseWhereClause()
+            {
+                return "cmsDictionary." + SqlSyntax.GetQuotedColumnName("id") + " = @id";
+            }
+
+            protected override IDictionaryItem ConvertToEntity(DictionaryDto dto)
+            {
+                return _dictionaryRepository.ConvertFromDto(dto);
+            }
+
+            protected override object GetBaseWhereClauseArguments(Guid id)
+            {
+                return new { id = id };
+            }
+
+            protected override string GetWhereInClauseForGetAll()
+            {
+                return "cmsDictionary." + SqlSyntax.GetQuotedColumnName("id") + " in (@ids)";
+            }
+
+            protected override IRepositoryCachePolicy<IDictionaryItem, Guid> CreateCachePolicy(IRuntimeCacheProvider runtimeCache)
+            {
+                var options = new RepositoryCachePolicyOptions
+                {
+                    //allow zero to be cached
+                    GetAllCacheAllowZeroCount = true
+                };
+
+                return new SingleItemsOnlyRepositoryCachePolicy<IDictionaryItem, Guid>(runtimeCache, options);
+            }
+        }
+
+        private class DictionaryByKeyRepository : SimpleGetRepository<string, IDictionaryItem, DictionaryDto>
+        {
+            private IRepositoryCachePolicy<IDictionaryItem, string> _cachePolicy;
+            private readonly DictionaryRepository _dictionaryRepository;
+
+            public DictionaryByKeyRepository(DictionaryRepository dictionaryRepository, IScopeUnitOfWork work, CacheHelper cache, ILogger logger)
+                : base(work, cache, logger)
+            {
+                _dictionaryRepository = dictionaryRepository;
+            }
+
+            protected override IEnumerable<DictionaryDto> PerformFetch(Sql sql)
+            {
+                return Database
+                    .FetchOneToMany<DictionaryDto>(x => x.LanguageTextDtos, sql);
+            }
+
+            protected override Sql<ISqlContext> GetBaseQuery(bool isCount)
+            {
+                return _dictionaryRepository.GetBaseQuery(isCount);
+            }
+
+            protected override string GetBaseWhereClause()
+            {
+                return "cmsDictionary." + SqlSyntax.GetQuotedColumnName("key") + " = @id";
+            }
+
+            protected override IDictionaryItem ConvertToEntity(DictionaryDto dto)
+            {
+                return _dictionaryRepository.ConvertFromDto(dto);
+            }
+
+            protected override object GetBaseWhereClauseArguments(string id)
+            {
+                return new { id = id };
+            }
+
+            protected override string GetWhereInClauseForGetAll()
+            {
+                return "cmsDictionary." + SqlSyntax.GetQuotedColumnName("key") + " in (@ids)";
+            }
+
+            protected override IRepositoryCachePolicy<IDictionaryItem, string> CreateCachePolicy(IRuntimeCacheProvider runtimeCache)
+            {
+                var options = new RepositoryCachePolicyOptions
+                {
+                    //allow zero to be cached
+                    GetAllCacheAllowZeroCount = true
+                };
+
+                return new SingleItemsOnlyRepositoryCachePolicy<IDictionaryItem, string>(runtimeCache, options);
+            }
+        }
+    }
+}
diff --git a/src/Umbraco.Core/Persistence/Repositories/ContentBlueprintRepository.cs b/src/Umbraco.Core/Persistence/Repositories/Implement/DocumentBlueprintRepository.cs
similarity index 70%
rename from src/Umbraco.Core/Persistence/Repositories/ContentBlueprintRepository.cs
rename to src/Umbraco.Core/Persistence/Repositories/Implement/DocumentBlueprintRepository.cs
index 227e5e7170..98de1179e4 100644
--- a/src/Umbraco.Core/Persistence/Repositories/ContentBlueprintRepository.cs
+++ b/src/Umbraco.Core/Persistence/Repositories/Implement/DocumentBlueprintRepository.cs
@@ -2,10 +2,9 @@
 using Umbraco.Core.Cache;
 using Umbraco.Core.Configuration.UmbracoSettings;
 using Umbraco.Core.Logging;
-using Umbraco.Core.Persistence.Repositories.Interfaces;
 using Umbraco.Core.Persistence.UnitOfWork;
 
-namespace Umbraco.Core.Persistence.Repositories
+namespace Umbraco.Core.Persistence.Repositories.Implement
 {
     /// <summary>
     /// Override the base content repository so we can change the node object type
@@ -16,9 +15,9 @@ namespace Umbraco.Core.Persistence.Repositories
     ///
     /// TODO: Create a helper method to contain most of the underlying logic for the ContentRepository
     /// </remarks>
-    internal class ContentBlueprintRepository : ContentRepository, IContentBlueprintRepository
+    internal class DocumentBlueprintRepository : DocumentRepository, IDocumentBlueprintRepository
     {
-        public ContentBlueprintRepository(IScopeUnitOfWork work, CacheHelper cacheHelper, ILogger logger, IContentTypeRepository contentTypeRepository, ITemplateRepository templateRepository, ITagRepository tagRepository, IContentSection settings)
+        public DocumentBlueprintRepository(IScopeUnitOfWork work, CacheHelper cacheHelper, ILogger logger, IContentTypeRepository contentTypeRepository, ITemplateRepository templateRepository, ITagRepository tagRepository, IContentSection settings)
             : base(work, cacheHelper, logger, contentTypeRepository, templateRepository, tagRepository, settings)
         {
             EnsureUniqueNaming = false; // duplicates are allowed
diff --git a/src/Umbraco.Core/Persistence/Repositories/ContentRepository.cs b/src/Umbraco.Core/Persistence/Repositories/Implement/DocumentRepository.cs
similarity index 94%
rename from src/Umbraco.Core/Persistence/Repositories/ContentRepository.cs
rename to src/Umbraco.Core/Persistence/Repositories/Implement/DocumentRepository.cs
index 5d966a8009..9e4796a049 100644
--- a/src/Umbraco.Core/Persistence/Repositories/ContentRepository.cs
+++ b/src/Umbraco.Core/Persistence/Repositories/Implement/DocumentRepository.cs
@@ -1,865 +1,864 @@
-using NPoco;
-using System;
-using System.Collections.Generic;
-using System.Diagnostics;
-using System.Linq;
-using Umbraco.Core.Cache;
-using Umbraco.Core.Configuration.UmbracoSettings;
-using Umbraco.Core.Exceptions;
-using Umbraco.Core.Logging;
-using Umbraco.Core.Models;
-using Umbraco.Core.Models.Membership;
-using Umbraco.Core.Models.Rdbms;
-using Umbraco.Core.Persistence.DatabaseModelDefinitions;
-using Umbraco.Core.Persistence.Factories;
-using Umbraco.Core.Persistence.Querying;
-using Umbraco.Core.Persistence.SqlSyntax;
-using Umbraco.Core.Persistence.UnitOfWork;
-
-namespace Umbraco.Core.Persistence.Repositories
-{
-    /// <summary>
-    /// Represents a repository for doing CRUD operations for <see cref="IContent"/>.
-    /// </summary>
-    internal class ContentRepository : RecycleBinRepository<int, IContent, ContentRepository>, IContentRepository
-    {
-        private readonly IContentTypeRepository _contentTypeRepository;
-        private readonly ITemplateRepository _templateRepository;
-        private readonly ITagRepository _tagRepository;
-        private readonly CacheHelper _cacheHelper;
-        private PermissionRepository<IContent> _permissionRepository;
-        private readonly ContentByGuidReadRepository _contentByGuidReadRepository;
-
-        public ContentRepository(IScopeUnitOfWork work, CacheHelper cacheHelper, ILogger logger, IContentTypeRepository contentTypeRepository, ITemplateRepository templateRepository, ITagRepository tagRepository, IContentSection settings)
-            : base(work, cacheHelper, logger)
-        {
-            _contentTypeRepository = contentTypeRepository ?? throw new ArgumentNullException(nameof(contentTypeRepository));
-            _templateRepository = templateRepository ?? throw new ArgumentNullException(nameof(templateRepository));
-            _tagRepository = tagRepository ?? throw new ArgumentNullException(nameof(tagRepository));
-            _cacheHelper = cacheHelper;
-            _contentByGuidReadRepository = new ContentByGuidReadRepository(this, work, cacheHelper, logger);
-            EnsureUniqueNaming = settings.EnsureUniqueNaming;
-        }
-
-        protected override ContentRepository This => this;
-
-        public bool EnsureUniqueNaming { get; set; }
-
-        // note: is ok to 'new' the repo here as it's a sub-repo really
-        private PermissionRepository<IContent> PermissionRepository => _permissionRepository
-            ?? (_permissionRepository = new PermissionRepository<IContent>(UnitOfWork, _cacheHelper, Logger));
-
-        #region Repository Base
-
-        protected override Guid NodeObjectTypeId => Constants.ObjectTypes.Document;
-
-        protected override IContent PerformGet(int id)
-        {
-            var sql = GetBaseQuery(QueryType.Single)
-                .Where<NodeDto>(x => x.NodeId == id)
-                .SelectTop(1);
-
-            var dto = Database.Fetch<DocumentDto>(sql).FirstOrDefault();
-            return dto == null
-                ? null
-                : MapDtoToContent(dto);
-        }
-
-        protected override IEnumerable<IContent> PerformGetAll(params int[] ids)
-        {
-            var sql = GetBaseQuery(QueryType.Many);
-
-            if (ids.Any())
-                sql.WhereIn<NodeDto>(x => x.NodeId, ids);
-
-            return MapDtosToContent(Database.Fetch<DocumentDto>(sql));
-        }
-
-        protected override IEnumerable<IContent> PerformGetByQuery(IQuery<IContent> query)
-        {
-            var sqlClause = GetBaseQuery(QueryType.Many);
-
-            var translator = new SqlTranslator<IContent>(sqlClause, query);
-            var sql = translator.Translate();
-
-            sql // fixme why?
-                .OrderBy<NodeDto>(x => x.Level)
-                .OrderBy<NodeDto>(x => x.SortOrder);
-
-            return MapDtosToContent(Database.Fetch<DocumentDto>(sql));
-        }
-
-        protected override Sql<ISqlContext> GetBaseQuery(QueryType queryType)
-        {
-            return GetBaseQuery(queryType, true);
-        }
-
-        protected virtual Sql<ISqlContext> GetBaseQuery(QueryType queryType, bool current)
-        {
-            var sql = SqlContext.Sql();
-
-            switch (queryType)
-            {
-                case QueryType.Count:
-                    sql = sql.SelectCount();
-                    break;
-                case QueryType.Ids:
-                    sql = sql.Select<DocumentDto>(x => x.NodeId);
-                    break;
-                case QueryType.Single:
-                case QueryType.Many:
-                    sql = sql.Select<DocumentDto>(r =>
-                        r.Select(documentDto => documentDto.ContentDto, r1 =>
-                            r1.Select(contentDto => contentDto.NodeDto))
-                         .Select(documentDto => documentDto.DocumentVersionDto, r1 =>
-                            r1.Select(documentVersionDto => documentVersionDto.ContentVersionDto))
-                         .Select(documentDto => documentDto.PublishedVersionDto, "pdv", r1 =>
-                            r1.Select(documentVersionDto => documentVersionDto.ContentVersionDto, "pcv")));
-                    break;
-            }
-
-            sql
-                .From<DocumentDto>()
-                .InnerJoin<ContentDto>().On<DocumentDto, ContentDto>(left => left.NodeId, right => right.NodeId)
-                .InnerJoin<NodeDto>().On<ContentDto, NodeDto>(left => left.NodeId, right => right.NodeId)
-
-                // inner join on mandatory edited version
-                .InnerJoin<ContentVersionDto>().On<DocumentDto, ContentVersionDto>((left, right) => left.NodeId == right.NodeId)
-                .InnerJoin<DocumentVersionDto>().On<ContentVersionDto, DocumentVersionDto>((left, right) => left.Id == right.Id)
-
-                // left join on optional published version
-                .LeftJoin<ContentVersionDto>(nested =>
-                        nested.InnerJoin<DocumentVersionDto>("pdv").On<ContentVersionDto, DocumentVersionDto>((left, right) => left.Id == right.Id && right.Published, "pcv", "pdv"), "pcv")
-                    .On<DocumentDto, ContentVersionDto>((left, right) => left.NodeId == right.NodeId, aliasRight: "pcv");
-
-            sql
-                .Where<NodeDto>(x => x.NodeObjectType == NodeObjectTypeId);
-
-            // this would ensure we don't get the published version - keep for reference
-            //sql
-            //    .WhereAny(
-            //        x => x.Where<ContentVersionDto, ContentVersionDto>((x1, x2) => x1.Id != x2.Id, alias2: "pcv"),
-            //        x => x.WhereNull<ContentVersionDto>(x1 => x1.Id, "pcv")
-            //    );
-
-            if (current)
-                sql.Where<ContentVersionDto>(x => x.Current); // always get the current version
-
-            return sql;
-        }
-
-        // fixme - kill, eventually
-        protected override Sql<ISqlContext> GetBaseQuery(bool isCount)
-        {
-            return GetBaseQuery(isCount ? QueryType.Count : QueryType.Single);
-        }
-
-        // fixme - kill, eventually
-        // ah maybe not, that what's used for eg Exists in base repo
-        protected override string GetBaseWhereClause()
-        {
-            return $"{Constants.DatabaseSchema.Tables.Node}.id = @id";
-        }
-
-        protected override IEnumerable<string> GetDeleteClauses()
-        {
-            var list = new List<string>
-            {
-                "DELETE FROM " + Constants.DatabaseSchema.Tables.RedirectUrl + " WHERE contentKey IN (SELECT uniqueId FROM " + Constants.DatabaseSchema.Tables.Node + " WHERE id = @id)",
-                "DELETE FROM " + Constants.DatabaseSchema.Tables.Task + " WHERE nodeId = @id",
-                "DELETE FROM " + Constants.DatabaseSchema.Tables.User2NodeNotify + " WHERE nodeId = @id",
-                "DELETE FROM " + Constants.DatabaseSchema.Tables.UserGroup2NodePermission + " WHERE nodeId = @id",
-                "DELETE FROM " + Constants.DatabaseSchema.Tables.UserStartNode + " WHERE startNode = @id",
-                "UPDATE " + Constants.DatabaseSchema.Tables.UserGroup + " SET startContentId = NULL WHERE startContentId = @id",
-                "DELETE FROM " + Constants.DatabaseSchema.Tables.Relation + " WHERE parentId = @id",
-                "DELETE FROM " + Constants.DatabaseSchema.Tables.Relation + " WHERE childId = @id",
-                "DELETE FROM " + Constants.DatabaseSchema.Tables.TagRelationship + " WHERE nodeId = @id",
-                "DELETE FROM " + Constants.DatabaseSchema.Tables.Domain + " WHERE domainRootStructureID = @id",
-                "DELETE FROM " + Constants.DatabaseSchema.Tables.Document + " WHERE nodeId = @id",
-                "DELETE FROM " + Constants.DatabaseSchema.Tables.DocumentVersion + " WHERE id IN (SELECT id FROM " + Constants.DatabaseSchema.Tables.ContentVersion + " WHERE nodeId = @id)",
-                "DELETE FROM " + Constants.DatabaseSchema.Tables.PropertyData + " WHERE versionId IN (SELECT id FROM " + Constants.DatabaseSchema.Tables.ContentVersion + " WHERE nodeId = @id)",
-                "DELETE FROM cmsPreviewXml WHERE nodeId = @id",
-                "DELETE FROM " + Constants.DatabaseSchema.Tables.ContentVersion + " WHERE nodeId = @id",
-                "DELETE FROM cmsContentXml WHERE nodeId = @id",
-                "DELETE FROM " + Constants.DatabaseSchema.Tables.Content + " WHERE nodeId = @id",
-                "DELETE FROM " + Constants.DatabaseSchema.Tables.Access + " WHERE nodeId = @id",
-                "DELETE FROM " + Constants.DatabaseSchema.Tables.Node + " WHERE id = @id"
-            };
-            return list;
-        }
-
-        #endregion
-
-        #region Versions
-
-        public override IEnumerable<IContent> GetAllVersions(int nodeId)
-        {
-            var sql = GetBaseQuery(QueryType.Many, false)
-                .Where<NodeDto>(x => x.NodeId == nodeId)
-                .OrderByDescending<ContentVersionDto>(x => x.Current)
-                .AndByDescending<ContentVersionDto>(x => x.VersionDate);
-
-            return MapDtosToContent(Database.Fetch<DocumentDto>(sql), true);
-        }
-
-        public override IContent GetVersion(int versionId)
-        {
-            var sql = GetBaseQuery(QueryType.Single, false)
-                .Where<ContentVersionDto>(x => x.Id == versionId);
-
-            var dto = Database.Fetch<DocumentDto>(sql).FirstOrDefault();
-            return dto == null ? null : MapDtoToContent(dto);
-        }
-
-        protected override void PerformDeleteVersion(int id, int versionId)
-        {
-            // raise event first else potential FK issues
-            OnUowRemovingVersion(new UnitOfWorkVersionEventArgs(UnitOfWork, id, versionId));
-
-            // fixme - syntax + ...
-            Database.Delete<PropertyDataDto>("WHERE versionId = @versionId", new { versionId });
-            Database.Delete<ContentVersionDto>("WHERE id = @versionId", new { versionId });
-            Database.Delete<DocumentVersionDto>("WHERE id = @versionId", new { versionId });
-        }
-
-        #endregion
-
-        #region Persist
-
-        protected override void PersistNewItem(IContent entity)
-        {
-            var content = (Content) entity;
-
-            content.AddingEntity();
-            var publishing = content.PublishedState == PublishedState.Publishing;
-
-            // ensure that the default template is assigned
-            if (entity.Template == null)
-                entity.Template = entity.ContentType.DefaultTemplate;
-
-            // ensure unique name on the same level
-            entity.Name = EnsureUniqueNodeName(entity.ParentId, entity.Name);
-
-            // ensure that strings don't contain characters that are invalid in xml
-            // fixme - do we really want to keep doing this here?
-            entity.SanitizeEntityPropertiesForXmlStorage();
-
-            // create the dto
-            var dto = ContentBaseFactory.BuildDto(entity, NodeObjectTypeId);
-
-            // derive path and level from parent
-            var parent = GetParentNodeDto(entity.ParentId);
-            var level = parent.Level + 1;
-
-            // get sort order
-            var sortOrder = GetNewChildSortOrder(entity.ParentId, 0);
-
-            // persist the node dto
-            var nodeDto = dto.ContentDto.NodeDto;
-            nodeDto.Path = parent.Path;
-            nodeDto.Level = Convert.ToInt16(level);
-            nodeDto.SortOrder = sortOrder;
-
-            // see if there's a reserved identifier for this unique id
-            // and then either update or insert the node dto
-            var id = GetReservedId(nodeDto.UniqueId);
-            if (id > 0)
-                nodeDto.NodeId = id;
-            else
-                Database.Insert(nodeDto);
-
-            nodeDto.Path = string.Concat(parent.Path, ",", nodeDto.NodeId);
-            nodeDto.ValidatePathWithException();
-            Database.Update(nodeDto);
-
-            // update entity
-            entity.Id = nodeDto.NodeId;
-            entity.Path = nodeDto.Path;
-            entity.SortOrder = sortOrder;
-            entity.Level = level;
-
-            // persist the content dto
-            var contentDto = dto.ContentDto;
-            contentDto.NodeId = nodeDto.NodeId;
-            Database.Insert(contentDto);
-
-            // persist the content version dto
-            var contentVersionDto = dto.DocumentVersionDto.ContentVersionDto;
-            contentVersionDto.NodeId = nodeDto.NodeId;
-            contentVersionDto.Current = !publishing;
-            Database.Insert(contentVersionDto);
-            content.VersionId = contentVersionDto.Id;
-
-            // persist the document version dto
-            var documentVersionDto = dto.DocumentVersionDto;
-            documentVersionDto.Id = content.VersionId;
-            if (publishing)
-                documentVersionDto.Published = true;
-            Database.Insert(documentVersionDto);
-
-            // and again in case we're publishing immediately
-            if (publishing)
-            {
-                content.PublishedVersionId = content.VersionId;
-                contentVersionDto.Id = 0;
-                contentVersionDto.Current = true;
-                Database.Insert(contentVersionDto);
-                content.VersionId = contentVersionDto.Id;
-
-                documentVersionDto.Id = content.VersionId;
-                documentVersionDto.Published = false;
-                Database.Insert(documentVersionDto);
-            }
-
-            // persist the property data
-            var propertyDataDtos = PropertyFactory.BuildDtos(content.VersionId, content.PublishedVersionId, entity.Properties, out var edited);
-            foreach (var propertyDataDto in propertyDataDtos)
-                Database.Insert(propertyDataDto);
-
-            // persist the document dto
-            // at that point, when publishing, the entity still has its old Published value
-            // so we need to explicitely update the dto to persist the correct value
-            if (content.PublishedState == PublishedState.Publishing)
-                dto.Published = true;
-            dto.NodeId = nodeDto.NodeId;
-            content.Edited = dto.Edited = !dto.Published || edited; // if not published, always edited
-            Database.Insert(dto);
-
-            // trigger here, before we reset Published etc
-            OnUowRefreshedEntity(new UnitOfWorkEntityEventArgs(UnitOfWork, entity));
-
-            // flip the entity's published property
-            // this also flips its published state
-            if (content.PublishedState == PublishedState.Publishing)
-            {
-                content.Published = true;
-                content.PublishName = content.Name;
-                content.PublishTemplate = content.Template;
-                content.PublisherId = content.WriterId;
-                content.PublishDate = content.UpdateDate;
-            }
-            else if (content.PublishedState == PublishedState.Unpublishing)
-            {
-                content.Published = false;
-                content.PublishName = null;
-                content.PublishTemplate = null;
-                content.PublisherId = null;
-                content.PublishDate = null;
-            }
-
-            // if published, set tags accordingly
-            if (entity.Published)
-                UpdateEntityTags(entity, _tagRepository);
-
-            entity.ResetDirtyProperties();
-
-            // troubleshooting
-            //if (Database.ExecuteScalar<int>("SELECT COUNT(*) FROM uDocumentVersion JOIN uContentVersion ON uDocumentVersion.id=uContentVersion.id WHERE published=1 AND nodeId=" + content.Id) > 1)
-            //{
-            //    Debugger.Break();
-            //    throw new Exception("oops");
-            //}
-            //if (Database.ExecuteScalar<int>("SELECT COUNT(*) FROM uDocumentVersion JOIN uContentVersion ON uDocumentVersion.id=uContentVersion.id WHERE [current]=1 AND nodeId=" + content.Id) > 1)
-            //{
-            //    Debugger.Break();
-            //    throw new Exception("oops");
-            //}
-        }
-
-        protected override void PersistUpdatedItem(IContent entity)
-        {
-            var content = (Content) entity;
-
-            // check if we need to make any database changes at all
-            if ((content.PublishedState == PublishedState.Published || content.PublishedState == PublishedState.Unpublished) && !content.IsEntityDirty() && !content.IsAnyUserPropertyDirty())
-                return; // no change to save, do nothing, don't even update dates
-
-            // whatever we do, we must check that we are saving the current version
-            // fixme maybe we can just fetch Current (bool)
-            var version = Database.Fetch<ContentVersionDto>(SqlContext.Sql().Select<ContentVersionDto>().From<ContentVersionDto>().Where<ContentVersionDto>(x => x.Id == content.VersionId)).FirstOrDefault();
-            if (version == null || !version.Current )
-                throw new InvalidOperationException("Cannot save a non-current version.");
-
-            // update
-            content.UpdatingEntity();
-            var publishing = content.PublishedState == PublishedState.Publishing;
-
-            // check if we need to create a new version
-            if (publishing && content.PublishedVersionId > 0)
-            {
-                // published version is not published anymore
-                Database.Execute(Sql().Update<DocumentVersionDto>(u => u.Set(x => x.Published, false)).Where<DocumentVersionDto>(x => x.Id == content.PublishedVersionId));
-            }
-
-            // ensure unique name on the same level
-            entity.Name = EnsureUniqueNodeName(entity.ParentId, entity.Name, entity.Id);
-
-            // ensure that strings don't contain characters that are invalid in xml
-            // fixme - do we really want to keep doing this here?
-            entity.SanitizeEntityPropertiesForXmlStorage();
-
-            // if parent has changed, get path, level and sort order
-            if (entity.IsPropertyDirty("ParentId"))
-            {
-                var parent = GetParentNodeDto(entity.ParentId);
-                entity.Path = string.Concat(parent.Path, ",", entity.Id);
-                entity.Level = parent.Level + 1;
-                entity.SortOrder = GetNewChildSortOrder(entity.ParentId, 0);
-            }
-
-            // create the dto
-            var dto = ContentBaseFactory.BuildDto(entity, NodeObjectTypeId);
-
-            // update the node dto
-            var nodeDto = dto.ContentDto.NodeDto;
-            nodeDto.ValidatePathWithException();
-            Database.Update(nodeDto);
-
-            // update the content dto
-            Database.Update(dto.ContentDto);
-
-            // update the content & document version dtos
-            var contentVersionDto = dto.DocumentVersionDto.ContentVersionDto;
-            var documentVersionDto = dto.DocumentVersionDto;
-            if (publishing)
-            {
-                documentVersionDto.Published = true; // now published
-                contentVersionDto.Current = false; // no more current
-            }
-            Database.Update(contentVersionDto);
-            Database.Update(documentVersionDto);
-
-            // and, if publishing, insert new content & document version dtos
-            if (publishing)
-            {
-                content.PublishedVersionId = content.VersionId;
-
-                contentVersionDto.Id = 0; // want a new id
-                contentVersionDto.Current = true; // current version
-                Database.Insert(contentVersionDto);
-                content.VersionId = documentVersionDto.Id = contentVersionDto.Id; // get the new id
-
-                documentVersionDto.Published = false; // non-published version
-                Database.Insert(documentVersionDto);
-            }
-
-            // replace the property data
-            var pdataToDelete = publishing ? new[] { content.VersionId, content.PublishedVersionId } : new[] { content.VersionId };
-            var deletePropertyDataSql = SqlContext.Sql().Delete<PropertyDataDto>().WhereIn<PropertyDataDto>(x => x.VersionId, pdataToDelete);
-            Database.Execute(deletePropertyDataSql);
-
-            var propertyDataDtos = PropertyFactory.BuildDtos(content.VersionId, publishing ? content.PublishedVersionId : 0, entity.Properties, out var edited);
-            foreach (var propertyDataDto in propertyDataDtos)
-                Database.Insert(propertyDataDto);
-
-            // update the document dto
-            // at that point, when un/publishing, the entity still has its old Published value
-            // so we need to explicitely update the dto to persist the correct value
-            if (content.PublishedState == PublishedState.Publishing)
-                dto.Published = true;
-            else if (content.PublishedState == PublishedState.Unpublishing)
-                dto.Published = false;
-            content.Edited = dto.Edited = !dto.Published || edited; // if not published, always edited
-            Database.Update(dto);
-
-            // if entity is publishing, update tags, else leave tags there
-            // means that implicitely unpublished, or trashed, entities *still* have tags in db
-            if (content.PublishedState == PublishedState.Publishing)
-                UpdateEntityTags(entity, _tagRepository);
-
-            // trigger here, before we reset Published etc
-            OnUowRefreshedEntity(new UnitOfWorkEntityEventArgs(UnitOfWork, entity));
-
-            // flip the entity's published property
-            // this also flips its published state
-            if (content.PublishedState == PublishedState.Publishing)
-            {
-                content.Published = true;
-                content.PublishName = content.Name;
-                content.PublishTemplate = content.Template;
-                content.PublisherId = content.WriterId;
-                content.PublishDate = content.UpdateDate;
-            }
-            else if (content.PublishedState == PublishedState.Unpublishing)
-            {
-                content.Published = false;
-                content.PublishName = null;
-                content.PublishTemplate = null;
-                content.PublisherId = null;
-                content.PublishDate = null;
-            }
-
-            entity.ResetDirtyProperties();
-
-            // troubleshooting
-            //if (Database.ExecuteScalar<int>("SELECT COUNT(*) FROM uDocumentVersion JOIN uContentVersion ON uDocumentVersion.id=uContentVersion.id WHERE published=1 AND nodeId=" + content.Id) > 1)
-            //{
-            //    Debugger.Break();
-            //    throw new Exception("oops");
-            //}
-            //if (Database.ExecuteScalar<int>("SELECT COUNT(*) FROM uDocumentVersion JOIN uContentVersion ON uDocumentVersion.id=uContentVersion.id WHERE [current]=1 AND nodeId=" + content.Id) > 1)
-            //{
-            //    Debugger.Break();
-            //    throw new Exception("oops");
-            //}
-        }
-
-        protected override void PersistDeletedItem(IContent entity)
-        {
-            // raise event first else potential FK issues
-            OnUowRemovingEntity(new UnitOfWorkEntityEventArgs(UnitOfWork, entity));
-
-            //We need to clear out all access rules but we need to do this in a manual way since
-            // nothing in that table is joined to a content id
-            var subQuery = SqlContext.Sql()
-                .Select<AccessRuleDto>(x => x.AccessId)
-                .From<AccessRuleDto>()
-                .InnerJoin<AccessDto>()
-                .On<AccessRuleDto, AccessDto>(left => left.AccessId, right => right.Id)
-                .Where<AccessDto>(dto => dto.NodeId == entity.Id);
-            Database.Execute(SqlContext.SqlSyntax.GetDeleteSubquery("umbracoAccessRule", "accessId", subQuery));
-
-            //now let the normal delete clauses take care of everything else
-            base.PersistDeletedItem(entity);
-        }
-
-        #endregion
-
-        #region Content Repository
-
-        public int CountPublished(string contentTypeAlias = null)
-        {
-            var sql = SqlContext.Sql();
-            if (contentTypeAlias.IsNullOrWhiteSpace())
-            {
-                sql.SelectCount()
-                    .From<NodeDto>()
-                    .InnerJoin<DocumentDto>()
-                    .On<NodeDto, DocumentDto>(left => left.NodeId, right => right.NodeId)
-                    .Where<NodeDto>(x => x.NodeObjectType == NodeObjectTypeId && x.Trashed == false)
-                    .Where<DocumentDto>(x => x.Published);
-            }
-            else
-            {
-                sql.SelectCount()
-                    .From<NodeDto>()
-                    .InnerJoin<ContentDto>()
-                    .On<NodeDto, ContentDto>(left => left.NodeId, right => right.NodeId)
-                    .InnerJoin<DocumentDto>()
-                    .On<NodeDto, DocumentDto>(left => left.NodeId, right => right.NodeId)
-                    .InnerJoin<ContentTypeDto>()
-                    .On<ContentTypeDto, ContentDto>(left => left.NodeId, right => right.ContentTypeId)
-                    .Where<NodeDto>(x => x.NodeObjectType == NodeObjectTypeId && x.Trashed == false)
-                    .Where<ContentTypeDto>(x => x.Alias == contentTypeAlias)
-                    .Where<DocumentDto>(x => x.Published);
-            }
-
-            return Database.ExecuteScalar<int>(sql);
-        }
-
-        public void ReplaceContentPermissions(EntityPermissionSet permissionSet)
-        {
-            PermissionRepository.ReplaceEntityPermissions(permissionSet);
-        }
-
-        /// <summary>
-        /// Assigns a single permission to the current content item for the specified group ids
-        /// </summary>
-        /// <param name="entity"></param>
-        /// <param name="permission"></param>
-        /// <param name="groupIds"></param>
-        public void AssignEntityPermission(IContent entity, char permission, IEnumerable<int> groupIds)
-        {
-            PermissionRepository.AssignEntityPermission(entity, permission, groupIds);
-        }
-
-        public EntityPermissionCollection GetPermissionsForEntity(int entityId)
-        {
-            return PermissionRepository.GetPermissionsForEntity(entityId);
-        }
-
-        /// <summary>
-        /// Used to add/update a permission for a content item
-        /// </summary>
-        /// <param name="permission"></param>
-        public void AddOrUpdatePermissions(ContentPermissionSet permission)
-        {
-            PermissionRepository.AddOrUpdate(permission);
-        }
-
-        /// <summary>
-        /// Gets paged content results.
-        /// </summary>
-        public IEnumerable<IContent> GetPagedResultsByQuery(IQuery<IContent> query,
-            long pageIndex, int pageSize, out long totalRecords,
-            string orderBy, Direction orderDirection, bool orderBySystemField,
-            IQuery<IContent> filter = null)
-        {
-            Sql<ISqlContext> filterSql = null;
-
-            if (filter != null)
-            {
-                filterSql = Sql();
-                foreach (var filterClause in filter.GetWhereClauses())
-                    filterSql.Append($"AND ({filterClause.Item1})", filterClause.Item2);                
-            }
-
-            return GetPagedResultsByQuery<DocumentDto>(query, pageIndex, pageSize, out totalRecords,
-                x => MapDtosToContent(x),
-                orderBy, orderDirection, orderBySystemField,
-                filterSql);
-        }
-
-        public bool IsPathPublished(IContent content)
-        {
-            // fail fast
-            if (content.Path.StartsWith("-1,-20,"))
-                return false;
-
-            // succeed fast
-            if (content.ParentId == -1)
-                return content.Published;
-
-            var ids = content.Path.Split(',').Skip(1).Select(int.Parse);
-
-            var sql = SqlContext.Sql()
-                .SelectCount<NodeDto>(x => x.NodeId)
-                .From<NodeDto>()
-                .InnerJoin<DocumentDto>().On<NodeDto, DocumentDto>((n, d) => n.NodeId == d.NodeId && d.Published)
-                .WhereIn<NodeDto>(x => x.NodeId, ids);
-
-            var count = Database.ExecuteScalar<int>(sql);
-            return count == content.Level;
-        }
-
-        #endregion
-
-        #region Recycle Bin
-
-        protected override int RecycleBinId => Constants.System.RecycleBinContent;
-
-        #endregion
-
-        #region Read Repository implementation for Guid keys
-
-        public IContent Get(Guid id)
-        {
-            return _contentByGuidReadRepository.Get(id);
-        }
-
-        IEnumerable<IContent> IReadRepository<Guid, IContent>.GetAll(params Guid[] ids)
-        {
-            return _contentByGuidReadRepository.GetAll(ids);
-        }
-
-        public bool Exists(Guid id)
-        {
-            return _contentByGuidReadRepository.Exists(id);
-        }
-
-        // reading repository purely for looking up by GUID
-        // fixme - ugly and to fix we need to decouple the IRepositoryQueryable -> IRepository -> IReadRepository which should all be separate things!
-        private class ContentByGuidReadRepository : NPocoRepositoryBase<Guid, IContent>
-        {
-            private readonly ContentRepository _outerRepo;
-
-            public ContentByGuidReadRepository(ContentRepository outerRepo, IScopeUnitOfWork work, CacheHelper cache, ILogger logger)
-                : base(work, cache, logger)
-            {
-                _outerRepo = outerRepo;
-            }
-
-            protected override Guid NodeObjectTypeId => _outerRepo.NodeObjectTypeId;
-
-            protected override IContent PerformGet(Guid id)
-            {
-                var sql = _outerRepo.GetBaseQuery(QueryType.Single)
-                    .Where<NodeDto>(x => x.UniqueId == id);
-
-                var dto = Database.Fetch<DocumentDto>(sql.SelectTop(1)).FirstOrDefault();
-
-                if (dto == null)
-                    return null;
-
-                var content = _outerRepo.MapDtoToContent(dto);
-
-                return content;
-            }
-
-            protected override IEnumerable<IContent> PerformGetAll(params Guid[] ids)
-            {
-                var sql = _outerRepo.GetBaseQuery(QueryType.Many);
-                if (ids.Length > 0)
-                    sql.WhereIn<NodeDto>(x => x.UniqueId, ids);
-
-                return _outerRepo.MapDtosToContent(Database.Fetch<DocumentDto>(sql));
-            }
-
-            protected override IEnumerable<IContent> PerformGetByQuery(IQuery<IContent> query)
-            {
-                throw new WontImplementException();
-            }
-
-            protected override IEnumerable<string> GetDeleteClauses()
-            {
-                throw new WontImplementException();
-            }
-
-            protected override void PersistNewItem(IContent entity)
-            {
-                throw new WontImplementException();
-            }
-
-            protected override void PersistUpdatedItem(IContent entity)
-            {
-                throw new WontImplementException();
-            }
-
-            protected override Sql<ISqlContext> GetBaseQuery(bool isCount)
-            {
-                throw new WontImplementException();
-            }
-
-            protected override string GetBaseWhereClause()
-            {
-                throw new WontImplementException();
-            }
-        }
-
-        #endregion
-
-        protected override string GetDatabaseFieldNameForOrderBy(string orderBy)
-        {
-            // NOTE see sortby.prevalues.controller.js for possible values
-            // that need to be handled here or in VersionableRepositoryBase
-
-            //Some custom ones
-            switch (orderBy.ToUpperInvariant())
-            {
-                case "UPDATER":
-                    // fixme orders by id not letter = bad
-                    return GetDatabaseFieldNameForOrderBy(Constants.DatabaseSchema.Tables.ContentVersion, "userId");
-                case "PUBLISHED":
-                    // fixme kill
-                    return GetDatabaseFieldNameForOrderBy(Constants.DatabaseSchema.Tables.Document, "published");
-                case "CONTENTTYPEALIAS":
-                    throw new NotSupportedException("Don't know how to support ContentTypeAlias.");
-            }
-
-            return base.GetDatabaseFieldNameForOrderBy(orderBy);
-        }
-
-        private IEnumerable<IContent> MapDtosToContent(List<DocumentDto> dtos, bool withCache = false)
-        {
-            var temps = new List<TempContent<Content>>();
-            var contentTypes = new Dictionary<int, IContentType>();
-            var templateIds = new List<int>();
-
-            var content = new Content[dtos.Count];
-
-            for (var i = 0; i < dtos.Count; i++)
-            {
-                var dto = dtos[i];
-
-                if (withCache)
-                {
-                    // if the cache contains the (proper version of the) item, use it
-                    var cached = IsolatedCache.GetCacheItem<IContent>(GetCacheIdKey<IContent>(dto.NodeId));
-                    if (cached != null && cached.VersionId == dto.DocumentVersionDto.ContentVersionDto.Id)
-                    {
-                        content[i] = (Content) cached;
-                        continue;
-                    }
-                }
-
-                // else, need to build it
-
-                // get the content type - the repository is full cache *but* still deep-clones
-                // whatever comes out of it, so use our own local index here to avoid this
-                var contentTypeId = dto.ContentDto.ContentTypeId;
-                if (contentTypes.TryGetValue(contentTypeId, out var contentType) == false)
-                    contentTypes[contentTypeId] = contentType = _contentTypeRepository.Get(contentTypeId);
-
-                var c = content[i] = ContentBaseFactory.BuildEntity(dto, contentType);
-
-                // need templates
-                var templateId = dto.DocumentVersionDto.TemplateId;
-                if (templateId.HasValue && templateId.Value > 0)
-                    templateIds.Add(templateId.Value);
-                if (dto.Published)
-                {
-                    templateId = dto.PublishedVersionDto.TemplateId;
-                    if (templateId.HasValue && templateId.Value > 0)
-                        templateIds.Add(templateId.Value);
-                }
-
-                // need properties
-                var versionId = dto.DocumentVersionDto.Id;
-                var publishedVersionId = dto.Published ? dto.PublishedVersionDto.Id : 0;
-                var temp = new TempContent<Content>(dto.NodeId, versionId, publishedVersionId, contentType, c)
-                {
-                    Template1Id = dto.DocumentVersionDto.TemplateId
-                };
-                if (dto.Published) temp.Template2Id = dto.PublishedVersionDto.TemplateId;
-                temps.Add(temp);
-            }
-
-            // load all required templates in 1 query, and index
-            var templates = _templateRepository.GetAll(templateIds.ToArray())
-                .ToDictionary(x => x.Id, x => x);
-
-            // load all properties for all documents from database in 1 query - indexed by version id
-            var properties = GetPropertyCollections(temps);
-
-            // assign templates and properties
-            foreach (var temp in temps)
-            {
-                // complete the item
-                if (temp.Template1Id.HasValue && templates.TryGetValue(temp.Template1Id.Value, out var template))
-                    temp.Content.Template = template;
-                if (temp.Template2Id.HasValue && templates.TryGetValue(temp.Template2Id.Value, out template))
-                    temp.Content.PublishTemplate = template;
-                temp.Content.Properties = properties[temp.VersionId];
-
-                // reset dirty initial properties (U4-1946)
-                temp.Content.ResetDirtyProperties(false);
-            }
-
-            return content;
-        }
-
-        private IContent MapDtoToContent(DocumentDto dto)
-        {
-            var contentType = _contentTypeRepository.Get(dto.ContentDto.ContentTypeId);
-            var content = ContentBaseFactory.BuildEntity(dto, contentType);
-
-            // get template
-            if (dto.DocumentVersionDto.TemplateId.HasValue && dto.DocumentVersionDto.TemplateId.Value > 0)
-                content.Template = _templateRepository.Get(dto.DocumentVersionDto.TemplateId.Value);
-
-            // get properties - indexed by version id
-            var versionId = dto.DocumentVersionDto.Id;
-
-            // fixme - shall we get published properties or not?
-            //var publishedVersionId = dto.Published ? dto.PublishedVersionDto.Id : 0;
-            var publishedVersionId = dto.PublishedVersionDto != null ? dto.PublishedVersionDto.Id : 0;
-
-            var temp = new TempContent<Content>(dto.NodeId, versionId, publishedVersionId, contentType);
-            var properties = GetPropertyCollections(new List<TempContent<Content>> { temp });
-            content.Properties = properties[dto.DocumentVersionDto.Id];
-
-            // reset dirty initial properties (U4-1946)
-            content.ResetDirtyProperties(false);
-            return content;
-        }
-
-        #region Utilities
-
-        protected override string EnsureUniqueNodeName(int parentId, string nodeName, int id = 0)
-        {
-            return EnsureUniqueNaming == false ? nodeName : base.EnsureUniqueNodeName(parentId, nodeName, id);
-        }
-
-        #endregion
-    }
-}
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using NPoco;
+using Umbraco.Core.Cache;
+using Umbraco.Core.Configuration.UmbracoSettings;
+using Umbraco.Core.Exceptions;
+using Umbraco.Core.Logging;
+using Umbraco.Core.Models;
+using Umbraco.Core.Models.Membership;
+using Umbraco.Core.Models.Rdbms;
+using Umbraco.Core.Persistence.DatabaseModelDefinitions;
+using Umbraco.Core.Persistence.Factories;
+using Umbraco.Core.Persistence.Querying;
+using Umbraco.Core.Persistence.SqlSyntax;
+using Umbraco.Core.Persistence.UnitOfWork;
+
+namespace Umbraco.Core.Persistence.Repositories.Implement
+{
+    /// <summary>
+    /// Represents a repository for doing CRUD operations for <see cref="IContent"/>.
+    /// </summary>
+    internal class DocumentRepository : ContentRepositoryBase<int, IContent, DocumentRepository>, IDocumentRepository
+    {
+        private readonly IContentTypeRepository _contentTypeRepository;
+        private readonly ITemplateRepository _templateRepository;
+        private readonly ITagRepository _tagRepository;
+        private readonly CacheHelper _cacheHelper;
+        private PermissionRepository<IContent> _permissionRepository;
+        private readonly ContentByGuidReadRepository _contentByGuidReadRepository;
+
+        public DocumentRepository(IScopeUnitOfWork work, CacheHelper cacheHelper, ILogger logger, IContentTypeRepository contentTypeRepository, ITemplateRepository templateRepository, ITagRepository tagRepository, IContentSection settings)
+            : base(work, cacheHelper, logger)
+        {
+            _contentTypeRepository = contentTypeRepository ?? throw new ArgumentNullException(nameof(contentTypeRepository));
+            _templateRepository = templateRepository ?? throw new ArgumentNullException(nameof(templateRepository));
+            _tagRepository = tagRepository ?? throw new ArgumentNullException(nameof(tagRepository));
+            _cacheHelper = cacheHelper;
+            _contentByGuidReadRepository = new ContentByGuidReadRepository(this, work, cacheHelper, logger);
+            EnsureUniqueNaming = settings.EnsureUniqueNaming;
+        }
+
+        protected override DocumentRepository This => this;
+
+        public bool EnsureUniqueNaming { get; set; }
+
+        // note: is ok to 'new' the repo here as it's a sub-repo really
+        private PermissionRepository<IContent> PermissionRepository => _permissionRepository
+            ?? (_permissionRepository = new PermissionRepository<IContent>(UnitOfWork, _cacheHelper, Logger));
+
+        #region Repository Base
+
+        protected override Guid NodeObjectTypeId => Constants.ObjectTypes.Document;
+
+        protected override IContent PerformGet(int id)
+        {
+            var sql = GetBaseQuery(QueryType.Single)
+                .Where<NodeDto>(x => x.NodeId == id)
+                .SelectTop(1);
+
+            var dto = Database.Fetch<DocumentDto>(sql).FirstOrDefault();
+            return dto == null
+                ? null
+                : MapDtoToContent(dto);
+        }
+
+        protected override IEnumerable<IContent> PerformGetAll(params int[] ids)
+        {
+            var sql = GetBaseQuery(QueryType.Many);
+
+            if (ids.Any())
+                sql.WhereIn<NodeDto>(x => x.NodeId, ids);
+
+            return MapDtosToContent(Database.Fetch<DocumentDto>(sql));
+        }
+
+        protected override IEnumerable<IContent> PerformGetByQuery(IQuery<IContent> query)
+        {
+            var sqlClause = GetBaseQuery(QueryType.Many);
+
+            var translator = new SqlTranslator<IContent>(sqlClause, query);
+            var sql = translator.Translate();
+
+            sql // fixme why?
+                .OrderBy<NodeDto>(x => x.Level)
+                .OrderBy<NodeDto>(x => x.SortOrder);
+
+            return MapDtosToContent(Database.Fetch<DocumentDto>(sql));
+        }
+
+        protected override Sql<ISqlContext> GetBaseQuery(QueryType queryType)
+        {
+            return GetBaseQuery(queryType, true);
+        }
+
+        protected virtual Sql<ISqlContext> GetBaseQuery(QueryType queryType, bool current)
+        {
+            var sql = SqlContext.Sql();
+
+            switch (queryType)
+            {
+                case QueryType.Count:
+                    sql = sql.SelectCount();
+                    break;
+                case QueryType.Ids:
+                    sql = sql.Select<DocumentDto>(x => x.NodeId);
+                    break;
+                case QueryType.Single:
+                case QueryType.Many:
+                    sql = sql.Select<DocumentDto>(r =>
+                        r.Select(documentDto => documentDto.ContentDto, r1 =>
+                            r1.Select(contentDto => contentDto.NodeDto))
+                         .Select(documentDto => documentDto.DocumentVersionDto, r1 =>
+                            r1.Select(documentVersionDto => documentVersionDto.ContentVersionDto))
+                         .Select(documentDto => documentDto.PublishedVersionDto, "pdv", r1 =>
+                            r1.Select(documentVersionDto => documentVersionDto.ContentVersionDto, "pcv")));
+                    break;
+            }
+
+            sql
+                .From<DocumentDto>()
+                .InnerJoin<ContentDto>().On<DocumentDto, ContentDto>(left => left.NodeId, right => right.NodeId)
+                .InnerJoin<NodeDto>().On<ContentDto, NodeDto>(left => left.NodeId, right => right.NodeId)
+
+                // inner join on mandatory edited version
+                .InnerJoin<ContentVersionDto>().On<DocumentDto, ContentVersionDto>((left, right) => left.NodeId == right.NodeId)
+                .InnerJoin<DocumentVersionDto>().On<ContentVersionDto, DocumentVersionDto>((left, right) => left.Id == right.Id)
+
+                // left join on optional published version
+                .LeftJoin<ContentVersionDto>(nested =>
+                        nested.InnerJoin<DocumentVersionDto>("pdv").On<ContentVersionDto, DocumentVersionDto>((left, right) => left.Id == right.Id && right.Published, "pcv", "pdv"), "pcv")
+                    .On<DocumentDto, ContentVersionDto>((left, right) => left.NodeId == right.NodeId, aliasRight: "pcv");
+
+            sql
+                .Where<NodeDto>(x => x.NodeObjectType == NodeObjectTypeId);
+
+            // this would ensure we don't get the published version - keep for reference
+            //sql
+            //    .WhereAny(
+            //        x => x.Where<ContentVersionDto, ContentVersionDto>((x1, x2) => x1.Id != x2.Id, alias2: "pcv"),
+            //        x => x.WhereNull<ContentVersionDto>(x1 => x1.Id, "pcv")
+            //    );
+
+            if (current)
+                sql.Where<ContentVersionDto>(x => x.Current); // always get the current version
+
+            return sql;
+        }
+
+        // fixme - kill, eventually
+        protected override Sql<ISqlContext> GetBaseQuery(bool isCount)
+        {
+            return GetBaseQuery(isCount ? QueryType.Count : QueryType.Single);
+        }
+
+        // fixme - kill, eventually
+        // ah maybe not, that what's used for eg Exists in base repo
+        protected override string GetBaseWhereClause()
+        {
+            return $"{Constants.DatabaseSchema.Tables.Node}.id = @id";
+        }
+
+        protected override IEnumerable<string> GetDeleteClauses()
+        {
+            var list = new List<string>
+            {
+                "DELETE FROM " + Constants.DatabaseSchema.Tables.RedirectUrl + " WHERE contentKey IN (SELECT uniqueId FROM " + Constants.DatabaseSchema.Tables.Node + " WHERE id = @id)",
+                "DELETE FROM " + Constants.DatabaseSchema.Tables.Task + " WHERE nodeId = @id",
+                "DELETE FROM " + Constants.DatabaseSchema.Tables.User2NodeNotify + " WHERE nodeId = @id",
+                "DELETE FROM " + Constants.DatabaseSchema.Tables.UserGroup2NodePermission + " WHERE nodeId = @id",
+                "DELETE FROM " + Constants.DatabaseSchema.Tables.UserStartNode + " WHERE startNode = @id",
+                "UPDATE " + Constants.DatabaseSchema.Tables.UserGroup + " SET startContentId = NULL WHERE startContentId = @id",
+                "DELETE FROM " + Constants.DatabaseSchema.Tables.Relation + " WHERE parentId = @id",
+                "DELETE FROM " + Constants.DatabaseSchema.Tables.Relation + " WHERE childId = @id",
+                "DELETE FROM " + Constants.DatabaseSchema.Tables.TagRelationship + " WHERE nodeId = @id",
+                "DELETE FROM " + Constants.DatabaseSchema.Tables.Domain + " WHERE domainRootStructureID = @id",
+                "DELETE FROM " + Constants.DatabaseSchema.Tables.Document + " WHERE nodeId = @id",
+                "DELETE FROM " + Constants.DatabaseSchema.Tables.DocumentVersion + " WHERE id IN (SELECT id FROM " + Constants.DatabaseSchema.Tables.ContentVersion + " WHERE nodeId = @id)",
+                "DELETE FROM " + Constants.DatabaseSchema.Tables.PropertyData + " WHERE versionId IN (SELECT id FROM " + Constants.DatabaseSchema.Tables.ContentVersion + " WHERE nodeId = @id)",
+                "DELETE FROM cmsPreviewXml WHERE nodeId = @id",
+                "DELETE FROM " + Constants.DatabaseSchema.Tables.ContentVersion + " WHERE nodeId = @id",
+                "DELETE FROM cmsContentXml WHERE nodeId = @id",
+                "DELETE FROM " + Constants.DatabaseSchema.Tables.Content + " WHERE nodeId = @id",
+                "DELETE FROM " + Constants.DatabaseSchema.Tables.Access + " WHERE nodeId = @id",
+                "DELETE FROM " + Constants.DatabaseSchema.Tables.Node + " WHERE id = @id"
+            };
+            return list;
+        }
+
+        #endregion
+
+        #region Versions
+
+        public override IEnumerable<IContent> GetAllVersions(int nodeId)
+        {
+            var sql = GetBaseQuery(QueryType.Many, false)
+                .Where<NodeDto>(x => x.NodeId == nodeId)
+                .OrderByDescending<ContentVersionDto>(x => x.Current)
+                .AndByDescending<ContentVersionDto>(x => x.VersionDate);
+
+            return MapDtosToContent(Database.Fetch<DocumentDto>(sql), true);
+        }
+
+        public override IContent GetVersion(int versionId)
+        {
+            var sql = GetBaseQuery(QueryType.Single, false)
+                .Where<ContentVersionDto>(x => x.Id == versionId);
+
+            var dto = Database.Fetch<DocumentDto>(sql).FirstOrDefault();
+            return dto == null ? null : MapDtoToContent(dto);
+        }
+
+        protected override void PerformDeleteVersion(int id, int versionId)
+        {
+            // raise event first else potential FK issues
+            OnUowRemovingVersion(new UnitOfWorkVersionEventArgs(UnitOfWork, id, versionId));
+
+            // fixme - syntax + ...
+            Database.Delete<PropertyDataDto>("WHERE versionId = @versionId", new { versionId });
+            Database.Delete<ContentVersionDto>("WHERE id = @versionId", new { versionId });
+            Database.Delete<DocumentVersionDto>("WHERE id = @versionId", new { versionId });
+        }
+
+        #endregion
+
+        #region Persist
+
+        protected override void PersistNewItem(IContent entity)
+        {
+            var content = (Content) entity;
+
+            content.AddingEntity();
+            var publishing = content.PublishedState == PublishedState.Publishing;
+
+            // ensure that the default template is assigned
+            if (entity.Template == null)
+                entity.Template = entity.ContentType.DefaultTemplate;
+
+            // ensure unique name on the same level
+            entity.Name = EnsureUniqueNodeName(entity.ParentId, entity.Name);
+
+            // ensure that strings don't contain characters that are invalid in xml
+            // fixme - do we really want to keep doing this here?
+            entity.SanitizeEntityPropertiesForXmlStorage();
+
+            // create the dto
+            var dto = ContentBaseFactory.BuildDto(entity, NodeObjectTypeId);
+
+            // derive path and level from parent
+            var parent = GetParentNodeDto(entity.ParentId);
+            var level = parent.Level + 1;
+
+            // get sort order
+            var sortOrder = GetNewChildSortOrder(entity.ParentId, 0);
+
+            // persist the node dto
+            var nodeDto = dto.ContentDto.NodeDto;
+            nodeDto.Path = parent.Path;
+            nodeDto.Level = Convert.ToInt16(level);
+            nodeDto.SortOrder = sortOrder;
+
+            // see if there's a reserved identifier for this unique id
+            // and then either update or insert the node dto
+            var id = GetReservedId(nodeDto.UniqueId);
+            if (id > 0)
+                nodeDto.NodeId = id;
+            else
+                Database.Insert(nodeDto);
+
+            nodeDto.Path = string.Concat(parent.Path, ",", nodeDto.NodeId);
+            nodeDto.ValidatePathWithException();
+            Database.Update(nodeDto);
+
+            // update entity
+            entity.Id = nodeDto.NodeId;
+            entity.Path = nodeDto.Path;
+            entity.SortOrder = sortOrder;
+            entity.Level = level;
+
+            // persist the content dto
+            var contentDto = dto.ContentDto;
+            contentDto.NodeId = nodeDto.NodeId;
+            Database.Insert(contentDto);
+
+            // persist the content version dto
+            var contentVersionDto = dto.DocumentVersionDto.ContentVersionDto;
+            contentVersionDto.NodeId = nodeDto.NodeId;
+            contentVersionDto.Current = !publishing;
+            Database.Insert(contentVersionDto);
+            content.VersionId = contentVersionDto.Id;
+
+            // persist the document version dto
+            var documentVersionDto = dto.DocumentVersionDto;
+            documentVersionDto.Id = content.VersionId;
+            if (publishing)
+                documentVersionDto.Published = true;
+            Database.Insert(documentVersionDto);
+
+            // and again in case we're publishing immediately
+            if (publishing)
+            {
+                content.PublishedVersionId = content.VersionId;
+                contentVersionDto.Id = 0;
+                contentVersionDto.Current = true;
+                Database.Insert(contentVersionDto);
+                content.VersionId = contentVersionDto.Id;
+
+                documentVersionDto.Id = content.VersionId;
+                documentVersionDto.Published = false;
+                Database.Insert(documentVersionDto);
+            }
+
+            // persist the property data
+            var propertyDataDtos = PropertyFactory.BuildDtos(content.VersionId, content.PublishedVersionId, entity.Properties, out var edited);
+            foreach (var propertyDataDto in propertyDataDtos)
+                Database.Insert(propertyDataDto);
+
+            // persist the document dto
+            // at that point, when publishing, the entity still has its old Published value
+            // so we need to explicitely update the dto to persist the correct value
+            if (content.PublishedState == PublishedState.Publishing)
+                dto.Published = true;
+            dto.NodeId = nodeDto.NodeId;
+            content.Edited = dto.Edited = !dto.Published || edited; // if not published, always edited
+            Database.Insert(dto);
+
+            // trigger here, before we reset Published etc
+            OnUowRefreshedEntity(new UnitOfWorkEntityEventArgs(UnitOfWork, entity));
+
+            // flip the entity's published property
+            // this also flips its published state
+            if (content.PublishedState == PublishedState.Publishing)
+            {
+                content.Published = true;
+                content.PublishName = content.Name;
+                content.PublishTemplate = content.Template;
+                content.PublisherId = content.WriterId;
+                content.PublishDate = content.UpdateDate;
+            }
+            else if (content.PublishedState == PublishedState.Unpublishing)
+            {
+                content.Published = false;
+                content.PublishName = null;
+                content.PublishTemplate = null;
+                content.PublisherId = null;
+                content.PublishDate = null;
+            }
+
+            // if published, set tags accordingly
+            if (entity.Published)
+                UpdateEntityTags(entity, _tagRepository);
+
+            entity.ResetDirtyProperties();
+
+            // troubleshooting
+            //if (Database.ExecuteScalar<int>("SELECT COUNT(*) FROM uDocumentVersion JOIN uContentVersion ON uDocumentVersion.id=uContentVersion.id WHERE published=1 AND nodeId=" + content.Id) > 1)
+            //{
+            //    Debugger.Break();
+            //    throw new Exception("oops");
+            //}
+            //if (Database.ExecuteScalar<int>("SELECT COUNT(*) FROM uDocumentVersion JOIN uContentVersion ON uDocumentVersion.id=uContentVersion.id WHERE [current]=1 AND nodeId=" + content.Id) > 1)
+            //{
+            //    Debugger.Break();
+            //    throw new Exception("oops");
+            //}
+        }
+
+        protected override void PersistUpdatedItem(IContent entity)
+        {
+            var content = (Content) entity;
+
+            // check if we need to make any database changes at all
+            if ((content.PublishedState == PublishedState.Published || content.PublishedState == PublishedState.Unpublished) && !content.IsEntityDirty() && !content.IsAnyUserPropertyDirty())
+                return; // no change to save, do nothing, don't even update dates
+
+            // whatever we do, we must check that we are saving the current version
+            // fixme maybe we can just fetch Current (bool)
+            var version = Database.Fetch<ContentVersionDto>(SqlContext.Sql().Select<ContentVersionDto>().From<ContentVersionDto>().Where<ContentVersionDto>(x => x.Id == content.VersionId)).FirstOrDefault();
+            if (version == null || !version.Current )
+                throw new InvalidOperationException("Cannot save a non-current version.");
+
+            // update
+            content.UpdatingEntity();
+            var publishing = content.PublishedState == PublishedState.Publishing;
+
+            // check if we need to create a new version
+            if (publishing && content.PublishedVersionId > 0)
+            {
+                // published version is not published anymore
+                Database.Execute(Sql().Update<DocumentVersionDto>(u => u.Set(x => x.Published, false)).Where<DocumentVersionDto>(x => x.Id == content.PublishedVersionId));
+            }
+
+            // ensure unique name on the same level
+            entity.Name = EnsureUniqueNodeName(entity.ParentId, entity.Name, entity.Id);
+
+            // ensure that strings don't contain characters that are invalid in xml
+            // fixme - do we really want to keep doing this here?
+            entity.SanitizeEntityPropertiesForXmlStorage();
+
+            // if parent has changed, get path, level and sort order
+            if (entity.IsPropertyDirty("ParentId"))
+            {
+                var parent = GetParentNodeDto(entity.ParentId);
+                entity.Path = string.Concat(parent.Path, ",", entity.Id);
+                entity.Level = parent.Level + 1;
+                entity.SortOrder = GetNewChildSortOrder(entity.ParentId, 0);
+            }
+
+            // create the dto
+            var dto = ContentBaseFactory.BuildDto(entity, NodeObjectTypeId);
+
+            // update the node dto
+            var nodeDto = dto.ContentDto.NodeDto;
+            nodeDto.ValidatePathWithException();
+            Database.Update(nodeDto);
+
+            // update the content dto
+            Database.Update(dto.ContentDto);
+
+            // update the content & document version dtos
+            var contentVersionDto = dto.DocumentVersionDto.ContentVersionDto;
+            var documentVersionDto = dto.DocumentVersionDto;
+            if (publishing)
+            {
+                documentVersionDto.Published = true; // now published
+                contentVersionDto.Current = false; // no more current
+            }
+            Database.Update(contentVersionDto);
+            Database.Update(documentVersionDto);
+
+            // and, if publishing, insert new content & document version dtos
+            if (publishing)
+            {
+                content.PublishedVersionId = content.VersionId;
+
+                contentVersionDto.Id = 0; // want a new id
+                contentVersionDto.Current = true; // current version
+                Database.Insert(contentVersionDto);
+                content.VersionId = documentVersionDto.Id = contentVersionDto.Id; // get the new id
+
+                documentVersionDto.Published = false; // non-published version
+                Database.Insert(documentVersionDto);
+            }
+
+            // replace the property data
+            var pdataToDelete = publishing ? new[] { content.VersionId, content.PublishedVersionId } : new[] { content.VersionId };
+            var deletePropertyDataSql = SqlContext.Sql().Delete<PropertyDataDto>().WhereIn<PropertyDataDto>(x => x.VersionId, pdataToDelete);
+            Database.Execute(deletePropertyDataSql);
+
+            var propertyDataDtos = PropertyFactory.BuildDtos(content.VersionId, publishing ? content.PublishedVersionId : 0, entity.Properties, out var edited);
+            foreach (var propertyDataDto in propertyDataDtos)
+                Database.Insert(propertyDataDto);
+
+            // update the document dto
+            // at that point, when un/publishing, the entity still has its old Published value
+            // so we need to explicitely update the dto to persist the correct value
+            if (content.PublishedState == PublishedState.Publishing)
+                dto.Published = true;
+            else if (content.PublishedState == PublishedState.Unpublishing)
+                dto.Published = false;
+            content.Edited = dto.Edited = !dto.Published || edited; // if not published, always edited
+            Database.Update(dto);
+
+            // if entity is publishing, update tags, else leave tags there
+            // means that implicitely unpublished, or trashed, entities *still* have tags in db
+            if (content.PublishedState == PublishedState.Publishing)
+                UpdateEntityTags(entity, _tagRepository);
+
+            // trigger here, before we reset Published etc
+            OnUowRefreshedEntity(new UnitOfWorkEntityEventArgs(UnitOfWork, entity));
+
+            // flip the entity's published property
+            // this also flips its published state
+            if (content.PublishedState == PublishedState.Publishing)
+            {
+                content.Published = true;
+                content.PublishName = content.Name;
+                content.PublishTemplate = content.Template;
+                content.PublisherId = content.WriterId;
+                content.PublishDate = content.UpdateDate;
+            }
+            else if (content.PublishedState == PublishedState.Unpublishing)
+            {
+                content.Published = false;
+                content.PublishName = null;
+                content.PublishTemplate = null;
+                content.PublisherId = null;
+                content.PublishDate = null;
+            }
+
+            entity.ResetDirtyProperties();
+
+            // troubleshooting
+            //if (Database.ExecuteScalar<int>("SELECT COUNT(*) FROM uDocumentVersion JOIN uContentVersion ON uDocumentVersion.id=uContentVersion.id WHERE published=1 AND nodeId=" + content.Id) > 1)
+            //{
+            //    Debugger.Break();
+            //    throw new Exception("oops");
+            //}
+            //if (Database.ExecuteScalar<int>("SELECT COUNT(*) FROM uDocumentVersion JOIN uContentVersion ON uDocumentVersion.id=uContentVersion.id WHERE [current]=1 AND nodeId=" + content.Id) > 1)
+            //{
+            //    Debugger.Break();
+            //    throw new Exception("oops");
+            //}
+        }
+
+        protected override void PersistDeletedItem(IContent entity)
+        {
+            // raise event first else potential FK issues
+            OnUowRemovingEntity(new UnitOfWorkEntityEventArgs(UnitOfWork, entity));
+
+            //We need to clear out all access rules but we need to do this in a manual way since
+            // nothing in that table is joined to a content id
+            var subQuery = SqlContext.Sql()
+                .Select<AccessRuleDto>(x => x.AccessId)
+                .From<AccessRuleDto>()
+                .InnerJoin<AccessDto>()
+                .On<AccessRuleDto, AccessDto>(left => left.AccessId, right => right.Id)
+                .Where<AccessDto>(dto => dto.NodeId == entity.Id);
+            Database.Execute(SqlContext.SqlSyntax.GetDeleteSubquery("umbracoAccessRule", "accessId", subQuery));
+
+            //now let the normal delete clauses take care of everything else
+            base.PersistDeletedItem(entity);
+        }
+
+        #endregion
+
+        #region Content Repository
+
+        public int CountPublished(string contentTypeAlias = null)
+        {
+            var sql = SqlContext.Sql();
+            if (contentTypeAlias.IsNullOrWhiteSpace())
+            {
+                sql.SelectCount()
+                    .From<NodeDto>()
+                    .InnerJoin<DocumentDto>()
+                    .On<NodeDto, DocumentDto>(left => left.NodeId, right => right.NodeId)
+                    .Where<NodeDto>(x => x.NodeObjectType == NodeObjectTypeId && x.Trashed == false)
+                    .Where<DocumentDto>(x => x.Published);
+            }
+            else
+            {
+                sql.SelectCount()
+                    .From<NodeDto>()
+                    .InnerJoin<ContentDto>()
+                    .On<NodeDto, ContentDto>(left => left.NodeId, right => right.NodeId)
+                    .InnerJoin<DocumentDto>()
+                    .On<NodeDto, DocumentDto>(left => left.NodeId, right => right.NodeId)
+                    .InnerJoin<ContentTypeDto>()
+                    .On<ContentTypeDto, ContentDto>(left => left.NodeId, right => right.ContentTypeId)
+                    .Where<NodeDto>(x => x.NodeObjectType == NodeObjectTypeId && x.Trashed == false)
+                    .Where<ContentTypeDto>(x => x.Alias == contentTypeAlias)
+                    .Where<DocumentDto>(x => x.Published);
+            }
+
+            return Database.ExecuteScalar<int>(sql);
+        }
+
+        public void ReplaceContentPermissions(EntityPermissionSet permissionSet)
+        {
+            PermissionRepository.ReplaceEntityPermissions(permissionSet);
+        }
+
+        /// <summary>
+        /// Assigns a single permission to the current content item for the specified group ids
+        /// </summary>
+        /// <param name="entity"></param>
+        /// <param name="permission"></param>
+        /// <param name="groupIds"></param>
+        public void AssignEntityPermission(IContent entity, char permission, IEnumerable<int> groupIds)
+        {
+            PermissionRepository.AssignEntityPermission(entity, permission, groupIds);
+        }
+
+        public EntityPermissionCollection GetPermissionsForEntity(int entityId)
+        {
+            return PermissionRepository.GetPermissionsForEntity(entityId);
+        }
+
+        /// <summary>
+        /// Used to add/update a permission for a content item
+        /// </summary>
+        /// <param name="permission"></param>
+        public void AddOrUpdatePermissions(ContentPermissionSet permission)
+        {
+            PermissionRepository.Save(permission);
+        }
+
+        /// <summary>
+        /// Gets paged content results.
+        /// </summary>
+        public override IEnumerable<IContent> GetPage(IQuery<IContent> query,
+            long pageIndex, int pageSize, out long totalRecords,
+            string orderBy, Direction orderDirection, bool orderBySystemField,
+            IQuery<IContent> filter = null)
+        {
+            Sql<ISqlContext> filterSql = null;
+
+            if (filter != null)
+            {
+                filterSql = Sql();
+                foreach (var filterClause in filter.GetWhereClauses())
+                    filterSql.Append($"AND ({filterClause.Item1})", filterClause.Item2);
+            }
+
+            return GetPagedResultsByQuery<DocumentDto>(query, pageIndex, pageSize, out totalRecords,
+                x => MapDtosToContent(x),
+                orderBy, orderDirection, orderBySystemField,
+                filterSql);
+        }
+
+        public bool IsPathPublished(IContent content)
+        {
+            // fail fast
+            if (content.Path.StartsWith("-1,-20,"))
+                return false;
+
+            // succeed fast
+            if (content.ParentId == -1)
+                return content.Published;
+
+            var ids = content.Path.Split(',').Skip(1).Select(int.Parse);
+
+            var sql = SqlContext.Sql()
+                .SelectCount<NodeDto>(x => x.NodeId)
+                .From<NodeDto>()
+                .InnerJoin<DocumentDto>().On<NodeDto, DocumentDto>((n, d) => n.NodeId == d.NodeId && d.Published)
+                .WhereIn<NodeDto>(x => x.NodeId, ids);
+
+            var count = Database.ExecuteScalar<int>(sql);
+            return count == content.Level;
+        }
+
+        #endregion
+
+        #region Recycle Bin
+
+        public override int RecycleBinId => Constants.System.RecycleBinContent;
+
+        #endregion
+
+        #region Read Repository implementation for Guid keys
+
+        public IContent Get(Guid id)
+        {
+            return _contentByGuidReadRepository.Get(id);
+        }
+
+        IEnumerable<IContent> IReadRepository<Guid, IContent>.GetMany(params Guid[] ids)
+        {
+            return _contentByGuidReadRepository.GetMany(ids);
+        }
+
+        public bool Exists(Guid id)
+        {
+            return _contentByGuidReadRepository.Exists(id);
+        }
+
+        // reading repository purely for looking up by GUID
+        // fixme - ugly and to fix we need to decouple the IRepositoryQueryable -> IRepository -> IReadRepository which should all be separate things!
+        private class ContentByGuidReadRepository : NPocoRepositoryBase<Guid, IContent>
+        {
+            private readonly DocumentRepository _outerRepo;
+
+            public ContentByGuidReadRepository(DocumentRepository outerRepo, IScopeUnitOfWork work, CacheHelper cache, ILogger logger)
+                : base(work, cache, logger)
+            {
+                _outerRepo = outerRepo;
+            }
+
+            protected override Guid NodeObjectTypeId => _outerRepo.NodeObjectTypeId;
+
+            protected override IContent PerformGet(Guid id)
+            {
+                var sql = _outerRepo.GetBaseQuery(QueryType.Single)
+                    .Where<NodeDto>(x => x.UniqueId == id);
+
+                var dto = Database.Fetch<DocumentDto>(sql.SelectTop(1)).FirstOrDefault();
+
+                if (dto == null)
+                    return null;
+
+                var content = _outerRepo.MapDtoToContent(dto);
+
+                return content;
+            }
+
+            protected override IEnumerable<IContent> PerformGetAll(params Guid[] ids)
+            {
+                var sql = _outerRepo.GetBaseQuery(QueryType.Many);
+                if (ids.Length > 0)
+                    sql.WhereIn<NodeDto>(x => x.UniqueId, ids);
+
+                return _outerRepo.MapDtosToContent(Database.Fetch<DocumentDto>(sql));
+            }
+
+            protected override IEnumerable<IContent> PerformGetByQuery(IQuery<IContent> query)
+            {
+                throw new WontImplementException();
+            }
+
+            protected override IEnumerable<string> GetDeleteClauses()
+            {
+                throw new WontImplementException();
+            }
+
+            protected override void PersistNewItem(IContent entity)
+            {
+                throw new WontImplementException();
+            }
+
+            protected override void PersistUpdatedItem(IContent entity)
+            {
+                throw new WontImplementException();
+            }
+
+            protected override Sql<ISqlContext> GetBaseQuery(bool isCount)
+            {
+                throw new WontImplementException();
+            }
+
+            protected override string GetBaseWhereClause()
+            {
+                throw new WontImplementException();
+            }
+        }
+
+        #endregion
+
+        protected override string GetDatabaseFieldNameForOrderBy(string orderBy)
+        {
+            // NOTE see sortby.prevalues.controller.js for possible values
+            // that need to be handled here or in VersionableRepositoryBase
+
+            //Some custom ones
+            switch (orderBy.ToUpperInvariant())
+            {
+                case "UPDATER":
+                    // fixme orders by id not letter = bad
+                    return GetDatabaseFieldNameForOrderBy(Constants.DatabaseSchema.Tables.ContentVersion, "userId");
+                case "PUBLISHED":
+                    // fixme kill
+                    return GetDatabaseFieldNameForOrderBy(Constants.DatabaseSchema.Tables.Document, "published");
+                case "CONTENTTYPEALIAS":
+                    throw new NotSupportedException("Don't know how to support ContentTypeAlias.");
+            }
+
+            return base.GetDatabaseFieldNameForOrderBy(orderBy);
+        }
+
+        private IEnumerable<IContent> MapDtosToContent(List<DocumentDto> dtos, bool withCache = false)
+        {
+            var temps = new List<TempContent<Content>>();
+            var contentTypes = new Dictionary<int, IContentType>();
+            var templateIds = new List<int>();
+
+            var content = new Content[dtos.Count];
+
+            for (var i = 0; i < dtos.Count; i++)
+            {
+                var dto = dtos[i];
+
+                if (withCache)
+                {
+                    // if the cache contains the (proper version of the) item, use it
+                    var cached = IsolatedCache.GetCacheItem<IContent>(RepositoryCacheKeys.GetKey<IContent>(dto.NodeId));
+                    if (cached != null && cached.VersionId == dto.DocumentVersionDto.ContentVersionDto.Id)
+                    {
+                        content[i] = (Content) cached;
+                        continue;
+                    }
+                }
+
+                // else, need to build it
+
+                // get the content type - the repository is full cache *but* still deep-clones
+                // whatever comes out of it, so use our own local index here to avoid this
+                var contentTypeId = dto.ContentDto.ContentTypeId;
+                if (contentTypes.TryGetValue(contentTypeId, out var contentType) == false)
+                    contentTypes[contentTypeId] = contentType = _contentTypeRepository.Get(contentTypeId);
+
+                var c = content[i] = ContentBaseFactory.BuildEntity(dto, contentType);
+
+                // need templates
+                var templateId = dto.DocumentVersionDto.TemplateId;
+                if (templateId.HasValue && templateId.Value > 0)
+                    templateIds.Add(templateId.Value);
+                if (dto.Published)
+                {
+                    templateId = dto.PublishedVersionDto.TemplateId;
+                    if (templateId.HasValue && templateId.Value > 0)
+                        templateIds.Add(templateId.Value);
+                }
+
+                // need properties
+                var versionId = dto.DocumentVersionDto.Id;
+                var publishedVersionId = dto.Published ? dto.PublishedVersionDto.Id : 0;
+                var temp = new TempContent<Content>(dto.NodeId, versionId, publishedVersionId, contentType, c)
+                {
+                    Template1Id = dto.DocumentVersionDto.TemplateId
+                };
+                if (dto.Published) temp.Template2Id = dto.PublishedVersionDto.TemplateId;
+                temps.Add(temp);
+            }
+
+            // load all required templates in 1 query, and index
+            var templates = _templateRepository.GetMany(templateIds.ToArray())
+                .ToDictionary(x => x.Id, x => x);
+
+            // load all properties for all documents from database in 1 query - indexed by version id
+            var properties = GetPropertyCollections(temps);
+
+            // assign templates and properties
+            foreach (var temp in temps)
+            {
+                // complete the item
+                if (temp.Template1Id.HasValue && templates.TryGetValue(temp.Template1Id.Value, out var template))
+                    temp.Content.Template = template;
+                if (temp.Template2Id.HasValue && templates.TryGetValue(temp.Template2Id.Value, out template))
+                    temp.Content.PublishTemplate = template;
+                temp.Content.Properties = properties[temp.VersionId];
+
+                // reset dirty initial properties (U4-1946)
+                temp.Content.ResetDirtyProperties(false);
+            }
+
+            return content;
+        }
+
+        private IContent MapDtoToContent(DocumentDto dto)
+        {
+            var contentType = _contentTypeRepository.Get(dto.ContentDto.ContentTypeId);
+            var content = ContentBaseFactory.BuildEntity(dto, contentType);
+
+            // get template
+            if (dto.DocumentVersionDto.TemplateId.HasValue && dto.DocumentVersionDto.TemplateId.Value > 0)
+                content.Template = _templateRepository.Get(dto.DocumentVersionDto.TemplateId.Value);
+
+            // get properties - indexed by version id
+            var versionId = dto.DocumentVersionDto.Id;
+
+            // fixme - shall we get published properties or not?
+            //var publishedVersionId = dto.Published ? dto.PublishedVersionDto.Id : 0;
+            var publishedVersionId = dto.PublishedVersionDto != null ? dto.PublishedVersionDto.Id : 0;
+
+            var temp = new TempContent<Content>(dto.NodeId, versionId, publishedVersionId, contentType);
+            var properties = GetPropertyCollections(new List<TempContent<Content>> { temp });
+            content.Properties = properties[dto.DocumentVersionDto.Id];
+
+            // reset dirty initial properties (U4-1946)
+            content.ResetDirtyProperties(false);
+            return content;
+        }
+
+        #region Utilities
+
+        protected override string EnsureUniqueNodeName(int parentId, string nodeName, int id = 0)
+        {
+            return EnsureUniqueNaming == false ? nodeName : base.EnsureUniqueNodeName(parentId, nodeName, id);
+        }
+
+        #endregion
+    }
+}
diff --git a/src/Umbraco.Core/Persistence/Repositories/DocumentTypeContainerRepository.cs b/src/Umbraco.Core/Persistence/Repositories/Implement/DocumentTypeContainerRepository.cs
similarity index 87%
rename from src/Umbraco.Core/Persistence/Repositories/DocumentTypeContainerRepository.cs
rename to src/Umbraco.Core/Persistence/Repositories/Implement/DocumentTypeContainerRepository.cs
index 4110d40548..13003d2377 100644
--- a/src/Umbraco.Core/Persistence/Repositories/DocumentTypeContainerRepository.cs
+++ b/src/Umbraco.Core/Persistence/Repositories/Implement/DocumentTypeContainerRepository.cs
@@ -2,7 +2,7 @@
 using Umbraco.Core.Logging;
 using Umbraco.Core.Persistence.UnitOfWork;
 
-namespace Umbraco.Core.Persistence.Repositories
+namespace Umbraco.Core.Persistence.Repositories.Implement
 {
     class DocumentTypeContainerRepository : EntityContainerRepository, IDocumentTypeContainerRepository
     {
diff --git a/src/Umbraco.Core/Persistence/Repositories/DomainRepository.cs b/src/Umbraco.Core/Persistence/Repositories/Implement/DomainRepository.cs
similarity index 95%
rename from src/Umbraco.Core/Persistence/Repositories/DomainRepository.cs
rename to src/Umbraco.Core/Persistence/Repositories/Implement/DomainRepository.cs
index 789082286c..f3af65d469 100644
--- a/src/Umbraco.Core/Persistence/Repositories/DomainRepository.cs
+++ b/src/Umbraco.Core/Persistence/Repositories/Implement/DomainRepository.cs
@@ -10,7 +10,7 @@ using Umbraco.Core.Models.Rdbms;
 using Umbraco.Core.Persistence.Querying;
 using Umbraco.Core.Persistence.UnitOfWork;
 
-namespace Umbraco.Core.Persistence.Repositories
+namespace Umbraco.Core.Persistence.Repositories.Implement
 {
     //TODO: We need to get a readonly ISO code for the domain assigned
 
@@ -30,7 +30,7 @@ namespace Umbraco.Core.Persistence.Repositories
         protected override IDomain PerformGet(int id)
         {
             //use the underlying GetAll which will force cache all domains
-            return GetAll().FirstOrDefault(x => x.Id == id);
+            return GetMany().FirstOrDefault(x => x.Id == id);
         }
 
         protected override IEnumerable<IDomain> PerformGetAll(params int[] ids)
@@ -157,22 +157,22 @@ namespace Umbraco.Core.Persistence.Repositories
 
         public IDomain GetByName(string domainName)
         {
-            return GetAll().FirstOrDefault(x => x.DomainName.InvariantEquals(domainName));
+            return GetMany().FirstOrDefault(x => x.DomainName.InvariantEquals(domainName));
         }
 
         public bool Exists(string domainName)
         {
-            return GetAll().Any(x => x.DomainName.InvariantEquals(domainName));
+            return GetMany().Any(x => x.DomainName.InvariantEquals(domainName));
         }
 
         public IEnumerable<IDomain> GetAll(bool includeWildcards)
         {
-            return GetAll().Where(x => includeWildcards || x.IsWildcard == false);
+            return GetMany().Where(x => includeWildcards || x.IsWildcard == false);
         }
 
         public IEnumerable<IDomain> GetAssignedDomains(int contentId, bool includeWildcards)
         {
-            return GetAll()
+            return GetMany()
                 .Where(x => x.RootContentId == contentId)
                 .Where(x => includeWildcards || x.IsWildcard == false);
         }
diff --git a/src/Umbraco.Core/Persistence/Repositories/EntityContainerRepository.cs b/src/Umbraco.Core/Persistence/Repositories/Implement/EntityContainerRepository.cs
similarity index 99%
rename from src/Umbraco.Core/Persistence/Repositories/EntityContainerRepository.cs
rename to src/Umbraco.Core/Persistence/Repositories/Implement/EntityContainerRepository.cs
index 7002518bf8..4ff4ff24e0 100644
--- a/src/Umbraco.Core/Persistence/Repositories/EntityContainerRepository.cs
+++ b/src/Umbraco.Core/Persistence/Repositories/Implement/EntityContainerRepository.cs
@@ -10,7 +10,7 @@ using Umbraco.Core.Models.Rdbms;
 using Umbraco.Core.Persistence.Querying;
 using Umbraco.Core.Persistence.UnitOfWork;
 
-namespace Umbraco.Core.Persistence.Repositories
+namespace Umbraco.Core.Persistence.Repositories.Implement
 {
     /// <summary>
     /// An internal repository for managing entity containers such as doc type, media type, data type containers.
diff --git a/src/Umbraco.Core/Persistence/Repositories/EntityRepository.cs b/src/Umbraco.Core/Persistence/Repositories/Implement/EntityRepository.cs
similarity index 97%
rename from src/Umbraco.Core/Persistence/Repositories/EntityRepository.cs
rename to src/Umbraco.Core/Persistence/Repositories/Implement/EntityRepository.cs
index 5afb1abdee..f9cab92a44 100644
--- a/src/Umbraco.Core/Persistence/Repositories/EntityRepository.cs
+++ b/src/Umbraco.Core/Persistence/Repositories/Implement/EntityRepository.cs
@@ -1,866 +1,865 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using NPoco;
-using Umbraco.Core.Models;
-using Umbraco.Core.Models.EntityBase;
-using Umbraco.Core.Models.Rdbms;
-using Umbraco.Core.Persistence.DatabaseModelDefinitions;
-using Umbraco.Core.Persistence.Querying;
-using Umbraco.Core.Persistence.UnitOfWork;
-using static Umbraco.Core.Persistence.NPocoSqlExtensions.Statics;
-
-namespace Umbraco.Core.Persistence.Repositories
-{
-    // fixme - use sql templates everywhere!
-
-    /// <summary>
-    /// Represents the EntityRepository used to query <see cref="IUmbracoEntity"/> objects.
-    /// </summary>
-    /// <remarks>
-    /// This is limited to objects that are based in the umbracoNode-table.
-    /// </remarks>
-    internal class EntityRepository : IEntityRepository
-    {
-        public EntityRepository(IScopeUnitOfWork work)
-        {
-            UnitOfWork = work;
-        }
-
-        protected IScopeUnitOfWork UnitOfWork { get; }
-        protected IUmbracoDatabase Database => UnitOfWork.Database;
-        protected Sql<ISqlContext> Sql() => UnitOfWork.SqlContext.Sql();
-
-        #region Repository
-
-        // get a page of entities
-        public IEnumerable<IUmbracoEntity> GetPagedResultsByQuery(IQuery<IUmbracoEntity> query, Guid objectType, long pageIndex, int pageSize, out long totalRecords,
-            string orderBy, Direction orderDirection, IQuery<IUmbracoEntity> filter = null)
-        {
-            var isContent = objectType == Constants.ObjectTypes.Document || objectType == Constants.ObjectTypes.DocumentBlueprint;
-            var isMedia = objectType == Constants.ObjectTypes.Media;
-
-            var sql = GetBaseWhere(isContent, isMedia, false, x =>
-            {
-                if (filter == null) return;
-                foreach (var filterClause in filter.GetWhereClauses())
-                    x.Where(filterClause.Item1, filterClause.Item2);
-            }, objectType);
-
-            var translator = new SqlTranslator<IUmbracoEntity>(sql, query);
-            sql = translator.Translate();
-            sql = AddGroupBy(isContent, isMedia, sql);
-            sql = sql.OrderBy<NodeDto>(x => x.NodeId);
-
-            //IEnumerable<IUmbracoEntity> result;
-            //
-            //if (isMedia)
-            //{
-            //    //Treat media differently for now, as an Entity it will be returned with ALL of it's properties in the AdditionalData bag!
-            //    var pagedResult = UnitOfWork.Database.Page<dynamic>(pageIndex + 1, pageSize, pagedSql);
-
-            //    var ids = pagedResult.Items.Select(x => (int)x.id).InGroupsOf(2000);
-            //    var entities = pagedResult.Items.Select(BuildEntityFromDynamic).Cast<IUmbracoEntity>().ToList();
-
-            //    //Now we need to merge in the property data since we need paging and we can't do this the way that the big media query was working before
-            //    foreach (var idGroup in ids)
-            //    {
-            //        var propSql = GetPropertySql(Constants.ObjectTypes.Media)
-            //            .WhereIn<NodeDto>(x => x.NodeId, idGroup)
-            //            .OrderBy<NodeDto>(x => x.NodeId);
-
-            //        //This does NOT fetch all data into memory in a list, this will read
-            //        // over the records as a data reader, this is much better for performance and memory,
-            //        // but it means that during the reading of this data set, nothing else can be read
-            //        // from SQL server otherwise we'll get an exception.
-            //        var allPropertyData = UnitOfWork.Database.Query<dynamic>(propSql);
-
-            //        //keep track of the current property data item being enumerated
-            //        var propertyDataSetEnumerator = allPropertyData.GetEnumerator();
-            //        var hasCurrent = false; // initially there is no enumerator.Current
-
-            //        try
-            //        {
-            //            //This must be sorted by node id (which is done by SQL) because this is how we are sorting the query to lookup property types above,
-            //            // which allows us to more efficiently iterate over the large data set of property values.
-            //            foreach (var entity in entities)
-            //            {
-            //                // assemble the dtos for this def
-            //                // use the available enumerator.Current if any else move to next
-            //                while (hasCurrent || propertyDataSetEnumerator.MoveNext())
-            //                {
-            //                    if (propertyDataSetEnumerator.Current.nodeId == entity.Id)
-            //                    {
-            //                        hasCurrent = false; // enumerator.Current is not available
-
-            //                        //the property data goes into the additional data
-            //                        entity.AdditionalData[propertyDataSetEnumerator.Current.propertyTypeAlias] = new UmbracoEntity.EntityProperty
-            //                        {
-            //                            PropertyEditorAlias = propertyDataSetEnumerator.Current.propertyEditorAlias,
-            //                            Value = StringExtensions.IsNullOrWhiteSpace(propertyDataSetEnumerator.Current.textValue)
-            //                                ? propertyDataSetEnumerator.Current.varcharValue
-            //                                : StringExtensions.ConvertToJsonIfPossible(propertyDataSetEnumerator.Current.textValue)
-            //                        };
-            //                    }
-            //                    else
-            //                    {
-            //                        hasCurrent = true; // enumerator.Current is available for another def
-            //                        break; // no more propertyDataDto for this def
-            //                    }
-            //                }
-            //            }
-            //        }
-            //        finally
-            //        {
-            //            propertyDataSetEnumerator.Dispose();
-            //        }
-            //    }
-
-            //    result = entities;
-            //}
-            //else
-            //{
-            //    var pagedResult = UnitOfWork.Database.Page<dynamic>(pageIndex + 1, pageSize, pagedSql);
-            //    result = pagedResult.Items.Select(BuildEntityFromDynamic).Cast<IUmbracoEntity>().ToList();
-            //}
-
-            var page = Database.Page<BaseDto>(pageIndex + 1, pageSize, sql);
-            var dtos = page.Items;
-            var entities = dtos.Select(x => BuildEntity(isContent, isMedia, x)).ToArray();
-
-            if (isMedia)
-                BuildProperties(entities, dtos);
-
-            totalRecords = page.TotalItems;
-            return entities;
-        }
-
-        public IUmbracoEntity GetByKey(Guid key)
-        {
-            var sql = GetBaseWhere(false, false, false, key);
-            var dto = Database.FirstOrDefault<BaseDto>(sql);
-            return dto == null ? null : BuildEntity(false, false, dto);
-        }
-
-        public IUmbracoEntity GetByKey(Guid key, Guid objectTypeId)
-        {
-            var isContent = objectTypeId == Constants.ObjectTypes.Document || objectTypeId == Constants.ObjectTypes.DocumentBlueprint;
-            var isMedia = objectTypeId == Constants.ObjectTypes.Media;
-
-            var sql = GetFullSqlForEntityType(isContent, isMedia, objectTypeId, key);
-            var dto = Database.FirstOrDefault<BaseDto>(sql);
-            if (dto == null) return null;
-
-            var entity = BuildEntity(isContent, isMedia, dto);
-
-            if (isMedia)
-                BuildProperties(entity, dto);
-
-            return entity;
-        }
-
-        public virtual IUmbracoEntity Get(int id)
-        {
-            var sql = GetBaseWhere(false, false, false, id);
-            var dto = Database.FirstOrDefault<BaseDto>(sql);
-            return dto == null ? null : BuildEntity(false, false, dto);
-        }
-
-        public virtual IUmbracoEntity Get(int id, Guid objectTypeId)
-        {
-            var isContent = objectTypeId == Constants.ObjectTypes.Document || objectTypeId == Constants.ObjectTypes.DocumentBlueprint;
-            var isMedia = objectTypeId == Constants.ObjectTypes.Media;
-
-            var sql = GetFullSqlForEntityType(isContent, isMedia, objectTypeId, id);
-            var dto = Database.FirstOrDefault<BaseDto>(sql);
-            if (dto == null) return null;
-
-            var entity = BuildEntity(isContent, isMedia, dto);
-
-            if (isMedia)
-                BuildProperties(entity, dto);
-
-            return entity;
-        }
-
-        public virtual IEnumerable<IUmbracoEntity> GetAll(Guid objectType, params int[] ids)
-        {
-            return ids.Length > 0
-                ? PerformGetAll(objectType, sql => sql.WhereIn<NodeDto>(x => x.NodeId, ids.Distinct()))
-                : PerformGetAll(objectType);
-        }
-
-        public virtual IEnumerable<IUmbracoEntity> GetAll(Guid objectType, params Guid[] keys)
-        {
-            return keys.Length > 0
-                ? PerformGetAll(objectType, sql => sql.WhereIn<NodeDto>(x => x.UniqueId, keys.Distinct()))
-                : PerformGetAll(objectType);
-        }
-
-        private IEnumerable<IUmbracoEntity> PerformGetAll(Guid objectType, Action<Sql<ISqlContext>> filter = null)
-        {
-            var isContent = objectType == Constants.ObjectTypes.Document || objectType == Constants.ObjectTypes.DocumentBlueprint;
-            var isMedia = objectType == Constants.ObjectTypes.Media;
-
-            var sql = GetFullSqlForEntityType(isContent, isMedia, objectType, filter);
-            var dtos = Database.Fetch<BaseDto>(sql);
-            if (dtos.Count == 0) return Enumerable.Empty<IUmbracoEntity>();
-
-            var entities = dtos.Select(x => BuildEntity(isContent, isMedia, x)).ToArray();
-
-            if (isMedia)
-                BuildProperties(entities, dtos);
-
-            return entities;
-        }
-
-        public virtual IEnumerable<EntityPath> GetAllPaths(Guid objectType, params int[] ids)
-        {
-            return ids.Any()
-                ? PerformGetAllPaths(objectType, sql => sql.WhereIn<NodeDto>(x => x.NodeId, ids.Distinct()))
-                : PerformGetAllPaths(objectType);
-        }
-
-        public virtual IEnumerable<EntityPath> GetAllPaths(Guid objectType, params Guid[] keys)
-        {
-            return keys.Any()
-                ? PerformGetAllPaths(objectType, sql => sql.WhereIn<NodeDto>(x => x.UniqueId, keys.Distinct()))
-                : PerformGetAllPaths(objectType);
-        }
-
-        private IEnumerable<EntityPath> PerformGetAllPaths(Guid objectType, Action<Sql<ISqlContext>> filter = null)
-        {
-            var sql = Sql().Select<NodeDto>(x => x.NodeId, x => x.Path).From<NodeDto>().Where<NodeDto>(x => x.NodeObjectType == objectType);
-            filter?.Invoke(sql);
-            return Database.Fetch<EntityPath>(sql);
-        }
-
-        public virtual IEnumerable<IUmbracoEntity> GetByQuery(IQuery<IUmbracoEntity> query)
-        {
-            var sqlClause = GetBase(false, false, null);
-            var translator = new SqlTranslator<IUmbracoEntity>(sqlClause, query);
-            var sql = translator.Translate();
-            sql = AddGroupBy(false, false, sql);
-            var dtos = Database.Fetch<BaseDto>(sql);
-            return dtos.Select(x => BuildEntity(false, false, x)).ToList();
-        }
-
-        public virtual IEnumerable<IUmbracoEntity> GetByQuery(IQuery<IUmbracoEntity> query, Guid objectType)
-        {
-            var isContent = objectType == Constants.ObjectTypes.Document || objectType == Constants.ObjectTypes.DocumentBlueprint;
-            var isMedia = objectType == Constants.ObjectTypes.Media;
-
-            var sql = GetBaseWhere(isContent, isMedia, false, null, objectType);
-            var translator = new SqlTranslator<IUmbracoEntity>(sql, query);
-            sql = translator.Translate();
-            sql = AddGroupBy(isContent, isMedia, sql);
-            var dtos = Database.Fetch<BaseDto>(sql);
-            if (dtos.Count == 0) return Enumerable.Empty<IUmbracoEntity>();
-
-            var entities = dtos.Select(x => BuildEntity(isContent, isMedia, x)).ToArray();
-
-            if (isMedia)
-                BuildProperties(entities, dtos);
-
-            return entities;
-        }
-
-        public UmbracoObjectTypes GetObjectType(int id)
-        {
-            var sql = Sql().Select<NodeDto>(x => x.NodeObjectType).From<NodeDto>().Where<NodeDto>(x => x.NodeId == id);
-            return UmbracoObjectTypesExtensions.GetUmbracoObjectType(Database.ExecuteScalar<Guid>(sql));
-        }
-
-        public UmbracoObjectTypes GetObjectType(Guid key)
-        {
-            var sql = Sql().Select<NodeDto>(x => x.NodeObjectType).From<NodeDto>().Where<NodeDto>(x => x.UniqueId == key);
-            return UmbracoObjectTypesExtensions.GetUmbracoObjectType(Database.ExecuteScalar<Guid>(sql));
-        }
-
-        public bool Exists(Guid key)
-        {
-            var sql = Sql().SelectCount().From<NodeDto>().Where<NodeDto>(x => x.UniqueId == key);
-            return Database.ExecuteScalar<int>(sql) > 0;
-        }
-
-        public bool Exists(int id)
-        {
-            var sql = Sql().SelectCount().From<NodeDto>().Where<NodeDto>(x => x.NodeId == id);
-            return Database.ExecuteScalar<int>(sql) > 0;
-        }
-
-        private void BuildProperties(UmbracoEntity entity, BaseDto dto)
-        {
-            var pdtos = Database.Fetch<PropertyDataDto>(GetPropertyData(dto.VersionId));
-            foreach (var pdto in pdtos)
-                BuildProperty(entity, pdto);
-        }
-
-        private void BuildProperties(UmbracoEntity[] entities, List<BaseDto> dtos)
-        {
-            var versionIds = dtos.Select(x => x.VersionId).Distinct().ToArray();
-            var pdtos = Database.FetchByGroups<PropertyDataDto, int>(versionIds, 2000, GetPropertyData);
-
-            var xentity = entities.ToDictionary(x => x.Id, x => x); // nodeId -> entity
-            var xdto = dtos.ToDictionary(x => x.VersionId, x => x.NodeId); // versionId -> nodeId
-            foreach (var pdto in pdtos)
-            {
-                var nodeId = xdto[pdto.VersionId];
-                var entity = xentity[nodeId];
-                BuildProperty(entity, pdto);
-            }
-        }
-
-        private void BuildProperty(UmbracoEntity entity, PropertyDataDto pdto)
-        {
-            // explain ?!
-            var value = string.IsNullOrWhiteSpace(pdto.TextValue)
-                ? pdto.VarcharValue
-                : pdto.TextValue.ConvertToJsonIfPossible();
-
-            entity.AdditionalData[pdto.PropertyTypeDto.Alias] = new UmbracoEntity.EntityProperty
-            {
-                PropertyEditorAlias = pdto.PropertyTypeDto.DataTypeDto.PropertyEditorAlias,
-                Value = value
-            };
-        }
-
-        #endregion
-
-        #region Sql
-
-        // gets the full sql for a given object type and a given unique id
-        protected Sql<ISqlContext> GetFullSqlForEntityType(bool isContent, bool isMedia, Guid objectType, Guid uniqueId)
-        {
-            var sql = GetBaseWhere(isContent, isMedia, false, objectType, uniqueId);
-            return AddGroupBy(isContent, isMedia, sql);
-        }
-
-        // gets the full sql for a given object type and a given node id
-        protected Sql<ISqlContext> GetFullSqlForEntityType(bool isContent, bool isMedia, Guid objectType, int nodeId)
-        {
-            var sql = GetBaseWhere(isContent, isMedia, false, objectType, nodeId);
-            return AddGroupBy(isContent, isMedia, sql);
-        }
-
-        // gets the full sql for a given object type, with a given filter
-        protected Sql<ISqlContext> GetFullSqlForEntityType(bool isContent, bool isMedia, Guid objectType, Action<Sql<ISqlContext>> filter)
-        {
-            var sql = GetBaseWhere(isContent, isMedia, false, filter, objectType);
-            return AddGroupBy(isContent, isMedia, sql);
-        }
-
-        // fixme kill this nonsense
-        //// gets the SELECT + FROM + WHERE sql
-        //// to get all property data for all items of the specified object type
-        //private Sql<ISqlContext> GetPropertySql(Guid objectType)
-        //{
-        //    return Sql()
-        //        .Select<PropertyDataDto>(x => x.VersionId, x => x.TextValue, x => x.VarcharValue)
-        //        .AndSelect<NodeDto>(x => x.NodeId)
-        //        .AndSelect<DataTypeDto>(x => x.PropertyEditorAlias)
-        //        .AndSelect<PropertyTypeDto>(x => Alias(x.Alias, "propertyTypeAlias"))
-        //        .From<PropertyDataDto>()
-        //        .InnerJoin<ContentVersionDto>().On<PropertyDataDto, ContentVersionDto>((left, right) => left.VersionId == right.Id)
-        //        .InnerJoin<NodeDto>().On<ContentVersionDto, NodeDto>((left, right) => left.NodeId == right.NodeId)
-        //        .InnerJoin<PropertyTypeDto>().On<PropertyDataDto, PropertyTypeDto>(dto => dto.PropertyTypeId, dto => dto.Id)
-        //        .InnerJoin<DataTypeDto>().On<PropertyTypeDto, DataTypeDto>(dto => dto.DataTypeId, dto => dto.DataTypeId)
-        //        .Where<NodeDto>(x => x.NodeObjectType == objectType);
-        //}
-
-        private Sql<ISqlContext> GetPropertyData(int versionId)
-        {
-            return Sql()
-                .Select<PropertyDataDto>(r => r.Select(x => x.PropertyTypeDto, r1 => r1.Select(x => x.DataTypeDto)))
-                .From<PropertyDataDto>()
-                .InnerJoin<PropertyTypeDto>().On<PropertyDataDto, PropertyTypeDto>((left, right) => left.PropertyTypeId == right.Id)
-                .InnerJoin<DataTypeDto>().On<PropertyTypeDto, DataTypeDto>((left, right) => left.DataTypeId == right.DataTypeId)
-                .Where<PropertyDataDto>(x => x.VersionId == versionId);
-        }
-
-        private Sql<ISqlContext> GetPropertyData(IEnumerable<int> versionIds)
-        {
-            return Sql()
-                .Select<PropertyDataDto>(r => r.Select(x => x.PropertyTypeDto, r1 => r1.Select(x => x.DataTypeDto)))
-                .From<PropertyDataDto>()
-                .InnerJoin<PropertyTypeDto>().On<PropertyDataDto, PropertyTypeDto>((left, right) => left.PropertyTypeId == right.Id)
-                .InnerJoin<DataTypeDto>().On<PropertyTypeDto, DataTypeDto>((left, right) => left.DataTypeId == right.DataTypeId)
-                .WhereIn<PropertyDataDto>(x => x.VersionId, versionIds)
-                .OrderBy<PropertyDataDto>(x => x.VersionId);
-        }
-
-        // fixme - wtf is this?
-        //private Sql<ISqlContext> GetFullSqlForMedia(Sql<ISqlContext> entitySql, Action<Sql<ISqlContext>> filter = null)
-        //{
-        //    //this will add any varcharValue property to the output which can be added to the additional properties
-
-        //    var sql = GetPropertySql(Constants.ObjectTypes.Media);
-
-        //    filter?.Invoke(sql);
-
-        //    // We're going to create a query to query against the entity SQL
-        //    // because we cannot group by nText columns and we have a COUNT in the entitySql we cannot simply left join
-        //    // the entitySql query, we have to join the wrapped query to get the ntext in the result
-
-        //    var wrappedSql = Sql()
-        //        .Append("SELECT * FROM (")
-        //        .Append(entitySql)
-        //        .Append(") tmpTbl LEFT JOIN (")
-        //        .Append(sql)
-        //        .Append(") as property ON id = property.nodeId")
-        //        .OrderBy("sortOrder, id");
-
-        //    return wrappedSql;
-        //}
-
-        // the DTO corresponding to fields selected by GetBase
-        // ReSharper disable once ClassNeverInstantiated.Local
-        private class BaseDto
-        {
-            // ReSharper disable UnusedAutoPropertyAccessor.Local
-            // ReSharper disable UnusedMember.Local
-            public int NodeId { get; set; }
-            public bool Trashed { get; set; }
-            public int ParentId { get; set; }
-            public int? UserId { get; set; }
-            public int Level { get; set; }
-            public string Path { get; set; }
-            public int SortOrder { get; set; }
-            public Guid UniqueId { get; set; }
-            public string Text { get; set; }
-            public Guid NodeObjectType { get; set; }
-            public DateTime CreateDate { get; set; }
-            public int Children { get; set; }
-            public int VersionId { get; set; }
-            public bool Published { get; set; }
-            public bool Edited { get; set; }
-            public string Alias { get; set; }
-            public string Icon { get; set; }
-            public string Thumbnail { get; set; }
-            public bool IsContainer { get; set; }
-            // ReSharper restore UnusedAutoPropertyAccessor.Local
-            // ReSharper restore UnusedMember.Local
-        }
-
-        // gets the base SELECT + FROM [+ filter] sql
-        // always from the 'current' content version
-        protected virtual Sql<ISqlContext> GetBase(bool isContent, bool isMedia, Action<Sql<ISqlContext>> filter, bool isCount = false)
-        {
-            var sql = Sql();
-
-            if (isCount)
-            {
-                sql.SelectCount();
-            }
-            else
-            {
-                sql
-                    .Select<NodeDto>(x => x.NodeId, x => x.Trashed, x => x.ParentId, x => x.UserId, x => x.Level, x => x.Path)
-                    .AndSelect<NodeDto>(x => x.SortOrder, x => x.UniqueId, x => x.Text, x => x.NodeObjectType, x => x.CreateDate)
-                    .Append(", COUNT(child.id) AS children");
-
-                if (isContent)
-                    sql
-                        .AndSelect<DocumentDto>(x => x.Published, x => x.Edited);
-
-                if (isContent || isMedia)
-                    sql
-                        .AndSelect<ContentVersionDto>(x => Alias(x.Id, "versionId"))
-                        .AndSelect<ContentTypeDto>(x => x.Alias, x => x.Icon, x => x.Thumbnail, x => x.IsContainer);
-            }
-
-            sql
-                .From<NodeDto>();
-
-            if (isContent || isMedia)
-            {
-                sql
-                    .InnerJoin<ContentVersionDto>().On<NodeDto, ContentVersionDto>((left, right) => left.NodeId == right.NodeId && right.Current)
-                    .InnerJoin<ContentDto>().On<NodeDto, ContentDto>((left, right) => left.NodeId == right.NodeId)
-                    .LeftJoin<ContentTypeDto>().On<ContentDto, ContentTypeDto>((left, right) => left.ContentTypeId == right.NodeId);
-            }
-
-            if (isContent)
-            {
-                sql
-                    .InnerJoin<DocumentDto>().On<NodeDto, DocumentDto>((left, right) => left.NodeId == right.NodeId);
-            }
-
-            if (isCount == false)
-                sql
-                    .LeftJoin<NodeDto>("child").On<NodeDto, NodeDto>((left, right) => left.NodeId == right.ParentId, aliasRight: "child");
-
-            filter?.Invoke(sql);
-
-            return sql;
-        }
-
-        // gets the base SELECT + FROM [+ filter] + WHERE sql
-        // for a given object type, with a given filter
-        protected virtual Sql<ISqlContext> GetBaseWhere(bool isContent, bool isMedia, bool isCount, Action<Sql<ISqlContext>> filter, Guid objectType)
-        {
-            return GetBase(isContent, isMedia, filter, isCount)
-                .Where<NodeDto>(x => x.NodeObjectType == objectType);
-        }
-
-        // gets the base SELECT + FROM + WHERE sql
-        // for a given node id
-        protected virtual Sql<ISqlContext> GetBaseWhere(bool isContent, bool isMedia, bool isCount, int id)
-        {
-            var sql = GetBase(isContent, isMedia, null, isCount)
-                .Where<NodeDto>(x => x.NodeId == id);
-            return AddGroupBy(isContent, isMedia, sql);
-        }
-
-        // gets the base SELECT + FROM + WHERE sql
-        // for a given unique id
-        protected virtual Sql<ISqlContext> GetBaseWhere(bool isContent, bool isMedia, bool isCount, Guid uniqueId)
-        {
-            var sql = GetBase(isContent, isMedia, null, isCount)
-                .Where<NodeDto>(x => x.UniqueId == uniqueId);
-            return AddGroupBy(isContent, isMedia, sql);
-        }
-
-        // gets the base SELECT + FROM + WHERE sql
-        // for a given object type and node id
-        protected virtual Sql<ISqlContext> GetBaseWhere(bool isContent, bool isMedia, bool isCount, Guid objectType, int nodeId)
-        {
-            return GetBase(isContent, isMedia, null, isCount)
-                .Where<NodeDto>(x => x.NodeId == nodeId && x.NodeObjectType == objectType);
-        }
-
-        // gets the base SELECT + FROM + WHERE sql
-        // for a given object type and unique id
-        protected virtual Sql<ISqlContext> GetBaseWhere(bool isContent, bool isMedia, bool isCount, Guid objectType, Guid uniqueId)
-        {
-            return GetBase(isContent, isMedia, null, isCount)
-                .Where<NodeDto>(x => x.UniqueId == uniqueId && x.NodeObjectType == objectType);
-        }
-
-        // gets the GROUP BY / ORDER BY sql
-        // required in order to count children
-        protected virtual Sql<ISqlContext> AddGroupBy(bool isContent, bool isMedia, Sql<ISqlContext> sql, bool sort = true)
-        {
-            sql
-                .GroupBy<NodeDto>(x => x.NodeId, x => x.Trashed, x => x.ParentId, x => x.UserId, x => x.Level, x => x.Path)
-                .AndBy<NodeDto>(x => x.SortOrder, x => x.UniqueId, x => x.Text, x => x.NodeObjectType, x => x.CreateDate);
-
-            if (isContent)
-                sql
-                    .AndBy<DocumentDto>(x => x.Published, x => x.Edited);
-
-            if (isContent || isMedia)
-                sql
-                    .AndBy<ContentVersionDto>(x => x.Id)
-                    .AndBy<ContentTypeDto>(x => x.Alias, x => x.Icon, x => x.Thumbnail, x => x.IsContainer);
-
-            if (sort)
-                sql.OrderBy<NodeDto>(x => x.SortOrder);
-
-            return sql;
-        }
-
-        #endregion
-
-        #region Classes
-
-        [ExplicitColumns]
-        internal class UmbracoPropertyDto
-        {
-            [Column("propertyEditorAlias")]
-            public string PropertyEditorAlias { get; set; }
-
-            [Column("propertyTypeAlias")]
-            public string PropertyAlias { get; set; }
-
-            [Column("varcharValue")]
-            public string VarcharValue { get; set; }
-
-            [Column("textValue")]
-            public string TextValue { get; set; }
-        }
-
-        // fixme kill
-        /// <summary>
-        /// This is a special relator in that it is not returning a DTO but a real resolved entity and that it accepts
-        /// a dynamic instance.
-        /// </summary>
-        /// <remarks>
-        /// We're doing this because when we query the db, we want to use dynamic so that it returns all available fields not just the ones
-        ///     defined on the entity so we can them to additional data
-        /// </remarks>
-        //internal class UmbracoEntityRelator
-        //{
-        //    internal UmbracoEntity Current;
-
-        //    public IEnumerable<IUmbracoEntity> MapAll(IEnumerable<dynamic> input)
-        //    {
-        //        UmbracoEntity entity;
-
-        //        foreach (var x in input)
-        //        {
-        //            entity = Map(x);
-        //            if (entity != null) yield return entity;
-        //        }
-
-        //        entity = Map((dynamic) null);
-        //        if (entity != null) yield return entity;
-        //    }
-
-        //    // must be called one last time with null in order to return the last one!
-        //    public UmbracoEntity Map(dynamic a)
-        //    {
-        //        // Terminating call.  Since we can return null from this function
-        //        // we need to be ready for NPoco to callback later with null
-        //        // parameters
-        //        if (a == null)
-        //            return Current;
-
-        //        string pPropertyEditorAlias = a.propertyEditorAlias;
-        //        var pExists = pPropertyEditorAlias != null;
-        //        string pPropertyAlias = a.propertyTypeAlias;
-        //        string pTextValue = a.textValue;
-        //        string pNVarcharValue = a.varcharValue;
-
-        //        // Is this the same UmbracoEntity as the current one we're processing
-        //        if (Current != null && Current.Key == a.uniqueID)
-        //        {
-        //            if (pExists && pPropertyAlias.IsNullOrWhiteSpace() == false)
-        //            {
-        //                // Add this UmbracoProperty to the current additional data
-        //                Current.AdditionalData[pPropertyAlias] = new UmbracoEntity.EntityProperty
-        //                {
-        //                    PropertyEditorAlias = pPropertyEditorAlias,
-        //                    Value = pTextValue.IsNullOrWhiteSpace()
-        //                        ? pNVarcharValue
-        //                        : pTextValue.ConvertToJsonIfPossible()
-        //                };
-        //            }
-
-        //            // Return null to indicate we're not done with this UmbracoEntity yet
-        //            return null;
-        //        }
-
-        //        // This is a different UmbracoEntity to the current one, or this is the
-        //        // first time through and we don't have a Tab yet
-
-        //        // Save the current UmbracoEntityDto
-        //        var prev = Current;
-
-        //        // Setup the new current UmbracoEntity
-
-        //        Current = BuildEntityFromDynamic(a);
-
-        //        if (pExists && pPropertyAlias.IsNullOrWhiteSpace() == false)
-        //        {
-        //            //add the property/create the prop list if null
-        //            Current.AdditionalData[pPropertyAlias] = new UmbracoEntity.EntityProperty
-        //            {
-        //                PropertyEditorAlias = pPropertyEditorAlias,
-        //                Value = pTextValue.IsNullOrWhiteSpace()
-        //                    ? pNVarcharValue
-        //                    : pTextValue.ConvertToJsonIfPossible()
-        //            };
-        //        }
-
-        //        // Return the now populated previous UmbracoEntity (or null if first time through)
-        //        return prev;
-        //    }
-        //}
-
-        // fixme need to review what's below
-        // comes from 7.6, similar to what's in VersionableRepositoryBase
-        // not sure it really makes sense...
-
-        //private class EntityDefinitionCollection : KeyedCollection<int, EntityDefinition>
-        //{
-        //    protected override int GetKeyForItem(EntityDefinition item)
-        //    {
-        //        return item.Id;
-        //    }
-
-        //    /// <summary>
-        //    /// if this key already exists if it does then we need to check
-        //    /// if the existing item is 'older' than the new item and if that is the case we'll replace the older one
-        //    /// </summary>
-        //    /// <param name="item"></param>
-        //    /// <returns></returns>
-        //    public bool AddOrUpdate(EntityDefinition item)
-        //    {
-        //        if (Dictionary == null)
-        //        {
-        //            Add(item);
-        //            return true;
-        //        }
-
-        //        var key = GetKeyForItem(item);
-        //        if (TryGetValue(key, out EntityDefinition found))
-        //        {
-        //            //it already exists and it's older so we need to replace it
-        //            if (item.VersionId > found.VersionId)
-        //            {
-        //                var currIndex = Items.IndexOf(found);
-        //                if (currIndex == -1)
-        //                    throw new IndexOutOfRangeException("Could not find the item in the list: " + found.Id);
-
-        //                //replace the current one with the newer one
-        //                SetItem(currIndex, item);
-        //                return true;
-        //            }
-        //            //could not add or update
-        //            return false;
-        //        }
-
-        //        Add(item);
-        //        return true;
-        //    }
-
-        //    private bool TryGetValue(int key, out EntityDefinition val)
-        //    {
-        //        if (Dictionary != null) return Dictionary.TryGetValue(key, out val);
-
-        //        val = null;
-        //        return false;
-        //    }
-        //}
-
-        // fixme wtf is this, why dynamics here, this is horrible !!
-        //private class EntityDefinition
-        //{
-        //    private readonly dynamic _entity;
-        //    private readonly bool _isContent;
-        //    private readonly bool _isMedia;
-
-        //    public EntityDefinition(dynamic entity, bool isContent, bool isMedia)
-        //    {
-        //        _entity = entity;
-        //        _isContent = isContent;
-        //        _isMedia = isMedia;
-        //    }
-
-        //    public IUmbracoEntity BuildFromDynamic()
-        //    {
-        //        return BuildEntityFromDynamic(_entity);
-        //    }
-
-        //    public int Id => _entity.id;
-
-        //    public int VersionId
-        //    {
-        //        get
-        //        {
-        //            if (_isContent || _isMedia)
-        //            {
-        //                return _entity.versionId;
-        //            }
-        //            return _entity.id;
-        //        }
-        //    }
-        //}
-
-        #endregion
-
-        #region Factory
-
-        // fixme kill all this
-        //private static void AddAdditionalData(UmbracoEntity entity, IDictionary<string, object> originalEntityProperties)
-        //{
-        //    var entityProps = typeof(IUmbracoEntity).GetPublicProperties().Select(x => x.Name).ToArray();
-
-        //    // figure out what extra properties we have that are not on the IUmbracoEntity and add them to additional data
-        //    foreach (var k in originalEntityProperties.Keys
-        //        .Select(x => new { orig = x, title = x.ToCleanString(CleanStringType.PascalCase | CleanStringType.Ascii | CleanStringType.ConvertCase) })
-        //        .Where(x => entityProps.InvariantContains(x.title) == false))
-        //    {
-        //        entity.AdditionalData[k.title] = originalEntityProperties[k.orig];
-        //    }
-        //}
-
-        //private static UmbracoEntity BuildEntityFromDynamic(dynamic d)
-        //{
-        //    var asDictionary = (IDictionary<string, object>) d;
-        //    var entity = new UmbracoEntity(d.trashed);
-
-        //    try
-        //    {
-        //        entity.DisableChangeTracking();
-
-        //        entity.CreateDate = d.createDate;
-        //        entity.CreatorId = d.nodeUser == null ? 0 : d.nodeUser;
-        //        entity.Id = d.id;
-        //        entity.Key = d.uniqueID;
-        //        entity.Level = d.level;
-        //        entity.Name = d.text;
-        //        entity.NodeObjectTypeId = d.nodeObjectType;
-        //        entity.ParentId = d.parentID;
-        //        entity.Path = d.path;
-        //        entity.SortOrder = d.sortOrder;
-        //        entity.HasChildren = d.children > 0;
-
-        //        entity.ContentTypeAlias = asDictionary.ContainsKey("alias") ? (d.alias ?? string.Empty) : string.Empty;
-        //        entity.ContentTypeIcon = asDictionary.ContainsKey("icon") ? (d.icon ?? string.Empty) : string.Empty;
-        //        entity.ContentTypeThumbnail = asDictionary.ContainsKey("thumbnail") ? (d.thumbnail ?? string.Empty) : string.Empty;
-        //        //entity.VersionId = asDictionary.ContainsKey("versionId") ? asDictionary["versionId"] : Guid.Empty;
-
-        //        entity.Published = asDictionary.ContainsKey("published") && (bool) asDictionary["published"];
-        //        entity.Edited = asDictionary.ContainsKey("edited") && (bool) asDictionary["edited"];
-
-        //        // assign the additional data
-        //        AddAdditionalData(entity, asDictionary);
-
-        //        return entity;
-        //    }
-        //    finally
-        //    {
-        //        entity.EnableChangeTracking();
-        //    }
-        //}
-
-        private static UmbracoEntity BuildEntity(bool isContent, bool isMedia, BaseDto dto)
-        {
-            var entity = new UmbracoEntity(dto.Trashed);
-
-            try
-            {
-                entity.DisableChangeTracking();
-
-                entity.CreateDate = dto.CreateDate;
-                entity.CreatorId = dto.UserId ?? 0;
-                entity.Id = dto.NodeId;
-                entity.Key = dto.UniqueId;
-                entity.Level = dto.Level;
-                entity.Name = dto.Text;
-                entity.NodeObjectTypeId = dto.NodeObjectType;
-                entity.ParentId = dto.ParentId;
-                entity.Path = dto.Path;
-                entity.SortOrder = dto.SortOrder;
-                entity.HasChildren = dto.Children > 0;
-
-                if (isContent)
-                {
-                    entity.Published = dto.Published;
-                    entity.Edited = dto.Edited;
-                }
-
-                // fixme what shall we do with versions?
-                //entity.VersionId = asDictionary.ContainsKey("versionId") ? asDictionary["versionId"] : Guid.Empty;
-
-                if (isContent || isMedia)
-                {
-                    entity.ContentTypeAlias = dto.Alias;
-                    entity.ContentTypeIcon = dto.Icon;
-                    entity.ContentTypeThumbnail = dto.Thumbnail;
-                    //entity.??? = dto.IsContainer;
-                }
-            }
-            finally
-            {
-                entity.EnableChangeTracking();
-            }
-
-            return entity;
-        }
-
-        #endregion
-    }
-}
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using NPoco;
+using Umbraco.Core.Models;
+using Umbraco.Core.Models.EntityBase;
+using Umbraco.Core.Models.Rdbms;
+using Umbraco.Core.Persistence.DatabaseModelDefinitions;
+using Umbraco.Core.Persistence.Querying;
+using Umbraco.Core.Persistence.UnitOfWork;
+
+namespace Umbraco.Core.Persistence.Repositories.Implement
+{
+    // fixme - use sql templates everywhere!
+
+    /// <summary>
+    /// Represents the EntityRepository used to query <see cref="IUmbracoEntity"/> objects.
+    /// </summary>
+    /// <remarks>
+    /// This is limited to objects that are based in the umbracoNode-table.
+    /// </remarks>
+    internal class EntityRepository : IEntityRepository
+    {
+        public EntityRepository(IScopeUnitOfWork work)
+        {
+            UnitOfWork = work;
+        }
+
+        protected IScopeUnitOfWork UnitOfWork { get; }
+        protected IUmbracoDatabase Database => UnitOfWork.Database;
+        protected Sql<ISqlContext> Sql() => UnitOfWork.SqlContext.Sql();
+
+        #region Repository
+
+        // get a page of entities
+        public IEnumerable<IUmbracoEntity> GetPagedResultsByQuery(IQuery<IUmbracoEntity> query, Guid objectType, long pageIndex, int pageSize, out long totalRecords,
+            string orderBy, Direction orderDirection, IQuery<IUmbracoEntity> filter = null)
+        {
+            var isContent = objectType == Constants.ObjectTypes.Document || objectType == Constants.ObjectTypes.DocumentBlueprint;
+            var isMedia = objectType == Constants.ObjectTypes.Media;
+
+            var sql = GetBaseWhere(isContent, isMedia, false, x =>
+            {
+                if (filter == null) return;
+                foreach (var filterClause in filter.GetWhereClauses())
+                    x.Where(filterClause.Item1, filterClause.Item2);
+            }, objectType);
+
+            var translator = new SqlTranslator<IUmbracoEntity>(sql, query);
+            sql = translator.Translate();
+            sql = AddGroupBy(isContent, isMedia, sql);
+            sql = sql.OrderBy<NodeDto>(x => x.NodeId);
+
+            //IEnumerable<IUmbracoEntity> result;
+            //
+            //if (isMedia)
+            //{
+            //    //Treat media differently for now, as an Entity it will be returned with ALL of it's properties in the AdditionalData bag!
+            //    var pagedResult = UnitOfWork.Database.Page<dynamic>(pageIndex + 1, pageSize, pagedSql);
+
+            //    var ids = pagedResult.Items.Select(x => (int)x.id).InGroupsOf(2000);
+            //    var entities = pagedResult.Items.Select(BuildEntityFromDynamic).Cast<IUmbracoEntity>().ToList();
+
+            //    //Now we need to merge in the property data since we need paging and we can't do this the way that the big media query was working before
+            //    foreach (var idGroup in ids)
+            //    {
+            //        var propSql = GetPropertySql(Constants.ObjectTypes.Media)
+            //            .WhereIn<NodeDto>(x => x.NodeId, idGroup)
+            //            .OrderBy<NodeDto>(x => x.NodeId);
+
+            //        //This does NOT fetch all data into memory in a list, this will read
+            //        // over the records as a data reader, this is much better for performance and memory,
+            //        // but it means that during the reading of this data set, nothing else can be read
+            //        // from SQL server otherwise we'll get an exception.
+            //        var allPropertyData = UnitOfWork.Database.Query<dynamic>(propSql);
+
+            //        //keep track of the current property data item being enumerated
+            //        var propertyDataSetEnumerator = allPropertyData.GetEnumerator();
+            //        var hasCurrent = false; // initially there is no enumerator.Current
+
+            //        try
+            //        {
+            //            //This must be sorted by node id (which is done by SQL) because this is how we are sorting the query to lookup property types above,
+            //            // which allows us to more efficiently iterate over the large data set of property values.
+            //            foreach (var entity in entities)
+            //            {
+            //                // assemble the dtos for this def
+            //                // use the available enumerator.Current if any else move to next
+            //                while (hasCurrent || propertyDataSetEnumerator.MoveNext())
+            //                {
+            //                    if (propertyDataSetEnumerator.Current.nodeId == entity.Id)
+            //                    {
+            //                        hasCurrent = false; // enumerator.Current is not available
+
+            //                        //the property data goes into the additional data
+            //                        entity.AdditionalData[propertyDataSetEnumerator.Current.propertyTypeAlias] = new UmbracoEntity.EntityProperty
+            //                        {
+            //                            PropertyEditorAlias = propertyDataSetEnumerator.Current.propertyEditorAlias,
+            //                            Value = StringExtensions.IsNullOrWhiteSpace(propertyDataSetEnumerator.Current.textValue)
+            //                                ? propertyDataSetEnumerator.Current.varcharValue
+            //                                : StringExtensions.ConvertToJsonIfPossible(propertyDataSetEnumerator.Current.textValue)
+            //                        };
+            //                    }
+            //                    else
+            //                    {
+            //                        hasCurrent = true; // enumerator.Current is available for another def
+            //                        break; // no more propertyDataDto for this def
+            //                    }
+            //                }
+            //            }
+            //        }
+            //        finally
+            //        {
+            //            propertyDataSetEnumerator.Dispose();
+            //        }
+            //    }
+
+            //    result = entities;
+            //}
+            //else
+            //{
+            //    var pagedResult = UnitOfWork.Database.Page<dynamic>(pageIndex + 1, pageSize, pagedSql);
+            //    result = pagedResult.Items.Select(BuildEntityFromDynamic).Cast<IUmbracoEntity>().ToList();
+            //}
+
+            var page = Database.Page<BaseDto>(pageIndex + 1, pageSize, sql);
+            var dtos = page.Items;
+            var entities = dtos.Select(x => BuildEntity(isContent, isMedia, x)).ToArray();
+
+            if (isMedia)
+                BuildProperties(entities, dtos);
+
+            totalRecords = page.TotalItems;
+            return entities;
+        }
+
+        public IUmbracoEntity GetByKey(Guid key)
+        {
+            var sql = GetBaseWhere(false, false, false, key);
+            var dto = Database.FirstOrDefault<BaseDto>(sql);
+            return dto == null ? null : BuildEntity(false, false, dto);
+        }
+
+        public IUmbracoEntity GetByKey(Guid key, Guid objectTypeId)
+        {
+            var isContent = objectTypeId == Constants.ObjectTypes.Document || objectTypeId == Constants.ObjectTypes.DocumentBlueprint;
+            var isMedia = objectTypeId == Constants.ObjectTypes.Media;
+
+            var sql = GetFullSqlForEntityType(isContent, isMedia, objectTypeId, key);
+            var dto = Database.FirstOrDefault<BaseDto>(sql);
+            if (dto == null) return null;
+
+            var entity = BuildEntity(isContent, isMedia, dto);
+
+            if (isMedia)
+                BuildProperties(entity, dto);
+
+            return entity;
+        }
+
+        public virtual IUmbracoEntity Get(int id)
+        {
+            var sql = GetBaseWhere(false, false, false, id);
+            var dto = Database.FirstOrDefault<BaseDto>(sql);
+            return dto == null ? null : BuildEntity(false, false, dto);
+        }
+
+        public virtual IUmbracoEntity Get(int id, Guid objectTypeId)
+        {
+            var isContent = objectTypeId == Constants.ObjectTypes.Document || objectTypeId == Constants.ObjectTypes.DocumentBlueprint;
+            var isMedia = objectTypeId == Constants.ObjectTypes.Media;
+
+            var sql = GetFullSqlForEntityType(isContent, isMedia, objectTypeId, id);
+            var dto = Database.FirstOrDefault<BaseDto>(sql);
+            if (dto == null) return null;
+
+            var entity = BuildEntity(isContent, isMedia, dto);
+
+            if (isMedia)
+                BuildProperties(entity, dto);
+
+            return entity;
+        }
+
+        public virtual IEnumerable<IUmbracoEntity> GetAll(Guid objectType, params int[] ids)
+        {
+            return ids.Length > 0
+                ? PerformGetAll(objectType, sql => sql.WhereIn<NodeDto>(x => x.NodeId, ids.Distinct()))
+                : PerformGetAll(objectType);
+        }
+
+        public virtual IEnumerable<IUmbracoEntity> GetAll(Guid objectType, params Guid[] keys)
+        {
+            return keys.Length > 0
+                ? PerformGetAll(objectType, sql => sql.WhereIn<NodeDto>(x => x.UniqueId, keys.Distinct()))
+                : PerformGetAll(objectType);
+        }
+
+        private IEnumerable<IUmbracoEntity> PerformGetAll(Guid objectType, Action<Sql<ISqlContext>> filter = null)
+        {
+            var isContent = objectType == Constants.ObjectTypes.Document || objectType == Constants.ObjectTypes.DocumentBlueprint;
+            var isMedia = objectType == Constants.ObjectTypes.Media;
+
+            var sql = GetFullSqlForEntityType(isContent, isMedia, objectType, filter);
+            var dtos = Database.Fetch<BaseDto>(sql);
+            if (dtos.Count == 0) return Enumerable.Empty<IUmbracoEntity>();
+
+            var entities = dtos.Select(x => BuildEntity(isContent, isMedia, x)).ToArray();
+
+            if (isMedia)
+                BuildProperties(entities, dtos);
+
+            return entities;
+        }
+
+        public virtual IEnumerable<EntityPath> GetAllPaths(Guid objectType, params int[] ids)
+        {
+            return ids.Any()
+                ? PerformGetAllPaths(objectType, sql => sql.WhereIn<NodeDto>(x => x.NodeId, ids.Distinct()))
+                : PerformGetAllPaths(objectType);
+        }
+
+        public virtual IEnumerable<EntityPath> GetAllPaths(Guid objectType, params Guid[] keys)
+        {
+            return keys.Any()
+                ? PerformGetAllPaths(objectType, sql => sql.WhereIn<NodeDto>(x => x.UniqueId, keys.Distinct()))
+                : PerformGetAllPaths(objectType);
+        }
+
+        private IEnumerable<EntityPath> PerformGetAllPaths(Guid objectType, Action<Sql<ISqlContext>> filter = null)
+        {
+            var sql = Sql().Select<NodeDto>(x => x.NodeId, x => x.Path).From<NodeDto>().Where<NodeDto>(x => x.NodeObjectType == objectType);
+            filter?.Invoke(sql);
+            return Database.Fetch<EntityPath>(sql);
+        }
+
+        public virtual IEnumerable<IUmbracoEntity> GetByQuery(IQuery<IUmbracoEntity> query)
+        {
+            var sqlClause = GetBase(false, false, null);
+            var translator = new SqlTranslator<IUmbracoEntity>(sqlClause, query);
+            var sql = translator.Translate();
+            sql = AddGroupBy(false, false, sql);
+            var dtos = Database.Fetch<BaseDto>(sql);
+            return dtos.Select(x => BuildEntity(false, false, x)).ToList();
+        }
+
+        public virtual IEnumerable<IUmbracoEntity> GetByQuery(IQuery<IUmbracoEntity> query, Guid objectType)
+        {
+            var isContent = objectType == Constants.ObjectTypes.Document || objectType == Constants.ObjectTypes.DocumentBlueprint;
+            var isMedia = objectType == Constants.ObjectTypes.Media;
+
+            var sql = GetBaseWhere(isContent, isMedia, false, null, objectType);
+            var translator = new SqlTranslator<IUmbracoEntity>(sql, query);
+            sql = translator.Translate();
+            sql = AddGroupBy(isContent, isMedia, sql);
+            var dtos = Database.Fetch<BaseDto>(sql);
+            if (dtos.Count == 0) return Enumerable.Empty<IUmbracoEntity>();
+
+            var entities = dtos.Select(x => BuildEntity(isContent, isMedia, x)).ToArray();
+
+            if (isMedia)
+                BuildProperties(entities, dtos);
+
+            return entities;
+        }
+
+        public UmbracoObjectTypes GetObjectType(int id)
+        {
+            var sql = Sql().Select<NodeDto>(x => x.NodeObjectType).From<NodeDto>().Where<NodeDto>(x => x.NodeId == id);
+            return UmbracoObjectTypesExtensions.GetUmbracoObjectType(Database.ExecuteScalar<Guid>(sql));
+        }
+
+        public UmbracoObjectTypes GetObjectType(Guid key)
+        {
+            var sql = Sql().Select<NodeDto>(x => x.NodeObjectType).From<NodeDto>().Where<NodeDto>(x => x.UniqueId == key);
+            return UmbracoObjectTypesExtensions.GetUmbracoObjectType(Database.ExecuteScalar<Guid>(sql));
+        }
+
+        public bool Exists(Guid key)
+        {
+            var sql = Sql().SelectCount().From<NodeDto>().Where<NodeDto>(x => x.UniqueId == key);
+            return Database.ExecuteScalar<int>(sql) > 0;
+        }
+
+        public bool Exists(int id)
+        {
+            var sql = Sql().SelectCount().From<NodeDto>().Where<NodeDto>(x => x.NodeId == id);
+            return Database.ExecuteScalar<int>(sql) > 0;
+        }
+
+        private void BuildProperties(UmbracoEntity entity, BaseDto dto)
+        {
+            var pdtos = Database.Fetch<PropertyDataDto>(GetPropertyData(dto.VersionId));
+            foreach (var pdto in pdtos)
+                BuildProperty(entity, pdto);
+        }
+
+        private void BuildProperties(UmbracoEntity[] entities, List<BaseDto> dtos)
+        {
+            var versionIds = dtos.Select(x => x.VersionId).Distinct().ToArray();
+            var pdtos = Database.FetchByGroups<PropertyDataDto, int>(versionIds, 2000, GetPropertyData);
+
+            var xentity = entities.ToDictionary(x => x.Id, x => x); // nodeId -> entity
+            var xdto = dtos.ToDictionary(x => x.VersionId, x => x.NodeId); // versionId -> nodeId
+            foreach (var pdto in pdtos)
+            {
+                var nodeId = xdto[pdto.VersionId];
+                var entity = xentity[nodeId];
+                BuildProperty(entity, pdto);
+            }
+        }
+
+        private void BuildProperty(UmbracoEntity entity, PropertyDataDto pdto)
+        {
+            // explain ?!
+            var value = string.IsNullOrWhiteSpace(pdto.TextValue)
+                ? pdto.VarcharValue
+                : pdto.TextValue.ConvertToJsonIfPossible();
+
+            entity.AdditionalData[pdto.PropertyTypeDto.Alias] = new UmbracoEntity.EntityProperty
+            {
+                PropertyEditorAlias = pdto.PropertyTypeDto.DataTypeDto.PropertyEditorAlias,
+                Value = value
+            };
+        }
+
+        #endregion
+
+        #region Sql
+
+        // gets the full sql for a given object type and a given unique id
+        protected Sql<ISqlContext> GetFullSqlForEntityType(bool isContent, bool isMedia, Guid objectType, Guid uniqueId)
+        {
+            var sql = GetBaseWhere(isContent, isMedia, false, objectType, uniqueId);
+            return AddGroupBy(isContent, isMedia, sql);
+        }
+
+        // gets the full sql for a given object type and a given node id
+        protected Sql<ISqlContext> GetFullSqlForEntityType(bool isContent, bool isMedia, Guid objectType, int nodeId)
+        {
+            var sql = GetBaseWhere(isContent, isMedia, false, objectType, nodeId);
+            return AddGroupBy(isContent, isMedia, sql);
+        }
+
+        // gets the full sql for a given object type, with a given filter
+        protected Sql<ISqlContext> GetFullSqlForEntityType(bool isContent, bool isMedia, Guid objectType, Action<Sql<ISqlContext>> filter)
+        {
+            var sql = GetBaseWhere(isContent, isMedia, false, filter, objectType);
+            return AddGroupBy(isContent, isMedia, sql);
+        }
+
+        // fixme kill this nonsense
+        //// gets the SELECT + FROM + WHERE sql
+        //// to get all property data for all items of the specified object type
+        //private Sql<ISqlContext> GetPropertySql(Guid objectType)
+        //{
+        //    return Sql()
+        //        .Select<PropertyDataDto>(x => x.VersionId, x => x.TextValue, x => x.VarcharValue)
+        //        .AndSelect<NodeDto>(x => x.NodeId)
+        //        .AndSelect<DataTypeDto>(x => x.PropertyEditorAlias)
+        //        .AndSelect<PropertyTypeDto>(x => Alias(x.Alias, "propertyTypeAlias"))
+        //        .From<PropertyDataDto>()
+        //        .InnerJoin<ContentVersionDto>().On<PropertyDataDto, ContentVersionDto>((left, right) => left.VersionId == right.Id)
+        //        .InnerJoin<NodeDto>().On<ContentVersionDto, NodeDto>((left, right) => left.NodeId == right.NodeId)
+        //        .InnerJoin<PropertyTypeDto>().On<PropertyDataDto, PropertyTypeDto>(dto => dto.PropertyTypeId, dto => dto.Id)
+        //        .InnerJoin<DataTypeDto>().On<PropertyTypeDto, DataTypeDto>(dto => dto.DataTypeId, dto => dto.DataTypeId)
+        //        .Where<NodeDto>(x => x.NodeObjectType == objectType);
+        //}
+
+        private Sql<ISqlContext> GetPropertyData(int versionId)
+        {
+            return Sql()
+                .Select<PropertyDataDto>(r => r.Select(x => x.PropertyTypeDto, r1 => r1.Select(x => x.DataTypeDto)))
+                .From<PropertyDataDto>()
+                .InnerJoin<PropertyTypeDto>().On<PropertyDataDto, PropertyTypeDto>((left, right) => left.PropertyTypeId == right.Id)
+                .InnerJoin<DataTypeDto>().On<PropertyTypeDto, DataTypeDto>((left, right) => left.DataTypeId == right.DataTypeId)
+                .Where<PropertyDataDto>(x => x.VersionId == versionId);
+        }
+
+        private Sql<ISqlContext> GetPropertyData(IEnumerable<int> versionIds)
+        {
+            return Sql()
+                .Select<PropertyDataDto>(r => r.Select(x => x.PropertyTypeDto, r1 => r1.Select(x => x.DataTypeDto)))
+                .From<PropertyDataDto>()
+                .InnerJoin<PropertyTypeDto>().On<PropertyDataDto, PropertyTypeDto>((left, right) => left.PropertyTypeId == right.Id)
+                .InnerJoin<DataTypeDto>().On<PropertyTypeDto, DataTypeDto>((left, right) => left.DataTypeId == right.DataTypeId)
+                .WhereIn<PropertyDataDto>(x => x.VersionId, versionIds)
+                .OrderBy<PropertyDataDto>(x => x.VersionId);
+        }
+
+        // fixme - wtf is this?
+        //private Sql<ISqlContext> GetFullSqlForMedia(Sql<ISqlContext> entitySql, Action<Sql<ISqlContext>> filter = null)
+        //{
+        //    //this will add any varcharValue property to the output which can be added to the additional properties
+
+        //    var sql = GetPropertySql(Constants.ObjectTypes.Media);
+
+        //    filter?.Invoke(sql);
+
+        //    // We're going to create a query to query against the entity SQL
+        //    // because we cannot group by nText columns and we have a COUNT in the entitySql we cannot simply left join
+        //    // the entitySql query, we have to join the wrapped query to get the ntext in the result
+
+        //    var wrappedSql = Sql()
+        //        .Append("SELECT * FROM (")
+        //        .Append(entitySql)
+        //        .Append(") tmpTbl LEFT JOIN (")
+        //        .Append(sql)
+        //        .Append(") as property ON id = property.nodeId")
+        //        .OrderBy("sortOrder, id");
+
+        //    return wrappedSql;
+        //}
+
+        // the DTO corresponding to fields selected by GetBase
+        // ReSharper disable once ClassNeverInstantiated.Local
+        private class BaseDto
+        {
+            // ReSharper disable UnusedAutoPropertyAccessor.Local
+            // ReSharper disable UnusedMember.Local
+            public int NodeId { get; set; }
+            public bool Trashed { get; set; }
+            public int ParentId { get; set; }
+            public int? UserId { get; set; }
+            public int Level { get; set; }
+            public string Path { get; set; }
+            public int SortOrder { get; set; }
+            public Guid UniqueId { get; set; }
+            public string Text { get; set; }
+            public Guid NodeObjectType { get; set; }
+            public DateTime CreateDate { get; set; }
+            public int Children { get; set; }
+            public int VersionId { get; set; }
+            public bool Published { get; set; }
+            public bool Edited { get; set; }
+            public string Alias { get; set; }
+            public string Icon { get; set; }
+            public string Thumbnail { get; set; }
+            public bool IsContainer { get; set; }
+            // ReSharper restore UnusedAutoPropertyAccessor.Local
+            // ReSharper restore UnusedMember.Local
+        }
+
+        // gets the base SELECT + FROM [+ filter] sql
+        // always from the 'current' content version
+        protected virtual Sql<ISqlContext> GetBase(bool isContent, bool isMedia, Action<Sql<ISqlContext>> filter, bool isCount = false)
+        {
+            var sql = Sql();
+
+            if (isCount)
+            {
+                sql.SelectCount();
+            }
+            else
+            {
+                sql
+                    .Select<NodeDto>(x => x.NodeId, x => x.Trashed, x => x.ParentId, x => x.UserId, x => x.Level, x => x.Path)
+                    .AndSelect<NodeDto>(x => x.SortOrder, x => x.UniqueId, x => x.Text, x => x.NodeObjectType, x => x.CreateDate)
+                    .Append(", COUNT(child.id) AS children");
+
+                if (isContent)
+                    sql
+                        .AndSelect<DocumentDto>(x => x.Published, x => x.Edited);
+
+                if (isContent || isMedia)
+                    sql
+                        .AndSelect<ContentVersionDto>(x => NPocoSqlExtensions.Statics.Alias(x.Id, "versionId"))
+                        .AndSelect<ContentTypeDto>(x => x.Alias, x => x.Icon, x => x.Thumbnail, x => x.IsContainer);
+            }
+
+            sql
+                .From<NodeDto>();
+
+            if (isContent || isMedia)
+            {
+                sql
+                    .InnerJoin<ContentVersionDto>().On<NodeDto, ContentVersionDto>((left, right) => left.NodeId == right.NodeId && right.Current)
+                    .InnerJoin<ContentDto>().On<NodeDto, ContentDto>((left, right) => left.NodeId == right.NodeId)
+                    .LeftJoin<ContentTypeDto>().On<ContentDto, ContentTypeDto>((left, right) => left.ContentTypeId == right.NodeId);
+            }
+
+            if (isContent)
+            {
+                sql
+                    .InnerJoin<DocumentDto>().On<NodeDto, DocumentDto>((left, right) => left.NodeId == right.NodeId);
+            }
+
+            if (isCount == false)
+                sql
+                    .LeftJoin<NodeDto>("child").On<NodeDto, NodeDto>((left, right) => left.NodeId == right.ParentId, aliasRight: "child");
+
+            filter?.Invoke(sql);
+
+            return sql;
+        }
+
+        // gets the base SELECT + FROM [+ filter] + WHERE sql
+        // for a given object type, with a given filter
+        protected virtual Sql<ISqlContext> GetBaseWhere(bool isContent, bool isMedia, bool isCount, Action<Sql<ISqlContext>> filter, Guid objectType)
+        {
+            return GetBase(isContent, isMedia, filter, isCount)
+                .Where<NodeDto>(x => x.NodeObjectType == objectType);
+        }
+
+        // gets the base SELECT + FROM + WHERE sql
+        // for a given node id
+        protected virtual Sql<ISqlContext> GetBaseWhere(bool isContent, bool isMedia, bool isCount, int id)
+        {
+            var sql = GetBase(isContent, isMedia, null, isCount)
+                .Where<NodeDto>(x => x.NodeId == id);
+            return AddGroupBy(isContent, isMedia, sql);
+        }
+
+        // gets the base SELECT + FROM + WHERE sql
+        // for a given unique id
+        protected virtual Sql<ISqlContext> GetBaseWhere(bool isContent, bool isMedia, bool isCount, Guid uniqueId)
+        {
+            var sql = GetBase(isContent, isMedia, null, isCount)
+                .Where<NodeDto>(x => x.UniqueId == uniqueId);
+            return AddGroupBy(isContent, isMedia, sql);
+        }
+
+        // gets the base SELECT + FROM + WHERE sql
+        // for a given object type and node id
+        protected virtual Sql<ISqlContext> GetBaseWhere(bool isContent, bool isMedia, bool isCount, Guid objectType, int nodeId)
+        {
+            return GetBase(isContent, isMedia, null, isCount)
+                .Where<NodeDto>(x => x.NodeId == nodeId && x.NodeObjectType == objectType);
+        }
+
+        // gets the base SELECT + FROM + WHERE sql
+        // for a given object type and unique id
+        protected virtual Sql<ISqlContext> GetBaseWhere(bool isContent, bool isMedia, bool isCount, Guid objectType, Guid uniqueId)
+        {
+            return GetBase(isContent, isMedia, null, isCount)
+                .Where<NodeDto>(x => x.UniqueId == uniqueId && x.NodeObjectType == objectType);
+        }
+
+        // gets the GROUP BY / ORDER BY sql
+        // required in order to count children
+        protected virtual Sql<ISqlContext> AddGroupBy(bool isContent, bool isMedia, Sql<ISqlContext> sql, bool sort = true)
+        {
+            sql
+                .GroupBy<NodeDto>(x => x.NodeId, x => x.Trashed, x => x.ParentId, x => x.UserId, x => x.Level, x => x.Path)
+                .AndBy<NodeDto>(x => x.SortOrder, x => x.UniqueId, x => x.Text, x => x.NodeObjectType, x => x.CreateDate);
+
+            if (isContent)
+                sql
+                    .AndBy<DocumentDto>(x => x.Published, x => x.Edited);
+
+            if (isContent || isMedia)
+                sql
+                    .AndBy<ContentVersionDto>(x => x.Id)
+                    .AndBy<ContentTypeDto>(x => x.Alias, x => x.Icon, x => x.Thumbnail, x => x.IsContainer);
+
+            if (sort)
+                sql.OrderBy<NodeDto>(x => x.SortOrder);
+
+            return sql;
+        }
+
+        #endregion
+
+        #region Classes
+
+        [ExplicitColumns]
+        internal class UmbracoPropertyDto
+        {
+            [Column("propertyEditorAlias")]
+            public string PropertyEditorAlias { get; set; }
+
+            [Column("propertyTypeAlias")]
+            public string PropertyAlias { get; set; }
+
+            [Column("varcharValue")]
+            public string VarcharValue { get; set; }
+
+            [Column("textValue")]
+            public string TextValue { get; set; }
+        }
+
+        // fixme kill
+        /// <summary>
+        /// This is a special relator in that it is not returning a DTO but a real resolved entity and that it accepts
+        /// a dynamic instance.
+        /// </summary>
+        /// <remarks>
+        /// We're doing this because when we query the db, we want to use dynamic so that it returns all available fields not just the ones
+        ///     defined on the entity so we can them to additional data
+        /// </remarks>
+        //internal class UmbracoEntityRelator
+        //{
+        //    internal UmbracoEntity Current;
+
+        //    public IEnumerable<IUmbracoEntity> MapAll(IEnumerable<dynamic> input)
+        //    {
+        //        UmbracoEntity entity;
+
+        //        foreach (var x in input)
+        //        {
+        //            entity = Map(x);
+        //            if (entity != null) yield return entity;
+        //        }
+
+        //        entity = Map((dynamic) null);
+        //        if (entity != null) yield return entity;
+        //    }
+
+        //    // must be called one last time with null in order to return the last one!
+        //    public UmbracoEntity Map(dynamic a)
+        //    {
+        //        // Terminating call.  Since we can return null from this function
+        //        // we need to be ready for NPoco to callback later with null
+        //        // parameters
+        //        if (a == null)
+        //            return Current;
+
+        //        string pPropertyEditorAlias = a.propertyEditorAlias;
+        //        var pExists = pPropertyEditorAlias != null;
+        //        string pPropertyAlias = a.propertyTypeAlias;
+        //        string pTextValue = a.textValue;
+        //        string pNVarcharValue = a.varcharValue;
+
+        //        // Is this the same UmbracoEntity as the current one we're processing
+        //        if (Current != null && Current.Key == a.uniqueID)
+        //        {
+        //            if (pExists && pPropertyAlias.IsNullOrWhiteSpace() == false)
+        //            {
+        //                // Add this UmbracoProperty to the current additional data
+        //                Current.AdditionalData[pPropertyAlias] = new UmbracoEntity.EntityProperty
+        //                {
+        //                    PropertyEditorAlias = pPropertyEditorAlias,
+        //                    Value = pTextValue.IsNullOrWhiteSpace()
+        //                        ? pNVarcharValue
+        //                        : pTextValue.ConvertToJsonIfPossible()
+        //                };
+        //            }
+
+        //            // Return null to indicate we're not done with this UmbracoEntity yet
+        //            return null;
+        //        }
+
+        //        // This is a different UmbracoEntity to the current one, or this is the
+        //        // first time through and we don't have a Tab yet
+
+        //        // Save the current UmbracoEntityDto
+        //        var prev = Current;
+
+        //        // Setup the new current UmbracoEntity
+
+        //        Current = BuildEntityFromDynamic(a);
+
+        //        if (pExists && pPropertyAlias.IsNullOrWhiteSpace() == false)
+        //        {
+        //            //add the property/create the prop list if null
+        //            Current.AdditionalData[pPropertyAlias] = new UmbracoEntity.EntityProperty
+        //            {
+        //                PropertyEditorAlias = pPropertyEditorAlias,
+        //                Value = pTextValue.IsNullOrWhiteSpace()
+        //                    ? pNVarcharValue
+        //                    : pTextValue.ConvertToJsonIfPossible()
+        //            };
+        //        }
+
+        //        // Return the now populated previous UmbracoEntity (or null if first time through)
+        //        return prev;
+        //    }
+        //}
+
+        // fixme need to review what's below
+        // comes from 7.6, similar to what's in VersionableRepositoryBase
+        // not sure it really makes sense...
+
+        //private class EntityDefinitionCollection : KeyedCollection<int, EntityDefinition>
+        //{
+        //    protected override int GetKeyForItem(EntityDefinition item)
+        //    {
+        //        return item.Id;
+        //    }
+
+        //    /// <summary>
+        //    /// if this key already exists if it does then we need to check
+        //    /// if the existing item is 'older' than the new item and if that is the case we'll replace the older one
+        //    /// </summary>
+        //    /// <param name="item"></param>
+        //    /// <returns></returns>
+        //    public bool AddOrUpdate(EntityDefinition item)
+        //    {
+        //        if (Dictionary == null)
+        //        {
+        //            Add(item);
+        //            return true;
+        //        }
+
+        //        var key = GetKeyForItem(item);
+        //        if (TryGetValue(key, out EntityDefinition found))
+        //        {
+        //            //it already exists and it's older so we need to replace it
+        //            if (item.VersionId > found.VersionId)
+        //            {
+        //                var currIndex = Items.IndexOf(found);
+        //                if (currIndex == -1)
+        //                    throw new IndexOutOfRangeException("Could not find the item in the list: " + found.Id);
+
+        //                //replace the current one with the newer one
+        //                SetItem(currIndex, item);
+        //                return true;
+        //            }
+        //            //could not add or update
+        //            return false;
+        //        }
+
+        //        Add(item);
+        //        return true;
+        //    }
+
+        //    private bool TryGetValue(int key, out EntityDefinition val)
+        //    {
+        //        if (Dictionary != null) return Dictionary.TryGetValue(key, out val);
+
+        //        val = null;
+        //        return false;
+        //    }
+        //}
+
+        // fixme wtf is this, why dynamics here, this is horrible !!
+        //private class EntityDefinition
+        //{
+        //    private readonly dynamic _entity;
+        //    private readonly bool _isContent;
+        //    private readonly bool _isMedia;
+
+        //    public EntityDefinition(dynamic entity, bool isContent, bool isMedia)
+        //    {
+        //        _entity = entity;
+        //        _isContent = isContent;
+        //        _isMedia = isMedia;
+        //    }
+
+        //    public IUmbracoEntity BuildFromDynamic()
+        //    {
+        //        return BuildEntityFromDynamic(_entity);
+        //    }
+
+        //    public int Id => _entity.id;
+
+        //    public int VersionId
+        //    {
+        //        get
+        //        {
+        //            if (_isContent || _isMedia)
+        //            {
+        //                return _entity.versionId;
+        //            }
+        //            return _entity.id;
+        //        }
+        //    }
+        //}
+
+        #endregion
+
+        #region Factory
+
+        // fixme kill all this
+        //private static void AddAdditionalData(UmbracoEntity entity, IDictionary<string, object> originalEntityProperties)
+        //{
+        //    var entityProps = typeof(IUmbracoEntity).GetPublicProperties().Select(x => x.Name).ToArray();
+
+        //    // figure out what extra properties we have that are not on the IUmbracoEntity and add them to additional data
+        //    foreach (var k in originalEntityProperties.Keys
+        //        .Select(x => new { orig = x, title = x.ToCleanString(CleanStringType.PascalCase | CleanStringType.Ascii | CleanStringType.ConvertCase) })
+        //        .Where(x => entityProps.InvariantContains(x.title) == false))
+        //    {
+        //        entity.AdditionalData[k.title] = originalEntityProperties[k.orig];
+        //    }
+        //}
+
+        //private static UmbracoEntity BuildEntityFromDynamic(dynamic d)
+        //{
+        //    var asDictionary = (IDictionary<string, object>) d;
+        //    var entity = new UmbracoEntity(d.trashed);
+
+        //    try
+        //    {
+        //        entity.DisableChangeTracking();
+
+        //        entity.CreateDate = d.createDate;
+        //        entity.CreatorId = d.nodeUser == null ? 0 : d.nodeUser;
+        //        entity.Id = d.id;
+        //        entity.Key = d.uniqueID;
+        //        entity.Level = d.level;
+        //        entity.Name = d.text;
+        //        entity.NodeObjectTypeId = d.nodeObjectType;
+        //        entity.ParentId = d.parentID;
+        //        entity.Path = d.path;
+        //        entity.SortOrder = d.sortOrder;
+        //        entity.HasChildren = d.children > 0;
+
+        //        entity.ContentTypeAlias = asDictionary.ContainsKey("alias") ? (d.alias ?? string.Empty) : string.Empty;
+        //        entity.ContentTypeIcon = asDictionary.ContainsKey("icon") ? (d.icon ?? string.Empty) : string.Empty;
+        //        entity.ContentTypeThumbnail = asDictionary.ContainsKey("thumbnail") ? (d.thumbnail ?? string.Empty) : string.Empty;
+        //        //entity.VersionId = asDictionary.ContainsKey("versionId") ? asDictionary["versionId"] : Guid.Empty;
+
+        //        entity.Published = asDictionary.ContainsKey("published") && (bool) asDictionary["published"];
+        //        entity.Edited = asDictionary.ContainsKey("edited") && (bool) asDictionary["edited"];
+
+        //        // assign the additional data
+        //        AddAdditionalData(entity, asDictionary);
+
+        //        return entity;
+        //    }
+        //    finally
+        //    {
+        //        entity.EnableChangeTracking();
+        //    }
+        //}
+
+        private static UmbracoEntity BuildEntity(bool isContent, bool isMedia, BaseDto dto)
+        {
+            var entity = new UmbracoEntity(dto.Trashed);
+
+            try
+            {
+                entity.DisableChangeTracking();
+
+                entity.CreateDate = dto.CreateDate;
+                entity.CreatorId = dto.UserId ?? 0;
+                entity.Id = dto.NodeId;
+                entity.Key = dto.UniqueId;
+                entity.Level = dto.Level;
+                entity.Name = dto.Text;
+                entity.NodeObjectTypeId = dto.NodeObjectType;
+                entity.ParentId = dto.ParentId;
+                entity.Path = dto.Path;
+                entity.SortOrder = dto.SortOrder;
+                entity.HasChildren = dto.Children > 0;
+
+                if (isContent)
+                {
+                    entity.Published = dto.Published;
+                    entity.Edited = dto.Edited;
+                }
+
+                // fixme what shall we do with versions?
+                //entity.VersionId = asDictionary.ContainsKey("versionId") ? asDictionary["versionId"] : Guid.Empty;
+
+                if (isContent || isMedia)
+                {
+                    entity.ContentTypeAlias = dto.Alias;
+                    entity.ContentTypeIcon = dto.Icon;
+                    entity.ContentTypeThumbnail = dto.Thumbnail;
+                    //entity.??? = dto.IsContainer;
+                }
+            }
+            finally
+            {
+                entity.EnableChangeTracking();
+            }
+
+            return entity;
+        }
+
+        #endregion
+    }
+}
diff --git a/src/Umbraco.Core/Persistence/Repositories/ExternalLoginRepository.cs b/src/Umbraco.Core/Persistence/Repositories/Implement/ExternalLoginRepository.cs
similarity index 98%
rename from src/Umbraco.Core/Persistence/Repositories/ExternalLoginRepository.cs
rename to src/Umbraco.Core/Persistence/Repositories/Implement/ExternalLoginRepository.cs
index 1ae88d9776..c3208c8a62 100644
--- a/src/Umbraco.Core/Persistence/Repositories/ExternalLoginRepository.cs
+++ b/src/Umbraco.Core/Persistence/Repositories/Implement/ExternalLoginRepository.cs
@@ -12,7 +12,7 @@ using Umbraco.Core.Persistence.Factories;
 using Umbraco.Core.Persistence.Querying;
 using Umbraco.Core.Persistence.UnitOfWork;
 
-namespace Umbraco.Core.Persistence.Repositories
+namespace Umbraco.Core.Persistence.Repositories.Implement
 {
     internal class ExternalLoginRepository : NPocoRepositoryBase<int, IIdentityUserLogin>, IExternalLoginRepository
     {
diff --git a/src/Umbraco.Core/Persistence/Repositories/FileRepository.cs b/src/Umbraco.Core/Persistence/Repositories/Implement/FileRepository.cs
similarity index 87%
rename from src/Umbraco.Core/Persistence/Repositories/FileRepository.cs
rename to src/Umbraco.Core/Persistence/Repositories/Implement/FileRepository.cs
index c5bdbe37b5..80481ddeb5 100644
--- a/src/Umbraco.Core/Persistence/Repositories/FileRepository.cs
+++ b/src/Umbraco.Core/Persistence/Repositories/Implement/FileRepository.cs
@@ -1,250 +1,242 @@
-using System.Collections.Generic;
-using System.IO;
-using System.Linq;
-using System.Text;
-using Umbraco.Core.IO;
-using Umbraco.Core.Models;
-using Umbraco.Core.Models.EntityBase;
-using Umbraco.Core.Persistence.UnitOfWork;
-
-namespace Umbraco.Core.Persistence.Repositories
-{
-    internal abstract class FileRepository<TId, TEntity> : DisposableObject, IUnitOfWorkRepository, IRepository<TId, TEntity>
-        where TEntity : IFile
-    {
-        protected FileRepository(IUnitOfWork work, IFileSystem fileSystem)
-        {
-            UnitOfWork = work;
-            FileSystem = fileSystem;
-        }
-
-        /// <summary>
-        /// Returns the Unit of Work added to the repository
-        /// </summary>
-        protected IUnitOfWork UnitOfWork { get; }
-
-        protected IFileSystem FileSystem { get; }
-
-        public virtual void AddFolder(string folderPath)
-        {
-            UnitOfWork.RegisterCreated(new Folder(folderPath), this);
-        }
-
-        public virtual void DeleteFolder(string folderPath)
-        {
-            UnitOfWork.RegisterDeleted(new Folder(folderPath), this);
-        }
-
-        #region Implementation of IRepository<TId,TEntity>
-
-        public virtual void AddOrUpdate(TEntity entity)
-        {
-            if (FileSystem.FileExists(entity.OriginalPath) == false)
-            {
-                UnitOfWork.RegisterCreated(entity, this);
-            }
-            else
-            {
-                UnitOfWork.RegisterUpdated(entity, this);
-            }
-        }
-
-        public virtual void Delete(TEntity entity)
-        {
-            if (UnitOfWork != null)
-            {
-                UnitOfWork.RegisterDeleted(entity, this);
-            }
-        }
-
-        public abstract TEntity Get(TId id);
-
-        public abstract IEnumerable<TEntity> GetAll(params TId[] ids);
-
-        public virtual bool Exists(TId id)
-        {
-            return FileSystem.FileExists(id.ToString());
-        }
-
-        #endregion
-
-        #region Implementation of IUnitOfWorkRepository
-
-        public void PersistNewItem(IEntity entity)
-        {
-            //special case for folder
-            var folder = entity as Folder;
-            if (folder != null)
-            {
-                PersistNewFolder(folder);
-            }
-            else
-            {
-                PersistNewItem((TEntity)entity);
-            }
-        }
-
-        public void PersistUpdatedItem(IEntity entity)
-        {
-            PersistUpdatedItem((TEntity)entity);
-        }
-
-        public void PersistDeletedItem(IEntity entity)
-        {
-            //special case for folder
-            var folder = entity as Folder;
-            if (folder != null)
-            {
-                PersistDeletedFolder(folder);
-            }
-            else
-            {
-                PersistDeletedItem((TEntity)entity);
-            }
-        }
-
-        #endregion
-
-        internal virtual void PersistNewFolder(Folder entity)
-        {
-            FileSystem.CreateFolder(entity.Path);
-        }
-
-        internal virtual void PersistDeletedFolder(Folder entity)
-        {
-            FileSystem.DeleteDirectory(entity.Path);
-        }
-
-        #region Abstract IUnitOfWorkRepository Methods
-
-        protected virtual void PersistNewItem(TEntity entity)
-        {
-            using (var stream = GetContentStream(entity.Content))
-            {
-                FileSystem.AddFile(entity.Path, stream, true);
-                entity.CreateDate = FileSystem.GetCreated(entity.Path).UtcDateTime;
-                entity.UpdateDate = FileSystem.GetLastModified(entity.Path).UtcDateTime;
-                //the id can be the hash
-                entity.Id = entity.Path.GetHashCode();
-                entity.Key = entity.Path.EncodeAsGuid();
-                entity.VirtualPath = FileSystem.GetUrl(entity.Path);
-            }
-        }
-
-        protected virtual void PersistUpdatedItem(TEntity entity)
-        {
-            using (var stream = GetContentStream(entity.Content))
-            {
-                FileSystem.AddFile(entity.Path, stream, true);
-                entity.CreateDate = FileSystem.GetCreated(entity.Path).UtcDateTime;
-                entity.UpdateDate = FileSystem.GetLastModified(entity.Path).UtcDateTime;
-                //the id can be the hash
-                entity.Id = entity.Path.GetHashCode();
-                entity.Key = entity.Path.EncodeAsGuid();
-                entity.VirtualPath = FileSystem.GetUrl(entity.Path);
-            }
-
-            //now that the file has been written, we need to check if the path had been changed
-            if (entity.Path.InvariantEquals(entity.OriginalPath) == false)
-            {
-                //delete the original file
-                FileSystem.DeleteFile(entity.OriginalPath);
-                //reset the original path on the file
-                entity.ResetOriginalPath();
-            }
-        }
-
-        protected virtual void PersistDeletedItem(TEntity entity)
-        {
-            if (FileSystem.FileExists(entity.Path))
-            {
-                FileSystem.DeleteFile(entity.Path);
-            }
-        }
-
-        #endregion
-
-        /// <summary>
-        /// Gets a stream that is used to write to the file
-        /// </summary>
-        /// <param name="content"></param>
-        /// <returns></returns>
-        protected virtual Stream GetContentStream(string content)
-        {
-            return new MemoryStream(Encoding.UTF8.GetBytes(content));
-        }
-
-        /// <summary>
-        /// Returns all files in the file system
-        /// </summary>
-        /// <param name="path"></param>
-        /// <param name="filter"></param>
-        /// <returns>
-        /// Returns a list of all files with their paths. For example:
-        ///
-        /// \hello.txt
-        /// \folder1\test.txt
-        /// \folder1\blah.csv
-        /// \folder1\folder2\blahhhhh.svg
-        /// </returns>
-        protected IEnumerable<string> FindAllFiles(string path, string filter)
-        {
-            var list = new List<string>();
-            list.AddRange(FileSystem.GetFiles(path, filter));
-
-            var directories = FileSystem.GetDirectories(path);
-            foreach (var directory in directories)
-            {
-                list.AddRange(FindAllFiles(directory, filter));
-            }
-
-            return list;
-        }
-
-        protected string GetFileContent(string filename)
-        {
-            if (FileSystem.FileExists(filename) == false)
-                return null;
-
-            try
-            {
-                using (var stream = FileSystem.OpenFile(filename))
-                using (var reader = new StreamReader(stream, Encoding.UTF8, true))
-                {
-                    return reader.ReadToEnd();
-                }
-            }
-            catch
-            {
-                return null; // deal with race conds
-            }
-        }
-
-        public long GetFileSize(string filename)
-        {
-            if (FileSystem.FileExists(filename) == false)
-                return -1;
-
-            try
-            {
-                return FileSystem.GetSize(filename);
-            }
-            catch
-            {
-                return -1; // deal with race conds
-            }
-        }
-
-        /// <summary>
-        /// Dispose any disposable properties
-        /// </summary>
-        /// <remarks>
-        /// Dispose the unit of work
-        /// </remarks>
-        protected override void DisposeResources()
-        {
-            // fixme - wtf in v8?
-            UnitOfWork.DisposeIfDisposable();
-        }
-    }
-}
+using System.Collections.Generic;
+using System.IO;
+using System.Text;
+using Umbraco.Core.IO;
+using Umbraco.Core.Models;
+using Umbraco.Core.Models.EntityBase;
+using Umbraco.Core.Persistence.UnitOfWork;
+
+namespace Umbraco.Core.Persistence.Repositories.Implement
+{
+    internal abstract class FileRepository<TId, TEntity> : DisposableObject, IUnitOfWorkRepository, IReadRepository<TId, TEntity>, IWriteRepository<TEntity>
+        where TEntity : IFile
+    {
+        protected FileRepository(IUnitOfWork work, IFileSystem fileSystem)
+        {
+            UnitOfWork = work;
+            FileSystem = fileSystem;
+        }
+
+        /// <summary>
+        /// Returns the Unit of Work added to the repository
+        /// </summary>
+        protected IUnitOfWork UnitOfWork { get; }
+
+        protected IFileSystem FileSystem { get; }
+
+        public virtual void AddFolder(string folderPath)
+        {
+            PersistNewItem(new Folder(folderPath));
+        }
+
+        public virtual void DeleteFolder(string folderPath)
+        {
+            PersistDeletedItem(new Folder(folderPath));
+        }
+
+        #region Implementation of IRepository<TId,TEntity>
+
+        public virtual void Save(TEntity entity)
+        {
+            if (FileSystem.FileExists(entity.OriginalPath) == false)
+                PersistNewItem(entity);
+            else
+                PersistUpdatedItem(entity);
+        }
+
+        public virtual void Delete(TEntity entity)
+        {
+            PersistDeletedItem(entity);
+        }
+
+        public abstract TEntity Get(TId id);
+
+        public abstract IEnumerable<TEntity> GetMany(params TId[] ids);
+
+        public virtual bool Exists(TId id)
+        {
+            return FileSystem.FileExists(id.ToString());
+        }
+
+        #endregion
+
+        #region Implementation of IUnitOfWorkRepository
+
+        public void PersistNewItem(IEntity entity)
+        {
+            //special case for folder
+            var folder = entity as Folder;
+            if (folder != null)
+            {
+                PersistNewFolder(folder);
+            }
+            else
+            {
+                PersistNewItem((TEntity)entity);
+            }
+        }
+
+        public void PersistUpdatedItem(IEntity entity)
+        {
+            PersistUpdatedItem((TEntity)entity);
+        }
+
+        public void PersistDeletedItem(IEntity entity)
+        {
+            //special case for folder
+            var folder = entity as Folder;
+            if (folder != null)
+            {
+                PersistDeletedFolder(folder);
+            }
+            else
+            {
+                PersistDeletedItem((TEntity)entity);
+            }
+        }
+
+        #endregion
+
+        internal virtual void PersistNewFolder(Folder entity)
+        {
+            FileSystem.CreateFolder(entity.Path);
+        }
+
+        internal virtual void PersistDeletedFolder(Folder entity)
+        {
+            FileSystem.DeleteDirectory(entity.Path);
+        }
+
+        #region Abstract IUnitOfWorkRepository Methods
+
+        protected virtual void PersistNewItem(TEntity entity)
+        {
+            using (var stream = GetContentStream(entity.Content))
+            {
+                FileSystem.AddFile(entity.Path, stream, true);
+                entity.CreateDate = FileSystem.GetCreated(entity.Path).UtcDateTime;
+                entity.UpdateDate = FileSystem.GetLastModified(entity.Path).UtcDateTime;
+                //the id can be the hash
+                entity.Id = entity.Path.GetHashCode();
+                entity.Key = entity.Path.EncodeAsGuid();
+                entity.VirtualPath = FileSystem.GetUrl(entity.Path);
+            }
+        }
+
+        protected virtual void PersistUpdatedItem(TEntity entity)
+        {
+            using (var stream = GetContentStream(entity.Content))
+            {
+                FileSystem.AddFile(entity.Path, stream, true);
+                entity.CreateDate = FileSystem.GetCreated(entity.Path).UtcDateTime;
+                entity.UpdateDate = FileSystem.GetLastModified(entity.Path).UtcDateTime;
+                //the id can be the hash
+                entity.Id = entity.Path.GetHashCode();
+                entity.Key = entity.Path.EncodeAsGuid();
+                entity.VirtualPath = FileSystem.GetUrl(entity.Path);
+            }
+
+            //now that the file has been written, we need to check if the path had been changed
+            if (entity.Path.InvariantEquals(entity.OriginalPath) == false)
+            {
+                //delete the original file
+                FileSystem.DeleteFile(entity.OriginalPath);
+                //reset the original path on the file
+                entity.ResetOriginalPath();
+            }
+        }
+
+        protected virtual void PersistDeletedItem(TEntity entity)
+        {
+            if (FileSystem.FileExists(entity.Path))
+            {
+                FileSystem.DeleteFile(entity.Path);
+            }
+        }
+
+        #endregion
+
+        /// <summary>
+        /// Gets a stream that is used to write to the file
+        /// </summary>
+        /// <param name="content"></param>
+        /// <returns></returns>
+        protected virtual Stream GetContentStream(string content)
+        {
+            return new MemoryStream(Encoding.UTF8.GetBytes(content));
+        }
+
+        /// <summary>
+        /// Returns all files in the file system
+        /// </summary>
+        /// <param name="path"></param>
+        /// <param name="filter"></param>
+        /// <returns>
+        /// Returns a list of all files with their paths. For example:
+        ///
+        /// \hello.txt
+        /// \folder1\test.txt
+        /// \folder1\blah.csv
+        /// \folder1\folder2\blahhhhh.svg
+        /// </returns>
+        protected IEnumerable<string> FindAllFiles(string path, string filter)
+        {
+            var list = new List<string>();
+            list.AddRange(FileSystem.GetFiles(path, filter));
+
+            var directories = FileSystem.GetDirectories(path);
+            foreach (var directory in directories)
+            {
+                list.AddRange(FindAllFiles(directory, filter));
+            }
+
+            return list;
+        }
+
+        protected string GetFileContent(string filename)
+        {
+            if (FileSystem.FileExists(filename) == false)
+                return null;
+
+            try
+            {
+                using (var stream = FileSystem.OpenFile(filename))
+                using (var reader = new StreamReader(stream, Encoding.UTF8, true))
+                {
+                    return reader.ReadToEnd();
+                }
+            }
+            catch
+            {
+                return null; // deal with race conds
+            }
+        }
+
+        public long GetFileSize(string filename)
+        {
+            if (FileSystem.FileExists(filename) == false)
+                return -1;
+
+            try
+            {
+                return FileSystem.GetSize(filename);
+            }
+            catch
+            {
+                return -1; // deal with race conds
+            }
+        }
+
+        /// <summary>
+        /// Dispose any disposable properties
+        /// </summary>
+        /// <remarks>
+        /// Dispose the unit of work
+        /// </remarks>
+        protected override void DisposeResources()
+        {
+            // fixme - wtf in v8?
+            UnitOfWork.DisposeIfDisposable();
+        }
+    }
+}
diff --git a/src/Umbraco.Core/Persistence/Repositories/LanguageRepository.cs b/src/Umbraco.Core/Persistence/Repositories/Implement/LanguageRepository.cs
similarity index 86%
rename from src/Umbraco.Core/Persistence/Repositories/LanguageRepository.cs
rename to src/Umbraco.Core/Persistence/Repositories/Implement/LanguageRepository.cs
index 12bf303c28..b10335628e 100644
--- a/src/Umbraco.Core/Persistence/Repositories/LanguageRepository.cs
+++ b/src/Umbraco.Core/Persistence/Repositories/Implement/LanguageRepository.cs
@@ -1,168 +1,167 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using NPoco;
-using Umbraco.Core.Cache;
-using Umbraco.Core.Logging;
-using Umbraco.Core.Models;
-using Umbraco.Core.Models.EntityBase;
-using Umbraco.Core.Models.Rdbms;
-
-using Umbraco.Core.Persistence.Factories;
-using Umbraco.Core.Persistence.Querying;
-using Umbraco.Core.Persistence.UnitOfWork;
-
-namespace Umbraco.Core.Persistence.Repositories
-{
-    /// <summary>
-    /// Represents a repository for doing CRUD operations for <see cref="Language"/>
-    /// </summary>
-    internal class LanguageRepository : NPocoRepositoryBase<int, ILanguage>, ILanguageRepository
-    {
-        private IRepositoryCachePolicy<ILanguage, int> _cachePolicy;
-
-        public LanguageRepository(IScopeUnitOfWork work, CacheHelper cache, ILogger logger)
-            : base(work, cache, logger)
-        { }
-
-        protected override IRepositoryCachePolicy<ILanguage, int> CreateCachePolicy(IRuntimeCacheProvider runtimeCache)
-        {
-            return new FullDataSetRepositoryCachePolicy<ILanguage, int>(runtimeCache, GetEntityId, /*expires:*/ false);
-        }
-
-        #region Overrides of RepositoryBase<int,Language>
-
-        protected override ILanguage PerformGet(int id)
-        {
-            //use the underlying GetAll which will force cache all domains
-            return GetAll().FirstOrDefault(x => x.Id == id);
-        }
-
-        protected override IEnumerable<ILanguage> PerformGetAll(params int[] ids)
-        {
-            var sql = GetBaseQuery(false).Where("umbracoLanguage.id > 0");
-            if (ids.Any())
-            {
-                sql.Where("umbracoLanguage.id in (@ids)", new { ids = ids });
-            }
-
-            //this needs to be sorted since that is the way legacy worked - default language is the first one!!
-            //even though legacy didn't sort, it should be by id
-            sql.OrderBy<LanguageDto>(dto => dto.Id);
-
-
-            return Database.Fetch<LanguageDto>(sql).Select(ConvertFromDto);
-        }
-
-        protected override IEnumerable<ILanguage> PerformGetByQuery(IQuery<ILanguage> query)
-        {
-            var sqlClause = GetBaseQuery(false);
-            var translator = new SqlTranslator<ILanguage>(sqlClause, query);
-            var sql = translator.Translate();
-            return Database.Fetch<LanguageDto>(sql).Select(ConvertFromDto);
-        }
-
-        #endregion
-
-        #region Overrides of NPocoRepositoryBase<int,Language>
-
-        protected override Sql<ISqlContext> GetBaseQuery(bool isCount)
-        {
-            var sql = Sql();
-
-            sql = isCount
-                ? sql.SelectCount()
-                : sql.Select<LanguageDto>();
-
-            sql
-               .From<LanguageDto>();
-            return sql;
-        }
-
-        protected override string GetBaseWhereClause()
-        {
-            return "umbracoLanguage.id = @id";
-        }
-
-        protected override IEnumerable<string> GetDeleteClauses()
-        {
-
-            var list = new List<string>
-                           {
-                               //NOTE: There is no constraint between the Language and cmsDictionary/cmsLanguageText tables (?)
-                               // but we still need to remove them
-                               "DELETE FROM cmsLanguageText WHERE languageId = @id",
-                               "DELETE FROM umbracoLanguage WHERE id = @id"
-                           };
-            return list;
-        }
-
-        protected override Guid NodeObjectTypeId
-        {
-            get { throw new NotImplementedException(); }
-        }
-
-        #endregion
-
-        #region Unit of Work Implementation
-
-        protected override void PersistNewItem(ILanguage entity)
-        {
-            ((Entity)entity).AddingEntity();
-
-            var factory = new LanguageFactory();
-            var dto = factory.BuildDto(entity);
-
-            var id = Convert.ToInt32(Database.Insert(dto));
-            entity.Id = id;
-
-            entity.ResetDirtyProperties();
-        }
-
-        protected override void PersistUpdatedItem(ILanguage entity)
-        {
-            ((Entity)entity).UpdatingEntity();
-
-            var factory = new LanguageFactory();
-            var dto = factory.BuildDto(entity);
-
-            Database.Update(dto);
-
-            entity.ResetDirtyProperties();
-
-            //Clear the cache entries that exist by key/iso
-            IsolatedCache.ClearCacheItem(GetCacheIdKey<ILanguage>(entity.IsoCode));
-            IsolatedCache.ClearCacheItem(GetCacheIdKey<ILanguage>(entity.CultureName));
-        }
-
-        protected override void PersistDeletedItem(ILanguage entity)
-        {
-            base.PersistDeletedItem(entity);
-
-            //Clear the cache entries that exist by key/iso
-            IsolatedCache.ClearCacheItem(GetCacheIdKey<ILanguage>(entity.IsoCode));
-            IsolatedCache.ClearCacheItem(GetCacheIdKey<ILanguage>(entity.CultureName));
-        }
-
-        #endregion
-
-        protected ILanguage ConvertFromDto(LanguageDto dto)
-        {
-            var factory = new LanguageFactory();
-            var entity = factory.BuildEntity(dto);
-            return entity;
-        }
-
-        public ILanguage GetByCultureName(string cultureName)
-        {
-            //use the underlying GetAll which will force cache all languages
-            return GetAll().FirstOrDefault(x => x.CultureName.InvariantEquals(cultureName));
-        }
-
-        public ILanguage GetByIsoCode(string isoCode)
-        {
-            //use the underlying GetAll which will force cache all languages
-            return GetAll().FirstOrDefault(x => x.IsoCode.InvariantEquals(isoCode));
-        }
-    }
-}
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using NPoco;
+using Umbraco.Core.Cache;
+using Umbraco.Core.Logging;
+using Umbraco.Core.Models;
+using Umbraco.Core.Models.EntityBase;
+using Umbraco.Core.Models.Rdbms;
+using Umbraco.Core.Persistence.Factories;
+using Umbraco.Core.Persistence.Querying;
+using Umbraco.Core.Persistence.UnitOfWork;
+
+namespace Umbraco.Core.Persistence.Repositories.Implement
+{
+    /// <summary>
+    /// Represents a repository for doing CRUD operations for <see cref="Language"/>
+    /// </summary>
+    internal class LanguageRepository : NPocoRepositoryBase<int, ILanguage>, ILanguageRepository
+    {
+        private IRepositoryCachePolicy<ILanguage, int> _cachePolicy;
+
+        public LanguageRepository(IScopeUnitOfWork work, CacheHelper cache, ILogger logger)
+            : base(work, cache, logger)
+        { }
+
+        protected override IRepositoryCachePolicy<ILanguage, int> CreateCachePolicy(IRuntimeCacheProvider runtimeCache)
+        {
+            return new FullDataSetRepositoryCachePolicy<ILanguage, int>(runtimeCache, GetEntityId, /*expires:*/ false);
+        }
+
+        #region Overrides of RepositoryBase<int,Language>
+
+        protected override ILanguage PerformGet(int id)
+        {
+            //use the underlying GetAll which will force cache all domains
+            return GetMany().FirstOrDefault(x => x.Id == id);
+        }
+
+        protected override IEnumerable<ILanguage> PerformGetAll(params int[] ids)
+        {
+            var sql = GetBaseQuery(false).Where("umbracoLanguage.id > 0");
+            if (ids.Any())
+            {
+                sql.Where("umbracoLanguage.id in (@ids)", new { ids = ids });
+            }
+
+            //this needs to be sorted since that is the way legacy worked - default language is the first one!!
+            //even though legacy didn't sort, it should be by id
+            sql.OrderBy<LanguageDto>(dto => dto.Id);
+
+
+            return Database.Fetch<LanguageDto>(sql).Select(ConvertFromDto);
+        }
+
+        protected override IEnumerable<ILanguage> PerformGetByQuery(IQuery<ILanguage> query)
+        {
+            var sqlClause = GetBaseQuery(false);
+            var translator = new SqlTranslator<ILanguage>(sqlClause, query);
+            var sql = translator.Translate();
+            return Database.Fetch<LanguageDto>(sql).Select(ConvertFromDto);
+        }
+
+        #endregion
+
+        #region Overrides of NPocoRepositoryBase<int,Language>
+
+        protected override Sql<ISqlContext> GetBaseQuery(bool isCount)
+        {
+            var sql = Sql();
+
+            sql = isCount
+                ? sql.SelectCount()
+                : sql.Select<LanguageDto>();
+
+            sql
+               .From<LanguageDto>();
+            return sql;
+        }
+
+        protected override string GetBaseWhereClause()
+        {
+            return "umbracoLanguage.id = @id";
+        }
+
+        protected override IEnumerable<string> GetDeleteClauses()
+        {
+
+            var list = new List<string>
+                           {
+                               //NOTE: There is no constraint between the Language and cmsDictionary/cmsLanguageText tables (?)
+                               // but we still need to remove them
+                               "DELETE FROM cmsLanguageText WHERE languageId = @id",
+                               "DELETE FROM umbracoLanguage WHERE id = @id"
+                           };
+            return list;
+        }
+
+        protected override Guid NodeObjectTypeId
+        {
+            get { throw new NotImplementedException(); }
+        }
+
+        #endregion
+
+        #region Unit of Work Implementation
+
+        protected override void PersistNewItem(ILanguage entity)
+        {
+            ((Entity)entity).AddingEntity();
+
+            var factory = new LanguageFactory();
+            var dto = factory.BuildDto(entity);
+
+            var id = Convert.ToInt32(Database.Insert(dto));
+            entity.Id = id;
+
+            entity.ResetDirtyProperties();
+        }
+
+        protected override void PersistUpdatedItem(ILanguage entity)
+        {
+            ((Entity)entity).UpdatingEntity();
+
+            var factory = new LanguageFactory();
+            var dto = factory.BuildDto(entity);
+
+            Database.Update(dto);
+
+            entity.ResetDirtyProperties();
+
+            //Clear the cache entries that exist by key/iso
+            IsolatedCache.ClearCacheItem(RepositoryCacheKeys.GetKey<ILanguage>(entity.IsoCode));
+            IsolatedCache.ClearCacheItem(RepositoryCacheKeys.GetKey<ILanguage>(entity.CultureName));
+        }
+
+        protected override void PersistDeletedItem(ILanguage entity)
+        {
+            base.PersistDeletedItem(entity);
+
+            //Clear the cache entries that exist by key/iso
+            IsolatedCache.ClearCacheItem(RepositoryCacheKeys.GetKey<ILanguage>(entity.IsoCode));
+            IsolatedCache.ClearCacheItem(RepositoryCacheKeys.GetKey<ILanguage>(entity.CultureName));
+        }
+
+        #endregion
+
+        protected ILanguage ConvertFromDto(LanguageDto dto)
+        {
+            var factory = new LanguageFactory();
+            var entity = factory.BuildEntity(dto);
+            return entity;
+        }
+
+        public ILanguage GetByCultureName(string cultureName)
+        {
+            //use the underlying GetAll which will force cache all languages
+            return GetMany().FirstOrDefault(x => x.CultureName.InvariantEquals(cultureName));
+        }
+
+        public ILanguage GetByIsoCode(string isoCode)
+        {
+            //use the underlying GetAll which will force cache all languages
+            return GetMany().FirstOrDefault(x => x.IsoCode.InvariantEquals(isoCode));
+        }
+    }
+}
diff --git a/src/Umbraco.Core/Persistence/Repositories/MacroRepository.cs b/src/Umbraco.Core/Persistence/Repositories/Implement/MacroRepository.cs
similarity index 95%
rename from src/Umbraco.Core/Persistence/Repositories/MacroRepository.cs
rename to src/Umbraco.Core/Persistence/Repositories/Implement/MacroRepository.cs
index 8dd41582dc..f7eb961305 100644
--- a/src/Umbraco.Core/Persistence/Repositories/MacroRepository.cs
+++ b/src/Umbraco.Core/Persistence/Repositories/Implement/MacroRepository.cs
@@ -1,222 +1,221 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using NPoco;
-using Umbraco.Core.Cache;
-using Umbraco.Core.Logging;
-using Umbraco.Core.Models;
-using Umbraco.Core.Models.EntityBase;
-using Umbraco.Core.Models.Rdbms;
-
-using Umbraco.Core.Persistence.Factories;
-using Umbraco.Core.Persistence.Querying;
-using Umbraco.Core.Persistence.UnitOfWork;
-
-namespace Umbraco.Core.Persistence.Repositories
-{
-    internal class MacroRepository : NPocoRepositoryBase<int, IMacro>, IMacroRepository
-    {
-        public MacroRepository(IScopeUnitOfWork work, CacheHelper cache, ILogger logger)
-            : base(work, cache, logger)
-        { }
-
-        protected override IMacro PerformGet(int id)
-        {
-            var sql = GetBaseQuery(false);
-            sql.Where(GetBaseWhereClause(), new { id });
-            return GetBySql(sql);
-        }
-
-        public IMacro Get(Guid id)
-        {
-            var sql = GetBaseQuery().Where("uniqueId=@Id", new { Id = id });
-            return GetBySql(sql);
-        }
-
-        private IMacro GetBySql(Sql sql)
-        {
-            var macroDto = Database
-                .FetchOneToMany<MacroDto>(x => x.MacroPropertyDtos, sql)
-                .FirstOrDefault();
-
-            if (macroDto == null)
-                return null;
-
-            var factory = new MacroFactory();
-            var entity = factory.BuildEntity(macroDto);
-
-            // reset dirty initial properties (U4-1946)
-            ((TracksChangesEntityBase)entity).ResetDirtyProperties(false);
-
-            return entity;
-        }
-
-        public IEnumerable<IMacro> GetAll(params Guid[] ids)
-        {
-            return ids.Length > 0 ? ids.Select(Get) : GetAllNoIds();
-        }
-
-        public bool Exists(Guid id)
-        {
-            return Get(id) != null;
-        }
-
-        protected override IEnumerable<IMacro> PerformGetAll(params int[] ids)
-        {
-            return ids.Length > 0 ? ids.Select(Get) : GetAllNoIds();
-        }
-
-        private IEnumerable<IMacro> GetAllNoIds()
-        {
-            var sql = GetBaseQuery(false)
-                //must be sorted this way for the relator to work
-                .OrderBy<MacroDto>(x => x.Id);
-
-            return Database
-                .FetchOneToMany<MacroDto>(x => x.MacroPropertyDtos, sql)
-                .Transform(ConvertFromDtos)
-                .ToArray(); // do it now and once
-        }
-
-        private IEnumerable<IMacro> ConvertFromDtos(IEnumerable<MacroDto> dtos)
-        {
-            var factory = new MacroFactory();
-            foreach (var entity in dtos.Select(factory.BuildEntity))
-            {
-                // reset dirty initial properties (U4-1946)
-                ((TracksChangesEntityBase)entity).ResetDirtyProperties(false);
-
-                yield return entity;
-            }
-        }
-
-        protected override IEnumerable<IMacro> PerformGetByQuery(IQuery<IMacro> query)
-        {
-            var sqlClause = GetBaseQuery(false);
-            var translator = new SqlTranslator<IMacro>(sqlClause, query);
-            var sql = translator.Translate();
-
-            return Database
-                .FetchOneToMany<MacroDto>(x => x.MacroPropertyDtos, sql)
-                .Select(x => Get(x.Id));
-        }
-
-        protected override Sql<ISqlContext> GetBaseQuery(bool isCount)
-        {
-            return isCount ? Sql().SelectCount().From<MacroDto>() : GetBaseQuery();
-        }
-
-        private Sql<ISqlContext> GetBaseQuery()
-        {
-            return Sql()
-                .SelectAll()
-                .From<MacroDto>()
-                .LeftJoin<MacroPropertyDto>()
-                .On<MacroDto, MacroPropertyDto>(left => left.Id, right => right.Macro);
-        }
-
-        protected override string GetBaseWhereClause()
-        {
-            return "cmsMacro.id = @id";
-        }
-
-        protected override IEnumerable<string> GetDeleteClauses()
-        {
-            var list = new List<string>
-                {
-                    "DELETE FROM cmsMacroProperty WHERE macro = @id",
-                    "DELETE FROM cmsMacro WHERE id = @id"
-                };
-            return list;
-        }
-
-        protected override Guid NodeObjectTypeId => throw new NotImplementedException();
-
-        protected override void PersistNewItem(IMacro entity)
-        {
-            ((Entity)entity).AddingEntity();
-
-            var factory = new MacroFactory();
-            var dto = factory.BuildDto(entity);
-
-            var id = Convert.ToInt32(Database.Insert(dto));
-            entity.Id = id;
-
-            foreach (var propDto in dto.MacroPropertyDtos)
-            {
-                //need to set the id explicitly here
-                propDto.Macro = id;
-                var propId = Convert.ToInt32(Database.Insert(propDto));
-                entity.Properties[propDto.Alias].Id = propId;
-            }
-
-            entity.ResetDirtyProperties();
-        }
-
-        protected override void PersistUpdatedItem(IMacro entity)
-        {
-            ((Entity)entity).UpdatingEntity();
-
-            var factory = new MacroFactory();
-            var dto = factory.BuildDto(entity);
-
-            Database.Update(dto);
-
-            //update the properties if they've changed
-            var macro = (Macro)entity;
-            if (macro.IsPropertyDirty("Properties") || macro.Properties.Any(x => x.IsDirty()))
-            {
-                var ids = dto.MacroPropertyDtos.Where(x => x.Id > 0).Select(x => x.Id).ToArray();
-                if (ids.Length > 0)
-                    Database.Delete<MacroPropertyDto>("WHERE macro=@macro AND id NOT IN (@ids)", new { macro = dto.Id, ids });
-                else
-                    Database.Delete<MacroPropertyDto>("WHERE macro=@macro", new { macro = dto.Id });
-
-                // detect new aliases, replace with temp aliases
-                // this ensures that we don't have collisions, ever
-                var aliases = new Dictionary<string, string>();
-                foreach (var propDto in dto.MacroPropertyDtos)
-                {
-                    var prop = macro.Properties.FirstOrDefault(x => x.Id == propDto.Id);
-                    if (prop == null) throw new Exception("oops: property.");
-                    if (propDto.Id == 0 || prop.IsPropertyDirty("Alias"))
-                    {
-                        var tempAlias = Guid.NewGuid().ToString("N").Substring(0, 8);
-                        aliases[tempAlias] = propDto.Alias;
-                        propDto.Alias = tempAlias;
-                    }
-                }
-
-                // insert or update existing properties, with temp aliases
-                foreach (var propDto in dto.MacroPropertyDtos)
-                {
-                    if (propDto.Id == 0)
-                    {
-                        // insert
-                        propDto.Id = Convert.ToInt32(Database.Insert(propDto));
-                        macro.Properties[aliases[propDto.Alias]].Id = propDto.Id;
-                    }
-                    else
-                    {
-                        // update
-                        var property = macro.Properties.FirstOrDefault(x => x.Id == propDto.Id);
-                        if (property == null) throw new Exception("oops: property.");
-                        if (property.IsDirty())
-                            Database.Update(propDto);
-                    }
-                }
-
-                // replace the temp aliases with the real ones
-                foreach (var propDto in dto.MacroPropertyDtos)
-                {
-                    if (aliases.ContainsKey(propDto.Alias) == false) continue;
-
-                    propDto.Alias = aliases[propDto.Alias];
-                    Database.Update(propDto);
-                }
-            }
-
-            entity.ResetDirtyProperties();
-        }
-    }
-}
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using NPoco;
+using Umbraco.Core.Cache;
+using Umbraco.Core.Logging;
+using Umbraco.Core.Models;
+using Umbraco.Core.Models.EntityBase;
+using Umbraco.Core.Models.Rdbms;
+using Umbraco.Core.Persistence.Factories;
+using Umbraco.Core.Persistence.Querying;
+using Umbraco.Core.Persistence.UnitOfWork;
+
+namespace Umbraco.Core.Persistence.Repositories.Implement
+{
+    internal class MacroRepository : NPocoRepositoryBase<int, IMacro>, IMacroRepository
+    {
+        public MacroRepository(IScopeUnitOfWork work, CacheHelper cache, ILogger logger)
+            : base(work, cache, logger)
+        { }
+
+        protected override IMacro PerformGet(int id)
+        {
+            var sql = GetBaseQuery(false);
+            sql.Where(GetBaseWhereClause(), new { id });
+            return GetBySql(sql);
+        }
+
+        public IMacro Get(Guid id)
+        {
+            var sql = GetBaseQuery().Where("uniqueId=@Id", new { Id = id });
+            return GetBySql(sql);
+        }
+
+        private IMacro GetBySql(Sql sql)
+        {
+            var macroDto = Database
+                .FetchOneToMany<MacroDto>(x => x.MacroPropertyDtos, sql)
+                .FirstOrDefault();
+
+            if (macroDto == null)
+                return null;
+
+            var factory = new MacroFactory();
+            var entity = factory.BuildEntity(macroDto);
+
+            // reset dirty initial properties (U4-1946)
+            ((TracksChangesEntityBase)entity).ResetDirtyProperties(false);
+
+            return entity;
+        }
+
+        public IEnumerable<IMacro> GetMany(params Guid[] ids)
+        {
+            return ids.Length > 0 ? ids.Select(Get) : GetAllNoIds();
+        }
+
+        public bool Exists(Guid id)
+        {
+            return Get(id) != null;
+        }
+
+        protected override IEnumerable<IMacro> PerformGetAll(params int[] ids)
+        {
+            return ids.Length > 0 ? ids.Select(Get) : GetAllNoIds();
+        }
+
+        private IEnumerable<IMacro> GetAllNoIds()
+        {
+            var sql = GetBaseQuery(false)
+                //must be sorted this way for the relator to work
+                .OrderBy<MacroDto>(x => x.Id);
+
+            return Database
+                .FetchOneToMany<MacroDto>(x => x.MacroPropertyDtos, sql)
+                .Transform(ConvertFromDtos)
+                .ToArray(); // do it now and once
+        }
+
+        private IEnumerable<IMacro> ConvertFromDtos(IEnumerable<MacroDto> dtos)
+        {
+            var factory = new MacroFactory();
+            foreach (var entity in dtos.Select(factory.BuildEntity))
+            {
+                // reset dirty initial properties (U4-1946)
+                ((TracksChangesEntityBase)entity).ResetDirtyProperties(false);
+
+                yield return entity;
+            }
+        }
+
+        protected override IEnumerable<IMacro> PerformGetByQuery(IQuery<IMacro> query)
+        {
+            var sqlClause = GetBaseQuery(false);
+            var translator = new SqlTranslator<IMacro>(sqlClause, query);
+            var sql = translator.Translate();
+
+            return Database
+                .FetchOneToMany<MacroDto>(x => x.MacroPropertyDtos, sql)
+                .Select(x => Get(x.Id));
+        }
+
+        protected override Sql<ISqlContext> GetBaseQuery(bool isCount)
+        {
+            return isCount ? Sql().SelectCount().From<MacroDto>() : GetBaseQuery();
+        }
+
+        private Sql<ISqlContext> GetBaseQuery()
+        {
+            return Sql()
+                .SelectAll()
+                .From<MacroDto>()
+                .LeftJoin<MacroPropertyDto>()
+                .On<MacroDto, MacroPropertyDto>(left => left.Id, right => right.Macro);
+        }
+
+        protected override string GetBaseWhereClause()
+        {
+            return "cmsMacro.id = @id";
+        }
+
+        protected override IEnumerable<string> GetDeleteClauses()
+        {
+            var list = new List<string>
+                {
+                    "DELETE FROM cmsMacroProperty WHERE macro = @id",
+                    "DELETE FROM cmsMacro WHERE id = @id"
+                };
+            return list;
+        }
+
+        protected override Guid NodeObjectTypeId => throw new NotImplementedException();
+
+        protected override void PersistNewItem(IMacro entity)
+        {
+            ((Entity)entity).AddingEntity();
+
+            var factory = new MacroFactory();
+            var dto = factory.BuildDto(entity);
+
+            var id = Convert.ToInt32(Database.Insert(dto));
+            entity.Id = id;
+
+            foreach (var propDto in dto.MacroPropertyDtos)
+            {
+                //need to set the id explicitly here
+                propDto.Macro = id;
+                var propId = Convert.ToInt32(Database.Insert(propDto));
+                entity.Properties[propDto.Alias].Id = propId;
+            }
+
+            entity.ResetDirtyProperties();
+        }
+
+        protected override void PersistUpdatedItem(IMacro entity)
+        {
+            ((Entity)entity).UpdatingEntity();
+
+            var factory = new MacroFactory();
+            var dto = factory.BuildDto(entity);
+
+            Database.Update(dto);
+
+            //update the properties if they've changed
+            var macro = (Macro)entity;
+            if (macro.IsPropertyDirty("Properties") || macro.Properties.Any(x => x.IsDirty()))
+            {
+                var ids = dto.MacroPropertyDtos.Where(x => x.Id > 0).Select(x => x.Id).ToArray();
+                if (ids.Length > 0)
+                    Database.Delete<MacroPropertyDto>("WHERE macro=@macro AND id NOT IN (@ids)", new { macro = dto.Id, ids });
+                else
+                    Database.Delete<MacroPropertyDto>("WHERE macro=@macro", new { macro = dto.Id });
+
+                // detect new aliases, replace with temp aliases
+                // this ensures that we don't have collisions, ever
+                var aliases = new Dictionary<string, string>();
+                foreach (var propDto in dto.MacroPropertyDtos)
+                {
+                    var prop = macro.Properties.FirstOrDefault(x => x.Id == propDto.Id);
+                    if (prop == null) throw new Exception("oops: property.");
+                    if (propDto.Id == 0 || prop.IsPropertyDirty("Alias"))
+                    {
+                        var tempAlias = Guid.NewGuid().ToString("N").Substring(0, 8);
+                        aliases[tempAlias] = propDto.Alias;
+                        propDto.Alias = tempAlias;
+                    }
+                }
+
+                // insert or update existing properties, with temp aliases
+                foreach (var propDto in dto.MacroPropertyDtos)
+                {
+                    if (propDto.Id == 0)
+                    {
+                        // insert
+                        propDto.Id = Convert.ToInt32(Database.Insert(propDto));
+                        macro.Properties[aliases[propDto.Alias]].Id = propDto.Id;
+                    }
+                    else
+                    {
+                        // update
+                        var property = macro.Properties.FirstOrDefault(x => x.Id == propDto.Id);
+                        if (property == null) throw new Exception("oops: property.");
+                        if (property.IsDirty())
+                            Database.Update(propDto);
+                    }
+                }
+
+                // replace the temp aliases with the real ones
+                foreach (var propDto in dto.MacroPropertyDtos)
+                {
+                    if (aliases.ContainsKey(propDto.Alias) == false) continue;
+
+                    propDto.Alias = aliases[propDto.Alias];
+                    Database.Update(propDto);
+                }
+            }
+
+            entity.ResetDirtyProperties();
+        }
+    }
+}
diff --git a/src/Umbraco.Core/Persistence/Repositories/MediaRepository.cs b/src/Umbraco.Core/Persistence/Repositories/Implement/MediaRepository.cs
similarity index 94%
rename from src/Umbraco.Core/Persistence/Repositories/MediaRepository.cs
rename to src/Umbraco.Core/Persistence/Repositories/Implement/MediaRepository.cs
index 728d069095..a508297aaf 100644
--- a/src/Umbraco.Core/Persistence/Repositories/MediaRepository.cs
+++ b/src/Umbraco.Core/Persistence/Repositories/Implement/MediaRepository.cs
@@ -1,564 +1,562 @@
-using System;
-using System.Collections.Generic;
-using System.Globalization;
-using System.Linq;
-using System.Text.RegularExpressions;
-using NPoco;
-using Umbraco.Core.Cache;
-using Umbraco.Core.Configuration.UmbracoSettings;
-using Umbraco.Core.Exceptions;
-using Umbraco.Core.Logging;
-using Umbraco.Core.Models;
-using Umbraco.Core.Models.EntityBase;
-using Umbraco.Core.Models.Rdbms;
-using Umbraco.Core.Persistence.DatabaseModelDefinitions;
-using Umbraco.Core.Persistence.Factories;
-using Umbraco.Core.Persistence.Querying;
-using Umbraco.Core.Persistence.UnitOfWork;
-
-namespace Umbraco.Core.Persistence.Repositories
-{
-    /// <summary>
-    /// Represents a repository for doing CRUD operations for <see cref="IMedia"/>
-    /// </summary>
-    internal class MediaRepository : RecycleBinRepository<int, IMedia, MediaRepository>, IMediaRepository
-    {
-        private readonly IMediaTypeRepository _mediaTypeRepository;
-        private readonly ITagRepository _tagRepository;
-        private readonly MediaByGuidReadRepository _mediaByGuidReadRepository;
-
-        public MediaRepository(IScopeUnitOfWork work, CacheHelper cache, ILogger logger, IMediaTypeRepository mediaTypeRepository, ITagRepository tagRepository, IContentSection contentSection)
-            : base(work, cache, logger)
-        {
-            _mediaTypeRepository = mediaTypeRepository ?? throw new ArgumentNullException(nameof(mediaTypeRepository));
-            _tagRepository = tagRepository ?? throw new ArgumentNullException(nameof(tagRepository));
-            _mediaByGuidReadRepository = new MediaByGuidReadRepository(this, work, cache, logger);
-            EnsureUniqueNaming = contentSection.EnsureUniqueNaming;
-        }
-
-        protected override MediaRepository This => this;
-
-        public bool EnsureUniqueNaming { get; set; }
-
-        #region Repository Base
-
-        protected override Guid NodeObjectTypeId => Constants.ObjectTypes.Media;
-
-        protected override IMedia PerformGet(int id)
-        {
-            var sql = GetBaseQuery(QueryType.Single)
-                .Where<NodeDto>(x => x.NodeId == id)
-                .SelectTop(1);
-
-            var dto = Database.Fetch<ContentDto>(sql).FirstOrDefault();
-            return dto == null
-                ? null
-                : MapDtoToContent(dto);
-        }
-
-        protected override IEnumerable<IMedia> PerformGetAll(params int[] ids)
-        {
-            var sql = GetBaseQuery(QueryType.Many);
-
-            if (ids.Any())
-                sql.WhereIn<NodeDto>(x => x.NodeId, ids);
-
-            return MapDtosToContent(Database.Fetch<ContentDto>(sql));
-        }
-
-        protected override IEnumerable<IMedia> PerformGetByQuery(IQuery<IMedia> query)
-        {
-            var sqlClause = GetBaseQuery(QueryType.Many);
-
-            var translator = new SqlTranslator<IMedia>(sqlClause, query);
-            var sql = translator.Translate();
-
-            sql // fixme why?
-                .OrderBy<NodeDto>(x => x.Level)
-                .OrderBy<NodeDto>(x => x.SortOrder);
-
-            return MapDtosToContent(Database.Fetch<ContentDto>(sql));
-        }
-
-        protected override Sql<ISqlContext> GetBaseQuery(QueryType queryType)
-        {
-            return GetBaseQuery(queryType, true);
-        }
-
-        protected virtual Sql<ISqlContext> GetBaseQuery(QueryType queryType, bool current)
-        {
-            var sql = SqlContext.Sql();
-
-            switch (queryType)
-            {
-                case QueryType.Count:
-                    sql = sql.SelectCount();
-                    break;
-                case QueryType.Ids:
-                    sql = sql.Select<ContentDto>(x => x.NodeId);
-                    break;
-                case QueryType.Single:
-                case QueryType.Many:
-                    sql = sql.Select<ContentDto>(r =>
-                        r.Select(x => x.NodeDto)
-                         .Select(x => x.ContentVersionDto));
-                    break;
-            }
-
-            sql
-                .From<ContentDto>()
-                .InnerJoin<NodeDto>().On<ContentDto, NodeDto>(left => left.NodeId, right => right.NodeId)
-                .InnerJoin<ContentVersionDto>().On<ContentDto, ContentVersionDto>(left => left.NodeId, right => right.NodeId);
-
-
-            sql.Where<NodeDto>(x => x.NodeObjectType == NodeObjectTypeId);
-
-            if (current)
-                sql.Where<ContentVersionDto>(x => x.Current); // always get the current version
-
-            return sql;
-        }
-
-        // fixme - kill, eventually
-        protected override Sql<ISqlContext> GetBaseQuery(bool isCount)
-        {
-            return GetBaseQuery(isCount ? QueryType.Count : QueryType.Single);
-        }
-
-        // fixme - kill, eventually
-        // ah maybe not, that what's used for eg Exists in base repo
-        protected override string GetBaseWhereClause()
-        {
-            return $"{Constants.DatabaseSchema.Tables.Node}.id = @id";
-        }
-
-        protected override IEnumerable<string> GetDeleteClauses()
-        {
-            var list = new List<string>
-            {
-                "DELETE FROM " + Constants.DatabaseSchema.Tables.Task + " WHERE nodeId = @id",
-                "DELETE FROM " + Constants.DatabaseSchema.Tables.User2NodeNotify + " WHERE nodeId = @id",
-                "DELETE FROM " + Constants.DatabaseSchema.Tables.UserGroup2NodePermission + " WHERE nodeId = @id",
-                "DELETE FROM " + Constants.DatabaseSchema.Tables.UserStartNode + " WHERE startNode = @id",
-                "UPDATE " + Constants.DatabaseSchema.Tables.UserGroup + " SET startContentId = NULL WHERE startContentId = @id",
-                "DELETE FROM " + Constants.DatabaseSchema.Tables.Relation + " WHERE parentId = @id",
-                "DELETE FROM " + Constants.DatabaseSchema.Tables.Relation + " WHERE childId = @id",
-                "DELETE FROM " + Constants.DatabaseSchema.Tables.TagRelationship + " WHERE nodeId = @id",
-                "DELETE FROM " + Constants.DatabaseSchema.Tables.Document + " WHERE nodeId = @id",
-                "DELETE FROM " + Constants.DatabaseSchema.Tables.PropertyData + " WHERE versionId IN (SELECT id FROM " + Constants.DatabaseSchema.Tables.ContentVersion + " WHERE nodeId = @id)",
-                "DELETE FROM " + Constants.DatabaseSchema.Tables.ContentVersion + " WHERE nodeId = @id",
-                "DELETE FROM " + Constants.DatabaseSchema.Tables.Content + " WHERE nodeId = @id",
-                "DELETE FROM " + Constants.DatabaseSchema.Tables.Node + " WHERE id = @id"
-            };
-            return list;
-        }
-
-        #endregion
-
-        #region Versions
-
-        public override IEnumerable<IMedia> GetAllVersions(int nodeId)
-        {
-            var sql = GetBaseQuery(QueryType.Many, false)
-                .Where<NodeDto>(x => x.NodeId == nodeId)
-                .OrderByDescending<ContentVersionDto>(x => x.Current)
-                .AndByDescending<ContentVersionDto>(x => x.VersionDate);
-
-            return MapDtosToContent(Database.Fetch<ContentDto>(sql), true);
-        }
-
-        public override IMedia GetVersion(int versionId)
-        {
-            var sql = GetBaseQuery(QueryType.Single)
-                .Where<ContentVersionDto>(x => x.Id == versionId);
-
-            var dto = Database.Fetch<ContentDto>(sql).FirstOrDefault();
-            return dto == null ? null : MapDtoToContent(dto);
-        }
-
-        public IMedia GetMediaByPath(string mediaPath)
-        {
-            var umbracoFileValue = mediaPath;
-            const string pattern = ".*[_][0-9]+[x][0-9]+[.].*";
-            var isResized = Regex.IsMatch(mediaPath, pattern);
-
-            // If the image has been resized we strip the "_403x328" of the original "/media/1024/koala_403x328.jpg" url.
-            if (isResized)
-            {
-                var underscoreIndex = mediaPath.LastIndexOf('_');
-                var dotIndex = mediaPath.LastIndexOf('.');
-                umbracoFileValue = string.Concat(mediaPath.Substring(0, underscoreIndex), mediaPath.Substring(dotIndex));
-            }
-
-            // If the stripped-down url returns null, we try again with the original url.
-            // Previously, the function would fail on e.g. "my_x_image.jpg"
-            var nodeId = GetMediaNodeIdByPath(Sql().Where<PropertyDataDto>(x => x.VarcharValue == umbracoFileValue));
-            if (nodeId < 0) nodeId = GetMediaNodeIdByPath(Sql().Where<PropertyDataDto>(x => x.VarcharValue == mediaPath));
-
-            // If no result so far, try getting from a json value stored in the ntext / nvarchar column
-            if (nodeId < 0) nodeId = GetMediaNodeIdByPath(Sql().Where("textValue LIKE @0", "%" + umbracoFileValue + "%"));
-            if (nodeId < 0) nodeId = GetMediaNodeIdByPath(Sql().Where("varcharValue LIKE @0", "%" + umbracoFileValue + "%"));
-
-            return nodeId < 0 ? null : Get(nodeId);
-        }
-
-        private int GetMediaNodeIdByPath(Sql query)
-        {
-            var sql = Sql().Select<ContentVersionDto>(x => x.NodeId)
-                .From<PropertyDataDto>()
-                .InnerJoin<PropertyTypeDto>().On<PropertyDataDto, PropertyTypeDto>(left => left.PropertyTypeId, right => right.Id)
-                .InnerJoin<ContentVersionDto>().On<PropertyDataDto, ContentVersionDto>((left, right) => left.VersionId == right.Id)
-                .Where<PropertyTypeDto>(x => x.Alias == "umbracoFile")
-                .Append(query);
-
-            var nodeId = Database.Fetch<int?>(sql).FirstOrDefault();
-            return nodeId ?? -1;
-        }
-
-        protected override void PerformDeleteVersion(int id, int versionId)
-        {
-            // raise event first else potential FK issues
-            OnUowRemovingVersion(new UnitOfWorkVersionEventArgs(UnitOfWork, id, versionId));
-
-            Database.Delete<PropertyDataDto>("WHERE versionId = @versionId", new { versionId });
-            Database.Delete<ContentVersionDto>("WHERE versionId = @versionId", new { versionId });
-        }
-
-        #endregion
-
-        #region Persist
-
-        protected override void PersistNewItem(IMedia entity)
-        {
-            var media = (Models.Media) entity;
-            media.AddingEntity();
-
-            // ensure unique name on the same level
-            entity.Name = EnsureUniqueNodeName(entity.ParentId, entity.Name);
-
-            // ensure that strings don't contain characters that are invalid in xml
-            // fixme - do we really want to keep doing this here?
-            entity.SanitizeEntityPropertiesForXmlStorage();
-
-            // create the dto
-            var dto = ContentBaseFactory.BuildDto(entity);
-
-            // derive path and level from parent
-            var parent = GetParentNodeDto(entity.ParentId);
-            var level = parent.Level + 1;
-
-            // get sort order
-            var sortOrder = GetNewChildSortOrder(entity.ParentId, 0);
-
-            // persist the node dto
-            var nodeDto = dto.NodeDto;
-            nodeDto.Path = parent.Path;
-            nodeDto.Level = Convert.ToInt16(level);
-            nodeDto.SortOrder = sortOrder;
-
-            // see if there's a reserved identifier for this unique id
-            // and then either update or insert the node dto
-            var id = GetReservedId(nodeDto.UniqueId);
-            if (id > 0)
-            {
-                nodeDto.NodeId = id;
-                nodeDto.Path = string.Concat(parent.Path, ",", nodeDto.NodeId);
-                nodeDto.ValidatePathWithException();
-                Database.Update(nodeDto);
-            }
-            else
-            {
-                Database.Insert(nodeDto);
-
-                // update path, now that we have an id
-                nodeDto.Path = string.Concat(parent.Path, ",", nodeDto.NodeId);
-                nodeDto.ValidatePathWithException();
-                Database.Update(nodeDto);
-            }
-
-            // update entity
-            entity.Id = nodeDto.NodeId;
-            entity.Path = nodeDto.Path;
-            entity.SortOrder = sortOrder;
-            entity.Level = level;
-
-            // persist the content dto
-            dto.NodeId = nodeDto.NodeId;
-            Database.Insert(dto);
-
-            // persist the content version dto
-            // assumes a new version id and version date (modified date) has been set
-            var contentVersionDto = dto.ContentVersionDto;
-            contentVersionDto.NodeId = nodeDto.NodeId;
-            contentVersionDto.Current = true;
-            Database.Insert(contentVersionDto);
-            media.VersionId = contentVersionDto.Id;
-
-            // persist the property data
-            var propertyDataDtos = PropertyFactory.BuildDtos(media.VersionId, 0, entity.Properties, out _);
-            foreach (var propertyDataDto in propertyDataDtos)
-                Database.Insert(propertyDataDto);
-
-            // set tags
-            UpdateEntityTags(entity, _tagRepository);
-
-            OnUowRefreshedEntity(new UnitOfWorkEntityEventArgs(UnitOfWork, entity));
-
-            entity.ResetDirtyProperties();
-        }
-
-        protected override void PersistUpdatedItem(IMedia entity)
-        {
-            var media = (Models.Media) entity;
-
-            // update
-            media.UpdatingEntity();
-
-            // ensure unique name on the same level
-            entity.Name = EnsureUniqueNodeName(entity.ParentId, entity.Name, entity.Id);
-
-            // ensure that strings don't contain characters that are invalid in xml
-            // fixme - do we really want to keep doing this here?
-            entity.SanitizeEntityPropertiesForXmlStorage();
-
-            // if parent has changed, get path, level and sort order
-            if (entity.IsPropertyDirty("ParentId"))
-            {
-                var parent = GetParentNodeDto(entity.ParentId);
-
-                entity.Path = string.Concat(parent.Path, ",", entity.Id);
-                entity.Level = parent.Level + 1;
-                entity.SortOrder = GetNewChildSortOrder(entity.ParentId, 0);
-            }
-
-            // create the dto
-            var dto = ContentBaseFactory.BuildDto(entity);
-
-            // update the node dto
-            var nodeDto = dto.NodeDto;
-            nodeDto.ValidatePathWithException();
-            Database.Update(nodeDto);
-
-            // update the content dto
-            Database.Update(dto);
-
-            // update the content version dto
-            var contentVersionDto = dto.ContentVersionDto;
-            contentVersionDto.Current = true;
-            Database.Update(contentVersionDto);
-
-            // replace the property data
-            var deletePropertyDataSql = SqlContext.Sql().Delete<PropertyDataDto>().Where<PropertyDataDto>(x => x.VersionId == media.VersionId);
-            Database.Execute(deletePropertyDataSql);
-            var propertyDataDtos = PropertyFactory.BuildDtos(media.VersionId, 0, entity.Properties, out _);
-            foreach (var propertyDataDto in propertyDataDtos)
-                Database.Insert(propertyDataDto);
-
-            UpdateEntityTags(entity, _tagRepository);
-
-            OnUowRefreshedEntity(new UnitOfWorkEntityEventArgs(UnitOfWork, entity));
-
-            entity.ResetDirtyProperties();
-        }
-
-        protected override void PersistDeletedItem(IMedia entity)
-        {
-            // raise event first else potential FK issues
-            OnUowRemovingEntity(new UnitOfWorkEntityEventArgs(UnitOfWork, entity));
-            base.PersistDeletedItem(entity);
-        }
-
-        #endregion
-
-        #region Recycle Bin
-
-        protected override int RecycleBinId => Constants.System.RecycleBinMedia;
-
-        #endregion
-
-        #region Read Repository implementation for Guid keys
-
-        public IMedia Get(Guid id)
-        {
-            return _mediaByGuidReadRepository.Get(id);
-        }
-
-        IEnumerable<IMedia> IReadRepository<Guid, IMedia>.GetAll(params Guid[] ids)
-        {
-            return _mediaByGuidReadRepository.GetAll(ids);
-        }
-
-        public bool Exists(Guid id)
-        {
-            return _mediaByGuidReadRepository.Exists(id);
-        }
-
-        /// <summary>
-        /// A reading repository purely for looking up by GUID
-        /// </summary>
-        /// <remarks>
-        /// TODO: This is ugly and to fix we need to decouple the IRepositoryQueryable -> IRepository -> IReadRepository which should all be separate things!
-        /// Then we can do the same thing with repository instances and we wouldn't need to leave all these methods as not implemented because we wouldn't need to implement them
-        /// </remarks>
-        private class MediaByGuidReadRepository : NPocoRepositoryBase<Guid, IMedia>
-        {
-            private readonly MediaRepository _outerRepo;
-
-            public MediaByGuidReadRepository(MediaRepository outerRepo, IScopeUnitOfWork work, CacheHelper cache, ILogger logger)
-                : base(work, cache, logger)
-            {
-                _outerRepo = outerRepo;
-            }
-
-            protected override Guid NodeObjectTypeId => _outerRepo.NodeObjectTypeId;
-
-            protected override IMedia PerformGet(Guid id)
-            {
-                var sql = _outerRepo.GetBaseQuery(QueryType.Single)
-                    .Where<NodeDto>(x => x.UniqueId == id);
-
-                var dto = Database.Fetch<ContentDto>(sql.SelectTop(1)).FirstOrDefault();
-
-                if (dto == null)
-                    return null;
-
-                var content = _outerRepo.MapDtoToContent(dto);
-
-                return content;
-            }
-
-            protected override IEnumerable<IMedia> PerformGetAll(params Guid[] ids)
-            {
-                var sql = _outerRepo.GetBaseQuery(QueryType.Many);
-                if (ids.Length > 0)
-                    sql.WhereIn<NodeDto>(x => x.UniqueId, ids);
-
-                return _outerRepo.MapDtosToContent(Database.Fetch<ContentDto>(sql));
-            }
-
-            protected override IEnumerable<IMedia> PerformGetByQuery(IQuery<IMedia> query)
-            {
-                throw new WontImplementException();
-            }
-
-            protected override IEnumerable<string> GetDeleteClauses()
-            {
-                throw new WontImplementException();
-            }
-
-            protected override void PersistNewItem(IMedia entity)
-            {
-                throw new WontImplementException();
-            }
-
-            protected override void PersistUpdatedItem(IMedia entity)
-            {
-                throw new WontImplementException();
-            }
-
-            protected override Sql<ISqlContext> GetBaseQuery(bool isCount)
-            {
-                throw new WontImplementException();
-            }
-
-            protected override string GetBaseWhereClause()
-            {
-                throw new WontImplementException();
-            }
-        }
-
-        #endregion
-
-        /// <summary>
-        /// Gets paged media results.
-        /// </summary>
-        public IEnumerable<IMedia> GetPagedResultsByQuery(IQuery<IMedia> query, long pageIndex, int pageSize, out long totalRecords,
-            string orderBy, Direction orderDirection, bool orderBySystemField, IQuery<IMedia> filter = null)
-        {
-            Sql<ISqlContext> filterSql = null;
-
-            if (filter != null)
-            {
-                filterSql = Sql();
-                foreach (var clause in filter.GetWhereClauses())
-                    filterSql = filterSql.Append($"AND ({clause.Item1})", clause.Item2);
-            }
-
-            return GetPagedResultsByQuery<ContentDto>(query, pageIndex, pageSize, out totalRecords,
-                x => MapDtosToContent(x), orderBy, orderDirection, orderBySystemField,
-                filterSql);
-        }
-
-        private IEnumerable<IMedia> MapDtosToContent(List<ContentDto> dtos, bool withCache = false)
-        {
-            var temps = new List<TempContent<Models.Media>>();
-            var contentTypes = new Dictionary<int, IMediaType>();
-            var content = new Models.Media[dtos.Count];
-
-            for (var i = 0; i < dtos.Count; i++)
-            {
-                var dto = dtos[i];
-
-                if (withCache)
-                {
-                    // if the cache contains the (proper version of the) item, use it
-                    var cached = IsolatedCache.GetCacheItem<IMedia>(GetCacheIdKey<IMedia>(dto.NodeId));
-                    if (cached != null && cached.VersionId == dto.ContentVersionDto.Id)
-                    {
-                        content[i] = (Models.Media) cached; // fixme should we just cache Media not IMedia?
-                        continue;
-                    }
-                }
-
-                // else, need to build it
-
-                // get the content type - the repository is full cache *but* still deep-clones
-                // whatever comes out of it, so use our own local index here to avoid this
-                var contentTypeId = dto.ContentTypeId;
-                if (contentTypes.TryGetValue(contentTypeId, out IMediaType contentType) == false)
-                    contentTypes[contentTypeId] = contentType = _mediaTypeRepository.Get(contentTypeId);
-
-                var c = content[i] = ContentBaseFactory.BuildEntity(dto, contentType);
-
-                // need properties
-                var versionId = dto.ContentVersionDto.Id;
-                temps.Add(new TempContent<Models.Media>(dto.NodeId, versionId, 0, contentType, c));
-            }
-
-            // load all properties for all documents from database in 1 query - indexed by version id
-            var properties = GetPropertyCollections(temps);
-
-            // assign properties
-            foreach (var temp in temps)
-            {
-                temp.Content.Properties = properties[temp.VersionId];
-
-                // reset dirty initial properties (U4-1946)
-                temp.Content.ResetDirtyProperties(false);
-            }
-
-            return content;
-        }
-
-        private IMedia MapDtoToContent(ContentDto dto)
-        {
-            var contentType = _mediaTypeRepository.Get(dto.ContentTypeId);
-            var media = ContentBaseFactory.BuildEntity(dto, contentType);
-
-            // get properties - indexed by version id
-            var versionId = dto.ContentVersionDto.Id;
-            var temp = new TempContent<Models.Media>(dto.NodeId, versionId, 0, contentType);
-            var properties = GetPropertyCollections(new List<TempContent<Models.Media>> { temp });
-            media.Properties = properties[versionId];
-
-            // reset dirty initial properties (U4-1946)
-            media.ResetDirtyProperties(false);
-            return media;
-        }
-
-        protected override string EnsureUniqueNodeName(int parentId, string nodeName, int id = 0)
-        {
-            return EnsureUniqueNaming == false ? nodeName : base.EnsureUniqueNodeName(parentId, nodeName, id);
-        }
-    }
-}
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text.RegularExpressions;
+using NPoco;
+using Umbraco.Core.Cache;
+using Umbraco.Core.Configuration.UmbracoSettings;
+using Umbraco.Core.Exceptions;
+using Umbraco.Core.Logging;
+using Umbraco.Core.Models;
+using Umbraco.Core.Models.Rdbms;
+using Umbraco.Core.Persistence.DatabaseModelDefinitions;
+using Umbraco.Core.Persistence.Factories;
+using Umbraco.Core.Persistence.Querying;
+using Umbraco.Core.Persistence.UnitOfWork;
+
+namespace Umbraco.Core.Persistence.Repositories.Implement
+{
+    /// <summary>
+    /// Represents a repository for doing CRUD operations for <see cref="IMedia"/>
+    /// </summary>
+    internal class MediaRepository : ContentRepositoryBase<int, IMedia, MediaRepository>, IMediaRepository
+    {
+        private readonly IMediaTypeRepository _mediaTypeRepository;
+        private readonly ITagRepository _tagRepository;
+        private readonly MediaByGuidReadRepository _mediaByGuidReadRepository;
+
+        public MediaRepository(IScopeUnitOfWork work, CacheHelper cache, ILogger logger, IMediaTypeRepository mediaTypeRepository, ITagRepository tagRepository, IContentSection contentSection)
+            : base(work, cache, logger)
+        {
+            _mediaTypeRepository = mediaTypeRepository ?? throw new ArgumentNullException(nameof(mediaTypeRepository));
+            _tagRepository = tagRepository ?? throw new ArgumentNullException(nameof(tagRepository));
+            _mediaByGuidReadRepository = new MediaByGuidReadRepository(this, work, cache, logger);
+            EnsureUniqueNaming = contentSection.EnsureUniqueNaming;
+        }
+
+        protected override MediaRepository This => this;
+
+        public bool EnsureUniqueNaming { get; set; }
+
+        #region Repository Base
+
+        protected override Guid NodeObjectTypeId => Constants.ObjectTypes.Media;
+
+        protected override IMedia PerformGet(int id)
+        {
+            var sql = GetBaseQuery(QueryType.Single)
+                .Where<NodeDto>(x => x.NodeId == id)
+                .SelectTop(1);
+
+            var dto = Database.Fetch<ContentDto>(sql).FirstOrDefault();
+            return dto == null
+                ? null
+                : MapDtoToContent(dto);
+        }
+
+        protected override IEnumerable<IMedia> PerformGetAll(params int[] ids)
+        {
+            var sql = GetBaseQuery(QueryType.Many);
+
+            if (ids.Any())
+                sql.WhereIn<NodeDto>(x => x.NodeId, ids);
+
+            return MapDtosToContent(Database.Fetch<ContentDto>(sql));
+        }
+
+        protected override IEnumerable<IMedia> PerformGetByQuery(IQuery<IMedia> query)
+        {
+            var sqlClause = GetBaseQuery(QueryType.Many);
+
+            var translator = new SqlTranslator<IMedia>(sqlClause, query);
+            var sql = translator.Translate();
+
+            sql // fixme why?
+                .OrderBy<NodeDto>(x => x.Level)
+                .OrderBy<NodeDto>(x => x.SortOrder);
+
+            return MapDtosToContent(Database.Fetch<ContentDto>(sql));
+        }
+
+        protected override Sql<ISqlContext> GetBaseQuery(QueryType queryType)
+        {
+            return GetBaseQuery(queryType, true);
+        }
+
+        protected virtual Sql<ISqlContext> GetBaseQuery(QueryType queryType, bool current)
+        {
+            var sql = SqlContext.Sql();
+
+            switch (queryType)
+            {
+                case QueryType.Count:
+                    sql = sql.SelectCount();
+                    break;
+                case QueryType.Ids:
+                    sql = sql.Select<ContentDto>(x => x.NodeId);
+                    break;
+                case QueryType.Single:
+                case QueryType.Many:
+                    sql = sql.Select<ContentDto>(r =>
+                        r.Select(x => x.NodeDto)
+                         .Select(x => x.ContentVersionDto));
+                    break;
+            }
+
+            sql
+                .From<ContentDto>()
+                .InnerJoin<NodeDto>().On<ContentDto, NodeDto>(left => left.NodeId, right => right.NodeId)
+                .InnerJoin<ContentVersionDto>().On<ContentDto, ContentVersionDto>(left => left.NodeId, right => right.NodeId);
+
+
+            sql.Where<NodeDto>(x => x.NodeObjectType == NodeObjectTypeId);
+
+            if (current)
+                sql.Where<ContentVersionDto>(x => x.Current); // always get the current version
+
+            return sql;
+        }
+
+        // fixme - kill, eventually
+        protected override Sql<ISqlContext> GetBaseQuery(bool isCount)
+        {
+            return GetBaseQuery(isCount ? QueryType.Count : QueryType.Single);
+        }
+
+        // fixme - kill, eventually
+        // ah maybe not, that what's used for eg Exists in base repo
+        protected override string GetBaseWhereClause()
+        {
+            return $"{Constants.DatabaseSchema.Tables.Node}.id = @id";
+        }
+
+        protected override IEnumerable<string> GetDeleteClauses()
+        {
+            var list = new List<string>
+            {
+                "DELETE FROM " + Constants.DatabaseSchema.Tables.Task + " WHERE nodeId = @id",
+                "DELETE FROM " + Constants.DatabaseSchema.Tables.User2NodeNotify + " WHERE nodeId = @id",
+                "DELETE FROM " + Constants.DatabaseSchema.Tables.UserGroup2NodePermission + " WHERE nodeId = @id",
+                "DELETE FROM " + Constants.DatabaseSchema.Tables.UserStartNode + " WHERE startNode = @id",
+                "UPDATE " + Constants.DatabaseSchema.Tables.UserGroup + " SET startContentId = NULL WHERE startContentId = @id",
+                "DELETE FROM " + Constants.DatabaseSchema.Tables.Relation + " WHERE parentId = @id",
+                "DELETE FROM " + Constants.DatabaseSchema.Tables.Relation + " WHERE childId = @id",
+                "DELETE FROM " + Constants.DatabaseSchema.Tables.TagRelationship + " WHERE nodeId = @id",
+                "DELETE FROM " + Constants.DatabaseSchema.Tables.Document + " WHERE nodeId = @id",
+                "DELETE FROM " + Constants.DatabaseSchema.Tables.PropertyData + " WHERE versionId IN (SELECT id FROM " + Constants.DatabaseSchema.Tables.ContentVersion + " WHERE nodeId = @id)",
+                "DELETE FROM " + Constants.DatabaseSchema.Tables.ContentVersion + " WHERE nodeId = @id",
+                "DELETE FROM " + Constants.DatabaseSchema.Tables.Content + " WHERE nodeId = @id",
+                "DELETE FROM " + Constants.DatabaseSchema.Tables.Node + " WHERE id = @id"
+            };
+            return list;
+        }
+
+        #endregion
+
+        #region Versions
+
+        public override IEnumerable<IMedia> GetAllVersions(int nodeId)
+        {
+            var sql = GetBaseQuery(QueryType.Many, false)
+                .Where<NodeDto>(x => x.NodeId == nodeId)
+                .OrderByDescending<ContentVersionDto>(x => x.Current)
+                .AndByDescending<ContentVersionDto>(x => x.VersionDate);
+
+            return MapDtosToContent(Database.Fetch<ContentDto>(sql), true);
+        }
+
+        public override IMedia GetVersion(int versionId)
+        {
+            var sql = GetBaseQuery(QueryType.Single)
+                .Where<ContentVersionDto>(x => x.Id == versionId);
+
+            var dto = Database.Fetch<ContentDto>(sql).FirstOrDefault();
+            return dto == null ? null : MapDtoToContent(dto);
+        }
+
+        public IMedia GetMediaByPath(string mediaPath)
+        {
+            var umbracoFileValue = mediaPath;
+            const string pattern = ".*[_][0-9]+[x][0-9]+[.].*";
+            var isResized = Regex.IsMatch(mediaPath, pattern);
+
+            // If the image has been resized we strip the "_403x328" of the original "/media/1024/koala_403x328.jpg" url.
+            if (isResized)
+            {
+                var underscoreIndex = mediaPath.LastIndexOf('_');
+                var dotIndex = mediaPath.LastIndexOf('.');
+                umbracoFileValue = string.Concat(mediaPath.Substring(0, underscoreIndex), mediaPath.Substring(dotIndex));
+            }
+
+            // If the stripped-down url returns null, we try again with the original url.
+            // Previously, the function would fail on e.g. "my_x_image.jpg"
+            var nodeId = GetMediaNodeIdByPath(Sql().Where<PropertyDataDto>(x => x.VarcharValue == umbracoFileValue));
+            if (nodeId < 0) nodeId = GetMediaNodeIdByPath(Sql().Where<PropertyDataDto>(x => x.VarcharValue == mediaPath));
+
+            // If no result so far, try getting from a json value stored in the ntext / nvarchar column
+            if (nodeId < 0) nodeId = GetMediaNodeIdByPath(Sql().Where("textValue LIKE @0", "%" + umbracoFileValue + "%"));
+            if (nodeId < 0) nodeId = GetMediaNodeIdByPath(Sql().Where("varcharValue LIKE @0", "%" + umbracoFileValue + "%"));
+
+            return nodeId < 0 ? null : Get(nodeId);
+        }
+
+        private int GetMediaNodeIdByPath(Sql query)
+        {
+            var sql = Sql().Select<ContentVersionDto>(x => x.NodeId)
+                .From<PropertyDataDto>()
+                .InnerJoin<PropertyTypeDto>().On<PropertyDataDto, PropertyTypeDto>(left => left.PropertyTypeId, right => right.Id)
+                .InnerJoin<ContentVersionDto>().On<PropertyDataDto, ContentVersionDto>((left, right) => left.VersionId == right.Id)
+                .Where<PropertyTypeDto>(x => x.Alias == "umbracoFile")
+                .Append(query);
+
+            var nodeId = Database.Fetch<int?>(sql).FirstOrDefault();
+            return nodeId ?? -1;
+        }
+
+        protected override void PerformDeleteVersion(int id, int versionId)
+        {
+            // raise event first else potential FK issues
+            OnUowRemovingVersion(new UnitOfWorkVersionEventArgs(UnitOfWork, id, versionId));
+
+            Database.Delete<PropertyDataDto>("WHERE versionId = @versionId", new { versionId });
+            Database.Delete<ContentVersionDto>("WHERE versionId = @versionId", new { versionId });
+        }
+
+        #endregion
+
+        #region Persist
+
+        protected override void PersistNewItem(IMedia entity)
+        {
+            var media = (Models.Media) entity;
+            media.AddingEntity();
+
+            // ensure unique name on the same level
+            entity.Name = EnsureUniqueNodeName(entity.ParentId, entity.Name);
+
+            // ensure that strings don't contain characters that are invalid in xml
+            // fixme - do we really want to keep doing this here?
+            entity.SanitizeEntityPropertiesForXmlStorage();
+
+            // create the dto
+            var dto = ContentBaseFactory.BuildDto(entity);
+
+            // derive path and level from parent
+            var parent = GetParentNodeDto(entity.ParentId);
+            var level = parent.Level + 1;
+
+            // get sort order
+            var sortOrder = GetNewChildSortOrder(entity.ParentId, 0);
+
+            // persist the node dto
+            var nodeDto = dto.NodeDto;
+            nodeDto.Path = parent.Path;
+            nodeDto.Level = Convert.ToInt16(level);
+            nodeDto.SortOrder = sortOrder;
+
+            // see if there's a reserved identifier for this unique id
+            // and then either update or insert the node dto
+            var id = GetReservedId(nodeDto.UniqueId);
+            if (id > 0)
+            {
+                nodeDto.NodeId = id;
+                nodeDto.Path = string.Concat(parent.Path, ",", nodeDto.NodeId);
+                nodeDto.ValidatePathWithException();
+                Database.Update(nodeDto);
+            }
+            else
+            {
+                Database.Insert(nodeDto);
+
+                // update path, now that we have an id
+                nodeDto.Path = string.Concat(parent.Path, ",", nodeDto.NodeId);
+                nodeDto.ValidatePathWithException();
+                Database.Update(nodeDto);
+            }
+
+            // update entity
+            entity.Id = nodeDto.NodeId;
+            entity.Path = nodeDto.Path;
+            entity.SortOrder = sortOrder;
+            entity.Level = level;
+
+            // persist the content dto
+            dto.NodeId = nodeDto.NodeId;
+            Database.Insert(dto);
+
+            // persist the content version dto
+            // assumes a new version id and version date (modified date) has been set
+            var contentVersionDto = dto.ContentVersionDto;
+            contentVersionDto.NodeId = nodeDto.NodeId;
+            contentVersionDto.Current = true;
+            Database.Insert(contentVersionDto);
+            media.VersionId = contentVersionDto.Id;
+
+            // persist the property data
+            var propertyDataDtos = PropertyFactory.BuildDtos(media.VersionId, 0, entity.Properties, out _);
+            foreach (var propertyDataDto in propertyDataDtos)
+                Database.Insert(propertyDataDto);
+
+            // set tags
+            UpdateEntityTags(entity, _tagRepository);
+
+            OnUowRefreshedEntity(new UnitOfWorkEntityEventArgs(UnitOfWork, entity));
+
+            entity.ResetDirtyProperties();
+        }
+
+        protected override void PersistUpdatedItem(IMedia entity)
+        {
+            var media = (Models.Media) entity;
+
+            // update
+            media.UpdatingEntity();
+
+            // ensure unique name on the same level
+            entity.Name = EnsureUniqueNodeName(entity.ParentId, entity.Name, entity.Id);
+
+            // ensure that strings don't contain characters that are invalid in xml
+            // fixme - do we really want to keep doing this here?
+            entity.SanitizeEntityPropertiesForXmlStorage();
+
+            // if parent has changed, get path, level and sort order
+            if (entity.IsPropertyDirty("ParentId"))
+            {
+                var parent = GetParentNodeDto(entity.ParentId);
+
+                entity.Path = string.Concat(parent.Path, ",", entity.Id);
+                entity.Level = parent.Level + 1;
+                entity.SortOrder = GetNewChildSortOrder(entity.ParentId, 0);
+            }
+
+            // create the dto
+            var dto = ContentBaseFactory.BuildDto(entity);
+
+            // update the node dto
+            var nodeDto = dto.NodeDto;
+            nodeDto.ValidatePathWithException();
+            Database.Update(nodeDto);
+
+            // update the content dto
+            Database.Update(dto);
+
+            // update the content version dto
+            var contentVersionDto = dto.ContentVersionDto;
+            contentVersionDto.Current = true;
+            Database.Update(contentVersionDto);
+
+            // replace the property data
+            var deletePropertyDataSql = SqlContext.Sql().Delete<PropertyDataDto>().Where<PropertyDataDto>(x => x.VersionId == media.VersionId);
+            Database.Execute(deletePropertyDataSql);
+            var propertyDataDtos = PropertyFactory.BuildDtos(media.VersionId, 0, entity.Properties, out _);
+            foreach (var propertyDataDto in propertyDataDtos)
+                Database.Insert(propertyDataDto);
+
+            UpdateEntityTags(entity, _tagRepository);
+
+            OnUowRefreshedEntity(new UnitOfWorkEntityEventArgs(UnitOfWork, entity));
+
+            entity.ResetDirtyProperties();
+        }
+
+        protected override void PersistDeletedItem(IMedia entity)
+        {
+            // raise event first else potential FK issues
+            OnUowRemovingEntity(new UnitOfWorkEntityEventArgs(UnitOfWork, entity));
+            base.PersistDeletedItem(entity);
+        }
+
+        #endregion
+
+        #region Recycle Bin
+
+        public override int RecycleBinId => Constants.System.RecycleBinMedia;
+
+        #endregion
+
+        #region Read Repository implementation for Guid keys
+
+        public IMedia Get(Guid id)
+        {
+            return _mediaByGuidReadRepository.Get(id);
+        }
+
+        IEnumerable<IMedia> IReadRepository<Guid, IMedia>.GetMany(params Guid[] ids)
+        {
+            return _mediaByGuidReadRepository.GetMany(ids);
+        }
+
+        public bool Exists(Guid id)
+        {
+            return _mediaByGuidReadRepository.Exists(id);
+        }
+
+        /// <summary>
+        /// A reading repository purely for looking up by GUID
+        /// </summary>
+        /// <remarks>
+        /// TODO: This is ugly and to fix we need to decouple the IRepositoryQueryable -> IRepository -> IReadRepository which should all be separate things!
+        /// Then we can do the same thing with repository instances and we wouldn't need to leave all these methods as not implemented because we wouldn't need to implement them
+        /// </remarks>
+        private class MediaByGuidReadRepository : NPocoRepositoryBase<Guid, IMedia>
+        {
+            private readonly MediaRepository _outerRepo;
+
+            public MediaByGuidReadRepository(MediaRepository outerRepo, IScopeUnitOfWork work, CacheHelper cache, ILogger logger)
+                : base(work, cache, logger)
+            {
+                _outerRepo = outerRepo;
+            }
+
+            protected override Guid NodeObjectTypeId => _outerRepo.NodeObjectTypeId;
+
+            protected override IMedia PerformGet(Guid id)
+            {
+                var sql = _outerRepo.GetBaseQuery(QueryType.Single)
+                    .Where<NodeDto>(x => x.UniqueId == id);
+
+                var dto = Database.Fetch<ContentDto>(sql.SelectTop(1)).FirstOrDefault();
+
+                if (dto == null)
+                    return null;
+
+                var content = _outerRepo.MapDtoToContent(dto);
+
+                return content;
+            }
+
+            protected override IEnumerable<IMedia> PerformGetAll(params Guid[] ids)
+            {
+                var sql = _outerRepo.GetBaseQuery(QueryType.Many);
+                if (ids.Length > 0)
+                    sql.WhereIn<NodeDto>(x => x.UniqueId, ids);
+
+                return _outerRepo.MapDtosToContent(Database.Fetch<ContentDto>(sql));
+            }
+
+            protected override IEnumerable<IMedia> PerformGetByQuery(IQuery<IMedia> query)
+            {
+                throw new WontImplementException();
+            }
+
+            protected override IEnumerable<string> GetDeleteClauses()
+            {
+                throw new WontImplementException();
+            }
+
+            protected override void PersistNewItem(IMedia entity)
+            {
+                throw new WontImplementException();
+            }
+
+            protected override void PersistUpdatedItem(IMedia entity)
+            {
+                throw new WontImplementException();
+            }
+
+            protected override Sql<ISqlContext> GetBaseQuery(bool isCount)
+            {
+                throw new WontImplementException();
+            }
+
+            protected override string GetBaseWhereClause()
+            {
+                throw new WontImplementException();
+            }
+        }
+
+        #endregion
+
+        /// <summary>
+        /// Gets paged media results.
+        /// </summary>
+        public override IEnumerable<IMedia> GetPage(IQuery<IMedia> query, long pageIndex, int pageSize, out long totalRecords,
+            string orderBy, Direction orderDirection, bool orderBySystemField, IQuery<IMedia> filter = null)
+        {
+            Sql<ISqlContext> filterSql = null;
+
+            if (filter != null)
+            {
+                filterSql = Sql();
+                foreach (var clause in filter.GetWhereClauses())
+                    filterSql = filterSql.Append($"AND ({clause.Item1})", clause.Item2);
+            }
+
+            return GetPagedResultsByQuery<ContentDto>(query, pageIndex, pageSize, out totalRecords,
+                x => MapDtosToContent(x), orderBy, orderDirection, orderBySystemField,
+                filterSql);
+        }
+
+        private IEnumerable<IMedia> MapDtosToContent(List<ContentDto> dtos, bool withCache = false)
+        {
+            var temps = new List<TempContent<Models.Media>>();
+            var contentTypes = new Dictionary<int, IMediaType>();
+            var content = new Models.Media[dtos.Count];
+
+            for (var i = 0; i < dtos.Count; i++)
+            {
+                var dto = dtos[i];
+
+                if (withCache)
+                {
+                    // if the cache contains the (proper version of the) item, use it
+                    var cached = IsolatedCache.GetCacheItem<IMedia>(RepositoryCacheKeys.GetKey<IMedia>(dto.NodeId));
+                    if (cached != null && cached.VersionId == dto.ContentVersionDto.Id)
+                    {
+                        content[i] = (Models.Media) cached; // fixme should we just cache Media not IMedia?
+                        continue;
+                    }
+                }
+
+                // else, need to build it
+
+                // get the content type - the repository is full cache *but* still deep-clones
+                // whatever comes out of it, so use our own local index here to avoid this
+                var contentTypeId = dto.ContentTypeId;
+                if (contentTypes.TryGetValue(contentTypeId, out IMediaType contentType) == false)
+                    contentTypes[contentTypeId] = contentType = _mediaTypeRepository.Get(contentTypeId);
+
+                var c = content[i] = ContentBaseFactory.BuildEntity(dto, contentType);
+
+                // need properties
+                var versionId = dto.ContentVersionDto.Id;
+                temps.Add(new TempContent<Models.Media>(dto.NodeId, versionId, 0, contentType, c));
+            }
+
+            // load all properties for all documents from database in 1 query - indexed by version id
+            var properties = GetPropertyCollections(temps);
+
+            // assign properties
+            foreach (var temp in temps)
+            {
+                temp.Content.Properties = properties[temp.VersionId];
+
+                // reset dirty initial properties (U4-1946)
+                temp.Content.ResetDirtyProperties(false);
+            }
+
+            return content;
+        }
+
+        private IMedia MapDtoToContent(ContentDto dto)
+        {
+            var contentType = _mediaTypeRepository.Get(dto.ContentTypeId);
+            var media = ContentBaseFactory.BuildEntity(dto, contentType);
+
+            // get properties - indexed by version id
+            var versionId = dto.ContentVersionDto.Id;
+            var temp = new TempContent<Models.Media>(dto.NodeId, versionId, 0, contentType);
+            var properties = GetPropertyCollections(new List<TempContent<Models.Media>> { temp });
+            media.Properties = properties[versionId];
+
+            // reset dirty initial properties (U4-1946)
+            media.ResetDirtyProperties(false);
+            return media;
+        }
+
+        protected override string EnsureUniqueNodeName(int parentId, string nodeName, int id = 0)
+        {
+            return EnsureUniqueNaming == false ? nodeName : base.EnsureUniqueNodeName(parentId, nodeName, id);
+        }
+    }
+}
diff --git a/src/Umbraco.Core/Persistence/Repositories/MediaTypeContainerRepository.cs b/src/Umbraco.Core/Persistence/Repositories/Implement/MediaTypeContainerRepository.cs
similarity index 87%
rename from src/Umbraco.Core/Persistence/Repositories/MediaTypeContainerRepository.cs
rename to src/Umbraco.Core/Persistence/Repositories/Implement/MediaTypeContainerRepository.cs
index e211642d46..be371a60f5 100644
--- a/src/Umbraco.Core/Persistence/Repositories/MediaTypeContainerRepository.cs
+++ b/src/Umbraco.Core/Persistence/Repositories/Implement/MediaTypeContainerRepository.cs
@@ -2,7 +2,7 @@
 using Umbraco.Core.Logging;
 using Umbraco.Core.Persistence.UnitOfWork;
 
-namespace Umbraco.Core.Persistence.Repositories
+namespace Umbraco.Core.Persistence.Repositories.Implement
 {
     class MediaTypeContainerRepository : EntityContainerRepository, IMediaTypeContainerRepository
     {
diff --git a/src/Umbraco.Core/Persistence/Repositories/MediaTypeRepository.cs b/src/Umbraco.Core/Persistence/Repositories/Implement/MediaTypeRepository.cs
similarity index 89%
rename from src/Umbraco.Core/Persistence/Repositories/MediaTypeRepository.cs
rename to src/Umbraco.Core/Persistence/Repositories/Implement/MediaTypeRepository.cs
index e0b7af5029..d162b8a353 100644
--- a/src/Umbraco.Core/Persistence/Repositories/MediaTypeRepository.cs
+++ b/src/Umbraco.Core/Persistence/Repositories/Implement/MediaTypeRepository.cs
@@ -1,177 +1,177 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using NPoco;
-using Umbraco.Core.Cache;
-using Umbraco.Core.Logging;
-using Umbraco.Core.Models;
-using Umbraco.Core.Models.Rdbms;
-using Umbraco.Core.Persistence.Querying;
-using Umbraco.Core.Persistence.UnitOfWork;
-
-namespace Umbraco.Core.Persistence.Repositories
-{
-    /// <summary>
-    /// Represents a repository for doing CRUD operations for <see cref="IMediaType"/>
-    /// </summary>
-    internal class MediaTypeRepository : ContentTypeRepositoryBase<IMediaType>, IMediaTypeRepository
-    {
-        private IRepositoryCachePolicy<IMediaType, int> _cachePolicy;
-
-        public MediaTypeRepository(IScopeUnitOfWork work, CacheHelper cache, ILogger logger)
-            : base(work, cache, logger)
-        { }
-
-        protected override bool IsPublishing => MediaType.IsPublishingConst;
-
-        protected override IRepositoryCachePolicy<IMediaType, int> CreateCachePolicy(IRuntimeCacheProvider runtimeCache)
-        {
-            return new FullDataSetRepositoryCachePolicy<IMediaType, int>(runtimeCache, GetEntityId, /*expires:*/ true);
-        }
-
-        protected override IMediaType PerformGet(int id)
-        {
-            //use the underlying GetAll which will force cache all content types
-            return GetAll().FirstOrDefault(x => x.Id == id);
-        }
-
-        protected override IMediaType PerformGet(Guid id)
-        {
-            //use the underlying GetAll which will force cache all content types
-            return GetAll().FirstOrDefault(x => x.Key == id);
-        }
-
-        protected override bool PerformExists(Guid id)
-        {
-            return GetAll().FirstOrDefault(x => x.Key == id) != null;
-        }
-
-        protected override IMediaType PerformGet(string alias)
-        {
-            //use the underlying GetAll which will force cache all content types
-            return GetAll().FirstOrDefault(x => x.Alias.InvariantEquals(alias));
-        }
-
-        protected override IEnumerable<IMediaType> PerformGetAll(params int[] ids)
-        {
-            if (ids.Any())
-            {
-                //NOTE: This logic should never be executed according to our cache policy
-                return ContentTypeQueryMapper.GetMediaTypes(Database, SqlSyntax, IsPublishing, this)
-                    .Where(x => ids.Contains(x.Id));
-            }
-
-            return ContentTypeQueryMapper.GetMediaTypes(Database, SqlSyntax, IsPublishing, this);
-        }
-
-        protected override IEnumerable<IMediaType> PerformGetAll(params Guid[] ids)
-        {
-            //use the underlying GetAll which will force cache all content types
-
-            if (ids.Any())
-            {
-                return GetAll().Where(x => ids.Contains(x.Key));
-            }
-            else
-            {
-                return GetAll();
-            }
-        }
-
-        protected override IEnumerable<IMediaType> PerformGetByQuery(IQuery<IMediaType> query)
-        {
-            var sqlClause = GetBaseQuery(false);
-            var translator = new SqlTranslator<IMediaType>(sqlClause, query);
-            var sql = translator.Translate();
-
-            var dtos = Database.Fetch<ContentTypeDto>(sql);
-
-            return
-                //This returns a lookup from the GetAll cached looup
-                (dtos.Any()
-                    ? GetAll(dtos.DistinctBy(x => x.NodeId).Select(x => x.NodeId).ToArray())
-                    : Enumerable.Empty<IMediaType>())
-                    //order the result by name
-                    .OrderBy(x => x.Name);
-        }
-
-        /// <summary>
-        /// Gets all entities of the specified <see cref="PropertyType"/> query
-        /// </summary>
-        /// <param name="query"></param>
-        /// <returns>An enumerable list of <see cref="IMediaType"/> objects</returns>
-        public IEnumerable<IMediaType> GetByQuery(IQuery<PropertyType> query)
-        {
-            var ints = PerformGetByQuery(query).ToArray();
-            return ints.Any()
-                ? GetAll(ints)
-                : Enumerable.Empty<IMediaType>();
-        }
-
-        protected override Sql<ISqlContext> GetBaseQuery(bool isCount)
-        {
-            var sql = Sql();
-
-            sql = isCount
-                ? sql.SelectCount()
-                : sql.Select<ContentTypeDto>(r => r.Select(x => x.NodeDto));
-
-            sql
-                .From<ContentTypeDto>()
-                .InnerJoin<NodeDto>()
-                .On<ContentTypeDto, NodeDto>( left => left.NodeId, right => right.NodeId)
-                .Where<NodeDto>(x => x.NodeObjectType == NodeObjectTypeId);
-
-            return sql;
-        }
-
-        protected override string GetBaseWhereClause()
-        {
-            return "umbracoNode.id = @id";
-        }
-
-        protected override IEnumerable<string> GetDeleteClauses()
-        {
-            var l = (List<string>) base.GetDeleteClauses(); // we know it's a list
-            l.Add("DELETE FROM cmsContentType WHERE nodeId = @id");
-            l.Add("DELETE FROM umbracoNode WHERE id = @id");
-            return l;
-        }
-
-        protected override Guid NodeObjectTypeId => Constants.ObjectTypes.MediaType;
-
-        protected override void PersistNewItem(IMediaType entity)
-        {
-            ((MediaType)entity).AddingEntity();
-
-            PersistNewBaseContentType(entity);
-
-            entity.ResetDirtyProperties();
-        }
-
-        protected override void PersistUpdatedItem(IMediaType entity)
-        {
-            ValidateAlias(entity);
-
-            //Updates Modified date
-            ((MediaType)entity).UpdatingEntity();
-
-            //Look up parent to get and set the correct Path if ParentId has changed
-            if (entity.IsPropertyDirty("ParentId"))
-            {
-                var parent = Database.First<NodeDto>("WHERE id = @ParentId", new { ParentId = entity.ParentId });
-                entity.Path = string.Concat(parent.Path, ",", entity.Id);
-                entity.Level = parent.Level + 1;
-                var maxSortOrder =
-                    Database.ExecuteScalar<int>(
-                        "SELECT coalesce(max(sortOrder),0) FROM umbracoNode WHERE parentid = @ParentId AND nodeObjectType = @NodeObjectType",
-                        new { ParentId = entity.ParentId, NodeObjectType = NodeObjectTypeId });
-                entity.SortOrder = maxSortOrder + 1;
-            }
-
-            PersistUpdatedBaseContentType(entity);
-
-            entity.ResetDirtyProperties();
-        }
-    }
-}
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using NPoco;
+using Umbraco.Core.Cache;
+using Umbraco.Core.Logging;
+using Umbraco.Core.Models;
+using Umbraco.Core.Models.Rdbms;
+using Umbraco.Core.Persistence.Querying;
+using Umbraco.Core.Persistence.UnitOfWork;
+
+namespace Umbraco.Core.Persistence.Repositories.Implement
+{
+    /// <summary>
+    /// Represents a repository for doing CRUD operations for <see cref="IMediaType"/>
+    /// </summary>
+    internal class MediaTypeRepository : ContentTypeRepositoryBase<IMediaType>, IMediaTypeRepository
+    {
+        private IRepositoryCachePolicy<IMediaType, int> _cachePolicy;
+
+        public MediaTypeRepository(IScopeUnitOfWork work, CacheHelper cache, ILogger logger)
+            : base(work, cache, logger)
+        { }
+
+        protected override bool IsPublishing => MediaType.IsPublishingConst;
+
+        protected override IRepositoryCachePolicy<IMediaType, int> CreateCachePolicy(IRuntimeCacheProvider runtimeCache)
+        {
+            return new FullDataSetRepositoryCachePolicy<IMediaType, int>(runtimeCache, GetEntityId, /*expires:*/ true);
+        }
+
+        protected override IMediaType PerformGet(int id)
+        {
+            //use the underlying GetAll which will force cache all content types
+            return GetMany().FirstOrDefault(x => x.Id == id);
+        }
+
+        protected override IMediaType PerformGet(Guid id)
+        {
+            //use the underlying GetAll which will force cache all content types
+            return GetMany().FirstOrDefault(x => x.Key == id);
+        }
+
+        protected override bool PerformExists(Guid id)
+        {
+            return GetMany().FirstOrDefault(x => x.Key == id) != null;
+        }
+
+        protected override IMediaType PerformGet(string alias)
+        {
+            //use the underlying GetAll which will force cache all content types
+            return GetMany().FirstOrDefault(x => x.Alias.InvariantEquals(alias));
+        }
+
+        protected override IEnumerable<IMediaType> PerformGetAll(params int[] ids)
+        {
+            if (ids.Any())
+            {
+                //NOTE: This logic should never be executed according to our cache policy
+                return ContentTypeQueryMapper.GetMediaTypes(Database, SqlSyntax, IsPublishing, this)
+                    .Where(x => ids.Contains(x.Id));
+            }
+
+            return ContentTypeQueryMapper.GetMediaTypes(Database, SqlSyntax, IsPublishing, this);
+        }
+
+        protected override IEnumerable<IMediaType> PerformGetAll(params Guid[] ids)
+        {
+            //use the underlying GetAll which will force cache all content types
+
+            if (ids.Any())
+            {
+                return GetMany().Where(x => ids.Contains(x.Key));
+            }
+            else
+            {
+                return GetMany();
+            }
+        }
+
+        protected override IEnumerable<IMediaType> PerformGetByQuery(IQuery<IMediaType> query)
+        {
+            var sqlClause = GetBaseQuery(false);
+            var translator = new SqlTranslator<IMediaType>(sqlClause, query);
+            var sql = translator.Translate();
+
+            var dtos = Database.Fetch<ContentTypeDto>(sql);
+
+            return
+                //This returns a lookup from the GetAll cached looup
+                (dtos.Any()
+                    ? GetMany(dtos.DistinctBy(x => x.NodeId).Select(x => x.NodeId).ToArray())
+                    : Enumerable.Empty<IMediaType>())
+                    //order the result by name
+                    .OrderBy(x => x.Name);
+        }
+
+        /// <summary>
+        /// Gets all entities of the specified <see cref="PropertyType"/> query
+        /// </summary>
+        /// <param name="query"></param>
+        /// <returns>An enumerable list of <see cref="IMediaType"/> objects</returns>
+        public IEnumerable<IMediaType> GetByQuery(IQuery<PropertyType> query)
+        {
+            var ints = PerformGetByQuery(query).ToArray();
+            return ints.Any()
+                ? GetMany(ints)
+                : Enumerable.Empty<IMediaType>();
+        }
+
+        protected override Sql<ISqlContext> GetBaseQuery(bool isCount)
+        {
+            var sql = Sql();
+
+            sql = isCount
+                ? sql.SelectCount()
+                : sql.Select<ContentTypeDto>(r => r.Select(x => x.NodeDto));
+
+            sql
+                .From<ContentTypeDto>()
+                .InnerJoin<NodeDto>()
+                .On<ContentTypeDto, NodeDto>( left => left.NodeId, right => right.NodeId)
+                .Where<NodeDto>(x => x.NodeObjectType == NodeObjectTypeId);
+
+            return sql;
+        }
+
+        protected override string GetBaseWhereClause()
+        {
+            return "umbracoNode.id = @id";
+        }
+
+        protected override IEnumerable<string> GetDeleteClauses()
+        {
+            var l = (List<string>) base.GetDeleteClauses(); // we know it's a list
+            l.Add("DELETE FROM cmsContentType WHERE nodeId = @id");
+            l.Add("DELETE FROM umbracoNode WHERE id = @id");
+            return l;
+        }
+
+        protected override Guid NodeObjectTypeId => Constants.ObjectTypes.MediaType;
+
+        protected override void PersistNewItem(IMediaType entity)
+        {
+            ((MediaType)entity).AddingEntity();
+
+            PersistNewBaseContentType(entity);
+
+            entity.ResetDirtyProperties();
+        }
+
+        protected override void PersistUpdatedItem(IMediaType entity)
+        {
+            ValidateAlias(entity);
+
+            //Updates Modified date
+            ((MediaType)entity).UpdatingEntity();
+
+            //Look up parent to get and set the correct Path if ParentId has changed
+            if (entity.IsPropertyDirty("ParentId"))
+            {
+                var parent = Database.First<NodeDto>("WHERE id = @ParentId", new { ParentId = entity.ParentId });
+                entity.Path = string.Concat(parent.Path, ",", entity.Id);
+                entity.Level = parent.Level + 1;
+                var maxSortOrder =
+                    Database.ExecuteScalar<int>(
+                        "SELECT coalesce(max(sortOrder),0) FROM umbracoNode WHERE parentid = @ParentId AND nodeObjectType = @NodeObjectType",
+                        new { ParentId = entity.ParentId, NodeObjectType = NodeObjectTypeId });
+                entity.SortOrder = maxSortOrder + 1;
+            }
+
+            PersistUpdatedBaseContentType(entity);
+
+            entity.ResetDirtyProperties();
+        }
+    }
+}
diff --git a/src/Umbraco.Core/Persistence/Repositories/MemberGroupRepository.cs b/src/Umbraco.Core/Persistence/Repositories/Implement/MemberGroupRepository.cs
similarity index 96%
rename from src/Umbraco.Core/Persistence/Repositories/MemberGroupRepository.cs
rename to src/Umbraco.Core/Persistence/Repositories/Implement/MemberGroupRepository.cs
index ee7726f349..a35a157782 100644
--- a/src/Umbraco.Core/Persistence/Repositories/MemberGroupRepository.cs
+++ b/src/Umbraco.Core/Persistence/Repositories/Implement/MemberGroupRepository.cs
@@ -1,325 +1,325 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using NPoco;
-using Umbraco.Core.Events;
-using Umbraco.Core.Logging;
-using Umbraco.Core.Models;
-using Umbraco.Core.Models.Rdbms;
-using Umbraco.Core.Persistence.Factories;
-using Umbraco.Core.Persistence.Querying;
-using Umbraco.Core.Persistence.UnitOfWork;
-using Umbraco.Core.Cache;
-
-namespace Umbraco.Core.Persistence.Repositories
-{
-    internal class MemberGroupRepository : NPocoRepositoryBase<int, IMemberGroup>, IMemberGroupRepository
-    {
-        public MemberGroupRepository(IScopeUnitOfWork work, CacheHelper cache, ILogger logger)
-            : base(work, cache, logger)
-        { }
-
-        private readonly MemberGroupFactory _modelFactory = new MemberGroupFactory();
-
-        protected override IMemberGroup PerformGet(int id)
-        {
-            var sql = GetBaseQuery(false);
-            sql.Where(GetBaseWhereClause(), new { Id = id });
-
-            var dto = Database.Fetch<NodeDto>(SqlSyntax.SelectTop(sql, 1)).FirstOrDefault();
-
-            return dto == null ? null : _modelFactory.BuildEntity(dto);
-        }
-
-        protected override IEnumerable<IMemberGroup> PerformGetAll(params int[] ids)
-        {
-            var sql = Sql()
-                .SelectAll()
-                .From<NodeDto>()
-                .Where<NodeDto>(dto => dto.NodeObjectType == NodeObjectTypeId);
-
-            if (ids.Any())
-                sql.Where("umbracoNode.id in (@ids)", new { /*ids =*/ ids });
-
-            return Database.Fetch<NodeDto>(sql).Select(x => _modelFactory.BuildEntity(x));
-        }
-
-        protected override IEnumerable<IMemberGroup> PerformGetByQuery(IQuery<IMemberGroup> query)
-        {
-            var sqlClause = GetBaseQuery(false);
-            var translator = new SqlTranslator<IMemberGroup>(sqlClause, query);
-            var sql = translator.Translate();
-
-            return Database.Fetch<NodeDto>(sql).Select(x => _modelFactory.BuildEntity(x));
-        }
-
-        protected override Sql<ISqlContext> GetBaseQuery(bool isCount)
-        {
-            var sql = Sql();
-
-            sql = isCount
-                ? sql.SelectCount()
-                : sql.Select<NodeDto>();
-
-            sql
-                .From<NodeDto>()
-                .Where<NodeDto>(x => x.NodeObjectType == NodeObjectTypeId);
-
-            return sql;
-        }
-
-        protected override string GetBaseWhereClause()
-        {
-            return "umbracoNode.id = @id";
-        }
-
-        protected override IEnumerable<string> GetDeleteClauses()
-        {
-            var list = new[]
-                           {
-                               "DELETE FROM umbracoUser2NodeNotify WHERE nodeId = @id",
-                               "DELETE FROM umbracoUserGroup2NodePermission WHERE nodeId = @id",
-                               "DELETE FROM umbracoRelation WHERE parentId = @id",
-                               "DELETE FROM umbracoRelation WHERE childId = @id",
-                               "DELETE FROM cmsTagRelationship WHERE nodeId = @id",
-                               "DELETE FROM cmsMember2MemberGroup WHERE MemberGroup = @id",
-                               "DELETE FROM umbracoNode WHERE id = @id"
-                           };
-            return list;
-        }
-
-        protected override Guid NodeObjectTypeId => Constants.ObjectTypes.MemberGroup;
-
-        protected override void PersistNewItem(IMemberGroup entity)
-        {
-            //Save to db
-            var group = (MemberGroup)entity;
-            group.AddingEntity();
-            var dto = _modelFactory.BuildDto(group);
-            var o = Database.IsNew(dto) ? Convert.ToInt32(Database.Insert(dto)) : Database.Update(dto);
-            group.Id = dto.NodeId; //Set Id on entity to ensure an Id is set
-
-            //Update with new correct path and id
-            dto.Path = string.Concat("-1,", dto.NodeId);
-            Database.Update(dto);
-            //assign to entity
-            group.Id = o;
-            group.ResetDirtyProperties();
-        }
-
-        protected override void PersistUpdatedItem(IMemberGroup entity)
-        {
-            var dto = _modelFactory.BuildDto(entity);
-
-            Database.Update(dto);
-
-            entity.ResetDirtyProperties();
-        }
-
-        public IMemberGroup GetByName(string name)
-        {
-            return IsolatedCache.GetCacheItem<IMemberGroup>(
-                typeof (IMemberGroup).FullName + "." + name,
-                () =>
-                {
-                    var qry = Query<IMemberGroup>().Where(group => group.Name.Equals(name));
-                    var result = GetByQuery(qry);
-                    return result.FirstOrDefault();
-                },
-                //cache for 5 mins since that is the default in the RuntimeCacheProvider
-                TimeSpan.FromMinutes(5),
-                //sliding is true
-                true);
-        }
-
-        public IMemberGroup CreateIfNotExists(string roleName)
-        {
-            var qry = Query<IMemberGroup>().Where(group => group.Name.Equals(roleName));
-            var result = GetByQuery(qry);
-
-            if (result.Any()) return null;
-
-            var grp = new MemberGroup
-            {
-                Name = roleName
-            };
-            PersistNewItem(grp);
-
-            if (UnitOfWork.Events.DispatchCancelable(SavingMemberGroup, this, new SaveEventArgs<IMemberGroup>(grp)))
-                return null;
-
-            UnitOfWork.Events.Dispatch(SavedMemberGroup, this, new SaveEventArgs<IMemberGroup>(grp));
-            return grp;
-        }
-
-        public IEnumerable<IMemberGroup> GetMemberGroupsForMember(int memberId)
-        {
-            var sql = Sql()
-                .Select("umbracoNode.*")
-                .From<NodeDto>()
-                .InnerJoin<Member2MemberGroupDto>()
-                .On<NodeDto, Member2MemberGroupDto>( dto => dto.NodeId, dto => dto.MemberGroup)
-                .Where<NodeDto>(x => x.NodeObjectType == NodeObjectTypeId)
-                .Where<Member2MemberGroupDto>(x => x.Member == memberId);
-
-            return Database.Fetch<NodeDto>(sql)
-                .DistinctBy(dto => dto.NodeId)
-                .Select(x => _modelFactory.BuildEntity(x));
-        }
-
-        public IEnumerable<IMemberGroup> GetMemberGroupsForMember(string username)
-        {
-            var sql = Sql()
-                .Select("un.*")
-                .From("umbracoNode AS un")
-                .InnerJoin("cmsMember2MemberGroup")
-                .On("un.id = cmsMember2MemberGroup.MemberGroup")
-                .LeftJoin("(SELECT umbracoNode.id, cmsMember.LoginName FROM umbracoNode INNER JOIN cmsMember ON umbracoNode.id = cmsMember.nodeId) AS member")
-                .On("member.id = cmsMember2MemberGroup.Member")
-                .Where("un.nodeObjectType=@objectType", new {objectType = NodeObjectTypeId })
-                .Where("member.LoginName=@loginName", new {loginName = username});
-
-            return Database.Fetch<NodeDto>(sql)
-                .DistinctBy(dto => dto.NodeId)
-                .Select(x => _modelFactory.BuildEntity(x));
-        }
-
-        public void AssignRoles(string[] usernames, string[] roleNames)
-        {
-            //first get the member ids based on the usernames
-            var memberObjectType = Constants.ObjectTypes.Member;
-
-            var memberSql = Sql()
-                .Select("umbracoNode.id")
-                .From<NodeDto>()
-                .InnerJoin<MemberDto>()
-                .On<NodeDto, MemberDto>(dto => dto.NodeId, dto => dto.NodeId)
-                .Where<NodeDto>(x => x.NodeObjectType == memberObjectType)
-                .Where("cmsMember.LoginName in (@usernames)", new { /*usernames =*/ usernames });
-            var memberIds = Database.Fetch<int>(memberSql).ToArray();
-
-            AssignRolesInternal(memberIds, roleNames);
-        }
-
-        public void DissociateRoles(string[] usernames, string[] roleNames)
-        {
-            //first get the member ids based on the usernames
-            var memberObjectType = Constants.ObjectTypes.Member;
-
-            var memberSql = Sql()
-                .Select("umbracoNode.id")
-                .From<NodeDto>()
-                .InnerJoin<MemberDto>()
-                .On<NodeDto, MemberDto>(dto => dto.NodeId, dto => dto.NodeId)
-                .Where<NodeDto>( x => x.NodeObjectType == memberObjectType)
-                .Where("cmsMember.LoginName in (@usernames)", new { /*usernames =*/ usernames });
-            var memberIds = Database.Fetch<int>(memberSql).ToArray();
-
-            DissociateRolesInternal(memberIds, roleNames);
-        }
-
-        public void AssignRoles(int[] memberIds, string[] roleNames)
-        {
-            AssignRolesInternal(memberIds, roleNames);
-        }
-
-        public void AssignRolesInternal(int[] memberIds, string[] roleNames)
-        {
-            //ensure they're unique
-            memberIds = memberIds.Distinct().ToArray();
-
-            //create the missing roles first
-
-            var existingSql = Sql()
-               .SelectAll()
-               .From<NodeDto>()
-               .Where<NodeDto>(dto => dto.NodeObjectType == NodeObjectTypeId)
-               .Where("umbracoNode." + SqlSyntax.GetQuotedColumnName("text") + " in (@names)", new { names = roleNames });
-            var existingRoles = Database.Fetch<NodeDto>(existingSql).Select(x => x.Text);
-            var missingRoles = roleNames.Except(existingRoles);
-            var missingGroups = missingRoles.Select(x => new MemberGroup {Name = x}).ToArray();
-
-            if (UnitOfWork.Events.DispatchCancelable(SavingMemberGroup, this, new SaveEventArgs<IMemberGroup>(missingGroups)))
-                return;
-
-            foreach (var m in missingGroups)
-                PersistNewItem(m);
-
-            UnitOfWork.Events.Dispatch(SavedMemberGroup, this, new SaveEventArgs<IMemberGroup>(missingGroups));
-
-            //now go get all the dto's for roles with these role names
-            var rolesForNames = Database.Fetch<NodeDto>(existingSql).ToArray();
-
-            //get the groups that are currently assigned to any of these members
-
-            var assignedSql = Sql()
-                .Select($"{SqlSyntax.GetQuotedColumnName("text")},{SqlSyntax.GetQuotedColumnName("Member")},{SqlSyntax.GetQuotedColumnName("MemberGroup")}")
-                .From<NodeDto>()
-                .InnerJoin<Member2MemberGroupDto>()
-                .On<NodeDto, Member2MemberGroupDto>(dto => dto.NodeId, dto => dto.MemberGroup)
-                .Where<NodeDto>(x => x.NodeObjectType == NodeObjectTypeId)
-                .Where("cmsMember2MemberGroup.Member in (@ids)", new { ids = memberIds });
-
-            var currentlyAssigned = Database.Fetch<AssignedRolesDto>(assignedSql).ToArray();
-
-            //assign the roles for each member id
-
-            foreach (var memberId in memberIds)
-            {
-                //find any roles for the current member that are currently assigned that
-                //exist in the roleNames list, then determine which ones are not currently assigned.
-                var mId = memberId;
-                var found = currentlyAssigned.Where(x => x.MemberId == mId).ToArray();
-                var assignedRoles = found.Where(x => roleNames.Contains(x.RoleName)).Select(x => x.RoleName);
-                var nonAssignedRoles = roleNames.Except(assignedRoles);
-                foreach (var toAssign in nonAssignedRoles)
-                {
-                    var groupId = rolesForNames.First(x => x.Text == toAssign).NodeId;
-                    Database.Insert(new Member2MemberGroupDto { Member = mId, MemberGroup = groupId });
-                }
-            }
-        }
-
-        public void DissociateRoles(int[] memberIds, string[] roleNames)
-        {
-            DissociateRolesInternal(memberIds, roleNames);
-        }
-
-        private void DissociateRolesInternal(int[] memberIds, string[] roleNames)
-        {
-            var existingSql = Sql()
-                    .SelectAll()
-                    .From<NodeDto>()
-                    .Where<NodeDto>(dto => dto.NodeObjectType == NodeObjectTypeId)
-                    .Where("umbracoNode." + SqlSyntax.GetQuotedColumnName("text") + " in (@names)", new { names = roleNames });
-            var existingRolesIds = Database.Fetch<NodeDto>(existingSql).Select(x => x.NodeId).ToArray();
-
-            Database.Execute("DELETE FROM cmsMember2MemberGroup WHERE Member IN (@memberIds) AND MemberGroup IN (@memberGroups)",
-                new { /*memberIds =*/ memberIds, memberGroups = existingRolesIds });
-        }
-
-        private class AssignedRolesDto
-        {
-            [Column("text")]
-            public string RoleName { get; set; }
-
-            [Column("Member")]
-            public int MemberId { get; set; }
-
-            [Column("MemberGroup")]
-            public int MemberGroupId { get; set; }
-        }
-
-        // todo - understand why we need these two repository-level events, move them back to service
-
-        /// <summary>
-        /// Occurs before Save
-        /// </summary>
-        internal static event TypedEventHandler<IMemberGroupRepository, SaveEventArgs<IMemberGroup>> SavingMemberGroup;
-
-        /// <summary>
-        /// Occurs after Save
-        /// </summary>
-        internal static event TypedEventHandler<IMemberGroupRepository, SaveEventArgs<IMemberGroup>> SavedMemberGroup;
-    }
-}
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using NPoco;
+using Umbraco.Core.Cache;
+using Umbraco.Core.Events;
+using Umbraco.Core.Logging;
+using Umbraco.Core.Models;
+using Umbraco.Core.Models.Rdbms;
+using Umbraco.Core.Persistence.Factories;
+using Umbraco.Core.Persistence.Querying;
+using Umbraco.Core.Persistence.UnitOfWork;
+
+namespace Umbraco.Core.Persistence.Repositories.Implement
+{
+    internal class MemberGroupRepository : NPocoRepositoryBase<int, IMemberGroup>, IMemberGroupRepository
+    {
+        public MemberGroupRepository(IScopeUnitOfWork work, CacheHelper cache, ILogger logger)
+            : base(work, cache, logger)
+        { }
+
+        private readonly MemberGroupFactory _modelFactory = new MemberGroupFactory();
+
+        protected override IMemberGroup PerformGet(int id)
+        {
+            var sql = GetBaseQuery(false);
+            sql.Where(GetBaseWhereClause(), new { Id = id });
+
+            var dto = Database.Fetch<NodeDto>(SqlSyntax.SelectTop(sql, 1)).FirstOrDefault();
+
+            return dto == null ? null : _modelFactory.BuildEntity(dto);
+        }
+
+        protected override IEnumerable<IMemberGroup> PerformGetAll(params int[] ids)
+        {
+            var sql = Sql()
+                .SelectAll()
+                .From<NodeDto>()
+                .Where<NodeDto>(dto => dto.NodeObjectType == NodeObjectTypeId);
+
+            if (ids.Any())
+                sql.Where("umbracoNode.id in (@ids)", new { /*ids =*/ ids });
+
+            return Database.Fetch<NodeDto>(sql).Select(x => _modelFactory.BuildEntity(x));
+        }
+
+        protected override IEnumerable<IMemberGroup> PerformGetByQuery(IQuery<IMemberGroup> query)
+        {
+            var sqlClause = GetBaseQuery(false);
+            var translator = new SqlTranslator<IMemberGroup>(sqlClause, query);
+            var sql = translator.Translate();
+
+            return Database.Fetch<NodeDto>(sql).Select(x => _modelFactory.BuildEntity(x));
+        }
+
+        protected override Sql<ISqlContext> GetBaseQuery(bool isCount)
+        {
+            var sql = Sql();
+
+            sql = isCount
+                ? sql.SelectCount()
+                : sql.Select<NodeDto>();
+
+            sql
+                .From<NodeDto>()
+                .Where<NodeDto>(x => x.NodeObjectType == NodeObjectTypeId);
+
+            return sql;
+        }
+
+        protected override string GetBaseWhereClause()
+        {
+            return "umbracoNode.id = @id";
+        }
+
+        protected override IEnumerable<string> GetDeleteClauses()
+        {
+            var list = new[]
+                           {
+                               "DELETE FROM umbracoUser2NodeNotify WHERE nodeId = @id",
+                               "DELETE FROM umbracoUserGroup2NodePermission WHERE nodeId = @id",
+                               "DELETE FROM umbracoRelation WHERE parentId = @id",
+                               "DELETE FROM umbracoRelation WHERE childId = @id",
+                               "DELETE FROM cmsTagRelationship WHERE nodeId = @id",
+                               "DELETE FROM cmsMember2MemberGroup WHERE MemberGroup = @id",
+                               "DELETE FROM umbracoNode WHERE id = @id"
+                           };
+            return list;
+        }
+
+        protected override Guid NodeObjectTypeId => Constants.ObjectTypes.MemberGroup;
+
+        protected override void PersistNewItem(IMemberGroup entity)
+        {
+            //Save to db
+            var group = (MemberGroup)entity;
+            group.AddingEntity();
+            var dto = _modelFactory.BuildDto(group);
+            var o = Database.IsNew(dto) ? Convert.ToInt32(Database.Insert(dto)) : Database.Update(dto);
+            group.Id = dto.NodeId; //Set Id on entity to ensure an Id is set
+
+            //Update with new correct path and id
+            dto.Path = string.Concat("-1,", dto.NodeId);
+            Database.Update(dto);
+            //assign to entity
+            group.Id = o;
+            group.ResetDirtyProperties();
+        }
+
+        protected override void PersistUpdatedItem(IMemberGroup entity)
+        {
+            var dto = _modelFactory.BuildDto(entity);
+
+            Database.Update(dto);
+
+            entity.ResetDirtyProperties();
+        }
+
+        public IMemberGroup GetByName(string name)
+        {
+            return IsolatedCache.GetCacheItem<IMemberGroup>(
+                typeof (IMemberGroup).FullName + "." + name,
+                () =>
+                {
+                    var qry = Query<IMemberGroup>().Where(group => group.Name.Equals(name));
+                    var result = Get(qry);
+                    return result.FirstOrDefault();
+                },
+                //cache for 5 mins since that is the default in the RuntimeCacheProvider
+                TimeSpan.FromMinutes(5),
+                //sliding is true
+                true);
+        }
+
+        public IMemberGroup CreateIfNotExists(string roleName)
+        {
+            var qry = Query<IMemberGroup>().Where(group => group.Name.Equals(roleName));
+            var result = Get(qry);
+
+            if (result.Any()) return null;
+
+            var grp = new MemberGroup
+            {
+                Name = roleName
+            };
+            PersistNewItem(grp);
+
+            if (UnitOfWork.Events.DispatchCancelable(SavingMemberGroup, this, new SaveEventArgs<IMemberGroup>(grp)))
+                return null;
+
+            UnitOfWork.Events.Dispatch(SavedMemberGroup, this, new SaveEventArgs<IMemberGroup>(grp));
+            return grp;
+        }
+
+        public IEnumerable<IMemberGroup> GetMemberGroupsForMember(int memberId)
+        {
+            var sql = Sql()
+                .Select("umbracoNode.*")
+                .From<NodeDto>()
+                .InnerJoin<Member2MemberGroupDto>()
+                .On<NodeDto, Member2MemberGroupDto>( dto => dto.NodeId, dto => dto.MemberGroup)
+                .Where<NodeDto>(x => x.NodeObjectType == NodeObjectTypeId)
+                .Where<Member2MemberGroupDto>(x => x.Member == memberId);
+
+            return Database.Fetch<NodeDto>(sql)
+                .DistinctBy(dto => dto.NodeId)
+                .Select(x => _modelFactory.BuildEntity(x));
+        }
+
+        public IEnumerable<IMemberGroup> GetMemberGroupsForMember(string username)
+        {
+            var sql = Sql()
+                .Select("un.*")
+                .From("umbracoNode AS un")
+                .InnerJoin("cmsMember2MemberGroup")
+                .On("un.id = cmsMember2MemberGroup.MemberGroup")
+                .LeftJoin("(SELECT umbracoNode.id, cmsMember.LoginName FROM umbracoNode INNER JOIN cmsMember ON umbracoNode.id = cmsMember.nodeId) AS member")
+                .On("member.id = cmsMember2MemberGroup.Member")
+                .Where("un.nodeObjectType=@objectType", new {objectType = NodeObjectTypeId })
+                .Where("member.LoginName=@loginName", new {loginName = username});
+
+            return Database.Fetch<NodeDto>(sql)
+                .DistinctBy(dto => dto.NodeId)
+                .Select(x => _modelFactory.BuildEntity(x));
+        }
+
+        public void AssignRoles(string[] usernames, string[] roleNames)
+        {
+            //first get the member ids based on the usernames
+            var memberObjectType = Constants.ObjectTypes.Member;
+
+            var memberSql = Sql()
+                .Select("umbracoNode.id")
+                .From<NodeDto>()
+                .InnerJoin<MemberDto>()
+                .On<NodeDto, MemberDto>(dto => dto.NodeId, dto => dto.NodeId)
+                .Where<NodeDto>(x => x.NodeObjectType == memberObjectType)
+                .Where("cmsMember.LoginName in (@usernames)", new { /*usernames =*/ usernames });
+            var memberIds = Database.Fetch<int>(memberSql).ToArray();
+
+            AssignRolesInternal(memberIds, roleNames);
+        }
+
+        public void DissociateRoles(string[] usernames, string[] roleNames)
+        {
+            //first get the member ids based on the usernames
+            var memberObjectType = Constants.ObjectTypes.Member;
+
+            var memberSql = Sql()
+                .Select("umbracoNode.id")
+                .From<NodeDto>()
+                .InnerJoin<MemberDto>()
+                .On<NodeDto, MemberDto>(dto => dto.NodeId, dto => dto.NodeId)
+                .Where<NodeDto>( x => x.NodeObjectType == memberObjectType)
+                .Where("cmsMember.LoginName in (@usernames)", new { /*usernames =*/ usernames });
+            var memberIds = Database.Fetch<int>(memberSql).ToArray();
+
+            DissociateRolesInternal(memberIds, roleNames);
+        }
+
+        public void AssignRoles(int[] memberIds, string[] roleNames)
+        {
+            AssignRolesInternal(memberIds, roleNames);
+        }
+
+        public void AssignRolesInternal(int[] memberIds, string[] roleNames)
+        {
+            //ensure they're unique
+            memberIds = memberIds.Distinct().ToArray();
+
+            //create the missing roles first
+
+            var existingSql = Sql()
+               .SelectAll()
+               .From<NodeDto>()
+               .Where<NodeDto>(dto => dto.NodeObjectType == NodeObjectTypeId)
+               .Where("umbracoNode." + SqlSyntax.GetQuotedColumnName("text") + " in (@names)", new { names = roleNames });
+            var existingRoles = Database.Fetch<NodeDto>(existingSql).Select(x => x.Text);
+            var missingRoles = roleNames.Except(existingRoles);
+            var missingGroups = missingRoles.Select(x => new MemberGroup {Name = x}).ToArray();
+
+            if (UnitOfWork.Events.DispatchCancelable(SavingMemberGroup, this, new SaveEventArgs<IMemberGroup>(missingGroups)))
+                return;
+
+            foreach (var m in missingGroups)
+                PersistNewItem(m);
+
+            UnitOfWork.Events.Dispatch(SavedMemberGroup, this, new SaveEventArgs<IMemberGroup>(missingGroups));
+
+            //now go get all the dto's for roles with these role names
+            var rolesForNames = Database.Fetch<NodeDto>(existingSql).ToArray();
+
+            //get the groups that are currently assigned to any of these members
+
+            var assignedSql = Sql()
+                .Select($"{SqlSyntax.GetQuotedColumnName("text")},{SqlSyntax.GetQuotedColumnName("Member")},{SqlSyntax.GetQuotedColumnName("MemberGroup")}")
+                .From<NodeDto>()
+                .InnerJoin<Member2MemberGroupDto>()
+                .On<NodeDto, Member2MemberGroupDto>(dto => dto.NodeId, dto => dto.MemberGroup)
+                .Where<NodeDto>(x => x.NodeObjectType == NodeObjectTypeId)
+                .Where("cmsMember2MemberGroup.Member in (@ids)", new { ids = memberIds });
+
+            var currentlyAssigned = Database.Fetch<AssignedRolesDto>(assignedSql).ToArray();
+
+            //assign the roles for each member id
+
+            foreach (var memberId in memberIds)
+            {
+                //find any roles for the current member that are currently assigned that
+                //exist in the roleNames list, then determine which ones are not currently assigned.
+                var mId = memberId;
+                var found = currentlyAssigned.Where(x => x.MemberId == mId).ToArray();
+                var assignedRoles = found.Where(x => roleNames.Contains(x.RoleName)).Select(x => x.RoleName);
+                var nonAssignedRoles = roleNames.Except(assignedRoles);
+                foreach (var toAssign in nonAssignedRoles)
+                {
+                    var groupId = rolesForNames.First(x => x.Text == toAssign).NodeId;
+                    Database.Insert(new Member2MemberGroupDto { Member = mId, MemberGroup = groupId });
+                }
+            }
+        }
+
+        public void DissociateRoles(int[] memberIds, string[] roleNames)
+        {
+            DissociateRolesInternal(memberIds, roleNames);
+        }
+
+        private void DissociateRolesInternal(int[] memberIds, string[] roleNames)
+        {
+            var existingSql = Sql()
+                    .SelectAll()
+                    .From<NodeDto>()
+                    .Where<NodeDto>(dto => dto.NodeObjectType == NodeObjectTypeId)
+                    .Where("umbracoNode." + SqlSyntax.GetQuotedColumnName("text") + " in (@names)", new { names = roleNames });
+            var existingRolesIds = Database.Fetch<NodeDto>(existingSql).Select(x => x.NodeId).ToArray();
+
+            Database.Execute("DELETE FROM cmsMember2MemberGroup WHERE Member IN (@memberIds) AND MemberGroup IN (@memberGroups)",
+                new { /*memberIds =*/ memberIds, memberGroups = existingRolesIds });
+        }
+
+        private class AssignedRolesDto
+        {
+            [Column("text")]
+            public string RoleName { get; set; }
+
+            [Column("Member")]
+            public int MemberId { get; set; }
+
+            [Column("MemberGroup")]
+            public int MemberGroupId { get; set; }
+        }
+
+        // todo - understand why we need these two repository-level events, move them back to service
+
+        /// <summary>
+        /// Occurs before Save
+        /// </summary>
+        internal static event TypedEventHandler<IMemberGroupRepository, SaveEventArgs<IMemberGroup>> SavingMemberGroup;
+
+        /// <summary>
+        /// Occurs after Save
+        /// </summary>
+        internal static event TypedEventHandler<IMemberGroupRepository, SaveEventArgs<IMemberGroup>> SavedMemberGroup;
+    }
+}
diff --git a/src/Umbraco.Core/Persistence/Repositories/MemberRepository.cs b/src/Umbraco.Core/Persistence/Repositories/Implement/MemberRepository.cs
similarity index 95%
rename from src/Umbraco.Core/Persistence/Repositories/MemberRepository.cs
rename to src/Umbraco.Core/Persistence/Repositories/Implement/MemberRepository.cs
index 877113ea5b..ebe09729ff 100644
--- a/src/Umbraco.Core/Persistence/Repositories/MemberRepository.cs
+++ b/src/Umbraco.Core/Persistence/Repositories/Implement/MemberRepository.cs
@@ -1,609 +1,609 @@
-using System;
-using System.Collections.Generic;
-using System.Globalization;
-using System.Linq;
-using NPoco;
-using Microsoft.AspNet.Identity;
-using Umbraco.Core.Cache;
-using Umbraco.Core.Logging;
-using Umbraco.Core.Models.EntityBase;
-using Umbraco.Core.Models;
-using Umbraco.Core.Models.Rdbms;
-using Umbraco.Core.Persistence.DatabaseModelDefinitions;
-using Umbraco.Core.Persistence.Factories;
-using Umbraco.Core.Persistence.Querying;
-using Umbraco.Core.Persistence.UnitOfWork;
-
-namespace Umbraco.Core.Persistence.Repositories
-{
-    /// <summary>
-    /// Represents a repository for doing CRUD operations for <see cref="IMember"/>
-    /// </summary>
-    internal class MemberRepository : VersionableRepositoryBase<int, IMember, MemberRepository>, IMemberRepository
-    {
-        private readonly IMemberTypeRepository _memberTypeRepository;
-        private readonly ITagRepository _tagRepository;
-        private readonly IMemberGroupRepository _memberGroupRepository;
-
-        public MemberRepository(IScopeUnitOfWork work, CacheHelper cache, ILogger logger, IMemberTypeRepository memberTypeRepository, IMemberGroupRepository memberGroupRepository, ITagRepository tagRepository)
-            : base(work, cache, logger)
-        {
-            _memberTypeRepository = memberTypeRepository ?? throw new ArgumentNullException(nameof(memberTypeRepository));
-            _tagRepository = tagRepository ?? throw new ArgumentNullException(nameof(tagRepository));
-            _memberGroupRepository = memberGroupRepository;
-        }
-
-        protected override MemberRepository This => this;
-
-        #region Repository Base
-
-        protected override Guid NodeObjectTypeId => Constants.ObjectTypes.Member;
-
-        protected override IMember PerformGet(int id)
-        {
-            var sql = GetBaseQuery(QueryType.Single)
-                .Where<NodeDto>(x => x.NodeId == id)
-                .SelectTop(1);
-
-            var dto = Database.Fetch<MemberDto>(sql).FirstOrDefault();
-            return dto == null
-                ? null
-                : MapDtoToContent(dto);
-        }
-
-        protected override IEnumerable<IMember> PerformGetAll(params int[] ids)
-        {
-            var sql = GetBaseQuery(QueryType.Many);
-
-            if (ids.Any())
-                sql.WhereIn<NodeDto>(x => x.NodeId, ids);
-
-            return MapDtosToContent(Database.Fetch<MemberDto>(sql));
-        }
-
-        protected override IEnumerable<IMember> PerformGetByQuery(IQuery<IMember> query)
-        {
-            var baseQuery = GetBaseQuery(false);
-
-            // fixme why is this different from content/media?!
-            // check if the query is based on properties or not
-
-            var wheres = query.GetWhereClauses();
-            //this is a pretty rudimentary check but wil work, we just need to know if this query requires property
-            // level queries
-            if (wheres.Any(x => x.Item1.Contains("cmsPropertyType")))
-            {
-                var sqlWithProps = GetNodeIdQueryWithPropertyData();
-                var translator = new SqlTranslator<IMember>(sqlWithProps, query);
-                var sql = translator.Translate();
-
-                baseQuery.Append("WHERE umbracoNode.id IN (" + sql.SQL + ")", sql.Arguments)
-                    .OrderBy<NodeDto>(x => x.SortOrder);
-
-                return MapDtosToContent(Database.Fetch<MemberDto>(baseQuery));
-            }
-            else
-            {
-                var translator = new SqlTranslator<IMember>(baseQuery, query);
-                var sql = translator.Translate()
-                    .OrderBy<NodeDto>(x => x.SortOrder);
-
-                return MapDtosToContent(Database.Fetch<MemberDto>(sql));
-            }
-
-        }
-
-        protected override Sql<ISqlContext> GetBaseQuery(QueryType queryType)
-        {
-            return GetBaseQuery(queryType, true);
-        }
-
-        protected virtual Sql<ISqlContext> GetBaseQuery(QueryType queryType, bool current)
-        {
-            var sql = SqlContext.Sql();
-
-            switch (queryType) // FIXME pretend we still need these queries for now
-            {
-                case QueryType.Count:
-                    sql = sql.SelectCount();
-                    break;
-                case QueryType.Ids:
-                    sql = sql.Select<MemberDto>(x => x.NodeId);
-                    break;
-                case QueryType.Single:
-                case QueryType.Many:
-                    sql = sql.Select<MemberDto>(r =>
-                        r.Select(x => x.ContentVersionDto)
-                         .Select(x => x.ContentDto, r1 =>
-                            r1.Select(x => x.NodeDto)));
-                    break;
-            }
-
-            sql
-                .From<MemberDto>()
-                .InnerJoin<ContentDto>().On<MemberDto, ContentDto>(left => left.NodeId, right => right.NodeId)
-                .InnerJoin<NodeDto>().On<ContentDto, NodeDto>(left => left.NodeId, right => right.NodeId)
-                .InnerJoin<ContentVersionDto>().On<ContentDto, ContentVersionDto>(left => left.NodeId, right => right.NodeId)
-
-                // joining the type so we can do a query against the member type - not sure if this adds much overhead or not?
-                // the execution plan says it doesn't so we'll go with that and in that case, it might be worth joining the content
-                // types by default on the document and media repo's so we can query by content type there too.
-                .InnerJoin<ContentTypeDto>().On<ContentDto, ContentTypeDto>(left => left.ContentTypeId, right => right.NodeId);
-
-            sql.Where<NodeDto>(x => x.NodeObjectType == NodeObjectTypeId);
-
-            if (current)
-                sql.Where<ContentVersionDto>(x => x.Current); // always get the current version
-
-            return sql;
-        }
-
-        // fixme - move that one up to Versionable! or better: kill it!
-        protected override Sql<ISqlContext> GetBaseQuery(bool isCount)
-        {
-            return GetBaseQuery(isCount ? QueryType.Count : QueryType.Single);
-        }
-
-        protected override string GetBaseWhereClause() // fixme - can we kill / refactor this?
-        {
-            return "umbracoNode.id = @id";
-        }
-
-        // fixme wtf?
-        protected Sql<ISqlContext> GetNodeIdQueryWithPropertyData()
-        {
-            return Sql()
-                .Select("DISTINCT(umbracoNode.id)")
-                .From<NodeDto>()
-                .InnerJoin<ContentDto>().On<NodeDto, ContentDto>((left, right) => left.NodeId == right.NodeId)
-                .InnerJoin<ContentTypeDto>().On<ContentDto, ContentTypeDto>((left, right) => left.ContentTypeId == right.NodeId)
-                .InnerJoin<ContentVersionDto>().On<NodeDto, ContentVersionDto>((left, right) => left.NodeId == right.NodeId)
-                .InnerJoin<MemberDto>().On<ContentDto, MemberDto>((left, right) => left.NodeId == right.NodeId)
-
-                .LeftJoin<PropertyTypeDto>().On<ContentDto, PropertyTypeDto>(left => left.ContentTypeId, right => right.ContentTypeId)
-                .LeftJoin<DataTypeDto>().On<PropertyTypeDto, DataTypeDto>(left => left.DataTypeId, right => right.DataTypeId)
-
-                .LeftJoin<PropertyDataDto>().On(x => x
-                    .Where<PropertyDataDto, PropertyTypeDto>((left, right) => left.PropertyTypeId == right.Id)
-                    .Where<PropertyDataDto, ContentVersionDto>((left, right) => left.VersionId == right.Id))
-
-                .Where<NodeDto>(x => x.NodeObjectType == NodeObjectTypeId);
-        }
-
-        protected override IEnumerable<string> GetDeleteClauses()
-        {
-            var list = new List<string>
-            {
-                "DELETE FROM cmsTask WHERE nodeId = @id",
-                "DELETE FROM umbracoUser2NodeNotify WHERE nodeId = @id",
-                "DELETE FROM umbracoUserGroup2NodePermission WHERE nodeId = @id",
-                "DELETE FROM umbracoRelation WHERE parentId = @id",
-                "DELETE FROM umbracoRelation WHERE childId = @id",
-                "DELETE FROM cmsTagRelationship WHERE nodeId = @id",
-                "DELETE FROM " + Constants.DatabaseSchema.Tables.PropertyData + " WHERE versionId IN (SELECT id FROM " + Constants.DatabaseSchema.Tables.ContentVersion + " WHERE nodeId = @id)",
-                "DELETE FROM cmsMember2MemberGroup WHERE Member = @id",
-                "DELETE FROM cmsMember WHERE nodeId = @id",
-                "DELETE FROM " + Constants.DatabaseSchema.Tables.ContentVersion + " WHERE nodeId = @id",
-                "DELETE FROM cmsContentXml WHERE nodeId = @id",
-                "DELETE FROM " + Constants.DatabaseSchema.Tables.Content + " WHERE nodeId = @id",
-                "DELETE FROM umbracoNode WHERE id = @id"
-            };
-            return list;
-        }
-
-        #endregion
-
-        #region Versions
-
-        public override IEnumerable<IMember> GetAllVersions(int nodeId)
-        {
-            var sql = GetBaseQuery(QueryType.Many, false)
-                .Where<NodeDto>(x => x.NodeId == nodeId)
-                .OrderByDescending<ContentVersionDto>(x => x.Current)
-                .AndByDescending<ContentVersionDto>(x => x.VersionDate);
-
-            return MapDtosToContent(Database.Fetch<MemberDto>(sql), true);
-        }
-
-        public override IMember GetVersion(int versionId)
-        {
-            var sql = GetBaseQuery(QueryType.Single)
-                .Where<ContentVersionDto>(x => x.Id == versionId);
-
-            var dto = Database.Fetch<MemberDto>(sql).FirstOrDefault();
-            return dto == null ? null : MapDtoToContent(dto);
-        }
-
-        protected override void PerformDeleteVersion(int id, int versionId)
-        {
-            // raise event first else potential FK issues
-            OnUowRemovingVersion(new UnitOfWorkVersionEventArgs(UnitOfWork, id, versionId));
-
-            Database.Delete<PropertyDataDto>("WHERE versionId = @VersionId", new { versionId });
-            Database.Delete<ContentVersionDto>("WHERE versionId = @VersionId", new { versionId });
-        }
-
-        #endregion
-
-        #region Persist
-
-        protected override void PersistNewItem(IMember entity)
-        {
-            var member = (Member) entity;
-            member.AddingEntity();
-
-            // ensure that strings don't contain characters that are invalid in xml
-            // fixme - do we really want to keep doing this here?
-            entity.SanitizeEntityPropertiesForXmlStorage();
-
-            // create the dto
-            var dto = ContentBaseFactory.BuildDto(entity);
-
-            // derive path and level from parent
-            var parent = GetParentNodeDto(entity.ParentId);
-            var level = parent.Level + 1;
-
-            // get sort order
-            var sortOrder = GetNewChildSortOrder(entity.ParentId, 0);
-
-            // persist the node dto
-            var nodeDto = dto.ContentDto.NodeDto;
-            nodeDto.Path = parent.Path;
-            nodeDto.Level = Convert.ToInt16(level);
-            nodeDto.SortOrder = sortOrder;
-
-            // see if there's a reserved identifier for this unique id
-            // and then either update or insert the node dto
-            var id = GetReservedId(nodeDto.UniqueId);
-            if (id > 0)
-            {
-                nodeDto.NodeId = id;
-                nodeDto.Path = string.Concat(parent.Path, ",", nodeDto.NodeId);
-                nodeDto.ValidatePathWithException();
-                Database.Update(nodeDto);
-            }
-            else
-            {
-                Database.Insert(nodeDto);
-
-                // update path, now that we have an id
-                nodeDto.Path = string.Concat(parent.Path, ",", nodeDto.NodeId);
-                nodeDto.ValidatePathWithException();
-                Database.Update(nodeDto);
-            }
-
-            // update entity
-            entity.Id = nodeDto.NodeId;
-            entity.Path = nodeDto.Path;
-            entity.SortOrder = sortOrder;
-            entity.Level = level;
-
-            // persist the content dto
-            var contentDto = dto.ContentDto;
-            contentDto.NodeId = nodeDto.NodeId;
-            Database.Insert(contentDto);
-
-            // persist the content version dto
-            // assumes a new version id and version date (modified date) has been set
-            var contentVersionDto = dto.ContentVersionDto;
-            contentVersionDto.NodeId = nodeDto.NodeId;
-            contentVersionDto.Current = true;
-            Database.Insert(contentVersionDto);
-            member.VersionId = contentVersionDto.Id;
-
-            // persist the member dto
-            dto.NodeId = nodeDto.NodeId;
-
-            // if the password is empty, generate one with the special prefix
-            // this will hash the guid with a salt so should be nicely random
-            if (entity.RawPasswordValue.IsNullOrWhiteSpace())
-            {
-                var aspHasher = new PasswordHasher();
-                dto.Password = Constants.Security.EmptyPasswordPrefix + aspHasher.HashPassword(Guid.NewGuid().ToString("N"));
-                entity.RawPasswordValue = dto.Password;
-            }
-
-            Database.Insert(dto);
-
-            // persist the property data
-            var propertyDataDtos = PropertyFactory.BuildDtos(member.VersionId, 0, entity.Properties, out _);
-            foreach (var propertyDataDto in propertyDataDtos)
-                Database.Insert(propertyDataDto);
-
-            UpdateEntityTags(entity, _tagRepository);
-
-            OnUowRefreshedEntity(new UnitOfWorkEntityEventArgs(UnitOfWork, entity));
-
-            entity.ResetDirtyProperties();
-        }
-
-        protected override void PersistUpdatedItem(IMember entity)
-        {
-            var member = (Member) entity;
-
-            // update
-            member.UpdatingEntity();
-
-            // ensure that strings don't contain characters that are invalid in xml
-            // fixme - do we really want to keep doing this here?
-            entity.SanitizeEntityPropertiesForXmlStorage();
-
-            // if parent has changed, get path, level and sort order
-            if (entity.IsPropertyDirty("ParentId"))
-            {
-                var parent = GetParentNodeDto(entity.ParentId);
-
-                entity.Path = string.Concat(parent.Path, ",", entity.Id);
-                entity.Level = parent.Level + 1;
-                entity.SortOrder = GetNewChildSortOrder(entity.ParentId, 0);
-            }
-
-            // create the dto
-            var dto = ContentBaseFactory.BuildDto(entity);
-
-            // update the node dto
-            var nodeDto = dto.ContentDto.NodeDto;
-            Database.Update(nodeDto);
-
-            // update the content dto
-            Database.Update(dto.ContentDto);
-
-            // update the content version dto
-            Database.Update(dto.ContentVersionDto);
-
-            // update the member dto
-            // but only the changed columns, 'cos we cannot update password if empty
-            var changedCols = new List<string>();
-
-            if (entity.IsPropertyDirty("Email"))
-                changedCols.Add("Email");
-
-            if (entity.IsPropertyDirty("Username"))
-                changedCols.Add("LoginName");
-
-            // do NOT update the password if it has not changed or if it is null or empty
-            if (entity.IsPropertyDirty("RawPasswordValue") && !string.IsNullOrWhiteSpace(entity.RawPasswordValue))
-                changedCols.Add("Password");
-
-            if (changedCols.Count > 0)
-                Database.Update(dto, changedCols);
-
-            // replace the property data
-            var deletePropertyDataSql = SqlContext.Sql().Delete<PropertyDataDto>().Where<PropertyDataDto>(x => x.VersionId == member.VersionId);
-            Database.Execute(deletePropertyDataSql);
-            var propertyDataDtos = PropertyFactory.BuildDtos(member.VersionId, 0, entity.Properties, out _);
-            foreach (var propertyDataDto in propertyDataDtos)
-                Database.Insert(propertyDataDto);
-
-            UpdateEntityTags(entity, _tagRepository);
-
-            OnUowRefreshedEntity(new UnitOfWorkEntityEventArgs(UnitOfWork, entity));
-
-            entity.ResetDirtyProperties();
-        }
-
-        protected override void PersistDeletedItem(IMember entity)
-        {
-            // raise event first else potential FK issues
-            OnUowRemovingEntity(new UnitOfWorkEntityEventArgs(UnitOfWork, entity));
-            base.PersistDeletedItem(entity);
-        }
-
-        #endregion
-
-        public IEnumerable<IMember> FindMembersInRole(string roleName, string usernameToMatch, StringPropertyMatchType matchType = StringPropertyMatchType.StartsWith)
-        {
-            //get the group id
-            var grpQry = Query<IMemberGroup>().Where(group => group.Name.Equals(roleName));
-            var memberGroup = _memberGroupRepository.GetByQuery(grpQry).FirstOrDefault();
-            if (memberGroup == null) return Enumerable.Empty<IMember>();
-
-            // get the members by username
-            var query = Query<IMember>();
-            switch (matchType)
-            {
-                case StringPropertyMatchType.Exact:
-                    query.Where(member => member.Username.Equals(usernameToMatch));
-                    break;
-                case StringPropertyMatchType.Contains:
-                    query.Where(member => member.Username.Contains(usernameToMatch));
-                    break;
-                case StringPropertyMatchType.StartsWith:
-                    query.Where(member => member.Username.StartsWith(usernameToMatch));
-                    break;
-                case StringPropertyMatchType.EndsWith:
-                    query.Where(member => member.Username.EndsWith(usernameToMatch));
-                    break;
-                case StringPropertyMatchType.Wildcard:
-                    query.Where(member => member.Username.SqlWildcard(usernameToMatch, TextColumnType.NVarchar));
-                    break;
-                default:
-                    throw new ArgumentOutOfRangeException(nameof(matchType));
-            }
-            var matchedMembers = GetByQuery(query).ToArray();
-
-            var membersInGroup = new List<IMember>();
-            //then we need to filter the matched members that are in the role
-            //since the max sql params are 2100 on sql server, we'll reduce that to be safe for potentially other servers and run the queries in batches
-            var inGroups = matchedMembers.InGroupsOf(1000);
-            foreach (var batch in inGroups)
-            {
-                var memberIdBatch = batch.Select(x => x.Id);
-                var sql = Sql().SelectAll().From<Member2MemberGroupDto>()
-                    .Where<Member2MemberGroupDto>(dto => dto.MemberGroup == memberGroup.Id)
-                    .Where("Member IN (@memberIds)", new { memberIds = memberIdBatch });
-                var memberIdsInGroup = Database.Fetch<Member2MemberGroupDto>(sql)
-                    .Select(x => x.Member).ToArray();
-
-                membersInGroup.AddRange(matchedMembers.Where(x => memberIdsInGroup.Contains(x.Id)));
-            }
-
-            return membersInGroup;
-
-        }
-
-        /// <summary>
-        /// Get all members in a specific group
-        /// </summary>
-        /// <param name="groupName"></param>
-        /// <returns></returns>
-        public IEnumerable<IMember> GetByMemberGroup(string groupName)
-        {
-            var grpQry = Query<IMemberGroup>().Where(group => group.Name.Equals(groupName));
-            var memberGroup = _memberGroupRepository.GetByQuery(grpQry).FirstOrDefault();
-            if (memberGroup == null) return Enumerable.Empty<IMember>();
-
-            var subQuery = Sql().Select("Member").From<Member2MemberGroupDto>().Where<Member2MemberGroupDto>(dto => dto.MemberGroup == memberGroup.Id);
-
-            var sql = GetBaseQuery(false)
-                //TODO: An inner join would be better, though I've read that the query optimizer will always turn a
-                // subquery with an IN clause into an inner join anyways.
-                .Append("WHERE umbracoNode.id IN (" + subQuery.SQL + ")", subQuery.Arguments)
-                .OrderByDescending<ContentVersionDto>(x => x.VersionDate)
-                .OrderBy<NodeDto>(x => x.SortOrder);
-
-            return MapDtosToContent(Database.Fetch<MemberDto>(sql));
-
-        }
-
-        public bool Exists(string username)
-        {
-            var sql = Sql()
-                .SelectCount()
-                .From<MemberDto>()
-                .Where<MemberDto>(x => x.LoginName == username);
-
-            return Database.ExecuteScalar<int>(sql) > 0;
-        }
-
-        public int GetCountByQuery(IQuery<IMember> query)
-        {
-            var sqlWithProps = GetNodeIdQueryWithPropertyData();
-            var translator = new SqlTranslator<IMember>(sqlWithProps, query);
-            var sql = translator.Translate();
-
-            //get the COUNT base query
-            var fullSql = GetBaseQuery(true)
-                .Append(new Sql("WHERE umbracoNode.id IN (" + sql.SQL + ")", sql.Arguments));
-
-            return Database.ExecuteScalar<int>(fullSql);
-        }
-
-        /// <summary>
-        /// Gets paged member results.
-        /// </summary>
-        public IEnumerable<IMember> GetPagedResultsByQuery(IQuery<IMember> query, long pageIndex, int pageSize, out long totalRecords,
-            string orderBy, Direction orderDirection, bool orderBySystemField, IQuery<IMember> filter = null)
-        {
-            Sql<ISqlContext> filterSql = null;
-
-            if (filter != null)
-            {
-                filterSql = Sql();
-                foreach (var clause in filter.GetWhereClauses())
-                    filterSql = filterSql.Append($"AND ({clause.Item1})", clause.Item2);
-            }
-
-            return GetPagedResultsByQuery<MemberDto>(query, pageIndex, pageSize, out totalRecords,
-                x => MapDtosToContent(x), orderBy, orderDirection, orderBySystemField,
-                filterSql);
-        }
-
-        private string _pagedResultsByQueryWhere;
-
-        private string GetPagedResultsByQueryWhere()
-        {
-            if (_pagedResultsByQueryWhere == null)
-                _pagedResultsByQueryWhere = " AND ("
-                    + $"({SqlSyntax.GetQuotedTableName("umbracoNode")}.{SqlSyntax.GetQuotedColumnName("text")} LIKE @0)"
-                    + " OR "
-                    + $"({SqlSyntax.GetQuotedTableName("cmsMember")}.{SqlSyntax.GetQuotedColumnName("LoginName")} LIKE @0)"
-                    + ")";
-
-            return _pagedResultsByQueryWhere;
-        }
-
-        protected override string GetDatabaseFieldNameForOrderBy(string orderBy)
-        {
-            //Some custom ones
-            switch (orderBy.ToUpperInvariant())
-            {
-                case "EMAIL":
-                    return GetDatabaseFieldNameForOrderBy("cmsMember", "email");
-                case "LOGINNAME":
-                    return GetDatabaseFieldNameForOrderBy("cmsMember", "loginName");
-                case "USERNAME":
-                    return GetDatabaseFieldNameForOrderBy("cmsMember", "loginName");
-            }
-
-            return base.GetDatabaseFieldNameForOrderBy(orderBy);
-        }
-
-        private IEnumerable<IMember> MapDtosToContent(List<MemberDto> dtos, bool withCache = false)
-        {
-            var temps = new List<TempContent<Member>>();
-            var contentTypes = new Dictionary<int, IMemberType>();
-            var content = new Member[dtos.Count];
-
-            for (var i = 0; i < dtos.Count; i++)
-            {
-                var dto = dtos[i];
-
-                if (withCache)
-                {
-                    // if the cache contains the (proper version of the) item, use it
-                    var cached = IsolatedCache.GetCacheItem<IMember>(GetCacheIdKey<IMember>(dto.NodeId));
-                    if (cached != null && cached.VersionId == dto.ContentVersionDto.Id)
-                    {
-                        content[i] = (Member) cached; // fixme should we just cache Content not IContent?
-                        continue;
-                    }
-                }
-
-                // else, need to build it
-
-                // get the content type - the repository is full cache *but* still deep-clones
-                // whatever comes out of it, so use our own local index here to avoid this
-                var contentTypeId = dto.ContentDto.ContentTypeId;
-                if (contentTypes.TryGetValue(contentTypeId, out var contentType) == false)
-                    contentTypes[contentTypeId] = contentType = _memberTypeRepository.Get(contentTypeId);
-
-                var c = content[i] = ContentBaseFactory.BuildEntity(dto, contentType);
-
-                // need properties
-                var versionId = dto.ContentVersionDto.Id;
-                temps.Add(new TempContent<Member>(dto.NodeId, versionId, 0, contentType, c));
-            }
-
-            // load all properties for all documents from database in 1 query - indexed by version id
-            var properties = GetPropertyCollections(temps);
-
-            // assign properites
-            foreach (var temp in temps)
-            {
-                temp.Content.Properties = properties[temp.VersionId];
-
-                // reset dirty initial properties (U4-1946)
-                temp.Content.ResetDirtyProperties(false);
-            }
-
-            return content;
-        }
-
-        private IMember MapDtoToContent(MemberDto dto)
-        {
-            var memberType = _memberTypeRepository.Get(dto.ContentDto.ContentTypeId);
-            var member = ContentBaseFactory.BuildEntity(dto, memberType);
-
-            // get properties - indexed by version id
-            var versionId = dto.ContentVersionDto.Id;
-            var temp = new TempContent<Member>(dto.ContentDto.NodeId,versionId, 0, memberType);
-            var properties = GetPropertyCollections(new List<TempContent<Member>> { temp });
-            member.Properties = properties[versionId];
-
-            // reset dirty initial properties (U4-1946)
-            member.ResetDirtyProperties(false);
-            return member;
-        }
-    }
-}
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using Microsoft.AspNet.Identity;
+using NPoco;
+using Umbraco.Core.Cache;
+using Umbraco.Core.Logging;
+using Umbraco.Core.Models;
+using Umbraco.Core.Models.Rdbms;
+using Umbraco.Core.Persistence.DatabaseModelDefinitions;
+using Umbraco.Core.Persistence.Factories;
+using Umbraco.Core.Persistence.Querying;
+using Umbraco.Core.Persistence.UnitOfWork;
+
+namespace Umbraco.Core.Persistence.Repositories.Implement
+{
+    /// <summary>
+    /// Represents a repository for doing CRUD operations for <see cref="IMember"/>
+    /// </summary>
+    internal class MemberRepository : ContentRepositoryBase<int, IMember, MemberRepository>, IMemberRepository
+    {
+        private readonly IMemberTypeRepository _memberTypeRepository;
+        private readonly ITagRepository _tagRepository;
+        private readonly IMemberGroupRepository _memberGroupRepository;
+
+        public MemberRepository(IScopeUnitOfWork work, CacheHelper cache, ILogger logger, IMemberTypeRepository memberTypeRepository, IMemberGroupRepository memberGroupRepository, ITagRepository tagRepository)
+            : base(work, cache, logger)
+        {
+            _memberTypeRepository = memberTypeRepository ?? throw new ArgumentNullException(nameof(memberTypeRepository));
+            _tagRepository = tagRepository ?? throw new ArgumentNullException(nameof(tagRepository));
+            _memberGroupRepository = memberGroupRepository;
+        }
+
+        protected override MemberRepository This => this;
+
+        public override int RecycleBinId => throw new NotSupportedException();
+
+        #region Repository Base
+
+        protected override Guid NodeObjectTypeId => Constants.ObjectTypes.Member;
+
+        protected override IMember PerformGet(int id)
+        {
+            var sql = GetBaseQuery(QueryType.Single)
+                .Where<NodeDto>(x => x.NodeId == id)
+                .SelectTop(1);
+
+            var dto = Database.Fetch<MemberDto>(sql).FirstOrDefault();
+            return dto == null
+                ? null
+                : MapDtoToContent(dto);
+        }
+
+        protected override IEnumerable<IMember> PerformGetAll(params int[] ids)
+        {
+            var sql = GetBaseQuery(QueryType.Many);
+
+            if (ids.Any())
+                sql.WhereIn<NodeDto>(x => x.NodeId, ids);
+
+            return MapDtosToContent(Database.Fetch<MemberDto>(sql));
+        }
+
+        protected override IEnumerable<IMember> PerformGetByQuery(IQuery<IMember> query)
+        {
+            var baseQuery = GetBaseQuery(false);
+
+            // fixme why is this different from content/media?!
+            // check if the query is based on properties or not
+
+            var wheres = query.GetWhereClauses();
+            //this is a pretty rudimentary check but wil work, we just need to know if this query requires property
+            // level queries
+            if (wheres.Any(x => x.Item1.Contains("cmsPropertyType")))
+            {
+                var sqlWithProps = GetNodeIdQueryWithPropertyData();
+                var translator = new SqlTranslator<IMember>(sqlWithProps, query);
+                var sql = translator.Translate();
+
+                baseQuery.Append("WHERE umbracoNode.id IN (" + sql.SQL + ")", sql.Arguments)
+                    .OrderBy<NodeDto>(x => x.SortOrder);
+
+                return MapDtosToContent(Database.Fetch<MemberDto>(baseQuery));
+            }
+            else
+            {
+                var translator = new SqlTranslator<IMember>(baseQuery, query);
+                var sql = translator.Translate()
+                    .OrderBy<NodeDto>(x => x.SortOrder);
+
+                return MapDtosToContent(Database.Fetch<MemberDto>(sql));
+            }
+
+        }
+
+        protected override Sql<ISqlContext> GetBaseQuery(QueryType queryType)
+        {
+            return GetBaseQuery(queryType, true);
+        }
+
+        protected virtual Sql<ISqlContext> GetBaseQuery(QueryType queryType, bool current)
+        {
+            var sql = SqlContext.Sql();
+
+            switch (queryType) // FIXME pretend we still need these queries for now
+            {
+                case QueryType.Count:
+                    sql = sql.SelectCount();
+                    break;
+                case QueryType.Ids:
+                    sql = sql.Select<MemberDto>(x => x.NodeId);
+                    break;
+                case QueryType.Single:
+                case QueryType.Many:
+                    sql = sql.Select<MemberDto>(r =>
+                        r.Select(x => x.ContentVersionDto)
+                         .Select(x => x.ContentDto, r1 =>
+                            r1.Select(x => x.NodeDto)));
+                    break;
+            }
+
+            sql
+                .From<MemberDto>()
+                .InnerJoin<ContentDto>().On<MemberDto, ContentDto>(left => left.NodeId, right => right.NodeId)
+                .InnerJoin<NodeDto>().On<ContentDto, NodeDto>(left => left.NodeId, right => right.NodeId)
+                .InnerJoin<ContentVersionDto>().On<ContentDto, ContentVersionDto>(left => left.NodeId, right => right.NodeId)
+
+                // joining the type so we can do a query against the member type - not sure if this adds much overhead or not?
+                // the execution plan says it doesn't so we'll go with that and in that case, it might be worth joining the content
+                // types by default on the document and media repo's so we can query by content type there too.
+                .InnerJoin<ContentTypeDto>().On<ContentDto, ContentTypeDto>(left => left.ContentTypeId, right => right.NodeId);
+
+            sql.Where<NodeDto>(x => x.NodeObjectType == NodeObjectTypeId);
+
+            if (current)
+                sql.Where<ContentVersionDto>(x => x.Current); // always get the current version
+
+            return sql;
+        }
+
+        // fixme - move that one up to Versionable! or better: kill it!
+        protected override Sql<ISqlContext> GetBaseQuery(bool isCount)
+        {
+            return GetBaseQuery(isCount ? QueryType.Count : QueryType.Single);
+        }
+
+        protected override string GetBaseWhereClause() // fixme - can we kill / refactor this?
+        {
+            return "umbracoNode.id = @id";
+        }
+
+        // fixme wtf?
+        protected Sql<ISqlContext> GetNodeIdQueryWithPropertyData()
+        {
+            return Sql()
+                .Select("DISTINCT(umbracoNode.id)")
+                .From<NodeDto>()
+                .InnerJoin<ContentDto>().On<NodeDto, ContentDto>((left, right) => left.NodeId == right.NodeId)
+                .InnerJoin<ContentTypeDto>().On<ContentDto, ContentTypeDto>((left, right) => left.ContentTypeId == right.NodeId)
+                .InnerJoin<ContentVersionDto>().On<NodeDto, ContentVersionDto>((left, right) => left.NodeId == right.NodeId)
+                .InnerJoin<MemberDto>().On<ContentDto, MemberDto>((left, right) => left.NodeId == right.NodeId)
+
+                .LeftJoin<PropertyTypeDto>().On<ContentDto, PropertyTypeDto>(left => left.ContentTypeId, right => right.ContentTypeId)
+                .LeftJoin<DataTypeDto>().On<PropertyTypeDto, DataTypeDto>(left => left.DataTypeId, right => right.DataTypeId)
+
+                .LeftJoin<PropertyDataDto>().On(x => x
+                    .Where<PropertyDataDto, PropertyTypeDto>((left, right) => left.PropertyTypeId == right.Id)
+                    .Where<PropertyDataDto, ContentVersionDto>((left, right) => left.VersionId == right.Id))
+
+                .Where<NodeDto>(x => x.NodeObjectType == NodeObjectTypeId);
+        }
+
+        protected override IEnumerable<string> GetDeleteClauses()
+        {
+            var list = new List<string>
+            {
+                "DELETE FROM cmsTask WHERE nodeId = @id",
+                "DELETE FROM umbracoUser2NodeNotify WHERE nodeId = @id",
+                "DELETE FROM umbracoUserGroup2NodePermission WHERE nodeId = @id",
+                "DELETE FROM umbracoRelation WHERE parentId = @id",
+                "DELETE FROM umbracoRelation WHERE childId = @id",
+                "DELETE FROM cmsTagRelationship WHERE nodeId = @id",
+                "DELETE FROM " + Constants.DatabaseSchema.Tables.PropertyData + " WHERE versionId IN (SELECT id FROM " + Constants.DatabaseSchema.Tables.ContentVersion + " WHERE nodeId = @id)",
+                "DELETE FROM cmsMember2MemberGroup WHERE Member = @id",
+                "DELETE FROM cmsMember WHERE nodeId = @id",
+                "DELETE FROM " + Constants.DatabaseSchema.Tables.ContentVersion + " WHERE nodeId = @id",
+                "DELETE FROM cmsContentXml WHERE nodeId = @id",
+                "DELETE FROM " + Constants.DatabaseSchema.Tables.Content + " WHERE nodeId = @id",
+                "DELETE FROM umbracoNode WHERE id = @id"
+            };
+            return list;
+        }
+
+        #endregion
+
+        #region Versions
+
+        public override IEnumerable<IMember> GetAllVersions(int nodeId)
+        {
+            var sql = GetBaseQuery(QueryType.Many, false)
+                .Where<NodeDto>(x => x.NodeId == nodeId)
+                .OrderByDescending<ContentVersionDto>(x => x.Current)
+                .AndByDescending<ContentVersionDto>(x => x.VersionDate);
+
+            return MapDtosToContent(Database.Fetch<MemberDto>(sql), true);
+        }
+
+        public override IMember GetVersion(int versionId)
+        {
+            var sql = GetBaseQuery(QueryType.Single)
+                .Where<ContentVersionDto>(x => x.Id == versionId);
+
+            var dto = Database.Fetch<MemberDto>(sql).FirstOrDefault();
+            return dto == null ? null : MapDtoToContent(dto);
+        }
+
+        protected override void PerformDeleteVersion(int id, int versionId)
+        {
+            // raise event first else potential FK issues
+            OnUowRemovingVersion(new UnitOfWorkVersionEventArgs(UnitOfWork, id, versionId));
+
+            Database.Delete<PropertyDataDto>("WHERE versionId = @VersionId", new { versionId });
+            Database.Delete<ContentVersionDto>("WHERE versionId = @VersionId", new { versionId });
+        }
+
+        #endregion
+
+        #region Persist
+
+        protected override void PersistNewItem(IMember entity)
+        {
+            var member = (Member) entity;
+            member.AddingEntity();
+
+            // ensure that strings don't contain characters that are invalid in xml
+            // fixme - do we really want to keep doing this here?
+            entity.SanitizeEntityPropertiesForXmlStorage();
+
+            // create the dto
+            var dto = ContentBaseFactory.BuildDto(entity);
+
+            // derive path and level from parent
+            var parent = GetParentNodeDto(entity.ParentId);
+            var level = parent.Level + 1;
+
+            // get sort order
+            var sortOrder = GetNewChildSortOrder(entity.ParentId, 0);
+
+            // persist the node dto
+            var nodeDto = dto.ContentDto.NodeDto;
+            nodeDto.Path = parent.Path;
+            nodeDto.Level = Convert.ToInt16(level);
+            nodeDto.SortOrder = sortOrder;
+
+            // see if there's a reserved identifier for this unique id
+            // and then either update or insert the node dto
+            var id = GetReservedId(nodeDto.UniqueId);
+            if (id > 0)
+            {
+                nodeDto.NodeId = id;
+                nodeDto.Path = string.Concat(parent.Path, ",", nodeDto.NodeId);
+                nodeDto.ValidatePathWithException();
+                Database.Update(nodeDto);
+            }
+            else
+            {
+                Database.Insert(nodeDto);
+
+                // update path, now that we have an id
+                nodeDto.Path = string.Concat(parent.Path, ",", nodeDto.NodeId);
+                nodeDto.ValidatePathWithException();
+                Database.Update(nodeDto);
+            }
+
+            // update entity
+            entity.Id = nodeDto.NodeId;
+            entity.Path = nodeDto.Path;
+            entity.SortOrder = sortOrder;
+            entity.Level = level;
+
+            // persist the content dto
+            var contentDto = dto.ContentDto;
+            contentDto.NodeId = nodeDto.NodeId;
+            Database.Insert(contentDto);
+
+            // persist the content version dto
+            // assumes a new version id and version date (modified date) has been set
+            var contentVersionDto = dto.ContentVersionDto;
+            contentVersionDto.NodeId = nodeDto.NodeId;
+            contentVersionDto.Current = true;
+            Database.Insert(contentVersionDto);
+            member.VersionId = contentVersionDto.Id;
+
+            // persist the member dto
+            dto.NodeId = nodeDto.NodeId;
+
+            // if the password is empty, generate one with the special prefix
+            // this will hash the guid with a salt so should be nicely random
+            if (entity.RawPasswordValue.IsNullOrWhiteSpace())
+            {
+                var aspHasher = new PasswordHasher();
+                dto.Password = Constants.Security.EmptyPasswordPrefix + aspHasher.HashPassword(Guid.NewGuid().ToString("N"));
+                entity.RawPasswordValue = dto.Password;
+            }
+
+            Database.Insert(dto);
+
+            // persist the property data
+            var propertyDataDtos = PropertyFactory.BuildDtos(member.VersionId, 0, entity.Properties, out _);
+            foreach (var propertyDataDto in propertyDataDtos)
+                Database.Insert(propertyDataDto);
+
+            UpdateEntityTags(entity, _tagRepository);
+
+            OnUowRefreshedEntity(new UnitOfWorkEntityEventArgs(UnitOfWork, entity));
+
+            entity.ResetDirtyProperties();
+        }
+
+        protected override void PersistUpdatedItem(IMember entity)
+        {
+            var member = (Member) entity;
+
+            // update
+            member.UpdatingEntity();
+
+            // ensure that strings don't contain characters that are invalid in xml
+            // fixme - do we really want to keep doing this here?
+            entity.SanitizeEntityPropertiesForXmlStorage();
+
+            // if parent has changed, get path, level and sort order
+            if (entity.IsPropertyDirty("ParentId"))
+            {
+                var parent = GetParentNodeDto(entity.ParentId);
+
+                entity.Path = string.Concat(parent.Path, ",", entity.Id);
+                entity.Level = parent.Level + 1;
+                entity.SortOrder = GetNewChildSortOrder(entity.ParentId, 0);
+            }
+
+            // create the dto
+            var dto = ContentBaseFactory.BuildDto(entity);
+
+            // update the node dto
+            var nodeDto = dto.ContentDto.NodeDto;
+            Database.Update(nodeDto);
+
+            // update the content dto
+            Database.Update(dto.ContentDto);
+
+            // update the content version dto
+            Database.Update(dto.ContentVersionDto);
+
+            // update the member dto
+            // but only the changed columns, 'cos we cannot update password if empty
+            var changedCols = new List<string>();
+
+            if (entity.IsPropertyDirty("Email"))
+                changedCols.Add("Email");
+
+            if (entity.IsPropertyDirty("Username"))
+                changedCols.Add("LoginName");
+
+            // do NOT update the password if it has not changed or if it is null or empty
+            if (entity.IsPropertyDirty("RawPasswordValue") && !string.IsNullOrWhiteSpace(entity.RawPasswordValue))
+                changedCols.Add("Password");
+
+            if (changedCols.Count > 0)
+                Database.Update(dto, changedCols);
+
+            // replace the property data
+            var deletePropertyDataSql = SqlContext.Sql().Delete<PropertyDataDto>().Where<PropertyDataDto>(x => x.VersionId == member.VersionId);
+            Database.Execute(deletePropertyDataSql);
+            var propertyDataDtos = PropertyFactory.BuildDtos(member.VersionId, 0, entity.Properties, out _);
+            foreach (var propertyDataDto in propertyDataDtos)
+                Database.Insert(propertyDataDto);
+
+            UpdateEntityTags(entity, _tagRepository);
+
+            OnUowRefreshedEntity(new UnitOfWorkEntityEventArgs(UnitOfWork, entity));
+
+            entity.ResetDirtyProperties();
+        }
+
+        protected override void PersistDeletedItem(IMember entity)
+        {
+            // raise event first else potential FK issues
+            OnUowRemovingEntity(new UnitOfWorkEntityEventArgs(UnitOfWork, entity));
+            base.PersistDeletedItem(entity);
+        }
+
+        #endregion
+
+        public IEnumerable<IMember> FindMembersInRole(string roleName, string usernameToMatch, StringPropertyMatchType matchType = StringPropertyMatchType.StartsWith)
+        {
+            //get the group id
+            var grpQry = Query<IMemberGroup>().Where(group => group.Name.Equals(roleName));
+            var memberGroup = _memberGroupRepository.Get(grpQry).FirstOrDefault();
+            if (memberGroup == null) return Enumerable.Empty<IMember>();
+
+            // get the members by username
+            var query = Query<IMember>();
+            switch (matchType)
+            {
+                case StringPropertyMatchType.Exact:
+                    query.Where(member => member.Username.Equals(usernameToMatch));
+                    break;
+                case StringPropertyMatchType.Contains:
+                    query.Where(member => member.Username.Contains(usernameToMatch));
+                    break;
+                case StringPropertyMatchType.StartsWith:
+                    query.Where(member => member.Username.StartsWith(usernameToMatch));
+                    break;
+                case StringPropertyMatchType.EndsWith:
+                    query.Where(member => member.Username.EndsWith(usernameToMatch));
+                    break;
+                case StringPropertyMatchType.Wildcard:
+                    query.Where(member => member.Username.SqlWildcard(usernameToMatch, TextColumnType.NVarchar));
+                    break;
+                default:
+                    throw new ArgumentOutOfRangeException(nameof(matchType));
+            }
+            var matchedMembers = Get(query).ToArray();
+
+            var membersInGroup = new List<IMember>();
+            //then we need to filter the matched members that are in the role
+            //since the max sql params are 2100 on sql server, we'll reduce that to be safe for potentially other servers and run the queries in batches
+            var inGroups = matchedMembers.InGroupsOf(1000);
+            foreach (var batch in inGroups)
+            {
+                var memberIdBatch = batch.Select(x => x.Id);
+                var sql = Sql().SelectAll().From<Member2MemberGroupDto>()
+                    .Where<Member2MemberGroupDto>(dto => dto.MemberGroup == memberGroup.Id)
+                    .Where("Member IN (@memberIds)", new { memberIds = memberIdBatch });
+                var memberIdsInGroup = Database.Fetch<Member2MemberGroupDto>(sql)
+                    .Select(x => x.Member).ToArray();
+
+                membersInGroup.AddRange(matchedMembers.Where(x => memberIdsInGroup.Contains(x.Id)));
+            }
+
+            return membersInGroup;
+
+        }
+
+        /// <summary>
+        /// Get all members in a specific group
+        /// </summary>
+        /// <param name="groupName"></param>
+        /// <returns></returns>
+        public IEnumerable<IMember> GetByMemberGroup(string groupName)
+        {
+            var grpQry = Query<IMemberGroup>().Where(group => group.Name.Equals(groupName));
+            var memberGroup = _memberGroupRepository.Get(grpQry).FirstOrDefault();
+            if (memberGroup == null) return Enumerable.Empty<IMember>();
+
+            var subQuery = Sql().Select("Member").From<Member2MemberGroupDto>().Where<Member2MemberGroupDto>(dto => dto.MemberGroup == memberGroup.Id);
+
+            var sql = GetBaseQuery(false)
+                //TODO: An inner join would be better, though I've read that the query optimizer will always turn a
+                // subquery with an IN clause into an inner join anyways.
+                .Append("WHERE umbracoNode.id IN (" + subQuery.SQL + ")", subQuery.Arguments)
+                .OrderByDescending<ContentVersionDto>(x => x.VersionDate)
+                .OrderBy<NodeDto>(x => x.SortOrder);
+
+            return MapDtosToContent(Database.Fetch<MemberDto>(sql));
+
+        }
+
+        public bool Exists(string username)
+        {
+            var sql = Sql()
+                .SelectCount()
+                .From<MemberDto>()
+                .Where<MemberDto>(x => x.LoginName == username);
+
+            return Database.ExecuteScalar<int>(sql) > 0;
+        }
+
+        public int GetCountByQuery(IQuery<IMember> query)
+        {
+            var sqlWithProps = GetNodeIdQueryWithPropertyData();
+            var translator = new SqlTranslator<IMember>(sqlWithProps, query);
+            var sql = translator.Translate();
+
+            //get the COUNT base query
+            var fullSql = GetBaseQuery(true)
+                .Append(new Sql("WHERE umbracoNode.id IN (" + sql.SQL + ")", sql.Arguments));
+
+            return Database.ExecuteScalar<int>(fullSql);
+        }
+
+        /// <summary>
+        /// Gets paged member results.
+        /// </summary>
+        public override IEnumerable<IMember> GetPage(IQuery<IMember> query, long pageIndex, int pageSize, out long totalRecords,
+            string orderBy, Direction orderDirection, bool orderBySystemField, IQuery<IMember> filter = null)
+        {
+            Sql<ISqlContext> filterSql = null;
+
+            if (filter != null)
+            {
+                filterSql = Sql();
+                foreach (var clause in filter.GetWhereClauses())
+                    filterSql = filterSql.Append($"AND ({clause.Item1})", clause.Item2);
+            }
+
+            return GetPagedResultsByQuery<MemberDto>(query, pageIndex, pageSize, out totalRecords,
+                x => MapDtosToContent(x), orderBy, orderDirection, orderBySystemField,
+                filterSql);
+        }
+
+        private string _pagedResultsByQueryWhere;
+
+        private string GetPagedResultsByQueryWhere()
+        {
+            if (_pagedResultsByQueryWhere == null)
+                _pagedResultsByQueryWhere = " AND ("
+                    + $"({SqlSyntax.GetQuotedTableName("umbracoNode")}.{SqlSyntax.GetQuotedColumnName("text")} LIKE @0)"
+                    + " OR "
+                    + $"({SqlSyntax.GetQuotedTableName("cmsMember")}.{SqlSyntax.GetQuotedColumnName("LoginName")} LIKE @0)"
+                    + ")";
+
+            return _pagedResultsByQueryWhere;
+        }
+
+        protected override string GetDatabaseFieldNameForOrderBy(string orderBy)
+        {
+            //Some custom ones
+            switch (orderBy.ToUpperInvariant())
+            {
+                case "EMAIL":
+                    return GetDatabaseFieldNameForOrderBy("cmsMember", "email");
+                case "LOGINNAME":
+                    return GetDatabaseFieldNameForOrderBy("cmsMember", "loginName");
+                case "USERNAME":
+                    return GetDatabaseFieldNameForOrderBy("cmsMember", "loginName");
+            }
+
+            return base.GetDatabaseFieldNameForOrderBy(orderBy);
+        }
+
+        private IEnumerable<IMember> MapDtosToContent(List<MemberDto> dtos, bool withCache = false)
+        {
+            var temps = new List<TempContent<Member>>();
+            var contentTypes = new Dictionary<int, IMemberType>();
+            var content = new Member[dtos.Count];
+
+            for (var i = 0; i < dtos.Count; i++)
+            {
+                var dto = dtos[i];
+
+                if (withCache)
+                {
+                    // if the cache contains the (proper version of the) item, use it
+                    var cached = IsolatedCache.GetCacheItem<IMember>(RepositoryCacheKeys.GetKey<IMember>(dto.NodeId));
+                    if (cached != null && cached.VersionId == dto.ContentVersionDto.Id)
+                    {
+                        content[i] = (Member) cached; // fixme should we just cache Content not IContent?
+                        continue;
+                    }
+                }
+
+                // else, need to build it
+
+                // get the content type - the repository is full cache *but* still deep-clones
+                // whatever comes out of it, so use our own local index here to avoid this
+                var contentTypeId = dto.ContentDto.ContentTypeId;
+                if (contentTypes.TryGetValue(contentTypeId, out var contentType) == false)
+                    contentTypes[contentTypeId] = contentType = _memberTypeRepository.Get(contentTypeId);
+
+                var c = content[i] = ContentBaseFactory.BuildEntity(dto, contentType);
+
+                // need properties
+                var versionId = dto.ContentVersionDto.Id;
+                temps.Add(new TempContent<Member>(dto.NodeId, versionId, 0, contentType, c));
+            }
+
+            // load all properties for all documents from database in 1 query - indexed by version id
+            var properties = GetPropertyCollections(temps);
+
+            // assign properites
+            foreach (var temp in temps)
+            {
+                temp.Content.Properties = properties[temp.VersionId];
+
+                // reset dirty initial properties (U4-1946)
+                temp.Content.ResetDirtyProperties(false);
+            }
+
+            return content;
+        }
+
+        private IMember MapDtoToContent(MemberDto dto)
+        {
+            var memberType = _memberTypeRepository.Get(dto.ContentDto.ContentTypeId);
+            var member = ContentBaseFactory.BuildEntity(dto, memberType);
+
+            // get properties - indexed by version id
+            var versionId = dto.ContentVersionDto.Id;
+            var temp = new TempContent<Member>(dto.ContentDto.NodeId,versionId, 0, memberType);
+            var properties = GetPropertyCollections(new List<TempContent<Member>> { temp });
+            member.Properties = properties[versionId];
+
+            // reset dirty initial properties (U4-1946)
+            member.ResetDirtyProperties(false);
+            return member;
+        }
+    }
+}
diff --git a/src/Umbraco.Core/Persistence/Repositories/MemberTypeRepository.cs b/src/Umbraco.Core/Persistence/Repositories/Implement/MemberTypeRepository.cs
similarity index 95%
rename from src/Umbraco.Core/Persistence/Repositories/MemberTypeRepository.cs
rename to src/Umbraco.Core/Persistence/Repositories/Implement/MemberTypeRepository.cs
index b02b2a0069..6e753c8e69 100644
--- a/src/Umbraco.Core/Persistence/Repositories/MemberTypeRepository.cs
+++ b/src/Umbraco.Core/Persistence/Repositories/Implement/MemberTypeRepository.cs
@@ -1,382 +1,380 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using NPoco;
-using Umbraco.Core.Cache;
-using Umbraco.Core.Logging;
-using Umbraco.Core.Models;
-using Umbraco.Core.Models.Rdbms;
-
-using Umbraco.Core.Persistence.Factories;
-using Umbraco.Core.Persistence.Mappers;
-using Umbraco.Core.Persistence.Querying;
-using Umbraco.Core.Persistence.UnitOfWork;
-
-namespace Umbraco.Core.Persistence.Repositories
-{
-    /// <summary>
-    /// Represents a repository for doing CRUD operations for <see cref="IMemberType"/>
-    /// </summary>
-    internal class MemberTypeRepository : ContentTypeRepositoryBase<IMemberType>, IMemberTypeRepository
-    {
-        private IRepositoryCachePolicy<IMemberType, int> _cachePolicy;
-
-        public MemberTypeRepository(IScopeUnitOfWork work, CacheHelper cache, ILogger logger)
-            : base(work, cache, logger)
-        { }
-
-        protected override bool IsPublishing => MemberType.IsPublishingConst;
-
-        protected override IRepositoryCachePolicy<IMemberType, int> CreateCachePolicy(IRuntimeCacheProvider runtimeCache)
-        {
-            return new FullDataSetRepositoryCachePolicy<IMemberType, int>(runtimeCache, GetEntityId, /*expires:*/ true);
-        }
-
-        protected override IMemberType PerformGet(int id)
-        {
-            //use the underlying GetAll which will force cache all content types
-            return GetAll().FirstOrDefault(x => x.Id == id);
-        }
-
-        protected override IMemberType PerformGet(Guid id)
-        {
-            //use the underlying GetAll which will force cache all content types
-            return GetAll().FirstOrDefault(x => x.Key == id);
-        }
-
-        protected override IEnumerable<IMemberType> PerformGetAll(params Guid[] ids)
-        {
-            //use the underlying GetAll which will force cache all content types
-
-            if (ids.Any())
-            {
-                return GetAll().Where(x => ids.Contains(x.Key));
-            }
-            else
-            {
-                return GetAll();
-            }
-        }
-
-        protected override bool PerformExists(Guid id)
-        {
-            return GetAll().FirstOrDefault(x => x.Key == id) != null;
-        }
-
-        protected override IMemberType PerformGet(string alias)
-        {
-            //use the underlying GetAll which will force cache all content types
-            return GetAll().FirstOrDefault(x => x.Alias.InvariantEquals(alias));
-        }
-
-        protected override IEnumerable<IMemberType> PerformGetAll(params int[] ids)
-        {
-            var sql = GetBaseQuery(false);
-            if (ids.Any())
-            {
-                //NOTE: This logic should never be executed according to our cache policy
-                var statement = string.Join(" OR ", ids.Select(x => string.Format("umbracoNode.id='{0}'", x)));
-                sql.Where(statement);
-            }
-            sql.OrderByDescending<NodeDto>(x => x.NodeId);
-
-            var dtos = Database
-                .Fetch<MemberTypeReadOnlyDto>(sql) // cannot use FetchOneToMany because we have 2 collections!
-                .Transform(MapOneToManies)
-                .ToList();
-
-            return BuildFromDtos(dtos);
-        }
-
-        protected override IEnumerable<IMemberType> PerformGetByQuery(IQuery<IMemberType> query)
-        {
-            var sqlSubquery = GetSubquery();
-            var translator = new SqlTranslator<IMemberType>(sqlSubquery, query);
-            var subquery = translator.Translate();
-            var sql = GetBaseQuery(false)
-                .Append("WHERE umbracoNode.id IN (" + subquery.SQL + ")", subquery.Arguments)
-                .OrderBy<NodeDto>(x => x.SortOrder);
-
-            var dtos = Database
-                .Fetch<MemberTypeReadOnlyDto>(sql) // cannot use FetchOneToMany because we have 2 collections!
-                .Transform(MapOneToManies)
-                .ToList();
-
-            return BuildFromDtos(dtos);
-        }
-
-        private IEnumerable<MemberTypeReadOnlyDto> MapOneToManies(IEnumerable<MemberTypeReadOnlyDto> dtos)
-        {
-            MemberTypeReadOnlyDto acc = null;
-            foreach (var dto in dtos)
-            {
-                if (acc == null)
-                {
-                    acc = dto;
-                }
-                else if (acc.UniqueId == dto.UniqueId)
-                {
-                    var prop = dto.PropertyTypes.SingleOrDefault();
-                    var group = dto.PropertyTypeGroups.SingleOrDefault();
-
-                    if (prop != null && prop.Id.HasValue && acc.PropertyTypes.Any(x => x.Id == prop.Id.Value) == false)
-                        acc.PropertyTypes.Add(prop);
-
-                    if (group != null && group.Id.HasValue && acc.PropertyTypeGroups.Any(x => x.Id == group.Id.Value) == false)
-                        acc.PropertyTypeGroups.Add(group);
-                }
-                else
-                {
-                    yield return acc;
-                    acc = dto;
-                }
-            }
-
-            if (acc != null)
-                yield return acc;
-        }
-
-        protected override Sql<ISqlContext> GetBaseQuery(bool isCount)
-        {
-            if (isCount)
-            {
-                return Sql()
-                    .SelectCount()
-                    .From<NodeDto>()
-                    .InnerJoin<ContentTypeDto>().On<ContentTypeDto, NodeDto>(left => left.NodeId, right => right.NodeId)
-                    .Where<NodeDto>(x => x.NodeObjectType == NodeObjectTypeId);
-            }
-
-            var sql = Sql()
-                .Select("umbracoNode.*", "cmsContentType.*", "cmsPropertyType.id AS PropertyTypeId", "cmsPropertyType.Alias",
-                    "cmsPropertyType.Name", "cmsPropertyType.Description", "cmsPropertyType.mandatory", "cmsPropertyType.UniqueID",
-                    "cmsPropertyType.validationRegExp", "cmsPropertyType.dataTypeId", "cmsPropertyType.sortOrder AS PropertyTypeSortOrder",
-                    "cmsPropertyType.propertyTypeGroupId AS PropertyTypesGroupId", "cmsMemberType.memberCanEdit", "cmsMemberType.viewOnProfile",
-                    "cmsDataType.propertyEditorAlias", "cmsDataType.dbType", "cmsPropertyTypeGroup.id AS PropertyTypeGroupId",
-                    "cmsPropertyTypeGroup.text AS PropertyGroupName", "cmsPropertyTypeGroup.uniqueID AS PropertyGroupUniqueID",
-                    "cmsPropertyTypeGroup.sortorder AS PropertyGroupSortOrder", "cmsPropertyTypeGroup.contenttypeNodeId")
-                .From<NodeDto>()
-                .InnerJoin<ContentTypeDto>().On<ContentTypeDto, NodeDto>(left => left.NodeId, right => right.NodeId)
-                .LeftJoin<PropertyTypeDto>().On<PropertyTypeDto, NodeDto>(left => left.ContentTypeId, right => right.NodeId)
-                .LeftJoin<MemberTypeDto>().On<MemberTypeDto, PropertyTypeDto>(left => left.PropertyTypeId, right => right.Id)
-                .LeftJoin<DataTypeDto>().On<DataTypeDto, PropertyTypeDto>(left => left.DataTypeId, right => right.DataTypeId)
-                .LeftJoin<PropertyTypeGroupDto>().On<PropertyTypeGroupDto, NodeDto>(left => left.ContentTypeNodeId, right => right.NodeId)
-                .Where<NodeDto>(x => x.NodeObjectType == NodeObjectTypeId);
-
-            return sql;
-        }
-
-        protected Sql<ISqlContext> GetSubquery()
-        {
-            var sql = Sql()
-                .Select("DISTINCT(umbracoNode.id)")
-                .From<NodeDto>()
-                .InnerJoin<ContentTypeDto>().On<ContentTypeDto, NodeDto>(left => left.NodeId, right => right.NodeId)
-                .LeftJoin<PropertyTypeDto>().On<PropertyTypeDto, NodeDto>(left => left.ContentTypeId, right => right.NodeId)
-                .LeftJoin<MemberTypeDto>().On<MemberTypeDto, PropertyTypeDto>(left => left.PropertyTypeId, right => right.Id)
-                .LeftJoin<DataTypeDto>().On<DataTypeDto, PropertyTypeDto>(left => left.DataTypeId, right => right.DataTypeId)
-                .LeftJoin<PropertyTypeGroupDto>().On<PropertyTypeGroupDto, NodeDto>(left => left.ContentTypeNodeId, right => right.NodeId)
-                .Where<NodeDto>(x => x.NodeObjectType == NodeObjectTypeId);
-            return sql;
-        }
-
-        protected override string GetBaseWhereClause()
-        {
-            return "umbracoNode.id = @id";
-        }
-
-        protected override IEnumerable<string> GetDeleteClauses()
-        {
-            var l = (List<string>) base.GetDeleteClauses(); // we know it's a list
-            l.Add("DELETE FROM cmsMemberType WHERE NodeId = @id");
-            l.Add("DELETE FROM cmsContentType WHERE nodeId = @id");
-            l.Add("DELETE FROM umbracoNode WHERE id = @id");
-            return l;
-        }
-
-        protected override Guid NodeObjectTypeId => Constants.ObjectTypes.MemberType;
-
-        protected override void PersistNewItem(IMemberType entity)
-        {
-            ValidateAlias(entity);
-
-            ((MemberType)entity).AddingEntity();
-
-            //set a default icon if one is not specified
-            if (entity.Icon.IsNullOrWhiteSpace())
-            {
-                entity.Icon = "icon-user";
-            }
-
-            //By Convention we add 9 stnd PropertyTypes to an Umbraco MemberType
-            entity.AddPropertyGroup(Constants.Conventions.Member.StandardPropertiesGroupName);
-            var standardPropertyTypes = Constants.Conventions.Member.GetStandardPropertyTypeStubs();
-            foreach (var standardPropertyType in standardPropertyTypes)
-            {
-                entity.AddPropertyType(standardPropertyType.Value, Constants.Conventions.Member.StandardPropertiesGroupName);
-            }
-
-            var factory = new ContentTypeFactory();
-
-            EnsureExplicitDataTypeForBuiltInProperties(entity);
-            PersistNewBaseContentType(entity);
-
-            //Handles the MemberTypeDto (cmsMemberType table)
-            var memberTypeDtos = factory.BuildMemberTypeDtos(entity);
-            foreach (var memberTypeDto in memberTypeDtos)
-            {
-                Database.Insert(memberTypeDto);
-            }
-
-            entity.ResetDirtyProperties();
-        }
-
-        protected override void PersistUpdatedItem(IMemberType entity)
-        {
-            ValidateAlias(entity);
-
-            //Updates Modified date
-            ((MemberType)entity).UpdatingEntity();
-
-            //Look up parent to get and set the correct Path if ParentId has changed
-            if (entity.IsPropertyDirty("ParentId"))
-            {
-                var parent = Database.First<NodeDto>("WHERE id = @ParentId", new { ParentId = entity.ParentId });
-                entity.Path = string.Concat(parent.Path, ",", entity.Id);
-                entity.Level = parent.Level + 1;
-                var maxSortOrder =
-                    Database.ExecuteScalar<int>(
-                        "SELECT coalesce(max(sortOrder),0) FROM umbracoNode WHERE parentid = @ParentId AND nodeObjectType = @NodeObjectType",
-                        new { ParentId = entity.ParentId, NodeObjectType = NodeObjectTypeId });
-                entity.SortOrder = maxSortOrder + 1;
-            }
-
-            var factory = new ContentTypeFactory();
-
-            EnsureExplicitDataTypeForBuiltInProperties(entity);
-            PersistUpdatedBaseContentType(entity);
-
-            // remove and insert - handle cmsMemberType table
-            Database.Delete<MemberTypeDto>("WHERE NodeId = @Id", new { Id = entity.Id });
-            var memberTypeDtos = factory.BuildMemberTypeDtos(entity);
-            foreach (var memberTypeDto in memberTypeDtos)
-            {
-                Database.Insert(memberTypeDto);
-            }
-
-            entity.ResetDirtyProperties();
-        }
-
-        /// <summary>
-        /// Override so we can specify explicit db type's on any property types that are built-in.
-        /// </summary>
-        /// <param name="propertyEditorAlias"></param>
-        /// <param name="dbType"></param>
-        /// <param name="propertyTypeAlias"></param>
-        /// <returns></returns>
-        protected override PropertyType CreatePropertyType(string propertyEditorAlias, DataTypeDatabaseType dbType, string propertyTypeAlias)
-        {
-            //custom property type constructor logic to set explicit dbtype's for built in properties
-            var stdProps = Constants.Conventions.Member.GetStandardPropertyTypeStubs();
-            var propDbType = GetDbTypeForBuiltInProperty(propertyTypeAlias, dbType, stdProps);
-            return new PropertyType(propertyEditorAlias, propDbType.Result,
-                //This flag tells the property type that it has an explicit dbtype and that it cannot be changed
-                // which is what we want for the built-in properties.
-                propDbType.Success,
-                propertyTypeAlias);
-        }
-
-        /// <summary>
-        /// Ensure that all the built-in membership provider properties have their correct data type
-        /// and property editors assigned. This occurs prior to saving so that the correct values are persisted.
-        /// </summary>
-        /// <param name="memberType"></param>
-        private static void EnsureExplicitDataTypeForBuiltInProperties(IContentTypeBase memberType)
-        {
-            var stdProps = Constants.Conventions.Member.GetStandardPropertyTypeStubs();
-            foreach (var propertyType in memberType.PropertyTypes)
-            {
-                var dbTypeAttempt = GetDbTypeForBuiltInProperty(propertyType.Alias, propertyType.DataTypeDatabaseType, stdProps);
-                if (dbTypeAttempt)
-                {
-                    //this reset's it's current data type reference which will be re-assigned based on the property editor assigned on the next line
-                    propertyType.DataTypeDefinitionId = 0;
-                    propertyType.DataTypeId = GetPropertyEditorForBuiltInProperty(propertyType.Alias, propertyType.DataTypeId, stdProps).Result;
-                }
-            }
-        }
-
-        /// <summary>
-        /// Builds a collection of entities from a collection of Dtos
-        /// </summary>
-        /// <param name="dtos"></param>
-        /// <returns></returns>
-        private IEnumerable<IMemberType> BuildFromDtos(List<MemberTypeReadOnlyDto> dtos)
-        {
-            if (dtos == null || dtos.Any() == false)
-                return Enumerable.Empty<IMemberType>();
-
-            var factory = new MemberTypeReadOnlyFactory();
-            return dtos.Select(x =>
-            {
-                bool needsSaving;
-                var memberType = factory.BuildEntity(x, out needsSaving);
-                if (needsSaving) PersistUpdatedItem(memberType);
-                return memberType;
-            }).ToList();
-        }
-
-        /// <summary>
-        /// If this is one of our internal properties - we will manually assign the data type since they must
-        /// always correspond to the correct db type no matter what the backing data type is assigned.
-        /// </summary>
-        /// <param name="propAlias"></param>
-        /// <param name="dbType"></param>
-        /// <param name="standardProps"></param>
-        /// <returns>
-        /// Successful attempt if it was a built in property
-        /// </returns>
-        internal static Attempt<DataTypeDatabaseType> GetDbTypeForBuiltInProperty(
-            string propAlias,
-            DataTypeDatabaseType dbType,
-            Dictionary<string, PropertyType> standardProps)
-        {
-            var aliases = standardProps.Select(x => x.Key).ToArray();
-
-            //check if it is built in
-            if (aliases.Contains(propAlias))
-            {
-                //return the pre-determined db type for this property
-                return Attempt<DataTypeDatabaseType>.Succeed(standardProps.Single(x => x.Key == propAlias).Value.DataTypeDatabaseType);
-            }
-
-            return Attempt<DataTypeDatabaseType>.Fail(dbType);
-        }
-
-        /// <summary>
-        ///
-        /// </summary>
-        /// <param name="propAlias"></param>
-        /// <param name="propertyEditor"></param>
-        /// <param name="standardProps"></param>
-        /// <returns>
-        /// Successful attempt if it was a built in property
-        /// </returns>
-        internal static Attempt<Guid> GetPropertyEditorForBuiltInProperty(
-            string propAlias,
-            Guid propertyEditor,
-            Dictionary<string, PropertyType> standardProps)
-        {
-            var aliases = standardProps.Select(x => x.Key).ToArray();
-
-            //check if it is built in
-            if (aliases.Contains(propAlias))
-            {
-                //return the pre-determined db type for this property
-                return Attempt<Guid>.Succeed(standardProps.Single(x => x.Key == propAlias).Value.DataTypeId);
-            }
-
-            return Attempt<Guid>.Fail(propertyEditor);
-        }
-    }
-}
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using NPoco;
+using Umbraco.Core.Cache;
+using Umbraco.Core.Logging;
+using Umbraco.Core.Models;
+using Umbraco.Core.Models.Rdbms;
+using Umbraco.Core.Persistence.Factories;
+using Umbraco.Core.Persistence.Querying;
+using Umbraco.Core.Persistence.UnitOfWork;
+
+namespace Umbraco.Core.Persistence.Repositories.Implement
+{
+    /// <summary>
+    /// Represents a repository for doing CRUD operations for <see cref="IMemberType"/>
+    /// </summary>
+    internal class MemberTypeRepository : ContentTypeRepositoryBase<IMemberType>, IMemberTypeRepository
+    {
+        private IRepositoryCachePolicy<IMemberType, int> _cachePolicy;
+
+        public MemberTypeRepository(IScopeUnitOfWork work, CacheHelper cache, ILogger logger)
+            : base(work, cache, logger)
+        { }
+
+        protected override bool IsPublishing => MemberType.IsPublishingConst;
+
+        protected override IRepositoryCachePolicy<IMemberType, int> CreateCachePolicy(IRuntimeCacheProvider runtimeCache)
+        {
+            return new FullDataSetRepositoryCachePolicy<IMemberType, int>(runtimeCache, GetEntityId, /*expires:*/ true);
+        }
+
+        protected override IMemberType PerformGet(int id)
+        {
+            //use the underlying GetAll which will force cache all content types
+            return GetMany().FirstOrDefault(x => x.Id == id);
+        }
+
+        protected override IMemberType PerformGet(Guid id)
+        {
+            //use the underlying GetAll which will force cache all content types
+            return GetMany().FirstOrDefault(x => x.Key == id);
+        }
+
+        protected override IEnumerable<IMemberType> PerformGetAll(params Guid[] ids)
+        {
+            //use the underlying GetAll which will force cache all content types
+
+            if (ids.Any())
+            {
+                return GetMany().Where(x => ids.Contains(x.Key));
+            }
+            else
+            {
+                return GetMany();
+            }
+        }
+
+        protected override bool PerformExists(Guid id)
+        {
+            return GetMany().FirstOrDefault(x => x.Key == id) != null;
+        }
+
+        protected override IMemberType PerformGet(string alias)
+        {
+            //use the underlying GetAll which will force cache all content types
+            return GetMany().FirstOrDefault(x => x.Alias.InvariantEquals(alias));
+        }
+
+        protected override IEnumerable<IMemberType> PerformGetAll(params int[] ids)
+        {
+            var sql = GetBaseQuery(false);
+            if (ids.Any())
+            {
+                //NOTE: This logic should never be executed according to our cache policy
+                var statement = string.Join(" OR ", ids.Select(x => string.Format("umbracoNode.id='{0}'", x)));
+                sql.Where(statement);
+            }
+            sql.OrderByDescending<NodeDto>(x => x.NodeId);
+
+            var dtos = Database
+                .Fetch<MemberTypeReadOnlyDto>(sql) // cannot use FetchOneToMany because we have 2 collections!
+                .Transform(MapOneToManies)
+                .ToList();
+
+            return BuildFromDtos(dtos);
+        }
+
+        protected override IEnumerable<IMemberType> PerformGetByQuery(IQuery<IMemberType> query)
+        {
+            var sqlSubquery = GetSubquery();
+            var translator = new SqlTranslator<IMemberType>(sqlSubquery, query);
+            var subquery = translator.Translate();
+            var sql = GetBaseQuery(false)
+                .Append("WHERE umbracoNode.id IN (" + subquery.SQL + ")", subquery.Arguments)
+                .OrderBy<NodeDto>(x => x.SortOrder);
+
+            var dtos = Database
+                .Fetch<MemberTypeReadOnlyDto>(sql) // cannot use FetchOneToMany because we have 2 collections!
+                .Transform(MapOneToManies)
+                .ToList();
+
+            return BuildFromDtos(dtos);
+        }
+
+        private IEnumerable<MemberTypeReadOnlyDto> MapOneToManies(IEnumerable<MemberTypeReadOnlyDto> dtos)
+        {
+            MemberTypeReadOnlyDto acc = null;
+            foreach (var dto in dtos)
+            {
+                if (acc == null)
+                {
+                    acc = dto;
+                }
+                else if (acc.UniqueId == dto.UniqueId)
+                {
+                    var prop = dto.PropertyTypes.SingleOrDefault();
+                    var group = dto.PropertyTypeGroups.SingleOrDefault();
+
+                    if (prop != null && prop.Id.HasValue && acc.PropertyTypes.Any(x => x.Id == prop.Id.Value) == false)
+                        acc.PropertyTypes.Add(prop);
+
+                    if (group != null && group.Id.HasValue && acc.PropertyTypeGroups.Any(x => x.Id == group.Id.Value) == false)
+                        acc.PropertyTypeGroups.Add(group);
+                }
+                else
+                {
+                    yield return acc;
+                    acc = dto;
+                }
+            }
+
+            if (acc != null)
+                yield return acc;
+        }
+
+        protected override Sql<ISqlContext> GetBaseQuery(bool isCount)
+        {
+            if (isCount)
+            {
+                return Sql()
+                    .SelectCount()
+                    .From<NodeDto>()
+                    .InnerJoin<ContentTypeDto>().On<ContentTypeDto, NodeDto>(left => left.NodeId, right => right.NodeId)
+                    .Where<NodeDto>(x => x.NodeObjectType == NodeObjectTypeId);
+            }
+
+            var sql = Sql()
+                .Select("umbracoNode.*", "cmsContentType.*", "cmsPropertyType.id AS PropertyTypeId", "cmsPropertyType.Alias",
+                    "cmsPropertyType.Name", "cmsPropertyType.Description", "cmsPropertyType.mandatory", "cmsPropertyType.UniqueID",
+                    "cmsPropertyType.validationRegExp", "cmsPropertyType.dataTypeId", "cmsPropertyType.sortOrder AS PropertyTypeSortOrder",
+                    "cmsPropertyType.propertyTypeGroupId AS PropertyTypesGroupId", "cmsMemberType.memberCanEdit", "cmsMemberType.viewOnProfile",
+                    "cmsDataType.propertyEditorAlias", "cmsDataType.dbType", "cmsPropertyTypeGroup.id AS PropertyTypeGroupId",
+                    "cmsPropertyTypeGroup.text AS PropertyGroupName", "cmsPropertyTypeGroup.uniqueID AS PropertyGroupUniqueID",
+                    "cmsPropertyTypeGroup.sortorder AS PropertyGroupSortOrder", "cmsPropertyTypeGroup.contenttypeNodeId")
+                .From<NodeDto>()
+                .InnerJoin<ContentTypeDto>().On<ContentTypeDto, NodeDto>(left => left.NodeId, right => right.NodeId)
+                .LeftJoin<PropertyTypeDto>().On<PropertyTypeDto, NodeDto>(left => left.ContentTypeId, right => right.NodeId)
+                .LeftJoin<MemberTypeDto>().On<MemberTypeDto, PropertyTypeDto>(left => left.PropertyTypeId, right => right.Id)
+                .LeftJoin<DataTypeDto>().On<DataTypeDto, PropertyTypeDto>(left => left.DataTypeId, right => right.DataTypeId)
+                .LeftJoin<PropertyTypeGroupDto>().On<PropertyTypeGroupDto, NodeDto>(left => left.ContentTypeNodeId, right => right.NodeId)
+                .Where<NodeDto>(x => x.NodeObjectType == NodeObjectTypeId);
+
+            return sql;
+        }
+
+        protected Sql<ISqlContext> GetSubquery()
+        {
+            var sql = Sql()
+                .Select("DISTINCT(umbracoNode.id)")
+                .From<NodeDto>()
+                .InnerJoin<ContentTypeDto>().On<ContentTypeDto, NodeDto>(left => left.NodeId, right => right.NodeId)
+                .LeftJoin<PropertyTypeDto>().On<PropertyTypeDto, NodeDto>(left => left.ContentTypeId, right => right.NodeId)
+                .LeftJoin<MemberTypeDto>().On<MemberTypeDto, PropertyTypeDto>(left => left.PropertyTypeId, right => right.Id)
+                .LeftJoin<DataTypeDto>().On<DataTypeDto, PropertyTypeDto>(left => left.DataTypeId, right => right.DataTypeId)
+                .LeftJoin<PropertyTypeGroupDto>().On<PropertyTypeGroupDto, NodeDto>(left => left.ContentTypeNodeId, right => right.NodeId)
+                .Where<NodeDto>(x => x.NodeObjectType == NodeObjectTypeId);
+            return sql;
+        }
+
+        protected override string GetBaseWhereClause()
+        {
+            return "umbracoNode.id = @id";
+        }
+
+        protected override IEnumerable<string> GetDeleteClauses()
+        {
+            var l = (List<string>) base.GetDeleteClauses(); // we know it's a list
+            l.Add("DELETE FROM cmsMemberType WHERE NodeId = @id");
+            l.Add("DELETE FROM cmsContentType WHERE nodeId = @id");
+            l.Add("DELETE FROM umbracoNode WHERE id = @id");
+            return l;
+        }
+
+        protected override Guid NodeObjectTypeId => Constants.ObjectTypes.MemberType;
+
+        protected override void PersistNewItem(IMemberType entity)
+        {
+            ValidateAlias(entity);
+
+            ((MemberType)entity).AddingEntity();
+
+            //set a default icon if one is not specified
+            if (entity.Icon.IsNullOrWhiteSpace())
+            {
+                entity.Icon = "icon-user";
+            }
+
+            //By Convention we add 9 stnd PropertyTypes to an Umbraco MemberType
+            entity.AddPropertyGroup(Constants.Conventions.Member.StandardPropertiesGroupName);
+            var standardPropertyTypes = Constants.Conventions.Member.GetStandardPropertyTypeStubs();
+            foreach (var standardPropertyType in standardPropertyTypes)
+            {
+                entity.AddPropertyType(standardPropertyType.Value, Constants.Conventions.Member.StandardPropertiesGroupName);
+            }
+
+            var factory = new ContentTypeFactory();
+
+            EnsureExplicitDataTypeForBuiltInProperties(entity);
+            PersistNewBaseContentType(entity);
+
+            //Handles the MemberTypeDto (cmsMemberType table)
+            var memberTypeDtos = factory.BuildMemberTypeDtos(entity);
+            foreach (var memberTypeDto in memberTypeDtos)
+            {
+                Database.Insert(memberTypeDto);
+            }
+
+            entity.ResetDirtyProperties();
+        }
+
+        protected override void PersistUpdatedItem(IMemberType entity)
+        {
+            ValidateAlias(entity);
+
+            //Updates Modified date
+            ((MemberType)entity).UpdatingEntity();
+
+            //Look up parent to get and set the correct Path if ParentId has changed
+            if (entity.IsPropertyDirty("ParentId"))
+            {
+                var parent = Database.First<NodeDto>("WHERE id = @ParentId", new { ParentId = entity.ParentId });
+                entity.Path = string.Concat(parent.Path, ",", entity.Id);
+                entity.Level = parent.Level + 1;
+                var maxSortOrder =
+                    Database.ExecuteScalar<int>(
+                        "SELECT coalesce(max(sortOrder),0) FROM umbracoNode WHERE parentid = @ParentId AND nodeObjectType = @NodeObjectType",
+                        new { ParentId = entity.ParentId, NodeObjectType = NodeObjectTypeId });
+                entity.SortOrder = maxSortOrder + 1;
+            }
+
+            var factory = new ContentTypeFactory();
+
+            EnsureExplicitDataTypeForBuiltInProperties(entity);
+            PersistUpdatedBaseContentType(entity);
+
+            // remove and insert - handle cmsMemberType table
+            Database.Delete<MemberTypeDto>("WHERE NodeId = @Id", new { Id = entity.Id });
+            var memberTypeDtos = factory.BuildMemberTypeDtos(entity);
+            foreach (var memberTypeDto in memberTypeDtos)
+            {
+                Database.Insert(memberTypeDto);
+            }
+
+            entity.ResetDirtyProperties();
+        }
+
+        /// <summary>
+        /// Override so we can specify explicit db type's on any property types that are built-in.
+        /// </summary>
+        /// <param name="propertyEditorAlias"></param>
+        /// <param name="dbType"></param>
+        /// <param name="propertyTypeAlias"></param>
+        /// <returns></returns>
+        protected override PropertyType CreatePropertyType(string propertyEditorAlias, DataTypeDatabaseType dbType, string propertyTypeAlias)
+        {
+            //custom property type constructor logic to set explicit dbtype's for built in properties
+            var stdProps = Constants.Conventions.Member.GetStandardPropertyTypeStubs();
+            var propDbType = GetDbTypeForBuiltInProperty(propertyTypeAlias, dbType, stdProps);
+            return new PropertyType(propertyEditorAlias, propDbType.Result,
+                //This flag tells the property type that it has an explicit dbtype and that it cannot be changed
+                // which is what we want for the built-in properties.
+                propDbType.Success,
+                propertyTypeAlias);
+        }
+
+        /// <summary>
+        /// Ensure that all the built-in membership provider properties have their correct data type
+        /// and property editors assigned. This occurs prior to saving so that the correct values are persisted.
+        /// </summary>
+        /// <param name="memberType"></param>
+        private static void EnsureExplicitDataTypeForBuiltInProperties(IContentTypeBase memberType)
+        {
+            var stdProps = Constants.Conventions.Member.GetStandardPropertyTypeStubs();
+            foreach (var propertyType in memberType.PropertyTypes)
+            {
+                var dbTypeAttempt = GetDbTypeForBuiltInProperty(propertyType.Alias, propertyType.DataTypeDatabaseType, stdProps);
+                if (dbTypeAttempt)
+                {
+                    //this reset's it's current data type reference which will be re-assigned based on the property editor assigned on the next line
+                    propertyType.DataTypeDefinitionId = 0;
+                    propertyType.DataTypeId = GetPropertyEditorForBuiltInProperty(propertyType.Alias, propertyType.DataTypeId, stdProps).Result;
+                }
+            }
+        }
+
+        /// <summary>
+        /// Builds a collection of entities from a collection of Dtos
+        /// </summary>
+        /// <param name="dtos"></param>
+        /// <returns></returns>
+        private IEnumerable<IMemberType> BuildFromDtos(List<MemberTypeReadOnlyDto> dtos)
+        {
+            if (dtos == null || dtos.Any() == false)
+                return Enumerable.Empty<IMemberType>();
+
+            var factory = new MemberTypeReadOnlyFactory();
+            return dtos.Select(x =>
+            {
+                bool needsSaving;
+                var memberType = factory.BuildEntity(x, out needsSaving);
+                if (needsSaving) PersistUpdatedItem(memberType);
+                return memberType;
+            }).ToList();
+        }
+
+        /// <summary>
+        /// If this is one of our internal properties - we will manually assign the data type since they must
+        /// always correspond to the correct db type no matter what the backing data type is assigned.
+        /// </summary>
+        /// <param name="propAlias"></param>
+        /// <param name="dbType"></param>
+        /// <param name="standardProps"></param>
+        /// <returns>
+        /// Successful attempt if it was a built in property
+        /// </returns>
+        internal static Attempt<DataTypeDatabaseType> GetDbTypeForBuiltInProperty(
+            string propAlias,
+            DataTypeDatabaseType dbType,
+            Dictionary<string, PropertyType> standardProps)
+        {
+            var aliases = standardProps.Select(x => x.Key).ToArray();
+
+            //check if it is built in
+            if (aliases.Contains(propAlias))
+            {
+                //return the pre-determined db type for this property
+                return Attempt<DataTypeDatabaseType>.Succeed(standardProps.Single(x => x.Key == propAlias).Value.DataTypeDatabaseType);
+            }
+
+            return Attempt<DataTypeDatabaseType>.Fail(dbType);
+        }
+
+        /// <summary>
+        ///
+        /// </summary>
+        /// <param name="propAlias"></param>
+        /// <param name="propertyEditor"></param>
+        /// <param name="standardProps"></param>
+        /// <returns>
+        /// Successful attempt if it was a built in property
+        /// </returns>
+        internal static Attempt<Guid> GetPropertyEditorForBuiltInProperty(
+            string propAlias,
+            Guid propertyEditor,
+            Dictionary<string, PropertyType> standardProps)
+        {
+            var aliases = standardProps.Select(x => x.Key).ToArray();
+
+            //check if it is built in
+            if (aliases.Contains(propAlias))
+            {
+                //return the pre-determined db type for this property
+                return Attempt<Guid>.Succeed(standardProps.Single(x => x.Key == propAlias).Value.DataTypeId);
+            }
+
+            return Attempt<Guid>.Fail(propertyEditor);
+        }
+    }
+}
diff --git a/src/Umbraco.Core/Persistence/Repositories/MigrationEntryRepository.cs b/src/Umbraco.Core/Persistence/Repositories/Implement/MigrationEntryRepository.cs
similarity index 98%
rename from src/Umbraco.Core/Persistence/Repositories/MigrationEntryRepository.cs
rename to src/Umbraco.Core/Persistence/Repositories/Implement/MigrationEntryRepository.cs
index b7e5548512..178eb24089 100644
--- a/src/Umbraco.Core/Persistence/Repositories/MigrationEntryRepository.cs
+++ b/src/Umbraco.Core/Persistence/Repositories/Implement/MigrationEntryRepository.cs
@@ -5,7 +5,6 @@ using LightInject;
 using NPoco;
 using Semver;
 using Umbraco.Core.Cache;
-using Umbraco.Core.Composing;
 using Umbraco.Core.Composing.CompositionRoots;
 using Umbraco.Core.Logging;
 using Umbraco.Core.Models;
@@ -14,7 +13,7 @@ using Umbraco.Core.Persistence.Factories;
 using Umbraco.Core.Persistence.Querying;
 using Umbraco.Core.Persistence.UnitOfWork;
 
-namespace Umbraco.Core.Persistence.Repositories
+namespace Umbraco.Core.Persistence.Repositories.Implement
 {
     internal class MigrationEntryRepository : NPocoRepositoryBase<int, IMigrationEntry>, IMigrationEntryRepository
     {
diff --git a/src/Umbraco.Core/Persistence/Repositories/NPocoRepositoryBase.cs b/src/Umbraco.Core/Persistence/Repositories/Implement/NPocoRepositoryBase.cs
similarity index 96%
rename from src/Umbraco.Core/Persistence/Repositories/NPocoRepositoryBase.cs
rename to src/Umbraco.Core/Persistence/Repositories/Implement/NPocoRepositoryBase.cs
index 8cf7bd2608..75b27d093a 100644
--- a/src/Umbraco.Core/Persistence/Repositories/NPocoRepositoryBase.cs
+++ b/src/Umbraco.Core/Persistence/Repositories/Implement/NPocoRepositoryBase.cs
@@ -1,89 +1,89 @@
-using System;
-using System.Collections.Generic;
-using NPoco;
-using Umbraco.Core.Cache;
-using Umbraco.Core.Logging;
-using Umbraco.Core.Models.EntityBase;
-using Umbraco.Core.Persistence.Querying;
-using Umbraco.Core.Persistence.SqlSyntax;
-using Umbraco.Core.Persistence.UnitOfWork;
-
-namespace Umbraco.Core.Persistence.Repositories
-{
-    /// <summary>
-    /// Represent an abstract Repository for NPoco based repositories
-    /// </summary>
-    /// <typeparam name="TId"></typeparam>
-    /// <typeparam name="TEntity"></typeparam>
-    internal abstract class NPocoRepositoryBase<TId, TEntity> : RepositoryBase<TId, TEntity>
-        where TEntity : class, IAggregateRoot
-    {
-        /// <summary>
-        /// Initializes a new instance of the <see cref="NPocoRepositoryBase{TId, TEntity}"/>.
-        /// </summary>
-        /// <param name="work">A database unit of work.</param>
-        /// <param name="cache">A cache helper.</param>
-        /// <param name="logger">A logger.</param>
-        protected NPocoRepositoryBase(IScopeUnitOfWork work, CacheHelper cache, ILogger logger)
-            : base(work, cache, logger)
-        { }
-
-        /// <summary>
-        /// Gets the repository's unit of work.
-        /// </summary>
-        protected internal new IScopeUnitOfWork UnitOfWork => base.UnitOfWork;
-
-        /// <summary>
-        /// Gets the repository's database.
-        /// </summary>
-        protected IUmbracoDatabase Database => UnitOfWork.Database;
-
-        /// <summary>
-        /// Gets the Sql context.
-        /// </summary>
-        protected ISqlContext SqlContext=> UnitOfWork.SqlContext;
-
-        protected Sql<ISqlContext> Sql() => SqlContext.Sql();
-        protected Sql<ISqlContext> Sql(string sql, params object[] args) => SqlContext.Sql(sql, args);
-        protected ISqlSyntaxProvider SqlSyntax => SqlContext.SqlSyntax;
-        protected IQuery<T> Query<T>() => SqlContext.Query<T>();
-
-        #region Abstract Methods
-
-        protected abstract Sql<ISqlContext> GetBaseQuery(bool isCount); // fixme obsolete, use QueryType instead everywhere
-        protected abstract string GetBaseWhereClause();
-        protected abstract IEnumerable<string> GetDeleteClauses();
-        protected abstract Guid NodeObjectTypeId { get; }
-        protected abstract override void PersistNewItem(TEntity entity);
-        protected abstract override void PersistUpdatedItem(TEntity entity);
-
-        #endregion
-
-        protected override bool PerformExists(TId id)
-        {
-            var sql = GetBaseQuery(true);
-            sql.Where(GetBaseWhereClause(), new { id = id});
-            var count = Database.ExecuteScalar<int>(sql);
-            return count == 1;
-        }
-
-        protected override int PerformCount(IQuery<TEntity> query)
-        {
-            var sqlClause = GetBaseQuery(true);
-            var translator = new SqlTranslator<TEntity>(sqlClause, query);
-            var sql = translator.Translate();
-
-            return Database.ExecuteScalar<int>(sql);
-        }
-
-        protected override void PersistDeletedItem(TEntity entity)
-        {
-            var deletes = GetDeleteClauses();
-            foreach (var delete in deletes)
-            {
-                Database.Execute(delete, new { id = GetEntityId(entity) });
-            }
-            entity.DeletedDate = DateTime.Now;
-        }
-    }
-}
+using System;
+using System.Collections.Generic;
+using NPoco;
+using Umbraco.Core.Cache;
+using Umbraco.Core.Logging;
+using Umbraco.Core.Models.EntityBase;
+using Umbraco.Core.Persistence.Querying;
+using Umbraco.Core.Persistence.SqlSyntax;
+using Umbraco.Core.Persistence.UnitOfWork;
+
+namespace Umbraco.Core.Persistence.Repositories.Implement
+{
+    /// <summary>
+    /// Represent an abstract Repository for NPoco based repositories
+    /// </summary>
+    /// <typeparam name="TId"></typeparam>
+    /// <typeparam name="TEntity"></typeparam>
+    internal abstract class NPocoRepositoryBase<TId, TEntity> : RepositoryBase<TId, TEntity>
+        where TEntity : class, IAggregateRoot
+    {
+        /// <summary>
+        /// Initializes a new instance of the <see cref="NPocoRepositoryBase{TId, TEntity}"/>.
+        /// </summary>
+        /// <param name="work">A database unit of work.</param>
+        /// <param name="cache">A cache helper.</param>
+        /// <param name="logger">A logger.</param>
+        protected NPocoRepositoryBase(IScopeUnitOfWork work, CacheHelper cache, ILogger logger)
+            : base(work, cache, logger)
+        { }
+
+        /// <summary>
+        /// Gets the repository's unit of work.
+        /// </summary>
+        protected internal new IScopeUnitOfWork UnitOfWork => base.UnitOfWork;
+
+        /// <summary>
+        /// Gets the repository's database.
+        /// </summary>
+        protected IUmbracoDatabase Database => UnitOfWork.Database;
+
+        /// <summary>
+        /// Gets the Sql context.
+        /// </summary>
+        protected ISqlContext SqlContext=> UnitOfWork.SqlContext;
+
+        protected Sql<ISqlContext> Sql() => SqlContext.Sql();
+        protected Sql<ISqlContext> Sql(string sql, params object[] args) => SqlContext.Sql(sql, args);
+        protected ISqlSyntaxProvider SqlSyntax => SqlContext.SqlSyntax;
+        protected IQuery<T> Query<T>() => SqlContext.Query<T>();
+
+        #region Abstract Methods
+
+        protected abstract Sql<ISqlContext> GetBaseQuery(bool isCount); // fixme obsolete, use QueryType instead everywhere
+        protected abstract string GetBaseWhereClause();
+        protected abstract IEnumerable<string> GetDeleteClauses();
+        protected abstract Guid NodeObjectTypeId { get; }
+        protected abstract override void PersistNewItem(TEntity entity);
+        protected abstract override void PersistUpdatedItem(TEntity entity);
+
+        #endregion
+
+        protected override bool PerformExists(TId id)
+        {
+            var sql = GetBaseQuery(true);
+            sql.Where(GetBaseWhereClause(), new { id = id});
+            var count = Database.ExecuteScalar<int>(sql);
+            return count == 1;
+        }
+
+        protected override int PerformCount(IQuery<TEntity> query)
+        {
+            var sqlClause = GetBaseQuery(true);
+            var translator = new SqlTranslator<TEntity>(sqlClause, query);
+            var sql = translator.Translate();
+
+            return Database.ExecuteScalar<int>(sql);
+        }
+
+        protected override void PersistDeletedItem(TEntity entity)
+        {
+            var deletes = GetDeleteClauses();
+            foreach (var delete in deletes)
+            {
+                Database.Execute(delete, new { id = GetEntityId(entity) });
+            }
+            entity.DeletedDate = DateTime.Now;
+        }
+    }
+}
diff --git a/src/Umbraco.Core/Persistence/Repositories/NotificationsRepository.cs b/src/Umbraco.Core/Persistence/Repositories/Implement/NotificationsRepository.cs
similarity index 98%
rename from src/Umbraco.Core/Persistence/Repositories/NotificationsRepository.cs
rename to src/Umbraco.Core/Persistence/Repositories/Implement/NotificationsRepository.cs
index edda5477f8..e8b8c0fa20 100644
--- a/src/Umbraco.Core/Persistence/Repositories/NotificationsRepository.cs
+++ b/src/Umbraco.Core/Persistence/Repositories/Implement/NotificationsRepository.cs
@@ -7,7 +7,7 @@ using Umbraco.Core.Models.Membership;
 using Umbraco.Core.Models.Rdbms;
 using Umbraco.Core.Persistence.UnitOfWork;
 
-namespace Umbraco.Core.Persistence.Repositories
+namespace Umbraco.Core.Persistence.Repositories.Implement
 {
     public class NotificationsRepository : DisposableObject, INotificationsRepository
     {
diff --git a/src/Umbraco.Core/Persistence/Repositories/PartialViewMacroRepository.cs b/src/Umbraco.Core/Persistence/Repositories/Implement/PartialViewMacroRepository.cs
similarity index 89%
rename from src/Umbraco.Core/Persistence/Repositories/PartialViewMacroRepository.cs
rename to src/Umbraco.Core/Persistence/Repositories/Implement/PartialViewMacroRepository.cs
index 1cbf3b377d..944f1fd38a 100644
--- a/src/Umbraco.Core/Persistence/Repositories/PartialViewMacroRepository.cs
+++ b/src/Umbraco.Core/Persistence/Repositories/Implement/PartialViewMacroRepository.cs
@@ -3,7 +3,7 @@ using Umbraco.Core.IO;
 using Umbraco.Core.Models;
 using Umbraco.Core.Persistence.UnitOfWork;
 
-namespace Umbraco.Core.Persistence.Repositories
+namespace Umbraco.Core.Persistence.Repositories.Implement
 {
     internal class PartialViewMacroRepository : PartialViewRepository, IPartialViewMacroRepository
     {
diff --git a/src/Umbraco.Core/Persistence/Repositories/PartialViewRepository.cs b/src/Umbraco.Core/Persistence/Repositories/Implement/PartialViewRepository.cs
similarity index 95%
rename from src/Umbraco.Core/Persistence/Repositories/PartialViewRepository.cs
rename to src/Umbraco.Core/Persistence/Repositories/Implement/PartialViewRepository.cs
index a92b9f9e6d..b086351fff 100644
--- a/src/Umbraco.Core/Persistence/Repositories/PartialViewRepository.cs
+++ b/src/Umbraco.Core/Persistence/Repositories/Implement/PartialViewRepository.cs
@@ -7,7 +7,7 @@ using Umbraco.Core.IO;
 using Umbraco.Core.Models;
 using Umbraco.Core.Persistence.UnitOfWork;
 
-namespace Umbraco.Core.Persistence.Repositories
+namespace Umbraco.Core.Persistence.Repositories.Implement
 {
     internal class PartialViewRepository : FileRepository<string, IPartialView>, IPartialViewRepository
     {
@@ -47,20 +47,20 @@ namespace Umbraco.Core.Persistence.Repositories
             return view;
         }
 
-        public override void AddOrUpdate(IPartialView entity)
+        public override void Save(IPartialView entity)
         {
             var partialView = entity as PartialView;
             if (partialView != null)
                 partialView.ViewType = ViewType;
 
-            base.AddOrUpdate(entity);
+            base.Save(entity);
 
             // ensure that from now on, content is lazy-loaded
             if (partialView != null && partialView.GetFileContent == null)
                 partialView.GetFileContent = file => GetFileContent(file.OriginalPath);
         }
 
-        public override IEnumerable<IPartialView> GetAll(params string[] ids)
+        public override IEnumerable<IPartialView> GetMany(params string[] ids)
         {
             //ensure they are de-duplicated, easy win if people don't do this as this can cause many excess queries
             ids = ids.Distinct().ToArray();
diff --git a/src/Umbraco.Core/Persistence/Repositories/PermissionRepository.cs b/src/Umbraco.Core/Persistence/Repositories/Implement/PermissionRepository.cs
similarity index 97%
rename from src/Umbraco.Core/Persistence/Repositories/PermissionRepository.cs
rename to src/Umbraco.Core/Persistence/Repositories/Implement/PermissionRepository.cs
index 68a742afe5..e6b4469ec4 100644
--- a/src/Umbraco.Core/Persistence/Repositories/PermissionRepository.cs
+++ b/src/Umbraco.Core/Persistence/Repositories/Implement/PermissionRepository.cs
@@ -1,334 +1,334 @@
-using System;
-using System.Collections.Generic;
-using System.Globalization;
-using System.Linq;
-using NPoco;
-using Umbraco.Core.Models.EntityBase;
-using Umbraco.Core.Models.Membership;
-using Umbraco.Core.Models.Rdbms;
-using Umbraco.Core.Persistence.UnitOfWork;
-using Umbraco.Core.Cache;
-using Umbraco.Core.Exceptions;
-using Umbraco.Core.Logging;
-using Umbraco.Core.Persistence.Querying;
-
-namespace Umbraco.Core.Persistence.Repositories
-{
-    /// <summary>
-    /// A (sub) repository that exposes functionality to modify assigned permissions to a node
-    /// </summary>
-    /// <typeparam name="TEntity"></typeparam>
-    /// <remarks>
-    /// This repo implements the base <see cref="NPocoRepositoryBase{TId,TEntity}"/> class so that permissions can be queued to be persisted
-    /// like the normal repository pattern but the standard repository Get commands don't apply and will throw <see cref="NotImplementedException"/>
-    /// </remarks>
-    internal class PermissionRepository<TEntity> : NPocoRepositoryBase<int, ContentPermissionSet>
-        where TEntity : class, IAggregateRoot
-    {
-        public PermissionRepository(IScopeUnitOfWork work, CacheHelper cache, ILogger logger)
-            : base(work, cache, logger)
-        { }
-
-        /// <summary>
-        /// Returns explicitly defined permissions for a user group for any number of nodes
-        /// </summary>
-        /// <param name="groupIds">
-        /// The group ids to lookup permissions for
-        /// </param>
-        /// <param name="entityIds"></param>
-        /// <returns></returns>
-        /// <remarks>
-        /// This method will not support passing in more than 2000 group Ids
-        /// </remarks>
-        public EntityPermissionCollection GetPermissionsForEntities(int[] groupIds, params int[] entityIds)
-        {
-            var result = new EntityPermissionCollection();
-
-            foreach (var groupOfGroupIds in groupIds.InGroupsOf(2000))
-            {
-                //copy local
-                var localIds = groupOfGroupIds.ToArray();
-
-                if (entityIds.Length == 0)
-                {
-                    var sql = Sql()
-                        .SelectAll()
-                        .From<UserGroup2NodePermissionDto>()
-                        .Where<UserGroup2NodePermissionDto>(dto => localIds.Contains(dto.UserGroupId));
-                    var permissions = UnitOfWork.Database.Fetch<UserGroup2NodePermissionDto>(sql);
-                    foreach (var permission in ConvertToPermissionList(permissions))
-                    {
-                        result.Add(permission);
-                    }
-                }
-                else
-                {
-                    //iterate in groups of 2000 since we don't want to exceed the max SQL param count
-                    foreach (var groupOfEntityIds in entityIds.InGroupsOf(2000))
-                    {
-                        var ids = groupOfEntityIds;
-                        var sql = Sql()
-                            .SelectAll()
-                            .From<UserGroup2NodePermissionDto>()
-                            .Where<UserGroup2NodePermissionDto>(dto => localIds.Contains(dto.UserGroupId) && ids.Contains(dto.NodeId));
-                        var permissions = UnitOfWork.Database.Fetch<UserGroup2NodePermissionDto>(sql);
-                        foreach (var permission in ConvertToPermissionList(permissions))
-                        {
-                            result.Add(permission);
-                        }
-                    }
-                }
-            }
-
-            return result;
-        }
-
-        /// <summary>
-        /// Returns permissions directly assigned to the content items for all user groups
-        /// </summary>
-        /// <param name="entityIds"></param>
-        /// <returns></returns>
-        public IEnumerable<EntityPermission> GetPermissionsForEntities(int[] entityIds)
-        {
-            var sql = Sql()
-                .SelectAll()
-                .From<UserGroup2NodePermissionDto>()
-                .Where<UserGroup2NodePermissionDto>(dto => entityIds.Contains(dto.NodeId))
-                .OrderBy<UserGroup2NodePermissionDto>(dto => dto.NodeId);
-
-            var result = UnitOfWork.Database.Fetch<UserGroup2NodePermissionDto>(sql);
-            return ConvertToPermissionList(result);
-        }
-
-        /// <summary>
-        /// Returns permissions directly assigned to the content item for all user groups
-        /// </summary>
-        /// <param name="entityId"></param>
-        /// <returns></returns>
-        public EntityPermissionCollection GetPermissionsForEntity(int entityId)
-        {
-            var sql = Sql()
-                .SelectAll()
-                .From<UserGroup2NodePermissionDto>()
-                .Where<UserGroup2NodePermissionDto>(dto => dto.NodeId == entityId)
-                .OrderBy<UserGroup2NodePermissionDto>(dto => dto.NodeId);
-
-            var result = UnitOfWork.Database.Fetch<UserGroup2NodePermissionDto>(sql);
-            return ConvertToPermissionList(result);
-        }
-
-        /// <summary>
-        /// Assigns the same permission set for a single group to any number of entities
-        /// </summary>
-        /// <param name="groupId"></param>
-        /// <param name="permissions"></param>
-        /// <param name="entityIds"></param>
-        /// <remarks>
-        /// This will first clear the permissions for this user and entities and recreate them
-        /// </remarks>
-        public void ReplacePermissions(int groupId, IEnumerable<char> permissions, params int[] entityIds)
-        {
-            if (entityIds.Length == 0)
-                return;
-
-            var db = UnitOfWork.Database;
-
-            //we need to batch these in groups of 2000 so we don't exceed the max 2100 limit
-            var sql = "DELETE FROM umbracoUserGroup2NodePermission WHERE userGroupId = @groupId AND nodeId in (@nodeIds)";
-            foreach (var idGroup in entityIds.InGroupsOf(2000))
-            {
-                db.Execute(sql, new { groupId, nodeIds = idGroup });
-            }
-
-            var toInsert = new List<UserGroup2NodePermissionDto>();
-            foreach (var p in permissions)
-            {
-                foreach (var e in entityIds)
-                {
-                    toInsert.Add(new UserGroup2NodePermissionDto
-                    {
-                        NodeId = e,
-                        Permission = p.ToString(CultureInfo.InvariantCulture),
-                        UserGroupId = groupId
-                    });
-                }
-            }
-
-            db.BulkInsertRecords(toInsert);
-        }
-
-        /// <summary>
-        /// Assigns one permission for a user to many entities
-        /// </summary>
-        /// <param name="groupId"></param>
-        /// <param name="permission"></param>
-        /// <param name="entityIds"></param>
-        public void AssignPermission(int groupId, char permission, params int[] entityIds)
-        {
-            var db = UnitOfWork.Database;
-
-            var sql = "DELETE FROM umbracoUserGroup2NodePermission WHERE userGroupId = @groupId AND permission=@permission AND nodeId in (@entityIds)";
-            db.Execute(sql,
-            new
-            {
-                groupId,
-                permission = permission.ToString(CultureInfo.InvariantCulture),
-                entityIds
-            });
-
-            var actions = entityIds.Select(id => new UserGroup2NodePermissionDto
-            {
-                NodeId = id,
-                Permission = permission.ToString(CultureInfo.InvariantCulture),
-                UserGroupId = groupId
-            }).ToArray();
-
-            db.BulkInsertRecords(actions);
-        }
-
-        /// <summary>
-        /// Assigns one permission to an entity for multiple groups
-        /// </summary>
-        /// <param name="entity"></param>
-        /// <param name="permission"></param>
-        /// <param name="groupIds"></param>
-        public void AssignEntityPermission(TEntity entity, char permission, IEnumerable<int> groupIds)
-        {
-            var db = UnitOfWork.Database;
-            var groupIdsA = groupIds.ToArray();
-
-            const string sql = "DELETE FROM umbracoUserGroup2NodePermission WHERE nodeId = @nodeId AND permission = @permission AND userGroupId in (@groupIds)";
-            db.Execute(sql,
-                new
-                {
-                    nodeId = entity.Id,
-                    permission = permission.ToString(CultureInfo.InvariantCulture),
-                    groupIds = groupIdsA
-                });
-
-            var actions = groupIdsA.Select(id => new UserGroup2NodePermissionDto
-            {
-                NodeId = entity.Id,
-                Permission = permission.ToString(CultureInfo.InvariantCulture),
-                UserGroupId = id
-            }).ToArray();
-
-            db.BulkInsertRecords(actions);
-        }
-
-        /// <summary>
-        /// Assigns permissions to an entity for multiple group/permission entries
-        /// </summary>
-        /// <param name="permissionSet">
-        /// </param>
-        /// <remarks>
-        /// This will first clear the permissions for this entity then re-create them
-        /// </remarks>
-        public void ReplaceEntityPermissions(EntityPermissionSet permissionSet)
-        {
-            var db = UnitOfWork.Database;
-
-            const string sql = "DELETE FROM umbracoUserGroup2NodePermission WHERE nodeId = @nodeId";
-            db.Execute(sql, new { nodeId = permissionSet.EntityId });
-
-            var toInsert = new List<UserGroup2NodePermissionDto>();
-            foreach (var entityPermission in permissionSet.PermissionsSet)
-            {
-                foreach (var permission in entityPermission.AssignedPermissions)
-                {
-                    toInsert.Add(new UserGroup2NodePermissionDto
-                    {
-                        NodeId = permissionSet.EntityId,
-                        Permission = permission,
-                        UserGroupId = entityPermission.UserGroupId
-                    });
-                }
-            }
-
-            db.BulkInsertRecords(toInsert);
-        }
-
-        #region Not implemented (don't need to for the purposes of this repo)
-
-        protected override ContentPermissionSet PerformGet(int id)
-        {
-            throw new WontImplementException();
-        }
-
-        protected override IEnumerable<ContentPermissionSet> PerformGetAll(params int[] ids)
-        {
-            throw new WontImplementException();
-        }
-
-        protected override IEnumerable<ContentPermissionSet> PerformGetByQuery(IQuery<ContentPermissionSet> query)
-        {
-            throw new WontImplementException();
-        }
-
-        protected override Sql<ISqlContext> GetBaseQuery(bool isCount)
-        {
-            throw new WontImplementException();
-        }
-
-        protected override string GetBaseWhereClause()
-        {
-            throw new WontImplementException();
-        }
-
-        protected override IEnumerable<string> GetDeleteClauses()
-        {
-            return new List<string>();
-        }
-
-        protected override Guid NodeObjectTypeId => throw new WontImplementException();
-
-        protected override void PersistDeletedItem(ContentPermissionSet entity)
-        {
-            throw new WontImplementException();
-        }
-
-        #endregion
-
-        /// <summary>
-        /// Used to add or update entity permissions during a content item being updated
-        /// </summary>
-        /// <param name="entity"></param>
-        protected override void PersistNewItem(ContentPermissionSet entity)
-        {
-            //does the same thing as update
-            PersistUpdatedItem(entity);
-        }
-
-        /// <summary>
-        /// Used to add or update entity permissions during a content item being updated
-        /// </summary>
-        /// <param name="entity"></param>
-        protected override void PersistUpdatedItem(ContentPermissionSet entity)
-        {
-            var asAggregateRoot = (IAggregateRoot)entity;
-            if (asAggregateRoot.HasIdentity == false)
-            {
-                throw new InvalidOperationException("Cannot create permissions for an entity without an Id");
-            }
-
-            ReplaceEntityPermissions(entity);
-        }
-
-        private static EntityPermissionCollection ConvertToPermissionList(IEnumerable<UserGroup2NodePermissionDto> result)
-        {
-            var permissions = new EntityPermissionCollection();
-            var nodePermissions = result.GroupBy(x => x.NodeId);
-            foreach (var np in nodePermissions)
-            {
-                var userGroupPermissions = np.GroupBy(x => x.UserGroupId);
-                foreach (var permission in userGroupPermissions)
-                {
-                    var perms = permission.Select(x => x.Permission).Distinct().ToArray();
-                    permissions.Add(new EntityPermission(permission.Key, np.Key, perms));
-                }
-            }
-
-            return permissions;
-        }
-    }
-}
+using System;
+using System.Collections.Generic;
+using System.Globalization;
+using System.Linq;
+using NPoco;
+using Umbraco.Core.Cache;
+using Umbraco.Core.Exceptions;
+using Umbraco.Core.Logging;
+using Umbraco.Core.Models.EntityBase;
+using Umbraco.Core.Models.Membership;
+using Umbraco.Core.Models.Rdbms;
+using Umbraco.Core.Persistence.Querying;
+using Umbraco.Core.Persistence.UnitOfWork;
+
+namespace Umbraco.Core.Persistence.Repositories.Implement
+{
+    /// <summary>
+    /// A (sub) repository that exposes functionality to modify assigned permissions to a node
+    /// </summary>
+    /// <typeparam name="TEntity"></typeparam>
+    /// <remarks>
+    /// This repo implements the base <see cref="NPocoRepositoryBase{TId,TEntity}"/> class so that permissions can be queued to be persisted
+    /// like the normal repository pattern but the standard repository Get commands don't apply and will throw <see cref="NotImplementedException"/>
+    /// </remarks>
+    internal class PermissionRepository<TEntity> : NPocoRepositoryBase<int, ContentPermissionSet>
+        where TEntity : class, IAggregateRoot
+    {
+        public PermissionRepository(IScopeUnitOfWork work, CacheHelper cache, ILogger logger)
+            : base(work, cache, logger)
+        { }
+
+        /// <summary>
+        /// Returns explicitly defined permissions for a user group for any number of nodes
+        /// </summary>
+        /// <param name="groupIds">
+        /// The group ids to lookup permissions for
+        /// </param>
+        /// <param name="entityIds"></param>
+        /// <returns></returns>
+        /// <remarks>
+        /// This method will not support passing in more than 2000 group Ids
+        /// </remarks>
+        public EntityPermissionCollection GetPermissionsForEntities(int[] groupIds, params int[] entityIds)
+        {
+            var result = new EntityPermissionCollection();
+
+            foreach (var groupOfGroupIds in groupIds.InGroupsOf(2000))
+            {
+                //copy local
+                var localIds = groupOfGroupIds.ToArray();
+
+                if (entityIds.Length == 0)
+                {
+                    var sql = Sql()
+                        .SelectAll()
+                        .From<UserGroup2NodePermissionDto>()
+                        .Where<UserGroup2NodePermissionDto>(dto => localIds.Contains(dto.UserGroupId));
+                    var permissions = UnitOfWork.Database.Fetch<UserGroup2NodePermissionDto>(sql);
+                    foreach (var permission in ConvertToPermissionList(permissions))
+                    {
+                        result.Add(permission);
+                    }
+                }
+                else
+                {
+                    //iterate in groups of 2000 since we don't want to exceed the max SQL param count
+                    foreach (var groupOfEntityIds in entityIds.InGroupsOf(2000))
+                    {
+                        var ids = groupOfEntityIds;
+                        var sql = Sql()
+                            .SelectAll()
+                            .From<UserGroup2NodePermissionDto>()
+                            .Where<UserGroup2NodePermissionDto>(dto => localIds.Contains(dto.UserGroupId) && ids.Contains(dto.NodeId));
+                        var permissions = UnitOfWork.Database.Fetch<UserGroup2NodePermissionDto>(sql);
+                        foreach (var permission in ConvertToPermissionList(permissions))
+                        {
+                            result.Add(permission);
+                        }
+                    }
+                }
+            }
+
+            return result;
+        }
+
+        /// <summary>
+        /// Returns permissions directly assigned to the content items for all user groups
+        /// </summary>
+        /// <param name="entityIds"></param>
+        /// <returns></returns>
+        public IEnumerable<EntityPermission> GetPermissionsForEntities(int[] entityIds)
+        {
+            var sql = Sql()
+                .SelectAll()
+                .From<UserGroup2NodePermissionDto>()
+                .Where<UserGroup2NodePermissionDto>(dto => entityIds.Contains(dto.NodeId))
+                .OrderBy<UserGroup2NodePermissionDto>(dto => dto.NodeId);
+
+            var result = UnitOfWork.Database.Fetch<UserGroup2NodePermissionDto>(sql);
+            return ConvertToPermissionList(result);
+        }
+
+        /// <summary>
+        /// Returns permissions directly assigned to the content item for all user groups
+        /// </summary>
+        /// <param name="entityId"></param>
+        /// <returns></returns>
+        public EntityPermissionCollection GetPermissionsForEntity(int entityId)
+        {
+            var sql = Sql()
+                .SelectAll()
+                .From<UserGroup2NodePermissionDto>()
+                .Where<UserGroup2NodePermissionDto>(dto => dto.NodeId == entityId)
+                .OrderBy<UserGroup2NodePermissionDto>(dto => dto.NodeId);
+
+            var result = UnitOfWork.Database.Fetch<UserGroup2NodePermissionDto>(sql);
+            return ConvertToPermissionList(result);
+        }
+
+        /// <summary>
+        /// Assigns the same permission set for a single group to any number of entities
+        /// </summary>
+        /// <param name="groupId"></param>
+        /// <param name="permissions"></param>
+        /// <param name="entityIds"></param>
+        /// <remarks>
+        /// This will first clear the permissions for this user and entities and recreate them
+        /// </remarks>
+        public void ReplacePermissions(int groupId, IEnumerable<char> permissions, params int[] entityIds)
+        {
+            if (entityIds.Length == 0)
+                return;
+
+            var db = UnitOfWork.Database;
+
+            //we need to batch these in groups of 2000 so we don't exceed the max 2100 limit
+            var sql = "DELETE FROM umbracoUserGroup2NodePermission WHERE userGroupId = @groupId AND nodeId in (@nodeIds)";
+            foreach (var idGroup in entityIds.InGroupsOf(2000))
+            {
+                db.Execute(sql, new { groupId, nodeIds = idGroup });
+            }
+
+            var toInsert = new List<UserGroup2NodePermissionDto>();
+            foreach (var p in permissions)
+            {
+                foreach (var e in entityIds)
+                {
+                    toInsert.Add(new UserGroup2NodePermissionDto
+                    {
+                        NodeId = e,
+                        Permission = p.ToString(CultureInfo.InvariantCulture),
+                        UserGroupId = groupId
+                    });
+                }
+            }
+
+            db.BulkInsertRecords(toInsert);
+        }
+
+        /// <summary>
+        /// Assigns one permission for a user to many entities
+        /// </summary>
+        /// <param name="groupId"></param>
+        /// <param name="permission"></param>
+        /// <param name="entityIds"></param>
+        public void AssignPermission(int groupId, char permission, params int[] entityIds)
+        {
+            var db = UnitOfWork.Database;
+
+            var sql = "DELETE FROM umbracoUserGroup2NodePermission WHERE userGroupId = @groupId AND permission=@permission AND nodeId in (@entityIds)";
+            db.Execute(sql,
+            new
+            {
+                groupId,
+                permission = permission.ToString(CultureInfo.InvariantCulture),
+                entityIds
+            });
+
+            var actions = entityIds.Select(id => new UserGroup2NodePermissionDto
+            {
+                NodeId = id,
+                Permission = permission.ToString(CultureInfo.InvariantCulture),
+                UserGroupId = groupId
+            }).ToArray();
+
+            db.BulkInsertRecords(actions);
+        }
+
+        /// <summary>
+        /// Assigns one permission to an entity for multiple groups
+        /// </summary>
+        /// <param name="entity"></param>
+        /// <param name="permission"></param>
+        /// <param name="groupIds"></param>
+        public void AssignEntityPermission(TEntity entity, char permission, IEnumerable<int> groupIds)
+        {
+            var db = UnitOfWork.Database;
+            var groupIdsA = groupIds.ToArray();
+
+            const string sql = "DELETE FROM umbracoUserGroup2NodePermission WHERE nodeId = @nodeId AND permission = @permission AND userGroupId in (@groupIds)";
+            db.Execute(sql,
+                new
+                {
+                    nodeId = entity.Id,
+                    permission = permission.ToString(CultureInfo.InvariantCulture),
+                    groupIds = groupIdsA
+                });
+
+            var actions = groupIdsA.Select(id => new UserGroup2NodePermissionDto
+            {
+                NodeId = entity.Id,
+                Permission = permission.ToString(CultureInfo.InvariantCulture),
+                UserGroupId = id
+            }).ToArray();
+
+            db.BulkInsertRecords(actions);
+        }
+
+        /// <summary>
+        /// Assigns permissions to an entity for multiple group/permission entries
+        /// </summary>
+        /// <param name="permissionSet">
+        /// </param>
+        /// <remarks>
+        /// This will first clear the permissions for this entity then re-create them
+        /// </remarks>
+        public void ReplaceEntityPermissions(EntityPermissionSet permissionSet)
+        {
+            var db = UnitOfWork.Database;
+
+            const string sql = "DELETE FROM umbracoUserGroup2NodePermission WHERE nodeId = @nodeId";
+            db.Execute(sql, new { nodeId = permissionSet.EntityId });
+
+            var toInsert = new List<UserGroup2NodePermissionDto>();
+            foreach (var entityPermission in permissionSet.PermissionsSet)
+            {
+                foreach (var permission in entityPermission.AssignedPermissions)
+                {
+                    toInsert.Add(new UserGroup2NodePermissionDto
+                    {
+                        NodeId = permissionSet.EntityId,
+                        Permission = permission,
+                        UserGroupId = entityPermission.UserGroupId
+                    });
+                }
+            }
+
+            db.BulkInsertRecords(toInsert);
+        }
+
+        #region Not implemented (don't need to for the purposes of this repo)
+
+        protected override ContentPermissionSet PerformGet(int id)
+        {
+            throw new WontImplementException();
+        }
+
+        protected override IEnumerable<ContentPermissionSet> PerformGetAll(params int[] ids)
+        {
+            throw new WontImplementException();
+        }
+
+        protected override IEnumerable<ContentPermissionSet> PerformGetByQuery(IQuery<ContentPermissionSet> query)
+        {
+            throw new WontImplementException();
+        }
+
+        protected override Sql<ISqlContext> GetBaseQuery(bool isCount)
+        {
+            throw new WontImplementException();
+        }
+
+        protected override string GetBaseWhereClause()
+        {
+            throw new WontImplementException();
+        }
+
+        protected override IEnumerable<string> GetDeleteClauses()
+        {
+            return new List<string>();
+        }
+
+        protected override Guid NodeObjectTypeId => throw new WontImplementException();
+
+        protected override void PersistDeletedItem(ContentPermissionSet entity)
+        {
+            throw new WontImplementException();
+        }
+
+        #endregion
+
+        /// <summary>
+        /// Used to add or update entity permissions during a content item being updated
+        /// </summary>
+        /// <param name="entity"></param>
+        protected override void PersistNewItem(ContentPermissionSet entity)
+        {
+            //does the same thing as update
+            PersistUpdatedItem(entity);
+        }
+
+        /// <summary>
+        /// Used to add or update entity permissions during a content item being updated
+        /// </summary>
+        /// <param name="entity"></param>
+        protected override void PersistUpdatedItem(ContentPermissionSet entity)
+        {
+            var asAggregateRoot = (IAggregateRoot)entity;
+            if (asAggregateRoot.HasIdentity == false)
+            {
+                throw new InvalidOperationException("Cannot create permissions for an entity without an Id");
+            }
+
+            ReplaceEntityPermissions(entity);
+        }
+
+        private static EntityPermissionCollection ConvertToPermissionList(IEnumerable<UserGroup2NodePermissionDto> result)
+        {
+            var permissions = new EntityPermissionCollection();
+            var nodePermissions = result.GroupBy(x => x.NodeId);
+            foreach (var np in nodePermissions)
+            {
+                var userGroupPermissions = np.GroupBy(x => x.UserGroupId);
+                foreach (var permission in userGroupPermissions)
+                {
+                    var perms = permission.Select(x => x.Permission).Distinct().ToArray();
+                    permissions.Add(new EntityPermission(permission.Key, np.Key, perms));
+                }
+            }
+
+            return permissions;
+        }
+    }
+}
diff --git a/src/Umbraco.Core/Persistence/Repositories/PublicAccessRepository.cs b/src/Umbraco.Core/Persistence/Repositories/Implement/PublicAccessRepository.cs
similarity index 97%
rename from src/Umbraco.Core/Persistence/Repositories/PublicAccessRepository.cs
rename to src/Umbraco.Core/Persistence/Repositories/Implement/PublicAccessRepository.cs
index 1f5f322e61..2883bb1dbd 100644
--- a/src/Umbraco.Core/Persistence/Repositories/PublicAccessRepository.cs
+++ b/src/Umbraco.Core/Persistence/Repositories/Implement/PublicAccessRepository.cs
@@ -10,7 +10,7 @@ using Umbraco.Core.Persistence.Factories;
 using Umbraco.Core.Persistence.Querying;
 using Umbraco.Core.Persistence.UnitOfWork;
 
-namespace Umbraco.Core.Persistence.Repositories
+namespace Umbraco.Core.Persistence.Repositories.Implement
 {
     internal class PublicAccessRepository : NPocoRepositoryBase<Guid, PublicAccessEntry>, IPublicAccessRepository
     {
@@ -26,7 +26,7 @@ namespace Umbraco.Core.Persistence.Repositories
         protected override PublicAccessEntry PerformGet(Guid id)
         {
             //return from GetAll - this will be cached as a collection
-            return GetAll().FirstOrDefault(x => x.Key == id);
+            return GetMany().FirstOrDefault(x => x.Key == id);
         }
 
         protected override IEnumerable<PublicAccessEntry> PerformGetAll(params Guid[] ids)
diff --git a/src/Umbraco.Core/Persistence/Repositories/QueryType.cs b/src/Umbraco.Core/Persistence/Repositories/Implement/QueryType.cs
similarity index 89%
rename from src/Umbraco.Core/Persistence/Repositories/QueryType.cs
rename to src/Umbraco.Core/Persistence/Repositories/Implement/QueryType.cs
index 319a24f6d7..8b7ab9285a 100644
--- a/src/Umbraco.Core/Persistence/Repositories/QueryType.cs
+++ b/src/Umbraco.Core/Persistence/Repositories/Implement/QueryType.cs
@@ -1,4 +1,4 @@
-namespace Umbraco.Core.Persistence.Repositories
+namespace Umbraco.Core.Persistence.Repositories.Implement
 {
     /// <summary>
     /// Specifies the type of base query.
diff --git a/src/Umbraco.Core/Persistence/Repositories/RedirectUrlRepository.cs b/src/Umbraco.Core/Persistence/Repositories/Implement/RedirectUrlRepository.cs
similarity index 99%
rename from src/Umbraco.Core/Persistence/Repositories/RedirectUrlRepository.cs
rename to src/Umbraco.Core/Persistence/Repositories/Implement/RedirectUrlRepository.cs
index cd14aa227c..8d01c48750 100644
--- a/src/Umbraco.Core/Persistence/Repositories/RedirectUrlRepository.cs
+++ b/src/Umbraco.Core/Persistence/Repositories/Implement/RedirectUrlRepository.cs
@@ -9,7 +9,7 @@ using Umbraco.Core.Models.Rdbms;
 using Umbraco.Core.Persistence.Querying;
 using Umbraco.Core.Persistence.UnitOfWork;
 
-namespace Umbraco.Core.Persistence.Repositories
+namespace Umbraco.Core.Persistence.Repositories.Implement
 {
     internal class RedirectUrlRepository : NPocoRepositoryBase<Guid, IRedirectUrl>, IRedirectUrlRepository
     {
diff --git a/src/Umbraco.Core/Persistence/Repositories/RelationRepository.cs b/src/Umbraco.Core/Persistence/Repositories/Implement/RelationRepository.cs
similarity index 95%
rename from src/Umbraco.Core/Persistence/Repositories/RelationRepository.cs
rename to src/Umbraco.Core/Persistence/Repositories/Implement/RelationRepository.cs
index 3b9d109761..4b2583e2f0 100644
--- a/src/Umbraco.Core/Persistence/Repositories/RelationRepository.cs
+++ b/src/Umbraco.Core/Persistence/Repositories/Implement/RelationRepository.cs
@@ -1,165 +1,163 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using LightInject;
-using NPoco;
-using Umbraco.Core.Cache;
-using Umbraco.Core.Composing;
-using Umbraco.Core.Composing.CompositionRoots;
-using Umbraco.Core.Logging;
-using Umbraco.Core.Models;
-using Umbraco.Core.Models.EntityBase;
-using Umbraco.Core.Models.Rdbms;
-
-using Umbraco.Core.Persistence.Factories;
-using Umbraco.Core.Persistence.Querying;
-using Umbraco.Core.Persistence.UnitOfWork;
-
-namespace Umbraco.Core.Persistence.Repositories
-{
-    /// <summary>
-    /// Represents a repository for doing CRUD operations for <see cref="Relation"/>
-    /// </summary>
-    internal class RelationRepository : NPocoRepositoryBase<int, IRelation>, IRelationRepository
-    {
-        private readonly IRelationTypeRepository _relationTypeRepository;
-
-        public RelationRepository(IScopeUnitOfWork work, [Inject(RepositoryCompositionRoot.DisabledCache)] CacheHelper cache, ILogger logger, IRelationTypeRepository relationTypeRepository)
-            : base(work, cache, logger)
-        {
-            _relationTypeRepository = relationTypeRepository;
-        }
-
-        #region Overrides of RepositoryBase<int,Relation>
-
-        protected override IRelation PerformGet(int id)
-        {
-            var sql = GetBaseQuery(false);
-            sql.Where(GetBaseWhereClause(), new { id });
-
-            var dto = Database.Fetch<RelationDto>(SqlSyntax.SelectTop(sql, 1)).FirstOrDefault();
-            if (dto == null)
-                return null;
-
-            var relationType = _relationTypeRepository.Get(dto.RelationType);
-            if (relationType == null)
-                throw new Exception(string.Format("RelationType with Id: {0} doesn't exist", dto.RelationType));
-
-            var factory = new RelationFactory(relationType);
-            return DtoToEntity(dto, factory);
-        }
-
-        protected override IEnumerable<IRelation> PerformGetAll(params int[] ids)
-        {
-            var sql = GetBaseQuery(false);
-            if (ids.Length > 0)
-                sql.WhereIn<RelationDto>(x => x.Id, ids);
-            sql.OrderBy<RelationDto>(x => x.RelationType);
-            var dtos = Database.Fetch<RelationDto>(sql);
-            return DtosToEntities(dtos);
-        }
-
-        protected override IEnumerable<IRelation> PerformGetByQuery(IQuery<IRelation> query)
-        {
-            var sqlClause = GetBaseQuery(false);
-            var translator = new SqlTranslator<IRelation>(sqlClause, query);
-            var sql = translator.Translate();
-            sql.OrderBy<RelationDto>(x => x.RelationType);
-            var dtos = Database.Fetch<RelationDto>(sql);
-            return DtosToEntities(dtos);
-        }
-
-        private IEnumerable<IRelation> DtosToEntities(IEnumerable<RelationDto> dtos)
-        {
-            // in most cases, the relation type will be the same for all of them,
-            // plus we've ordered the relations by type, so try to allocate as few
-            // factories as possible - bearing in mind that relation types are cached
-            RelationFactory factory = null;
-            var relationTypeId = -1;
-
-            return dtos.Select(x =>
-            {
-                if (relationTypeId != x.RelationType)
-                    factory = new RelationFactory(_relationTypeRepository.Get(relationTypeId = x.RelationType));
-                return DtoToEntity(x, factory);
-            }).ToList();
-        }
-
-        private static IRelation DtoToEntity(RelationDto dto, RelationFactory factory)
-        {
-            var entity = factory.BuildEntity(dto);
-
-            // reset dirty initial properties (U4-1946)
-            ((TracksChangesEntityBase)entity).ResetDirtyProperties(false);
-
-            return entity;
-        }
-
-        #endregion
-
-        #region Overrides of NPocoRepositoryBase<int,Relation>
-
-        protected override Sql<ISqlContext> GetBaseQuery(bool isCount)
-        {
-            var sql = Sql();
-
-            sql = isCount
-                ? sql.SelectCount()
-                : sql.Select<RelationDto>();
-
-            sql
-               .From<RelationDto>();
-
-            return sql;
-        }
-
-        protected override string GetBaseWhereClause()
-        {
-            return "umbracoRelation.id = @id";
-        }
-
-        protected override IEnumerable<string> GetDeleteClauses()
-        {
-            var list = new List<string>
-                           {
-                               "DELETE FROM umbracoRelation WHERE id = @id"
-                           };
-            return list;
-        }
-
-        protected override Guid NodeObjectTypeId
-        {
-            get { throw new NotImplementedException(); }
-        }
-
-        #endregion
-
-        #region Unit of Work Implementation
-
-        protected override void PersistNewItem(IRelation entity)
-        {
-            ((Entity)entity).AddingEntity();
-
-            var factory = new RelationFactory(entity.RelationType);
-            var dto = factory.BuildDto(entity);
-
-            var id = Convert.ToInt32(Database.Insert(dto));
-            entity.Id = id;
-
-            entity.ResetDirtyProperties();
-        }
-
-        protected override void PersistUpdatedItem(IRelation entity)
-        {
-            ((Entity)entity).UpdatingEntity();
-
-            var factory = new RelationFactory(entity.RelationType);
-            var dto = factory.BuildDto(entity);
-            Database.Update(dto);
-
-            entity.ResetDirtyProperties();
-        }
-
-        #endregion
-    }
-}
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using LightInject;
+using NPoco;
+using Umbraco.Core.Cache;
+using Umbraco.Core.Composing.CompositionRoots;
+using Umbraco.Core.Logging;
+using Umbraco.Core.Models;
+using Umbraco.Core.Models.EntityBase;
+using Umbraco.Core.Models.Rdbms;
+using Umbraco.Core.Persistence.Factories;
+using Umbraco.Core.Persistence.Querying;
+using Umbraco.Core.Persistence.UnitOfWork;
+
+namespace Umbraco.Core.Persistence.Repositories.Implement
+{
+    /// <summary>
+    /// Represents a repository for doing CRUD operations for <see cref="Relation"/>
+    /// </summary>
+    internal class RelationRepository : NPocoRepositoryBase<int, IRelation>, IRelationRepository
+    {
+        private readonly IRelationTypeRepository _relationTypeRepository;
+
+        public RelationRepository(IScopeUnitOfWork work, [Inject(RepositoryCompositionRoot.DisabledCache)] CacheHelper cache, ILogger logger, IRelationTypeRepository relationTypeRepository)
+            : base(work, cache, logger)
+        {
+            _relationTypeRepository = relationTypeRepository;
+        }
+
+        #region Overrides of RepositoryBase<int,Relation>
+
+        protected override IRelation PerformGet(int id)
+        {
+            var sql = GetBaseQuery(false);
+            sql.Where(GetBaseWhereClause(), new { id });
+
+            var dto = Database.Fetch<RelationDto>(SqlSyntax.SelectTop(sql, 1)).FirstOrDefault();
+            if (dto == null)
+                return null;
+
+            var relationType = _relationTypeRepository.Get(dto.RelationType);
+            if (relationType == null)
+                throw new Exception(string.Format("RelationType with Id: {0} doesn't exist", dto.RelationType));
+
+            var factory = new RelationFactory(relationType);
+            return DtoToEntity(dto, factory);
+        }
+
+        protected override IEnumerable<IRelation> PerformGetAll(params int[] ids)
+        {
+            var sql = GetBaseQuery(false);
+            if (ids.Length > 0)
+                sql.WhereIn<RelationDto>(x => x.Id, ids);
+            sql.OrderBy<RelationDto>(x => x.RelationType);
+            var dtos = Database.Fetch<RelationDto>(sql);
+            return DtosToEntities(dtos);
+        }
+
+        protected override IEnumerable<IRelation> PerformGetByQuery(IQuery<IRelation> query)
+        {
+            var sqlClause = GetBaseQuery(false);
+            var translator = new SqlTranslator<IRelation>(sqlClause, query);
+            var sql = translator.Translate();
+            sql.OrderBy<RelationDto>(x => x.RelationType);
+            var dtos = Database.Fetch<RelationDto>(sql);
+            return DtosToEntities(dtos);
+        }
+
+        private IEnumerable<IRelation> DtosToEntities(IEnumerable<RelationDto> dtos)
+        {
+            // in most cases, the relation type will be the same for all of them,
+            // plus we've ordered the relations by type, so try to allocate as few
+            // factories as possible - bearing in mind that relation types are cached
+            RelationFactory factory = null;
+            var relationTypeId = -1;
+
+            return dtos.Select(x =>
+            {
+                if (relationTypeId != x.RelationType)
+                    factory = new RelationFactory(_relationTypeRepository.Get(relationTypeId = x.RelationType));
+                return DtoToEntity(x, factory);
+            }).ToList();
+        }
+
+        private static IRelation DtoToEntity(RelationDto dto, RelationFactory factory)
+        {
+            var entity = factory.BuildEntity(dto);
+
+            // reset dirty initial properties (U4-1946)
+            ((TracksChangesEntityBase)entity).ResetDirtyProperties(false);
+
+            return entity;
+        }
+
+        #endregion
+
+        #region Overrides of NPocoRepositoryBase<int,Relation>
+
+        protected override Sql<ISqlContext> GetBaseQuery(bool isCount)
+        {
+            var sql = Sql();
+
+            sql = isCount
+                ? sql.SelectCount()
+                : sql.Select<RelationDto>();
+
+            sql
+               .From<RelationDto>();
+
+            return sql;
+        }
+
+        protected override string GetBaseWhereClause()
+        {
+            return "umbracoRelation.id = @id";
+        }
+
+        protected override IEnumerable<string> GetDeleteClauses()
+        {
+            var list = new List<string>
+                           {
+                               "DELETE FROM umbracoRelation WHERE id = @id"
+                           };
+            return list;
+        }
+
+        protected override Guid NodeObjectTypeId
+        {
+            get { throw new NotImplementedException(); }
+        }
+
+        #endregion
+
+        #region Unit of Work Implementation
+
+        protected override void PersistNewItem(IRelation entity)
+        {
+            ((Entity)entity).AddingEntity();
+
+            var factory = new RelationFactory(entity.RelationType);
+            var dto = factory.BuildDto(entity);
+
+            var id = Convert.ToInt32(Database.Insert(dto));
+            entity.Id = id;
+
+            entity.ResetDirtyProperties();
+        }
+
+        protected override void PersistUpdatedItem(IRelation entity)
+        {
+            ((Entity)entity).UpdatingEntity();
+
+            var factory = new RelationFactory(entity.RelationType);
+            var dto = factory.BuildDto(entity);
+            Database.Update(dto);
+
+            entity.ResetDirtyProperties();
+        }
+
+        #endregion
+    }
+}
diff --git a/src/Umbraco.Core/Persistence/Repositories/RelationTypeRepository.cs b/src/Umbraco.Core/Persistence/Repositories/Implement/RelationTypeRepository.cs
similarity index 91%
rename from src/Umbraco.Core/Persistence/Repositories/RelationTypeRepository.cs
rename to src/Umbraco.Core/Persistence/Repositories/Implement/RelationTypeRepository.cs
index 2085a7cfb9..00ee49bda1 100644
--- a/src/Umbraco.Core/Persistence/Repositories/RelationTypeRepository.cs
+++ b/src/Umbraco.Core/Persistence/Repositories/Implement/RelationTypeRepository.cs
@@ -1,160 +1,160 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using NPoco;
-using Umbraco.Core.Cache;
-using Umbraco.Core.Logging;
-using Umbraco.Core.Models;
-using Umbraco.Core.Models.EntityBase;
-using Umbraco.Core.Models.Rdbms;
-using Umbraco.Core.Persistence.Factories;
-using Umbraco.Core.Persistence.Querying;
-using Umbraco.Core.Persistence.UnitOfWork;
-
-namespace Umbraco.Core.Persistence.Repositories
-{
-    /// <summary>
-    /// Represents a repository for doing CRUD operations for <see cref="RelationType"/>
-    /// </summary>
-    internal class RelationTypeRepository : NPocoRepositoryBase<int, IRelationType>, IRelationTypeRepository
-    {
-        public RelationTypeRepository(IScopeUnitOfWork work, CacheHelper cache, ILogger logger)
-            : base(work, cache, logger)
-        { }
-
-        protected override IRepositoryCachePolicy<IRelationType, int> CreateCachePolicy(IRuntimeCacheProvider runtimeCache)
-        {
-            return new FullDataSetRepositoryCachePolicy<IRelationType, int>(runtimeCache, GetEntityId, /*expires:*/ true);
-        }
-
-        #region Overrides of RepositoryBase<int,RelationType>
-
-        protected override IRelationType PerformGet(int id)
-        {
-            // use the underlying GetAll which will force cache all content types
-            return GetAll().FirstOrDefault(x => x.Id == id);
-        }
-
-        public IRelationType Get(Guid id)
-        {
-            // use the underlying GetAll which will force cache all content types
-            return GetAll().FirstOrDefault(x => x.Key == id);
-        }
-
-        public bool Exists(Guid id)
-        {
-            return Get(id) != null;
-        }
-
-        protected override IEnumerable<IRelationType> PerformGetAll(params int[] ids)
-        {
-            var sql = GetBaseQuery(false);
-
-            // should not happen due to the cache policy
-            if (ids.Any())
-                throw new NotImplementedException();
-
-            var dtos = Database.Fetch<RelationTypeDto>(sql);
-            var factory = new RelationTypeFactory();
-            return dtos.Select(x => DtoToEntity(x, factory));
-        }
-
-        public IEnumerable<IRelationType> GetAll(params Guid[] ids)
-        {
-            // should not happen due to the cache policy
-            if (ids.Any())
-                throw new NotImplementedException();
-
-            return GetAll(new int[0]);
-        }
-
-        protected override IEnumerable<IRelationType> PerformGetByQuery(IQuery<IRelationType> query)
-        {
-            var sqlClause = GetBaseQuery(false);
-            var translator = new SqlTranslator<IRelationType>(sqlClause, query);
-            var sql = translator.Translate();
-
-            var dtos = Database.Fetch<RelationTypeDto>(sql);
-            var factory = new RelationTypeFactory();
-            return dtos.Select(x => DtoToEntity(x, factory));
-        }
-
-        private static IRelationType DtoToEntity(RelationTypeDto dto, RelationTypeFactory factory)
-        {
-            var entity = factory.BuildEntity(dto);
-
-            // reset dirty initial properties (U4-1946)
-            ((TracksChangesEntityBase) entity).ResetDirtyProperties(false);
-
-            return entity;
-        }
-
-        #endregion
-
-        #region Overrides of NPocoRepositoryBase<int,RelationType>
-
-        protected override Sql<ISqlContext> GetBaseQuery(bool isCount)
-        {
-            var sql = Sql();
-
-            sql = isCount
-                ? sql.SelectCount()
-                : sql.Select<RelationTypeDto>();
-
-            sql
-               .From<RelationTypeDto>();
-
-            return sql;
-        }
-
-        protected override string GetBaseWhereClause()
-        {
-            return "umbracoRelationType.id = @id";
-        }
-
-        protected override IEnumerable<string> GetDeleteClauses()
-        {
-            var list = new List<string>
-                           {
-                               "DELETE FROM umbracoRelation WHERE relType = @id",
-                               "DELETE FROM umbracoRelationType WHERE id = @id"
-                           };
-            return list;
-        }
-
-        protected override Guid NodeObjectTypeId
-        {
-            get { throw new NotImplementedException(); }
-        }
-
-        #endregion
-
-        #region Unit of Work Implementation
-
-        protected override void PersistNewItem(IRelationType entity)
-        {
-            ((Entity)entity).AddingEntity();
-
-            var factory = new RelationTypeFactory();
-            var dto = factory.BuildDto(entity);
-
-            var id = Convert.ToInt32(Database.Insert(dto));
-            entity.Id = id;
-
-            entity.ResetDirtyProperties();
-        }
-
-        protected override void PersistUpdatedItem(IRelationType entity)
-        {
-            ((Entity)entity).UpdatingEntity();
-
-            var factory = new RelationTypeFactory();
-            var dto = factory.BuildDto(entity);
-            Database.Update(dto);
-
-            entity.ResetDirtyProperties();
-        }
-
-        #endregion
-    }
-}
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using NPoco;
+using Umbraco.Core.Cache;
+using Umbraco.Core.Logging;
+using Umbraco.Core.Models;
+using Umbraco.Core.Models.EntityBase;
+using Umbraco.Core.Models.Rdbms;
+using Umbraco.Core.Persistence.Factories;
+using Umbraco.Core.Persistence.Querying;
+using Umbraco.Core.Persistence.UnitOfWork;
+
+namespace Umbraco.Core.Persistence.Repositories.Implement
+{
+    /// <summary>
+    /// Represents a repository for doing CRUD operations for <see cref="RelationType"/>
+    /// </summary>
+    internal class RelationTypeRepository : NPocoRepositoryBase<int, IRelationType>, IRelationTypeRepository
+    {
+        public RelationTypeRepository(IScopeUnitOfWork work, CacheHelper cache, ILogger logger)
+            : base(work, cache, logger)
+        { }
+
+        protected override IRepositoryCachePolicy<IRelationType, int> CreateCachePolicy(IRuntimeCacheProvider runtimeCache)
+        {
+            return new FullDataSetRepositoryCachePolicy<IRelationType, int>(runtimeCache, GetEntityId, /*expires:*/ true);
+        }
+
+        #region Overrides of RepositoryBase<int,RelationType>
+
+        protected override IRelationType PerformGet(int id)
+        {
+            // use the underlying GetAll which will force cache all content types
+            return GetMany().FirstOrDefault(x => x.Id == id);
+        }
+
+        public IRelationType Get(Guid id)
+        {
+            // use the underlying GetAll which will force cache all content types
+            return GetMany().FirstOrDefault(x => x.Key == id);
+        }
+
+        public bool Exists(Guid id)
+        {
+            return Get(id) != null;
+        }
+
+        protected override IEnumerable<IRelationType> PerformGetAll(params int[] ids)
+        {
+            var sql = GetBaseQuery(false);
+
+            // should not happen due to the cache policy
+            if (ids.Any())
+                throw new NotImplementedException();
+
+            var dtos = Database.Fetch<RelationTypeDto>(sql);
+            var factory = new RelationTypeFactory();
+            return dtos.Select(x => DtoToEntity(x, factory));
+        }
+
+        public IEnumerable<IRelationType> GetMany(params Guid[] ids)
+        {
+            // should not happen due to the cache policy
+            if (ids.Any())
+                throw new NotImplementedException();
+
+            return GetMany(new int[0]);
+        }
+
+        protected override IEnumerable<IRelationType> PerformGetByQuery(IQuery<IRelationType> query)
+        {
+            var sqlClause = GetBaseQuery(false);
+            var translator = new SqlTranslator<IRelationType>(sqlClause, query);
+            var sql = translator.Translate();
+
+            var dtos = Database.Fetch<RelationTypeDto>(sql);
+            var factory = new RelationTypeFactory();
+            return dtos.Select(x => DtoToEntity(x, factory));
+        }
+
+        private static IRelationType DtoToEntity(RelationTypeDto dto, RelationTypeFactory factory)
+        {
+            var entity = factory.BuildEntity(dto);
+
+            // reset dirty initial properties (U4-1946)
+            ((TracksChangesEntityBase) entity).ResetDirtyProperties(false);
+
+            return entity;
+        }
+
+        #endregion
+
+        #region Overrides of NPocoRepositoryBase<int,RelationType>
+
+        protected override Sql<ISqlContext> GetBaseQuery(bool isCount)
+        {
+            var sql = Sql();
+
+            sql = isCount
+                ? sql.SelectCount()
+                : sql.Select<RelationTypeDto>();
+
+            sql
+               .From<RelationTypeDto>();
+
+            return sql;
+        }
+
+        protected override string GetBaseWhereClause()
+        {
+            return "umbracoRelationType.id = @id";
+        }
+
+        protected override IEnumerable<string> GetDeleteClauses()
+        {
+            var list = new List<string>
+                           {
+                               "DELETE FROM umbracoRelation WHERE relType = @id",
+                               "DELETE FROM umbracoRelationType WHERE id = @id"
+                           };
+            return list;
+        }
+
+        protected override Guid NodeObjectTypeId
+        {
+            get { throw new NotImplementedException(); }
+        }
+
+        #endregion
+
+        #region Unit of Work Implementation
+
+        protected override void PersistNewItem(IRelationType entity)
+        {
+            ((Entity)entity).AddingEntity();
+
+            var factory = new RelationTypeFactory();
+            var dto = factory.BuildDto(entity);
+
+            var id = Convert.ToInt32(Database.Insert(dto));
+            entity.Id = id;
+
+            entity.ResetDirtyProperties();
+        }
+
+        protected override void PersistUpdatedItem(IRelationType entity)
+        {
+            ((Entity)entity).UpdatingEntity();
+
+            var factory = new RelationTypeFactory();
+            var dto = factory.BuildDto(entity);
+            Database.Update(dto);
+
+            entity.ResetDirtyProperties();
+        }
+
+        #endregion
+    }
+}
diff --git a/src/Umbraco.Core/Persistence/Repositories/RepositoryBaseOfTIdTEntity.cs b/src/Umbraco.Core/Persistence/Repositories/Implement/RepositoryBaseOfTIdTEntity.cs
similarity index 91%
rename from src/Umbraco.Core/Persistence/Repositories/RepositoryBaseOfTIdTEntity.cs
rename to src/Umbraco.Core/Persistence/Repositories/Implement/RepositoryBaseOfTIdTEntity.cs
index ef4ea02d18..b23e347e79 100644
--- a/src/Umbraco.Core/Persistence/Repositories/RepositoryBaseOfTIdTEntity.cs
+++ b/src/Umbraco.Core/Persistence/Repositories/Implement/RepositoryBaseOfTIdTEntity.cs
@@ -8,21 +8,31 @@ using Umbraco.Core.Persistence.Querying;
 using Umbraco.Core.Persistence.UnitOfWork;
 using Umbraco.Core.Scoping;
 
-namespace Umbraco.Core.Persistence.Repositories
+namespace Umbraco.Core.Persistence.Repositories.Implement
 {
     /// <summary>
     /// Provides a base class to all repositories.
     /// </summary>
     /// <typeparam name="TEntity">The type of the entity managed by this repository.</typeparam>
     /// <typeparam name="TId">The type of the entity's unique identifier.</typeparam>
-    internal abstract class RepositoryBase<TId, TEntity> : RepositoryBase, IReadRepository<TId, TEntity>, IWriteRepository<TEntity>, IQueryRepository<TId, TEntity>, IUnitOfWorkRepository
+    internal abstract class RepositoryBase<TId, TEntity> : IReadWriteQueryRepository<TId, TEntity>, IUnitOfWorkRepository
         where TEntity : class, IAggregateRoot
     {
         private IRepositoryCachePolicy<TEntity, TId> _cachePolicy;
+        private IRuntimeCacheProvider _isolatedCache;
 
         protected RepositoryBase(IScopeUnitOfWork work, CacheHelper cache, ILogger logger)
-            : base(work, cache, logger)
-        { }
+        {
+            Logger = logger ?? throw new ArgumentNullException(nameof(logger));
+            UnitOfWork = work ?? throw new ArgumentNullException(nameof(work));
+            GlobalCache = cache ?? throw new ArgumentNullException(nameof(cache));
+        }
+
+        protected IScopeUnitOfWork UnitOfWork { get; }
+
+        protected CacheHelper GlobalCache { get; }
+
+        protected ILogger Logger { get; }
 
         #region Static Queries
 
@@ -38,8 +48,7 @@ namespace Umbraco.Core.Persistence.Repositories
         /// <summary>
         /// The runtime cache used for this repo by default is the isolated cache for this type
         /// </summary>
-        private IRuntimeCacheProvider _isolatedCache;
-        protected override IRuntimeCacheProvider IsolatedCache
+        protected IRuntimeCacheProvider IsolatedCache
         {
             get
             {
@@ -155,12 +164,12 @@ namespace Umbraco.Core.Persistence.Repositories
         /// </summary>
         /// <remarks>This method is backed by an <see cref="IRuntimeCacheProvider"/> cache</remarks>
         /// <param name="entity"></param>
-        public void AddOrUpdate(TEntity entity)
+        public void Save(TEntity entity)
         {
             if (entity.HasIdentity == false)
-                UnitOfWork.RegisterCreated(entity, this);
+                PersistNewItem(entity);
             else
-                UnitOfWork.RegisterUpdated(entity, this);
+                PersistUpdatedItem(entity);
         }
 
         /// <summary>
@@ -169,7 +178,7 @@ namespace Umbraco.Core.Persistence.Repositories
         /// <param name="entity"></param>
         public virtual void Delete(TEntity entity)
         {
-            UnitOfWork?.RegisterDeleted(entity, this);
+            PersistDeletedItem(entity);
         }
 
         protected abstract TEntity PerformGet(TId id);
@@ -197,7 +206,7 @@ namespace Umbraco.Core.Persistence.Repositories
         /// </summary>
         /// <param name="ids"></param>
         /// <returns></returns>
-        public IEnumerable<TEntity> GetAll(params TId[] ids)
+        public IEnumerable<TEntity> GetMany(params TId[] ids)
         {
             //ensure they are de-duplicated, easy win if people don't do this as this can cause many excess queries
             ids = ids.Distinct()
@@ -219,7 +228,7 @@ namespace Umbraco.Core.Persistence.Repositories
         /// </summary>
         /// <param name="query"></param>
         /// <returns></returns>
-        public IEnumerable<TEntity> GetByQuery(IQuery<TEntity> query)
+        public IEnumerable<TEntity> Get(IQuery<TEntity> query)
         {
             return PerformGetByQuery(query)
                 //ensure we don't include any null refs in the returned collection!
diff --git a/src/Umbraco.Core/Persistence/Repositories/Implement/RepositoryCacheKeys.cs b/src/Umbraco.Core/Persistence/Repositories/Implement/RepositoryCacheKeys.cs
new file mode 100644
index 0000000000..09a7c021f8
--- /dev/null
+++ b/src/Umbraco.Core/Persistence/Repositories/Implement/RepositoryCacheKeys.cs
@@ -0,0 +1,21 @@
+using System;
+using System.Collections.Generic;
+
+namespace Umbraco.Core.Persistence.Repositories.Implement
+{
+    /// <summary>
+    /// Provides cache keys for repositories.
+    /// </summary>
+    internal static class RepositoryCacheKeys
+    {
+        private static readonly Dictionary<Type, string> Keys = new Dictionary<Type, string>();
+
+        public static string GetKey<T>()
+        {
+            var type = typeof(T);
+            return Keys.TryGetValue(type, out var key) ? key : (Keys[type] = "uRepo_" + type.Name + "_");
+        }
+
+        public static string GetKey<T>(object id) => GetKey<T>() + id;
+    }
+}
diff --git a/src/Umbraco.Core/Persistence/Repositories/ScriptRepository.cs b/src/Umbraco.Core/Persistence/Repositories/Implement/ScriptRepository.cs
similarity index 92%
rename from src/Umbraco.Core/Persistence/Repositories/ScriptRepository.cs
rename to src/Umbraco.Core/Persistence/Repositories/Implement/ScriptRepository.cs
index 17875317c2..d2a1debb76 100644
--- a/src/Umbraco.Core/Persistence/Repositories/ScriptRepository.cs
+++ b/src/Umbraco.Core/Persistence/Repositories/Implement/ScriptRepository.cs
@@ -1,134 +1,134 @@
-using System;
-using System.Collections.Generic;
-using System.IO;
-using System.Linq;
-using LightInject;
-using Umbraco.Core.Configuration.UmbracoSettings;
-using Umbraco.Core.IO;
-using Umbraco.Core.Models;
-using Umbraco.Core.Persistence.UnitOfWork;
-
-namespace Umbraco.Core.Persistence.Repositories
-{
-    /// <summary>
-    /// Represents the Script Repository
-    /// </summary>
-    internal class ScriptRepository : FileRepository<string, Script>, IScriptRepository
-    {
-        private readonly IContentSection _contentConfig;
-
-        public ScriptRepository(IUnitOfWork work, [Inject("ScriptFileSystem")] IFileSystem fileSystem, IContentSection contentConfig)
-            : base(work, fileSystem)
-        {
-            if (contentConfig == null) throw new ArgumentNullException(nameof(contentConfig));
-            _contentConfig = contentConfig;
-        }
-
-        #region Implementation of IRepository<string,Script>
-
-        public override Script Get(string id)
-        {
-            // get the relative path within the filesystem
-            // (though... id should be relative already)
-            var path = FileSystem.GetRelativePath(id);
-
-            if (FileSystem.FileExists(path) == false)
-                return null;
-
-            // content will be lazy-loaded when required
-            var created = FileSystem.GetCreated(path).UtcDateTime;
-            var updated = FileSystem.GetLastModified(path).UtcDateTime;
-            //var content = GetFileContent(path);
-
-            var script = new Script(path, file => GetFileContent(file.OriginalPath))
-            {
-                //id can be the hash
-                Id = path.GetHashCode(),
-                Key = path.EncodeAsGuid(),
-                //Content = content,
-                CreateDate = created,
-                UpdateDate = updated,
-                VirtualPath = FileSystem.GetUrl(path)
-            };
-
-            // reset dirty initial properties (U4-1946)
-            script.ResetDirtyProperties(false);
-
-            return script;
-        }
-
-        public override void AddOrUpdate(Script entity)
-        {
-            base.AddOrUpdate(entity);
-
-            // ensure that from now on, content is lazy-loaded
-            if (entity.GetFileContent == null)
-                entity.GetFileContent = file => GetFileContent(file.OriginalPath);
-        }
-
-        public override IEnumerable<Script> GetAll(params string[] ids)
-        {
-            //ensure they are de-duplicated, easy win if people don't do this as this can cause many excess queries
-            ids = ids.Distinct().ToArray();
-
-            if (ids.Any())
-            {
-                foreach (var id in ids)
-                {
-                    yield return Get(id);
-                }
-            }
-            else
-            {
-                var files = FindAllFiles("", "*.*");
-                foreach (var file in files)
-                {
-                    yield return Get(file);
-                }
-            }
-        }
-
-        public bool ValidateScript(Script script)
-        {
-            // get full path
-            string fullPath;
-            try
-            {
-                // may throw for security reasons
-                fullPath = FileSystem.GetFullPath(script.Path);
-            }
-            catch
-            {
-                return false;
-            }
-
-            // validate path & extension
-            var validDir = SystemDirectories.Scripts;
-            var isValidPath = IOHelper.VerifyEditPath(fullPath, validDir);
-            var validExts = _contentConfig.ScriptFileTypes.ToList();
-            var isValidExtension = IOHelper.VerifyFileExtension(script.Path, validExts);
-            return isValidPath && isValidExtension;
-        }
-
-        public Stream GetFileContentStream(string filepath)
-        {
-            if (FileSystem.FileExists(filepath) == false) return null;
-
-            try
-            {
-                return FileSystem.OpenFile(filepath);
-            }
-            catch
-            {
-                return null; // deal with race conds
-            }
-        }
-
-        public void SetFileContent(string filepath, Stream content)
-        {
-            FileSystem.AddFile(filepath, content, true);
-        }
-
-        #endregion
-    }
-}
+using System;
+using System.Collections.Generic;
+using System.IO;
+using System.Linq;
+using LightInject;
+using Umbraco.Core.Configuration.UmbracoSettings;
+using Umbraco.Core.IO;
+using Umbraco.Core.Models;
+using Umbraco.Core.Persistence.UnitOfWork;
+
+namespace Umbraco.Core.Persistence.Repositories.Implement
+{
+    /// <summary>
+    /// Represents the Script Repository
+    /// </summary>
+    internal class ScriptRepository : FileRepository<string, Script>, IScriptRepository
+    {
+        private readonly IContentSection _contentConfig;
+
+        public ScriptRepository(IUnitOfWork work, [Inject("ScriptFileSystem")] IFileSystem fileSystem, IContentSection contentConfig)
+            : base(work, fileSystem)
+        {
+            if (contentConfig == null) throw new ArgumentNullException(nameof(contentConfig));
+            _contentConfig = contentConfig;
+        }
+
+        #region Implementation of IRepository<string,Script>
+
+        public override Script Get(string id)
+        {
+            // get the relative path within the filesystem
+            // (though... id should be relative already)
+            var path = FileSystem.GetRelativePath(id);
+
+            if (FileSystem.FileExists(path) == false)
+                return null;
+
+            // content will be lazy-loaded when required
+            var created = FileSystem.GetCreated(path).UtcDateTime;
+            var updated = FileSystem.GetLastModified(path).UtcDateTime;
+            //var content = GetFileContent(path);
+
+            var script = new Script(path, file => GetFileContent(file.OriginalPath))
+            {
+                //id can be the hash
+                Id = path.GetHashCode(),
+                Key = path.EncodeAsGuid(),
+                //Content = content,
+                CreateDate = created,
+                UpdateDate = updated,
+                VirtualPath = FileSystem.GetUrl(path)
+            };
+
+            // reset dirty initial properties (U4-1946)
+            script.ResetDirtyProperties(false);
+
+            return script;
+        }
+
+        public override void Save(Script entity)
+        {
+            base.Save(entity);
+
+            // ensure that from now on, content is lazy-loaded
+            if (entity.GetFileContent == null)
+                entity.GetFileContent = file => GetFileContent(file.OriginalPath);
+        }
+
+        public override IEnumerable<Script> GetMany(params string[] ids)
+        {
+            //ensure they are de-duplicated, easy win if people don't do this as this can cause many excess queries
+            ids = ids.Distinct().ToArray();
+
+            if (ids.Any())
+            {
+                foreach (var id in ids)
+                {
+                    yield return Get(id);
+                }
+            }
+            else
+            {
+                var files = FindAllFiles("", "*.*");
+                foreach (var file in files)
+                {
+                    yield return Get(file);
+                }
+            }
+        }
+
+        public bool ValidateScript(Script script)
+        {
+            // get full path
+            string fullPath;
+            try
+            {
+                // may throw for security reasons
+                fullPath = FileSystem.GetFullPath(script.Path);
+            }
+            catch
+            {
+                return false;
+            }
+
+            // validate path & extension
+            var validDir = SystemDirectories.Scripts;
+            var isValidPath = IOHelper.VerifyEditPath(fullPath, validDir);
+            var validExts = _contentConfig.ScriptFileTypes.ToList();
+            var isValidExtension = IOHelper.VerifyFileExtension(script.Path, validExts);
+            return isValidPath && isValidExtension;
+        }
+
+        public Stream GetFileContentStream(string filepath)
+        {
+            if (FileSystem.FileExists(filepath) == false) return null;
+
+            try
+            {
+                return FileSystem.OpenFile(filepath);
+            }
+            catch
+            {
+                return null; // deal with race conds
+            }
+        }
+
+        public void SetFileContent(string filepath, Stream content)
+        {
+            FileSystem.AddFile(filepath, content, true);
+        }
+
+        #endregion
+    }
+}
diff --git a/src/Umbraco.Core/Persistence/Repositories/ServerRegistrationRepository.cs b/src/Umbraco.Core/Persistence/Repositories/Implement/ServerRegistrationRepository.cs
similarity index 93%
rename from src/Umbraco.Core/Persistence/Repositories/ServerRegistrationRepository.cs
rename to src/Umbraco.Core/Persistence/Repositories/Implement/ServerRegistrationRepository.cs
index 48b6250b33..483d1049e3 100644
--- a/src/Umbraco.Core/Persistence/Repositories/ServerRegistrationRepository.cs
+++ b/src/Umbraco.Core/Persistence/Repositories/Implement/ServerRegistrationRepository.cs
@@ -1,132 +1,132 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using NPoco;
-using Umbraco.Core.Cache;
-using Umbraco.Core.Logging;
-using Umbraco.Core.Models;
-using Umbraco.Core.Models.Rdbms;
-using Umbraco.Core.Persistence.Factories;
-using Umbraco.Core.Persistence.Querying;
-using Umbraco.Core.Persistence.UnitOfWork;
-
-namespace Umbraco.Core.Persistence.Repositories
-{
-    internal class ServerRegistrationRepository : NPocoRepositoryBase<int, IServerRegistration>, IServerRegistrationRepository
-    {
-        // fixme - should we use NoCache instead of CreateDisabledCacheHelper?!
-        public ServerRegistrationRepository(IScopeUnitOfWork work, ILogger logger)
-            : base(work, CacheHelper.CreateDisabledCacheHelper(), logger)
-        { }
-
-        protected override IRepositoryCachePolicy<IServerRegistration, int> CreateCachePolicy(IRuntimeCacheProvider runtimeCache)
-        {
-            // fixme - wtf are we doing with cache here?
-            // why are we using disabled cache helper up there?
-            //
-            // 7.6 says:
-            // note: this means that the ServerRegistrationRepository does *not* implement scoped cache,
-            // and this is because the repository is special and should not participate in scopes
-            // (cleanup in v8)
-            //
-            return new FullDataSetRepositoryCachePolicy<IServerRegistration, int>(GlobalCache.RuntimeCache, GetEntityId, /*expires:*/ false);
-        }
-
-        public void ClearCache()
-        {
-            CachePolicy.ClearAll();
-        }
-
-        protected override int PerformCount(IQuery<IServerRegistration> query)
-        {
-            throw new NotSupportedException("This repository does not support this method.");
-        }
-
-        protected override bool PerformExists(int id)
-        {
-            // use the underlying GetAll which force-caches all registrations
-            return GetAll().Any(x => x.Id == id);
-        }
-
-        protected override IServerRegistration PerformGet(int id)
-        {
-            // use the underlying GetAll which force-caches all registrations
-            return GetAll().FirstOrDefault(x => x.Id == id);
-        }
-
-        protected override IEnumerable<IServerRegistration> PerformGetAll(params int[] ids)
-        {
-            var factory = new ServerRegistrationFactory();
-            return Database.Fetch<ServerRegistrationDto>("WHERE id > 0")
-                .Select(x => factory.BuildEntity(x));
-        }
-
-        protected override IEnumerable<IServerRegistration> PerformGetByQuery(IQuery<IServerRegistration> query)
-        {
-            throw new NotSupportedException("This repository does not support this method.");
-        }
-
-        protected override Sql<ISqlContext> GetBaseQuery(bool isCount)
-        {
-            var sql = Sql();
-
-            sql = isCount
-                ? sql.SelectCount()
-                : sql.Select<ServerRegistrationDto>();
-
-            sql
-               .From<ServerRegistrationDto>();
-
-            return sql;
-        }
-
-        protected override string GetBaseWhereClause()
-        {
-            return "id = @id";
-        }
-
-        protected override IEnumerable<string> GetDeleteClauses()
-        {
-            var list = new List<string>
-                {
-                    "DELETE FROM umbracoServer WHERE id = @id"
-                };
-            return list;
-        }
-
-        protected override Guid NodeObjectTypeId => throw new NotImplementedException();
-
-        protected override void PersistNewItem(IServerRegistration entity)
-        {
-            ((ServerRegistration)entity).AddingEntity();
-
-            var factory = new ServerRegistrationFactory();
-            var dto = factory.BuildDto(entity);
-
-            var id = Convert.ToInt32(Database.Insert(dto));
-            entity.Id = id;
-
-            entity.ResetDirtyProperties();
-        }
-
-        protected override void PersistUpdatedItem(IServerRegistration entity)
-        {
-            ((ServerRegistration)entity).UpdatingEntity();
-
-            var factory = new ServerRegistrationFactory();
-            var dto = factory.BuildDto(entity);
-
-            Database.Update(dto);
-
-            entity.ResetDirtyProperties();
-        }
-
-        public void DeactiveStaleServers(TimeSpan staleTimeout)
-        {
-            var timeoutDate = DateTime.Now.Subtract(staleTimeout);
-
-            Database.Update<ServerRegistrationDto>("SET isActive=0, isMaster=0 WHERE lastNotifiedDate < @timeoutDate", new { /*timeoutDate =*/ timeoutDate });
-            ClearCache();
-        }
-    }
-}
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using NPoco;
+using Umbraco.Core.Cache;
+using Umbraco.Core.Logging;
+using Umbraco.Core.Models;
+using Umbraco.Core.Models.Rdbms;
+using Umbraco.Core.Persistence.Factories;
+using Umbraco.Core.Persistence.Querying;
+using Umbraco.Core.Persistence.UnitOfWork;
+
+namespace Umbraco.Core.Persistence.Repositories.Implement
+{
+    internal class ServerRegistrationRepository : NPocoRepositoryBase<int, IServerRegistration>, IServerRegistrationRepository
+    {
+        // fixme - should we use NoCache instead of CreateDisabledCacheHelper?!
+        public ServerRegistrationRepository(IScopeUnitOfWork work, ILogger logger)
+            : base(work, CacheHelper.CreateDisabledCacheHelper(), logger)
+        { }
+
+        protected override IRepositoryCachePolicy<IServerRegistration, int> CreateCachePolicy(IRuntimeCacheProvider runtimeCache)
+        {
+            // fixme - wtf are we doing with cache here?
+            // why are we using disabled cache helper up there?
+            //
+            // 7.6 says:
+            // note: this means that the ServerRegistrationRepository does *not* implement scoped cache,
+            // and this is because the repository is special and should not participate in scopes
+            // (cleanup in v8)
+            //
+            return new FullDataSetRepositoryCachePolicy<IServerRegistration, int>(GlobalCache.RuntimeCache, GetEntityId, /*expires:*/ false);
+        }
+
+        public void ClearCache()
+        {
+            CachePolicy.ClearAll();
+        }
+
+        protected override int PerformCount(IQuery<IServerRegistration> query)
+        {
+            throw new NotSupportedException("This repository does not support this method.");
+        }
+
+        protected override bool PerformExists(int id)
+        {
+            // use the underlying GetAll which force-caches all registrations
+            return GetMany().Any(x => x.Id == id);
+        }
+
+        protected override IServerRegistration PerformGet(int id)
+        {
+            // use the underlying GetAll which force-caches all registrations
+            return GetMany().FirstOrDefault(x => x.Id == id);
+        }
+
+        protected override IEnumerable<IServerRegistration> PerformGetAll(params int[] ids)
+        {
+            var factory = new ServerRegistrationFactory();
+            return Database.Fetch<ServerRegistrationDto>("WHERE id > 0")
+                .Select(x => factory.BuildEntity(x));
+        }
+
+        protected override IEnumerable<IServerRegistration> PerformGetByQuery(IQuery<IServerRegistration> query)
+        {
+            throw new NotSupportedException("This repository does not support this method.");
+        }
+
+        protected override Sql<ISqlContext> GetBaseQuery(bool isCount)
+        {
+            var sql = Sql();
+
+            sql = isCount
+                ? sql.SelectCount()
+                : sql.Select<ServerRegistrationDto>();
+
+            sql
+               .From<ServerRegistrationDto>();
+
+            return sql;
+        }
+
+        protected override string GetBaseWhereClause()
+        {
+            return "id = @id";
+        }
+
+        protected override IEnumerable<string> GetDeleteClauses()
+        {
+            var list = new List<string>
+                {
+                    "DELETE FROM umbracoServer WHERE id = @id"
+                };
+            return list;
+        }
+
+        protected override Guid NodeObjectTypeId => throw new NotImplementedException();
+
+        protected override void PersistNewItem(IServerRegistration entity)
+        {
+            ((ServerRegistration)entity).AddingEntity();
+
+            var factory = new ServerRegistrationFactory();
+            var dto = factory.BuildDto(entity);
+
+            var id = Convert.ToInt32(Database.Insert(dto));
+            entity.Id = id;
+
+            entity.ResetDirtyProperties();
+        }
+
+        protected override void PersistUpdatedItem(IServerRegistration entity)
+        {
+            ((ServerRegistration)entity).UpdatingEntity();
+
+            var factory = new ServerRegistrationFactory();
+            var dto = factory.BuildDto(entity);
+
+            Database.Update(dto);
+
+            entity.ResetDirtyProperties();
+        }
+
+        public void DeactiveStaleServers(TimeSpan staleTimeout)
+        {
+            var timeoutDate = DateTime.Now.Subtract(staleTimeout);
+
+            Database.Update<ServerRegistrationDto>("SET isActive=0, isMaster=0 WHERE lastNotifiedDate < @timeoutDate", new { /*timeoutDate =*/ timeoutDate });
+            ClearCache();
+        }
+    }
+}
diff --git a/src/Umbraco.Core/Persistence/Repositories/SimilarNodeName.cs b/src/Umbraco.Core/Persistence/Repositories/Implement/SimilarNodeName.cs
similarity index 98%
rename from src/Umbraco.Core/Persistence/Repositories/SimilarNodeName.cs
rename to src/Umbraco.Core/Persistence/Repositories/Implement/SimilarNodeName.cs
index 8b8b2d3658..56a520902c 100644
--- a/src/Umbraco.Core/Persistence/Repositories/SimilarNodeName.cs
+++ b/src/Umbraco.Core/Persistence/Repositories/Implement/SimilarNodeName.cs
@@ -2,7 +2,7 @@
 using System.Collections.Generic;
 using System.Linq;
 
-namespace Umbraco.Core.Persistence.Repositories
+namespace Umbraco.Core.Persistence.Repositories.Implement
 {
     internal class SimilarNodeName
     {
diff --git a/src/Umbraco.Core/Persistence/Repositories/SimpleGetRepository.cs b/src/Umbraco.Core/Persistence/Repositories/Implement/SimpleGetRepository.cs
similarity index 98%
rename from src/Umbraco.Core/Persistence/Repositories/SimpleGetRepository.cs
rename to src/Umbraco.Core/Persistence/Repositories/Implement/SimpleGetRepository.cs
index b0081a1ea8..135dc86f63 100644
--- a/src/Umbraco.Core/Persistence/Repositories/SimpleGetRepository.cs
+++ b/src/Umbraco.Core/Persistence/Repositories/Implement/SimpleGetRepository.cs
@@ -8,7 +8,7 @@ using Umbraco.Core.Models.EntityBase;
 using Umbraco.Core.Persistence.Querying;
 using Umbraco.Core.Persistence.UnitOfWork;
 
-namespace Umbraco.Core.Persistence.Repositories
+namespace Umbraco.Core.Persistence.Repositories.Implement
 {
     /// <summary>
     /// Simple abstract ReadOnly repository used to simply have PerformGet and PeformGetAll with an underlying cache
diff --git a/src/Umbraco.Core/Persistence/Repositories/StylesheetRepository.cs b/src/Umbraco.Core/Persistence/Repositories/Implement/StylesheetRepository.cs
similarity index 89%
rename from src/Umbraco.Core/Persistence/Repositories/StylesheetRepository.cs
rename to src/Umbraco.Core/Persistence/Repositories/Implement/StylesheetRepository.cs
index ea920b538c..3ef7d7f245 100644
--- a/src/Umbraco.Core/Persistence/Repositories/StylesheetRepository.cs
+++ b/src/Umbraco.Core/Persistence/Repositories/Implement/StylesheetRepository.cs
@@ -1,162 +1,159 @@
-using System;
-using System.Collections.Generic;
-using System.IO;
-using System.Linq;
-using System.Text;
-using LightInject;
-using Umbraco.Core.IO;
-using Umbraco.Core.Models;
-using Umbraco.Core.Models.Rdbms;
-using Umbraco.Core.Persistence.UnitOfWork;
-
-namespace Umbraco.Core.Persistence.Repositories
-{
-    /// <summary>
-    /// Represents the Stylesheet Repository
-    /// </summary>
-    internal class StylesheetRepository : FileRepository<string, Stylesheet>, IStylesheetRepository
-    {
-        public StylesheetRepository(IUnitOfWork work, [Inject("StylesheetFileSystem")] IFileSystem fileSystem)
-            : base(work, fileSystem)
-        { }
-
-        #region Overrides of FileRepository<string,Stylesheet>
-
-        public override Stylesheet Get(string id)
-        {
-            // get the relative path within the filesystem
-            // (though... id should be relative already)
-            var path = FileSystem.GetRelativePath(id);
-
-            path = path.EnsureEndsWith(".css");
-
-            if (FileSystem.FileExists(path) == false)
-                return null;
-
-            // content will be lazy-loaded when required
-            var created = FileSystem.GetCreated(path).UtcDateTime;
-            var updated = FileSystem.GetLastModified(path).UtcDateTime;
-            //var content = GetFileContent(path);
-
-            var stylesheet = new Stylesheet(path, file => GetFileContent(file.OriginalPath))
-            {
-                //Content = content,
-                Key = path.EncodeAsGuid(),
-                CreateDate = created,
-                UpdateDate = updated,
-                Id = path.GetHashCode(),
-                VirtualPath = FileSystem.GetUrl(path)
-            };
-
-            // reset dirty initial properties (U4-1946)
-            stylesheet.ResetDirtyProperties(false);
-
-            return stylesheet;
-
-        }
-
-        public override void AddOrUpdate(Stylesheet entity)
-        {
-            base.AddOrUpdate(entity);
-
-            // ensure that from now on, content is lazy-loaded
-            if (entity.GetFileContent == null)
-                entity.GetFileContent = file => GetFileContent(file.OriginalPath);
-        }
-
-        public override IEnumerable<Stylesheet> GetAll(params string[] ids)
-        {
-            //ensure they are de-duplicated, easy win if people don't do this as this can cause many excess queries
-            ids = ids
-                .Select(x => x.EnsureEndsWith(".css"))
-                .Distinct()
-                .ToArray();
-
-            if (ids.Any())
-            {
-                foreach (var id in ids)
-                {
-                    yield return Get(id);
-                }
-            }
-            else
-            {
-                var files = FindAllFiles("", "*.css");
-                foreach (var file in files)
-                {
-                    yield return Get(file);
-                }
-            }
-        }
-
-        /// <summary>
-        /// Gets a list of all <see cref="Stylesheet"/> that exist at the relative path specified.
-        /// </summary>
-        /// <param name="rootPath">
-        /// If null or not specified, will return the stylesheets at the root path relative to the IFileSystem
-        /// </param>
-        /// <returns></returns>
-        public IEnumerable<Stylesheet> GetStylesheetsAtPath(string rootPath = null)
-        {
-            return FileSystem.GetFiles(rootPath ?? string.Empty, "*.css").Select(Get);
-        }
-
-        private static readonly List<string> ValidExtensions = new List<string> { "css" };
-
-        public bool ValidateStylesheet(Stylesheet stylesheet)
-        {
-            // get full path
-            string fullPath;
-            try
-            {
-                // may throw for security reasons
-                fullPath = FileSystem.GetFullPath(stylesheet.Path);
-            }
-            catch
-            {
-                return false;
-            }
-
-            // validate path and extension
-            var validDir = SystemDirectories.Css;
-            var isValidPath = IOHelper.VerifyEditPath(fullPath, validDir);
-            var isValidExtension = IOHelper.VerifyFileExtension(stylesheet.Path, ValidExtensions);
-            return isValidPath && isValidExtension;
-        }
-
-        public Stream GetFileContentStream(string filepath)
-        {
-            if (FileSystem.FileExists(filepath) == false) return null;
-
-            try
-            {
-                return FileSystem.OpenFile(filepath);
-            }
-            catch
-            {
-                return null; // deal with race conds
-            }
-        }
-
-        public void SetFileContent(string filepath, Stream content)
-        {
-            FileSystem.AddFile(filepath, content, true);
-        }
-
-        public long GetFileSize(string filepath)
-        {
-            if (FileSystem.FileExists(filepath) == false) return -1;
-
-            try
-            {
-                return FileSystem.GetSize(filepath);
-            }
-            catch
-            {
-                return -1; // deal with race conds
-            }
-        }
-
-        #endregion
-    }
-}
+using System.Collections.Generic;
+using System.IO;
+using System.Linq;
+using LightInject;
+using Umbraco.Core.IO;
+using Umbraco.Core.Models;
+using Umbraco.Core.Persistence.UnitOfWork;
+
+namespace Umbraco.Core.Persistence.Repositories.Implement
+{
+    /// <summary>
+    /// Represents the Stylesheet Repository
+    /// </summary>
+    internal class StylesheetRepository : FileRepository<string, Stylesheet>, IStylesheetRepository
+    {
+        public StylesheetRepository(IUnitOfWork work, [Inject("StylesheetFileSystem")] IFileSystem fileSystem)
+            : base(work, fileSystem)
+        { }
+
+        #region Overrides of FileRepository<string,Stylesheet>
+
+        public override Stylesheet Get(string id)
+        {
+            // get the relative path within the filesystem
+            // (though... id should be relative already)
+            var path = FileSystem.GetRelativePath(id);
+
+            path = path.EnsureEndsWith(".css");
+
+            if (FileSystem.FileExists(path) == false)
+                return null;
+
+            // content will be lazy-loaded when required
+            var created = FileSystem.GetCreated(path).UtcDateTime;
+            var updated = FileSystem.GetLastModified(path).UtcDateTime;
+            //var content = GetFileContent(path);
+
+            var stylesheet = new Stylesheet(path, file => GetFileContent(file.OriginalPath))
+            {
+                //Content = content,
+                Key = path.EncodeAsGuid(),
+                CreateDate = created,
+                UpdateDate = updated,
+                Id = path.GetHashCode(),
+                VirtualPath = FileSystem.GetUrl(path)
+            };
+
+            // reset dirty initial properties (U4-1946)
+            stylesheet.ResetDirtyProperties(false);
+
+            return stylesheet;
+
+        }
+
+        public override void Save(Stylesheet entity)
+        {
+            base.Save(entity);
+
+            // ensure that from now on, content is lazy-loaded
+            if (entity.GetFileContent == null)
+                entity.GetFileContent = file => GetFileContent(file.OriginalPath);
+        }
+
+        public override IEnumerable<Stylesheet> GetMany(params string[] ids)
+        {
+            //ensure they are de-duplicated, easy win if people don't do this as this can cause many excess queries
+            ids = ids
+                .Select(x => StringExtensions.EnsureEndsWith(x, ".css"))
+                .Distinct()
+                .ToArray();
+
+            if (ids.Any())
+            {
+                foreach (var id in ids)
+                {
+                    yield return Get(id);
+                }
+            }
+            else
+            {
+                var files = FindAllFiles("", "*.css");
+                foreach (var file in files)
+                {
+                    yield return Get(file);
+                }
+            }
+        }
+
+        /// <summary>
+        /// Gets a list of all <see cref="Stylesheet"/> that exist at the relative path specified.
+        /// </summary>
+        /// <param name="rootPath">
+        /// If null or not specified, will return the stylesheets at the root path relative to the IFileSystem
+        /// </param>
+        /// <returns></returns>
+        public IEnumerable<Stylesheet> GetStylesheetsAtPath(string rootPath = null)
+        {
+            return FileSystem.GetFiles(rootPath ?? string.Empty, "*.css").Select(Get);
+        }
+
+        private static readonly List<string> ValidExtensions = new List<string> { "css" };
+
+        public bool ValidateStylesheet(Stylesheet stylesheet)
+        {
+            // get full path
+            string fullPath;
+            try
+            {
+                // may throw for security reasons
+                fullPath = FileSystem.GetFullPath(stylesheet.Path);
+            }
+            catch
+            {
+                return false;
+            }
+
+            // validate path and extension
+            var validDir = SystemDirectories.Css;
+            var isValidPath = IOHelper.VerifyEditPath(fullPath, validDir);
+            var isValidExtension = IOHelper.VerifyFileExtension(stylesheet.Path, ValidExtensions);
+            return isValidPath && isValidExtension;
+        }
+
+        public Stream GetFileContentStream(string filepath)
+        {
+            if (FileSystem.FileExists(filepath) == false) return null;
+
+            try
+            {
+                return FileSystem.OpenFile(filepath);
+            }
+            catch
+            {
+                return null; // deal with race conds
+            }
+        }
+
+        public void SetFileContent(string filepath, Stream content)
+        {
+            FileSystem.AddFile(filepath, content, true);
+        }
+
+        public long GetFileSize(string filepath)
+        {
+            if (FileSystem.FileExists(filepath) == false) return -1;
+
+            try
+            {
+                return FileSystem.GetSize(filepath);
+            }
+            catch
+            {
+                return -1; // deal with race conds
+            }
+        }
+
+        #endregion
+    }
+}
diff --git a/src/Umbraco.Core/Persistence/Repositories/TagRepository.cs b/src/Umbraco.Core/Persistence/Repositories/Implement/TagRepository.cs
similarity index 99%
rename from src/Umbraco.Core/Persistence/Repositories/TagRepository.cs
rename to src/Umbraco.Core/Persistence/Repositories/Implement/TagRepository.cs
index 82e7d9b78a..84b81b9fcf 100644
--- a/src/Umbraco.Core/Persistence/Repositories/TagRepository.cs
+++ b/src/Umbraco.Core/Persistence/Repositories/Implement/TagRepository.cs
@@ -7,12 +7,11 @@ using Umbraco.Core.Logging;
 using Umbraco.Core.Models;
 using Umbraco.Core.Models.EntityBase;
 using Umbraco.Core.Models.Rdbms;
-
 using Umbraco.Core.Persistence.Factories;
 using Umbraco.Core.Persistence.Querying;
 using Umbraco.Core.Persistence.UnitOfWork;
 
-namespace Umbraco.Core.Persistence.Repositories
+namespace Umbraco.Core.Persistence.Repositories.Implement
 {
     internal class TagRepository : NPocoRepositoryBase<int, ITag>, ITagRepository
     {
diff --git a/src/Umbraco.Core/Persistence/Repositories/TaskRepository.cs b/src/Umbraco.Core/Persistence/Repositories/Implement/TaskRepository.cs
similarity index 99%
rename from src/Umbraco.Core/Persistence/Repositories/TaskRepository.cs
rename to src/Umbraco.Core/Persistence/Repositories/Implement/TaskRepository.cs
index bf4449bc92..cc0fe96bc2 100644
--- a/src/Umbraco.Core/Persistence/Repositories/TaskRepository.cs
+++ b/src/Umbraco.Core/Persistence/Repositories/Implement/TaskRepository.cs
@@ -12,7 +12,7 @@ using Umbraco.Core.Persistence.Factories;
 using Umbraco.Core.Persistence.Querying;
 using Umbraco.Core.Persistence.UnitOfWork;
 
-namespace Umbraco.Core.Persistence.Repositories
+namespace Umbraco.Core.Persistence.Repositories.Implement
 {
     internal class TaskRepository : NPocoRepositoryBase<int, Task>, ITaskRepository
     {
diff --git a/src/Umbraco.Core/Persistence/Repositories/TaskTypeRepository.cs b/src/Umbraco.Core/Persistence/Repositories/Implement/TaskTypeRepository.cs
similarity index 98%
rename from src/Umbraco.Core/Persistence/Repositories/TaskTypeRepository.cs
rename to src/Umbraco.Core/Persistence/Repositories/Implement/TaskTypeRepository.cs
index aaa17538bb..64eb323e70 100644
--- a/src/Umbraco.Core/Persistence/Repositories/TaskTypeRepository.cs
+++ b/src/Umbraco.Core/Persistence/Repositories/Implement/TaskTypeRepository.cs
@@ -12,7 +12,7 @@ using Umbraco.Core.Persistence.Factories;
 using Umbraco.Core.Persistence.Querying;
 using Umbraco.Core.Persistence.UnitOfWork;
 
-namespace Umbraco.Core.Persistence.Repositories
+namespace Umbraco.Core.Persistence.Repositories.Implement
 {
     internal class TaskTypeRepository : NPocoRepositoryBase<int, TaskType>, ITaskTypeRepository
     {
diff --git a/src/Umbraco.Core/Persistence/Repositories/TemplateRepository.cs b/src/Umbraco.Core/Persistence/Repositories/Implement/TemplateRepository.cs
similarity index 96%
rename from src/Umbraco.Core/Persistence/Repositories/TemplateRepository.cs
rename to src/Umbraco.Core/Persistence/Repositories/Implement/TemplateRepository.cs
index 4b62523a79..873f205406 100644
--- a/src/Umbraco.Core/Persistence/Repositories/TemplateRepository.cs
+++ b/src/Umbraco.Core/Persistence/Repositories/Implement/TemplateRepository.cs
@@ -1,846 +1,845 @@
-using System;
-using System.Collections.Generic;
-using System.IO;
-using System.Linq;
-using System.Text;
-using NPoco;
-using Umbraco.Core.Cache;
-using Umbraco.Core.Configuration.UmbracoSettings;
-using Umbraco.Core.IO;
-using Umbraco.Core.Logging;
-using Umbraco.Core.Models;
-using Umbraco.Core.Models.EntityBase;
-using Umbraco.Core.Models.Rdbms;
-
-using Umbraco.Core.Persistence.Factories;
-using Umbraco.Core.Persistence.Querying;
-using Umbraco.Core.Persistence.UnitOfWork;
-using Umbraco.Core.Strings;
-
-namespace Umbraco.Core.Persistence.Repositories
-{
-    /// <summary>
-    /// Represents the Template Repository
-    /// </summary>
-    internal class TemplateRepository : NPocoRepositoryBase<int, ITemplate>, ITemplateRepository
-    {
-        private readonly IFileSystem _masterpagesFileSystem;
-        private readonly IFileSystem _viewsFileSystem;
-        private readonly ITemplatesSection _templateConfig;
-        private readonly ViewHelper _viewHelper;
-        private readonly MasterPageHelper _masterPageHelper;
-
-        public TemplateRepository(IScopeUnitOfWork work, CacheHelper cache, ILogger logger, IFileSystem masterpageFileSystem, IFileSystem viewFileSystem, ITemplatesSection templateConfig)
-            : base(work, cache, logger)
-        {
-            _masterpagesFileSystem = masterpageFileSystem;
-            _viewsFileSystem = viewFileSystem;
-            _templateConfig = templateConfig;
-            _viewHelper = new ViewHelper(_viewsFileSystem);
-            _masterPageHelper = new MasterPageHelper(_masterpagesFileSystem);
-        }
-
-        protected override IRepositoryCachePolicy<ITemplate, int> CreateCachePolicy(IRuntimeCacheProvider runtimeCache)
-        {
-            return new FullDataSetRepositoryCachePolicy<ITemplate, int>(runtimeCache, GetEntityId, /*expires:*/ false);
-        }
-
-        #region Overrides of RepositoryBase<int,ITemplate>
-
-        protected override ITemplate PerformGet(int id)
-        {
-            //use the underlying GetAll which will force cache all templates
-            return base.GetAll().FirstOrDefault(x => x.Id == id);
-        }
-
-        protected override IEnumerable<ITemplate> PerformGetAll(params int[] ids)
-        {
-            var sql = GetBaseQuery(false);
-
-            if (ids.Any())
-            {
-                sql.Where("umbracoNode.id in (@ids)", new { ids = ids });
-            }
-            else
-            {
-                sql.Where<NodeDto>(x => x.NodeObjectType == NodeObjectTypeId);
-            }
-
-            var dtos = Database.Fetch<TemplateDto>(sql);
-
-            if (dtos.Count == 0) return Enumerable.Empty<ITemplate>();
-
-            //look up the simple template definitions that have a master template assigned, this is used
-            // later to populate the template item's properties
-            var childIds = (ids.Any()
-                ? GetAxisDefinitions(dtos.ToArray())
-                : dtos.Select(x => new UmbracoEntity
-                {
-                    Id = x.NodeId,
-                    ParentId = x.NodeDto.ParentId,
-                    Name = x.Alias
-                })).ToArray();
-
-            return dtos.Select(d => MapFromDto(d, childIds));
-        }
-
-        protected override IEnumerable<ITemplate> PerformGetByQuery(IQuery<ITemplate> query)
-        {
-            var sqlClause = GetBaseQuery(false);
-            var translator = new SqlTranslator<ITemplate>(sqlClause, query);
-            var sql = translator.Translate();
-
-            var dtos = Database.Fetch<TemplateDto>(sql);
-
-            if (dtos.Count == 0) return Enumerable.Empty<ITemplate>();
-
-            //look up the simple template definitions that have a master template assigned, this is used
-            // later to populate the template item's properties
-            var childIds = GetAxisDefinitions(dtos.ToArray()).ToArray();
-
-            return dtos.Select(d => MapFromDto(d, childIds));
-        }
-
-        #endregion
-
-        #region Overrides of NPocoRepositoryBase<int,ITemplate>
-
-        protected override Sql<ISqlContext> GetBaseQuery(bool isCount)
-        {
-            var sql = SqlContext.Sql();
-
-            sql = isCount
-                ? sql.SelectCount()
-                : sql.Select<TemplateDto>(r => r.Select(x => x.NodeDto));
-
-            sql
-                .From<TemplateDto>()
-                .InnerJoin<NodeDto>()
-                .On<TemplateDto, NodeDto>(left => left.NodeId, right => right.NodeId)
-                .Where<NodeDto>(x => x.NodeObjectType == NodeObjectTypeId);
-
-            return sql;
-        }
-
-        protected override string GetBaseWhereClause()
-        {
-            return Constants.DatabaseSchema.Tables.Node + ".id = @id";
-        }
-
-        protected override IEnumerable<string> GetDeleteClauses()
-        {
-            var list = new List<string>
-            {
-                "DELETE FROM " + Constants.DatabaseSchema.Tables.User2NodeNotify + " WHERE nodeId = @id",
-                "DELETE FROM " + Constants.DatabaseSchema.Tables.UserGroup2NodePermission + " WHERE nodeId = @id",
-                "UPDATE " + Constants.DatabaseSchema.Tables.DocumentVersion + " SET templateId = NULL WHERE templateId = @id",
-                "DELETE FROM " + Constants.DatabaseSchema.Tables.DocumentType + " WHERE templateNodeId = @id",
-                "DELETE FROM " + Constants.DatabaseSchema.Tables.Template + " WHERE nodeId = @id",
-                "DELETE FROM " + Constants.DatabaseSchema.Tables.Node + " WHERE id = @id"
-            };
-            return list;
-        }
-
-        protected override Guid NodeObjectTypeId => Constants.ObjectTypes.Template;
-
-        protected override void PersistNewItem(ITemplate entity)
-        {
-            EnsureValidAlias(entity);
-
-            //Save to db
-            var template = (Template)entity;
-            template.AddingEntity();
-
-            var factory = new TemplateFactory(NodeObjectTypeId);
-            var dto = factory.BuildDto(template);
-
-            //Create the (base) node data - umbracoNode
-            var nodeDto = dto.NodeDto;
-            nodeDto.Path = "-1," + dto.NodeDto.NodeId;
-            var o = Database.IsNew<NodeDto>(nodeDto) ? Convert.ToInt32(Database.Insert(nodeDto)) : Database.Update(nodeDto);
-
-            //Update with new correct path
-            var parent = Get(template.MasterTemplateId.Value);
-            if (parent != null)
-            {
-                nodeDto.Path = string.Concat(parent.Path, ",", nodeDto.NodeId);
-            }
-            else
-            {
-                nodeDto.Path = "-1," + dto.NodeDto.NodeId;
-            }
-            Database.Update(nodeDto);
-
-            //Insert template dto
-            dto.NodeId = nodeDto.NodeId;
-            Database.Insert(dto);
-
-            //Update entity with correct values
-            template.Id = nodeDto.NodeId; //Set Id on entity to ensure an Id is set
-            template.Path = nodeDto.Path;
-
-            //now do the file work
-            SaveFile(template, dto);
-
-            template.ResetDirtyProperties();
-
-            // ensure that from now on, content is lazy-loaded
-            if (template.GetFileContent == null)
-                template.GetFileContent = file => GetFileContent((Template) file, false);
-        }
-
-        protected override void PersistUpdatedItem(ITemplate entity)
-        {
-            EnsureValidAlias(entity);
-
-            //store the changed alias if there is one for use with updating files later
-            var originalAlias = entity.Alias;
-            if (entity.IsPropertyDirty("Alias"))
-            {
-                //we need to check what it currently is before saving and remove that file
-                var current = Get(entity.Id);
-                originalAlias = current.Alias;
-            }
-
-            var template = (Template)entity;
-
-            if (entity.IsPropertyDirty("MasterTemplateId"))
-            {
-                var parent = Get(template.MasterTemplateId.Value);
-                if (parent != null)
-                {
-                    entity.Path = string.Concat(parent.Path, ",", entity.Id);
-                }
-                else
-                {
-                    //this means that the master template has been removed, so we need to reset the template's
-                    //path to be at the root
-                    entity.Path = string.Concat("-1,", entity.Id);
-                }
-            }
-
-            //Get TemplateDto from db to get the Primary key of the entity
-            var templateDto = Database.SingleOrDefault<TemplateDto>("WHERE nodeId = @Id", new { Id = entity.Id });
-            //Save updated entity to db
-
-            template.UpdateDate = DateTime.Now;
-            var factory = new TemplateFactory(templateDto.PrimaryKey, NodeObjectTypeId);
-            var dto = factory.BuildDto(template);
-
-            Database.Update(dto.NodeDto);
-            Database.Update(dto);
-
-            //re-update if this is a master template, since it could have changed!
-            var axisDefs = GetAxisDefinitions(dto);
-            template.IsMasterTemplate = axisDefs.Any(x => x.ParentId == dto.NodeId);
-
-            //now do the file work
-            SaveFile((Template) entity, dto, originalAlias);
-
-            entity.ResetDirtyProperties();
-
-            // ensure that from now on, content is lazy-loaded
-            if (template.GetFileContent == null)
-                template.GetFileContent = file => GetFileContent((Template) file, false);
-        }
-
-        private void SaveFile(Template template, TemplateDto dto, string originalAlias = null)
-        {
-            string content;
-
-            var templateOnDisk = template as TemplateOnDisk;
-            if (templateOnDisk != null && templateOnDisk.IsOnDisk)
-            {
-                // if "template on disk" load content from disk
-                content = _viewHelper.GetFileContents(template);
-            }
-            else
-            {
-                // else, create or write template.Content to disk
-                if (DetermineTemplateRenderingEngine(template) == RenderingEngine.Mvc)
-                {
-                    content = originalAlias == null
-                        ? _viewHelper.CreateView(template, true)
-                        : _viewHelper.UpdateViewFile(template, originalAlias);
-                }
-                else
-                {
-                    content = originalAlias == null
-                        ? _masterPageHelper.CreateMasterPage(template, this, true)
-                        : _masterPageHelper.UpdateMasterPageFile(template, originalAlias, this);
-                }
-            }
-
-            // once content has been set, "template on disk" are not "on disk" anymore
-            template.Content = content;
-            SetVirtualPath(template);
-
-            if (dto.Design == content) return;
-            dto.Design = content;
-            Database.Update(dto); // though... we don't care about the db value really??!!
-        }
-
-        protected override void PersistDeletedItem(ITemplate entity)
-        {
-            var deletes = GetDeleteClauses().ToArray();
-
-            var descendants = GetDescendants(entity.Id).ToList();
-
-            //change the order so it goes bottom up! (deepest level first)
-            descendants.Reverse();
-
-            //delete the hierarchy
-            foreach (var descendant in descendants)
-            {
-                foreach (var delete in deletes)
-                {
-                    Database.Execute(delete, new { id = GetEntityId(descendant) });
-                }
-            }
-
-            //now we can delete this one
-            foreach (var delete in deletes)
-            {
-                Database.Execute(delete, new { id = GetEntityId(entity) });
-            }
-
-            if (DetermineTemplateRenderingEngine(entity) == RenderingEngine.Mvc)
-            {
-                var viewName = string.Concat(entity.Alias, ".cshtml");
-                _viewsFileSystem.DeleteFile(viewName);
-            }
-            else
-            {
-                var masterpageName = string.Concat(entity.Alias, ".master");
-                _masterpagesFileSystem.DeleteFile(masterpageName);
-            }
-
-            entity.DeletedDate = DateTime.Now;
-        }
-
-        #endregion
-
-        private IEnumerable<IUmbracoEntity> GetAxisDefinitions(params TemplateDto[] templates)
-        {
-            //look up the simple template definitions that have a master template assigned, this is used
-            // later to populate the template item's properties
-            var childIdsSql = SqlContext.Sql()
-                .Select("nodeId,alias,parentID")
-                .From<TemplateDto>()
-                .InnerJoin<NodeDto>()
-                .On<TemplateDto, NodeDto>(dto => dto.NodeId, dto => dto.NodeId)
-                //lookup axis's
-                .Where("umbracoNode." + SqlContext.SqlSyntax.GetQuotedColumnName("id") + " IN (@parentIds) OR umbracoNode.parentID IN (@childIds)",
-                    new {parentIds = templates.Select(x => x.NodeDto.ParentId), childIds = templates.Select(x => x.NodeId)});
-
-            var childIds = Database.Fetch<dynamic>(childIdsSql)
-                .Select(x => new UmbracoEntity
-                {
-                    Id = x.nodeId,
-                    ParentId = x.parentID,
-                    Name = x.alias
-                });
-            return childIds;
-        }
-
-        /// <summary>
-        /// Maps from a dto to an ITemplate
-        /// </summary>
-        /// <param name="dto"></param>
-        /// <param name="axisDefinitions">
-        /// This is a collection of template definitions ... either all templates, or the collection of child templates and it's parent template
-        /// </param>
-        /// <returns></returns>
-        private ITemplate MapFromDto(TemplateDto dto, IUmbracoEntity[] axisDefinitions)
-        {
-            var factory = new TemplateFactory();
-            var template = factory.BuildEntity(dto, axisDefinitions, file => GetFileContent((Template) file, false));
-
-            if (dto.NodeDto.ParentId > 0)
-            {
-                var masterTemplate = axisDefinitions.FirstOrDefault(x => x.Id == dto.NodeDto.ParentId);
-                if (masterTemplate != null)
-                {
-                    template.MasterTemplateAlias = masterTemplate.Name;
-                    template.MasterTemplateId = new Lazy<int>(() => dto.NodeDto.ParentId);
-                }
-            }
-
-            // get the infos (update date and virtual path) that will change only if
-            // path changes - but do not get content, will get loaded only when required
-            GetFileContent(template, true);
-
-            // reset dirty initial properties (U4-1946)
-            template.ResetDirtyProperties(false);
-
-            return template;
-        }
-
-        private void SetVirtualPath(ITemplate template)
-        {
-            var path = template.OriginalPath;
-            if (string.IsNullOrWhiteSpace(path))
-            {
-                // we need to discover the path
-                path = string.Concat(template.Alias, ".cshtml");
-                if (_viewsFileSystem.FileExists(path))
-                {
-                    template.VirtualPath = _viewsFileSystem.GetUrl(path);
-                    return;
-                }
-                path = string.Concat(template.Alias, ".vbhtml");
-                if (_viewsFileSystem.FileExists(path))
-                {
-                    template.VirtualPath = _viewsFileSystem.GetUrl(path);
-                    return;
-                }
-                path = string.Concat(template.Alias, ".master");
-                if (_masterpagesFileSystem.FileExists(path))
-                {
-                    template.VirtualPath = _masterpagesFileSystem.GetUrl(path);
-                    return;
-                }
-            }
-            else
-            {
-                // we know the path already
-                var ext = Path.GetExtension(path);
-                switch (ext)
-                {
-                    case ".cshtml":
-                    case ".vbhtml":
-                        template.VirtualPath = _viewsFileSystem.GetUrl(path);
-                        return;
-                    case ".master":
-                        template.VirtualPath = _masterpagesFileSystem.GetUrl(path);
-                        return;
-                }
-            }
-
-            template.VirtualPath = string.Empty; // file not found...
-        }
-
-        private string GetFileContent(ITemplate template, bool init)
-        {
-            var path = template.OriginalPath;
-            if (string.IsNullOrWhiteSpace(path))
-            {
-                // we need to discover the path
-                path = string.Concat(template.Alias, ".cshtml");
-                if (_viewsFileSystem.FileExists(path))
-                    return GetFileContent(template, _viewsFileSystem, path, init);
-                path = string.Concat(template.Alias, ".vbhtml");
-                if (_viewsFileSystem.FileExists(path))
-                    return GetFileContent(template, _viewsFileSystem, path, init);
-                path = string.Concat(template.Alias, ".master");
-                if (_masterpagesFileSystem.FileExists(path))
-                    return GetFileContent(template, _masterpagesFileSystem, path, init);
-            }
-            else
-            {
-                // we know the path already
-                var ext = Path.GetExtension(path);
-                switch (ext)
-                {
-                    case ".cshtml":
-                    case ".vbhtml":
-                        return GetFileContent(template, _viewsFileSystem, path, init);
-                    case ".master":
-                        return GetFileContent(template, _masterpagesFileSystem, path, init);
-                }
-            }
-
-            template.VirtualPath = string.Empty; // file not found...
-            return string.Empty;
-        }
-
-        private string GetFileContent(ITemplate template, IFileSystem fs, string filename, bool init)
-        {
-            // do not update .UpdateDate as that would make it dirty (side-effect)
-            // unless initializing, because we have to do it once
-            if (init)
-            {
-                template.UpdateDate = fs.GetLastModified(filename).UtcDateTime;
-            }
-
-            // TODO
-            //  see if this could enable us to update UpdateDate without messing with change tracking
-            //  and then we'd want to do it for scripts, stylesheets and partial views too (ie files)
-            //var xtemplate = template as Template;
-            //xtemplate.DisableChangeTracking();
-            //template.UpdateDate = fs.GetLastModified(filename).UtcDateTime;
-            //xtemplate.EnableChangeTracking();
-
-            template.VirtualPath = fs.GetUrl(filename);
-
-            return init ? null : GetFileContent(fs, filename);
-        }
-
-        private string GetFileContent(IFileSystem fs, string filename)
-        {
-            using (var stream = fs.OpenFile(filename))
-            using (var reader = new StreamReader(stream, Encoding.UTF8, true))
-            {
-                return reader.ReadToEnd();
-            }
-        }
-
-        public Stream GetFileContentStream(string filepath)
-        {
-            var fs = GetFileSystem(filepath);
-            if (fs.FileExists(filepath) == false) return null;
-
-            try
-            {
-                return GetFileSystem(filepath).OpenFile(filepath);
-            }
-            catch
-            {
-                return null; // deal with race conds
-            }
-        }
-
-        public void SetFileContent(string filepath, Stream content)
-        {
-            GetFileSystem(filepath).AddFile(filepath, content, true);
-        }
-
-        public long GetFileSize(string filepath)
-        {
-            return GetFileSystem(filepath).GetSize(filepath);
-        }
-
-        private IFileSystem GetFileSystem(string filepath)
-        {
-            var ext = Path.GetExtension(filepath);
-            IFileSystem fs;
-            switch (ext)
-            {
-                case ".cshtml":
-                case ".vbhtml":
-                    fs = _viewsFileSystem;
-                    break;
-                case ".master":
-                    fs = _masterpagesFileSystem;
-                    break;
-                default:
-                    throw new Exception("Unsupported extension " + ext + ".");
-            }
-            return fs;
-        }
-
-        #region Implementation of ITemplateRepository
-
-        public ITemplate Get(string alias)
-        {
-            return GetAll(alias).FirstOrDefault();
-        }
-
-        public IEnumerable<ITemplate> GetAll(params string[] aliases)
-        {
-            //We must call the base (normal) GetAll method
-            // which is cached. This is a specialized method and unfortunatley with the params[] it
-            // overlaps with the normal GetAll method.
-            if (aliases.Any() == false) return base.GetAll();
-
-            //return from base.GetAll, this is all cached
-            return base.GetAll().Where(x => aliases.InvariantContains(x.Alias));
-        }
-
-        public IEnumerable<ITemplate> GetChildren(int masterTemplateId)
-        {
-            //return from base.GetAll, this is all cached
-            var all = base.GetAll().ToArray();
-
-            if (masterTemplateId <= 0) return all.Where(x => x.MasterTemplateAlias.IsNullOrWhiteSpace());
-
-            var parent = all.FirstOrDefault(x => x.Id == masterTemplateId);
-            if (parent == null) return Enumerable.Empty<ITemplate>();
-
-            var children = all.Where(x => x.MasterTemplateAlias.InvariantEquals(parent.Alias));
-            return children;
-        }
-
-        public IEnumerable<ITemplate> GetChildren(string alias)
-        {
-            //return from base.GetAll, this is all cached
-            return base.GetAll().Where(x => alias.IsNullOrWhiteSpace()
-                ? x.MasterTemplateAlias.IsNullOrWhiteSpace()
-                : x.MasterTemplateAlias.InvariantEquals(alias));
-        }
-
-        public IEnumerable<ITemplate> GetDescendants(int masterTemplateId)
-        {
-            //return from base.GetAll, this is all cached
-            var all = base.GetAll().ToArray();
-            var descendants = new List<ITemplate>();
-            if (masterTemplateId > 0)
-            {
-                var parent = all.FirstOrDefault(x => x.Id == masterTemplateId);
-                if (parent == null) return Enumerable.Empty<ITemplate>();
-                //recursively add all children with a level
-                AddChildren(all, descendants, parent.Alias);
-            }
-            else
-            {
-                descendants.AddRange(all.Where(x => x.MasterTemplateAlias.IsNullOrWhiteSpace()));
-                foreach (var parent in descendants)
-                {
-                    //recursively add all children with a level
-                    AddChildren(all, descendants, parent.Alias);
-                }
-            }
-
-            //return the list - it will be naturally ordered by level
-            return descendants;
-        }
-
-        public IEnumerable<ITemplate> GetDescendants(string alias)
-        {
-            var all = base.GetAll().ToArray();
-            var descendants = new List<ITemplate>();
-            if (alias.IsNullOrWhiteSpace() == false)
-            {
-                var parent = all.FirstOrDefault(x => x.Alias.InvariantEquals(alias));
-                if (parent == null) return Enumerable.Empty<ITemplate>();
-                //recursively add all children
-                AddChildren(all, descendants, parent.Alias);
-            }
-            else
-            {
-                descendants.AddRange(all.Where(x => x.MasterTemplateAlias.IsNullOrWhiteSpace()));
-                foreach (var parent in descendants)
-                {
-                    //recursively add all children with a level
-                    AddChildren(all, descendants, parent.Alias);
-                }
-            }
-            //return the list - it will be naturally ordered by level
-            return descendants;
-        }
-
-        private void AddChildren(ITemplate[] all, List<ITemplate> descendants, string masterAlias)
-        {
-            var c = all.Where(x => x.MasterTemplateAlias.InvariantEquals(masterAlias)).ToArray();
-            descendants.AddRange(c);
-            if (c.Any() == false) return;
-            //recurse through all children
-            foreach (var child in c)
-            {
-                AddChildren(all, descendants, child.Alias);
-            }
-        }
-
-        /// <summary>
-        /// Returns a template as a template node which can be traversed (parent, children)
-        /// </summary>
-        /// <param name="alias"></param>
-        /// <returns></returns>
-        [Obsolete("Use GetDescendants instead")]
-        public TemplateNode GetTemplateNode(string alias)
-        {
-            //first get all template objects
-            var allTemplates = base.GetAll().ToArray();
-
-            var selfTemplate = allTemplates.SingleOrDefault(x => x.Alias.InvariantEquals(alias));
-            if (selfTemplate == null)
-            {
-                return null;
-            }
-
-            var top = selfTemplate;
-            while (top.MasterTemplateAlias.IsNullOrWhiteSpace() == false)
-            {
-                top = allTemplates.Single(x => x.Alias.InvariantEquals(top.MasterTemplateAlias));
-            }
-
-            var topNode = new TemplateNode(allTemplates.Single(x => x.Id == top.Id));
-            var childTemplates = allTemplates.Where(x => x.MasterTemplateAlias.InvariantEquals(top.Alias));
-            //This now creates the hierarchy recursively
-            topNode.Children = CreateChildren(topNode, childTemplates, allTemplates);
-
-            //now we'll return the TemplateNode requested
-            return FindTemplateInTree(topNode, alias);
-        }
-
-        [Obsolete("Only used by obsolete code")]
-        private static TemplateNode WalkTree(TemplateNode current, string alias)
-        {
-            //now walk the tree to find the node
-            if (current.Template.Alias.InvariantEquals(alias))
-            {
-                return current;
-            }
-            foreach (var c in current.Children)
-            {
-                var found = WalkTree(c, alias);
-                if (found != null) return found;
-            }
-            return null;
-        }
-
-        /// <summary>
-        /// Given a template node in a tree, this will find the template node with the given alias if it is found in the hierarchy, otherwise null
-        /// </summary>
-        /// <param name="anyNode"></param>
-        /// <param name="alias"></param>
-        /// <returns></returns>
-        [Obsolete("Use GetDescendants instead")]
-        public TemplateNode FindTemplateInTree(TemplateNode anyNode, string alias)
-        {
-            //first get the root
-            var top = anyNode;
-            while (top.Parent != null)
-            {
-                top = top.Parent;
-            }
-            return WalkTree(top, alias);
-        }
-
-        /// <summary>
-        /// This checks what the default rendering engine is set in config but then also ensures that there isn't already
-        /// a template that exists in the opposite rendering engine's template folder, then returns the appropriate
-        /// rendering engine to use.
-        /// </summary>
-        /// <returns></returns>
-        /// <remarks>
-        /// The reason this is required is because for example, if you have a master page file already existing under ~/masterpages/Blah.aspx
-        /// and then you go to create a template in the tree called Blah and the default rendering engine is MVC, it will create a Blah.cshtml
-        /// empty template in ~/Views. This means every page that is using Blah will go to MVC and render an empty page.
-        /// This is mostly related to installing packages since packages install file templates to the file system and then create the
-        /// templates in business logic. Without this, it could cause the wrong rendering engine to be used for a package.
-        /// </remarks>
-        public RenderingEngine DetermineTemplateRenderingEngine(ITemplate template)
-        {
-            var engine = _templateConfig.DefaultRenderingEngine;
-            var viewHelper = new ViewHelper(_viewsFileSystem);
-            if (viewHelper.ViewExists(template) == false)
-            {
-                if (template.Content.IsNullOrWhiteSpace() == false && MasterPageHelper.IsMasterPageSyntax(template.Content))
-                {
-                    //there is a design but its definitely a webforms design and we haven't got a MVC view already for it
-                    return RenderingEngine.WebForms;
-                }
-            }
-
-            var masterPageHelper = new MasterPageHelper(_masterpagesFileSystem);
-
-            switch (engine)
-            {
-                case RenderingEngine.Mvc:
-                    //check if there's a view in ~/masterpages
-                    if (masterPageHelper.MasterPageExists(template) && viewHelper.ViewExists(template) == false)
-                    {
-                        //change this to webforms since there's already a file there for this template alias
-                        engine = RenderingEngine.WebForms;
-                    }
-                    break;
-                case RenderingEngine.WebForms:
-                    //check if there's a view in ~/views
-                    if (viewHelper.ViewExists(template) && masterPageHelper.MasterPageExists(template) == false)
-                    {
-                        //change this to mvc since there's already a file there for this template alias
-                        engine = RenderingEngine.Mvc;
-                    }
-                    break;
-            }
-            return engine;
-        }
-
-        /// <summary>
-        /// Validates a <see cref="ITemplate"/>
-        /// </summary>
-        /// <param name="template"><see cref="ITemplate"/> to validate</param>
-        /// <returns>True if Script is valid, otherwise false</returns>
-        public bool ValidateTemplate(ITemplate template)
-        {
-            // get path
-            // TODO
-            //  templates should have a real Path somehow - but anyways
-            //  are we using Path for something else?!
-            var path = template.VirtualPath;
-
-            // get valid paths
-            var validDirs = _templateConfig.DefaultRenderingEngine == RenderingEngine.Mvc
-                ? new[] { SystemDirectories.Masterpages, SystemDirectories.MvcViews }
-                : new[] { SystemDirectories.Masterpages };
-
-            // get valid extensions
-            var validExts = new List<string>();
-            if (_templateConfig.DefaultRenderingEngine == RenderingEngine.Mvc)
-            {
-                validExts.Add("cshtml");
-                validExts.Add("vbhtml");
-            }
-            else
-            {
-                validExts.Add(_templateConfig.UseAspNetMasterPages ? "master" : "aspx");
-            }
-
-            // validate path and extension
-            var validFile = IOHelper.VerifyEditPath(path, validDirs);
-            var validExtension = IOHelper.VerifyFileExtension(path, validExts);
-            return validFile && validExtension;
-        }
-
-        private static IEnumerable<TemplateNode> CreateChildren(TemplateNode parent, IEnumerable<ITemplate> childTemplates, ITemplate[] allTemplates)
-        {
-            var children = new List<TemplateNode>();
-            foreach (var childTemplate in childTemplates)
-            {
-                var template = allTemplates.Single(x => x.Id == childTemplate.Id);
-                var child = new TemplateNode(template)
-                    {
-                        Parent = parent
-                    };
-
-                //add to our list
-                children.Add(child);
-
-                //get this node's children
-                var local = childTemplate;
-                var kids = allTemplates.Where(x => x.MasterTemplateAlias.InvariantEquals(local.Alias));
-
-                //recurse
-                child.Children = CreateChildren(child, kids, allTemplates);
-            }
-            return children;
-        }
-
-        #endregion
-
-        /// <summary>
-        /// Ensures that there are not duplicate aliases and if so, changes it to be a numbered version and also verifies the length
-        /// </summary>
-        /// <param name="template"></param>
-        private void EnsureValidAlias(ITemplate template)
-        {
-            //ensure unique alias
-            template.Alias = template.Alias.ToCleanString(CleanStringType.UnderscoreAlias);
-
-            if (template.Alias.Length > 100)
-                template.Alias = template.Alias.Substring(0, 95);
-
-            if (AliasAlreadExists(template))
-            {
-                template.Alias = EnsureUniqueAlias(template, 1);
-            }
-        }
-
-        private bool AliasAlreadExists(ITemplate template)
-        {
-            var sql = GetBaseQuery(true).Where<TemplateDto>(x => x.Alias.InvariantEquals(template.Alias) && x.NodeId != template.Id);
-            var count = Database.ExecuteScalar<int>(sql);
-            return count > 0;
-        }
-
-        private string EnsureUniqueAlias(ITemplate template, int attempts)
-        {
-            //TODO: This is ported from the old data layer... pretty crap way of doing this but it works for now.
-            if (AliasAlreadExists(template))
-                return template.Alias + attempts;
-            attempts++;
-            return EnsureUniqueAlias(template, attempts);
-        }
-    }
-}
+using System;
+using System.Collections.Generic;
+using System.IO;
+using System.Linq;
+using System.Text;
+using NPoco;
+using Umbraco.Core.Cache;
+using Umbraco.Core.Configuration.UmbracoSettings;
+using Umbraco.Core.IO;
+using Umbraco.Core.Logging;
+using Umbraco.Core.Models;
+using Umbraco.Core.Models.EntityBase;
+using Umbraco.Core.Models.Rdbms;
+using Umbraco.Core.Persistence.Factories;
+using Umbraco.Core.Persistence.Querying;
+using Umbraco.Core.Persistence.UnitOfWork;
+using Umbraco.Core.Strings;
+
+namespace Umbraco.Core.Persistence.Repositories.Implement
+{
+    /// <summary>
+    /// Represents the Template Repository
+    /// </summary>
+    internal class TemplateRepository : NPocoRepositoryBase<int, ITemplate>, ITemplateRepository
+    {
+        private readonly IFileSystem _masterpagesFileSystem;
+        private readonly IFileSystem _viewsFileSystem;
+        private readonly ITemplatesSection _templateConfig;
+        private readonly ViewHelper _viewHelper;
+        private readonly MasterPageHelper _masterPageHelper;
+
+        public TemplateRepository(IScopeUnitOfWork work, CacheHelper cache, ILogger logger, IFileSystem masterpageFileSystem, IFileSystem viewFileSystem, ITemplatesSection templateConfig)
+            : base(work, cache, logger)
+        {
+            _masterpagesFileSystem = masterpageFileSystem;
+            _viewsFileSystem = viewFileSystem;
+            _templateConfig = templateConfig;
+            _viewHelper = new ViewHelper(_viewsFileSystem);
+            _masterPageHelper = new MasterPageHelper(_masterpagesFileSystem);
+        }
+
+        protected override IRepositoryCachePolicy<ITemplate, int> CreateCachePolicy(IRuntimeCacheProvider runtimeCache)
+        {
+            return new FullDataSetRepositoryCachePolicy<ITemplate, int>(runtimeCache, GetEntityId, /*expires:*/ false);
+        }
+
+        #region Overrides of RepositoryBase<int,ITemplate>
+
+        protected override ITemplate PerformGet(int id)
+        {
+            //use the underlying GetAll which will force cache all templates
+            return base.GetMany().FirstOrDefault(x => x.Id == id);
+        }
+
+        protected override IEnumerable<ITemplate> PerformGetAll(params int[] ids)
+        {
+            var sql = GetBaseQuery(false);
+
+            if (ids.Any())
+            {
+                sql.Where("umbracoNode.id in (@ids)", new { ids = ids });
+            }
+            else
+            {
+                sql.Where<NodeDto>(x => x.NodeObjectType == NodeObjectTypeId);
+            }
+
+            var dtos = Database.Fetch<TemplateDto>(sql);
+
+            if (dtos.Count == 0) return Enumerable.Empty<ITemplate>();
+
+            //look up the simple template definitions that have a master template assigned, this is used
+            // later to populate the template item's properties
+            var childIds = (ids.Any()
+                ? GetAxisDefinitions(dtos.ToArray())
+                : dtos.Select(x => new UmbracoEntity
+                {
+                    Id = x.NodeId,
+                    ParentId = x.NodeDto.ParentId,
+                    Name = x.Alias
+                })).ToArray();
+
+            return dtos.Select(d => MapFromDto(d, childIds));
+        }
+
+        protected override IEnumerable<ITemplate> PerformGetByQuery(IQuery<ITemplate> query)
+        {
+            var sqlClause = GetBaseQuery(false);
+            var translator = new SqlTranslator<ITemplate>(sqlClause, query);
+            var sql = translator.Translate();
+
+            var dtos = Database.Fetch<TemplateDto>(sql);
+
+            if (dtos.Count == 0) return Enumerable.Empty<ITemplate>();
+
+            //look up the simple template definitions that have a master template assigned, this is used
+            // later to populate the template item's properties
+            var childIds = GetAxisDefinitions(dtos.ToArray()).ToArray();
+
+            return dtos.Select(d => MapFromDto(d, childIds));
+        }
+
+        #endregion
+
+        #region Overrides of NPocoRepositoryBase<int,ITemplate>
+
+        protected override Sql<ISqlContext> GetBaseQuery(bool isCount)
+        {
+            var sql = SqlContext.Sql();
+
+            sql = isCount
+                ? sql.SelectCount()
+                : sql.Select<TemplateDto>(r => r.Select(x => x.NodeDto));
+
+            sql
+                .From<TemplateDto>()
+                .InnerJoin<NodeDto>()
+                .On<TemplateDto, NodeDto>(left => left.NodeId, right => right.NodeId)
+                .Where<NodeDto>(x => x.NodeObjectType == NodeObjectTypeId);
+
+            return sql;
+        }
+
+        protected override string GetBaseWhereClause()
+        {
+            return Constants.DatabaseSchema.Tables.Node + ".id = @id";
+        }
+
+        protected override IEnumerable<string> GetDeleteClauses()
+        {
+            var list = new List<string>
+            {
+                "DELETE FROM " + Constants.DatabaseSchema.Tables.User2NodeNotify + " WHERE nodeId = @id",
+                "DELETE FROM " + Constants.DatabaseSchema.Tables.UserGroup2NodePermission + " WHERE nodeId = @id",
+                "UPDATE " + Constants.DatabaseSchema.Tables.DocumentVersion + " SET templateId = NULL WHERE templateId = @id",
+                "DELETE FROM " + Constants.DatabaseSchema.Tables.DocumentType + " WHERE templateNodeId = @id",
+                "DELETE FROM " + Constants.DatabaseSchema.Tables.Template + " WHERE nodeId = @id",
+                "DELETE FROM " + Constants.DatabaseSchema.Tables.Node + " WHERE id = @id"
+            };
+            return list;
+        }
+
+        protected override Guid NodeObjectTypeId => Constants.ObjectTypes.Template;
+
+        protected override void PersistNewItem(ITemplate entity)
+        {
+            EnsureValidAlias(entity);
+
+            //Save to db
+            var template = (Template)entity;
+            template.AddingEntity();
+
+            var factory = new TemplateFactory(NodeObjectTypeId);
+            var dto = factory.BuildDto(template);
+
+            //Create the (base) node data - umbracoNode
+            var nodeDto = dto.NodeDto;
+            nodeDto.Path = "-1," + dto.NodeDto.NodeId;
+            var o = Database.IsNew<NodeDto>(nodeDto) ? Convert.ToInt32(Database.Insert(nodeDto)) : Database.Update(nodeDto);
+
+            //Update with new correct path
+            var parent = Get(template.MasterTemplateId.Value);
+            if (parent != null)
+            {
+                nodeDto.Path = string.Concat(parent.Path, ",", nodeDto.NodeId);
+            }
+            else
+            {
+                nodeDto.Path = "-1," + dto.NodeDto.NodeId;
+            }
+            Database.Update(nodeDto);
+
+            //Insert template dto
+            dto.NodeId = nodeDto.NodeId;
+            Database.Insert(dto);
+
+            //Update entity with correct values
+            template.Id = nodeDto.NodeId; //Set Id on entity to ensure an Id is set
+            template.Path = nodeDto.Path;
+
+            //now do the file work
+            SaveFile(template, dto);
+
+            template.ResetDirtyProperties();
+
+            // ensure that from now on, content is lazy-loaded
+            if (template.GetFileContent == null)
+                template.GetFileContent = file => GetFileContent((Template) file, false);
+        }
+
+        protected override void PersistUpdatedItem(ITemplate entity)
+        {
+            EnsureValidAlias(entity);
+
+            //store the changed alias if there is one for use with updating files later
+            var originalAlias = entity.Alias;
+            if (entity.IsPropertyDirty("Alias"))
+            {
+                //we need to check what it currently is before saving and remove that file
+                var current = Get(entity.Id);
+                originalAlias = current.Alias;
+            }
+
+            var template = (Template)entity;
+
+            if (entity.IsPropertyDirty("MasterTemplateId"))
+            {
+                var parent = Get(template.MasterTemplateId.Value);
+                if (parent != null)
+                {
+                    entity.Path = string.Concat(parent.Path, ",", entity.Id);
+                }
+                else
+                {
+                    //this means that the master template has been removed, so we need to reset the template's
+                    //path to be at the root
+                    entity.Path = string.Concat("-1,", entity.Id);
+                }
+            }
+
+            //Get TemplateDto from db to get the Primary key of the entity
+            var templateDto = Database.SingleOrDefault<TemplateDto>("WHERE nodeId = @Id", new { Id = entity.Id });
+            //Save updated entity to db
+
+            template.UpdateDate = DateTime.Now;
+            var factory = new TemplateFactory(templateDto.PrimaryKey, NodeObjectTypeId);
+            var dto = factory.BuildDto(template);
+
+            Database.Update(dto.NodeDto);
+            Database.Update(dto);
+
+            //re-update if this is a master template, since it could have changed!
+            var axisDefs = GetAxisDefinitions(dto);
+            template.IsMasterTemplate = axisDefs.Any(x => x.ParentId == dto.NodeId);
+
+            //now do the file work
+            SaveFile((Template) entity, dto, originalAlias);
+
+            entity.ResetDirtyProperties();
+
+            // ensure that from now on, content is lazy-loaded
+            if (template.GetFileContent == null)
+                template.GetFileContent = file => GetFileContent((Template) file, false);
+        }
+
+        private void SaveFile(Template template, TemplateDto dto, string originalAlias = null)
+        {
+            string content;
+
+            var templateOnDisk = template as TemplateOnDisk;
+            if (templateOnDisk != null && templateOnDisk.IsOnDisk)
+            {
+                // if "template on disk" load content from disk
+                content = _viewHelper.GetFileContents(template);
+            }
+            else
+            {
+                // else, create or write template.Content to disk
+                if (DetermineTemplateRenderingEngine(template) == RenderingEngine.Mvc)
+                {
+                    content = originalAlias == null
+                        ? _viewHelper.CreateView(template, true)
+                        : _viewHelper.UpdateViewFile(template, originalAlias);
+                }
+                else
+                {
+                    content = originalAlias == null
+                        ? _masterPageHelper.CreateMasterPage(template, this, true)
+                        : _masterPageHelper.UpdateMasterPageFile(template, originalAlias, this);
+                }
+            }
+
+            // once content has been set, "template on disk" are not "on disk" anymore
+            template.Content = content;
+            SetVirtualPath(template);
+
+            if (dto.Design == content) return;
+            dto.Design = content;
+            Database.Update(dto); // though... we don't care about the db value really??!!
+        }
+
+        protected override void PersistDeletedItem(ITemplate entity)
+        {
+            var deletes = GetDeleteClauses().ToArray();
+
+            var descendants = GetDescendants(entity.Id).ToList();
+
+            //change the order so it goes bottom up! (deepest level first)
+            descendants.Reverse();
+
+            //delete the hierarchy
+            foreach (var descendant in descendants)
+            {
+                foreach (var delete in deletes)
+                {
+                    Database.Execute(delete, new { id = GetEntityId(descendant) });
+                }
+            }
+
+            //now we can delete this one
+            foreach (var delete in deletes)
+            {
+                Database.Execute(delete, new { id = GetEntityId(entity) });
+            }
+
+            if (DetermineTemplateRenderingEngine(entity) == RenderingEngine.Mvc)
+            {
+                var viewName = string.Concat(entity.Alias, ".cshtml");
+                _viewsFileSystem.DeleteFile(viewName);
+            }
+            else
+            {
+                var masterpageName = string.Concat(entity.Alias, ".master");
+                _masterpagesFileSystem.DeleteFile(masterpageName);
+            }
+
+            entity.DeletedDate = DateTime.Now;
+        }
+
+        #endregion
+
+        private IEnumerable<IUmbracoEntity> GetAxisDefinitions(params TemplateDto[] templates)
+        {
+            //look up the simple template definitions that have a master template assigned, this is used
+            // later to populate the template item's properties
+            var childIdsSql = SqlContext.Sql()
+                .Select("nodeId,alias,parentID")
+                .From<TemplateDto>()
+                .InnerJoin<NodeDto>()
+                .On<TemplateDto, NodeDto>(dto => dto.NodeId, dto => dto.NodeId)
+                //lookup axis's
+                .Where("umbracoNode." + SqlContext.SqlSyntax.GetQuotedColumnName("id") + " IN (@parentIds) OR umbracoNode.parentID IN (@childIds)",
+                    new {parentIds = templates.Select(x => x.NodeDto.ParentId), childIds = templates.Select(x => x.NodeId)});
+
+            var childIds = Database.Fetch<dynamic>(childIdsSql)
+                .Select(x => new UmbracoEntity
+                {
+                    Id = x.nodeId,
+                    ParentId = x.parentID,
+                    Name = x.alias
+                });
+            return childIds;
+        }
+
+        /// <summary>
+        /// Maps from a dto to an ITemplate
+        /// </summary>
+        /// <param name="dto"></param>
+        /// <param name="axisDefinitions">
+        /// This is a collection of template definitions ... either all templates, or the collection of child templates and it's parent template
+        /// </param>
+        /// <returns></returns>
+        private ITemplate MapFromDto(TemplateDto dto, IUmbracoEntity[] axisDefinitions)
+        {
+            var factory = new TemplateFactory();
+            var template = factory.BuildEntity(dto, axisDefinitions, file => GetFileContent((Template) file, false));
+
+            if (dto.NodeDto.ParentId > 0)
+            {
+                var masterTemplate = axisDefinitions.FirstOrDefault(x => x.Id == dto.NodeDto.ParentId);
+                if (masterTemplate != null)
+                {
+                    template.MasterTemplateAlias = masterTemplate.Name;
+                    template.MasterTemplateId = new Lazy<int>(() => dto.NodeDto.ParentId);
+                }
+            }
+
+            // get the infos (update date and virtual path) that will change only if
+            // path changes - but do not get content, will get loaded only when required
+            GetFileContent(template, true);
+
+            // reset dirty initial properties (U4-1946)
+            template.ResetDirtyProperties(false);
+
+            return template;
+        }
+
+        private void SetVirtualPath(ITemplate template)
+        {
+            var path = template.OriginalPath;
+            if (string.IsNullOrWhiteSpace(path))
+            {
+                // we need to discover the path
+                path = string.Concat(template.Alias, ".cshtml");
+                if (_viewsFileSystem.FileExists(path))
+                {
+                    template.VirtualPath = _viewsFileSystem.GetUrl(path);
+                    return;
+                }
+                path = string.Concat(template.Alias, ".vbhtml");
+                if (_viewsFileSystem.FileExists(path))
+                {
+                    template.VirtualPath = _viewsFileSystem.GetUrl(path);
+                    return;
+                }
+                path = string.Concat(template.Alias, ".master");
+                if (_masterpagesFileSystem.FileExists(path))
+                {
+                    template.VirtualPath = _masterpagesFileSystem.GetUrl(path);
+                    return;
+                }
+            }
+            else
+            {
+                // we know the path already
+                var ext = Path.GetExtension(path);
+                switch (ext)
+                {
+                    case ".cshtml":
+                    case ".vbhtml":
+                        template.VirtualPath = _viewsFileSystem.GetUrl(path);
+                        return;
+                    case ".master":
+                        template.VirtualPath = _masterpagesFileSystem.GetUrl(path);
+                        return;
+                }
+            }
+
+            template.VirtualPath = string.Empty; // file not found...
+        }
+
+        private string GetFileContent(ITemplate template, bool init)
+        {
+            var path = template.OriginalPath;
+            if (string.IsNullOrWhiteSpace(path))
+            {
+                // we need to discover the path
+                path = string.Concat(template.Alias, ".cshtml");
+                if (_viewsFileSystem.FileExists(path))
+                    return GetFileContent(template, _viewsFileSystem, path, init);
+                path = string.Concat(template.Alias, ".vbhtml");
+                if (_viewsFileSystem.FileExists(path))
+                    return GetFileContent(template, _viewsFileSystem, path, init);
+                path = string.Concat(template.Alias, ".master");
+                if (_masterpagesFileSystem.FileExists(path))
+                    return GetFileContent(template, _masterpagesFileSystem, path, init);
+            }
+            else
+            {
+                // we know the path already
+                var ext = Path.GetExtension(path);
+                switch (ext)
+                {
+                    case ".cshtml":
+                    case ".vbhtml":
+                        return GetFileContent(template, _viewsFileSystem, path, init);
+                    case ".master":
+                        return GetFileContent(template, _masterpagesFileSystem, path, init);
+                }
+            }
+
+            template.VirtualPath = string.Empty; // file not found...
+            return string.Empty;
+        }
+
+        private string GetFileContent(ITemplate template, IFileSystem fs, string filename, bool init)
+        {
+            // do not update .UpdateDate as that would make it dirty (side-effect)
+            // unless initializing, because we have to do it once
+            if (init)
+            {
+                template.UpdateDate = fs.GetLastModified(filename).UtcDateTime;
+            }
+
+            // TODO
+            //  see if this could enable us to update UpdateDate without messing with change tracking
+            //  and then we'd want to do it for scripts, stylesheets and partial views too (ie files)
+            //var xtemplate = template as Template;
+            //xtemplate.DisableChangeTracking();
+            //template.UpdateDate = fs.GetLastModified(filename).UtcDateTime;
+            //xtemplate.EnableChangeTracking();
+
+            template.VirtualPath = fs.GetUrl(filename);
+
+            return init ? null : GetFileContent(fs, filename);
+        }
+
+        private string GetFileContent(IFileSystem fs, string filename)
+        {
+            using (var stream = fs.OpenFile(filename))
+            using (var reader = new StreamReader(stream, Encoding.UTF8, true))
+            {
+                return reader.ReadToEnd();
+            }
+        }
+
+        public Stream GetFileContentStream(string filepath)
+        {
+            var fs = GetFileSystem(filepath);
+            if (fs.FileExists(filepath) == false) return null;
+
+            try
+            {
+                return GetFileSystem(filepath).OpenFile(filepath);
+            }
+            catch
+            {
+                return null; // deal with race conds
+            }
+        }
+
+        public void SetFileContent(string filepath, Stream content)
+        {
+            GetFileSystem(filepath).AddFile(filepath, content, true);
+        }
+
+        public long GetFileSize(string filepath)
+        {
+            return GetFileSystem(filepath).GetSize(filepath);
+        }
+
+        private IFileSystem GetFileSystem(string filepath)
+        {
+            var ext = Path.GetExtension(filepath);
+            IFileSystem fs;
+            switch (ext)
+            {
+                case ".cshtml":
+                case ".vbhtml":
+                    fs = _viewsFileSystem;
+                    break;
+                case ".master":
+                    fs = _masterpagesFileSystem;
+                    break;
+                default:
+                    throw new Exception("Unsupported extension " + ext + ".");
+            }
+            return fs;
+        }
+
+        #region Implementation of ITemplateRepository
+
+        public ITemplate Get(string alias)
+        {
+            return GetAll(alias).FirstOrDefault();
+        }
+
+        public IEnumerable<ITemplate> GetAll(params string[] aliases)
+        {
+            //We must call the base (normal) GetAll method
+            // which is cached. This is a specialized method and unfortunatley with the params[] it
+            // overlaps with the normal GetAll method.
+            if (aliases.Any() == false) return base.GetMany();
+
+            //return from base.GetAll, this is all cached
+            return base.GetMany().Where(x => aliases.InvariantContains(x.Alias));
+        }
+
+        public IEnumerable<ITemplate> GetChildren(int masterTemplateId)
+        {
+            //return from base.GetAll, this is all cached
+            var all = base.GetMany().ToArray();
+
+            if (masterTemplateId <= 0) return all.Where(x => x.MasterTemplateAlias.IsNullOrWhiteSpace());
+
+            var parent = all.FirstOrDefault(x => x.Id == masterTemplateId);
+            if (parent == null) return Enumerable.Empty<ITemplate>();
+
+            var children = all.Where(x => x.MasterTemplateAlias.InvariantEquals(parent.Alias));
+            return children;
+        }
+
+        public IEnumerable<ITemplate> GetChildren(string alias)
+        {
+            //return from base.GetAll, this is all cached
+            return base.GetMany().Where(x => alias.IsNullOrWhiteSpace()
+                ? x.MasterTemplateAlias.IsNullOrWhiteSpace()
+                : x.MasterTemplateAlias.InvariantEquals(alias));
+        }
+
+        public IEnumerable<ITemplate> GetDescendants(int masterTemplateId)
+        {
+            //return from base.GetAll, this is all cached
+            var all = base.GetMany().ToArray();
+            var descendants = new List<ITemplate>();
+            if (masterTemplateId > 0)
+            {
+                var parent = all.FirstOrDefault(x => x.Id == masterTemplateId);
+                if (parent == null) return Enumerable.Empty<ITemplate>();
+                //recursively add all children with a level
+                AddChildren(all, descendants, parent.Alias);
+            }
+            else
+            {
+                descendants.AddRange(all.Where(x => x.MasterTemplateAlias.IsNullOrWhiteSpace()));
+                foreach (var parent in descendants)
+                {
+                    //recursively add all children with a level
+                    AddChildren(all, descendants, parent.Alias);
+                }
+            }
+
+            //return the list - it will be naturally ordered by level
+            return descendants;
+        }
+
+        public IEnumerable<ITemplate> GetDescendants(string alias)
+        {
+            var all = base.GetMany().ToArray();
+            var descendants = new List<ITemplate>();
+            if (alias.IsNullOrWhiteSpace() == false)
+            {
+                var parent = all.FirstOrDefault(x => x.Alias.InvariantEquals(alias));
+                if (parent == null) return Enumerable.Empty<ITemplate>();
+                //recursively add all children
+                AddChildren(all, descendants, parent.Alias);
+            }
+            else
+            {
+                descendants.AddRange(all.Where(x => x.MasterTemplateAlias.IsNullOrWhiteSpace()));
+                foreach (var parent in descendants)
+                {
+                    //recursively add all children with a level
+                    AddChildren(all, descendants, parent.Alias);
+                }
+            }
+            //return the list - it will be naturally ordered by level
+            return descendants;
+        }
+
+        private void AddChildren(ITemplate[] all, List<ITemplate> descendants, string masterAlias)
+        {
+            var c = all.Where(x => x.MasterTemplateAlias.InvariantEquals(masterAlias)).ToArray();
+            descendants.AddRange(c);
+            if (c.Any() == false) return;
+            //recurse through all children
+            foreach (var child in c)
+            {
+                AddChildren(all, descendants, child.Alias);
+            }
+        }
+
+        /// <summary>
+        /// Returns a template as a template node which can be traversed (parent, children)
+        /// </summary>
+        /// <param name="alias"></param>
+        /// <returns></returns>
+        [Obsolete("Use GetDescendants instead")]
+        public TemplateNode GetTemplateNode(string alias)
+        {
+            //first get all template objects
+            var allTemplates = base.GetMany().ToArray();
+
+            var selfTemplate = allTemplates.SingleOrDefault(x => x.Alias.InvariantEquals(alias));
+            if (selfTemplate == null)
+            {
+                return null;
+            }
+
+            var top = selfTemplate;
+            while (top.MasterTemplateAlias.IsNullOrWhiteSpace() == false)
+            {
+                top = allTemplates.Single(x => x.Alias.InvariantEquals(top.MasterTemplateAlias));
+            }
+
+            var topNode = new TemplateNode(allTemplates.Single(x => x.Id == top.Id));
+            var childTemplates = allTemplates.Where(x => x.MasterTemplateAlias.InvariantEquals(top.Alias));
+            //This now creates the hierarchy recursively
+            topNode.Children = CreateChildren(topNode, childTemplates, allTemplates);
+
+            //now we'll return the TemplateNode requested
+            return FindTemplateInTree(topNode, alias);
+        }
+
+        [Obsolete("Only used by obsolete code")]
+        private static TemplateNode WalkTree(TemplateNode current, string alias)
+        {
+            //now walk the tree to find the node
+            if (current.Template.Alias.InvariantEquals(alias))
+            {
+                return current;
+            }
+            foreach (var c in current.Children)
+            {
+                var found = WalkTree(c, alias);
+                if (found != null) return found;
+            }
+            return null;
+        }
+
+        /// <summary>
+        /// Given a template node in a tree, this will find the template node with the given alias if it is found in the hierarchy, otherwise null
+        /// </summary>
+        /// <param name="anyNode"></param>
+        /// <param name="alias"></param>
+        /// <returns></returns>
+        [Obsolete("Use GetDescendants instead")]
+        public TemplateNode FindTemplateInTree(TemplateNode anyNode, string alias)
+        {
+            //first get the root
+            var top = anyNode;
+            while (top.Parent != null)
+            {
+                top = top.Parent;
+            }
+            return WalkTree(top, alias);
+        }
+
+        /// <summary>
+        /// This checks what the default rendering engine is set in config but then also ensures that there isn't already
+        /// a template that exists in the opposite rendering engine's template folder, then returns the appropriate
+        /// rendering engine to use.
+        /// </summary>
+        /// <returns></returns>
+        /// <remarks>
+        /// The reason this is required is because for example, if you have a master page file already existing under ~/masterpages/Blah.aspx
+        /// and then you go to create a template in the tree called Blah and the default rendering engine is MVC, it will create a Blah.cshtml
+        /// empty template in ~/Views. This means every page that is using Blah will go to MVC and render an empty page.
+        /// This is mostly related to installing packages since packages install file templates to the file system and then create the
+        /// templates in business logic. Without this, it could cause the wrong rendering engine to be used for a package.
+        /// </remarks>
+        public RenderingEngine DetermineTemplateRenderingEngine(ITemplate template)
+        {
+            var engine = _templateConfig.DefaultRenderingEngine;
+            var viewHelper = new ViewHelper(_viewsFileSystem);
+            if (viewHelper.ViewExists(template) == false)
+            {
+                if (template.Content.IsNullOrWhiteSpace() == false && MasterPageHelper.IsMasterPageSyntax(template.Content))
+                {
+                    //there is a design but its definitely a webforms design and we haven't got a MVC view already for it
+                    return RenderingEngine.WebForms;
+                }
+            }
+
+            var masterPageHelper = new MasterPageHelper(_masterpagesFileSystem);
+
+            switch (engine)
+            {
+                case RenderingEngine.Mvc:
+                    //check if there's a view in ~/masterpages
+                    if (masterPageHelper.MasterPageExists(template) && viewHelper.ViewExists(template) == false)
+                    {
+                        //change this to webforms since there's already a file there for this template alias
+                        engine = RenderingEngine.WebForms;
+                    }
+                    break;
+                case RenderingEngine.WebForms:
+                    //check if there's a view in ~/views
+                    if (viewHelper.ViewExists(template) && masterPageHelper.MasterPageExists(template) == false)
+                    {
+                        //change this to mvc since there's already a file there for this template alias
+                        engine = RenderingEngine.Mvc;
+                    }
+                    break;
+            }
+            return engine;
+        }
+
+        /// <summary>
+        /// Validates a <see cref="ITemplate"/>
+        /// </summary>
+        /// <param name="template"><see cref="ITemplate"/> to validate</param>
+        /// <returns>True if Script is valid, otherwise false</returns>
+        public bool ValidateTemplate(ITemplate template)
+        {
+            // get path
+            // TODO
+            //  templates should have a real Path somehow - but anyways
+            //  are we using Path for something else?!
+            var path = template.VirtualPath;
+
+            // get valid paths
+            var validDirs = _templateConfig.DefaultRenderingEngine == RenderingEngine.Mvc
+                ? new[] { SystemDirectories.Masterpages, SystemDirectories.MvcViews }
+                : new[] { SystemDirectories.Masterpages };
+
+            // get valid extensions
+            var validExts = new List<string>();
+            if (_templateConfig.DefaultRenderingEngine == RenderingEngine.Mvc)
+            {
+                validExts.Add("cshtml");
+                validExts.Add("vbhtml");
+            }
+            else
+            {
+                validExts.Add(_templateConfig.UseAspNetMasterPages ? "master" : "aspx");
+            }
+
+            // validate path and extension
+            var validFile = IOHelper.VerifyEditPath(path, validDirs);
+            var validExtension = IOHelper.VerifyFileExtension(path, validExts);
+            return validFile && validExtension;
+        }
+
+        private static IEnumerable<TemplateNode> CreateChildren(TemplateNode parent, IEnumerable<ITemplate> childTemplates, ITemplate[] allTemplates)
+        {
+            var children = new List<TemplateNode>();
+            foreach (var childTemplate in childTemplates)
+            {
+                var template = allTemplates.Single(x => x.Id == childTemplate.Id);
+                var child = new TemplateNode(template)
+                    {
+                        Parent = parent
+                    };
+
+                //add to our list
+                children.Add(child);
+
+                //get this node's children
+                var local = childTemplate;
+                var kids = allTemplates.Where(x => x.MasterTemplateAlias.InvariantEquals(local.Alias));
+
+                //recurse
+                child.Children = CreateChildren(child, kids, allTemplates);
+            }
+            return children;
+        }
+
+        #endregion
+
+        /// <summary>
+        /// Ensures that there are not duplicate aliases and if so, changes it to be a numbered version and also verifies the length
+        /// </summary>
+        /// <param name="template"></param>
+        private void EnsureValidAlias(ITemplate template)
+        {
+            //ensure unique alias
+            template.Alias = template.Alias.ToCleanString(CleanStringType.UnderscoreAlias);
+
+            if (template.Alias.Length > 100)
+                template.Alias = template.Alias.Substring(0, 95);
+
+            if (AliasAlreadExists(template))
+            {
+                template.Alias = EnsureUniqueAlias(template, 1);
+            }
+        }
+
+        private bool AliasAlreadExists(ITemplate template)
+        {
+            var sql = GetBaseQuery(true).Where<TemplateDto>(x => x.Alias.InvariantEquals(template.Alias) && x.NodeId != template.Id);
+            var count = Database.ExecuteScalar<int>(sql);
+            return count > 0;
+        }
+
+        private string EnsureUniqueAlias(ITemplate template, int attempts)
+        {
+            //TODO: This is ported from the old data layer... pretty crap way of doing this but it works for now.
+            if (AliasAlreadExists(template))
+                return template.Alias + attempts;
+            attempts++;
+            return EnsureUniqueAlias(template, attempts);
+        }
+    }
+}
diff --git a/src/Umbraco.Core/Persistence/Repositories/TupleExtensions.cs b/src/Umbraco.Core/Persistence/Repositories/Implement/TupleExtensions.cs
similarity index 90%
rename from src/Umbraco.Core/Persistence/Repositories/TupleExtensions.cs
rename to src/Umbraco.Core/Persistence/Repositories/Implement/TupleExtensions.cs
index a944e9e497..eae9251552 100644
--- a/src/Umbraco.Core/Persistence/Repositories/TupleExtensions.cs
+++ b/src/Umbraco.Core/Persistence/Repositories/Implement/TupleExtensions.cs
@@ -2,7 +2,7 @@
 using System.Collections.Generic;
 using System.Linq;
 
-namespace Umbraco.Core.Persistence.Repositories
+namespace Umbraco.Core.Persistence.Repositories.Implement
 {
     static class TupleExtensions
     {
diff --git a/src/Umbraco.Core/Persistence/Repositories/UserGroupRepository.cs b/src/Umbraco.Core/Persistence/Repositories/Implement/UserGroupRepository.cs
similarity index 99%
rename from src/Umbraco.Core/Persistence/Repositories/UserGroupRepository.cs
rename to src/Umbraco.Core/Persistence/Repositories/Implement/UserGroupRepository.cs
index 0c88647218..2721ec0585 100644
--- a/src/Umbraco.Core/Persistence/Repositories/UserGroupRepository.cs
+++ b/src/Umbraco.Core/Persistence/Repositories/Implement/UserGroupRepository.cs
@@ -2,10 +2,10 @@
 using System.Collections.Generic;
 using System.Linq;
 using NPoco;
-using Umbraco.Core.Logging;
-using Umbraco.Core.Models;
 using Umbraco.Core.Cache;
 using Umbraco.Core.Exceptions;
+using Umbraco.Core.Logging;
+using Umbraco.Core.Models;
 using Umbraco.Core.Models.EntityBase;
 using Umbraco.Core.Models.Membership;
 using Umbraco.Core.Models.Rdbms;
@@ -13,7 +13,7 @@ using Umbraco.Core.Persistence.Factories;
 using Umbraco.Core.Persistence.Querying;
 using Umbraco.Core.Persistence.UnitOfWork;
 
-namespace Umbraco.Core.Persistence.Repositories
+namespace Umbraco.Core.Persistence.Repositories.Implement
 {
     /// <summary>
     /// Represents the UserGroupRepository for doing CRUD operations for <see cref="IUserGroup"/>
@@ -84,7 +84,7 @@ namespace Umbraco.Core.Persistence.Repositories
 
         public void AddOrUpdateGroupWithUsers(IUserGroup userGroup, int[] userIds)
         {
-            _userGroupWithUsersRepository.AddOrUpdate(new UserGroupWithUsers(userGroup, userIds));
+            _userGroupWithUsersRepository.Save(new UserGroupWithUsers(userGroup, userIds));
         }
 
 
diff --git a/src/Umbraco.Core/Persistence/Repositories/UserRepository.cs b/src/Umbraco.Core/Persistence/Repositories/Implement/UserRepository.cs
similarity index 97%
rename from src/Umbraco.Core/Persistence/Repositories/UserRepository.cs
rename to src/Umbraco.Core/Persistence/Repositories/Implement/UserRepository.cs
index fa5bfb8103..daf5306ccd 100644
--- a/src/Umbraco.Core/Persistence/Repositories/UserRepository.cs
+++ b/src/Umbraco.Core/Persistence/Repositories/Implement/UserRepository.cs
@@ -1,763 +1,761 @@
-using System;
-using System.Collections.Generic;
-using System.ComponentModel;
-using System.Linq;
-using System.Linq.Expressions;
-using System.Text;
-using System.Web.Security;
-using Newtonsoft.Json;
-using NPoco;
-using Umbraco.Core.Cache;
-using Umbraco.Core.Logging;
-using Umbraco.Core.Models;
-using Umbraco.Core.Models.EntityBase;
-using Umbraco.Core.Models.Membership;
-using Umbraco.Core.Models.Rdbms;
-using Umbraco.Core.Persistence.DatabaseModelDefinitions;
-using Umbraco.Core.Persistence.Factories;
-using Umbraco.Core.Persistence.Mappers;
-using Umbraco.Core.Persistence.Querying;
-using Umbraco.Core.Persistence.UnitOfWork;
-using Umbraco.Core.Security;
-
-namespace Umbraco.Core.Persistence.Repositories
-{
-    /// <summary>
-    /// Represents the UserRepository for doing CRUD operations for <see cref="IUser"/>
-    /// </summary>
-    internal class UserRepository : NPocoRepositoryBase<int, IUser>, IUserRepository
-    {
-        private readonly IMapperCollection _mapperCollection;
-        private readonly IDictionary<string, string> _passwordConfig;
-
-        /// <summary>
-        /// Constructor
-        /// </summary>
-        /// <param name="work"></param>
-        /// <param name="cacheHelper"></param>
-        /// <param name="logger"></param>
-        /// <param name="passwordConfig">
-        /// A dictionary specifying the configuration for user passwords. If this is null then no password configuration will be persisted or read.
-        /// </param>
-        public UserRepository(IScopeUnitOfWork work, CacheHelper cacheHelper, ILogger logger, IMapperCollection mapperCollection)
-            : base(work, cacheHelper, logger)
-        {
-            _mapperCollection = mapperCollection;
-
-            var userMembershipProvider = MembershipProviderExtensions.GetUsersMembershipProvider();
-            _passwordConfig = userMembershipProvider == null || userMembershipProvider.PasswordFormat != MembershipPasswordFormat.Hashed
-                ? null
-                : new Dictionary<string, string> { { "hashAlgorithm", Membership.HashAlgorithmType } };
-        }
-
-        // for tests
-        internal UserRepository(IScopeUnitOfWork work, CacheHelper cacheHelper, ILogger logger, IMapperCollection mapperCollection, IDictionary<string, string> passwordConfig)
-            : base(work, cacheHelper, logger)
-        {
-            _mapperCollection = mapperCollection;
-            _passwordConfig = passwordConfig;
-        }
-
-        #region Overrides of RepositoryBase<int,IUser>
-
-        protected override IUser PerformGet(int id)
-        {
-            var sql = SqlContext.Sql()
-                .Select<UserDto>()
-                .From<UserDto>()
-                .Where<UserDto>(x => x.Id == id);
-
-            var dtos = Database.Fetch<UserDto>(sql);
-            if (dtos.Count == 0) return null;
-
-            PerformGetReferencedDtos(dtos);
-            return UserFactory.BuildEntity(dtos[0]);
-        }
-
-        /// <summary>
-        /// Returns a user by username
-        /// </summary>
-        /// <param name="username"></param>
-        /// <param name="includeSecurityData">
-        /// Can be used for slightly faster user lookups if the result doesn't require security data (i.e. groups, apps & start nodes).
-        /// This is really only used for a shim in order to upgrade to 7.6.
-        /// </param>
-        /// <returns>
-        /// A non cached <see cref="IUser"/> instance
-        /// </returns>
-        public IUser GetByUsername(string username, bool includeSecurityData)
-        {
-            return GetWith(sql => sql.Where<UserDto>(x => x.Login == username), includeSecurityData);
-        }
-
-        /// <summary>
-        /// Returns a user by id
-        /// </summary>
-        /// <param name="id"></param>
-        /// <param name="includeSecurityData">
-        /// This is really only used for a shim in order to upgrade to 7.6 but could be used
-        /// for slightly faster user lookups if the result doesn't require security data (i.e. groups, apps & start nodes)
-        /// </param>
-        /// <returns>
-        /// A non cached <see cref="IUser"/> instance
-        /// </returns>
-        public IUser Get(int id, bool includeSecurityData)
-        {
-            return GetWith(sql => sql.Where<UserDto>(x => x.Id == id), includeSecurityData);
-        }
-
-        public IProfile GetProfile(string username)
-        {
-            var dto = GetDtoWith(sql => sql.Where<UserDto>(x => x.UserName == username), false);
-            return dto == null ? null : new UserProfile(dto.Id, dto.UserName);
-        }
-
-        public IProfile GetProfile(int id)
-        {
-            var dto = GetDtoWith(sql => sql.Where<UserDto>(x => x.Id == id), false);
-            return dto == null ? null : new UserProfile(dto.Id, dto.UserName);
-        }
-
-        public IDictionary<UserState, int> GetUserStates()
-        {
-            var sql = @"SELECT '1CountOfAll' AS colName, COUNT(id) AS num FROM umbracoUser
-UNION
-SELECT '2CountOfActive' AS colName, COUNT(id) AS num FROM umbracoUser WHERE userDisabled = 0 AND userNoConsole = 0 AND lastLoginDate IS NOT NULL
-UNION
-SELECT '3CountOfDisabled' AS colName, COUNT(id) AS num FROM umbracoUser WHERE userDisabled = 1
-UNION
-SELECT '4CountOfLockedOut' AS colName, COUNT(id) AS num FROM umbracoUser WHERE userNoConsole = 1
-UNION
-SELECT '5CountOfInvited' AS colName, COUNT(id) AS num FROM umbracoUser WHERE lastLoginDate IS NULL AND userDisabled = 1 AND invitedDate IS NOT NULL
-ORDER BY colName";
-
-            var result = Database.Fetch<dynamic>(sql);
-
-            return new Dictionary<UserState, int>
-            {
-                {UserState.All, result[0].num},
-                {UserState.Active, result[1].num},
-                {UserState.Disabled, result[2].num},
-                {UserState.LockedOut, result[3].num},
-                {UserState.Invited, result[4].num}
-            };
-        }
-
-        protected override IEnumerable<IUser> PerformGetAll(params int[] ids)
-        {
-            var dtos = ids.Length == 0
-                ? GetDtosWith(null, true)
-                : GetDtosWith(sql => sql.WhereIn<UserDto>(x => x.Id, ids), true);
-            var users = new IUser[dtos.Count];
-            var i = 0;
-            foreach (var dto in dtos)
-                users[i++] = UserFactory.BuildEntity(dto);
-            return users;
-        }
-
-        protected override IEnumerable<IUser> PerformGetByQuery(IQuery<IUser> query)
-        {
-            var dtos = GetDtosWith(sql => new SqlTranslator<IUser>(sql, query).Translate(), true)
-                .DistinctBy(x => x.Id)
-                .ToList();
-
-            var users = new IUser[dtos.Count];
-            var i = 0;
-            foreach (var dto in dtos)
-                users[i++] = UserFactory.BuildEntity(dto);
-            return users;
-        }
-
-        private IUser GetWith(Action<Sql<ISqlContext>> with, bool includeReferences)
-        {
-            var dto = GetDtoWith(with, includeReferences);
-            return dto == null ? null : UserFactory.BuildEntity(dto);
-        }
-
-        private UserDto GetDtoWith(Action<Sql<ISqlContext>> with, bool includeReferences)
-        {
-            var dtos = GetDtosWith(with, includeReferences);
-            return dtos.FirstOrDefault();
-        }
-
-        private List<UserDto> GetDtosWith(Action<Sql<ISqlContext>> with, bool includeReferences)
-        {
-            var sql = SqlContext.Sql()
-                .Select<UserDto>()
-                .From<UserDto>();
-
-            with?.Invoke(sql);
-
-            var dtos = Database.Fetch<UserDto>(sql);
-
-            if (includeReferences)
-                PerformGetReferencedDtos(dtos);
-
-            return dtos;
-        }
-
-        // NPoco cannot fetch 2+ references at a time
-        // plus it creates a combinatorial explosion
-        // better use extra queries
-        // unfortunately, SqlCe and MySql don't support multiple result sets
-        private void PerformGetReferencedDtos(List<UserDto> dtos)
-        {
-            if (dtos.Count == 0) return;
-
-            var userIds = dtos.Count == 1 ? new List<int> { dtos[0].Id } : dtos.Select(x => x.Id).ToList();
-            var xUsers = dtos.Count == 1 ? null : dtos.ToDictionary(x => x.Id, x => x);
-
-            // get users2groups
-
-            var sql = SqlContext.Sql()
-                .Select<User2UserGroupDto>()
-                .From<User2UserGroupDto>()
-                .WhereIn<User2UserGroupReadOnlyDto>(x => x.UserId, userIds);
-
-            var users2groups = Database.Fetch<User2UserGroupDto>(sql);
-            var groupIds = users2groups.Select(x => x.UserGroupId).ToList();
-
-            // get groups
-
-            sql = SqlContext.Sql()
-                .Select<UserGroupDto>()
-                .From<UserGroupDto>()
-                .WhereIn<UserGroupDto>(x => x.Id, groupIds);
-
-            var groups = Database.Fetch<UserGroupDto>(sql)
-                .ToDictionary(x => x.Id, x => x);
-
-            // get groups2apps
-
-            sql = SqlContext.Sql()
-                .Select<UserGroup2AppDto>()
-                .From<UserGroup2AppDto>()
-                .WhereIn<UserGroup2AppDto>(x => x.UserGroupId, groupIds);
-
-            var groups2apps = Database.Fetch<UserGroup2AppDto>(sql)
-                .GroupBy(x => x.UserGroupId)
-                .ToDictionary(x => x.Key, x => x);
-
-            // get start nodes
-
-            sql = SqlContext.Sql()
-                .Select<UserStartNodeDto>()
-                .From<UserStartNodeDto>()
-                .WhereIn<UserStartNodeDto>(x => x.UserId, userIds);
-
-            var startNodes = Database.Fetch<UserStartNodeDto>(sql);
-
-            // map groups
-
-            foreach (var user2group in users2groups)
-            {
-                if (groups.TryGetValue(user2group.UserGroupId, out var group))
-                {
-                    var dto = xUsers == null ? dtos[0] : xUsers[user2group.UserId];
-                    dto.UserGroupDtos.Add(group); // user2group is distinct
-                }
-            }
-
-            // map start nodes
-
-            foreach (var startNode in startNodes)
-            {
-                var dto = xUsers == null ? dtos[0] : xUsers[startNode.UserId];
-                dto.UserStartNodeDtos.Add(startNode); // hashset = distinct
-            }
-
-            // map apps
-
-            foreach (var group in groups.Values)
-            {
-                if (groups2apps.TryGetValue(group.Id, out var list))
-                    group.UserGroup2AppDtos = list.ToList(); // groups2apps is distinct
-            }
-        }
-
-        #endregion
-
-        #region Overrides of NPocoRepositoryBase<int,IUser>
-
-        protected override Sql<ISqlContext> GetBaseQuery(bool isCount)
-        {
-            if (isCount)
-                return SqlContext.Sql()
-                    .SelectCount()
-                    .From<UserDto>();
-
-            return SqlContext.Sql()
-                .Select<UserDto>()
-                .From<UserDto>();
-        }
-
-        private static void AddGroupLeftJoin(Sql<ISqlContext> sql)
-        {
-            sql
-                .LeftJoin<User2UserGroupDto>()
-                .On<User2UserGroupDto, UserDto>(left => left.UserId, right => right.Id)
-                .LeftJoin<UserGroupDto>()
-                .On<UserGroupDto, User2UserGroupDto>(left => left.Id, right => right.UserGroupId)
-                .LeftJoin<UserGroup2AppDto>()
-                .On<UserGroup2AppDto, UserGroupDto>(left => left.UserGroupId, right => right.Id)
-                .LeftJoin<UserStartNodeDto>()
-                .On<UserStartNodeDto, UserDto>(left => left.UserId, right => right.Id);
-        }
-
-        private Sql<ISqlContext> GetBaseQuery(string columns)
-        {
-            return SqlContext.Sql()
-                .Select(columns)
-                .From<UserDto>();
-        }
-
-        protected override string GetBaseWhereClause()
-        {
-            return "umbracoUser.id = @id";
-        }
-
-        protected override IEnumerable<string> GetDeleteClauses()
-        {
-            var list = new List<string>
-            {
-                "DELETE FROM cmsTask WHERE userId = @id",
-                "DELETE FROM cmsTask WHERE parentUserId = @id",
-                "DELETE FROM umbracoUser2UserGroup WHERE userId = @id",
-                "DELETE FROM umbracoUser2NodeNotify WHERE userId = @id",
-                "DELETE FROM umbracoUser WHERE id = @id",
-                "DELETE FROM umbracoExternalLogin WHERE id = @id"
-            };
-            return list;
-        }
-
-        protected override Guid NodeObjectTypeId => throw new NotImplementedException();
-
-        protected override void PersistNewItem(IUser entity)
-        {
-            ((User) entity).AddingEntity();
-
-            // ensure security stamp if missing
-            if (entity.SecurityStamp.IsNullOrWhiteSpace())
-                entity.SecurityStamp = Guid.NewGuid().ToString();
-
-            var userDto = UserFactory.BuildDto(entity);
-
-            // check if we have a known config, we only want to store config for hashing
-            //TODO: This logic will need to be updated when we do http://issues.umbraco.org/issue/U4-10089
-            if (_passwordConfig != null && _passwordConfig.Count > 0)
-            {
-                var json = JsonConvert.SerializeObject(_passwordConfig);
-                userDto.PasswordConfig = json;
-            }
-
-            var id = Convert.ToInt32(Database.Insert(userDto));
-            entity.Id = id;
-
-            if (entity.IsPropertyDirty("StartContentIds"))
-            {
-                AddingOrUpdateStartNodes(entity, Enumerable.Empty<UserStartNodeDto>(), UserStartNodeDto.StartNodeTypeValue.Content, entity.StartContentIds);
-            }
-
-            if (entity.IsPropertyDirty("StartMediaIds"))
-            {
-                AddingOrUpdateStartNodes(entity, Enumerable.Empty<UserStartNodeDto>(), UserStartNodeDto.StartNodeTypeValue.Media, entity.StartMediaIds);
-            }
-
-            if (entity.IsPropertyDirty("Groups"))
-            {
-                // lookup all assigned
-                var assigned = entity.Groups == null || entity.Groups.Any() == false
-                    ? new List<UserGroupDto>()
-                    : Database.Fetch<UserGroupDto>("SELECT * FROM umbracoUserGroup WHERE userGroupAlias IN (@aliases)", new { aliases = entity.Groups.Select(x => x.Alias) });
-
-                foreach (var groupDto in assigned)
-                {
-                    var dto = new User2UserGroupDto
-                    {
-                        UserGroupId = groupDto.Id,
-                        UserId = entity.Id
-                    };
-                    Database.Insert(dto);
-                }
-            }
-
-            entity.ResetDirtyProperties();
-        }
-
-        protected override void PersistUpdatedItem(IUser entity)
-        {
-            // updates Modified date
-            ((User) entity).UpdatingEntity();
-
-            // ensure security stamp if missing
-            if (entity.SecurityStamp.IsNullOrWhiteSpace())
-                entity.SecurityStamp = Guid.NewGuid().ToString();
-
-            var userDto = UserFactory.BuildDto(entity);
-
-            // build list of columns to check for saving - we don't want to save the password if it hasn't changed!
-            // list the columns to save, NOTE: would be nice to not have hard coded strings here but no real good way around that
-            var colsToSave = new Dictionary<string, string>
-            {
-                {"userDisabled", "IsApproved"},
-                {"userNoConsole", "IsLockedOut"},
-                {"startStructureID", "StartContentId"},
-                {"startMediaID", "StartMediaId"},
-                {"userName", "Name"},
-                {"userLogin", "Username"},
-                {"userEmail", "Email"},
-                {"userLanguage", "Language"},
-                {"securityStampToken", "SecurityStamp"},
-                {"lastLockoutDate", "LastLockoutDate"},
-                {"lastPasswordChangeDate", "LastPasswordChangeDate"},
-                {"lastLoginDate", "LastLoginDate"},
-                {"failedLoginAttempts", "FailedPasswordAttempts"},
-                {"createDate", "CreateDate"},
-                {"updateDate", "UpdateDate"},
-                {"avatar", "Avatar"},
-                {"emailConfirmedDate", "EmailConfirmedDate"},
-                {"invitedDate", "InvitedDate"}
-            };
-
-            // create list of properties that have changed
-            var changedCols = colsToSave
-                .Where(col => entity.IsPropertyDirty(col.Value))
-                .Select(col => col.Key)
-                .ToList();
-
-            // DO NOT update the password if it has not changed or if it is null or empty
-            if (entity.IsPropertyDirty("RawPasswordValue") && entity.RawPasswordValue.IsNullOrWhiteSpace() == false)
-            {
-                changedCols.Add("userPassword");
-
-                // special case - when using ASP.Net identity the user manager will take care of updating the security stamp, however
-                // when not using ASP.Net identity (i.e. old membership providers), we'll need to take care of updating this manually
-                // so we can just detect if that property is dirty, if it's not we'll set it manually
-                if (entity.IsPropertyDirty("SecurityStamp") == false)
-                {
-                    userDto.SecurityStampToken = entity.SecurityStamp = Guid.NewGuid().ToString();
-                    changedCols.Add("securityStampToken");
-                }
-
-                // check if we have a known config, we only want to store config for hashing
-                //TODO: This logic will need to be updated when we do http://issues.umbraco.org/issue/U4-10089
-                if (_passwordConfig != null && _passwordConfig.Count > 0)
-                {
-                    var json = JsonConvert.SerializeObject(_passwordConfig);
-                    userDto.PasswordConfig = json;
-
-                    changedCols.Add("passwordConfig");
-                }
-            }
-
-            //only update the changed cols
-            if (changedCols.Count > 0)
-            {
-                Database.Update(userDto, changedCols);
-            }
-
-            if (entity.IsPropertyDirty("StartContentIds") || entity.IsPropertyDirty("StartMediaIds"))
-            {
-                var assignedStartNodes = Database.Fetch<UserStartNodeDto>("SELECT * FROM umbracoUserStartNode WHERE userId = @userId", new { userId = entity.Id });
-                if (entity.IsPropertyDirty("StartContentIds"))
-                {
-                    AddingOrUpdateStartNodes(entity, assignedStartNodes, UserStartNodeDto.StartNodeTypeValue.Content, entity.StartContentIds);
-                }
-                if (entity.IsPropertyDirty("StartMediaIds"))
-                {
-                    AddingOrUpdateStartNodes(entity, assignedStartNodes, UserStartNodeDto.StartNodeTypeValue.Media, entity.StartMediaIds);
-                }
-            }
-
-            if (entity.IsPropertyDirty("Groups"))
-            {
-                //lookup all assigned
-                var assigned = entity.Groups == null || entity.Groups.Any() == false
-                    ? new List<UserGroupDto>()
-                    : Database.Fetch<UserGroupDto>("SELECT * FROM umbracoUserGroup WHERE userGroupAlias IN (@aliases)", new { aliases = entity.Groups.Select(x => x.Alias) });
-
-                //first delete all
-                //TODO: We could do this a nicer way instead of "Nuke and Pave"
-                Database.Delete<User2UserGroupDto>("WHERE UserId = @UserId", new { UserId = entity.Id });
-
-                foreach (var groupDto in assigned)
-                {
-                    var dto = new User2UserGroupDto
-                    {
-                        UserGroupId = groupDto.Id,
-                        UserId = entity.Id
-                    };
-                    Database.Insert(dto);
-                }
-            }
-
-            entity.ResetDirtyProperties();
-        }
-
-        private void AddingOrUpdateStartNodes(IEntity entity, IEnumerable<UserStartNodeDto> current, UserStartNodeDto.StartNodeTypeValue startNodeType, int[] entityStartIds)
-        {
-            var assignedIds = current.Where(x => x.StartNodeType == (int)startNodeType).Select(x => x.StartNode).ToArray();
-
-            //remove the ones not assigned to the entity
-            var toDelete = assignedIds.Except(entityStartIds).ToArray();
-            if (toDelete.Length > 0)
-                Database.Delete<UserStartNodeDto>("WHERE UserId = @UserId AND startNode IN (@startNodes)", new { UserId = entity.Id, startNodes = toDelete });
-            //add the ones not currently in the db
-            var toAdd = entityStartIds.Except(assignedIds).ToArray();
-            foreach (var i in toAdd)
-            {
-                var dto = new UserStartNodeDto
-                {
-                    StartNode = i,
-                    StartNodeType = (int)startNodeType,
-                    UserId = entity.Id
-                };
-                Database.Insert(dto);
-            }
-        }
-
-        #endregion
-
-        #region Implementation of IUserRepository
-
-        public int GetCountByQuery(IQuery<IUser> query)
-        {
-            var sqlClause = GetBaseQuery("umbracoUser.id");
-            var translator = new SqlTranslator<IUser>(sqlClause, query);
-            var subquery = translator.Translate();
-            //get the COUNT base query
-            var sql = GetBaseQuery(true)
-                .Append(new Sql("WHERE umbracoUser.id IN (" + subquery.SQL + ")", subquery.Arguments));
-
-            return Database.ExecuteScalar<int>(sql);
-        }
-
-        public bool Exists(string username)
-        {
-            var sql = SqlContext.Sql()
-                .SelectCount()
-                .From<UserDto>()
-                .Where<UserDto>(x => x.UserName == username);
-
-            return Database.ExecuteScalar<int>(sql) > 0;
-        }
-
-        /// <summary>
-        /// Gets a list of <see cref="IUser"/> objects associated with a given group
-        /// </summary>
-        /// <param name="groupId">Id of group</param>
-        public IEnumerable<IUser> GetAllInGroup(int groupId)
-        {
-            return GetAllInOrNotInGroup(groupId, true);
-        }
-
-        /// <summary>
-        /// Gets a list of <see cref="IUser"/> objects not associated with a given group
-        /// </summary>
-        /// <param name="groupId">Id of group</param>
-        public IEnumerable<IUser> GetAllNotInGroup(int groupId)
-        {
-            return GetAllInOrNotInGroup(groupId, false);
-        }
-
-        private IEnumerable<IUser> GetAllInOrNotInGroup(int groupId, bool include)
-        {
-            var sql = SqlContext.Sql()
-                .Select<UserDto>()
-                .From<UserDto>();
-
-            var inSql = SqlContext.Sql()
-                .Select<User2UserGroupDto>(x => x.UserId)
-                .From<User2UserGroupDto>()
-                .Where<User2UserGroupDto>(x => x.UserGroupId == groupId);
-
-            if (include)
-                sql.WhereIn<UserDto>(x => x.Id, inSql);
-            else
-                sql.WhereNotIn<UserDto>(x => x.Id, inSql);
-
-            return ConvertFromDtos(Database.Fetch<UserDto>(sql));
-        }
-
-        /// <summary>
-        /// Gets paged user results
-        /// </summary>
-        /// <param name="query"></param>
-        /// <param name="pageIndex"></param>
-        /// <param name="pageSize"></param>
-        /// <param name="totalRecords"></param>
-        /// <param name="orderBy"></param>
-        /// <param name="orderDirection"></param>
-        /// <param name="includeUserGroups">
-        /// A filter to only include user that belong to these user groups
-        /// </param>
-        /// <param name="excludeUserGroups">
-        /// A filter to only include users that do not belong to these user groups
-        /// </param>
-        /// <param name="userState">Optional parameter to filter by specfied user state</param>
-        /// <param name="filter"></param>
-        /// <returns></returns>
-        /// <remarks>
-        /// The query supplied will ONLY work with data specifically on the umbracoUser table because we are using NPoco paging (SQL paging)
-        /// </remarks>
-        public IEnumerable<IUser> GetPagedResultsByQuery(IQuery<IUser> query, long pageIndex, int pageSize, out long totalRecords,
-            Expression<Func<IUser, object>> orderBy, Direction orderDirection = Direction.Ascending,
-            string[] includeUserGroups = null, string[] excludeUserGroups = null, UserState[] userState = null, IQuery<IUser> filter = null)
-        {
-            if (orderBy == null) throw new ArgumentNullException(nameof(orderBy));
-
-            // get the referenced column name and find the corresp mapped column name
-            var expressionMember = ExpressionHelper.GetMemberInfo(orderBy);
-            var mapper = _mapperCollection[typeof(IUser)];
-            var mappedField = mapper.Map(SqlContext.SqlSyntax, expressionMember.Name);
-
-            if (mappedField.IsNullOrWhiteSpace())
-                throw new ArgumentException("Could not find a mapping for the column specified in the orderBy clause");
-
-            return GetPagedResultsByQuery(query, pageIndex, pageSize, out totalRecords, mappedField, orderDirection, includeUserGroups, excludeUserGroups, userState, filter);
-        }
-
-        private IEnumerable<IUser> GetPagedResultsByQuery(IQuery<IUser> query, long pageIndex, int pageSize, out long totalRecords,
-            string orderBy, Direction orderDirection = Direction.Ascending,
-            string[] includeUserGroups = null, string[] excludeUserGroups = null, UserState[] userState = null, IQuery<IUser> filter = null)
-        {
-            if (string.IsNullOrWhiteSpace(orderBy)) throw new ArgumentException("Value cannot be null or whitespace.", nameof(orderBy));
-
-            Sql<ISqlContext> filterSql = null;
-            var customFilterWheres = filter != null ? filter.GetWhereClauses().ToArray() : null;
-            var hasCustomFilter = customFilterWheres != null && customFilterWheres.Length > 0;
-            if (hasCustomFilter
-                || includeUserGroups != null && includeUserGroups.Length > 0
-                || excludeUserGroups != null && excludeUserGroups.Length > 0
-                || userState != null && userState.Length > 0 && userState.Contains(UserState.All) == false)
-                filterSql = SqlContext.Sql();
-
-            if (hasCustomFilter)
-            {
-                foreach (var clause in customFilterWheres)
-                    filterSql.Append($"AND ({clause.Item1})", clause.Item2);
-            }
-
-
-            if (includeUserGroups != null && includeUserGroups.Length > 0)
-            {
-                const string subQuery = @"AND (umbracoUser.id IN (SELECT DISTINCT umbracoUser.id
-                    FROM umbracoUser
-                    INNER JOIN umbracoUser2UserGroup ON umbracoUser2UserGroup.userId = umbracoUser.id
-                    INNER JOIN umbracoUserGroup ON umbracoUserGroup.id = umbracoUser2UserGroup.userGroupId
-                    WHERE umbracoUserGroup.userGroupAlias IN (@userGroups)))";
-                filterSql.Append(subQuery, new { userGroups = includeUserGroups });
-            }
-
-            if (excludeUserGroups != null && excludeUserGroups.Length > 0)
-            {
-                var subQuery = @"AND (umbracoUser.id NOT IN (SELECT DISTINCT umbracoUser.id
-                    FROM umbracoUser
-                    INNER JOIN umbracoUser2UserGroup ON umbracoUser2UserGroup.userId = umbracoUser.id
-                    INNER JOIN umbracoUserGroup ON umbracoUserGroup.id = umbracoUser2UserGroup.userGroupId
-                    WHERE umbracoUserGroup.userGroupAlias IN (@userGroups)))";
-                filterSql.Append(subQuery, new { userGroups = excludeUserGroups });
-            }
-
-            if (userState != null && userState.Length > 0)
-            {
-                //the "ALL" state doesn't require any filtering so we ignore that, if it exists in the list we don't do any filtering
-                if (userState.Contains(UserState.All) == false)
-                {
-                    var sb = new StringBuilder("(");
-                    var appended = false;
-
-                    if (userState.Contains(UserState.Active))
-                    {
-                        sb.Append("(userDisabled = 0 AND userNoConsole = 0 AND lastLoginDate IS NOT NULL)");
-                        appended = true;
-                    }
-                    if (userState.Contains(UserState.Disabled))
-                    {
-                        if (appended) sb.Append(" OR ");
-                        sb.Append("(userDisabled = 1)");
-                        appended = true;
-                    }
-                    if (userState.Contains(UserState.LockedOut))
-                    {
-                        if (appended) sb.Append(" OR ");
-                        sb.Append("(userNoConsole = 1)");
-                        appended = true;
-                    }
-                    if (userState.Contains(UserState.Invited))
-                    {
-                        if (appended) sb.Append(" OR ");
-                        sb.Append("(lastLoginDate IS NULL AND userDisabled = 1 AND invitedDate IS NOT NULL)");
-                        appended = true;
-                    }
-
-                    sb.Append(")");
-                    filterSql.Append("AND " + sb);
-                }
-            }
-
-            // create base query
-            var sql = SqlContext.Sql()
-                .Select<UserDto>()
-                .From<UserDto>();
-
-            // apply query
-            if (query != null)
-                sql = new SqlTranslator<IUser>(sql, query).Translate();
-
-            // get sorted and filtered sql
-            var sqlNodeIdsWithSort = ApplySort(ApplyFilter(sql, filterSql), orderDirection, orderBy);
-
-            // get a page of results and total count
-            var pagedResult = Database.Page<UserDto>(pageIndex + 1, pageSize, sqlNodeIdsWithSort);
-            totalRecords = Convert.ToInt32(pagedResult.TotalItems);
-
-            // map references
-            PerformGetReferencedDtos(pagedResult.Items);
-            return pagedResult.Items.Select(UserFactory.BuildEntity);
-        }
-
-        private Sql<ISqlContext> ApplyFilter(Sql<ISqlContext> sql, Sql<ISqlContext> filterSql)
-        {
-            if (filterSql == null) return sql;
-
-            sql.Append(SqlContext.Sql(" WHERE " + filterSql.SQL.TrimStart("AND "), filterSql.Arguments));
-
-            return sql;
-        }
-
-        private static Sql<ISqlContext> ApplySort(Sql<ISqlContext> sql, Direction orderDirection, string orderBy)
-        {
-            if (string.IsNullOrEmpty(orderBy)) return sql;
-
-            if (orderDirection == Direction.Ascending)
-                sql.OrderBy(orderBy);
-            else
-                sql.OrderByDescending(orderBy);
-
-            return sql;
-        }
-
-        internal IEnumerable<IUser> GetNextUsers(int id, int count)
-        {
-            var idsQuery = SqlContext.Sql()
-                .Select<UserDto>(x => x.Id)
-                .From<UserDto>()
-                .Where<UserDto>(x => x.Id >= id)
-                .OrderBy<UserDto>(x => x.Id);
-
-            // first page is index 1, not zero
-            var ids = Database.Page<int>(1, count, idsQuery).Items.ToArray();
-
-            // now get the actual users and ensure they are ordered properly (same clause)
-            return ids.Length == 0 ? Enumerable.Empty<IUser>() : GetAll(ids).OrderBy(x => x.Id);
-        }
-
-        #endregion
-
-        private IEnumerable<IUser> ConvertFromDtos(IEnumerable<UserDto> dtos)
-        {
-            return dtos.Select(UserFactory.BuildEntity);
-        }
-    }
-}
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Linq.Expressions;
+using System.Text;
+using System.Web.Security;
+using Newtonsoft.Json;
+using NPoco;
+using Umbraco.Core.Cache;
+using Umbraco.Core.Logging;
+using Umbraco.Core.Models.EntityBase;
+using Umbraco.Core.Models.Membership;
+using Umbraco.Core.Models.Rdbms;
+using Umbraco.Core.Persistence.DatabaseModelDefinitions;
+using Umbraco.Core.Persistence.Factories;
+using Umbraco.Core.Persistence.Mappers;
+using Umbraco.Core.Persistence.Querying;
+using Umbraco.Core.Persistence.UnitOfWork;
+using Umbraco.Core.Security;
+
+namespace Umbraco.Core.Persistence.Repositories.Implement
+{
+    /// <summary>
+    /// Represents the UserRepository for doing CRUD operations for <see cref="IUser"/>
+    /// </summary>
+    internal class UserRepository : NPocoRepositoryBase<int, IUser>, IUserRepository
+    {
+        private readonly IMapperCollection _mapperCollection;
+        private readonly IDictionary<string, string> _passwordConfig;
+
+        /// <summary>
+        /// Constructor
+        /// </summary>
+        /// <param name="work"></param>
+        /// <param name="cacheHelper"></param>
+        /// <param name="logger"></param>
+        /// <param name="passwordConfig">
+        /// A dictionary specifying the configuration for user passwords. If this is null then no password configuration will be persisted or read.
+        /// </param>
+        public UserRepository(IScopeUnitOfWork work, CacheHelper cacheHelper, ILogger logger, IMapperCollection mapperCollection)
+            : base(work, cacheHelper, logger)
+        {
+            _mapperCollection = mapperCollection;
+
+            var userMembershipProvider = MembershipProviderExtensions.GetUsersMembershipProvider();
+            _passwordConfig = userMembershipProvider == null || userMembershipProvider.PasswordFormat != MembershipPasswordFormat.Hashed
+                ? null
+                : new Dictionary<string, string> { { "hashAlgorithm", Membership.HashAlgorithmType } };
+        }
+
+        // for tests
+        internal UserRepository(IScopeUnitOfWork work, CacheHelper cacheHelper, ILogger logger, IMapperCollection mapperCollection, IDictionary<string, string> passwordConfig)
+            : base(work, cacheHelper, logger)
+        {
+            _mapperCollection = mapperCollection;
+            _passwordConfig = passwordConfig;
+        }
+
+        #region Overrides of RepositoryBase<int,IUser>
+
+        protected override IUser PerformGet(int id)
+        {
+            var sql = SqlContext.Sql()
+                .Select<UserDto>()
+                .From<UserDto>()
+                .Where<UserDto>(x => x.Id == id);
+
+            var dtos = Database.Fetch<UserDto>(sql);
+            if (dtos.Count == 0) return null;
+
+            PerformGetReferencedDtos(dtos);
+            return UserFactory.BuildEntity(dtos[0]);
+        }
+
+        /// <summary>
+        /// Returns a user by username
+        /// </summary>
+        /// <param name="username"></param>
+        /// <param name="includeSecurityData">
+        /// Can be used for slightly faster user lookups if the result doesn't require security data (i.e. groups, apps & start nodes).
+        /// This is really only used for a shim in order to upgrade to 7.6.
+        /// </param>
+        /// <returns>
+        /// A non cached <see cref="IUser"/> instance
+        /// </returns>
+        public IUser GetByUsername(string username, bool includeSecurityData)
+        {
+            return GetWith(sql => sql.Where<UserDto>(x => x.Login == username), includeSecurityData);
+        }
+
+        /// <summary>
+        /// Returns a user by id
+        /// </summary>
+        /// <param name="id"></param>
+        /// <param name="includeSecurityData">
+        /// This is really only used for a shim in order to upgrade to 7.6 but could be used
+        /// for slightly faster user lookups if the result doesn't require security data (i.e. groups, apps & start nodes)
+        /// </param>
+        /// <returns>
+        /// A non cached <see cref="IUser"/> instance
+        /// </returns>
+        public IUser Get(int id, bool includeSecurityData)
+        {
+            return GetWith(sql => sql.Where<UserDto>(x => x.Id == id), includeSecurityData);
+        }
+
+        public IProfile GetProfile(string username)
+        {
+            var dto = GetDtoWith(sql => sql.Where<UserDto>(x => x.UserName == username), false);
+            return dto == null ? null : new UserProfile(dto.Id, dto.UserName);
+        }
+
+        public IProfile GetProfile(int id)
+        {
+            var dto = GetDtoWith(sql => sql.Where<UserDto>(x => x.Id == id), false);
+            return dto == null ? null : new UserProfile(dto.Id, dto.UserName);
+        }
+
+        public IDictionary<UserState, int> GetUserStates()
+        {
+            var sql = @"SELECT '1CountOfAll' AS colName, COUNT(id) AS num FROM umbracoUser
+UNION
+SELECT '2CountOfActive' AS colName, COUNT(id) AS num FROM umbracoUser WHERE userDisabled = 0 AND userNoConsole = 0 AND lastLoginDate IS NOT NULL
+UNION
+SELECT '3CountOfDisabled' AS colName, COUNT(id) AS num FROM umbracoUser WHERE userDisabled = 1
+UNION
+SELECT '4CountOfLockedOut' AS colName, COUNT(id) AS num FROM umbracoUser WHERE userNoConsole = 1
+UNION
+SELECT '5CountOfInvited' AS colName, COUNT(id) AS num FROM umbracoUser WHERE lastLoginDate IS NULL AND userDisabled = 1 AND invitedDate IS NOT NULL
+ORDER BY colName";
+
+            var result = Database.Fetch<dynamic>(sql);
+
+            return new Dictionary<UserState, int>
+            {
+                {UserState.All, result[0].num},
+                {UserState.Active, result[1].num},
+                {UserState.Disabled, result[2].num},
+                {UserState.LockedOut, result[3].num},
+                {UserState.Invited, result[4].num}
+            };
+        }
+
+        protected override IEnumerable<IUser> PerformGetAll(params int[] ids)
+        {
+            var dtos = ids.Length == 0
+                ? GetDtosWith(null, true)
+                : GetDtosWith(sql => sql.WhereIn<UserDto>(x => x.Id, ids), true);
+            var users = new IUser[dtos.Count];
+            var i = 0;
+            foreach (var dto in dtos)
+                users[i++] = UserFactory.BuildEntity(dto);
+            return users;
+        }
+
+        protected override IEnumerable<IUser> PerformGetByQuery(IQuery<IUser> query)
+        {
+            var dtos = GetDtosWith(sql => new SqlTranslator<IUser>(sql, query).Translate(), true)
+                .DistinctBy(x => x.Id)
+                .ToList();
+
+            var users = new IUser[dtos.Count];
+            var i = 0;
+            foreach (var dto in dtos)
+                users[i++] = UserFactory.BuildEntity(dto);
+            return users;
+        }
+
+        private IUser GetWith(Action<Sql<ISqlContext>> with, bool includeReferences)
+        {
+            var dto = GetDtoWith(with, includeReferences);
+            return dto == null ? null : UserFactory.BuildEntity(dto);
+        }
+
+        private UserDto GetDtoWith(Action<Sql<ISqlContext>> with, bool includeReferences)
+        {
+            var dtos = GetDtosWith(with, includeReferences);
+            return dtos.FirstOrDefault();
+        }
+
+        private List<UserDto> GetDtosWith(Action<Sql<ISqlContext>> with, bool includeReferences)
+        {
+            var sql = SqlContext.Sql()
+                .Select<UserDto>()
+                .From<UserDto>();
+
+            with?.Invoke(sql);
+
+            var dtos = Database.Fetch<UserDto>(sql);
+
+            if (includeReferences)
+                PerformGetReferencedDtos(dtos);
+
+            return dtos;
+        }
+
+        // NPoco cannot fetch 2+ references at a time
+        // plus it creates a combinatorial explosion
+        // better use extra queries
+        // unfortunately, SqlCe and MySql don't support multiple result sets
+        private void PerformGetReferencedDtos(List<UserDto> dtos)
+        {
+            if (dtos.Count == 0) return;
+
+            var userIds = dtos.Count == 1 ? new List<int> { dtos[0].Id } : dtos.Select(x => x.Id).ToList();
+            var xUsers = dtos.Count == 1 ? null : dtos.ToDictionary(x => x.Id, x => x);
+
+            // get users2groups
+
+            var sql = SqlContext.Sql()
+                .Select<User2UserGroupDto>()
+                .From<User2UserGroupDto>()
+                .WhereIn<User2UserGroupReadOnlyDto>(x => x.UserId, userIds);
+
+            var users2groups = Database.Fetch<User2UserGroupDto>(sql);
+            var groupIds = users2groups.Select(x => x.UserGroupId).ToList();
+
+            // get groups
+
+            sql = SqlContext.Sql()
+                .Select<UserGroupDto>()
+                .From<UserGroupDto>()
+                .WhereIn<UserGroupDto>(x => x.Id, groupIds);
+
+            var groups = Database.Fetch<UserGroupDto>(sql)
+                .ToDictionary(x => x.Id, x => x);
+
+            // get groups2apps
+
+            sql = SqlContext.Sql()
+                .Select<UserGroup2AppDto>()
+                .From<UserGroup2AppDto>()
+                .WhereIn<UserGroup2AppDto>(x => x.UserGroupId, groupIds);
+
+            var groups2apps = Database.Fetch<UserGroup2AppDto>(sql)
+                .GroupBy(x => x.UserGroupId)
+                .ToDictionary(x => x.Key, x => x);
+
+            // get start nodes
+
+            sql = SqlContext.Sql()
+                .Select<UserStartNodeDto>()
+                .From<UserStartNodeDto>()
+                .WhereIn<UserStartNodeDto>(x => x.UserId, userIds);
+
+            var startNodes = Database.Fetch<UserStartNodeDto>(sql);
+
+            // map groups
+
+            foreach (var user2group in users2groups)
+            {
+                if (groups.TryGetValue(user2group.UserGroupId, out var group))
+                {
+                    var dto = xUsers == null ? dtos[0] : xUsers[user2group.UserId];
+                    dto.UserGroupDtos.Add(group); // user2group is distinct
+                }
+            }
+
+            // map start nodes
+
+            foreach (var startNode in startNodes)
+            {
+                var dto = xUsers == null ? dtos[0] : xUsers[startNode.UserId];
+                dto.UserStartNodeDtos.Add(startNode); // hashset = distinct
+            }
+
+            // map apps
+
+            foreach (var group in groups.Values)
+            {
+                if (groups2apps.TryGetValue(group.Id, out var list))
+                    group.UserGroup2AppDtos = list.ToList(); // groups2apps is distinct
+            }
+        }
+
+        #endregion
+
+        #region Overrides of NPocoRepositoryBase<int,IUser>
+
+        protected override Sql<ISqlContext> GetBaseQuery(bool isCount)
+        {
+            if (isCount)
+                return SqlContext.Sql()
+                    .SelectCount()
+                    .From<UserDto>();
+
+            return SqlContext.Sql()
+                .Select<UserDto>()
+                .From<UserDto>();
+        }
+
+        private static void AddGroupLeftJoin(Sql<ISqlContext> sql)
+        {
+            sql
+                .LeftJoin<User2UserGroupDto>()
+                .On<User2UserGroupDto, UserDto>(left => left.UserId, right => right.Id)
+                .LeftJoin<UserGroupDto>()
+                .On<UserGroupDto, User2UserGroupDto>(left => left.Id, right => right.UserGroupId)
+                .LeftJoin<UserGroup2AppDto>()
+                .On<UserGroup2AppDto, UserGroupDto>(left => left.UserGroupId, right => right.Id)
+                .LeftJoin<UserStartNodeDto>()
+                .On<UserStartNodeDto, UserDto>(left => left.UserId, right => right.Id);
+        }
+
+        private Sql<ISqlContext> GetBaseQuery(string columns)
+        {
+            return SqlContext.Sql()
+                .Select(columns)
+                .From<UserDto>();
+        }
+
+        protected override string GetBaseWhereClause()
+        {
+            return "umbracoUser.id = @id";
+        }
+
+        protected override IEnumerable<string> GetDeleteClauses()
+        {
+            var list = new List<string>
+            {
+                "DELETE FROM cmsTask WHERE userId = @id",
+                "DELETE FROM cmsTask WHERE parentUserId = @id",
+                "DELETE FROM umbracoUser2UserGroup WHERE userId = @id",
+                "DELETE FROM umbracoUser2NodeNotify WHERE userId = @id",
+                "DELETE FROM umbracoUser WHERE id = @id",
+                "DELETE FROM umbracoExternalLogin WHERE id = @id"
+            };
+            return list;
+        }
+
+        protected override Guid NodeObjectTypeId => throw new NotImplementedException();
+
+        protected override void PersistNewItem(IUser entity)
+        {
+            ((User) entity).AddingEntity();
+
+            // ensure security stamp if missing
+            if (entity.SecurityStamp.IsNullOrWhiteSpace())
+                entity.SecurityStamp = Guid.NewGuid().ToString();
+
+            var userDto = UserFactory.BuildDto(entity);
+
+            // check if we have a known config, we only want to store config for hashing
+            //TODO: This logic will need to be updated when we do http://issues.umbraco.org/issue/U4-10089
+            if (_passwordConfig != null && _passwordConfig.Count > 0)
+            {
+                var json = JsonConvert.SerializeObject(_passwordConfig);
+                userDto.PasswordConfig = json;
+            }
+
+            var id = Convert.ToInt32(Database.Insert(userDto));
+            entity.Id = id;
+
+            if (entity.IsPropertyDirty("StartContentIds"))
+            {
+                AddingOrUpdateStartNodes(entity, Enumerable.Empty<UserStartNodeDto>(), UserStartNodeDto.StartNodeTypeValue.Content, entity.StartContentIds);
+            }
+
+            if (entity.IsPropertyDirty("StartMediaIds"))
+            {
+                AddingOrUpdateStartNodes(entity, Enumerable.Empty<UserStartNodeDto>(), UserStartNodeDto.StartNodeTypeValue.Media, entity.StartMediaIds);
+            }
+
+            if (entity.IsPropertyDirty("Groups"))
+            {
+                // lookup all assigned
+                var assigned = entity.Groups == null || entity.Groups.Any() == false
+                    ? new List<UserGroupDto>()
+                    : Database.Fetch<UserGroupDto>("SELECT * FROM umbracoUserGroup WHERE userGroupAlias IN (@aliases)", new { aliases = entity.Groups.Select(x => x.Alias) });
+
+                foreach (var groupDto in assigned)
+                {
+                    var dto = new User2UserGroupDto
+                    {
+                        UserGroupId = groupDto.Id,
+                        UserId = entity.Id
+                    };
+                    Database.Insert(dto);
+                }
+            }
+
+            entity.ResetDirtyProperties();
+        }
+
+        protected override void PersistUpdatedItem(IUser entity)
+        {
+            // updates Modified date
+            ((User) entity).UpdatingEntity();
+
+            // ensure security stamp if missing
+            if (entity.SecurityStamp.IsNullOrWhiteSpace())
+                entity.SecurityStamp = Guid.NewGuid().ToString();
+
+            var userDto = UserFactory.BuildDto(entity);
+
+            // build list of columns to check for saving - we don't want to save the password if it hasn't changed!
+            // list the columns to save, NOTE: would be nice to not have hard coded strings here but no real good way around that
+            var colsToSave = new Dictionary<string, string>
+            {
+                {"userDisabled", "IsApproved"},
+                {"userNoConsole", "IsLockedOut"},
+                {"startStructureID", "StartContentId"},
+                {"startMediaID", "StartMediaId"},
+                {"userName", "Name"},
+                {"userLogin", "Username"},
+                {"userEmail", "Email"},
+                {"userLanguage", "Language"},
+                {"securityStampToken", "SecurityStamp"},
+                {"lastLockoutDate", "LastLockoutDate"},
+                {"lastPasswordChangeDate", "LastPasswordChangeDate"},
+                {"lastLoginDate", "LastLoginDate"},
+                {"failedLoginAttempts", "FailedPasswordAttempts"},
+                {"createDate", "CreateDate"},
+                {"updateDate", "UpdateDate"},
+                {"avatar", "Avatar"},
+                {"emailConfirmedDate", "EmailConfirmedDate"},
+                {"invitedDate", "InvitedDate"}
+            };
+
+            // create list of properties that have changed
+            var changedCols = colsToSave
+                .Where(col => entity.IsPropertyDirty(col.Value))
+                .Select(col => col.Key)
+                .ToList();
+
+            // DO NOT update the password if it has not changed or if it is null or empty
+            if (entity.IsPropertyDirty("RawPasswordValue") && entity.RawPasswordValue.IsNullOrWhiteSpace() == false)
+            {
+                changedCols.Add("userPassword");
+
+                // special case - when using ASP.Net identity the user manager will take care of updating the security stamp, however
+                // when not using ASP.Net identity (i.e. old membership providers), we'll need to take care of updating this manually
+                // so we can just detect if that property is dirty, if it's not we'll set it manually
+                if (entity.IsPropertyDirty("SecurityStamp") == false)
+                {
+                    userDto.SecurityStampToken = entity.SecurityStamp = Guid.NewGuid().ToString();
+                    changedCols.Add("securityStampToken");
+                }
+
+                // check if we have a known config, we only want to store config for hashing
+                //TODO: This logic will need to be updated when we do http://issues.umbraco.org/issue/U4-10089
+                if (_passwordConfig != null && _passwordConfig.Count > 0)
+                {
+                    var json = JsonConvert.SerializeObject(_passwordConfig);
+                    userDto.PasswordConfig = json;
+
+                    changedCols.Add("passwordConfig");
+                }
+            }
+
+            //only update the changed cols
+            if (changedCols.Count > 0)
+            {
+                Database.Update(userDto, changedCols);
+            }
+
+            if (entity.IsPropertyDirty("StartContentIds") || entity.IsPropertyDirty("StartMediaIds"))
+            {
+                var assignedStartNodes = Database.Fetch<UserStartNodeDto>("SELECT * FROM umbracoUserStartNode WHERE userId = @userId", new { userId = entity.Id });
+                if (entity.IsPropertyDirty("StartContentIds"))
+                {
+                    AddingOrUpdateStartNodes(entity, assignedStartNodes, UserStartNodeDto.StartNodeTypeValue.Content, entity.StartContentIds);
+                }
+                if (entity.IsPropertyDirty("StartMediaIds"))
+                {
+                    AddingOrUpdateStartNodes(entity, assignedStartNodes, UserStartNodeDto.StartNodeTypeValue.Media, entity.StartMediaIds);
+                }
+            }
+
+            if (entity.IsPropertyDirty("Groups"))
+            {
+                //lookup all assigned
+                var assigned = entity.Groups == null || entity.Groups.Any() == false
+                    ? new List<UserGroupDto>()
+                    : Database.Fetch<UserGroupDto>("SELECT * FROM umbracoUserGroup WHERE userGroupAlias IN (@aliases)", new { aliases = entity.Groups.Select(x => x.Alias) });
+
+                //first delete all
+                //TODO: We could do this a nicer way instead of "Nuke and Pave"
+                Database.Delete<User2UserGroupDto>("WHERE UserId = @UserId", new { UserId = entity.Id });
+
+                foreach (var groupDto in assigned)
+                {
+                    var dto = new User2UserGroupDto
+                    {
+                        UserGroupId = groupDto.Id,
+                        UserId = entity.Id
+                    };
+                    Database.Insert(dto);
+                }
+            }
+
+            entity.ResetDirtyProperties();
+        }
+
+        private void AddingOrUpdateStartNodes(IEntity entity, IEnumerable<UserStartNodeDto> current, UserStartNodeDto.StartNodeTypeValue startNodeType, int[] entityStartIds)
+        {
+            var assignedIds = current.Where(x => x.StartNodeType == (int)startNodeType).Select(x => x.StartNode).ToArray();
+
+            //remove the ones not assigned to the entity
+            var toDelete = assignedIds.Except(entityStartIds).ToArray();
+            if (toDelete.Length > 0)
+                Database.Delete<UserStartNodeDto>("WHERE UserId = @UserId AND startNode IN (@startNodes)", new { UserId = entity.Id, startNodes = toDelete });
+            //add the ones not currently in the db
+            var toAdd = entityStartIds.Except(assignedIds).ToArray();
+            foreach (var i in toAdd)
+            {
+                var dto = new UserStartNodeDto
+                {
+                    StartNode = i,
+                    StartNodeType = (int)startNodeType,
+                    UserId = entity.Id
+                };
+                Database.Insert(dto);
+            }
+        }
+
+        #endregion
+
+        #region Implementation of IUserRepository
+
+        public int GetCountByQuery(IQuery<IUser> query)
+        {
+            var sqlClause = GetBaseQuery("umbracoUser.id");
+            var translator = new SqlTranslator<IUser>(sqlClause, query);
+            var subquery = translator.Translate();
+            //get the COUNT base query
+            var sql = GetBaseQuery(true)
+                .Append(new Sql("WHERE umbracoUser.id IN (" + subquery.SQL + ")", subquery.Arguments));
+
+            return Database.ExecuteScalar<int>(sql);
+        }
+
+        public bool Exists(string username)
+        {
+            var sql = SqlContext.Sql()
+                .SelectCount()
+                .From<UserDto>()
+                .Where<UserDto>(x => x.UserName == username);
+
+            return Database.ExecuteScalar<int>(sql) > 0;
+        }
+
+        /// <summary>
+        /// Gets a list of <see cref="IUser"/> objects associated with a given group
+        /// </summary>
+        /// <param name="groupId">Id of group</param>
+        public IEnumerable<IUser> GetAllInGroup(int groupId)
+        {
+            return GetAllInOrNotInGroup(groupId, true);
+        }
+
+        /// <summary>
+        /// Gets a list of <see cref="IUser"/> objects not associated with a given group
+        /// </summary>
+        /// <param name="groupId">Id of group</param>
+        public IEnumerable<IUser> GetAllNotInGroup(int groupId)
+        {
+            return GetAllInOrNotInGroup(groupId, false);
+        }
+
+        private IEnumerable<IUser> GetAllInOrNotInGroup(int groupId, bool include)
+        {
+            var sql = SqlContext.Sql()
+                .Select<UserDto>()
+                .From<UserDto>();
+
+            var inSql = SqlContext.Sql()
+                .Select<User2UserGroupDto>(x => x.UserId)
+                .From<User2UserGroupDto>()
+                .Where<User2UserGroupDto>(x => x.UserGroupId == groupId);
+
+            if (include)
+                sql.WhereIn<UserDto>(x => x.Id, inSql);
+            else
+                sql.WhereNotIn<UserDto>(x => x.Id, inSql);
+
+            return ConvertFromDtos(Database.Fetch<UserDto>(sql));
+        }
+
+        /// <summary>
+        /// Gets paged user results
+        /// </summary>
+        /// <param name="query"></param>
+        /// <param name="pageIndex"></param>
+        /// <param name="pageSize"></param>
+        /// <param name="totalRecords"></param>
+        /// <param name="orderBy"></param>
+        /// <param name="orderDirection"></param>
+        /// <param name="includeUserGroups">
+        /// A filter to only include user that belong to these user groups
+        /// </param>
+        /// <param name="excludeUserGroups">
+        /// A filter to only include users that do not belong to these user groups
+        /// </param>
+        /// <param name="userState">Optional parameter to filter by specfied user state</param>
+        /// <param name="filter"></param>
+        /// <returns></returns>
+        /// <remarks>
+        /// The query supplied will ONLY work with data specifically on the umbracoUser table because we are using NPoco paging (SQL paging)
+        /// </remarks>
+        public IEnumerable<IUser> GetPagedResultsByQuery(IQuery<IUser> query, long pageIndex, int pageSize, out long totalRecords,
+            Expression<Func<IUser, object>> orderBy, Direction orderDirection = Direction.Ascending,
+            string[] includeUserGroups = null, string[] excludeUserGroups = null, UserState[] userState = null, IQuery<IUser> filter = null)
+        {
+            if (orderBy == null) throw new ArgumentNullException(nameof(orderBy));
+
+            // get the referenced column name and find the corresp mapped column name
+            var expressionMember = ExpressionHelper.GetMemberInfo(orderBy);
+            var mapper = _mapperCollection[typeof(IUser)];
+            var mappedField = mapper.Map(SqlContext.SqlSyntax, expressionMember.Name);
+
+            if (mappedField.IsNullOrWhiteSpace())
+                throw new ArgumentException("Could not find a mapping for the column specified in the orderBy clause");
+
+            return GetPagedResultsByQuery(query, pageIndex, pageSize, out totalRecords, mappedField, orderDirection, includeUserGroups, excludeUserGroups, userState, filter);
+        }
+
+        private IEnumerable<IUser> GetPagedResultsByQuery(IQuery<IUser> query, long pageIndex, int pageSize, out long totalRecords,
+            string orderBy, Direction orderDirection = Direction.Ascending,
+            string[] includeUserGroups = null, string[] excludeUserGroups = null, UserState[] userState = null, IQuery<IUser> filter = null)
+        {
+            if (string.IsNullOrWhiteSpace(orderBy)) throw new ArgumentException("Value cannot be null or whitespace.", nameof(orderBy));
+
+            Sql<ISqlContext> filterSql = null;
+            var customFilterWheres = filter != null ? filter.GetWhereClauses().ToArray() : null;
+            var hasCustomFilter = customFilterWheres != null && customFilterWheres.Length > 0;
+            if (hasCustomFilter
+                || includeUserGroups != null && includeUserGroups.Length > 0
+                || excludeUserGroups != null && excludeUserGroups.Length > 0
+                || userState != null && userState.Length > 0 && userState.Contains(UserState.All) == false)
+                filterSql = SqlContext.Sql();
+
+            if (hasCustomFilter)
+            {
+                foreach (var clause in customFilterWheres)
+                    filterSql.Append($"AND ({clause.Item1})", clause.Item2);
+            }
+
+
+            if (includeUserGroups != null && includeUserGroups.Length > 0)
+            {
+                const string subQuery = @"AND (umbracoUser.id IN (SELECT DISTINCT umbracoUser.id
+                    FROM umbracoUser
+                    INNER JOIN umbracoUser2UserGroup ON umbracoUser2UserGroup.userId = umbracoUser.id
+                    INNER JOIN umbracoUserGroup ON umbracoUserGroup.id = umbracoUser2UserGroup.userGroupId
+                    WHERE umbracoUserGroup.userGroupAlias IN (@userGroups)))";
+                filterSql.Append(subQuery, new { userGroups = includeUserGroups });
+            }
+
+            if (excludeUserGroups != null && excludeUserGroups.Length > 0)
+            {
+                var subQuery = @"AND (umbracoUser.id NOT IN (SELECT DISTINCT umbracoUser.id
+                    FROM umbracoUser
+                    INNER JOIN umbracoUser2UserGroup ON umbracoUser2UserGroup.userId = umbracoUser.id
+                    INNER JOIN umbracoUserGroup ON umbracoUserGroup.id = umbracoUser2UserGroup.userGroupId
+                    WHERE umbracoUserGroup.userGroupAlias IN (@userGroups)))";
+                filterSql.Append(subQuery, new { userGroups = excludeUserGroups });
+            }
+
+            if (userState != null && userState.Length > 0)
+            {
+                //the "ALL" state doesn't require any filtering so we ignore that, if it exists in the list we don't do any filtering
+                if (userState.Contains(UserState.All) == false)
+                {
+                    var sb = new StringBuilder("(");
+                    var appended = false;
+
+                    if (userState.Contains(UserState.Active))
+                    {
+                        sb.Append("(userDisabled = 0 AND userNoConsole = 0 AND lastLoginDate IS NOT NULL)");
+                        appended = true;
+                    }
+                    if (userState.Contains(UserState.Disabled))
+                    {
+                        if (appended) sb.Append(" OR ");
+                        sb.Append("(userDisabled = 1)");
+                        appended = true;
+                    }
+                    if (userState.Contains(UserState.LockedOut))
+                    {
+                        if (appended) sb.Append(" OR ");
+                        sb.Append("(userNoConsole = 1)");
+                        appended = true;
+                    }
+                    if (userState.Contains(UserState.Invited))
+                    {
+                        if (appended) sb.Append(" OR ");
+                        sb.Append("(lastLoginDate IS NULL AND userDisabled = 1 AND invitedDate IS NOT NULL)");
+                        appended = true;
+                    }
+
+                    sb.Append(")");
+                    filterSql.Append("AND " + sb);
+                }
+            }
+
+            // create base query
+            var sql = SqlContext.Sql()
+                .Select<UserDto>()
+                .From<UserDto>();
+
+            // apply query
+            if (query != null)
+                sql = new SqlTranslator<IUser>(sql, query).Translate();
+
+            // get sorted and filtered sql
+            var sqlNodeIdsWithSort = ApplySort(ApplyFilter(sql, filterSql), orderDirection, orderBy);
+
+            // get a page of results and total count
+            var pagedResult = Database.Page<UserDto>(pageIndex + 1, pageSize, sqlNodeIdsWithSort);
+            totalRecords = Convert.ToInt32(pagedResult.TotalItems);
+
+            // map references
+            PerformGetReferencedDtos(pagedResult.Items);
+            return pagedResult.Items.Select(UserFactory.BuildEntity);
+        }
+
+        private Sql<ISqlContext> ApplyFilter(Sql<ISqlContext> sql, Sql<ISqlContext> filterSql)
+        {
+            if (filterSql == null) return sql;
+
+            sql.Append(SqlContext.Sql(" WHERE " + filterSql.SQL.TrimStart("AND "), filterSql.Arguments));
+
+            return sql;
+        }
+
+        private static Sql<ISqlContext> ApplySort(Sql<ISqlContext> sql, Direction orderDirection, string orderBy)
+        {
+            if (string.IsNullOrEmpty(orderBy)) return sql;
+
+            if (orderDirection == Direction.Ascending)
+                sql.OrderBy(orderBy);
+            else
+                sql.OrderByDescending(orderBy);
+
+            return sql;
+        }
+
+        internal IEnumerable<IUser> GetNextUsers(int id, int count)
+        {
+            var idsQuery = SqlContext.Sql()
+                .Select<UserDto>(x => x.Id)
+                .From<UserDto>()
+                .Where<UserDto>(x => x.Id >= id)
+                .OrderBy<UserDto>(x => x.Id);
+
+            // first page is index 1, not zero
+            var ids = Database.Page<int>(1, count, idsQuery).Items.ToArray();
+
+            // now get the actual users and ensure they are ordered properly (same clause)
+            return ids.Length == 0 ? Enumerable.Empty<IUser>() : GetMany(ids).OrderBy(x => x.Id);
+        }
+
+        #endregion
+
+        private IEnumerable<IUser> ConvertFromDtos(IEnumerable<UserDto> dtos)
+        {
+            return dtos.Select(UserFactory.BuildEntity);
+        }
+    }
+}
diff --git a/src/Umbraco.Core/Persistence/Repositories/VersionableRepositoryBaseAliasRegex.cs b/src/Umbraco.Core/Persistence/Repositories/Implement/VersionableRepositoryBaseAliasRegex.cs
similarity index 94%
rename from src/Umbraco.Core/Persistence/Repositories/VersionableRepositoryBaseAliasRegex.cs
rename to src/Umbraco.Core/Persistence/Repositories/Implement/VersionableRepositoryBaseAliasRegex.cs
index 9eef623514..fba162c5ad 100644
--- a/src/Umbraco.Core/Persistence/Repositories/VersionableRepositoryBaseAliasRegex.cs
+++ b/src/Umbraco.Core/Persistence/Repositories/Implement/VersionableRepositoryBaseAliasRegex.cs
@@ -3,7 +3,7 @@ using System.Collections.Generic;
 using System.Text.RegularExpressions;
 using Umbraco.Core.Persistence.SqlSyntax;
 
-namespace Umbraco.Core.Persistence.Repositories
+namespace Umbraco.Core.Persistence.Repositories.Implement
 {
     internal static class VersionableRepositoryBaseAliasRegex
     {
diff --git a/src/Umbraco.Core/Persistence/Repositories/XsltFileRepository.cs b/src/Umbraco.Core/Persistence/Repositories/Implement/XsltFileRepository.cs
similarity index 93%
rename from src/Umbraco.Core/Persistence/Repositories/XsltFileRepository.cs
rename to src/Umbraco.Core/Persistence/Repositories/Implement/XsltFileRepository.cs
index 3993d87a6d..cd03e9272d 100644
--- a/src/Umbraco.Core/Persistence/Repositories/XsltFileRepository.cs
+++ b/src/Umbraco.Core/Persistence/Repositories/Implement/XsltFileRepository.cs
@@ -5,7 +5,7 @@ using Umbraco.Core.IO;
 using Umbraco.Core.Models;
 using Umbraco.Core.Persistence.UnitOfWork;
 
-namespace Umbraco.Core.Persistence.Repositories
+namespace Umbraco.Core.Persistence.Repositories.Implement
 {
     /// <summary>
     /// Represents the XsltFile Repository
@@ -44,19 +44,19 @@ namespace Umbraco.Core.Persistence.Repositories
             return xsltFile;
         }
 
-        public override void AddOrUpdate(XsltFile entity)
+        public override void Save(XsltFile entity)
         {
-            base.AddOrUpdate(entity);
+            base.Save(entity);
 
             // ensure that from now on, content is lazy-loaded
             if (entity.GetFileContent == null)
                 entity.GetFileContent = file => GetFileContent(file.OriginalPath);
         }
 
-        public override IEnumerable<XsltFile> GetAll(params string[] ids)
+        public override IEnumerable<XsltFile> GetMany(params string[] ids)
         {
             ids = ids
-                .Select(x => x.EnsureEndsWith(".xslt"))
+                .Select(x => StringExtensions.EnsureEndsWith(x, ".xslt"))
                 .Distinct()
                 .ToArray();
 
diff --git a/src/Umbraco.Core/Persistence/Repositories/Interfaces/IContentBlueprintRepository.cs b/src/Umbraco.Core/Persistence/Repositories/Interfaces/IContentBlueprintRepository.cs
deleted file mode 100644
index 4fdef0d50e..0000000000
--- a/src/Umbraco.Core/Persistence/Repositories/Interfaces/IContentBlueprintRepository.cs
+++ /dev/null
@@ -1,5 +0,0 @@
-namespace Umbraco.Core.Persistence.Repositories.Interfaces
-{
-    interface IContentBlueprintRepository : IContentRepository
-    { }
-}
diff --git a/src/Umbraco.Core/Persistence/Repositories/Interfaces/IEntityContainerRepository.cs b/src/Umbraco.Core/Persistence/Repositories/Interfaces/IEntityContainerRepository.cs
deleted file mode 100644
index 14322ee55c..0000000000
--- a/src/Umbraco.Core/Persistence/Repositories/Interfaces/IEntityContainerRepository.cs
+++ /dev/null
@@ -1,7 +0,0 @@
-using Umbraco.Core.Models;
-
-namespace Umbraco.Core.Persistence.Repositories
-{
-    interface IEntityContainerRepository : IRepository<int, EntityContainer>
-    { }
-}
diff --git a/src/Umbraco.Core/Persistence/Repositories/Interfaces/IQueryRepository.cs b/src/Umbraco.Core/Persistence/Repositories/Interfaces/IQueryRepository.cs
deleted file mode 100644
index 149253ceda..0000000000
--- a/src/Umbraco.Core/Persistence/Repositories/Interfaces/IQueryRepository.cs
+++ /dev/null
@@ -1,24 +0,0 @@
-using System.Collections.Generic;
-using Umbraco.Core.Persistence.Querying;
-
-namespace Umbraco.Core.Persistence.Repositories
-{
-    //TODO: This should be decoupled! Shouldn't inherit from the IRepository
-
-    public interface IQueryRepository<in TId, TEntity> : IRepository<TId, TEntity>
-    {
-        /// <summary>
-        /// Gets all entities of the specified type and query
-        /// </summary>
-        /// <param name="query"></param>
-        /// <returns></returns>
-        IEnumerable<TEntity> GetByQuery(IQuery<TEntity> query);
-
-        /// <summary>
-        /// Returns the count for the specified query
-        /// </summary>
-        /// <param name="query"></param>
-        /// <returns></returns>
-        int Count(IQuery<TEntity> query);
-    }
-}
diff --git a/src/Umbraco.Core/Persistence/Repositories/Interfaces/IRecycleBinRepository.cs b/src/Umbraco.Core/Persistence/Repositories/Interfaces/IRecycleBinRepository.cs
deleted file mode 100644
index b697b9be0a..0000000000
--- a/src/Umbraco.Core/Persistence/Repositories/Interfaces/IRecycleBinRepository.cs
+++ /dev/null
@@ -1,16 +0,0 @@
-using System;
-using System.Collections.Generic;
-using Umbraco.Core.Models.EntityBase;
-
-namespace Umbraco.Core.Persistence.Repositories
-{
-    public interface IRecycleBinRepository<out TEntity>
-        where TEntity : IAggregateRoot
-    {
-        /// <summary>
-        /// Gets all entities in recycle bin
-        /// </summary>
-        /// <returns></returns>
-        IEnumerable<TEntity> GetEntitiesInRecycleBin();
-    }
-}
diff --git a/src/Umbraco.Core/Persistence/Repositories/Interfaces/IRepository.cs b/src/Umbraco.Core/Persistence/Repositories/Interfaces/IRepository.cs
deleted file mode 100644
index 36feb15575..0000000000
--- a/src/Umbraco.Core/Persistence/Repositories/Interfaces/IRepository.cs
+++ /dev/null
@@ -1,52 +0,0 @@
-using System.Collections.Generic;
-
-namespace Umbraco.Core.Persistence.Repositories
-{
-    /// <summary>
-    /// Defines the base implementation of a repository.
-    /// </summary>
-    public interface IRepository
-    { }
-
-    public interface IReadRepository<in TId, out TEntity> : IRepository
-    {
-        /// <summary>
-        /// Gets an Entity by Id
-        /// </summary>
-        /// <param name="id"></param>
-        /// <returns></returns>
-        TEntity Get(TId id);
-
-        /// <summary>
-        /// Gets all entities of the spefified type
-        /// </summary>
-        /// <param name="ids"></param>
-        /// <returns></returns>
-        IEnumerable<TEntity> GetAll(params TId[] ids);
-
-        /// <summary>
-        /// Boolean indicating whether an Entity with the specified Id exists
-        /// </summary>
-        /// <param name="id"></param>
-        /// <returns></returns>
-        bool Exists(TId id);
-    }
-
-    public interface IWriteRepository<in TEntity> : IRepository
-    {
-        /// <summary>
-        /// Adds or Updates an Entity
-        /// </summary>
-        /// <param name="entity"></param>
-        void AddOrUpdate(TEntity entity);
-
-        /// <summary>
-        /// Deletes an Entity
-        /// </summary>
-        /// <param name="entity"></param>
-        void Delete(TEntity entity);
-    }
-
-    public interface IRepository<in TId, TEntity> : IReadRepository<TId, TEntity>, IWriteRepository<TEntity>
-    { }
-}
diff --git a/src/Umbraco.Core/Persistence/Repositories/Interfaces/IRepositoryVersionable.cs b/src/Umbraco.Core/Persistence/Repositories/Interfaces/IRepositoryVersionable.cs
deleted file mode 100644
index f8ba8ce4fe..0000000000
--- a/src/Umbraco.Core/Persistence/Repositories/Interfaces/IRepositoryVersionable.cs
+++ /dev/null
@@ -1,69 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Xml.Linq;
-using Umbraco.Core.Models;
-using Umbraco.Core.Models.EntityBase;
-using Umbraco.Core.Persistence.DatabaseModelDefinitions;
-using Umbraco.Core.Persistence.Querying;
-
-namespace Umbraco.Core.Persistence.Repositories
-{
-    /// <summary>
-    /// Defines the implementation of a Repository, which allows getting versions of an <see cref="TEntity"/>
-    /// </summary>
-    /// <typeparam name="TEntity">Type of <see cref="IAggregateRoot"/> entity for which the repository is used</typeparam>
-    /// <typeparam name="TId">Type of the Id used for this entity</typeparam>
-    public interface IRepositoryVersionable<TId, TEntity> : IQueryRepository<TId, TEntity>
-        where TEntity : IAggregateRoot
-    {
-        /// <summary>
-        /// Get the total count of entities
-        /// </summary>
-        /// <param name="contentTypeAlias"></param>
-        /// <returns></returns>
-        int Count(string contentTypeAlias = null);
-
-        int CountChildren(int parentId, string contentTypeAlias = null);
-
-        int CountDescendants(int parentId, string contentTypeAlias = null);
-
-        /// <summary>
-        /// Gets a list of all versions for an <see cref="TEntity"/> ordered so latest is first
-        /// </summary>
-        /// <param name="nodeId">Id of the <see cref="TEntity"/> to retrieve versions from</param>
-        /// <returns>An enumerable list of the same <see cref="TEntity"/> object with different versions</returns>
-        IEnumerable<TEntity> GetAllVersions(int nodeId);
-
-        /// <summary>
-        /// Gets a list of all version idenfitifers of an entity.
-        /// </summary>
-        /// <param name="id"></param>
-        /// <param name="topRows">The maximum number of rows to return</param>
-        IEnumerable<int> GetVersionIds(int id, int topRows);
-
-        /// <summary>
-        /// Gets a specific version of an entity.
-        /// </summary>
-        /// <param name="versionId">The identifier of the version.</param>
-        TEntity GetVersion(int versionId);
-
-        /// <summary>
-        /// Deletes a specific version of an entity.
-        /// </summary>
-        /// <param name="versionId">The identifier of the version to delete.</param>
-        void DeleteVersion(int versionId);
-
-        /// <summary>
-        /// Deletes all versions of an entity, older than a date.
-        /// </summary>
-        /// <param name="nodeId">The identifier of the entity.</param>
-        /// <param name="versionDate">The date.</param>
-        void DeleteVersions(int nodeId, DateTime versionDate);
-
-        /// <summary>
-        /// Gets paged content results.
-        /// </summary>
-        IEnumerable<TEntity> GetPagedResultsByQuery(IQuery<TEntity> query, long pageIndex, int pageSize, out long totalRecords,
-            string orderBy, Direction orderDirection, bool orderBySystemField, IQuery<TEntity> filter = null);
-    }
-}
diff --git a/src/Umbraco.Core/Persistence/Repositories/RecycleBinRepository.cs b/src/Umbraco.Core/Persistence/Repositories/RecycleBinRepository.cs
deleted file mode 100644
index bfdf564c26..0000000000
--- a/src/Umbraco.Core/Persistence/Repositories/RecycleBinRepository.cs
+++ /dev/null
@@ -1,24 +0,0 @@
-using System.Collections.Generic;
-using Umbraco.Core.Cache;
-using Umbraco.Core.Logging;
-using Umbraco.Core.Models.EntityBase;
-using Umbraco.Core.Persistence.UnitOfWork;
-
-namespace Umbraco.Core.Persistence.Repositories
-{
-    internal abstract class RecycleBinRepository<TId, TEntity, TRepository> : VersionableRepositoryBase<TId, TEntity, TRepository>, IRecycleBinRepository<TEntity>
-        where TEntity : class, IUmbracoEntity
-        where TRepository :  class, IRepository
-    {
-        protected RecycleBinRepository(IScopeUnitOfWork work, CacheHelper cache, ILogger logger)
-            : base(work, cache, logger)
-        { }
-
-        protected abstract int RecycleBinId { get; }
-
-        public virtual IEnumerable<TEntity> GetEntitiesInRecycleBin()
-        {
-            return GetByQuery(Query<TEntity>().Where(entity => entity.Trashed));
-        }
-    }
-}
diff --git a/src/Umbraco.Core/Persistence/Repositories/RepositoryBase.cs b/src/Umbraco.Core/Persistence/Repositories/RepositoryBase.cs
deleted file mode 100644
index 99bc7b8c69..0000000000
--- a/src/Umbraco.Core/Persistence/Repositories/RepositoryBase.cs
+++ /dev/null
@@ -1,39 +0,0 @@
-using System;
-using System.Collections.Generic;
-using Umbraco.Core.Cache;
-using Umbraco.Core.Logging;
-using Umbraco.Core.Persistence.UnitOfWork;
-
-namespace Umbraco.Core.Persistence.Repositories
-{
-    /// <summary>
-    /// Provides a base class to all repositories.
-    /// </summary>
-    internal abstract class RepositoryBase
-    {
-        private static readonly Dictionary<Type, string> CacheTypeKeys = new Dictionary<Type, string>();
-
-        protected RepositoryBase(IScopeUnitOfWork work, CacheHelper cache, ILogger logger)
-        {
-            Logger = logger ?? throw new ArgumentNullException(nameof(logger));
-            UnitOfWork = work ?? throw new ArgumentNullException(nameof(work));
-            GlobalCache = cache ?? throw new ArgumentNullException(nameof(cache));
-        }
-
-        protected IScopeUnitOfWork UnitOfWork { get; }
-
-        protected CacheHelper GlobalCache { get; }
-
-        protected abstract IRuntimeCacheProvider IsolatedCache { get; }
-
-        protected ILogger Logger { get; }
-
-        public static string GetCacheIdKey<T>(object id) => GetCacheTypeKey<T>() + id;
-
-        public static string GetCacheTypeKey<T>()
-        {
-            var type = typeof(T);
-            return CacheTypeKeys.TryGetValue(type, out string key) ? key : (CacheTypeKeys[type] = "uRepo_" + type.Name + "_");
-        }
-    }
-}
diff --git a/src/Umbraco.Core/Persistence/RepositoryFactory.cs b/src/Umbraco.Core/Persistence/RepositoryFactory.cs
index 283cbfafd4..e3bb717d39 100644
--- a/src/Umbraco.Core/Persistence/RepositoryFactory.cs
+++ b/src/Umbraco.Core/Persistence/RepositoryFactory.cs
@@ -26,14 +26,11 @@ namespace Umbraco.Core.Persistence
         /// </summary>
         /// <typeparam name="TRepository">The type of the repository.</typeparam>
         /// <param name="uow">A unit of work.</param>
-        /// <param name="name">The optional name of the repository.</param>
         /// <returns>The created repository for the unit of work.</returns>
-        public virtual TRepository CreateRepository<TRepository>(IScopeUnitOfWork uow, string name = null)
+        public virtual TRepository CreateRepository<TRepository>(IScopeUnitOfWork uow)
             where TRepository : IRepository
         {
-            return string.IsNullOrWhiteSpace(name)
-                ? _container.GetInstance<IScopeUnitOfWork, TRepository>(uow)
-                : _container.GetInstance<IScopeUnitOfWork, TRepository>(uow, name);
+            return _container.GetInstance<IScopeUnitOfWork, TRepository>(uow);
         }
     }
 }
diff --git a/src/Umbraco.Core/Persistence/UnitOfWork/IUnitOfWork.cs b/src/Umbraco.Core/Persistence/UnitOfWork/IUnitOfWork.cs
index fdc369374c..e72933ce90 100644
--- a/src/Umbraco.Core/Persistence/UnitOfWork/IUnitOfWork.cs
+++ b/src/Umbraco.Core/Persistence/UnitOfWork/IUnitOfWork.cs
@@ -9,27 +9,6 @@ namespace Umbraco.Core.Persistence.UnitOfWork
     /// </summary>
     public interface IUnitOfWork : IDisposable
     {
-        /// <summary>
-        /// Registers an entity to be created as part of this unit of work.
-        /// </summary>
-        /// <param name="entity">The entity.</param>
-        /// <param name="repository">The repository in charge of the entity.</param>
-        void RegisterCreated(IEntity entity, IUnitOfWorkRepository repository);
-
-        /// <summary>
-        /// Registers an entity to be updated as part of this unit of work.
-        /// </summary>
-        /// <param name="entity">The entity.</param>
-        /// <param name="repository">The repository in charge of the entity.</param>
-        void RegisterUpdated(IEntity entity, IUnitOfWorkRepository repository);
-
-        /// <summary>
-        /// Registers an entity to be deleted as part of this unit of work.
-        /// </summary>
-        /// <param name="entity">The entity.</param>
-        /// <param name="repository">The repository in charge of the entity.</param>
-        void RegisterDeleted(IEntity entity, IUnitOfWorkRepository repository);
-
         // fixme - we should get rid of all references to database here, or merge IUnitOfWork with IDatabaseUnitOfWork
         // fixme - do we have a scope.Begin()? or is it even automatic? and then do we need Begin() at all?
 
@@ -76,9 +55,8 @@ namespace Umbraco.Core.Persistence.UnitOfWork
         /// Creates a repository.
         /// </summary>
         /// <typeparam name="TRepository">The type of the repository.</typeparam>
-        /// <param name="name">The optional name of the repository.</param>
         /// <returns>The created repository for the unit of work.</returns>
-        TRepository CreateRepository<TRepository>(string name = null)
+        TRepository CreateRepository<TRepository>()
             where TRepository : IRepository;
     }
 }
diff --git a/src/Umbraco.Core/Persistence/UnitOfWork/ScopeUnitOfWork.cs b/src/Umbraco.Core/Persistence/UnitOfWork/ScopeUnitOfWork.cs
index 3dc7470e25..7ec1ff49d5 100644
--- a/src/Umbraco.Core/Persistence/UnitOfWork/ScopeUnitOfWork.cs
+++ b/src/Umbraco.Core/Persistence/UnitOfWork/ScopeUnitOfWork.cs
@@ -57,9 +57,9 @@ namespace Umbraco.Core.Persistence.UnitOfWork
 
         #endregion
 
-        public override TRepository CreateRepository<TRepository>(string name = null)
+        public override TRepository CreateRepository<TRepository>()
         {
-            return RepositoryFactory.CreateRepository<TRepository>(this, name);
+            return RepositoryFactory.CreateRepository<TRepository>(this);
         }
 
         public override void Begin()
diff --git a/src/Umbraco.Core/Persistence/UnitOfWork/UnitOfWorkBase.cs b/src/Umbraco.Core/Persistence/UnitOfWork/UnitOfWorkBase.cs
index 3af5fe9a70..de65f00cc6 100644
--- a/src/Umbraco.Core/Persistence/UnitOfWork/UnitOfWorkBase.cs
+++ b/src/Umbraco.Core/Persistence/UnitOfWork/UnitOfWorkBase.cs
@@ -32,78 +32,9 @@ namespace Umbraco.Core.Persistence.UnitOfWork
 
         protected RepositoryFactory RepositoryFactory { get; }
 
-        public abstract TRepository CreateRepository<TRepository>(string name = null)
+        public abstract TRepository CreateRepository<TRepository>()
             where TRepository : IRepository;
 
-        /// <summary>
-        /// Registers an entity to be added as part of this unit of work.
-        /// </summary>
-        /// <param name="entity">The entity.</param>
-        /// <param name="repository">The repository in charge of the entity.</param>
-        public void RegisterCreated(IEntity entity, IUnitOfWorkRepository repository)
-        {
-            if (ReadOnly)
-                throw new NotSupportedException("This unit of work is read-only.");
-
-            Completed = false;
-
-            if (Immediate)
-                repository.PersistNewItem(entity);
-            else
-                Operations.Enqueue(new Operation
-                {
-                    Entity = entity,
-                    Repository = repository,
-                    Type = OperationType.Insert
-                });
-        }
-
-        /// <summary>
-        /// Registers an entity to be updated as part of this unit of work.
-        /// </summary>
-        /// <param name="entity">The entity.</param>
-        /// <param name="repository">The repository in charge of the entity.</param>
-        public void RegisterUpdated(IEntity entity, IUnitOfWorkRepository repository)
-        {
-            if (ReadOnly)
-                throw new NotSupportedException("This unit of work is read-only.");
-
-            Completed = false;
-
-            if (Immediate)
-                repository.PersistUpdatedItem(entity);
-            else
-                Operations.Enqueue(new Operation
-                {
-                    Entity = entity,
-                    Repository = repository,
-                    Type = OperationType.Update
-                });
-        }
-
-        /// <summary>
-        /// Registers an entity to be deleted as part of this unit of work.
-        /// </summary>
-        /// <param name="entity">The entity.</param>
-        /// <param name="repository">The repository in charge of the entity.</param>
-        public void RegisterDeleted(IEntity entity, IUnitOfWorkRepository repository)
-        {
-            if (ReadOnly)
-                throw new NotSupportedException("This unit of work is read-only.");
-
-            Completed = false;
-
-            if (Immediate)
-                repository.PersistDeletedItem(entity);
-            else
-                Operations.Enqueue(new Operation
-                {
-                    Entity = entity,
-                    Repository = repository,
-                    Type = OperationType.Delete
-                });
-        }
-
         // fixme - we don't need Begin, really, or do we?
         public virtual void Begin()
         { }
diff --git a/src/Umbraco.Core/Services/AuditService.cs b/src/Umbraco.Core/Services/AuditService.cs
index 2ac8e4b37e..31478b6e00 100644
--- a/src/Umbraco.Core/Services/AuditService.cs
+++ b/src/Umbraco.Core/Services/AuditService.cs
@@ -19,7 +19,7 @@ namespace Umbraco.Core.Services
             using (var uow = UowProvider.CreateUnitOfWork())
             {
                 var repo = uow.CreateRepository<IAuditRepository>();
-                repo.AddOrUpdate(new AuditItem(objectId, comment, type, userId));
+                repo.Save(new AuditItem(objectId, comment, type, userId));
                 uow.Complete();
             }
         }
@@ -29,7 +29,7 @@ namespace Umbraco.Core.Services
             using (var uow = UowProvider.CreateUnitOfWork())
             {
                 var repo = uow.CreateRepository<IAuditRepository>();
-                var result = repo.GetByQuery(Query<AuditItem>().Where(x => x.Id == objectId));
+                var result = repo.Get(Query<AuditItem>().Where(x => x.Id == objectId));
                 uow.Complete();
                 return result;
             }
@@ -41,8 +41,8 @@ namespace Umbraco.Core.Services
             {
                 var repo = uow.CreateRepository<IAuditRepository>();
                 var result = sinceDate.HasValue == false
-                    ? repo.GetByQuery(Query<AuditItem>().Where(x => x.UserId == userId && x.AuditType == type))
-                    : repo.GetByQuery(Query<AuditItem>().Where(x => x.UserId == userId && x.AuditType == type && x.CreateDate >= sinceDate.Value));
+                    ? repo.Get(Query<AuditItem>().Where(x => x.UserId == userId && x.AuditType == type))
+                    : repo.Get(Query<AuditItem>().Where(x => x.UserId == userId && x.AuditType == type && x.CreateDate >= sinceDate.Value));
                 uow.Complete();
                 return result;
             }
@@ -54,8 +54,8 @@ namespace Umbraco.Core.Services
             {
                 var repo = uow.CreateRepository<IAuditRepository>();
                 var result = sinceDate.HasValue == false
-                    ? repo.GetByQuery(Query<AuditItem>().Where(x => x.AuditType == type))
-                    : repo.GetByQuery(Query<AuditItem>().Where(x => x.AuditType == type && x.CreateDate >= sinceDate.Value));
+                    ? repo.Get(Query<AuditItem>().Where(x => x.AuditType == type))
+                    : repo.Get(Query<AuditItem>().Where(x => x.AuditType == type && x.CreateDate >= sinceDate.Value));
                 uow.Complete();
                 return result;
             }
diff --git a/src/Umbraco.Core/Services/ContentService.cs b/src/Umbraco.Core/Services/ContentService.cs
index 8e7ef4b137..33c7600b02 100644
--- a/src/Umbraco.Core/Services/ContentService.cs
+++ b/src/Umbraco.Core/Services/ContentService.cs
@@ -11,7 +11,6 @@ using Umbraco.Core.Models.Membership;
 using Umbraco.Core.Persistence.DatabaseModelDefinitions;
 using Umbraco.Core.Persistence.Querying;
 using Umbraco.Core.Persistence.Repositories;
-using Umbraco.Core.Persistence.Repositories.Interfaces;
 using Umbraco.Core.Persistence.UnitOfWork;
 using Umbraco.Core.Services.Changes;
 
@@ -50,7 +49,7 @@ namespace Umbraco.Core.Services
             using (var uow = UowProvider.CreateUnitOfWork(readOnly: true))
             {
                 uow.ReadLock(Constants.Locks.ContentTree);
-                var repo = uow.CreateRepository<IContentRepository>();
+                var repo = uow.CreateRepository<IDocumentRepository>();
                 return repo.CountPublished();
             }
         }
@@ -60,7 +59,7 @@ namespace Umbraco.Core.Services
             using (var uow = UowProvider.CreateUnitOfWork(readOnly: true))
             {
                 uow.ReadLock(Constants.Locks.ContentTree);
-                var repo = uow.CreateRepository<IContentRepository>();
+                var repo = uow.CreateRepository<IDocumentRepository>();
                 return repo.Count(contentTypeAlias);
             }
         }
@@ -70,7 +69,7 @@ namespace Umbraco.Core.Services
             using (var uow = UowProvider.CreateUnitOfWork(readOnly: true))
             {
                 uow.ReadLock(Constants.Locks.ContentTree);
-                var repo = uow.CreateRepository<IContentRepository>();
+                var repo = uow.CreateRepository<IDocumentRepository>();
                 return repo.CountChildren(parentId, contentTypeAlias);
             }
         }
@@ -80,7 +79,7 @@ namespace Umbraco.Core.Services
             using (var uow = UowProvider.CreateUnitOfWork(readOnly: true))
             {
                 uow.ReadLock(Constants.Locks.ContentTree);
-                var repo = uow.CreateRepository<IContentRepository>();
+                var repo = uow.CreateRepository<IDocumentRepository>();
                 return repo.CountDescendants(parentId, contentTypeAlias);
             }
         }
@@ -99,7 +98,7 @@ namespace Umbraco.Core.Services
             using (var uow = UowProvider.CreateUnitOfWork())
             {
                 uow.WriteLock(Constants.Locks.ContentTree);
-                var repo = uow.CreateRepository<IContentRepository>();
+                var repo = uow.CreateRepository<IDocumentRepository>();
                 repo.ReplaceContentPermissions(permissionSet);
                 uow.Complete();
             }
@@ -116,7 +115,7 @@ namespace Umbraco.Core.Services
             using (var uow = UowProvider.CreateUnitOfWork())
             {
                 uow.WriteLock(Constants.Locks.ContentTree);
-                var repo = uow.CreateRepository<IContentRepository>();
+                var repo = uow.CreateRepository<IDocumentRepository>();
                 repo.AssignEntityPermission(entity, permission, groupIds);
                 uow.Complete();
             }
@@ -132,7 +131,7 @@ namespace Umbraco.Core.Services
             using (var uow = UowProvider.CreateUnitOfWork(readOnly: true))
             {
                 uow.ReadLock(Constants.Locks.ContentTree);
-                var repo = uow.CreateRepository<IContentRepository>();
+                var repo = uow.CreateRepository<IDocumentRepository>();
                 return repo.GetPermissionsForEntity(content.Id);
             }
         }
@@ -341,8 +340,8 @@ namespace Umbraco.Core.Services
                     return;
                 }
 
-                var repo = uow.CreateRepository<IContentRepository>();
-                repo.AddOrUpdate(content);
+                var repo = uow.CreateRepository<IDocumentRepository>();
+                repo.Save(content);
 
                 uow.Flush(); // need everything so we can serialize
 
@@ -373,7 +372,7 @@ namespace Umbraco.Core.Services
             using (var uow = UowProvider.CreateUnitOfWork(readOnly: true))
             {
                 uow.ReadLock(Constants.Locks.ContentTree);
-                var repository = uow.CreateRepository<IContentRepository>();
+                var repository = uow.CreateRepository<IDocumentRepository>();
                 return repository.Get(id);
             }
         }
@@ -391,8 +390,8 @@ namespace Umbraco.Core.Services
             using (var uow = UowProvider.CreateUnitOfWork(readOnly: true))
             {
                 uow.ReadLock(Constants.Locks.ContentTree);
-                var repository = uow.CreateRepository<IContentRepository>();
-                var items = repository.GetAll(idsA);
+                var repository = uow.CreateRepository<IDocumentRepository>();
+                var items = repository.GetMany(idsA);
 
                 var index = items.ToDictionary(x => x.Id, x => x);
 
@@ -410,7 +409,7 @@ namespace Umbraco.Core.Services
             using (var uow = UowProvider.CreateUnitOfWork(readOnly: true))
             {
                 uow.ReadLock(Constants.Locks.ContentTree);
-                var repository = uow.CreateRepository<IContentRepository>();
+                var repository = uow.CreateRepository<IDocumentRepository>();
                 return repository.Get(key);
             }
         }
@@ -428,8 +427,8 @@ namespace Umbraco.Core.Services
             using (var uow = UowProvider.CreateUnitOfWork(readOnly: true))
             {
                 uow.ReadLock(Constants.Locks.ContentTree);
-                var repository = uow.CreateRepository<IContentRepository>();
-                var items = repository.GetAll(idsA);
+                var repository = uow.CreateRepository<IDocumentRepository>();
+                var items = repository.GetMany(idsA);
 
                 var index = items.ToDictionary(x => x.Key, x => x);
 
@@ -447,9 +446,9 @@ namespace Umbraco.Core.Services
             using (var uow = UowProvider.CreateUnitOfWork(readOnly: true))
             {
                 uow.ReadLock(Constants.Locks.ContentTree);
-                var repository = uow.CreateRepository<IContentRepository>();
+                var repository = uow.CreateRepository<IDocumentRepository>();
                 var query = Query<IContent>().Where(x => x.ContentTypeId == id);
-                return repository.GetByQuery(query);
+                return repository.Get(query);
             }
         }
 
@@ -458,9 +457,9 @@ namespace Umbraco.Core.Services
             using (var uow = UowProvider.CreateUnitOfWork(readOnly: true))
             {
                 uow.ReadLock(Constants.Locks.ContentTree);
-                var repository = uow.CreateRepository<IContentRepository>();
+                var repository = uow.CreateRepository<IDocumentRepository>();
                 var query = Query<IContent>().Where(x => x.ContentTypeId == id);
-                return repository.GetByQuery(query);
+                return repository.Get(query);
             }
         }
 
@@ -475,9 +474,9 @@ namespace Umbraco.Core.Services
             using (var uow = UowProvider.CreateUnitOfWork(readOnly: true))
             {
                 uow.ReadLock(Constants.Locks.ContentTree);
-                var repository = uow.CreateRepository<IContentRepository>();
+                var repository = uow.CreateRepository<IDocumentRepository>();
                 var query = Query<IContent>().Where(x => x.Level == level && x.Trashed == false);
-                return repository.GetByQuery(query);
+                return repository.Get(query);
             }
         }
 
@@ -491,7 +490,7 @@ namespace Umbraco.Core.Services
             using (var uow = UowProvider.CreateUnitOfWork(readOnly: true))
             {
                 uow.ReadLock(Constants.Locks.ContentTree);
-                var repository = uow.CreateRepository<IContentRepository>();
+                var repository = uow.CreateRepository<IDocumentRepository>();
                 return repository.GetVersion(versionId);
             }
         }
@@ -506,7 +505,7 @@ namespace Umbraco.Core.Services
             using (var uow = UowProvider.CreateUnitOfWork(readOnly: true))
             {
                 uow.ReadLock(Constants.Locks.ContentTree);
-                var repository = uow.CreateRepository<IContentRepository>();
+                var repository = uow.CreateRepository<IDocumentRepository>();
                 return repository.GetAllVersions(id);
             }
         }
@@ -521,7 +520,7 @@ namespace Umbraco.Core.Services
         {
             using (var uow = UowProvider.CreateUnitOfWork(readOnly: true))
             {
-                var repository = uow.CreateRepository<IContentRepository>();
+                var repository = uow.CreateRepository<IDocumentRepository>();
                 return repository.GetVersionIds(id, maxRows);
             }
         }
@@ -557,8 +556,8 @@ namespace Umbraco.Core.Services
             using (var uow = UowProvider.CreateUnitOfWork(readOnly: true))
             {
                 uow.ReadLock(Constants.Locks.ContentTree);
-                var repository = uow.CreateRepository<IContentRepository>();
-                return repository.GetAll(ids);
+                var repository = uow.CreateRepository<IDocumentRepository>();
+                return repository.GetMany(ids);
             }
         }
 
@@ -572,9 +571,9 @@ namespace Umbraco.Core.Services
             using (var uow = UowProvider.CreateUnitOfWork(readOnly: true))
             {
                 uow.ReadLock(Constants.Locks.ContentTree);
-                var repository = uow.CreateRepository<IContentRepository>();
+                var repository = uow.CreateRepository<IDocumentRepository>();
                 var query = Query<IContent>().Where(x => x.ParentId == id);
-                return repository.GetByQuery(query).OrderBy(x => x.SortOrder);
+                return repository.Get(query).OrderBy(x => x.SortOrder);
             }
         }
 
@@ -588,9 +587,9 @@ namespace Umbraco.Core.Services
             using (var uow = UowProvider.CreateUnitOfWork(readOnly: true))
             {
                 uow.ReadLock(Constants.Locks.ContentTree);
-                var repository = uow.CreateRepository<IContentRepository>();
+                var repository = uow.CreateRepository<IDocumentRepository>();
                 var query = Query<IContent>().Where(x => x.ParentId == id && x.Published);
-                return repository.GetByQuery(query).OrderBy(x => x.SortOrder);
+                return repository.Get(query).OrderBy(x => x.SortOrder);
             }
         }
 
@@ -611,7 +610,7 @@ namespace Umbraco.Core.Services
             using (var uow = UowProvider.CreateUnitOfWork(readOnly: true))
             {
                 uow.ReadLock(Constants.Locks.ContentTree);
-                var repository = uow.CreateRepository<IContentRepository>();
+                var repository = uow.CreateRepository<IDocumentRepository>();
                 var filterQuery = filter.IsNullOrWhiteSpace()
                     ? null
                     : Query<IContent>().Where(x => x.Name.Contains(filter));
@@ -641,13 +640,13 @@ namespace Umbraco.Core.Services
             using (var uow = UowProvider.CreateUnitOfWork(readOnly: true))
             {
                 uow.ReadLock(Constants.Locks.ContentTree);
-                var repository = uow.CreateRepository<IContentRepository>();
+                var repository = uow.CreateRepository<IDocumentRepository>();
 
                 var query = Query<IContent>();
                 //if the id is System Root, then just get all - NO! does not make sense!
                 //if (id != Constants.System.Root)
                 query.Where(x => x.ParentId == id);
-                return repository.GetPagedResultsByQuery(query, pageIndex, pageSize, out totalChildren, orderBy, orderDirection, orderBySystemField, filter);
+                return repository.GetPage(query, pageIndex, pageSize, out totalChildren, orderBy, orderDirection, orderBySystemField, filter);
             }
         }
 
@@ -695,7 +694,7 @@ namespace Umbraco.Core.Services
             using (var uow = UowProvider.CreateUnitOfWork(readOnly: true))
             {
                 uow.ReadLock(Constants.Locks.ContentTree);
-                var repository = uow.CreateRepository<IContentRepository>();
+                var repository = uow.CreateRepository<IDocumentRepository>();
 
                 var query = Query<IContent>();
                 //if the id is System Root, then just get all
@@ -710,7 +709,7 @@ namespace Umbraco.Core.Services
                     }
                     query.Where(x => x.Path.SqlStartsWith($"{contentPath[0]},", TextColumnType.NVarchar));
                 }
-                return repository.GetPagedResultsByQuery(query, pageIndex, pageSize, out totalChildren, orderBy, orderDirection, orderBySystemField, filter);
+                return repository.GetPage(query, pageIndex, pageSize, out totalChildren, orderBy, orderDirection, orderBySystemField, filter);
             }
         }
 
@@ -725,9 +724,9 @@ namespace Umbraco.Core.Services
             using (var uow = UowProvider.CreateUnitOfWork(readOnly: true))
             {
                 uow.ReadLock(Constants.Locks.ContentTree);
-                var repository = uow.CreateRepository<IContentRepository>();
+                var repository = uow.CreateRepository<IDocumentRepository>();
                 var query = Query<IContent>().Where(x => x.ParentId == parentId && x.Name.Contains(name));
-                return repository.GetByQuery(query);
+                return repository.Get(query);
             }
         }
 
@@ -741,7 +740,7 @@ namespace Umbraco.Core.Services
             using (var uow = UowProvider.CreateUnitOfWork(readOnly: true))
             {
                 uow.ReadLock(Constants.Locks.ContentTree);
-                var repository = uow.CreateRepository<IContentRepository>();
+                var repository = uow.CreateRepository<IDocumentRepository>();
                 var content = GetById(id);
                 if (content == null)
                 {
@@ -750,7 +749,7 @@ namespace Umbraco.Core.Services
                 }
                 var pathMatch = content.Path + ",";
                 var query = Query<IContent>().Where(x => x.Id != content.Id && x.Path.StartsWith(pathMatch));
-                return repository.GetByQuery(query);
+                return repository.Get(query);
             }
         }
 
@@ -764,10 +763,10 @@ namespace Umbraco.Core.Services
             using (var uow = UowProvider.CreateUnitOfWork(readOnly: true))
             {
                 uow.ReadLock(Constants.Locks.ContentTree);
-                var repository = uow.CreateRepository<IContentRepository>();
+                var repository = uow.CreateRepository<IDocumentRepository>();
                 var pathMatch = content.Path + ",";
                 var query = Query<IContent>().Where(x => x.Id != content.Id && x.Path.StartsWith(pathMatch));
-                return repository.GetByQuery(query);
+                return repository.Get(query);
             }
         }
 
@@ -805,9 +804,9 @@ namespace Umbraco.Core.Services
             using (var uow = UowProvider.CreateUnitOfWork(readOnly: true))
             {
                 uow.ReadLock(Constants.Locks.ContentTree);
-                var repository = uow.CreateRepository<IContentRepository>();
+                var repository = uow.CreateRepository<IDocumentRepository>();
                 var query = Query<IContent>().Where(x => x.ParentId == Constants.System.Root);
-                return repository.GetByQuery(query);
+                return repository.Get(query);
             }
         }
 
@@ -820,8 +819,8 @@ namespace Umbraco.Core.Services
             using (var uow = UowProvider.CreateUnitOfWork(readOnly: true))
             {
                 uow.ReadLock(Constants.Locks.ContentTree);
-                var repository = uow.CreateRepository<IContentRepository>();
-                return repository.GetByQuery(QueryNotTrashed);
+                var repository = uow.CreateRepository<IDocumentRepository>();
+                return repository.Get(QueryNotTrashed);
             }
         }
 
@@ -840,9 +839,9 @@ namespace Umbraco.Core.Services
 
         private IEnumerable<IContent> GetContentForExpiration(IScopeUnitOfWork uow)
         {
-            var repository = uow.CreateRepository<IContentRepository>();
+            var repository = uow.CreateRepository<IDocumentRepository>();
             var query = Query<IContent>().Where(x => x.Published && x.ExpireDate <= DateTime.Now);
-            return repository.GetByQuery(query);
+            return repository.Get(query);
         }
 
         /// <summary>
@@ -860,9 +859,9 @@ namespace Umbraco.Core.Services
 
         private IEnumerable<IContent> GetContentForRelease(IScopeUnitOfWork uow)
         {
-            var repository = uow.CreateRepository<IContentRepository>();
+            var repository = uow.CreateRepository<IDocumentRepository>();
             var query = Query<IContent>().Where(x => x.Published == false && x.ReleaseDate <= DateTime.Now);
-            return repository.GetByQuery(query);
+            return repository.Get(query);
         }
 
         /// <summary>
@@ -874,10 +873,10 @@ namespace Umbraco.Core.Services
             using (var uow = UowProvider.CreateUnitOfWork(readOnly: true))
             {
                 uow.ReadLock(Constants.Locks.ContentTree);
-                var repository = uow.CreateRepository<IContentRepository>();
+                var repository = uow.CreateRepository<IDocumentRepository>();
                 var bin = $"{Constants.System.Root},{Constants.System.RecycleBinContent},";
                 var query = Query<IContent>().Where(x => x.Path.StartsWith(bin));
-                return repository.GetByQuery(query);
+                return repository.Get(query);
             }
         }
 
@@ -912,7 +911,7 @@ namespace Umbraco.Core.Services
             using (var uow = UowProvider.CreateUnitOfWork(readOnly: true))
             {
                 uow.ReadLock(Constants.Locks.ContentTree);
-                var repo = uow.CreateRepository<IContentRepository>();
+                var repo = uow.CreateRepository<IDocumentRepository>();
                 return repo.IsPathPublished(content);
             }
         }
@@ -950,12 +949,12 @@ namespace Umbraco.Core.Services
 
                 uow.WriteLock(Constants.Locks.ContentTree);
 
-                var repository = uow.CreateRepository<IContentRepository>();
+                var repository = uow.CreateRepository<IDocumentRepository>();
                 if (content.HasIdentity == false)
                     content.CreatorId = userId;
                 content.WriterId = userId;
 
-                repository.AddOrUpdate(content);
+                repository.Save(content);
 
                 if (raiseEvents)
                 {
@@ -990,14 +989,14 @@ namespace Umbraco.Core.Services
                     x.IsNewEntity() ? TreeChangeTypes.RefreshBranch : TreeChangeTypes.RefreshNode));
 
                 uow.WriteLock(Constants.Locks.ContentTree);
-                var repository = uow.CreateRepository<IContentRepository>();
+                var repository = uow.CreateRepository<IDocumentRepository>();
                 foreach (var content in contentsA)
                 {
                     if (content.HasIdentity == false)
                         content.CreatorId = userId;
                     content.WriterId = userId;
 
-                    repository.AddOrUpdate(content);
+                    repository.Save(content);
                 }
 
                 if (raiseEvents)
@@ -1042,7 +1041,7 @@ namespace Umbraco.Core.Services
                 var previouslyPublished = content.HasIdentity && content.Published;
 
                 uow.WriteLock(Constants.Locks.ContentTree);
-                var repository = uow.CreateRepository<IContentRepository>();
+                var repository = uow.CreateRepository<IDocumentRepository>();
 
                 // ensure that the document can be published, and publish
                 // handling events, business rules, etc
@@ -1055,7 +1054,7 @@ namespace Umbraco.Core.Services
                     content.CreatorId = userId;
                 content.WriterId = userId;
 
-                repository.AddOrUpdate(content);
+                repository.Save(content);
 
                 if (raiseEvents) // always
                 {
@@ -1102,7 +1101,7 @@ namespace Umbraco.Core.Services
             using (var uow = UowProvider.CreateUnitOfWork())
             {
                 uow.WriteLock(Constants.Locks.ContentTree);
-                var repository = uow.CreateRepository<IContentRepository>();
+                var repository = uow.CreateRepository<IDocumentRepository>();
 
                 var newest = GetById(content.Id); // ensure we have the newest version
                 if (content.VersionId != newest.VersionId) // but use the original object if it's already the newest version
@@ -1121,7 +1120,7 @@ namespace Umbraco.Core.Services
                 if (attempt.Success == false) return attempt; // causes rollback
 
                 content.WriterId = userId;
-                repository.AddOrUpdate(content);
+                repository.Save(content);
 
                 uow.Events.Dispatch(UnPublished, this, new PublishEventArgs<IContent>(content, false, false), "UnPublished");
                 uow.Events.Dispatch(TreeChanged, this, new TreeChange<IContent>(content, TreeChangeTypes.RefreshBranch).ToEventArgs());
@@ -1198,7 +1197,7 @@ namespace Umbraco.Core.Services
             using (var uow = UowProvider.CreateUnitOfWork())
             {
                 uow.WriteLock(Constants.Locks.ContentTree);
-                var repository = uow.CreateRepository<IContentRepository>();
+                var repository = uow.CreateRepository<IDocumentRepository>();
 
                 // fixme events?!
 
@@ -1249,7 +1248,7 @@ namespace Umbraco.Core.Services
         }
 
         private PublishResult SaveAndPublishBranchOne(IContent document,
-            IContentRepository repository, IScopeUnitOfWork uow,
+            IDocumentRepository repository, IScopeUnitOfWork uow,
             Func<IContent, bool> editing, Func<IContent, bool> publishValues,
             bool checkPath,
             List<IContent> publishedDocuments,
@@ -1276,7 +1275,7 @@ namespace Umbraco.Core.Services
 
             // save
             document.WriterId = userId;
-            repository.AddOrUpdate(document);
+            repository.Save(document);
             publishedDocuments.Add(document);
             return publishResult;
         }
@@ -1300,7 +1299,7 @@ namespace Umbraco.Core.Services
                 }
 
                 uow.WriteLock(Constants.Locks.ContentTree);
-                var repository = uow.CreateRepository<IContentRepository>();
+                var repository = uow.CreateRepository<IDocumentRepository>();
 
                 // if it's not trashed yet, and published, we should unpublish
                 // but... UnPublishing event makes no sense (not going to cancel?) and no need to save
@@ -1319,7 +1318,7 @@ namespace Umbraco.Core.Services
             return OperationResult.Succeed(evtMsgs);
         }
 
-        private void DeleteLocked(IScopeUnitOfWork uow, IContentRepository repository, IContent content)
+        private void DeleteLocked(IScopeUnitOfWork uow, IDocumentRepository repository, IContent content)
         {
             // then recursively delete descendants, bottom-up
             // just repository.Delete + an event
@@ -1375,7 +1374,7 @@ namespace Umbraco.Core.Services
                 }
 
                 uow.WriteLock(Constants.Locks.ContentTree);
-                var repository = uow.CreateRepository<IContentRepository>();
+                var repository = uow.CreateRepository<IDocumentRepository>();
                 repository.DeleteVersions(id, versionDate);
 
                 deleteRevisionsEventArgs.CanCancel = false;
@@ -1412,7 +1411,7 @@ namespace Umbraco.Core.Services
                 }
 
                 uow.WriteLock(Constants.Locks.ContentTree);
-                var repository = uow.CreateRepository<IContentRepository>();
+                var repository = uow.CreateRepository<IDocumentRepository>();
                 var c = repository.Get(id);
                 if (c.VersionId != versionId) // don't delete the current version
                     repository.DeleteVersion(versionId);
@@ -1437,7 +1436,7 @@ namespace Umbraco.Core.Services
             using (var uow = UowProvider.CreateUnitOfWork())
             {
                 uow.WriteLock(Constants.Locks.ContentTree);
-                var repository = uow.CreateRepository<IContentRepository>();
+                var repository = uow.CreateRepository<IDocumentRepository>();
 
                 var originalPath = content.Path;
                 var moveEventInfo = new MoveEventInfo<IContent>(content, originalPath, Constants.System.RecycleBinContent);
@@ -1497,7 +1496,7 @@ namespace Umbraco.Core.Services
             using (var uow = UowProvider.CreateUnitOfWork())
             {
                 uow.WriteLock(Constants.Locks.ContentTree);
-                var repository = uow.CreateRepository<IContentRepository>();
+                var repository = uow.CreateRepository<IDocumentRepository>();
 
                 var parent = parentId == Constants.System.Root ? null : GetById(parentId);
                 if (parentId != Constants.System.Root && (parent == null || parent.Trashed))
@@ -1545,7 +1544,7 @@ namespace Umbraco.Core.Services
 
         // MUST be called from within WriteLock
         // trash indicates whether we are trashing, un-trashing, or not changing anything
-        private void PerformMoveLocked(IContentRepository repository,
+        private void PerformMoveLocked(IDocumentRepository repository,
             IContent content, int parentId, IContent parent, int userId,
             ICollection<Tuple<IContent, string>> moves,
             bool? trash)
@@ -1590,11 +1589,11 @@ namespace Umbraco.Core.Services
             }
         }
 
-        private static void PerformMoveContentLocked(IContentRepository repository, IContent content, int userId, bool? trash)
+        private static void PerformMoveContentLocked(IDocumentRepository repository, IContent content, int userId, bool? trash)
         {
             if (trash.HasValue) ((ContentBase) content).Trashed = trash.Value;
             content.WriterId = userId;
-            repository.AddOrUpdate(content);
+            repository.Save(content);
         }
 
         /// <summary>
@@ -1609,7 +1608,7 @@ namespace Umbraco.Core.Services
             using (var uow = UowProvider.CreateUnitOfWork())
             {
                 uow.WriteLock(Constants.Locks.ContentTree);
-                var repository = uow.CreateRepository<IContentRepository>();
+                var repository = uow.CreateRepository<IDocumentRepository>();
 
                 // v7 EmptyingRecycleBin and EmptiedRecycleBin events are greatly simplified since
                 // each deleted items will have its own deleting/deleted events. so, files and such
@@ -1625,7 +1624,7 @@ namespace Umbraco.Core.Services
 
                 // emptying the recycle bin means deleting whetever is in there - do it properly!
                 var query = Query<IContent>().Where(x => x.ParentId == Constants.System.RecycleBinContent);
-                var contents = repository.GetByQuery(query).ToArray();
+                var contents = repository.Get(query).ToArray();
                 foreach (var content in contents)
                 {
                     DeleteLocked(uow, repository, content);
@@ -1691,7 +1690,7 @@ namespace Umbraco.Core.Services
                 var copies = new List<Tuple<IContent, IContent>>();
 
                 uow.WriteLock(Constants.Locks.ContentTree);
-                var repository = uow.CreateRepository<IContentRepository>();
+                var repository = uow.CreateRepository<IDocumentRepository>();
 
                 // a copy is not published (but not really unpublishing either)
                 // update the create author and last edit author
@@ -1705,7 +1704,7 @@ namespace Umbraco.Core.Services
                 currentPermissions.RemoveWhere(p => p.IsDefaultPermissions);
 
                 // save and flush because we need the ID for the recursive Copying events
-                repository.AddOrUpdate(copy);
+                repository.Save(copy);
 
                 //add permissions
                 if (currentPermissions.Count > 0)
@@ -1741,7 +1740,7 @@ namespace Umbraco.Core.Services
                         descendantCopy.WriterId = userId;
 
                         // save and flush (see above)
-                        repository.AddOrUpdate(descendantCopy);
+                        repository.Save(descendantCopy);
                         uow.Flush();
 
                         copies.Add(Tuple.Create(descendant, descendantCopy));
@@ -1820,7 +1819,7 @@ namespace Umbraco.Core.Services
                 var saved = new List<IContent>();
 
                 uow.WriteLock(Constants.Locks.ContentTree);
-                var repository = uow.CreateRepository<IContentRepository>();
+                var repository = uow.CreateRepository<IDocumentRepository>();
                 var sortOrder = 0;
 
                 foreach (var content in itemsA)
@@ -1844,7 +1843,7 @@ namespace Umbraco.Core.Services
 
                     // save
                     saved.Add(content);
-                    repository.AddOrUpdate(content);
+                    repository.Save(content);
                 }
 
                 if (raiseEvents)
@@ -1880,16 +1879,16 @@ namespace Umbraco.Core.Services
             using (var uow = UowProvider.CreateUnitOfWork(readOnly: true))
             {
                 uow.ReadLock(Constants.Locks.ContentTree);
-                var repository = uow.CreateRepository<IContentRepository>();
+                var repository = uow.CreateRepository<IDocumentRepository>();
                 return GetPublishedDescendantsLocked(uow, repository, content).ToArray(); // ToArray important in uow!
             }
         }
 
-        internal IEnumerable<IContent> GetPublishedDescendantsLocked(IScopeUnitOfWork uow, IContentRepository repository, IContent content)
+        internal IEnumerable<IContent> GetPublishedDescendantsLocked(IScopeUnitOfWork uow, IDocumentRepository repository, IContent content)
         {
             var pathMatch = content.Path + ",";
             var query = Query<IContent>().Where(x => x.Id != content.Id && x.Path.StartsWith(pathMatch) /*&& x.Trashed == false*/);
-            var contents = repository.GetByQuery(query);
+            var contents = repository.Get(query);
 
             // beware! contents contains all published version below content
             // including those that are not directly published because below an unpublished content
@@ -1913,7 +1912,7 @@ namespace Umbraco.Core.Services
         private void Audit(IUnitOfWork uow, AuditType type, string message, int userId, int objectId)
         {
             var repo = uow.CreateRepository<IAuditRepository>();
-            repo.AddOrUpdate(new AuditItem(objectId, message, type, userId));
+            repo.Save(new AuditItem(objectId, message, type, userId));
         }
 
         #endregion
@@ -2207,10 +2206,10 @@ namespace Umbraco.Core.Services
             using (var uow = UowProvider.CreateUnitOfWork(immediate: true))
             {
                 uow.WriteLock(Constants.Locks.ContentTree);
-                var repository = uow.CreateRepository<IContentRepository>();
+                var repository = uow.CreateRepository<IDocumentRepository>();
 
                 var query = Query<IContent>().WhereIn(x => x.ContentTypeId, contentTypeIdsA);
-                var contents = repository.GetByQuery(query).ToArray();
+                var contents = repository.Get(query).ToArray();
 
                 if (uow.Events.DispatchCancelable(Deleting, this, new DeleteEventArgs<IContent>(contents)))
                 {
@@ -2231,7 +2230,7 @@ namespace Umbraco.Core.Services
                     // if current content has children, move them to trash
                     var c = content;
                     var childQuery = Query<IContent>().Where(x => x.ParentId == c.Id);
-                    var children = repository.GetByQuery(childQuery);
+                    var children = repository.Get(childQuery);
                     foreach (var child in children)
                     {
                         // see MoveToRecycleBin
@@ -2277,7 +2276,7 @@ namespace Umbraco.Core.Services
 
             var repository = uow.CreateRepository<IContentTypeRepository>();
             var query = Query<IContentType>().Where(x => x.Alias == contentTypeAlias);
-            var contentType = repository.GetByQuery(query).FirstOrDefault();
+            var contentType = repository.Get(query).FirstOrDefault();
 
             if (contentType == null)
                 throw new Exception($"No ContentType matching the passed in Alias: '{contentTypeAlias}' was found"); // causes rollback
@@ -2304,7 +2303,7 @@ namespace Umbraco.Core.Services
             using (var uow = UowProvider.CreateUnitOfWork(readOnly: true))
             {
                 uow.ReadLock(Constants.Locks.ContentTree);
-                var repository = uow.CreateRepository<IContentBlueprintRepository>();
+                var repository = uow.CreateRepository<IDocumentBlueprintRepository>();
                 var blueprint = repository.Get(id);
                 if (blueprint != null)
                     ((Content) blueprint).Blueprint = true;
@@ -2317,7 +2316,7 @@ namespace Umbraco.Core.Services
             using (var uow = UowProvider.CreateUnitOfWork(readOnly: true))
             {
                 uow.ReadLock(Constants.Locks.ContentTree);
-                var repository = uow.CreateRepository<IContentBlueprintRepository>();
+                var repository = uow.CreateRepository<IDocumentBlueprintRepository>();
                 var blueprint = repository.Get(id);
                 if (blueprint != null)
                     ((Content) blueprint).Blueprint = true;
@@ -2342,7 +2341,7 @@ namespace Umbraco.Core.Services
                     throw new ArgumentException("Cannot save content blueprint with empty name.");
                 }
 
-                var repository = uow.CreateRepository<IContentBlueprintRepository>();
+                var repository = uow.CreateRepository<IDocumentBlueprintRepository>();
 
                 if (content.HasIdentity == false)
                 {
@@ -2350,7 +2349,7 @@ namespace Umbraco.Core.Services
                 }
                 content.WriterId = userId;
 
-                repository.AddOrUpdate(content);
+                repository.Save(content);
 
                 uow.Events.Dispatch(SavedBlueprint, this, new SaveEventArgs<IContent>(content), "SavedBlueprint");
 
@@ -2363,7 +2362,7 @@ namespace Umbraco.Core.Services
             using (var uow = UowProvider.CreateUnitOfWork())
             {
                 uow.WriteLock(Constants.Locks.ContentTree);
-                var repository = uow.CreateRepository<IContentBlueprintRepository>();
+                var repository = uow.CreateRepository<IDocumentBlueprintRepository>();
                 repository.Delete(content);
                 uow.Events.Dispatch(DeletedBlueprint, this, new DeleteEventArgs<IContent>(content), "DeletedBlueprint");
                 uow.Complete();
@@ -2391,14 +2390,14 @@ namespace Umbraco.Core.Services
         {
             using (var uow = UowProvider.CreateUnitOfWork(readOnly: true))
             {
-                var repository = uow.CreateRepository<IContentBlueprintRepository>();
+                var repository = uow.CreateRepository<IDocumentBlueprintRepository>();
 
                 var query = Query<IContent>();
                 if (contentTypeId.Length > 0)
                 {
                     query.Where(x => contentTypeId.Contains(x.ContentTypeId));
                 }
-                return repository.GetByQuery(query).Select(x =>
+                return repository.Get(query).Select(x =>
                 {
                     ((Content) x).Blueprint = true;
                     return x;
diff --git a/src/Umbraco.Core/Services/ContentTypeServiceBaseOfTRepositoryTItemTService.cs b/src/Umbraco.Core/Services/ContentTypeServiceBaseOfTRepositoryTItemTService.cs
index 2319dd9e32..a01bf49a1c 100644
--- a/src/Umbraco.Core/Services/ContentTypeServiceBaseOfTRepositoryTItemTService.cs
+++ b/src/Umbraco.Core/Services/ContentTypeServiceBaseOfTRepositoryTItemTService.cs
@@ -8,6 +8,7 @@ using Umbraco.Core.Models;
 using Umbraco.Core.Models.EntityBase;
 using Umbraco.Core.Persistence;
 using Umbraco.Core.Persistence.Repositories;
+using Umbraco.Core.Persistence.Repositories.Implement;
 using Umbraco.Core.Persistence.UnitOfWork;
 using Umbraco.Core.Services.Changes;
 
@@ -53,7 +54,7 @@ namespace Umbraco.Core.Services
             // eg maybe a property has been added, with an alias that's OK (no conflict with ancestors)
             // but that cannot be used (conflict with descendants)
 
-            var allContentTypes = repository.GetAll(new int[0]).Cast<IContentTypeComposition>().ToArray();
+            var allContentTypes = repository.GetMany(new int[0]).Cast<IContentTypeComposition>().ToArray();
 
             var compositionAliases = compositionContentType.CompositionAliases();
             var compositions = allContentTypes.Where(x => compositionAliases.Any(y => x.Alias.Equals(y)));
@@ -227,7 +228,7 @@ namespace Umbraco.Core.Services
             {
                 var repo = uow.CreateRepository<TRepository>();
                 uow.ReadLock(ReadLockIds);
-                return repo.GetAll(ids);
+                return repo.GetMany(ids);
             }
         }
 
@@ -238,7 +239,7 @@ namespace Umbraco.Core.Services
                 var repo = uow.CreateRepository<TRepository>();
                 uow.ReadLock(ReadLockIds);
                 // IReadRepository<Guid, TEntity> is explicitely implemented, need to cast the repo
-                return ((IReadRepository<Guid, TItem>) repo).GetAll(ids);
+                return ((IReadRepository<Guid, TItem>) repo).GetMany(ids);
             }
         }
 
@@ -249,7 +250,7 @@ namespace Umbraco.Core.Services
                 var repo = uow.CreateRepository<TRepository>();
                 uow.ReadLock(ReadLockIds);
                 var query = Query<TItem>().Where(x => x.ParentId == id);
-                return repo.GetByQuery(query);
+                return repo.Get(query);
             }
         }
 
@@ -262,7 +263,7 @@ namespace Umbraco.Core.Services
                 var found = Get(id);
                 if (found == null) return Enumerable.Empty<TItem>();
                 var query = Query<TItem>().Where(x => x.ParentId == found.Id);
-                return repo.GetByQuery(query);
+                return repo.Get(query);
             }
         }
 
@@ -323,7 +324,7 @@ namespace Umbraco.Core.Services
                 {
                     var i = ids.Pop();
                     var query = Query<TItem>().Where(x => x.ParentId == i);
-                    var result = repo.GetByQuery(query).ToArray();
+                    var result = repo.Get(query).ToArray();
 
                     foreach (var c in result)
                     {
@@ -403,7 +404,7 @@ namespace Umbraco.Core.Services
 
                 item.CreatorId = userId;
                 if (item.Description == string.Empty) item.Description = null;
-                repo.AddOrUpdate(item); // also updates content/media/member items
+                repo.Save(item); // also updates content/media/member items
 
                 // figure out impacted content types
                 var changes = ComposeContentTypeChanges(item).ToArray();
@@ -446,7 +447,7 @@ namespace Umbraco.Core.Services
                 {
                     contentType.CreatorId = userId;
                     if (contentType.Description == string.Empty) contentType.Description = null;
-                    repo.AddOrUpdate(contentType);
+                    repo.Save(contentType);
                 }
 
                 // figure out impacted content types
@@ -679,7 +680,7 @@ namespace Umbraco.Core.Services
                     }
 
                     copy.ParentId = containerId;
-                    repo.AddOrUpdate(copy);
+                    repo.Save(copy);
                     uow.Complete();
                 }
                 catch (DataOperationException<MoveOperationStatusType> ex)
@@ -777,7 +778,7 @@ namespace Umbraco.Core.Services
                         return OperationResult.Attempt.Cancel(evtMsgs, container);
                     }
 
-                    repo.AddOrUpdate(container);
+                    repo.Save(container);
                     uow.Complete();
 
                     saveEventArgs.CanCancel = false;
@@ -822,7 +823,7 @@ namespace Umbraco.Core.Services
                 uow.WriteLock(WriteLockIds); // also for containers
 
                 var repo = uow.CreateContainerRepository(containerObjectType);
-                repo.AddOrUpdate(container);
+                repo.Save(container);
                 uow.Complete();
 
                 OnSavedContainer(uow, new SaveEventArgs<EntityContainer>(container, evtMsgs));
@@ -862,7 +863,7 @@ namespace Umbraco.Core.Services
                 uow.ReadLock(ReadLockIds); // also for containers
 
                 var repo = uow.CreateContainerRepository(ContainerObjectType);
-                return repo.GetAll(containerIds);
+                return repo.GetMany(containerIds);
             }
         }
 
@@ -946,7 +947,7 @@ namespace Umbraco.Core.Services
                         throw new InvalidOperationException("No container found with id " + id);
 
                     container.Name = name;
-                    repository.AddOrUpdate(container);
+                    repository.Save(container);
                     uow.Complete();
 
                     OnRenamedContainer(uow, new SaveEventArgs<EntityContainer>(container, evtMsgs));
@@ -967,7 +968,7 @@ namespace Umbraco.Core.Services
         private void Audit(IScopeUnitOfWork uow, AuditType type, string message, int userId, int objectId)
         {
             var repo = uow.CreateRepository<IAuditRepository>();
-            repo.AddOrUpdate(new AuditItem(objectId, message, type, userId));
+            repo.Save(new AuditItem(objectId, message, type, userId));
         }
 
         #endregion
diff --git a/src/Umbraco.Core/Services/DataTypeService.cs b/src/Umbraco.Core/Services/DataTypeService.cs
index 6ed5c477c4..3696179f2e 100644
--- a/src/Umbraco.Core/Services/DataTypeService.cs
+++ b/src/Umbraco.Core/Services/DataTypeService.cs
@@ -9,6 +9,7 @@ using Umbraco.Core.Persistence.UnitOfWork;
 using Umbraco.Core.PropertyEditors;
 using Umbraco.Core.Exceptions;
 using Umbraco.Core.Persistence.Repositories;
+using Umbraco.Core.Persistence.Repositories.Implement;
 
 namespace Umbraco.Core.Services
 {
@@ -44,7 +45,7 @@ namespace Umbraco.Core.Services
                         return OperationResult.Attempt.Cancel(evtMsgs, container);
                     }
 
-                    repo.AddOrUpdate(container);
+                    repo.Save(container);
                     uow.Complete();
 
                     uow.Events.Dispatch(SavedContainer, this, new SaveEventArgs<EntityContainer>(container, evtMsgs));
@@ -105,7 +106,7 @@ namespace Umbraco.Core.Services
             using (var uow = UowProvider.CreateUnitOfWork(readOnly: true))
             {
                 var repo = uow.CreateRepository<IDataTypeContainerRepository>();
-                return repo.GetAll(containerIds);
+                return repo.GetMany(containerIds);
             }
         }
 
@@ -134,7 +135,7 @@ namespace Umbraco.Core.Services
                 }
 
                 var repo = uow.CreateRepository<IDataTypeContainerRepository>();
-                repo.AddOrUpdate(container);
+                repo.Save(container);
 
                 uow.Events.Dispatch(SavedContainer, this, new SaveEventArgs<EntityContainer>(container, evtMsgs));
                 uow.Complete();
@@ -191,7 +192,7 @@ namespace Umbraco.Core.Services
 
                     container.Name = name;
 
-                    repository.AddOrUpdate(container);
+                    repository.Save(container);
                     uow.Complete();
 
                     // fixme - triggering SavedContainer with a different name?!
@@ -218,7 +219,7 @@ namespace Umbraco.Core.Services
             using (var uow = UowProvider.CreateUnitOfWork(readOnly: true))
             {
                 var repository = uow.CreateRepository<IDataTypeDefinitionRepository>();
-                return repository.GetByQuery(Query<IDataTypeDefinition>().Where(x => x.Name == name)).FirstOrDefault();
+                return repository.Get(Query<IDataTypeDefinition>().Where(x => x.Name == name)).FirstOrDefault();
             }
         }
 
@@ -247,7 +248,7 @@ namespace Umbraco.Core.Services
             {
                 var repository = uow.CreateRepository<IDataTypeDefinitionRepository>();
                 var query = Query<IDataTypeDefinition>().Where(x => x.Key == id);
-                return repository.GetByQuery(query).FirstOrDefault();
+                return repository.Get(query).FirstOrDefault();
             }
         }
 
@@ -262,7 +263,7 @@ namespace Umbraco.Core.Services
             {
                 var repository = uow.CreateRepository<IDataTypeDefinitionRepository>();
                 var query = Query<IDataTypeDefinition>().Where(x => x.PropertyEditorAlias == propertyEditorAlias);
-                return repository.GetByQuery(query);
+                return repository.Get(query);
             }
         }
 
@@ -276,7 +277,7 @@ namespace Umbraco.Core.Services
             using (var uow = UowProvider.CreateUnitOfWork(readOnly: true))
             {
                 var repository = uow.CreateRepository<IDataTypeDefinitionRepository>();
-                return repository.GetAll(ids);
+                return repository.GetMany(ids);
             }
         }
 
@@ -394,7 +395,7 @@ namespace Umbraco.Core.Services
                 }
 
                 var repository = uow.CreateRepository<IDataTypeDefinitionRepository>();
-                repository.AddOrUpdate(dataTypeDefinition);
+                repository.Save(dataTypeDefinition);
 
                 saveEventArgs.CanCancel = false;
                 uow.Events.Dispatch(Saved, this, saveEventArgs);
@@ -436,7 +437,7 @@ namespace Umbraco.Core.Services
                 foreach (var dataTypeDefinition in dataTypeDefinitionsA)
                 {
                     dataTypeDefinition.CreatorId = userId;
-                    repository.AddOrUpdate(dataTypeDefinition);
+                    repository.Save(dataTypeDefinition);
                 }
 
                 if (raiseEvents)
@@ -542,7 +543,7 @@ namespace Umbraco.Core.Services
                 dataTypeDefinition.CreatorId = userId;
 
                 var repository = uow.CreateRepository<IDataTypeDefinitionRepository>();
-                repository.AddOrUpdate(dataTypeDefinition); // definition
+                repository.Save(dataTypeDefinition); // definition
                 repository.AddOrUpdatePreValues(dataTypeDefinition, values); //prevalues
 
                 saveEventArgs.CanCancel = false;
@@ -587,7 +588,7 @@ namespace Umbraco.Core.Services
         private void Audit(IUnitOfWork uow, AuditType type, string message, int userId, int objectId)
         {
             var repo = uow.CreateRepository<IAuditRepository>();
-            repo.AddOrUpdate(new AuditItem(objectId, message, type, userId));
+            repo.Save(new AuditItem(objectId, message, type, userId));
         }
 
         #region Event Handlers
diff --git a/src/Umbraco.Core/Services/DomainService.cs b/src/Umbraco.Core/Services/DomainService.cs
index 57869e3772..c57238c032 100644
--- a/src/Umbraco.Core/Services/DomainService.cs
+++ b/src/Umbraco.Core/Services/DomainService.cs
@@ -101,7 +101,7 @@ namespace Umbraco.Core.Services
                 }
 
                 var repository = uow.CreateRepository<IDomainRepository>();
-                repository.AddOrUpdate(domainEntity);
+                repository.Save(domainEntity);
                 uow.Complete();
                 saveEventArgs.CanCancel = false;
                 uow.Events.Dispatch(Saved, this, saveEventArgs);
diff --git a/src/Umbraco.Core/Services/ExternalLoginService.cs b/src/Umbraco.Core/Services/ExternalLoginService.cs
index 20f6fbe155..af3ed2bd09 100644
--- a/src/Umbraco.Core/Services/ExternalLoginService.cs
+++ b/src/Umbraco.Core/Services/ExternalLoginService.cs
@@ -26,7 +26,7 @@ namespace Umbraco.Core.Services
             {
                 var repo = uow.CreateRepository<IExternalLoginRepository>();
                 return repo
-                    .GetByQuery(Query<IIdentityUserLogin>().Where(x => x.UserId == userId))
+                    .Get(Query<IIdentityUserLogin>().Where(x => x.UserId == userId))
                     .ToList(); // ToList is important here, must evaluate within uow!
             }
         }
@@ -43,7 +43,7 @@ namespace Umbraco.Core.Services
             {
                 var repo = uow.CreateRepository<IExternalLoginRepository>();
                 return repo
-                    .GetByQuery(Query<IIdentityUserLogin>().Where(x => x.ProviderKey == login.ProviderKey && x.LoginProvider == login.LoginProvider))
+                    .Get(Query<IIdentityUserLogin>().Where(x => x.ProviderKey == login.ProviderKey && x.LoginProvider == login.LoginProvider))
                     .ToList(); // ToList is important here, must evaluate within uow!
             }
         }
diff --git a/src/Umbraco.Core/Services/FileService.cs b/src/Umbraco.Core/Services/FileService.cs
index 76aca5f5e7..6302b686c2 100644
--- a/src/Umbraco.Core/Services/FileService.cs
+++ b/src/Umbraco.Core/Services/FileService.cs
@@ -10,6 +10,7 @@ using Umbraco.Core.Logging;
 using Umbraco.Core.Models;
 using Umbraco.Core.Persistence;
 using Umbraco.Core.Persistence.Repositories;
+using Umbraco.Core.Persistence.Repositories.Implement;
 using Umbraco.Core.Persistence.UnitOfWork;
 
 namespace Umbraco.Core.Services
@@ -37,7 +38,7 @@ namespace Umbraco.Core.Services
             using (var uow = UowProvider.CreateUnitOfWork(readOnly: true))
             {
                 var repository = uow.CreateRepository<IStylesheetRepository>();
-                return repository.GetAll(names);
+                return repository.GetMany(names);
             }
         }
 
@@ -72,7 +73,7 @@ namespace Umbraco.Core.Services
                 }
 
                 var repository = uow.CreateRepository<IStylesheetRepository>();
-                repository.AddOrUpdate(stylesheet);
+                repository.Save(stylesheet);
                 saveEventArgs.CanCancel = false;
                 uow.Events.Dispatch(SavedStylesheet, this, saveEventArgs);
 
@@ -169,7 +170,7 @@ namespace Umbraco.Core.Services
             using (var uow = UowProvider.CreateUnitOfWork(readOnly: true))
             {
                 var repository = uow.CreateRepository<IScriptRepository>();
-                return repository.GetAll(names);
+                return repository.GetMany(names);
             }
         }
 
@@ -204,7 +205,7 @@ namespace Umbraco.Core.Services
                 }
 
                 var repository = uow.CreateRepository<IScriptRepository>();
-                repository.AddOrUpdate(script);
+                repository.Save(script);
                 saveEventArgs.CanCancel = false;
                 uow.Events.Dispatch(SavedScript, this, saveEventArgs);
 
@@ -352,7 +353,7 @@ namespace Umbraco.Core.Services
                 }
 
                 var repository = uow.CreateRepository<ITemplateRepository>();
-                repository.AddOrUpdate(template);
+                repository.Save(template);
                 saveEventArgs.CanCancel = false;
                 uow.Events.Dispatch(SavedTemplate, this, saveEventArgs);
 
@@ -442,7 +443,7 @@ namespace Umbraco.Core.Services
             {
                 var repository = uow.CreateRepository<ITemplateRepository>();
                 var query = Query<ITemplate>().Where(x => x.Key == id);
-                return repository.GetByQuery(query).SingleOrDefault();
+                return repository.Get(query).SingleOrDefault();
             }
         }
 
@@ -546,7 +547,7 @@ namespace Umbraco.Core.Services
                 }
 
                 var repository = uow.CreateRepository<ITemplateRepository>();
-                repository.AddOrUpdate(template);
+                repository.Save(template);
 
                 uow.Events.Dispatch(SavedTemplate, this, new SaveEventArgs<ITemplate>(template, false));
 
@@ -573,7 +574,7 @@ namespace Umbraco.Core.Services
 
                 var repository = uow.CreateRepository<ITemplateRepository>();
                 foreach (var template in templatesA)
-                    repository.AddOrUpdate(template);
+                    repository.Save(template);
 
                 uow.Events.Dispatch(SavedTemplate, this, new SaveEventArgs<ITemplate>(templatesA, false));
 
@@ -743,7 +744,7 @@ namespace Umbraco.Core.Services
             using (var uow = UowProvider.CreateUnitOfWork(readOnly: true))
             {
                 var repository = uow.CreateRepository<IPartialViewMacroRepository>();
-                return repository.GetAll(names).OrderBy(x => x.Name);
+                return repository.GetMany(names).OrderBy(x => x.Name);
             }
         }
 
@@ -761,7 +762,7 @@ namespace Umbraco.Core.Services
             using (var uow = UowProvider.CreateUnitOfWork(readOnly: true))
             {
                 var repository = uow.CreateRepository<IXsltFileRepository>();
-                return repository.GetAll(names).OrderBy(x => x.Name);
+                return repository.GetMany(names).OrderBy(x => x.Name);
             }
         }
 
@@ -822,7 +823,7 @@ namespace Umbraco.Core.Services
 
                 var repository = uow.CreatePartialViewRepository(partialViewType);
                 if (partialViewContent != null) partialView.Content = partialViewContent;
-                repository.AddOrUpdate(partialView);
+                repository.Save(partialView);
 
                 newEventArgs.CanCancel = false;
                 uow.Events.Dispatch(CreatedPartialView, this, newEventArgs);
@@ -897,7 +898,7 @@ namespace Umbraco.Core.Services
                 }
 
                 var repository = uow.CreatePartialViewRepository(partialViewType);
-                repository.AddOrUpdate(partialView);
+                repository.Save(partialView);
                 saveEventArgs.CanCancel = false;
                 Audit(uow, AuditType.Save, $"Save {partialViewType} performed by user", userId, -1);
                 uow.Events.Dispatch(SavedPartialView, this, saveEventArgs);
@@ -1109,7 +1110,7 @@ namespace Umbraco.Core.Services
         private void Audit(IUnitOfWork uow, AuditType type, string message, int userId, int objectId)
         {
             var repo = uow.CreateRepository<IAuditRepository>();
-            repo.AddOrUpdate(new AuditItem(objectId, message, type, userId));
+            repo.Save(new AuditItem(objectId, message, type, userId));
         }
 
         //TODO Method to change name and/or alias of view/masterpage template
diff --git a/src/Umbraco.Core/Services/LocalizationService.cs b/src/Umbraco.Core/Services/LocalizationService.cs
index bde5dd7cc5..15afb57cee 100644
--- a/src/Umbraco.Core/Services/LocalizationService.cs
+++ b/src/Umbraco.Core/Services/LocalizationService.cs
@@ -87,7 +87,7 @@ namespace Umbraco.Core.Services
                     return item;
                 }
 
-                repository.AddOrUpdate(item);
+                repository.Save(item);
                 uow.Complete();
 
                 // ensure the lazy Language callback is assigned
@@ -161,7 +161,7 @@ namespace Umbraco.Core.Services
             {
                 var repository = uow.CreateRepository<IDictionaryRepository>();
                 var query = Query<IDictionaryItem>().Where(x => x.ParentId == parentId);
-                var items = repository.GetByQuery(query).ToArray();
+                var items = repository.Get(query).ToArray();
                 //ensure the lazy Language callback is assigned
                 foreach (var item in items)
                     EnsureDictionaryItemLanguageCallback(item);
@@ -197,7 +197,7 @@ namespace Umbraco.Core.Services
             {
                 var repository = uow.CreateRepository<IDictionaryRepository>();
                 var query = Query<IDictionaryItem>().Where(x => x.ParentId == null);
-                var items = repository.GetByQuery(query).ToArray();
+                var items = repository.Get(query).ToArray();
                 //ensure the lazy Language callback is assigned
                 foreach (var item in items)
                     EnsureDictionaryItemLanguageCallback(item);
@@ -236,7 +236,7 @@ namespace Umbraco.Core.Services
                 }
 
                 var repository = uow.CreateRepository<IDictionaryRepository>();
-                repository.AddOrUpdate(dictionaryItem);
+                repository.Save(dictionaryItem);
 
                 // ensure the lazy Language callback is assigned
                 EnsureDictionaryItemLanguageCallback(dictionaryItem);
@@ -327,7 +327,7 @@ namespace Umbraco.Core.Services
             using (var uow = UowProvider.CreateUnitOfWork(readOnly: true))
             {
                 var repository = uow.CreateRepository<ILanguageRepository>();
-                return repository.GetAll();
+                return repository.GetMany();
             }
         }
 
@@ -348,7 +348,7 @@ namespace Umbraco.Core.Services
                 }
 
                 var repository = uow.CreateRepository<ILanguageRepository>();
-                repository.AddOrUpdate(language);
+                repository.Save(language);
                 saveEventArgs.CanCancel = false;
                 uow.Events.Dispatch(SavedLanguage, this, saveEventArgs);
 
@@ -390,7 +390,7 @@ namespace Umbraco.Core.Services
         private void Audit(IScopeUnitOfWork uow, AuditType type, string message, int userId, int objectId)
         {
             var repo = uow.CreateRepository<IAuditRepository>();
-            repo.AddOrUpdate(new AuditItem(objectId, message, type, userId));
+            repo.Save(new AuditItem(objectId, message, type, userId));
         }
 
         /// <summary>
diff --git a/src/Umbraco.Core/Services/MacroService.cs b/src/Umbraco.Core/Services/MacroService.cs
index 662d7235aa..9af283249a 100644
--- a/src/Umbraco.Core/Services/MacroService.cs
+++ b/src/Umbraco.Core/Services/MacroService.cs
@@ -47,7 +47,7 @@ namespace Umbraco.Core.Services
             {
                 var repository = uow.CreateRepository<IMacroRepository>();
                 var q = Query<IMacro>().Where(x => x.Alias == alias);
-                return repository.GetByQuery(q).FirstOrDefault();
+                return repository.Get(q).FirstOrDefault();
             }
         }
 
@@ -61,7 +61,7 @@ namespace Umbraco.Core.Services
             using (var uow = UowProvider.CreateUnitOfWork(readOnly: true))
             {
                 var repository = uow.CreateRepository<IMacroRepository>();
-                return repository.GetAll(ids);
+                return repository.GetMany(ids);
             }
         }
 
@@ -70,7 +70,7 @@ namespace Umbraco.Core.Services
             using (var uow = UowProvider.CreateUnitOfWork(readOnly: true))
             {
                 var repository = uow.CreateRepository<IMacroRepository>();
-                return repository.GetAll(ids);
+                return repository.GetMany(ids);
             }
         }
 
@@ -140,7 +140,7 @@ namespace Umbraco.Core.Services
                 }
 
                 var repository = uow.CreateRepository<IMacroRepository>();
-                repository.AddOrUpdate(macro);
+                repository.Save(macro);
                 saveEventArgs.CanCancel = false;
                 uow.Events.Dispatch(Saved, this, saveEventArgs);
                 Audit(uow, AuditType.Save, "Save Macro performed by user", userId, -1);
@@ -171,7 +171,7 @@ namespace Umbraco.Core.Services
         private void Audit(IScopeUnitOfWork uow, AuditType type, string message, int userId, int objectId)
         {
             var repo = uow.CreateRepository<IAuditRepository>();
-            repo.AddOrUpdate(new AuditItem(objectId, message, type, userId));
+            repo.Save(new AuditItem(objectId, message, type, userId));
         }
 
         #region Event Handlers
diff --git a/src/Umbraco.Core/Services/MediaService.cs b/src/Umbraco.Core/Services/MediaService.cs
index edcef9edd0..12d75ac6b7 100644
--- a/src/Umbraco.Core/Services/MediaService.cs
+++ b/src/Umbraco.Core/Services/MediaService.cs
@@ -292,7 +292,7 @@ namespace Umbraco.Core.Services
                 }
 
                 var repo = uow.CreateRepository<IMediaRepository>();
-                repo.AddOrUpdate(media);
+                repo.Save(media);
 
                 saveEventArgs.CanCancel = false;
                 uow.Events.Dispatch(Saved, this, saveEventArgs);
@@ -342,7 +342,7 @@ namespace Umbraco.Core.Services
             {
                 uow.ReadLock(Constants.Locks.MediaTree);
                 var repository = uow.CreateRepository<IMediaRepository>();
-                return repository.GetAll(idsA);
+                return repository.GetMany(idsA);
             }
         }
 
@@ -375,7 +375,7 @@ namespace Umbraco.Core.Services
             {
                 uow.ReadLock(Constants.Locks.MediaTree);
                 var repository = uow.CreateRepository<IMediaRepository>();
-                return repository.GetAll(idsA);
+                return repository.GetMany(idsA);
             }
         }
 
@@ -391,7 +391,7 @@ namespace Umbraco.Core.Services
                 uow.ReadLock(Constants.Locks.MediaTree);
                 var repository = uow.CreateRepository<IMediaRepository>();
                 var query = Query<IMedia>().Where(x => x.ContentTypeId == id);
-                return repository.GetByQuery(query);
+                return repository.Get(query);
             }
         }
 
@@ -408,7 +408,7 @@ namespace Umbraco.Core.Services
                 uow.ReadLock(Constants.Locks.MediaTree);
                 var repository = uow.CreateRepository<IMediaRepository>();
                 var query = Query<IMedia>().Where(x => x.Level == level && x.Trashed == false);
-                return repository.GetByQuery(query);
+                return repository.Get(query);
             }
         }
 
@@ -474,7 +474,7 @@ namespace Umbraco.Core.Services
             {
                 uow.ReadLock(Constants.Locks.MediaTree);
                 var repository = uow.CreateRepository<IMediaRepository>();
-                return repository.GetAll(ids);
+                return repository.GetMany(ids);
             }
         }
 
@@ -490,7 +490,7 @@ namespace Umbraco.Core.Services
                 uow.ReadLock(Constants.Locks.MediaTree);
                 var repository = uow.CreateRepository<IMediaRepository>();
                 var query = Query<IMedia>().Where(x => x.ParentId == id);
-                return repository.GetByQuery(query).OrderBy(x => x.SortOrder);
+                return repository.Get(query).OrderBy(x => x.SortOrder);
             }
         }
 
@@ -542,7 +542,7 @@ namespace Umbraco.Core.Services
                 //if (id != Constants.System.Root)
                 query.Where(x => x.ParentId == id);
 
-                return repository.GetPagedResultsByQuery(query, pageIndex, pageSize, out totalChildren, orderBy, orderDirection, orderBySystemField, filter);
+                return repository.GetPage(query, pageIndex, pageSize, out totalChildren, orderBy, orderDirection, orderBySystemField, filter);
             }
         }
 
@@ -583,7 +583,7 @@ namespace Umbraco.Core.Services
                     ? null
                     : Query<IMedia>().Where(x => x.Name.Contains(filter));
 
-                return repository.GetPagedResultsByQuery(query, pageIndex, pageSize, out totalChildren, orderBy, orderDirection, orderBySystemField, filterQuery);
+                return repository.GetPage(query, pageIndex, pageSize, out totalChildren, orderBy, orderDirection, orderBySystemField, filterQuery);
             }
         }
 
@@ -642,7 +642,7 @@ namespace Umbraco.Core.Services
                     }
                     query.Where(x => x.Path.SqlStartsWith(mediaPath[0] + ",", TextColumnType.NVarchar));
                 }
-                return repository.GetPagedResultsByQuery(query, pageIndex, pageSize, out totalChildren, orderBy, orderDirection, orderBySystemField, filter);
+                return repository.GetPage(query, pageIndex, pageSize, out totalChildren, orderBy, orderDirection, orderBySystemField, filter);
             }
         }
 
@@ -663,7 +663,7 @@ namespace Umbraco.Core.Services
 
                 var pathMatch = media.Path + ",";
                 var query = Query<IMedia>().Where(x => x.Id != media.Id && x.Path.StartsWith(pathMatch));
-                return repository.GetByQuery(query);
+                return repository.Get(query);
             }
         }
 
@@ -680,7 +680,7 @@ namespace Umbraco.Core.Services
                 var repository = uow.CreateRepository<IMediaRepository>();
                 var pathMatch = media.Path + ",";
                 var query = Query<IMedia>().Where(x => x.Id != media.Id && x.Path.StartsWith(pathMatch));
-                return repository.GetByQuery(query);
+                return repository.Get(query);
             }
         }
 
@@ -720,7 +720,7 @@ namespace Umbraco.Core.Services
                 uow.ReadLock(Constants.Locks.MediaTree);
                 var repository = uow.CreateRepository<IMediaRepository>();
                 var query = Query<IMedia>().Where(x => x.ParentId == Constants.System.Root);
-                return repository.GetByQuery(query);
+                return repository.Get(query);
             }
         }
 
@@ -736,7 +736,7 @@ namespace Umbraco.Core.Services
                 var repository = uow.CreateRepository<IMediaRepository>();
                 var bin = $"{Constants.System.Root},{Constants.System.RecycleBinMedia},";
                 var query = Query<IMedia>().Where(x => x.Path.StartsWith(bin));
-                return repository.GetByQuery(query);
+                return repository.Get(query);
             }
         }
 
@@ -815,7 +815,7 @@ namespace Umbraco.Core.Services
                 var repository = uow.CreateRepository<IMediaRepository>();
                 if (media.HasIdentity == false)
                     media.CreatorId = userId;
-                repository.AddOrUpdate(media);
+                repository.Save(media);
 
                 if (raiseEvents)
                 {
@@ -872,7 +872,7 @@ namespace Umbraco.Core.Services
                 {
                     if (media.HasIdentity == false)
                         media.CreatorId = userId;
-                    repository.AddOrUpdate(media);
+                    repository.Save(media);
                 }
 
                 if (raiseEvents)
@@ -1224,7 +1224,7 @@ namespace Umbraco.Core.Services
             bool? trash)
         {
             if (trash.HasValue) ((ContentBase) media).Trashed = trash.Value;
-            repository.AddOrUpdate(media);
+            repository.Save(media);
         }
 
         /// <summary>
@@ -1255,7 +1255,7 @@ namespace Umbraco.Core.Services
 
                 // emptying the recycle bin means deleting whetever is in there - do it properly!
                 var query = Query<IMedia>().Where(x => x.ParentId == Constants.System.RecycleBinMedia);
-                var medias = repository.GetByQuery(query).ToArray();
+                var medias = repository.Get(query).ToArray();
                 foreach (var media in medias)
                 {
                     DeleteLocked(uow, repository, media);
@@ -1316,7 +1316,7 @@ namespace Umbraco.Core.Services
                     media.SortOrder = sortOrder++;
                     // save
                     saved.Add(media);
-                    repository.AddOrUpdate(media);
+                    repository.Save(media);
                 }
 
                 if (raiseEvents)
@@ -1340,7 +1340,7 @@ namespace Umbraco.Core.Services
         private void Audit(IScopeUnitOfWork uow, AuditType type, string message, int userId, int objectId)
         {
             var repo = uow.CreateRepository<IAuditRepository>();
-            repo.AddOrUpdate(new AuditItem(objectId, message, type, userId));
+            repo.Save(new AuditItem(objectId, message, type, userId));
         }
 
         #endregion
@@ -1498,7 +1498,7 @@ namespace Umbraco.Core.Services
                 var repository = uow.CreateRepository<IMediaRepository>();
 
                 var query = Query<IMedia>().WhereIn(x => x.ContentTypeId, mediaTypeIdsA);
-                var medias = repository.GetByQuery(query).ToArray();
+                var medias = repository.Get(query).ToArray();
 
                 if (uow.Events.DispatchCancelable(Deleting, this, new DeleteEventArgs<IMedia>(medias)))
                 {
@@ -1513,7 +1513,7 @@ namespace Umbraco.Core.Services
                     // if current media has children, move them to trash
                     var m = media;
                     var childQuery = Query<IMedia>().Where(x => x.Path.StartsWith(m.Path));
-                    var children = repository.GetByQuery(childQuery);
+                    var children = repository.Get(childQuery);
                     foreach (var child in children.Where(x => mediaTypeIdsA.Contains(x.ContentTypeId) == false))
                     {
                         // see MoveToRecycleBin
@@ -1561,7 +1561,7 @@ namespace Umbraco.Core.Services
 
                 var repository = uow.CreateRepository<IMediaTypeRepository>();
                 var query = Query<IMediaType>().Where(x => x.Alias == mediaTypeAlias);
-                var mediaType = repository.GetByQuery(query).FirstOrDefault();
+                var mediaType = repository.Get(query).FirstOrDefault();
 
                 if (mediaType == null)
                     throw new Exception($"No MediaType matching the passed in Alias: '{mediaTypeAlias}' was found"); // causes rollback
diff --git a/src/Umbraco.Core/Services/MemberGroupService.cs b/src/Umbraco.Core/Services/MemberGroupService.cs
index f33115a606..24dc233882 100644
--- a/src/Umbraco.Core/Services/MemberGroupService.cs
+++ b/src/Umbraco.Core/Services/MemberGroupService.cs
@@ -3,6 +3,7 @@ using Umbraco.Core.Events;
 using Umbraco.Core.Logging;
 using Umbraco.Core.Models;
 using Umbraco.Core.Persistence.Repositories;
+using Umbraco.Core.Persistence.Repositories.Implement;
 using Umbraco.Core.Persistence.UnitOfWork;
 
 namespace Umbraco.Core.Services
@@ -52,7 +53,7 @@ namespace Umbraco.Core.Services
             using (var uow = UowProvider.CreateUnitOfWork(readOnly: true))
             {
                 var repository = uow.CreateRepository<IMemberGroupRepository>();
-                return repository.GetAll();
+                return repository.GetMany();
             }
         }
 
@@ -86,7 +87,7 @@ namespace Umbraco.Core.Services
                 }
 
                 var repository = uow.CreateRepository<IMemberGroupRepository>();
-                repository.AddOrUpdate(memberGroup);
+                repository.Save(memberGroup);
                 uow.Complete();
 
                 if (raiseEvents)
diff --git a/src/Umbraco.Core/Services/MemberService.cs b/src/Umbraco.Core/Services/MemberService.cs
index 519bce8a48..02c6b50409 100644
--- a/src/Umbraco.Core/Services/MemberService.cs
+++ b/src/Umbraco.Core/Services/MemberService.cs
@@ -326,7 +326,7 @@ namespace Umbraco.Core.Services
                 }
 
                 var repository = uow.CreateRepository<IMemberRepository>();
-                repository.AddOrUpdate(member);
+                repository.Save(member);
 
                 saveEventArgs.CanCancel = false;
                 uow.Events.Dispatch(Saved, this, saveEventArgs);
@@ -373,7 +373,7 @@ namespace Umbraco.Core.Services
                 uow.ReadLock(Constants.Locks.MemberTree);
                 var repository = uow.CreateRepository<IMemberRepository>();
                 var query = Query<IMember>().Where(x => x.Key == id);
-                return repository.GetByQuery(query).FirstOrDefault();
+                return repository.Get(query).FirstOrDefault();
             }
         }
 
@@ -390,7 +390,7 @@ namespace Umbraco.Core.Services
             {
                 uow.ReadLock(Constants.Locks.MemberTree);
                 var repository = uow.CreateRepository<IMemberRepository>();
-                return repository.GetPagedResultsByQuery(null, pageIndex, pageSize, out totalRecords, "LoginName", Direction.Ascending, true);
+                return repository.GetPage(null, pageIndex, pageSize, out totalRecords, "LoginName", Direction.Ascending, true);
             }
         }
 
@@ -411,7 +411,7 @@ namespace Umbraco.Core.Services
                 var repository = uow.CreateRepository<IMemberRepository>();
                 var query1 = memberTypeAlias == null ? null : Query<IMember>().Where(x => x.ContentTypeAlias == memberTypeAlias);
                 var query2 = filter == null ? null : Query<IMember>().Where(x => x.Name.Contains(filter) || x.Username.Contains(filter));
-                return repository.GetPagedResultsByQuery(query1, pageIndex, pageSize, out totalRecords, orderBy, orderDirection, orderBySystemField, query2);
+                return repository.GetPage(query1, pageIndex, pageSize, out totalRecords, orderBy, orderDirection, orderBySystemField, query2);
             }
         }
 
@@ -445,7 +445,7 @@ namespace Umbraco.Core.Services
                 uow.ReadLock(Constants.Locks.MemberTree);
                 var repository = uow.CreateRepository<IMemberRepository>();
                 var query = Query<IMember>().Where(x => x.Email.Equals(email));
-                return repository.GetByQuery(query).FirstOrDefault();
+                return repository.Get(query).FirstOrDefault();
             }
         }
 
@@ -465,7 +465,7 @@ namespace Umbraco.Core.Services
                 uow.ReadLock(Constants.Locks.MemberTree);
                 var repository = uow.CreateRepository<IMemberRepository>();
                 var query = Query<IMember>().Where(x => x.Username.Equals(username));
-                return repository.GetByQuery(query).FirstOrDefault();
+                return repository.Get(query).FirstOrDefault();
             }
         }
 
@@ -481,7 +481,7 @@ namespace Umbraco.Core.Services
                 uow.ReadLock(Constants.Locks.MemberTree);
                 var repository = uow.CreateRepository<IMemberRepository>();
                 var query = Query<IMember>().Where(x => x.ContentTypeAlias == memberTypeAlias);
-                return repository.GetByQuery(query);
+                return repository.Get(query);
             }
         }
 
@@ -498,7 +498,7 @@ namespace Umbraco.Core.Services
                 var repository = uow.CreateRepository<IMemberRepository>();
                 repository.Get(memberTypeId);
                 var query = Query<IMember>().Where(x => x.ContentTypeId == memberTypeId);
-                return repository.GetByQuery(query);
+                return repository.Get(query);
             }
         }
 
@@ -529,7 +529,7 @@ namespace Umbraco.Core.Services
             {
                 uow.ReadLock(Constants.Locks.MemberTree);
                 var repository = uow.CreateRepository<IMemberRepository>();
-                return repository.GetAll(ids);
+                return repository.GetMany(ids);
             }
         }
 
@@ -571,7 +571,7 @@ namespace Umbraco.Core.Services
                         throw new ArgumentOutOfRangeException(nameof(matchType)); // causes rollback
                 }
 
-                return repository.GetPagedResultsByQuery(query, pageIndex, pageSize, out totalRecords, "Name", Direction.Ascending, true);
+                return repository.GetPage(query, pageIndex, pageSize, out totalRecords, "Name", Direction.Ascending, true);
             }
         }
 
@@ -613,7 +613,7 @@ namespace Umbraco.Core.Services
                         throw new ArgumentOutOfRangeException(nameof(matchType));
                 }
 
-                return repository.GetPagedResultsByQuery(query, pageIndex, pageSize, out totalRecords, "Email", Direction.Ascending, true);
+                return repository.GetPage(query, pageIndex, pageSize, out totalRecords, "Email", Direction.Ascending, true);
             }
         }
 
@@ -655,7 +655,7 @@ namespace Umbraco.Core.Services
                         throw new ArgumentOutOfRangeException(nameof(matchType));
                 }
 
-                return repository.GetPagedResultsByQuery(query, pageIndex, pageSize, out totalRecords, "LoginName", Direction.Ascending, true);
+                return repository.GetPage(query, pageIndex, pageSize, out totalRecords, "LoginName", Direction.Ascending, true);
             }
         }
 
@@ -704,7 +704,7 @@ namespace Umbraco.Core.Services
                         throw new ArgumentOutOfRangeException(nameof(matchType));
                 }
 
-                return repository.GetByQuery(query);
+                return repository.Get(query);
             }
         }
 
@@ -754,7 +754,7 @@ namespace Umbraco.Core.Services
                         throw new ArgumentOutOfRangeException(nameof(matchType));
                 }
 
-                return repository.GetByQuery(query);
+                return repository.Get(query);
             }
         }
 
@@ -774,7 +774,7 @@ namespace Umbraco.Core.Services
                     ((Member)x).PropertyTypeAlias == propertyTypeAlias &&
                     ((Member)x).BoolPropertyValue == value);
 
-                return repository.GetByQuery(query);
+                return repository.Get(query);
             }
         }
 
@@ -825,7 +825,7 @@ namespace Umbraco.Core.Services
                 }
 
                 //TODO: Since this is by property value, we need a GetByPropertyQuery on the repo!
-                return repository.GetByQuery(query);
+                return repository.Get(query);
             }
         }
 
@@ -888,7 +888,7 @@ namespace Umbraco.Core.Services
                 uow.WriteLock(Constants.Locks.MemberTree);
                 var repository = uow.CreateRepository<IMemberRepository>();
 
-                repository.AddOrUpdate(member);
+                repository.Save(member);
 
                 if (raiseEvents)
                 {
@@ -923,7 +923,7 @@ namespace Umbraco.Core.Services
                 uow.WriteLock(Constants.Locks.MemberTree);
                 var repository = uow.CreateRepository<IMemberRepository>();
                 foreach (var member in membersA)
-                    repository.AddOrUpdate(member);
+                    repository.Save(member);
 
                 if (raiseEvents)
                 {
@@ -1001,7 +1001,7 @@ namespace Umbraco.Core.Services
             {
                 uow.ReadLock(Constants.Locks.MemberTree);
                 var repository = uow.CreateRepository<IMemberGroupRepository>();
-                return repository.GetAll().Select(x => x.Name).Distinct();
+                return repository.GetMany().Select(x => x.Name).Distinct();
             }
         }
 
@@ -1064,7 +1064,7 @@ namespace Umbraco.Core.Services
                 }
 
                 var query = Query<IMemberGroup>().Where(g => g.Name == roleName);
-                var found = repository.GetByQuery(query).ToArray();
+                var found = repository.Get(query).ToArray();
 
                 foreach (var memberGroup in found)
                     _memberGroupService.Delete(memberGroup);
@@ -1145,7 +1145,7 @@ namespace Umbraco.Core.Services
         private void Audit(IUnitOfWork uow, AuditType type, string message, int userId, int objectId)
         {
             var repo = uow.CreateRepository<IAuditRepository>();
-            repo.AddOrUpdate(new AuditItem(objectId, message, type, userId));
+            repo.Save(new AuditItem(objectId, message, type, userId));
         }
 
         #endregion
@@ -1309,7 +1309,7 @@ namespace Umbraco.Core.Services
 
                 //TODO: What about content that has the contenttype as part of its composition?
                 var query = Query<IMember>().Where(x => x.ContentTypeId == memberTypeId);
-                var members = repository.GetByQuery(query).ToArray();
+                var members = repository.Get(query).ToArray();
 
                 var deleteEventArgs = new DeleteEventArgs<IMember>(members);
                 if (uow.Events.DispatchCancelable(Deleting, this, deleteEventArgs))
diff --git a/src/Umbraco.Core/Services/MemberTypeService.cs b/src/Umbraco.Core/Services/MemberTypeService.cs
index 306b714fba..1b16afa9fa 100644
--- a/src/Umbraco.Core/Services/MemberTypeService.cs
+++ b/src/Umbraco.Core/Services/MemberTypeService.cs
@@ -39,7 +39,7 @@ namespace Umbraco.Core.Services
                 uow.ReadLock(ReadLockIds);
                 var repo = uow.CreateRepository<IMemberTypeRepository>();
 
-                using (var e = repo.GetAll(new int[0]).GetEnumerator())
+                using (var e = repo.GetMany(new int[0]).GetEnumerator())
                 {
                     if (e.MoveNext() == false)
                         throw new InvalidOperationException("No member types could be resolved");
diff --git a/src/Umbraco.Core/Services/MigrationEntryService.cs b/src/Umbraco.Core/Services/MigrationEntryService.cs
index 2a4d99ea17..f78a94ec90 100644
--- a/src/Umbraco.Core/Services/MigrationEntryService.cs
+++ b/src/Umbraco.Core/Services/MigrationEntryService.cs
@@ -34,7 +34,7 @@ namespace Umbraco.Core.Services
             using (var uow = UowProvider.CreateUnitOfWork())
             {
                 var repo = uow.CreateRepository<IMigrationEntryRepository>();
-                repo.AddOrUpdate(entry);
+                repo.Save(entry);
                 uow.Complete();
             }
 
@@ -68,7 +68,7 @@ namespace Umbraco.Core.Services
                 var repo = uow.CreateRepository<IMigrationEntryRepository>();
                 var query = Query<IMigrationEntry>()
                     .Where(x => x.MigrationName.ToUpper() == migrationName.ToUpper());
-                return repo.GetByQuery(query);
+                return repo.Get(query);
             }
         }
 
diff --git a/src/Umbraco.Core/Services/PackagingService.cs b/src/Umbraco.Core/Services/PackagingService.cs
index e078af3416..92dfb0e65b 100644
--- a/src/Umbraco.Core/Services/PackagingService.cs
+++ b/src/Umbraco.Core/Services/PackagingService.cs
@@ -788,7 +788,7 @@ namespace Umbraco.Core.Services
             {
                 var repository = uow.CreateRepository<IContentTypeRepository>();
                 var query = Query<IContentType>().Where(x => x.Alias == contentTypeAlias);
-                var contentType = repository.GetByQuery(query).FirstOrDefault();
+                var contentType = repository.Get(query).FirstOrDefault();
 
                 if (contentType == null)
                     throw new Exception($"ContentType matching the passed in Alias: '{contentTypeAlias}' was null");
@@ -1517,7 +1517,7 @@ namespace Umbraco.Core.Services
         private static void Audit(IUnitOfWork uow, AuditType type, string message, int userId, int objectId)
         {
             var auditRepo = uow.CreateRepository<IAuditRepository>();
-            auditRepo.AddOrUpdate(new AuditItem(objectId, message, type, userId));
+            auditRepo.Save(new AuditItem(objectId, message, type, userId));
         }
 
         #endregion
diff --git a/src/Umbraco.Core/Services/PublicAccessService.cs b/src/Umbraco.Core/Services/PublicAccessService.cs
index e88e263819..742d7ecb02 100644
--- a/src/Umbraco.Core/Services/PublicAccessService.cs
+++ b/src/Umbraco.Core/Services/PublicAccessService.cs
@@ -25,7 +25,7 @@ namespace Umbraco.Core.Services
             using (var uow = UowProvider.CreateUnitOfWork(readOnly: true))
             {
                 var repo = uow.CreateRepository<IPublicAccessRepository>();
-                return repo.GetAll();
+                return repo.GetMany();
             }
         }
 
@@ -64,7 +64,7 @@ namespace Umbraco.Core.Services
                 var repo = uow.CreateRepository<IPublicAccessRepository>();
 
                 //This will retrieve from cache!
-                var entries = repo.GetAll().ToArray();
+                var entries = repo.GetMany().ToArray();
                 uow.Complete();
 
                 foreach (var id in ids)
@@ -114,7 +114,7 @@ namespace Umbraco.Core.Services
             {
                 var repo = uow.CreateRepository<IPublicAccessRepository>();
 
-                entry = repo.GetAll().FirstOrDefault(x => x.ProtectedNodeId == content.Id);
+                entry = repo.GetMany().FirstOrDefault(x => x.ProtectedNodeId == content.Id);
                 if (entry == null)
                     return OperationResult.Attempt.Cannot<PublicAccessEntry>(evtMsgs); // causes rollback
 
@@ -136,7 +136,7 @@ namespace Umbraco.Core.Services
                     return OperationResult.Attempt.Cancel(evtMsgs, entry);
                 }
 
-                repo.AddOrUpdate(entry);
+                repo.Save(entry);
 
                 uow.Complete();
 
@@ -161,7 +161,7 @@ namespace Umbraco.Core.Services
             {
                 var repo = uow.CreateRepository<IPublicAccessRepository>();
 
-                entry = repo.GetAll().FirstOrDefault(x => x.ProtectedNodeId == content.Id);
+                entry = repo.GetMany().FirstOrDefault(x => x.ProtectedNodeId == content.Id);
                 if (entry == null) return Attempt<OperationResult>.Fail(); // causes rollback
 
                 var existingRule = entry.Rules.FirstOrDefault(x => x.RuleType == ruleType && x.RuleValue == ruleValue);
@@ -176,7 +176,7 @@ namespace Umbraco.Core.Services
                     return OperationResult.Attempt.Cancel(evtMsgs);
                 }
 
-                repo.AddOrUpdate(entry);
+                repo.Save(entry);
                 uow.Complete();
 
                 saveEventArgs.CanCancel = false;
@@ -204,7 +204,7 @@ namespace Umbraco.Core.Services
                 }
 
                 var repo = uow.CreateRepository<IPublicAccessRepository>();
-                repo.AddOrUpdate(entry);
+                repo.Save(entry);
                 uow.Complete();
 
                 saveEventArgs.CanCancel = false;
diff --git a/src/Umbraco.Core/Services/RedirectUrlService.cs b/src/Umbraco.Core/Services/RedirectUrlService.cs
index a30262e5e1..752bc646c5 100644
--- a/src/Umbraco.Core/Services/RedirectUrlService.cs
+++ b/src/Umbraco.Core/Services/RedirectUrlService.cs
@@ -24,7 +24,7 @@ namespace Umbraco.Core.Services
                     redir.CreateDateUtc = DateTime.UtcNow;
                 else
                     redir = new RedirectUrl { Key = Guid.NewGuid(), Url = url, ContentKey = contentKey };
-                repo.AddOrUpdate(redir);
+                repo.Save(redir);
                 uow.Complete();
             }
         }
diff --git a/src/Umbraco.Core/Services/RelationService.cs b/src/Umbraco.Core/Services/RelationService.cs
index 83c97bd99f..bc81debde6 100644
--- a/src/Umbraco.Core/Services/RelationService.cs
+++ b/src/Umbraco.Core/Services/RelationService.cs
@@ -73,7 +73,7 @@ namespace Umbraco.Core.Services
             {
                 var repository = uow.CreateRepository<IRelationTypeRepository>();
                 var query = Query<IRelationType>().Where(x => x.Alias == alias);
-                return repository.GetByQuery(query).FirstOrDefault();
+                return repository.Get(query).FirstOrDefault();
             }
         }
 
@@ -87,7 +87,7 @@ namespace Umbraco.Core.Services
             using (var uow = UowProvider.CreateUnitOfWork(readOnly: true))
             {
                 var repository = uow.CreateRepository<IRelationRepository>();
-                return repository.GetAll(ids);
+                return repository.GetMany(ids);
             }
         }
 
@@ -112,7 +112,7 @@ namespace Umbraco.Core.Services
             {
                 var repository = uow.CreateRepository<IRelationRepository>();
                 var query = Query<IRelation>().Where(x => x.RelationTypeId == relationTypeId);
-                return repository.GetByQuery(query);
+                return repository.Get(query);
             }
         }
 
@@ -126,7 +126,7 @@ namespace Umbraco.Core.Services
             using (var uow = UowProvider.CreateUnitOfWork(readOnly: true))
             {
                 var repository = uow.CreateRepository<IRelationTypeRepository>();
-                return repository.GetAll(ids);
+                return repository.GetMany(ids);
             }
         }
 
@@ -141,7 +141,7 @@ namespace Umbraco.Core.Services
             {
                 var repository = uow.CreateRepository<IRelationRepository>();
                 var query = Query<IRelation>().Where(x => x.ParentId == id);
-                return repository.GetByQuery(query);
+                return repository.Get(query);
             }
         }
 
@@ -177,7 +177,7 @@ namespace Umbraco.Core.Services
             {
                 var repository = uow.CreateRepository<IRelationRepository>();
                 var query = Query<IRelation>().Where(x => x.ChildId == id);
-                return repository.GetByQuery(query);
+                return repository.Get(query);
             }
         }
 
@@ -214,7 +214,7 @@ namespace Umbraco.Core.Services
             {
                 var repository = uow.CreateRepository<IRelationRepository>();
                 var query = Query<IRelation>().Where(x => x.ChildId == id || x.ParentId == id);
-                return repository.GetByQuery(query);
+                return repository.Get(query);
             }
         }
 
@@ -225,13 +225,13 @@ namespace Umbraco.Core.Services
                 var repository = uow.CreateRepository<IRelationTypeRepository>();
 
                 var rtQuery = Query<IRelationType>().Where(x => x.Alias == relationTypeAlias);
-                var relationType = repository.GetByQuery(rtQuery).FirstOrDefault();
+                var relationType = repository.Get(rtQuery).FirstOrDefault();
                 if (relationType == null)
                     return Enumerable.Empty<IRelation>();
 
                 var relationRepo = uow.CreateRepository<IRelationRepository>();
                 var query = Query<IRelation>().Where(x => (x.ChildId == id || x.ParentId == id) && x.RelationTypeId == relationType.Id);
-                return relationRepo.GetByQuery(query);
+                return relationRepo.Get(query);
             }
         }
 
@@ -247,7 +247,7 @@ namespace Umbraco.Core.Services
             {
                 var repository = uow.CreateRepository<IRelationTypeRepository>();
                 var query = Query<IRelationType>().Where(x => x.Name == relationTypeName);
-                var relationTypes = repository.GetByQuery(query);
+                var relationTypes = repository.Get(query);
                 relationTypeIds = relationTypes.Select(x => x.Id).ToList();
             }
 
@@ -268,7 +268,7 @@ namespace Umbraco.Core.Services
             {
                 var repository = uow.CreateRepository<IRelationTypeRepository>();
                 var query = Query<IRelationType>().Where(x => x.Alias == relationTypeAlias);
-                var relationTypes = repository.GetByQuery(query);
+                var relationTypes = repository.Get(query);
                 relationTypeIds = relationTypes.Select(x => x.Id).ToList();
             }
 
@@ -288,7 +288,7 @@ namespace Umbraco.Core.Services
             {
                 var repository = uow.CreateRepository<IRelationRepository>();
                 var query = Query<IRelation>().Where(x => x.RelationTypeId == relationTypeId);
-                return repository.GetByQuery(query);
+                return repository.Get(query);
             }
         }
 
@@ -408,7 +408,7 @@ namespace Umbraco.Core.Services
                 }
 
                 var repository = uow.CreateRepository<IRelationRepository>();
-                repository.AddOrUpdate(relation);
+                repository.Save(relation);
                 saveEventArgs.CanCancel = false;
                 uow.Events.Dispatch(SavedRelation, this, saveEventArgs);
                 uow.Complete();
@@ -442,7 +442,7 @@ namespace Umbraco.Core.Services
                 }
 
                 var repository = uow.CreateRepository<IRelationRepository>();
-                repository.AddOrUpdate(relation);
+                repository.Save(relation);
                 saveEventArgs.CanCancel = false;
                 uow.Events.Dispatch(SavedRelation, this, saveEventArgs);
                 uow.Complete();
@@ -462,7 +462,7 @@ namespace Umbraco.Core.Services
             {
                 var repository = uow.CreateRepository<IRelationRepository>();
                 var query = Query<IRelation>().Where(x => x.RelationTypeId == relationType.Id);
-                return repository.GetByQuery(query).Any();
+                return repository.Get(query).Any();
             }
         }
 
@@ -477,7 +477,7 @@ namespace Umbraco.Core.Services
             {
                 var repository = uow.CreateRepository<IRelationRepository>();
                 var query = Query<IRelation>().Where(x => x.ParentId == id || x.ChildId == id);
-                return repository.GetByQuery(query).Any();
+                return repository.Get(query).Any();
             }
         }
 
@@ -493,7 +493,7 @@ namespace Umbraco.Core.Services
             {
                 var repository = uow.CreateRepository<IRelationRepository>();
                 var query = Query<IRelation>().Where(x => x.ParentId == parentId && x.ChildId == childId);
-                return repository.GetByQuery(query).Any();
+                return repository.Get(query).Any();
             }
         }
 
@@ -527,7 +527,7 @@ namespace Umbraco.Core.Services
             {
                 var repository = uow.CreateRepository<IRelationRepository>();
                 var query = Query<IRelation>().Where(x => x.ParentId == parentId && x.ChildId == childId && x.RelationTypeId == relationType.Id);
-                return repository.GetByQuery(query).Any();
+                return repository.Get(query).Any();
             }
         }
 
@@ -571,7 +571,7 @@ namespace Umbraco.Core.Services
                 }
 
                 var repository = uow.CreateRepository<IRelationRepository>();
-                repository.AddOrUpdate(relation);
+                repository.Save(relation);
                 uow.Complete();
                 saveEventArgs.CanCancel = false;
                 uow.Events.Dispatch(SavedRelation, this, saveEventArgs);
@@ -594,7 +594,7 @@ namespace Umbraco.Core.Services
                 }
 
                 var repository = uow.CreateRepository<IRelationTypeRepository>();
-                repository.AddOrUpdate(relationType);
+                repository.Save(relationType);
                 uow.Complete();
                 saveEventArgs.CanCancel = false;
                 uow.Events.Dispatch(SavedRelationType, this, saveEventArgs);
@@ -658,7 +658,7 @@ namespace Umbraco.Core.Services
             {
                 var repository = uow.CreateRepository<IRelationRepository>();
                 var query = Query<IRelation>().Where(x => x.RelationTypeId == relationType.Id);
-                relations.AddRange(repository.GetByQuery(query).ToList());
+                relations.AddRange(repository.Get(query).ToList());
 
                 foreach (var relation in relations)
                     repository.Delete(relation);
@@ -681,7 +681,7 @@ namespace Umbraco.Core.Services
                 {
                     var id = relationTypeId;
                     var query = Query<IRelation>().Where(x => x.RelationTypeId == id);
-                    relations.AddRange(repository.GetByQuery(query));
+                    relations.AddRange(repository.Get(query));
                 }
             }
             return relations;
diff --git a/src/Umbraco.Core/Services/ServerRegistrationService.cs b/src/Umbraco.Core/Services/ServerRegistrationService.cs
index aa29f18f8f..7cfa855c1c 100644
--- a/src/Umbraco.Core/Services/ServerRegistrationService.cs
+++ b/src/Umbraco.Core/Services/ServerRegistrationService.cs
@@ -6,6 +6,7 @@ using Umbraco.Core.Events;
 using Umbraco.Core.Logging;
 using Umbraco.Core.Models;
 using Umbraco.Core.Persistence.Repositories;
+using Umbraco.Core.Persistence.Repositories.Implement;
 using Umbraco.Core.Persistence.UnitOfWork;
 using Umbraco.Core.Sync;
 
@@ -46,7 +47,7 @@ namespace Umbraco.Core.Services
 
                 ((ServerRegistrationRepository) repo).ClearCache(); // ensure we have up-to-date cache
 
-                var regs = repo.GetAll().ToArray();
+                var regs = repo.GetMany().ToArray();
                 var hasMaster = regs.Any(x => ((ServerRegistration)x).IsMaster);
                 var server = regs.FirstOrDefault(x => x.ServerIdentity.InvariantEquals(serverIdentity));
 
@@ -64,12 +65,12 @@ namespace Umbraco.Core.Services
                 if (hasMaster == false)
                     server.IsMaster = true;
 
-                repo.AddOrUpdate(server);
+                repo.Save(server);
                 uow.Flush(); // triggers a cache reload
                 repo.DeactiveStaleServers(staleTimeout); // triggers a cache reload
 
                 // reload - cheap, cached
-                regs = repo.GetAll().ToArray();
+                regs = repo.GetMany().ToArray();
 
                 // default role is single server, but if registrations contain more
                 // than one active server, then role is master or slave
@@ -96,10 +97,10 @@ namespace Umbraco.Core.Services
 
                 ((ServerRegistrationRepository) repo).ClearCache(); // ensure we have up-to-date cache
 
-                var server = repo.GetAll().FirstOrDefault(x => x.ServerIdentity.InvariantEquals(serverIdentity));
+                var server = repo.GetMany().FirstOrDefault(x => x.ServerIdentity.InvariantEquals(serverIdentity));
                 if (server == null) return;
                 server.IsActive = server.IsMaster = false;
-                repo.AddOrUpdate(server); // will trigger a cache reload
+                repo.Save(server); // will trigger a cache reload
 
                 uow.Complete();
             }
@@ -136,7 +137,7 @@ namespace Umbraco.Core.Services
                 uow.ReadLock(Constants.Locks.Servers);
                 var repo = uow.CreateRepository<IServerRegistrationRepository>();
                 if (refresh) ((ServerRegistrationRepository) repo).ClearCache();
-                return repo.GetAll().Where(x => x.IsActive).ToArray(); // fast, cached
+                return repo.GetMany().Where(x => x.IsActive).ToArray(); // fast, cached
             }
         }
 
diff --git a/src/Umbraco.Core/Services/TaskService.cs b/src/Umbraco.Core/Services/TaskService.cs
index c3d93acf38..bf665b8a85 100644
--- a/src/Umbraco.Core/Services/TaskService.cs
+++ b/src/Umbraco.Core/Services/TaskService.cs
@@ -20,7 +20,7 @@ namespace Umbraco.Core.Services
             using (var uow = UowProvider.CreateUnitOfWork(readOnly: true))
             {
                 var repo = uow.CreateRepository<ITaskTypeRepository>();
-                return repo.GetByQuery(Query<TaskType>().Where(x => x.Alias == taskTypeAlias)).FirstOrDefault();
+                return repo.Get(Query<TaskType>().Where(x => x.Alias == taskTypeAlias)).FirstOrDefault();
             }
         }
 
@@ -38,7 +38,7 @@ namespace Umbraco.Core.Services
             using (var uow = UowProvider.CreateUnitOfWork())
             {
                 var repo = uow.CreateRepository<ITaskTypeRepository>();
-                repo.AddOrUpdate(taskType);
+                repo.Save(taskType);
                 uow.Complete();
             }
         }
@@ -58,7 +58,7 @@ namespace Umbraco.Core.Services
             using (var uow = UowProvider.CreateUnitOfWork(readOnly: true))
             {
                 var repo = uow.CreateRepository<ITaskTypeRepository>();
-                return repo.GetAll();
+                return repo.GetMany();
             }
         }
 
@@ -81,7 +81,7 @@ namespace Umbraco.Core.Services
             using (var uow = UowProvider.CreateUnitOfWork())
             {
                 var repo = uow.CreateRepository<ITaskRepository>();
-                repo.AddOrUpdate(task);
+                repo.Save(task);
                 uow.Complete();
             }
         }
diff --git a/src/Umbraco.Core/Services/UserService.cs b/src/Umbraco.Core/Services/UserService.cs
index 1a76be9e9a..a74c179ddd 100644
--- a/src/Umbraco.Core/Services/UserService.cs
+++ b/src/Umbraco.Core/Services/UserService.cs
@@ -15,6 +15,7 @@ using Umbraco.Core.Models.Membership;
 using Umbraco.Core.Persistence.DatabaseModelDefinitions;
 using Umbraco.Core.Persistence.Querying;
 using Umbraco.Core.Persistence.Repositories;
+using Umbraco.Core.Persistence.Repositories.Implement;
 using Umbraco.Core.Persistence.UnitOfWork;
 using Umbraco.Core.Security;
 
@@ -131,7 +132,7 @@ namespace Umbraco.Core.Services
                     return user;
                 }
 
-                repository.AddOrUpdate(user);
+                repository.Save(user);
 
                 saveEventArgs.CanCancel = false;
                 uow.Events.Dispatch(SavedUser, this, saveEventArgs);
@@ -177,7 +178,7 @@ namespace Umbraco.Core.Services
             {
                 var repository = uow.CreateRepository<IUserRepository>();
                 var query = Query<IUser>().Where(x => x.Email.Equals(email));
-                return repository.GetByQuery(query).FirstOrDefault();
+                return repository.Get(query).FirstOrDefault();
             }
         }
 
@@ -318,13 +319,13 @@ namespace Umbraco.Core.Services
                     var groupRepository = uow.CreateRepository<IUserGroupRepository>();
                     foreach (var userGroup in explicitUser.GroupsToSave)
                     {
-                        groupRepository.AddOrUpdate(userGroup);
+                        groupRepository.Save(userGroup);
                     }
                 }
 
                 try
                 {
-                    repository.AddOrUpdate(entity);
+                    repository.Save(entity);
                     if (raiseEvents)
                     {
                         saveEventArgs.CanCancel = false;
@@ -382,7 +383,7 @@ namespace Umbraco.Core.Services
                     if (string.IsNullOrWhiteSpace(user.Name))
                         throw new ArgumentException("Empty name.", nameof(entities));
 
-                    repository.AddOrUpdate(user);
+                    repository.Save(user);
 
                     //Now we have to check for backwards compat hacks
                     var explicitUser = user as User;
@@ -390,7 +391,7 @@ namespace Umbraco.Core.Services
                     {
                         foreach (var userGroup in explicitUser.GroupsToSave)
                         {
-                            groupRepository.AddOrUpdate(userGroup);
+                            groupRepository.Save(userGroup);
                         }
                     }
                 }
@@ -740,7 +741,7 @@ namespace Umbraco.Core.Services
             using (var uow = UowProvider.CreateUnitOfWork(readOnly: true))
             {
                 var repository = uow.CreateRepository<IUserRepository>();
-                return repository.GetAll(ids);
+                return repository.GetMany(ids);
             }
         }
 
@@ -809,7 +810,7 @@ namespace Umbraco.Core.Services
             using (var uow = UowProvider.CreateUnitOfWork(readOnly: true))
             {
                 var repository = uow.CreateRepository<IUserGroupRepository>();
-                return repository.GetAll(ids).OrderBy(x => x.Name);
+                return repository.GetMany(ids).OrderBy(x => x.Name);
             }
         }
 
@@ -821,7 +822,7 @@ namespace Umbraco.Core.Services
             {
                 var repository = uow.CreateRepository<IUserGroupRepository>();
                 var query = Query<IUserGroup>().Where(x => aliases.SqlIn(x.Alias));
-                var contents = repository.GetByQuery(query);
+                var contents = repository.Get(query);
                 return contents.WhereNotNull().ToArray();
             }
         }
@@ -839,7 +840,7 @@ namespace Umbraco.Core.Services
             {
                 var repository = uow.CreateRepository<IUserGroupRepository>();
                 var query = Query<IUserGroup>().Where(x => x.Alias == alias);
-                var contents = repository.GetByQuery(query);
+                var contents = repository.Get(query);
                 return contents.FirstOrDefault();
             }
         }
@@ -932,7 +933,7 @@ namespace Umbraco.Core.Services
                 {
                     //now remove the section for each user and commit
                     group.RemoveAllowedSection(sectionAlias);
-                    repository.AddOrUpdate(group);
+                    repository.Save(group);
                 }
 
                 uow.Complete();
diff --git a/src/Umbraco.Core/Umbraco.Core.csproj b/src/Umbraco.Core/Umbraco.Core.csproj
index 18f8879f3d..82920961cb 100644
--- a/src/Umbraco.Core/Umbraco.Core.csproj
+++ b/src/Umbraco.Core/Umbraco.Core.csproj
@@ -839,6 +839,7 @@
     <Compile Include="Persistence\FaultHandling\Strategies\NetworkConnectivityErrorDetectionStrategy.cs" />
     <Compile Include="Persistence\FaultHandling\Strategies\SqlAzureTransientErrorDetectionStrategy.cs" />
     <Compile Include="Persistence\FaultHandling\ThrottlingCondition.cs" />
+    <Compile Include="Persistence\IReadWriteQueryRepository.cs" />
     <Compile Include="Persistence\ISqlContext.cs" />
     <Compile Include="Persistence\IUmbracoDatabase.cs" />
     <Compile Include="Persistence\IUmbracoDatabaseFactory.cs" />
@@ -1053,100 +1054,100 @@
     <Compile Include="Persistence\Querying\TextColumnType.cs" />
     <Compile Include="Persistence\Querying\ValuePropertyMatchType.cs" />
     <Compile Include="Persistence\RecordPersistenceType.cs" />
-    <Compile Include="Persistence\Repositories\AuditRepository.cs" />
-    <Compile Include="Persistence\Repositories\ContentBlueprintRepository.cs" />
-    <Compile Include="Persistence\Repositories\ContentRepository.cs" />
-    <Compile Include="Persistence\Repositories\ContentTypeRepository.cs" />
-    <Compile Include="Persistence\Repositories\ContentTypeRepositoryBase.cs" />
-    <Compile Include="Persistence\Repositories\DataTypeContainerRepository.cs" />
-    <Compile Include="Persistence\Repositories\DataTypeDefinitionRepository.cs" />
-    <Compile Include="Persistence\Repositories\DictionaryRepository.cs" />
-    <Compile Include="Persistence\Repositories\DocumentTypeContainerRepository.cs" />
-    <Compile Include="Persistence\Repositories\DomainRepository.cs" />
-    <Compile Include="Persistence\Repositories\EntityContainerRepository.cs" />
-    <Compile Include="Persistence\Repositories\EntityRepository.cs" />
-    <Compile Include="Persistence\Repositories\ExternalLoginRepository.cs" />
-    <Compile Include="Persistence\Repositories\FileRepository.cs" />
-    <Compile Include="Persistence\Repositories\Interfaces\IAuditRepository.cs" />
-    <Compile Include="Persistence\Repositories\Interfaces\IContentBlueprintRepository.cs" />
-    <Compile Include="Persistence\Repositories\Interfaces\IContentRepository.cs" />
-    <Compile Include="Persistence\Repositories\Interfaces\IContentTypeRepository.cs" />
-    <Compile Include="Persistence\Repositories\Interfaces\IContentTypeRepositoryBase.cs" />
-    <Compile Include="Persistence\Repositories\Interfaces\IDataTypeContainerRepository.cs" />
-    <Compile Include="Persistence\Repositories\Interfaces\IDataTypeDefinitionRepository.cs" />
-    <Compile Include="Persistence\Repositories\Interfaces\IDictionaryRepository.cs" />
-    <Compile Include="Persistence\Repositories\Interfaces\IDocumentTypeContainerRepository.cs" />
-    <Compile Include="Persistence\Repositories\Interfaces\IDomainRepository.cs" />
-    <Compile Include="Persistence\Repositories\Interfaces\IEntityContainerRepository.cs" />
-    <Compile Include="Persistence\Repositories\Interfaces\IEntityRepository.cs" />
-    <Compile Include="Persistence\Repositories\Interfaces\IExternalLoginRepository.cs" />
-    <Compile Include="Persistence\Repositories\Interfaces\ILanguageRepository.cs" />
-    <Compile Include="Persistence\Repositories\Interfaces\IMacroRepository.cs" />
-    <Compile Include="Persistence\Repositories\Interfaces\IMediaRepository.cs" />
-    <Compile Include="Persistence\Repositories\Interfaces\IMediaTypeContainerRepository.cs" />
-    <Compile Include="Persistence\Repositories\Interfaces\IMediaTypeRepository.cs" />
-    <Compile Include="Persistence\Repositories\Interfaces\IMemberGroupRepository.cs" />
-    <Compile Include="Persistence\Repositories\Interfaces\IMemberRepository.cs" />
-    <Compile Include="Persistence\Repositories\Interfaces\IMemberTypeRepository.cs" />
-    <Compile Include="Persistence\Repositories\Interfaces\IMigrationEntryRepository.cs" />
-    <Compile Include="Persistence\Repositories\Interfaces\INotificationsRepository.cs" />
-    <Compile Include="Persistence\Repositories\Interfaces\IPartialViewMacroRepository.cs" />
-    <Compile Include="Persistence\Repositories\Interfaces\IPartialViewRepository.cs" />
-    <Compile Include="Persistence\Repositories\Interfaces\IPublicAccessRepository.cs" />
-    <Compile Include="Persistence\Repositories\Interfaces\IQueryRepository.cs" />
-    <Compile Include="Persistence\Repositories\Interfaces\IRecycleBinRepository.cs" />
-    <Compile Include="Persistence\Repositories\Interfaces\IRedirectUrlRepository.cs" />
-    <Compile Include="Persistence\Repositories\Interfaces\IRelationRepository.cs" />
-    <Compile Include="Persistence\Repositories\Interfaces\IRelationTypeRepository.cs" />
-    <Compile Include="Persistence\Repositories\Interfaces\IRepository.cs" />
-    <Compile Include="Persistence\Repositories\Interfaces\IRepositoryVersionable.cs" />
-    <Compile Include="Persistence\Repositories\Interfaces\IScriptRepository.cs" />
-    <Compile Include="Persistence\Repositories\Interfaces\IServerRegistrationRepository.cs" />
-    <Compile Include="Persistence\Repositories\Interfaces\IStylesheetRepository.cs" />
-    <Compile Include="Persistence\Repositories\Interfaces\ITagRepository.cs" />
-    <Compile Include="Persistence\Repositories\Interfaces\ITaskRepository.cs" />
-    <Compile Include="Persistence\Repositories\Interfaces\ITaskTypeRepository.cs" />
-    <Compile Include="Persistence\Repositories\Interfaces\ITemplateRepository.cs" />
-    <Compile Include="Persistence\Repositories\Interfaces\IUserGroupRepository.cs" />
-    <Compile Include="Persistence\Repositories\Interfaces\IUserRepository.cs" />
-    <Compile Include="Persistence\Repositories\Interfaces\IXsltFileRepository.cs" />
-    <Compile Include="Persistence\Repositories\LanguageRepository.cs" />
-    <Compile Include="Persistence\Repositories\MacroRepository.cs" />
-    <Compile Include="Persistence\Repositories\MediaRepository.cs" />
-    <Compile Include="Persistence\Repositories\MediaTypeContainerRepository.cs" />
-    <Compile Include="Persistence\Repositories\MediaTypeRepository.cs" />
-    <Compile Include="Persistence\Repositories\MemberGroupRepository.cs" />
-    <Compile Include="Persistence\Repositories\MemberRepository.cs" />
-    <Compile Include="Persistence\Repositories\MemberTypeRepository.cs" />
-    <Compile Include="Persistence\Repositories\MigrationEntryRepository.cs" />
-    <Compile Include="Persistence\Repositories\NotificationsRepository.cs" />
-    <Compile Include="Persistence\Repositories\NPocoRepositoryBase.cs" />
-    <Compile Include="Persistence\Repositories\PartialViewMacroRepository.cs" />
-    <Compile Include="Persistence\Repositories\PartialViewRepository.cs" />
-    <Compile Include="Persistence\Repositories\PermissionRepository.cs" />
-    <Compile Include="Persistence\Repositories\PublicAccessRepository.cs" />
-    <Compile Include="Persistence\Repositories\QueryType.cs" />
-    <Compile Include="Persistence\Repositories\RecycleBinRepository.cs" />
-    <Compile Include="Persistence\Repositories\RedirectUrlRepository.cs" />
-    <Compile Include="Persistence\Repositories\RelationRepository.cs" />
-    <Compile Include="Persistence\Repositories\RelationTypeRepository.cs" />
-    <Compile Include="Persistence\Repositories\RepositoryBase.cs" />
-    <Compile Include="Persistence\Repositories\RepositoryBaseOfTIdTEntity.cs" />
-    <Compile Include="Persistence\Repositories\ScriptRepository.cs" />
-    <Compile Include="Persistence\Repositories\ServerRegistrationRepository.cs" />
-    <Compile Include="Persistence\Repositories\SimilarNodeName.cs" />
-    <Compile Include="Persistence\Repositories\SimpleGetRepository.cs" />
-    <Compile Include="Persistence\Repositories\StylesheetRepository.cs" />
-    <Compile Include="Persistence\Repositories\TagRepository.cs" />
-    <Compile Include="Persistence\Repositories\TaskRepository.cs" />
-    <Compile Include="Persistence\Repositories\TaskTypeRepository.cs" />
-    <Compile Include="Persistence\Repositories\TemplateRepository.cs" />
-    <Compile Include="Persistence\Repositories\TupleExtensions.cs" />
-    <Compile Include="Persistence\Repositories\UserGroupRepository.cs" />
-    <Compile Include="Persistence\Repositories\UserRepository.cs" />
-    <Compile Include="Persistence\Repositories\VersionableRepositoryBase.cs" />
-    <Compile Include="Persistence\Repositories\VersionableRepositoryBaseAliasRegex.cs" />
-    <Compile Include="Persistence\Repositories\XsltFileRepository.cs" />
+    <Compile Include="Persistence\Repositories\Implement\AuditRepository.cs" />
+    <Compile Include="Persistence\Repositories\Implement\DocumentBlueprintRepository.cs" />
+    <Compile Include="Persistence\Repositories\Implement\DocumentRepository.cs" />
+    <Compile Include="Persistence\Repositories\Implement\ContentTypeRepository.cs" />
+    <Compile Include="Persistence\Repositories\Implement\ContentTypeRepositoryBase.cs" />
+    <Compile Include="Persistence\Repositories\Implement\DataTypeContainerRepository.cs" />
+    <Compile Include="Persistence\Repositories\Implement\DataTypeDefinitionRepository.cs" />
+    <Compile Include="Persistence\Repositories\Implement\DictionaryRepository.cs" />
+    <Compile Include="Persistence\Repositories\Implement\DocumentTypeContainerRepository.cs" />
+    <Compile Include="Persistence\Repositories\Implement\DomainRepository.cs" />
+    <Compile Include="Persistence\Repositories\Implement\EntityContainerRepository.cs" />
+    <Compile Include="Persistence\Repositories\Implement\EntityRepository.cs" />
+    <Compile Include="Persistence\Repositories\Implement\ExternalLoginRepository.cs" />
+    <Compile Include="Persistence\Repositories\Implement\FileRepository.cs" />
+    <Compile Include="Persistence\Repositories\IAuditRepository.cs" />
+    <Compile Include="Persistence\Repositories\IDocumentBlueprintRepository.cs" />
+    <Compile Include="Persistence\Repositories\IDocumentRepository.cs" />
+    <Compile Include="Persistence\Repositories\IContentTypeRepository.cs" />
+    <Compile Include="Persistence\Repositories\IContentTypeRepositoryBase.cs" />
+    <Compile Include="Persistence\Repositories\IDataTypeContainerRepository.cs" />
+    <Compile Include="Persistence\Repositories\IDataTypeDefinitionRepository.cs" />
+    <Compile Include="Persistence\Repositories\IDictionaryRepository.cs" />
+    <Compile Include="Persistence\Repositories\IDocumentTypeContainerRepository.cs" />
+    <Compile Include="Persistence\Repositories\IDomainRepository.cs" />
+    <Compile Include="Persistence\Repositories\IEntityContainerRepository.cs" />
+    <Compile Include="Persistence\Repositories\IEntityRepository.cs" />
+    <Compile Include="Persistence\Repositories\IExternalLoginRepository.cs" />
+    <Compile Include="Persistence\Repositories\ILanguageRepository.cs" />
+    <Compile Include="Persistence\Repositories\IMacroRepository.cs" />
+    <Compile Include="Persistence\Repositories\IMediaRepository.cs" />
+    <Compile Include="Persistence\Repositories\IMediaTypeContainerRepository.cs" />
+    <Compile Include="Persistence\Repositories\IMediaTypeRepository.cs" />
+    <Compile Include="Persistence\Repositories\IMemberGroupRepository.cs" />
+    <Compile Include="Persistence\Repositories\IMemberRepository.cs" />
+    <Compile Include="Persistence\Repositories\IMemberTypeRepository.cs" />
+    <Compile Include="Persistence\Repositories\IMigrationEntryRepository.cs" />
+    <Compile Include="Persistence\Repositories\INotificationsRepository.cs" />
+    <Compile Include="Persistence\Repositories\IPartialViewMacroRepository.cs" />
+    <Compile Include="Persistence\Repositories\IPartialViewRepository.cs" />
+    <Compile Include="Persistence\Repositories\IPublicAccessRepository.cs" />
+    <Compile Include="Persistence\IQueryRepository.cs" />
+    <Compile Include="Persistence\IReadRepository.cs" />
+    <Compile Include="Persistence\Repositories\IRedirectUrlRepository.cs" />
+    <Compile Include="Persistence\Repositories\IRelationRepository.cs" />
+    <Compile Include="Persistence\Repositories\IRelationTypeRepository.cs" />
+    <Compile Include="Persistence\IRepository.cs" />
+    <Compile Include="Persistence\Repositories\IContentRepository.cs" />
+    <Compile Include="Persistence\Repositories\IScriptRepository.cs" />
+    <Compile Include="Persistence\Repositories\IServerRegistrationRepository.cs" />
+    <Compile Include="Persistence\Repositories\IStylesheetRepository.cs" />
+    <Compile Include="Persistence\Repositories\ITagRepository.cs" />
+    <Compile Include="Persistence\Repositories\ITaskRepository.cs" />
+    <Compile Include="Persistence\Repositories\ITaskTypeRepository.cs" />
+    <Compile Include="Persistence\Repositories\ITemplateRepository.cs" />
+    <Compile Include="Persistence\Repositories\IUserGroupRepository.cs" />
+    <Compile Include="Persistence\Repositories\IUserRepository.cs" />
+    <Compile Include="Persistence\IWriteRepository.cs" />
+    <Compile Include="Persistence\Repositories\IXsltFileRepository.cs" />
+    <Compile Include="Persistence\Repositories\Implement\LanguageRepository.cs" />
+    <Compile Include="Persistence\Repositories\Implement\MacroRepository.cs" />
+    <Compile Include="Persistence\Repositories\Implement\MediaRepository.cs" />
+    <Compile Include="Persistence\Repositories\Implement\MediaTypeContainerRepository.cs" />
+    <Compile Include="Persistence\Repositories\Implement\MediaTypeRepository.cs" />
+    <Compile Include="Persistence\Repositories\Implement\MemberGroupRepository.cs" />
+    <Compile Include="Persistence\Repositories\Implement\MemberRepository.cs" />
+    <Compile Include="Persistence\Repositories\Implement\MemberTypeRepository.cs" />
+    <Compile Include="Persistence\Repositories\Implement\MigrationEntryRepository.cs" />
+    <Compile Include="Persistence\Repositories\Implement\NotificationsRepository.cs" />
+    <Compile Include="Persistence\Repositories\Implement\NPocoRepositoryBase.cs" />
+    <Compile Include="Persistence\Repositories\Implement\PartialViewMacroRepository.cs" />
+    <Compile Include="Persistence\Repositories\Implement\PartialViewRepository.cs" />
+    <Compile Include="Persistence\Repositories\Implement\PermissionRepository.cs" />
+    <Compile Include="Persistence\Repositories\Implement\PublicAccessRepository.cs" />
+    <Compile Include="Persistence\Repositories\Implement\QueryType.cs" />
+    <Compile Include="Persistence\Repositories\Implement\RedirectUrlRepository.cs" />
+    <Compile Include="Persistence\Repositories\Implement\RelationRepository.cs" />
+    <Compile Include="Persistence\Repositories\Implement\RelationTypeRepository.cs" />
+    <Compile Include="Persistence\Repositories\Implement\RepositoryCacheKeys.cs" />
+    <Compile Include="Persistence\Repositories\Implement\RepositoryBaseOfTIdTEntity.cs" />
+    <Compile Include="Persistence\Repositories\Implement\ScriptRepository.cs" />
+    <Compile Include="Persistence\Repositories\Implement\ServerRegistrationRepository.cs" />
+    <Compile Include="Persistence\Repositories\Implement\SimilarNodeName.cs" />
+    <Compile Include="Persistence\Repositories\Implement\SimpleGetRepository.cs" />
+    <Compile Include="Persistence\Repositories\Implement\StylesheetRepository.cs" />
+    <Compile Include="Persistence\Repositories\Implement\TagRepository.cs" />
+    <Compile Include="Persistence\Repositories\Implement\TaskRepository.cs" />
+    <Compile Include="Persistence\Repositories\Implement\TaskTypeRepository.cs" />
+    <Compile Include="Persistence\Repositories\Implement\TemplateRepository.cs" />
+    <Compile Include="Persistence\Repositories\Implement\TupleExtensions.cs" />
+    <Compile Include="Persistence\Repositories\Implement\UserGroupRepository.cs" />
+    <Compile Include="Persistence\Repositories\Implement\UserRepository.cs" />
+    <Compile Include="Persistence\Repositories\Implement\ContentRepositoryBase.cs" />
+    <Compile Include="Persistence\Repositories\Implement\VersionableRepositoryBaseAliasRegex.cs" />
+    <Compile Include="Persistence\Repositories\Implement\XsltFileRepository.cs" />
     <Compile Include="Persistence\RepositoryFactory.cs" />
     <Compile Include="Persistence\SqlContext.cs" />
     <Compile Include="Persistence\SqlSyntax\ColumnInfo.cs" />
@@ -1483,5 +1484,8 @@
   <ItemGroup>
     <EmbeddedResource Include="FileResources\Files.resx" />
   </ItemGroup>
+  <ItemGroup>
+    <Folder Include="Services\Implement\" />
+  </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
 </Project>
\ No newline at end of file
diff --git a/src/Umbraco.Tests/Integration/ContentEventsTests.cs b/src/Umbraco.Tests/Integration/ContentEventsTests.cs
index e2a11a56e3..d401b70e5e 100644
--- a/src/Umbraco.Tests/Integration/ContentEventsTests.cs
+++ b/src/Umbraco.Tests/Integration/ContentEventsTests.cs
@@ -9,6 +9,7 @@ using Umbraco.Core.Composing;
 using Umbraco.Core.Logging;
 using Umbraco.Core.Models;
 using Umbraco.Core.Persistence.Repositories;
+using Umbraco.Core.Persistence.Repositories.Implement;
 using Umbraco.Core.Sync;
 using Umbraco.Tests.Cache.DistributedCache;
 using Umbraco.Tests.Services;
@@ -36,9 +37,9 @@ namespace Umbraco.Tests.Integration
 
             _events = new List<EventInstance>();
 
-            ContentRepository.UowRefreshedEntity += ContentRepositoryRefreshed;
-            ContentRepository.UowRemovingEntity += ContentRepositoryRemoved;
-            ContentRepository.UowRemovingVersion += ContentRepositoryRemovedVersion;
+            DocumentRepository.UowRefreshedEntity += ContentRepositoryRefreshed;
+            DocumentRepository.UowRemovingEntity += ContentRepositoryRemoved;
+            DocumentRepository.UowRemovingVersion += ContentRepositoryRemovedVersion;
             ContentCacheRefresher.CacheUpdated += ContentCacheUpdated;
 
             // ensure there's a current context
@@ -77,9 +78,9 @@ namespace Umbraco.Tests.Integration
 
             // clear ALL events
 
-            ContentRepository.UowRefreshedEntity -= ContentRepositoryRefreshed;
-            ContentRepository.UowRemovingEntity -= ContentRepositoryRemoved;
-            ContentRepository.UowRemovingVersion -= ContentRepositoryRemovedVersion;
+            DocumentRepository.UowRefreshedEntity -= ContentRepositoryRefreshed;
+            DocumentRepository.UowRemovingEntity -= ContentRepositoryRemoved;
+            DocumentRepository.UowRemovingVersion -= ContentRepositoryRemovedVersion;
             ContentCacheRefresher.CacheUpdated -= ContentCacheUpdated;
         }
 
@@ -197,7 +198,7 @@ namespace Umbraco.Tests.Integration
             return PropertiesImpactingAllVersions.Any(content.IsPropertyDirty);
         }
 
-        private void ContentRepositoryRefreshed(ContentRepository sender, ContentRepository.UnitOfWorkEntityEventArgs args)
+        private void ContentRepositoryRefreshed(DocumentRepository sender, DocumentRepository.UnitOfWorkEntityEventArgs args)
         {
             // reports the event as : "ContentRepository/Refresh/XY-Z"
             // where
@@ -323,7 +324,7 @@ namespace Umbraco.Tests.Integration
             _events.Add(e);
         }
 
-        private void ContentRepositoryRemoved(ContentRepository sender, ContentRepository.UnitOfWorkEntityEventArgs args)
+        private void ContentRepositoryRemoved(DocumentRepository sender, DocumentRepository.UnitOfWorkEntityEventArgs args)
         {
             // reports the event as : "ContentRepository/Remove/X"
             // where
@@ -343,7 +344,7 @@ namespace Umbraco.Tests.Integration
             _events.Add(e);
         }
 
-        private void ContentRepositoryRemovedVersion(ContentRepository sender, ContentRepository.UnitOfWorkVersionEventArgs args)
+        private void ContentRepositoryRemovedVersion(DocumentRepository sender, DocumentRepository.UnitOfWorkVersionEventArgs args)
         {
             // reports the event as : "ContentRepository/Remove/X:Y"
             // where
diff --git a/src/Umbraco.Tests/Persistence/Querying/ContentTypeSqlMappingTests.cs b/src/Umbraco.Tests/Persistence/Querying/ContentTypeSqlMappingTests.cs
index 5db81cd67f..bb47ba3060 100644
--- a/src/Umbraco.Tests/Persistence/Querying/ContentTypeSqlMappingTests.cs
+++ b/src/Umbraco.Tests/Persistence/Querying/ContentTypeSqlMappingTests.cs
@@ -7,6 +7,7 @@ using Umbraco.Core;
 using Umbraco.Core.Models;
 using Umbraco.Core.Models.Rdbms;
 using Umbraco.Core.Persistence.Repositories;
+using Umbraco.Core.Persistence.Repositories.Implement;
 using Umbraco.Tests.TestHelpers;
 using Umbraco.Tests.Testing;
 
diff --git a/src/Umbraco.Tests/Persistence/Repositories/AuditRepositoryTest.cs b/src/Umbraco.Tests/Persistence/Repositories/AuditRepositoryTest.cs
index 7c6f3c7b63..76c4630fbf 100644
--- a/src/Umbraco.Tests/Persistence/Repositories/AuditRepositoryTest.cs
+++ b/src/Umbraco.Tests/Persistence/Repositories/AuditRepositoryTest.cs
@@ -3,6 +3,7 @@ using NUnit.Framework;
 using Umbraco.Core.Models;
 using Umbraco.Core.Models.Rdbms;
 using Umbraco.Core.Persistence.Repositories;
+using Umbraco.Core.Persistence.Repositories.Implement;
 using Umbraco.Tests.TestHelpers;
 using Umbraco.Tests.Testing;
 
@@ -19,7 +20,7 @@ namespace Umbraco.Tests.Persistence.Repositories
             using (var unitOfWork = provider.CreateUnitOfWork())
             {
                 var repo = new AuditRepository(unitOfWork, CacheHelper, Logger);
-                repo.AddOrUpdate(new AuditItem(-1, "This is a System audit trail", AuditType.System, 0));
+                repo.Save(new AuditItem(-1, "This is a System audit trail", AuditType.System, 0));
                 unitOfWork.Complete();
 
                 var dtos = unitOfWork.Database.Fetch<LogDto>("WHERE id > -1");
diff --git a/src/Umbraco.Tests/Persistence/Repositories/ContentRepositoryTest.cs b/src/Umbraco.Tests/Persistence/Repositories/ContentRepositoryTest.cs
index c1f3287a3e..28aa89306c 100644
--- a/src/Umbraco.Tests/Persistence/Repositories/ContentRepositoryTest.cs
+++ b/src/Umbraco.Tests/Persistence/Repositories/ContentRepositoryTest.cs
@@ -18,6 +18,7 @@ using Umbraco.Core.Persistence.UnitOfWork;
 using Umbraco.Tests.TestHelpers;
 using Umbraco.Tests.TestHelpers.Entities;
 using Umbraco.Core.Persistence.DatabaseModelDefinitions;
+using Umbraco.Core.Persistence.Repositories.Implement;
 using Umbraco.Core.Persistence.SqlSyntax;
 using Umbraco.Core.Scoping;
 using Umbraco.Tests.Testing;
@@ -34,17 +35,17 @@ namespace Umbraco.Tests.Persistence.Repositories
 
             CreateTestData();
 
-            VersionableRepositoryBase.ThrowOnWarning = true;
+            ContentRepositoryBase.ThrowOnWarning = true;
         }
 
         public override void TearDown()
         {
-            VersionableRepositoryBase.ThrowOnWarning = false;
+            ContentRepositoryBase.ThrowOnWarning = false;
 
             base.TearDown();
         }
 
-        private ContentRepository CreateRepository(IScopeUnitOfWork unitOfWork, out ContentTypeRepository contentTypeRepository, out DataTypeDefinitionRepository dtdRepository, CacheHelper cacheHelper = null)
+        private DocumentRepository CreateRepository(IScopeUnitOfWork unitOfWork, out ContentTypeRepository contentTypeRepository, out DataTypeDefinitionRepository dtdRepository, CacheHelper cacheHelper = null)
         {
             cacheHelper = cacheHelper ?? CacheHelper;
 
@@ -54,20 +55,20 @@ namespace Umbraco.Tests.Persistence.Repositories
             return ctRepository;
         }
 
-        private ContentRepository CreateRepository(IScopeUnitOfWork unitOfWork, out ContentTypeRepository contentTypeRepository, CacheHelper cacheHelper = null)
+        private DocumentRepository CreateRepository(IScopeUnitOfWork unitOfWork, out ContentTypeRepository contentTypeRepository, CacheHelper cacheHelper = null)
         {
             TemplateRepository tr;
             return CreateRepository(unitOfWork, out contentTypeRepository, out tr, cacheHelper);
         }
 
-        private ContentRepository CreateRepository(IScopeUnitOfWork unitOfWork, out ContentTypeRepository contentTypeRepository, out TemplateRepository templateRepository, CacheHelper cacheHelper = null)
+        private DocumentRepository CreateRepository(IScopeUnitOfWork unitOfWork, out ContentTypeRepository contentTypeRepository, out TemplateRepository templateRepository, CacheHelper cacheHelper = null)
         {
             cacheHelper = cacheHelper ?? CacheHelper;
 
             templateRepository = new TemplateRepository(unitOfWork, cacheHelper, Logger, Mock.Of<IFileSystem>(), Mock.Of<IFileSystem>(), Mock.Of<ITemplatesSection>());
             var tagRepository = new TagRepository(unitOfWork, cacheHelper, Logger);
             contentTypeRepository = new ContentTypeRepository(unitOfWork, cacheHelper, Logger, templateRepository);
-            var repository = new ContentRepository(unitOfWork, cacheHelper, Logger, contentTypeRepository, templateRepository, tagRepository, Mock.Of<IContentSection>());
+            var repository = new DocumentRepository(unitOfWork, cacheHelper, Logger, contentTypeRepository, templateRepository, tagRepository, Mock.Of<IContentSection>());
             return repository;
         }
 
@@ -91,9 +92,9 @@ namespace Umbraco.Tests.Persistence.Repositories
 
                 var contentType = MockedContentTypes.CreateSimpleContentType("umbTextpage1", "Textpage");
                 ServiceContext.FileService.SaveTemplate(contentType.DefaultTemplate); // else, FK violation on contentType!
-                contentTypeRepository.AddOrUpdate(contentType);
+                contentTypeRepository.Save(contentType);
                 var content = MockedContent.CreateSimpleContent(contentType);
-                repository.AddOrUpdate(content);
+                repository.Save(content);
                 unitOfWork.Complete();
 
                 udb.EnableSqlCount = true;
@@ -134,8 +135,8 @@ namespace Umbraco.Tests.Persistence.Repositories
                 IContent content1 = MockedContent.CreateSimpleContent(hasPropertiesContentType);
 
                 // save = create the initial version
-                contentTypeRepository.AddOrUpdate(hasPropertiesContentType);
-                repository.AddOrUpdate(content1);
+                contentTypeRepository.Save(hasPropertiesContentType);
+                repository.Save(content1);
                 unitOfWork.Flush();
                 versions.Add(content1.VersionId); // the first version
 
@@ -143,7 +144,7 @@ namespace Umbraco.Tests.Persistence.Repositories
                 content1.SetValue("title", "title");
                 ((Content) content1).PublishValues();
                 ((Content) content1).PublishedState = PublishedState.Publishing;
-                repository.AddOrUpdate(content1);
+                repository.Save(content1);
                 unitOfWork.Flush();
                 versions.Add(content1.VersionId); // NEW VERSION
 
@@ -160,7 +161,7 @@ namespace Umbraco.Tests.Persistence.Repositories
                 // save = update the current (draft) version
                 content1.Name = "name-1";
                 content1.SetValue("title", "title-1");
-                repository.AddOrUpdate(content1);
+                repository.Save(content1);
                 unitOfWork.Flush();
                 versions.Add(content1.VersionId); // the same version
 
@@ -174,7 +175,7 @@ namespace Umbraco.Tests.Persistence.Repositories
 
                 // unpublish = no impact on versions
                 ((Content) content1).PublishedState = PublishedState.Unpublishing;
-                repository.AddOrUpdate(content1);
+                repository.Save(content1);
                 unitOfWork.Flush();
                 versions.Add(content1.VersionId); // the same version
 
@@ -191,7 +192,7 @@ namespace Umbraco.Tests.Persistence.Repositories
                 // save = update the current (draft) version
                 content1.Name = "name-2";
                 content1.SetValue("title", "title-2");
-                repository.AddOrUpdate(content1);
+                repository.Save(content1);
                 unitOfWork.Flush();
                 versions.Add(content1.VersionId); // the same version
 
@@ -205,7 +206,7 @@ namespace Umbraco.Tests.Persistence.Repositories
                 // publish = version
                 ((Content) content1).PublishValues();
                 ((Content) content1).PublishedState = PublishedState.Publishing;
-                repository.AddOrUpdate(content1);
+                repository.Save(content1);
                 unitOfWork.Flush();
                 versions.Add(content1.VersionId); // NEW VERSION
 
@@ -225,7 +226,7 @@ namespace Umbraco.Tests.Persistence.Repositories
 
                 //Thread.Sleep(2000); // force date change
 
-                repository.AddOrUpdate(content1);
+                repository.Save(content1);
                 unitOfWork.Flush();
                 versions.Add(content1.VersionId); // the same version
 
@@ -241,7 +242,7 @@ namespace Umbraco.Tests.Persistence.Repositories
                 content1.SetValue("title", "title-4");
                 ((Content) content1).PublishValues();
                 ((Content) content1).PublishedState = PublishedState.Publishing;
-                repository.AddOrUpdate(content1);
+                repository.Save(content1);
                 unitOfWork.Flush();
                 versions.Add(content1.VersionId); // NEW VERSION
 
@@ -307,16 +308,16 @@ namespace Umbraco.Tests.Persistence.Repositories
                 var content2 = MockedContent.CreateBasicContent(emptyContentType);
                 var content3 = MockedContent.CreateSimpleContent(hasPropertiesContentType);
 
-                contentTypeRepository.AddOrUpdate(emptyContentType);
-                contentTypeRepository.AddOrUpdate(hasPropertiesContentType);
-                repository.AddOrUpdate(content1);
-                repository.AddOrUpdate(content2);
-                repository.AddOrUpdate(content3);
+                contentTypeRepository.Save(emptyContentType);
+                contentTypeRepository.Save(hasPropertiesContentType);
+                repository.Save(content1);
+                repository.Save(content2);
+                repository.Save(content3);
                 unitOfWork.Flush();
 
                 // this will cause the GetPropertyCollection to execute and we need to ensure that
                 // all of the properties and property types are all correct
-                var result = repository.GetAll(content1.Id, content2.Id, content3.Id).ToArray();
+                var result = repository.GetMany(content1.Id, content2.Id, content3.Id).ToArray();
                 var n1 = result[0];
                 var n2 = result[1];
                 var n3 = result[2];
@@ -351,7 +352,7 @@ namespace Umbraco.Tests.Persistence.Repositories
                 var repository = CreateRepository(unitOfWork, out var contentTypeRepository, out DataTypeDefinitionRepository dataTypeDefinitionRepository);
 
                 var dtd = new DataTypeDefinition(-1, Constants.PropertyEditors.DecimalAlias) { Name = "test", DatabaseType = DataTypeDatabaseType.Decimal };
-                dataTypeDefinitionRepository.AddOrUpdate(dtd);
+                dataTypeDefinitionRepository.Save(dtd);
                 unitOfWork.Complete();
 
                 const string decimalPropertyAlias = "decimalProperty";
@@ -367,13 +368,13 @@ namespace Umbraco.Tests.Persistence.Repositories
                         MockedPropertyTypes.CreateDateTimeProperty(dateTimePropertyAlias, "DateTime property")
                     });
                 var contentType = MockedContentTypes.CreateSimpleContentType("umbTextpage1", "Textpage", propertyTypeCollection);
-                contentTypeRepository.AddOrUpdate(contentType);
+                contentTypeRepository.Save(contentType);
                 unitOfWork.Complete();
 
                 // int and decimal values are passed in as strings as they would be from the backoffice UI
                 var textpage = MockedContent.CreateSimpleContentWithSpecialDatabaseTypes(contentType, "test@umbraco.org", -1, "100", "150", dateValue);
 
-                repository.AddOrUpdate(textpage);
+                repository.Save(textpage);
                 unitOfWork.Complete();
 
                 Assert.That(contentType.HasIdentity, Is.True);
@@ -401,8 +402,8 @@ namespace Umbraco.Tests.Persistence.Repositories
                 ServiceContext.FileService.SaveTemplate(contentType.DefaultTemplate); // else, FK violation on contentType!
                 IContent textpage = MockedContent.CreateSimpleContent(contentType);
 
-                contentTypeRepository.AddOrUpdate(contentType);
-                repository.AddOrUpdate(textpage);
+                contentTypeRepository.Save(contentType);
+                repository.Save(textpage);
                 unitOfWork.Complete();
 
                 Assert.That(contentType.HasIdentity, Is.True);
@@ -419,7 +420,7 @@ namespace Umbraco.Tests.Persistence.Repositories
                 var repository = CreateRepository(unitOfWork, out var contentTypeRepository, out TemplateRepository templateRepository);
 
                 var template = new Template("hello", "hello");
-                templateRepository.AddOrUpdate(template);
+                templateRepository.Save(template);
                 unitOfWork.Flush();
 
                 var contentType = MockedContentTypes.CreateSimpleContentType("umbTextpage2", "Textpage");
@@ -427,8 +428,8 @@ namespace Umbraco.Tests.Persistence.Repositories
                 contentType.SetDefaultTemplate(template);
                 var textpage = MockedContent.CreateSimpleContent(contentType);
 
-                contentTypeRepository.AddOrUpdate(contentType);
-                repository.AddOrUpdate(textpage);
+                contentTypeRepository.Save(contentType);
+                repository.Save(textpage);
                 unitOfWork.Flush();
 
                 var fetched = repository.Get(textpage.Id);
@@ -453,14 +454,14 @@ namespace Umbraco.Tests.Persistence.Repositories
                 var repository = CreateRepository(unitOfWork, out var contentTypeRepository);
                 var contentType = MockedContentTypes.CreateSimpleContentType("umbTextpage1", "Textpage");
                 ServiceContext.FileService.SaveTemplate(contentType.DefaultTemplate); // else, FK violation on contentType!
-                contentTypeRepository.AddOrUpdate(contentType);
+                contentTypeRepository.Save(contentType);
                 unitOfWork.Flush();
 
                 var textpage = MockedContent.CreateSimpleContent(contentType, "test@umbraco.org");
                 var anotherTextpage = MockedContent.CreateSimpleContent(contentType, "@lightgiants");
 
-                repository.AddOrUpdate(textpage);
-                repository.AddOrUpdate(anotherTextpage);
+                repository.Save(textpage);
+                repository.Save(anotherTextpage);
                 unitOfWork.Flush();
 
 
@@ -488,12 +489,12 @@ namespace Umbraco.Tests.Persistence.Repositories
                 ServiceContext.FileService.SaveTemplate(contentType.DefaultTemplate); // else, FK violation on contentType!
                 var textpage = MockedContent.CreateSimpleContent(contentType);
 
-                contentTypeRepository.AddOrUpdate(contentType);
-                repository.AddOrUpdate(textpage);
+                contentTypeRepository.Save(contentType);
+                repository.Save(textpage);
                 unitOfWork.Flush();
 
                 var subpage = MockedContent.CreateSimpleContent(contentType, "Text Page 1", textpage.Id);
-                repository.AddOrUpdate(subpage);
+                repository.Save(subpage);
                 unitOfWork.Flush();
 
                 Assert.That(contentType.HasIdentity, Is.True);
@@ -530,7 +531,7 @@ namespace Umbraco.Tests.Persistence.Repositories
 
                 var content = repository.Get(NodeDto.NodeIdSeed + 2);
                 content.Name = "About 2";
-                repository.AddOrUpdate(content);
+                repository.Save(content);
                 unitOfWork.Flush();
                 var updatedContent = repository.Get(NodeDto.NodeIdSeed + 2);
 
@@ -540,7 +541,7 @@ namespace Umbraco.Tests.Persistence.Repositories
 
                 Assert.AreEqual(content.GetValue("title"), "Welcome to our Home page");
                 content.SetValue("title", "toot");
-                repository.AddOrUpdate(content);
+                repository.Save(content);
                 unitOfWork.Flush();
                 updatedContent = repository.Get(NodeDto.NodeIdSeed + 2);
 
@@ -559,7 +560,7 @@ namespace Umbraco.Tests.Persistence.Repositories
 
                 var content = repository.Get(NodeDto.NodeIdSeed + 2);
                 content.Template = null;
-                repository.AddOrUpdate(content);
+                repository.Save(content);
                 unitOfWork.Flush();
                 var updatedContent = repository.Get(NodeDto.NodeIdSeed + 2);
 
@@ -580,7 +581,7 @@ namespace Umbraco.Tests.Persistence.Repositories
                 content.CreatorId = 0;
                 content.WriterId = 0;
 
-                repository.AddOrUpdate(content);
+                repository.Save(content);
                 unitOfWork.Flush();
                 var id = content.Id;
 
@@ -622,7 +623,7 @@ namespace Umbraco.Tests.Persistence.Repositories
                 var repository = CreateRepository(unitOfWork, out _);
 
                 var query = unitOfWork.SqlContext.Query<IContent>().Where(x => x.Level == 2);
-                var result = repository.GetByQuery(query);
+                var result = repository.Get(query);
 
                 Assert.GreaterOrEqual(2, result.Count());
             }
@@ -637,13 +638,13 @@ namespace Umbraco.Tests.Persistence.Repositories
             using (var unitOfWork = provider.CreateUnitOfWork())
             {
                 var repository = CreateRepository(unitOfWork, out _);
-                result = repository.GetAll().ToArray();
+                result = repository.GetMany().ToArray();
 
                 // save them all
                 foreach (var content in result)
                 {
                     content.SetValue("title", content.GetValue<string>("title") + "x");
-                    repository.AddOrUpdate(content);
+                    repository.Save(content);
                 }
                 unitOfWork.Flush();
 
@@ -651,7 +652,7 @@ namespace Umbraco.Tests.Persistence.Repositories
                 foreach (var content in result)
                 {
                     content.PublishValues();
-                    repository.AddOrUpdate(content);
+                    repository.Save(content);
                 }
                 unitOfWork.Flush();
 
@@ -662,7 +663,7 @@ namespace Umbraco.Tests.Persistence.Repositories
             using (var unitOfWork = provider.CreateUnitOfWork())
             {
                 var repository = CreateRepository(unitOfWork, out _);
-                var result2 = repository.GetAll().ToArray();
+                var result2 = repository.GetMany().ToArray();
 
                 Assert.AreEqual(result.Length, result2.Length);
             }
@@ -697,12 +698,12 @@ namespace Umbraco.Tests.Persistence.Repositories
                     unitOfWork.Database.AsUmbracoDatabase().EnableSqlTrace = true;
                     unitOfWork.Database.AsUmbracoDatabase().EnableSqlCount = true;
 
-                    var result = repository.GetPagedResultsByQuery(query, 0, 2, out var totalRecords, "title", Direction.Ascending, false);
+                    var result = repository.GetPage(query, 0, 2, out var totalRecords, "title", Direction.Ascending, false);
 
                     Assert.AreEqual(3, totalRecords);
                     Assert.AreEqual(2, result.Count());
 
-                    result = repository.GetPagedResultsByQuery(query, 1, 2, out totalRecords, "title", Direction.Ascending, false);
+                    result = repository.GetPage(query, 1, 2, out totalRecords, "title", Direction.Ascending, false);
 
                     Assert.AreEqual(1, result.Count());
                 }
@@ -729,7 +730,7 @@ namespace Umbraco.Tests.Persistence.Repositories
                     unitOfWork.Database.AsUmbracoDatabase().EnableSqlTrace = true;
                     unitOfWork.Database.AsUmbracoDatabase().EnableSqlCount = true;
 
-                    var result = repository.GetPagedResultsByQuery(query, 0, 1, out var totalRecords, "Name", Direction.Ascending, true);
+                    var result = repository.GetPage(query, 0, 1, out var totalRecords, "Name", Direction.Ascending, true);
 
                     Assert.That(totalRecords, Is.GreaterThanOrEqualTo(2));
                     Assert.That(result.Count(), Is.EqualTo(1));
@@ -752,7 +753,7 @@ namespace Umbraco.Tests.Persistence.Repositories
                 var repository = CreateRepository(unitOfWork, out _);
 
                 var query = unitOfWork.SqlContext.Query<IContent>().Where(x => x.Level == 2);
-                var result = repository.GetPagedResultsByQuery(query, 1, 1, out var totalRecords, "Name", Direction.Ascending, true);
+                var result = repository.GetPage(query, 1, 1, out var totalRecords, "Name", Direction.Ascending, true);
 
                 Assert.That(totalRecords, Is.GreaterThanOrEqualTo(2));
                 Assert.That(result.Count(), Is.EqualTo(1));
@@ -769,7 +770,7 @@ namespace Umbraco.Tests.Persistence.Repositories
                 var repository = CreateRepository(unitOfWork, out _);
 
                 var query = unitOfWork.SqlContext.Query<IContent>().Where(x => x.Level == 2);
-                var result = repository.GetPagedResultsByQuery(query, 0, 2, out var totalRecords, "Name", Direction.Ascending, true);
+                var result = repository.GetPage(query, 0, 2, out var totalRecords, "Name", Direction.Ascending, true);
 
                 Assert.That(totalRecords, Is.GreaterThanOrEqualTo(2));
                 Assert.That(result.Count(), Is.EqualTo(2));
@@ -786,7 +787,7 @@ namespace Umbraco.Tests.Persistence.Repositories
                 var repository = CreateRepository(unitOfWork, out _);
 
                 var query = unitOfWork.SqlContext.Query<IContent>().Where(x => x.Level == 2);
-                var result = repository.GetPagedResultsByQuery(query, 0, 1, out var totalRecords, "Name", Direction.Descending, true);
+                var result = repository.GetPage(query, 0, 1, out var totalRecords, "Name", Direction.Descending, true);
 
                 Assert.That(totalRecords, Is.GreaterThanOrEqualTo(2));
                 Assert.That(result.Count(), Is.EqualTo(1));
@@ -805,7 +806,7 @@ namespace Umbraco.Tests.Persistence.Repositories
                 var query = unitOfWork.SqlContext.Query<IContent>().Where(x => x.Level == 2);
 
                 var filterQuery = unitOfWork.SqlContext.Query<IContent>().Where(x => x.Name.Contains("Page 2"));
-                var result = repository.GetPagedResultsByQuery(query, 0, 1, out var totalRecords, "Name", Direction.Ascending, true, filterQuery);
+                var result = repository.GetPage(query, 0, 1, out var totalRecords, "Name", Direction.Ascending, true, filterQuery);
 
                 Assert.That(totalRecords, Is.EqualTo(1));
                 Assert.That(result.Count(), Is.EqualTo(1));
@@ -824,7 +825,7 @@ namespace Umbraco.Tests.Persistence.Repositories
                 var query = unitOfWork.SqlContext.Query<IContent>().Where(x => x.Level == 2);
 
                 var filterQuery = unitOfWork.SqlContext.Query<IContent>().Where(x => x.Name.Contains("text"));
-                var result = repository.GetPagedResultsByQuery(query, 0, 1, out var totalRecords, "Name", Direction.Ascending, true, filterQuery);
+                var result = repository.GetPage(query, 0, 1, out var totalRecords, "Name", Direction.Ascending, true, filterQuery);
 
                 Assert.That(totalRecords, Is.EqualTo(2));
                 Assert.That(result.Count(), Is.EqualTo(1));
@@ -840,7 +841,7 @@ namespace Umbraco.Tests.Persistence.Repositories
             {
                 var repository = CreateRepository(unitOfWork, out _);
 
-                var contents = repository.GetAll(NodeDto.NodeIdSeed + 2, NodeDto.NodeIdSeed + 3);
+                var contents = repository.GetMany(NodeDto.NodeIdSeed + 2, NodeDto.NodeIdSeed + 3);
 
 
                 Assert.That(contents, Is.Not.Null);
@@ -857,18 +858,18 @@ namespace Umbraco.Tests.Persistence.Repositories
             {
                 var repository = CreateRepository(unitOfWork, out _);
 
-                var contents = repository.GetAll();
+                var contents = repository.GetMany();
 
                 Assert.That(contents, Is.Not.Null);
                 Assert.That(contents.Any(), Is.True);
                 Assert.That(contents.Count(), Is.GreaterThanOrEqualTo(4));
 
-                contents = repository.GetAll(contents.Select(x => x.Id).ToArray());
+                contents = repository.GetMany(contents.Select(x => x.Id).ToArray());
                 Assert.That(contents, Is.Not.Null);
                 Assert.That(contents.Any(), Is.True);
                 Assert.That(contents.Count(), Is.GreaterThanOrEqualTo(4));
 
-                contents = ((IReadRepository<Guid, IContent>)repository).GetAll(contents.Select(x => x.Key).ToArray());
+                contents = ((IReadRepository<Guid, IContent>)repository).GetMany(contents.Select(x => x.Key).ToArray());
                 Assert.That(contents, Is.Not.Null);
                 Assert.That(contents.Any(), Is.True);
                 Assert.That(contents.Count(), Is.GreaterThanOrEqualTo(4));
@@ -913,7 +914,7 @@ namespace Umbraco.Tests.Persistence.Repositories
                 var repository = CreateRepository(unitOfWork, out _);
 
                 var query = unitOfWork.SqlContext.Query<IContent>().Where(x => x.Key == new Guid("B58B3AD4-62C2-4E27-B1BE-837BD7C533E0"));
-                var content = repository.GetByQuery(query).SingleOrDefault();
+                var content = repository.Get(query).SingleOrDefault();
 
                 Assert.IsNotNull(content);
                 Assert.AreEqual(NodeDto.NodeIdSeed + 2, content.Id);
diff --git a/src/Umbraco.Tests/Persistence/Repositories/ContentTypeRepositoryTest.cs b/src/Umbraco.Tests/Persistence/Repositories/ContentTypeRepositoryTest.cs
index 50fafcc7b0..85ec51a076 100644
--- a/src/Umbraco.Tests/Persistence/Repositories/ContentTypeRepositoryTest.cs
+++ b/src/Umbraco.Tests/Persistence/Repositories/ContentTypeRepositoryTest.cs
@@ -11,7 +11,9 @@ using Umbraco.Core.IO;
 using Umbraco.Core.Models;
 using Umbraco.Core.Models.EntityBase;
 using Umbraco.Core.Models.Rdbms;
+using Umbraco.Core.Persistence;
 using Umbraco.Core.Persistence.Repositories;
+using Umbraco.Core.Persistence.Repositories.Implement;
 using Umbraco.Core.Persistence.UnitOfWork;
 using Umbraco.Tests.TestHelpers;
 using Umbraco.Tests.TestHelpers.Entities;
@@ -31,12 +33,12 @@ namespace Umbraco.Tests.Persistence.Repositories
             CreateTestData();
         }
 
-        private ContentRepository CreateRepository(IScopeUnitOfWork unitOfWork, out ContentTypeRepository contentTypeRepository)
+        private DocumentRepository CreateRepository(IScopeUnitOfWork unitOfWork, out ContentTypeRepository contentTypeRepository)
         {
             var templateRepository = new TemplateRepository(unitOfWork, CacheHelper.CreateDisabledCacheHelper(), Logger, Mock.Of<IFileSystem>(), Mock.Of<IFileSystem>(), Mock.Of<ITemplatesSection>());
             var tagRepository = new TagRepository(unitOfWork, CacheHelper.CreateDisabledCacheHelper(), Logger);
             contentTypeRepository = new ContentTypeRepository(unitOfWork, CacheHelper.CreateDisabledCacheHelper(), Logger, templateRepository);
-            var repository = new ContentRepository(unitOfWork, CacheHelper.CreateDisabledCacheHelper(), Logger, contentTypeRepository, templateRepository, tagRepository, Mock.Of<IContentSection>());
+            var repository = new DocumentRepository(unitOfWork, CacheHelper.CreateDisabledCacheHelper(), Logger, contentTypeRepository, templateRepository, tagRepository, Mock.Of<IContentSection>());
             return repository;
         }
 
@@ -78,14 +80,14 @@ namespace Umbraco.Tests.Persistence.Repositories
                 };
                 foreach (var template in templates)
                 {
-                    templateRepo.AddOrUpdate(template);
+                    templateRepo.Save(template);
                 }
                 unitOfWork.Flush();
 
                 var contentType = MockedContentTypes.CreateSimpleContentType();
                 contentType.AllowedTemplates = new[] { templates[0], templates[1] };
                 contentType.SetDefaultTemplate(templates[0]);
-                repository.AddOrUpdate(contentType);
+                repository.Save(contentType);
                 unitOfWork.Flush();
 
                 //re-get
@@ -106,16 +108,16 @@ namespace Umbraco.Tests.Persistence.Repositories
                 var containerRepository = CreateContainerRepository(unitOfWork, Constants.ObjectTypes.DocumentTypeContainer);
                 var repository = CreateRepository(unitOfWork);
                 var container1 = new EntityContainer(Constants.ObjectTypes.DocumentType) { Name = "blah1" };
-                containerRepository.AddOrUpdate(container1);
+                containerRepository.Save(container1);
                 unitOfWork.Flush();
 
                 var container2 = new EntityContainer(Constants.ObjectTypes.DocumentType) { Name = "blah2", ParentId = container1.Id };
-                containerRepository.AddOrUpdate(container2);
+                containerRepository.Save(container2);
                 unitOfWork.Flush();
 
                 var contentType = (IContentType)MockedContentTypes.CreateBasicContentType("asdfasdf");
                 contentType.ParentId = container2.Id;
-                repository.AddOrUpdate(contentType);
+                repository.Save(contentType);
                 unitOfWork.Flush();
 
                 //create a
@@ -124,7 +126,7 @@ namespace Umbraco.Tests.Persistence.Repositories
                     Name = "Blahasdfsadf"
                 };
                 contentType.ParentId = contentType.Id;
-                repository.AddOrUpdate(contentType2);
+                repository.Save(contentType2);
                 unitOfWork.Flush();
 
                 var result = repository.Move(contentType, container1).ToArray();
@@ -151,7 +153,7 @@ namespace Umbraco.Tests.Persistence.Repositories
             {
                 var containerRepository = CreateContainerRepository(unitOfWork, Constants.ObjectTypes.DocumentTypeContainer);
                 var container = new EntityContainer(Constants.ObjectTypes.DocumentType) { Name = "blah" };
-                containerRepository.AddOrUpdate(container);
+                containerRepository.Save(container);
                 unitOfWork.Flush();
                 Assert.That(container.Id, Is.GreaterThan(0));
 
@@ -171,11 +173,11 @@ namespace Umbraco.Tests.Persistence.Repositories
                 var containerRepository = CreateContainerRepository(unitOfWork, Constants.ObjectTypes.DocumentTypeContainer);
 
                 container1 = new EntityContainer(Constants.ObjectTypes.DocumentType) { Name = "container1" };
-                containerRepository.AddOrUpdate(container1);
+                containerRepository.Save(container1);
                 container2 = new EntityContainer(Constants.ObjectTypes.DocumentType) { Name = "container2" };
-                containerRepository.AddOrUpdate(container2);
+                containerRepository.Save(container2);
                 container3 = new EntityContainer(Constants.ObjectTypes.DocumentType) { Name = "container3" };
-                containerRepository.AddOrUpdate(container3);
+                containerRepository.Save(container3);
                 unitOfWork.Flush();
                 Assert.That(container1.Id, Is.GreaterThan(0));
                 Assert.That(container2.Id, Is.GreaterThan(0));
@@ -187,7 +189,7 @@ namespace Umbraco.Tests.Persistence.Repositories
                 Assert.IsNotNull(found2);
                 var found3 = containerRepository.Get(container3.Id);
                 Assert.IsNotNull(found3);
-                var allContainers = containerRepository.GetAll();
+                var allContainers = containerRepository.GetMany();
                 Assert.AreEqual(3, allContainers.Count());
             }
         }
@@ -200,7 +202,7 @@ namespace Umbraco.Tests.Persistence.Repositories
             {
                 var containerRepository = CreateContainerRepository(unitOfWork, Constants.ObjectTypes.DocumentTypeContainer);
                 var container = new EntityContainer(Constants.ObjectTypes.DocumentType) { Name = "blah" };
-                containerRepository.AddOrUpdate(container);
+                containerRepository.Save(container);
                 unitOfWork.Flush();
 
                 // Act
@@ -221,12 +223,12 @@ namespace Umbraco.Tests.Persistence.Repositories
                 var containerRepository = CreateContainerRepository(unitOfWork, Constants.ObjectTypes.MediaTypeContainer);
                 var repository = CreateRepository(unitOfWork);
                 var container = new EntityContainer(Constants.ObjectTypes.MediaType) { Name = "blah" };
-                containerRepository.AddOrUpdate(container);
+                containerRepository.Save(container);
                 unitOfWork.Flush();
 
                 var contentType = MockedContentTypes.CreateSimpleContentType("test", "Test", propertyGroupName: "testGroup");
                 contentType.ParentId = container.Id;
-                repository.AddOrUpdate(contentType);
+                repository.Save(contentType);
                 unitOfWork.Flush();
 
                 Assert.AreEqual(container.Id, contentType.ParentId);
@@ -242,12 +244,12 @@ namespace Umbraco.Tests.Persistence.Repositories
                 var containerRepository = CreateContainerRepository(unitOfWork, Constants.ObjectTypes.MediaTypeContainer);
                 var repository = CreateMediaTypeRepository(unitOfWork);
                 var container = new EntityContainer(Constants.ObjectTypes.MediaType) { Name = "blah" };
-                containerRepository.AddOrUpdate(container);
+                containerRepository.Save(container);
                 unitOfWork.Flush();
 
                 IMediaType contentType = MockedContentTypes.CreateSimpleMediaType("test", "Test", propertyGroupName: "testGroup");
                 contentType.ParentId = container.Id;
-                repository.AddOrUpdate(contentType);
+                repository.Save(contentType);
                 unitOfWork.Flush();
 
                 // Act
@@ -273,7 +275,7 @@ namespace Umbraco.Tests.Persistence.Repositories
                 var repository = CreateRepository(unitOfWork);
                 // Act
                 var contentType = MockedContentTypes.CreateSimpleContentType("test", "Test", propertyGroupName: "testGroup");
-                repository.AddOrUpdate(contentType);
+                repository.Save(contentType);
                 unitOfWork.Flush();
 
                 var fetched = repository.Get(contentType.Id);
@@ -319,7 +321,7 @@ namespace Umbraco.Tests.Persistence.Repositories
 
                 Assert.AreEqual(4, mapped.PropertyTypes.Count());
 
-                repository.AddOrUpdate(mapped);
+                repository.Save(mapped);
                 unitOfWork.Flush();
 
                 Assert.AreEqual(4, mapped.PropertyTypes.Count());
@@ -367,7 +369,7 @@ namespace Umbraco.Tests.Persistence.Repositories
                     SortOrder = 1,
                     DataTypeDefinitionId = -88
                 });
-                repository.AddOrUpdate(contentType);
+                repository.Save(contentType);
                 unitOfWork.Flush();
 
                 var dirty = ((ICanBeDirty)contentType).IsDirty();
@@ -465,7 +467,7 @@ namespace Umbraco.Tests.Persistence.Repositories
                 Assert.AreEqual(mapped.Thumbnail, "Doc2.png");
                 Assert.IsTrue(mapped.PropertyTypes.Any(x => x.Alias == "subtitle"));
 
-                repository.AddOrUpdate(mapped);
+                repository.Save(mapped);
                 unitOfWork.Flush();
 
                 var dirty = mapped.IsDirty();
@@ -496,7 +498,7 @@ namespace Umbraco.Tests.Persistence.Repositories
                 var repository = CreateRepository(unitOfWork);
                 // Act
                 var contentType = MockedContentTypes.CreateSimpleContentType();
-                repository.AddOrUpdate(contentType);
+                repository.Save(contentType);
                 unitOfWork.Flush();
 
                 var contentType2 = repository.Get(contentType.Id);
@@ -522,9 +524,9 @@ namespace Umbraco.Tests.Persistence.Repositories
                 var ctChild1 = MockedContentTypes.CreateSimpleContentType("child1", "Child 1", ctMain, true);
                 var ctChild2 = MockedContentTypes.CreateSimpleContentType("child2", "Child 2", ctChild1, true);
 
-                repository.AddOrUpdate(ctMain);
-                repository.AddOrUpdate(ctChild1);
-                repository.AddOrUpdate(ctChild2);
+                repository.Save(ctMain);
+                repository.Save(ctChild1);
+                repository.Save(ctChild2);
                 unitOfWork.Flush();
 
                 // Act
@@ -550,15 +552,15 @@ namespace Umbraco.Tests.Persistence.Repositories
                 var repository = CreateRepository(unitOfWork);
                 var contentType = repository.Get(NodeDto.NodeIdSeed + 1);
                 var child1 = MockedContentTypes.CreateSimpleContentType("abc", "abc", contentType, randomizeAliases: true);
-                repository.AddOrUpdate(child1);
+                repository.Save(child1);
                 var child3 = MockedContentTypes.CreateSimpleContentType("zyx", "zyx", contentType, randomizeAliases: true);
-                repository.AddOrUpdate(child3);
+                repository.Save(child3);
                 var child2 = MockedContentTypes.CreateSimpleContentType("a123", "a123", contentType, randomizeAliases: true);
-                repository.AddOrUpdate(child2);
+                repository.Save(child2);
                 unitOfWork.Flush();
 
                 // Act
-                var contentTypes = repository.GetByQuery(unitOfWork.SqlContext.Query<IContentType>().Where(x => x.ParentId == contentType.Id));
+                var contentTypes = repository.Get(unitOfWork.SqlContext.Query<IContentType>().Where(x => x.ParentId == contentType.Id));
 
                 // Assert
                 Assert.That(contentTypes.Count(), Is.EqualTo(3));
@@ -597,7 +599,7 @@ namespace Umbraco.Tests.Persistence.Repositories
                 var repository = CreateRepository(unitOfWork);
                 var contentType = repository.Get(NodeDto.NodeIdSeed + 1);
                 var childContentType = MockedContentTypes.CreateSimpleContentType("blah", "Blah", contentType, randomizeAliases:true);
-                repository.AddOrUpdate(childContentType);
+                repository.Save(childContentType);
                 unitOfWork.Flush();
 
                 // Act
@@ -635,7 +637,7 @@ namespace Umbraco.Tests.Persistence.Repositories
                 var repository = CreateRepository(unitOfWork);
 
                 // Act
-                var contentTypes = repository.GetAll();
+                var contentTypes = repository.GetMany();
                 int count =
                     unitOfWork.Database.ExecuteScalar<int>(
                         "SELECT COUNT(*) FROM umbracoNode WHERE nodeObjectType = @NodeObjectType",
@@ -655,10 +657,10 @@ namespace Umbraco.Tests.Persistence.Repositories
             using (var unitOfWork = provider.CreateUnitOfWork())
             {
                 var repository = CreateRepository(unitOfWork);
-                var allGuidIds = repository.GetAll().Select(x => x.Key).ToArray();
+                var allGuidIds = repository.GetMany().Select(x => x.Key).ToArray();
 
                 // Act
-                var contentTypes = ((IReadRepository<Guid, IContentType>)repository).GetAll(allGuidIds);
+                var contentTypes = ((IReadRepository<Guid, IContentType>)repository).GetMany(allGuidIds);
                 int count =
                     unitOfWork.Database.ExecuteScalar<int>(
                         "SELECT COUNT(*) FROM umbracoNode WHERE nodeObjectType = @NodeObjectType",
@@ -699,7 +701,7 @@ namespace Umbraco.Tests.Persistence.Repositories
 
                 // Act
                 contentType.PropertyGroups["Meta"].PropertyTypes.Remove("description");
-                repository.AddOrUpdate(contentType);
+                repository.Save(contentType);
                 unitOfWork.Flush();
 
                 var result = repository.Get(NodeDto.NodeIdSeed + 1);
@@ -775,7 +777,7 @@ namespace Umbraco.Tests.Persistence.Repositories
                 Assert.That(contentType.PropertyGroups.Count, Is.EqualTo(2));
                 Assert.That(contentType.PropertyTypes.Count(), Is.EqualTo(5));
 
-                repository.AddOrUpdate(contentType);
+                repository.Save(contentType);
                 unitOfWork.Flush();
 
                 // Assert
@@ -799,8 +801,8 @@ namespace Umbraco.Tests.Persistence.Repositories
 
                 var subpageContentType = MockedContentTypes.CreateSimpleContentType("umbSubpage", "Subpage");
                 var simpleSubpageContentType = MockedContentTypes.CreateSimpleContentType("umbSimpleSubpage", "Simple Subpage");
-                repository.AddOrUpdate(subpageContentType);
-                repository.AddOrUpdate(simpleSubpageContentType);
+                repository.Save(subpageContentType);
+                repository.Save(simpleSubpageContentType);
                 unitOfWork.Flush();
 
                 // Act
@@ -810,7 +812,7 @@ namespace Umbraco.Tests.Persistence.Repositories
                         new ContentTypeSort(new Lazy<int>(() => subpageContentType.Id), 0, subpageContentType.Alias),
                         new ContentTypeSort(new Lazy<int>(() => simpleSubpageContentType.Id), 1, simpleSubpageContentType.Alias)
                     };
-                repository.AddOrUpdate(contentType);
+                repository.Save(contentType);
                 unitOfWork.Flush();
 
                 //Assert
@@ -834,12 +836,12 @@ namespace Umbraco.Tests.Persistence.Repositories
                 var contentType = repository.Get(NodeDto.NodeIdSeed + 1);
 
                 var subpage = MockedContent.CreateTextpageContent(contentType, "Text Page 1", contentType.Id);
-                contentRepository.AddOrUpdate(subpage);
+                contentRepository.Save(subpage);
                 unitOfWork.Flush();
 
                 // Act
                 contentType.RemovePropertyType("keywords");
-                repository.AddOrUpdate(contentType);
+                repository.Save(contentType);
                 unitOfWork.Flush();
 
                 // Assert
@@ -861,13 +863,13 @@ namespace Umbraco.Tests.Persistence.Repositories
                 var contentType = repository.Get(NodeDto.NodeIdSeed + 1);
 
                 var subpage = MockedContent.CreateTextpageContent(contentType, "Text Page 1", contentType.Id);
-                contentRepository.AddOrUpdate(subpage);
+                contentRepository.Save(subpage);
                 unitOfWork.Flush();
 
                 // Act
                 var propertyGroup = contentType.PropertyGroups.First(x => x.Name == "Meta");
                 propertyGroup.PropertyTypes.Add(new PropertyType("test", DataTypeDatabaseType.Ntext, "metaAuthor") { Name = "Meta Author", Description = "", Mandatory = false, SortOrder = 1, DataTypeDefinitionId = -88 });
-                repository.AddOrUpdate(contentType);
+                repository.Save(contentType);
                 unitOfWork.Flush();
 
                 // Assert
@@ -889,18 +891,18 @@ namespace Umbraco.Tests.Persistence.Repositories
                 var contentType = repository.Get(NodeDto.NodeIdSeed + 1);
 
                 var subpage = MockedContent.CreateTextpageContent(contentType, "Text Page 1", contentType.Id);
-                contentRepository.AddOrUpdate(subpage);
+                contentRepository.Save(subpage);
                 unitOfWork.Flush();
 
                 var propertyGroup = contentType.PropertyGroups.First(x => x.Name == "Meta");
                 propertyGroup.PropertyTypes.Add(new PropertyType("test", DataTypeDatabaseType.Ntext, "metaAuthor") { Name = "Meta Author", Description = "", Mandatory = false, SortOrder = 1, DataTypeDefinitionId = -88 });
-                repository.AddOrUpdate(contentType);
+                repository.Save(contentType);
                 unitOfWork.Flush();
 
                 // Act
                 var content = contentRepository.Get(subpage.Id);
                 content.SetValue("metaAuthor", "John Doe");
-                contentRepository.AddOrUpdate(content);
+                contentRepository.Save(content);
                 unitOfWork.Flush();
 
                 //Assert
@@ -923,7 +925,7 @@ namespace Umbraco.Tests.Persistence.Repositories
                 var contentType = repository.Get(NodeDto.NodeIdSeed + 1);
 
                 var subpage = MockedContent.CreateTextpageContent(contentType, "Text Page 1", contentType.Id);
-                contentRepository.AddOrUpdate(subpage);
+                contentRepository.Save(subpage);
                 unitOfWork.Flush();
 
                 //Remove PropertyType
@@ -931,13 +933,13 @@ namespace Umbraco.Tests.Persistence.Repositories
                 //Add PropertyType
                 var propertyGroup = contentType.PropertyGroups.First(x => x.Name == "Meta");
                 propertyGroup.PropertyTypes.Add(new PropertyType("test", DataTypeDatabaseType.Ntext, "metaAuthor") { Name = "Meta Author", Description = "",  Mandatory = false, SortOrder = 1, DataTypeDefinitionId = -88 });
-                repository.AddOrUpdate(contentType);
+                repository.Save(contentType);
                 unitOfWork.Flush();
 
                 // Act
                 var content = contentRepository.Get(subpage.Id);
                 content.SetValue("metaAuthor", "John Doe");
-                contentRepository.AddOrUpdate(content);
+                contentRepository.Save(content);
                 unitOfWork.Flush();
 
                 //Assert
diff --git a/src/Umbraco.Tests/Persistence/Repositories/DataTypeDefinitionRepositoryTest.cs b/src/Umbraco.Tests/Persistence/Repositories/DataTypeDefinitionRepositoryTest.cs
index 3c1ba02532..5bc5d9ee0f 100644
--- a/src/Umbraco.Tests/Persistence/Repositories/DataTypeDefinitionRepositoryTest.cs
+++ b/src/Umbraco.Tests/Persistence/Repositories/DataTypeDefinitionRepositoryTest.cs
@@ -11,6 +11,7 @@ using Umbraco.Tests.TestHelpers;
 using Umbraco.Core.Composing;
 using Umbraco.Tests.Testing;
 using LightInject;
+using Umbraco.Core.Persistence.Repositories.Implement;
 
 namespace Umbraco.Tests.Persistence.Repositories
 {
@@ -75,18 +76,18 @@ namespace Umbraco.Tests.Persistence.Repositories
                 var containerRepository = CreateContainerRepository(unitOfWork);
                 var repository = CreateRepository(unitOfWork);
                 var container1 = new EntityContainer(Constants.ObjectTypes.DataType) { Name = "blah1" };
-                containerRepository.AddOrUpdate(container1);
+                containerRepository.Save(container1);
                 unitOfWork.Flush();
 
                 var container2 = new EntityContainer(Constants.ObjectTypes.DataType) { Name = "blah2", ParentId = container1.Id };
-                containerRepository.AddOrUpdate(container2);
+                containerRepository.Save(container2);
                 unitOfWork.Flush();
 
                 var dataType = (IDataTypeDefinition)new DataTypeDefinition(container2.Id, Constants.PropertyEditors.RadioButtonListAlias)
                 {
                     Name = "dt1"
                 };
-                repository.AddOrUpdate(dataType);
+                repository.Save(dataType);
                 unitOfWork.Flush();
 
                 //create a
@@ -94,7 +95,7 @@ namespace Umbraco.Tests.Persistence.Repositories
                 {
                     Name = "dt2"
                 };
-                repository.AddOrUpdate(dataType2);
+                repository.Save(dataType2);
                 unitOfWork.Flush();
 
                 var result = repository.Move(dataType, container1).ToArray();
@@ -121,7 +122,7 @@ namespace Umbraco.Tests.Persistence.Repositories
             {
                 var containerRepository = CreateContainerRepository(unitOfWork);
                 var container = new EntityContainer(Constants.ObjectTypes.DataType) { Name = "blah" };
-                containerRepository.AddOrUpdate(container);
+                containerRepository.Save(container);
                 unitOfWork.Flush();
                 Assert.That(container.Id, Is.GreaterThan(0));
 
@@ -138,7 +139,7 @@ namespace Umbraco.Tests.Persistence.Repositories
             {
                 var containerRepository = CreateContainerRepository(unitOfWork);
                 var container = new EntityContainer(Constants.ObjectTypes.DataType) { Name = "blah" };
-                containerRepository.AddOrUpdate(container);
+                containerRepository.Save(container);
                 unitOfWork.Flush();
 
                 // Act
@@ -159,11 +160,11 @@ namespace Umbraco.Tests.Persistence.Repositories
                 var containerRepository = CreateContainerRepository(unitOfWork);
                 var repository = CreateRepository(unitOfWork);
                 var container = new EntityContainer(Constants.ObjectTypes.DataType) { Name = "blah" };
-                containerRepository.AddOrUpdate(container);
+                containerRepository.Save(container);
                 unitOfWork.Flush();
 
                 var dataTypeDefinition = new DataTypeDefinition(container.Id, Constants.PropertyEditors.RadioButtonListAlias) { Name = "test" };
-                repository.AddOrUpdate(dataTypeDefinition);
+                repository.Save(dataTypeDefinition);
                 unitOfWork.Flush();
 
                 Assert.AreEqual(container.Id, dataTypeDefinition.ParentId);
@@ -179,11 +180,11 @@ namespace Umbraco.Tests.Persistence.Repositories
                 var containerRepository = CreateContainerRepository(unitOfWork);
                 var repository = CreateRepository(unitOfWork);
                 var container = new EntityContainer(Constants.ObjectTypes.DataType) { Name = "blah" };
-                containerRepository.AddOrUpdate(container);
+                containerRepository.Save(container);
                 unitOfWork.Flush();
 
                 IDataTypeDefinition dataType = new DataTypeDefinition(container.Id, Constants.PropertyEditors.RadioButtonListAlias) { Name = "test" };
-                repository.AddOrUpdate(dataType);
+                repository.Save(dataType);
                 unitOfWork.Flush();
 
                 // Act
@@ -208,7 +209,7 @@ namespace Umbraco.Tests.Persistence.Repositories
                 var repository = CreateRepository(unitOfWork);
                 IDataTypeDefinition dataTypeDefinition = new DataTypeDefinition(-1, Constants.PropertyEditors.RadioButtonListAlias) {Name = "test"};
 
-                repository.AddOrUpdate(dataTypeDefinition);
+                repository.Save(dataTypeDefinition);
 
                 unitOfWork.Flush();
                 var id = dataTypeDefinition.Id;
@@ -252,7 +253,7 @@ namespace Umbraco.Tests.Persistence.Repositories
                 var repository = CreateRepository(unitOfWork);
 
                 // Act
-                var dataTypeDefinitions = repository.GetAll();
+                var dataTypeDefinitions = repository.GetMany();
 
                 // Assert
                 Assert.That(dataTypeDefinitions, Is.Not.Null);
@@ -272,7 +273,7 @@ namespace Umbraco.Tests.Persistence.Repositories
                 var repository = CreateRepository(unitOfWork);
 
                 // Act
-                var dataTypeDefinitions = repository.GetAll(-40, -41, -42);
+                var dataTypeDefinitions = repository.GetMany(-40, -41, -42);
 
                 // Assert
                 Assert.That(dataTypeDefinitions, Is.Not.Null);
@@ -293,7 +294,7 @@ namespace Umbraco.Tests.Persistence.Repositories
 
                 // Act
                 var query = unitOfWork.SqlContext.Query<IDataTypeDefinition>().Where(x => x.PropertyEditorAlias == Constants.PropertyEditors.RadioButtonListAlias);
-                var result = repository.GetByQuery(query);
+                var result = repository.Get(query);
 
                 // Assert
                 Assert.That(result, Is.Not.Null);
@@ -336,7 +337,7 @@ namespace Umbraco.Tests.Persistence.Repositories
                 };
 
                 // Act
-                repository.AddOrUpdate(dataTypeDefinition);
+                repository.Save(dataTypeDefinition);
                 unitOfWork.Flush();
                 var exists = repository.Exists(dataTypeDefinition.Id);
 
@@ -364,14 +365,14 @@ namespace Umbraco.Tests.Persistence.Repositories
                     Name = "AgeDataType",
                     CreatorId = 0
                 };
-                repository.AddOrUpdate(dataTypeDefinition);
+                repository.Save(dataTypeDefinition);
                 unitOfWork.Flush();
 
                 // Act
                 var definition = repository.Get(dataTypeDefinition.Id);
                 definition.Name = "AgeDataType Updated";
                 definition.PropertyEditorAlias = "Test.TestEditor"; //change
-                repository.AddOrUpdate(definition);
+                repository.Save(definition);
                 unitOfWork.Flush();
 
                 var definitionUpdated = repository.Get(dataTypeDefinition.Id);
@@ -399,7 +400,7 @@ namespace Umbraco.Tests.Persistence.Repositories
                 };
 
                 // Act
-                repository.AddOrUpdate(dataTypeDefinition);
+                repository.Save(dataTypeDefinition);
                 unitOfWork.Flush();
                 var existsBefore = repository.Exists(dataTypeDefinition.Id);
 
@@ -441,7 +442,7 @@ namespace Umbraco.Tests.Persistence.Repositories
             {
                 var repository = CreateRepository(unitOfWork);
                 var dataTypeDefinition = new DataTypeDefinition(-1, Constants.PropertyEditors.RadioButtonListAlias) { Name = "test" };
-                repository.AddOrUpdate(dataTypeDefinition);
+                repository.Save(dataTypeDefinition);
                 unitOfWork.Flush();
                 var dtid = dataTypeDefinition.Id;
 
@@ -461,7 +462,7 @@ namespace Umbraco.Tests.Persistence.Repositories
             {
                 var repository = CreateRepository(unitOfWork);
                 var dataTypeDefinition = new DataTypeDefinition(-1, Constants.PropertyEditors.RadioButtonListAlias) { Name = "test" };
-                repository.AddOrUpdate(dataTypeDefinition);
+                repository.Save(dataTypeDefinition);
                 unitOfWork.Flush();
                 var dtid = dataTypeDefinition.Id;
 
@@ -482,7 +483,7 @@ namespace Umbraco.Tests.Persistence.Repositories
             {
                 var repository = Container.GetInstance<IScopeUnitOfWork, IDataTypeDefinitionRepository>(unitOfWork);
                 dtd = new DataTypeDefinition(-1, Constants.PropertyEditors.RadioButtonListAlias) { Name = "test" };
-                repository.AddOrUpdate(dtd);
+                repository.Save(dtd);
                 unitOfWork.Flush();
 
                 unitOfWork.Database.Insert(new DataTypePreValueDto { DataTypeNodeId = dtd.Id, SortOrder = 0, Value = "test1" });
@@ -513,7 +514,7 @@ namespace Umbraco.Tests.Persistence.Repositories
             {
                 var repository = Container.GetInstance<IScopeUnitOfWork, IDataTypeDefinitionRepository>(unitOfWork);
                 dtd = new DataTypeDefinition(-1, Constants.PropertyEditors.RadioButtonListAlias) { Name = "test" };
-                repository.AddOrUpdate(dtd);
+                repository.Save(dtd);
                 unitOfWork.Flush();
 
                 id = unitOfWork.Database.Insert(new DataTypePreValueDto() { DataTypeNodeId = dtd.Id, SortOrder = 0, Value = "test1" });
diff --git a/src/Umbraco.Tests/Persistence/Repositories/DictionaryRepositoryTest.cs b/src/Umbraco.Tests/Persistence/Repositories/DictionaryRepositoryTest.cs
index 133b00bec1..d7fad862b7 100644
--- a/src/Umbraco.Tests/Persistence/Repositories/DictionaryRepositoryTest.cs
+++ b/src/Umbraco.Tests/Persistence/Repositories/DictionaryRepositoryTest.cs
@@ -43,7 +43,7 @@ namespace Umbraco.Tests.Persistence.Repositories
                     }
                 };
 
-                repository.AddOrUpdate(dictionaryItem);
+                repository.Save(dictionaryItem);
                 unitOfWork.Flush();
 
                 //re-get
@@ -75,7 +75,7 @@ namespace Umbraco.Tests.Persistence.Repositories
                     }
                 };
 
-                repository.AddOrUpdate(dictionaryItem);
+                repository.Save(dictionaryItem);
                 unitOfWork.Flush();
 
                 //re-get
@@ -107,7 +107,7 @@ namespace Umbraco.Tests.Persistence.Repositories
                     }
                 };
 
-                repository.AddOrUpdate(dictionaryItem);
+                repository.Save(dictionaryItem);
                 unitOfWork.Flush();
 
                 //re-get
@@ -134,7 +134,7 @@ namespace Umbraco.Tests.Persistence.Repositories
                 var repository = CreateRepository(unitOfWork);
                 var dictionaryItem = (IDictionaryItem) new DictionaryItem("Testing1235");
 
-                repository.AddOrUpdate(dictionaryItem);
+                repository.Save(dictionaryItem);
                 unitOfWork.Flush();
 
                 //re-get
@@ -160,7 +160,7 @@ namespace Umbraco.Tests.Persistence.Repositories
 
                 // Act
                 var dictionaryItem = repository.Get(1);
-                var dictionaryItems = repository.GetAll();
+                var dictionaryItems = repository.GetMany();
 
                 // Assert
                 Assert.That(dictionaryItems, Is.Not.Null);
@@ -180,7 +180,7 @@ namespace Umbraco.Tests.Persistence.Repositories
                 var repository = CreateRepository(unitOfWork);
 
                 // Act
-                var dictionaryItems = repository.GetAll(1, 2);
+                var dictionaryItems = repository.GetMany(1, 2);
 
                 // Assert
                 Assert.That(dictionaryItems, Is.Not.Null);
@@ -201,7 +201,7 @@ namespace Umbraco.Tests.Persistence.Repositories
 
                 // Act
                 var query = unitOfWork.SqlContext.Query<IDictionaryItem>().Where(x => x.ItemKey == "Article");
-                var result = repository.GetByQuery(query);
+                var result = repository.Get(query);
 
                 // Assert
                 Assert.That(result, Is.Not.Null);
@@ -248,7 +248,7 @@ namespace Umbraco.Tests.Persistence.Repositories
                 read.Translations = translations;
 
                 // Act
-                repository.AddOrUpdate(read);
+                repository.Save(read);
                 unitOfWork.Flush();
 
                 var exists = repository.Exists(read.Id);
@@ -274,7 +274,7 @@ namespace Umbraco.Tests.Persistence.Repositories
                 translations[0].Value = "Read even more";
                 item.Translations = translations;
 
-                repository.AddOrUpdate(item);
+                repository.Save(item);
                 unitOfWork.Flush();
 
                 var dictionaryItem = repository.Get(1);
@@ -304,7 +304,7 @@ namespace Umbraco.Tests.Persistence.Repositories
                 translations.Add(new DictionaryTranslation(languageNo, "Les mer"));
                 item.Translations = translations;
 
-                repository.AddOrUpdate(item);
+                repository.Save(item);
                 unitOfWork.Flush();
 
                 var dictionaryItem = (DictionaryItem) repository.Get(1);
diff --git a/src/Umbraco.Tests/Persistence/Repositories/DomainRepositoryTest.cs b/src/Umbraco.Tests/Persistence/Repositories/DomainRepositoryTest.cs
index cf70a5afc5..8c1fdf5f55 100644
--- a/src/Umbraco.Tests/Persistence/Repositories/DomainRepositoryTest.cs
+++ b/src/Umbraco.Tests/Persistence/Repositories/DomainRepositoryTest.cs
@@ -7,6 +7,7 @@ using Umbraco.Core.Configuration.UmbracoSettings;
 using Umbraco.Core.IO;
 using Umbraco.Core.Models;
 using Umbraco.Core.Persistence.Repositories;
+using Umbraco.Core.Persistence.Repositories.Implement;
 using Umbraco.Core.Persistence.UnitOfWork;
 using Umbraco.Tests.TestHelpers;
 using Umbraco.Tests.TestHelpers.Entities;
@@ -18,12 +19,12 @@ namespace Umbraco.Tests.Persistence.Repositories
     [UmbracoTest(Database = UmbracoTestOptions.Database.NewSchemaPerTest)]
     public class DomainRepositoryTest : TestWithDatabaseBase
     {
-        private DomainRepository CreateRepository(IScopeUnitOfWork unitOfWork, out ContentTypeRepository contentTypeRepository, out ContentRepository contentRepository, out LanguageRepository languageRepository)
+        private DomainRepository CreateRepository(IScopeUnitOfWork unitOfWork, out ContentTypeRepository contentTypeRepository, out DocumentRepository documentRepository, out LanguageRepository languageRepository)
         {
             var templateRepository = new TemplateRepository(unitOfWork, DisabledCache, Logger, Mock.Of<IFileSystem>(), Mock.Of<IFileSystem>(), Mock.Of<ITemplatesSection>());
             var tagRepository = new TagRepository(unitOfWork, DisabledCache, Logger);
             contentTypeRepository = new ContentTypeRepository(unitOfWork, DisabledCache, Logger, templateRepository);
-            contentRepository = new ContentRepository(unitOfWork, DisabledCache, Logger, contentTypeRepository, templateRepository, tagRepository, Mock.Of<IContentSection>());
+            documentRepository = new DocumentRepository(unitOfWork, DisabledCache, Logger, contentTypeRepository, templateRepository, tagRepository, Mock.Of<IContentSection>());
             languageRepository = new LanguageRepository(unitOfWork, DisabledCache, Logger);
             var domainRepository = new DomainRepository(unitOfWork, DisabledCache, Logger);
             return domainRepository;
@@ -34,19 +35,19 @@ namespace Umbraco.Tests.Persistence.Repositories
             var provider = TestObjects.GetScopeUnitOfWorkProvider(Logger);
             using (var unitOfWork = provider.CreateUnitOfWork())
             {
-                ContentRepository contentRepo;
+                DocumentRepository documentRepo;
                 LanguageRepository langRepo;
                 ContentTypeRepository contentTypeRepo;
 
-                var repo = CreateRepository(unitOfWork, out contentTypeRepo, out contentRepo, out langRepo);
+                var repo = CreateRepository(unitOfWork, out contentTypeRepo, out documentRepo, out langRepo);
 
                 var lang = new Language(isoName);
-                langRepo.AddOrUpdate(lang);
+                langRepo.Save(lang);
 
                 ct = MockedContentTypes.CreateBasicContentType("test", "Test");
-                contentTypeRepo.AddOrUpdate(ct);
+                contentTypeRepo.Save(ct);
                 var content = new Content("test", -1, ct) { CreatorId = 0, WriterId = 0 };
-                contentRepo.AddOrUpdate(content);
+                documentRepo.Save(content);
                 unitOfWork.Complete();
                 return content.Id;
             }
@@ -61,17 +62,17 @@ namespace Umbraco.Tests.Persistence.Repositories
             var provider = TestObjects.GetScopeUnitOfWorkProvider(Logger);
             using (var unitOfWork = provider.CreateUnitOfWork())
             {
-                ContentRepository contentRepo;
+                DocumentRepository documentRepo;
                 LanguageRepository langRepo;
                 ContentTypeRepository contentTypeRepo;
 
-                var repo = CreateRepository(unitOfWork, out contentTypeRepo, out contentRepo, out langRepo);
+                var repo = CreateRepository(unitOfWork, out contentTypeRepo, out documentRepo, out langRepo);
 
                 var lang = langRepo.GetByIsoCode("en-AU");
-                var content = contentRepo.Get(contentId);
+                var content = documentRepo.Get(contentId);
 
                 var domain = (IDomain)new UmbracoDomain("test.com") { RootContentId = content.Id, LanguageId = lang.Id };
-                repo.AddOrUpdate(domain);
+                repo.Save(domain);
                 unitOfWork.Flush();
 
                 //re-get
@@ -96,16 +97,16 @@ namespace Umbraco.Tests.Persistence.Repositories
             var provider = TestObjects.GetScopeUnitOfWorkProvider(Logger);
             using (var unitOfWork = provider.CreateUnitOfWork())
             {
-                ContentRepository contentRepo;
+                DocumentRepository documentRepo;
                 LanguageRepository langRepo;
                 ContentTypeRepository contentTypeRepo;
 
-                var repo = CreateRepository(unitOfWork, out contentTypeRepo, out contentRepo, out langRepo);
+                var repo = CreateRepository(unitOfWork, out contentTypeRepo, out documentRepo, out langRepo);
 
-                var content = contentRepo.Get(contentId);
+                var content = documentRepo.Get(contentId);
 
                 var domain = (IDomain)new UmbracoDomain("test.com") { RootContentId = content.Id };
-                repo.AddOrUpdate(domain);
+                repo.Save(domain);
                 unitOfWork.Flush();
 
                 //re-get
@@ -129,21 +130,21 @@ namespace Umbraco.Tests.Persistence.Repositories
             var provider = TestObjects.GetScopeUnitOfWorkProvider(Logger);
             using (var unitOfWork = provider.CreateUnitOfWork())
             {
-                ContentRepository contentRepo;
+                DocumentRepository documentRepo;
                 LanguageRepository langRepo;
                 ContentTypeRepository contentTypeRepo;
 
-                var repo = CreateRepository(unitOfWork, out contentTypeRepo, out contentRepo, out langRepo);
+                var repo = CreateRepository(unitOfWork, out contentTypeRepo, out documentRepo, out langRepo);
 
                 var lang = langRepo.GetByIsoCode("en-AU");
-                var content = contentRepo.Get(contentId);
+                var content = documentRepo.Get(contentId);
 
                 var domain1 = (IDomain)new UmbracoDomain("test.com") { RootContentId = content.Id, LanguageId = lang.Id };
-                repo.AddOrUpdate(domain1);
+                repo.Save(domain1);
                 unitOfWork.Flush();
 
                 var domain2 = (IDomain)new UmbracoDomain("test.com") { RootContentId = content.Id, LanguageId = lang.Id };
-                repo.AddOrUpdate(domain2);
+                repo.Save(domain2);
 
                 Assert.Throws<DuplicateNameException>(unitOfWork.Flush);
             }
@@ -158,17 +159,17 @@ namespace Umbraco.Tests.Persistence.Repositories
             var provider = TestObjects.GetScopeUnitOfWorkProvider(Logger);
             using (var unitOfWork = provider.CreateUnitOfWork())
             {
-                ContentRepository contentRepo;
+                DocumentRepository documentRepo;
                 LanguageRepository langRepo;
                 ContentTypeRepository contentTypeRepo;
 
-                var repo = CreateRepository(unitOfWork, out contentTypeRepo, out contentRepo, out langRepo);
+                var repo = CreateRepository(unitOfWork, out contentTypeRepo, out documentRepo, out langRepo);
 
                 var lang = langRepo.GetByIsoCode("en-AU");
-                var content = contentRepo.Get(contentId);
+                var content = documentRepo.Get(contentId);
 
                 var domain = (IDomain)new UmbracoDomain("test.com") { RootContentId = content.Id, LanguageId = lang.Id };
-                repo.AddOrUpdate(domain);
+                repo.Save(domain);
                 unitOfWork.Flush();
 
                 repo.Delete(domain);
@@ -191,25 +192,25 @@ namespace Umbraco.Tests.Persistence.Repositories
             var provider = TestObjects.GetScopeUnitOfWorkProvider(Logger);
             using (var unitOfWork = provider.CreateUnitOfWork())
             {
-                ContentRepository contentRepo;
+                DocumentRepository documentRepo;
                 LanguageRepository langRepo;
                 ContentTypeRepository contentTypeRepo;
 
-                var repo = CreateRepository(unitOfWork, out contentTypeRepo, out contentRepo, out langRepo);
+                var repo = CreateRepository(unitOfWork, out contentTypeRepo, out documentRepo, out langRepo);
 
-                var content1 = contentRepo.Get(contentId1);
+                var content1 = documentRepo.Get(contentId1);
 
                 //more test data
                 var lang1 = langRepo.GetByIsoCode("en-AU");
                 var lang2 = new Language("es");
-                langRepo.AddOrUpdate(lang2);
+                langRepo.Save(lang2);
                 var content2 = new Content("test", -1, ct) { CreatorId = 0, WriterId = 0 };
-                contentRepo.AddOrUpdate(content2);
+                documentRepo.Save(content2);
                 unitOfWork.Flush();
 
 
                 var domain = (IDomain)new UmbracoDomain("test.com") { RootContentId = content1.Id, LanguageId = lang1.Id };
-                repo.AddOrUpdate(domain);
+                repo.Save(domain);
                 unitOfWork.Flush();
 
                 //re-get
@@ -218,7 +219,7 @@ namespace Umbraco.Tests.Persistence.Repositories
                 domain.DomainName = "blah.com";
                 domain.RootContentId = content2.Id;
                 domain.LanguageId = lang2.Id;
-                repo.AddOrUpdate(domain);
+                repo.Save(domain);
                 unitOfWork.Flush();
 
                 //re-get
@@ -241,19 +242,19 @@ namespace Umbraco.Tests.Persistence.Repositories
             var provider = TestObjects.GetScopeUnitOfWorkProvider(Logger);
             using (var unitOfWork = provider.CreateUnitOfWork())
             {
-                ContentRepository contentRepo;
+                DocumentRepository documentRepo;
                 LanguageRepository langRepo;
                 ContentTypeRepository contentTypeRepo;
 
-                var repo = CreateRepository(unitOfWork, out contentTypeRepo, out contentRepo, out langRepo);
+                var repo = CreateRepository(unitOfWork, out contentTypeRepo, out documentRepo, out langRepo);
 
                 var lang = langRepo.GetByIsoCode("en-AU");
-                var content = contentRepo.Get(contentId);
+                var content = documentRepo.Get(contentId);
 
                 for (int i = 0; i < 10; i++)
                 {
                     var domain = (IDomain)new UmbracoDomain("test" + i + ".com") { RootContentId = content.Id, LanguageId = lang.Id };
-                    repo.AddOrUpdate(domain);
+                    repo.Save(domain);
                     unitOfWork.Flush();
                 }
 
@@ -272,19 +273,19 @@ namespace Umbraco.Tests.Persistence.Repositories
             var provider = TestObjects.GetScopeUnitOfWorkProvider(Logger);
             using (var unitOfWork = provider.CreateUnitOfWork())
             {
-                ContentRepository contentRepo;
+                DocumentRepository documentRepo;
                 LanguageRepository langRepo;
                 ContentTypeRepository contentTypeRepo;
 
-                var repo = CreateRepository(unitOfWork, out contentTypeRepo, out contentRepo, out langRepo);
+                var repo = CreateRepository(unitOfWork, out contentTypeRepo, out documentRepo, out langRepo);
 
                 var lang = langRepo.GetByIsoCode("en-AU");
-                var content = contentRepo.Get(contentId);
+                var content = documentRepo.Get(contentId);
 
                 for (int i = 0; i < 10; i++)
                 {
                     var domain = (IDomain)new UmbracoDomain("test" + i + ".com") { RootContentId = content.Id, LanguageId = lang.Id };
-                    repo.AddOrUpdate(domain);
+                    repo.Save(domain);
                     unitOfWork.Flush();
                 }
 
@@ -303,23 +304,23 @@ namespace Umbraco.Tests.Persistence.Repositories
             var provider = TestObjects.GetScopeUnitOfWorkProvider(Logger);
             using (var unitOfWork = provider.CreateUnitOfWork())
             {
-                ContentRepository contentRepo;
+                DocumentRepository documentRepo;
                 LanguageRepository langRepo;
                 ContentTypeRepository contentTypeRepo;
 
-                var repo = CreateRepository(unitOfWork, out contentTypeRepo, out contentRepo, out langRepo);
+                var repo = CreateRepository(unitOfWork, out contentTypeRepo, out documentRepo, out langRepo);
 
                 var lang = langRepo.GetByIsoCode("en-AU");
-                var content = contentRepo.Get(contentId);
+                var content = documentRepo.Get(contentId);
 
                 for (int i = 0; i < 10; i++)
                 {
                     var domain = (IDomain)new UmbracoDomain("test " + i + ".com") { RootContentId = content.Id, LanguageId = lang.Id };
-                    repo.AddOrUpdate(domain);
+                    repo.Save(domain);
                     unitOfWork.Flush();
                 }
 
-                var all = repo.GetAll();
+                var all = repo.GetMany();
 
                 Assert.AreEqual(10, all.Count());
             }
@@ -334,25 +335,25 @@ namespace Umbraco.Tests.Persistence.Repositories
             var provider = TestObjects.GetScopeUnitOfWorkProvider(Logger);
             using (var unitOfWork = provider.CreateUnitOfWork())
             {
-                ContentRepository contentRepo;
+                DocumentRepository documentRepo;
                 LanguageRepository langRepo;
                 ContentTypeRepository contentTypeRepo;
 
-                var repo = CreateRepository(unitOfWork, out contentTypeRepo, out contentRepo, out langRepo);
+                var repo = CreateRepository(unitOfWork, out contentTypeRepo, out documentRepo, out langRepo);
 
                 var lang = langRepo.GetByIsoCode("en-AU");
-                var content = contentRepo.Get(contentId);
+                var content = documentRepo.Get(contentId);
 
                 var ids = new List<int>();
                 for (int i = 0; i < 10; i++)
                 {
                     var domain = (IDomain)new UmbracoDomain("test " + i + ".com") { RootContentId = content.Id, LanguageId = lang.Id };
-                    repo.AddOrUpdate(domain);
+                    repo.Save(domain);
                     unitOfWork.Flush();
                     ids.Add(domain.Id);
                 }
 
-                var all = repo.GetAll(ids.Take(8).ToArray());
+                var all = repo.GetMany(ids.Take(8).ToArray());
 
                 Assert.AreEqual(8, all.Count());
             }
@@ -367,14 +368,14 @@ namespace Umbraco.Tests.Persistence.Repositories
             var provider = TestObjects.GetScopeUnitOfWorkProvider(Logger);
             using (var unitOfWork = provider.CreateUnitOfWork())
             {
-                ContentRepository contentRepo;
+                DocumentRepository documentRepo;
                 LanguageRepository langRepo;
                 ContentTypeRepository contentTypeRepo;
 
-                var repo = CreateRepository(unitOfWork, out contentTypeRepo, out contentRepo, out langRepo);
+                var repo = CreateRepository(unitOfWork, out contentTypeRepo, out documentRepo, out langRepo);
 
                 var lang = langRepo.GetByIsoCode("en-AU");
-                var content = contentRepo.Get(contentId);
+                var content = documentRepo.Get(contentId);
 
                 for (int i = 0; i < 10; i++)
                 {
@@ -383,7 +384,7 @@ namespace Umbraco.Tests.Persistence.Repositories
                         RootContentId = content.Id,
                         LanguageId = lang.Id
                     };
-                    repo.AddOrUpdate(domain);
+                    repo.Save(domain);
                     unitOfWork.Flush();
                 }
 
@@ -402,22 +403,22 @@ namespace Umbraco.Tests.Persistence.Repositories
             var provider = TestObjects.GetScopeUnitOfWorkProvider(Logger);
             using (var unitOfWork = provider.CreateUnitOfWork())
             {
-                ContentRepository contentRepo;
+                DocumentRepository documentRepo;
                 LanguageRepository langRepo;
                 ContentTypeRepository contentTypeRepo;
 
-                var repo = CreateRepository(unitOfWork, out contentTypeRepo, out contentRepo, out langRepo);
+                var repo = CreateRepository(unitOfWork, out contentTypeRepo, out documentRepo, out langRepo);
 
                 var contentItems = new List<IContent>();
 
                 var lang = langRepo.GetByIsoCode("en-AU");
-                contentItems.Add(contentRepo.Get(contentId));
+                contentItems.Add(documentRepo.Get(contentId));
 
                 //more test data (3 content items total)
                 for (int i = 0; i < 2; i++)
                 {
                     var c = new Content("test" + i, -1, ct) { CreatorId = 0, WriterId = 0 };
-                    contentRepo.AddOrUpdate(c);
+                    documentRepo.Save(c);
                     unitOfWork.Flush();
                     contentItems.Add(c);
                 }
@@ -429,7 +430,7 @@ namespace Umbraco.Tests.Persistence.Repositories
                         RootContentId = ((i % 2 == 0) ? contentItems[0] : contentItems[1]).Id,
                         LanguageId = lang.Id
                     };
-                    repo.AddOrUpdate(domain);
+                    repo.Save(domain);
                     unitOfWork.Flush();
                 }
 
@@ -453,22 +454,22 @@ namespace Umbraco.Tests.Persistence.Repositories
             var provider = TestObjects.GetScopeUnitOfWorkProvider(Logger);
             using (var unitOfWork = provider.CreateUnitOfWork())
             {
-                ContentRepository contentRepo;
+                DocumentRepository documentRepo;
                 LanguageRepository langRepo;
                 ContentTypeRepository contentTypeRepo;
 
-                var repo = CreateRepository(unitOfWork, out contentTypeRepo, out contentRepo, out langRepo);
+                var repo = CreateRepository(unitOfWork, out contentTypeRepo, out documentRepo, out langRepo);
 
                 var contentItems = new List<IContent>();
 
                 var lang = langRepo.GetByIsoCode("en-AU");
-                contentItems.Add(contentRepo.Get(contentId));
+                contentItems.Add(documentRepo.Get(contentId));
 
                 //more test data (3 content items total)
                 for (int i = 0; i < 2; i++)
                 {
                     var c = new Content("test" + i, -1, ct) { CreatorId = 0, WriterId = 0 };
-                    contentRepo.AddOrUpdate(c);
+                    documentRepo.Save(c);
                     unitOfWork.Flush();
                     contentItems.Add(c);
                 }
@@ -480,7 +481,7 @@ namespace Umbraco.Tests.Persistence.Repositories
                         RootContentId = ((i % 2 == 0) ? contentItems[0] : contentItems[1]).Id,
                         LanguageId = lang.Id
                     };
-                    repo.AddOrUpdate(domain);
+                    repo.Save(domain);
                     unitOfWork.Flush();
                 }
 
diff --git a/src/Umbraco.Tests/Persistence/Repositories/LanguageRepositoryTest.cs b/src/Umbraco.Tests/Persistence/Repositories/LanguageRepositoryTest.cs
index 1f69737e27..14030852ae 100644
--- a/src/Umbraco.Tests/Persistence/Repositories/LanguageRepositoryTest.cs
+++ b/src/Umbraco.Tests/Persistence/Repositories/LanguageRepositoryTest.cs
@@ -10,6 +10,7 @@ using Umbraco.Core.Persistence;
 
 using Umbraco.Core.Persistence.Querying;
 using Umbraco.Core.Persistence.Repositories;
+using Umbraco.Core.Persistence.Repositories.Implement;
 using Umbraco.Core.Persistence.UnitOfWork;
 using Umbraco.Tests.TestHelpers;
 using Umbraco.Tests.Testing;
@@ -68,7 +69,7 @@ namespace Umbraco.Tests.Persistence.Repositories
                 {
                     CultureName = au.DisplayName
                 };
-                repository.AddOrUpdate(language);
+                repository.Save(language);
                 unitOfWork.Flush();
 
                 //re-get
@@ -95,7 +96,7 @@ namespace Umbraco.Tests.Persistence.Repositories
                 {
                     CultureName = au.DisplayName
                 };
-                repository.AddOrUpdate(language);
+                repository.Save(language);
                 unitOfWork.Flush();
 
                 //re-get
@@ -136,7 +137,7 @@ namespace Umbraco.Tests.Persistence.Repositories
                 var repository = CreateRepository(unitOfWork);
 
                 // Act
-                var languages = repository.GetAll();
+                var languages = repository.GetMany();
 
                 // Assert
                 Assert.That(languages, Is.Not.Null);
@@ -156,7 +157,7 @@ namespace Umbraco.Tests.Persistence.Repositories
                 var repository = CreateRepository(unitOfWork);
 
                 // Act
-                var languages = repository.GetAll(1, 2);
+                var languages = repository.GetMany(1, 2);
 
                 // Assert
                 Assert.That(languages, Is.Not.Null);
@@ -177,7 +178,7 @@ namespace Umbraco.Tests.Persistence.Repositories
 
                 // Act
                 var query = unitOfWork.SqlContext.Query<ILanguage>().Where(x => x.IsoCode == "da-DK");
-                var result = repository.GetByQuery(query);
+                var result = repository.Get(query);
 
                 // Assert
                 Assert.That(result, Is.Not.Null);
@@ -215,7 +216,7 @@ namespace Umbraco.Tests.Persistence.Repositories
 
                 // Act
                 var languageBR = new Language("pt-BR") {CultureName = "pt-BR"};
-                repository.AddOrUpdate(languageBR);
+                repository.Save(languageBR);
                 unitOfWork.Flush();
 
                 // Assert
@@ -238,7 +239,7 @@ namespace Umbraco.Tests.Persistence.Repositories
                 language.IsoCode = "pt-BR";
                 language.CultureName = "pt-BR";
 
-                repository.AddOrUpdate(language);
+                repository.Save(language);
                 unitOfWork.Flush();
 
                 var languageUpdated = repository.Get(5);
diff --git a/src/Umbraco.Tests/Persistence/Repositories/MacroRepositoryTest.cs b/src/Umbraco.Tests/Persistence/Repositories/MacroRepositoryTest.cs
index 7114bc70ac..00c6666f68 100644
--- a/src/Umbraco.Tests/Persistence/Repositories/MacroRepositoryTest.cs
+++ b/src/Umbraco.Tests/Persistence/Repositories/MacroRepositoryTest.cs
@@ -10,6 +10,7 @@ using Umbraco.Core.Persistence;
 
 using Umbraco.Core.Persistence.Querying;
 using Umbraco.Core.Persistence.Repositories;
+using Umbraco.Core.Persistence.Repositories.Implement;
 using Umbraco.Core.Persistence.UnitOfWork;
 using Umbraco.Tests.TestHelpers;
 using Umbraco.Tests.Testing;
@@ -37,7 +38,7 @@ namespace Umbraco.Tests.Persistence.Repositories
                 var repository = new MacroRepository(unitOfWork, CacheHelper.CreateDisabledCacheHelper(), Mock.Of<ILogger>());
 
                 var macro = new Macro("test1", "Test", "~/usercontrol/blah.ascx", "MyAssembly", "test.xslt", "~/views/macropartials/test.cshtml");
-                repository.AddOrUpdate(macro);
+                repository.Save(macro);
 
                 Assert.Throws<SqlCeException>(unitOfWork.Flush);
             }
@@ -55,7 +56,7 @@ namespace Umbraco.Tests.Persistence.Repositories
 
                 var macro = repository.Get(1);
                 macro.Alias = "test2";
-                repository.AddOrUpdate(macro);
+                repository.Save(macro);
                 Assert.Throws<SqlCeException>(unitOfWork.Flush);
             }
 
@@ -116,7 +117,7 @@ namespace Umbraco.Tests.Persistence.Repositories
                 var repository = new MacroRepository(unitOfWork, CacheHelper.CreateDisabledCacheHelper(), Mock.Of<ILogger>());
 
                 // Act
-                var macros = repository.GetAll();
+                var macros = repository.GetMany();
 
                 // Assert
                 Assert.That(macros.Count(), Is.EqualTo(3));
@@ -135,7 +136,7 @@ namespace Umbraco.Tests.Persistence.Repositories
 
                 // Act
                 var query = unitOfWork.SqlContext.Query<IMacro>().Where(x => x.Alias.ToUpper() == "TEST1");
-                var result = repository.GetByQuery(query);
+                var result = repository.Get(query);
 
                 // Assert
                 Assert.AreEqual(1, result.Count());
@@ -172,7 +173,7 @@ namespace Umbraco.Tests.Persistence.Repositories
                 // Act
                 var macro = new Macro("test", "Test", "~/usercontrol/blah.ascx", "MyAssembly", "test.xslt", "~/views/macropartials/test.cshtml");
                 macro.Properties.Add(new MacroProperty("test", "Test", 0, "test"));
-                repository.AddOrUpdate(macro);
+                repository.Save(macro);
                 unitOfWork.Flush();
 
                 // Assert
@@ -204,7 +205,7 @@ namespace Umbraco.Tests.Persistence.Repositories
                 macro.UseInEditor = true;
                 macro.XsltPath = "";
 
-                repository.AddOrUpdate(macro);
+                repository.Save(macro);
                 unitOfWork.Flush();
 
                 var macroUpdated = repository.Get(2);
@@ -277,7 +278,7 @@ namespace Umbraco.Tests.Persistence.Repositories
                 var macro = repository.Get(1);
                 macro.Properties.Add(new MacroProperty("new1", "New1", 3, "test"));
 
-                repository.AddOrUpdate(macro);
+                repository.Save(macro);
 
                 unitOfWork.Flush();
 
@@ -305,7 +306,7 @@ namespace Umbraco.Tests.Persistence.Repositories
                 var macro = new Macro("newmacro", "A new macro", "~/usercontrol/test1.ascx", "MyAssembly1", "test1.xslt", "~/views/macropartials/test1.cshtml");
                 macro.Properties.Add(new MacroProperty("blah1", "New1", 4, "test.editor"));
 
-                repository.AddOrUpdate(macro);
+                repository.Save(macro);
 
                 unitOfWork.Flush();
 
@@ -330,12 +331,12 @@ namespace Umbraco.Tests.Persistence.Repositories
 
                 var macro = new Macro("newmacro", "A new macro", "~/usercontrol/test1.ascx", "MyAssembly1", "test1.xslt", "~/views/macropartials/test1.cshtml");
                 macro.Properties.Add(new MacroProperty("blah1", "New1", 4, "test.editor"));
-                repository.AddOrUpdate(macro);
+                repository.Save(macro);
                 unitOfWork.Flush();
 
                 var result = repository.Get(macro.Id);
                 result.Properties.Remove("blah1");
-                repository.AddOrUpdate(result);
+                repository.Save(result);
                 unitOfWork.Flush();
 
                 // Assert
@@ -365,7 +366,7 @@ namespace Umbraco.Tests.Persistence.Repositories
                 macro.Properties.Remove("blah2");
                 macro.Properties.Add(prop2);
 
-                repository.AddOrUpdate(macro);
+                repository.Save(macro);
                 unitOfWork.Flush();
 
                 // Assert
@@ -388,13 +389,13 @@ namespace Umbraco.Tests.Persistence.Repositories
 
                 var macro = repository.Get(1);
                 macro.Properties.Add(new MacroProperty("new1", "New1", 3, "test"));
-                repository.AddOrUpdate(macro);
+                repository.Save(macro);
                 unitOfWork.Flush();
 
                 //Act
                 macro = repository.Get(1);
                 macro.Properties["new1"].Name = "this is a new name";
-                repository.AddOrUpdate(macro);
+                repository.Save(macro);
                 unitOfWork.Flush();
 
 
@@ -417,13 +418,13 @@ namespace Umbraco.Tests.Persistence.Repositories
 
                 var macro = repository.Get(1);
                 macro.Properties.Add(new MacroProperty("new1", "New1", 3, "test"));
-                repository.AddOrUpdate(macro);
+                repository.Save(macro);
                 unitOfWork.Flush();
 
                 //Act
                 macro = repository.Get(1);
                 macro.Properties.UpdateProperty("new1", newAlias: "newAlias");
-                repository.AddOrUpdate(macro);
+                repository.Save(macro);
                 unitOfWork.Flush();
 
                 // Assert
@@ -445,9 +446,9 @@ namespace Umbraco.Tests.Persistence.Repositories
             {
                 var repository = new MacroRepository(unitOfWork, CacheHelper.CreateDisabledCacheHelper(), Mock.Of<ILogger>());
 
-                repository.AddOrUpdate(new Macro("test1", "Test1", "~/usercontrol/test1.ascx", "MyAssembly1", "test1.xslt", "~/views/macropartials/test1.cshtml"));
-                repository.AddOrUpdate(new Macro("test2", "Test2", "~/usercontrol/test2.ascx", "MyAssembly2", "test2.xslt", "~/views/macropartials/test2.cshtml"));
-                repository.AddOrUpdate(new Macro("test3", "Tet3", "~/usercontrol/test3.ascx", "MyAssembly3", "test3.xslt", "~/views/macropartials/test3.cshtml"));
+                repository.Save(new Macro("test1", "Test1", "~/usercontrol/test1.ascx", "MyAssembly1", "test1.xslt", "~/views/macropartials/test1.cshtml"));
+                repository.Save(new Macro("test2", "Test2", "~/usercontrol/test2.ascx", "MyAssembly2", "test2.xslt", "~/views/macropartials/test2.cshtml"));
+                repository.Save(new Macro("test3", "Tet3", "~/usercontrol/test3.ascx", "MyAssembly3", "test3.xslt", "~/views/macropartials/test3.cshtml"));
                 unitOfWork.Complete();
             }
 
diff --git a/src/Umbraco.Tests/Persistence/Repositories/MediaRepositoryTest.cs b/src/Umbraco.Tests/Persistence/Repositories/MediaRepositoryTest.cs
index da6897412e..c24d114453 100644
--- a/src/Umbraco.Tests/Persistence/Repositories/MediaRepositoryTest.cs
+++ b/src/Umbraco.Tests/Persistence/Repositories/MediaRepositoryTest.cs
@@ -13,6 +13,7 @@ using Umbraco.Core.Persistence.UnitOfWork;
 using Umbraco.Tests.TestHelpers;
 using Umbraco.Tests.TestHelpers.Entities;
 using Umbraco.Core.Persistence.DatabaseModelDefinitions;
+using Umbraco.Core.Persistence.Repositories.Implement;
 using Umbraco.Tests.Testing;
 
 namespace Umbraco.Tests.Persistence.Repositories
@@ -60,8 +61,8 @@ namespace Umbraco.Tests.Persistence.Repositories
 
                 var mediaType = MockedContentTypes.CreateSimpleMediaType("umbTextpage1", "Textpage");
                 var media = MockedMedia.CreateSimpleMedia(mediaType, "hello", -1);
-                mediaTypeRepository.AddOrUpdate(mediaType);
-                repository.AddOrUpdate(media);
+                mediaTypeRepository.Save(mediaType);
+                repository.Save(media);
                 unitOfWork.Complete();
 
                 udb.EnableSqlCount = true;
@@ -101,8 +102,8 @@ namespace Umbraco.Tests.Persistence.Repositories
                 var image = MockedMedia.CreateMediaImage(mediaType, -1);
 
                 // Act
-                mediaTypeRepository.AddOrUpdate(mediaType);
-                repository.AddOrUpdate(image);
+                mediaTypeRepository.Save(mediaType);
+                repository.Save(image);
                 unitOfWork.Flush();
 
                 var fetched = repository.Get(image.Id);
@@ -129,11 +130,11 @@ namespace Umbraco.Tests.Persistence.Repositories
                 var file = MockedMedia.CreateMediaFile(mediaType, -1);
 
                 // Act
-                repository.AddOrUpdate(file);
+                repository.Save(file);
                 unitOfWork.Flush();
 
                 var image = MockedMedia.CreateMediaImage(mediaType, -1);
-                repository.AddOrUpdate(image);
+                repository.Save(image);
                 unitOfWork.Flush();
 
                 // Assert
@@ -178,7 +179,7 @@ namespace Umbraco.Tests.Persistence.Repositories
                 // Act
                 var content = repository.Get(NodeDto.NodeIdSeed + 2);
                 content.Name = "Test File Updated";
-                repository.AddOrUpdate(content);
+                repository.Save(content);
                 unitOfWork.Flush();
 
                 var updatedContent = repository.Get(NodeDto.NodeIdSeed + 2);
@@ -252,7 +253,7 @@ namespace Umbraco.Tests.Persistence.Repositories
 
                 // Act
                 var query = unitOfWork.SqlContext.Query<IMedia>().Where(x => x.Level == 2);
-                var result = repository.GetByQuery(query);
+                var result = repository.Get(query);
 
                 // Assert
                 Assert.That(result.Count(), Is.GreaterThanOrEqualTo(2)); //There should be two entities on level 2: File and Media
@@ -273,13 +274,13 @@ namespace Umbraco.Tests.Persistence.Repositories
                 for (int i = 0; i < 10; i++)
                 {
                     var folder = MockedMedia.CreateMediaFolder(folderMediaType, -1);
-                    repository.AddOrUpdate(folder);
+                    repository.Save(folder);
                 }
                 unitOfWork.Flush();
 
                 var types = new[] { 1031 };
                 var query = unitOfWork.SqlContext.Query<IMedia>().Where(x => types.Contains(x.ContentTypeId));
-                var result = repository.GetByQuery(query);
+                var result = repository.Get(query);
 
                 // Assert
                 Assert.That(result.Count(), Is.GreaterThanOrEqualTo(11));
@@ -304,13 +305,13 @@ namespace Umbraco.Tests.Persistence.Repositories
                 for (int i = 0; i < 10; i++)
                 {
                     var folder = MockedMedia.CreateMediaFolder(folderMediaType, -1);
-                    repository.AddOrUpdate(folder);
+                    repository.Save(folder);
                 }
                 unitOfWork.Flush();
 
                 var types = new[] { "Folder" };
                 var query = unitOfWork.SqlContext.Query<IMedia>().Where(x => types.Contains(x.ContentType.Alias));
-                var result = repository.GetByQuery(query);
+                var result = repository.Get(query);
 
                 // Assert
                 Assert.That(result.Count(), Is.GreaterThanOrEqualTo(11));
@@ -329,7 +330,7 @@ namespace Umbraco.Tests.Persistence.Repositories
                 // Act
                 var query = unitOfWork.SqlContext.Query<IMedia>().Where(x => x.Level == 2);
                 long totalRecords;
-                var result = repository.GetPagedResultsByQuery(query, 0, 1, out totalRecords, "SortOrder", Direction.Ascending, true);
+                var result = repository.GetPage(query, 0, 1, out totalRecords, "SortOrder", Direction.Ascending, true);
 
                 // Assert
                 Assert.That(totalRecords, Is.GreaterThanOrEqualTo(2));
@@ -351,7 +352,7 @@ namespace Umbraco.Tests.Persistence.Repositories
                 // Act
                 var query = unitOfWork.SqlContext.Query<IMedia>().Where(x => x.Level == 2);
                 long totalRecords;
-                var result = repository.GetPagedResultsByQuery(query, 1, 1, out totalRecords, "SortOrder", Direction.Ascending, true);
+                var result = repository.GetPage(query, 1, 1, out totalRecords, "SortOrder", Direction.Ascending, true);
 
                 // Assert
                 Assert.That(totalRecords, Is.GreaterThanOrEqualTo(2));
@@ -373,7 +374,7 @@ namespace Umbraco.Tests.Persistence.Repositories
                 // Act
                 var query = unitOfWork.SqlContext.Query<IMedia>().Where(x => x.Level == 2);
                 long totalRecords;
-                var result = repository.GetPagedResultsByQuery(query, 0, 2, out totalRecords, "SortOrder", Direction.Ascending, true);
+                var result = repository.GetPage(query, 0, 2, out totalRecords, "SortOrder", Direction.Ascending, true);
 
                 // Assert
                 Assert.That(totalRecords, Is.GreaterThanOrEqualTo(2));
@@ -395,7 +396,7 @@ namespace Umbraco.Tests.Persistence.Repositories
                 // Act
                 var query = unitOfWork.SqlContext.Query<IMedia>().Where(x => x.Level == 2);
                 long totalRecords;
-                var result = repository.GetPagedResultsByQuery(query, 0, 1, out totalRecords, "SortOrder", Direction.Descending, true);
+                var result = repository.GetPage(query, 0, 1, out totalRecords, "SortOrder", Direction.Descending, true);
 
                 // Assert
                 Assert.That(totalRecords, Is.GreaterThanOrEqualTo(2));
@@ -417,7 +418,7 @@ namespace Umbraco.Tests.Persistence.Repositories
                 // Act
                 var query = unitOfWork.SqlContext.Query<IMedia>().Where(x => x.Level == 2);
                 long totalRecords;
-                var result = repository.GetPagedResultsByQuery(query, 0, 1, out totalRecords, "Name", Direction.Ascending, true);
+                var result = repository.GetPage(query, 0, 1, out totalRecords, "Name", Direction.Ascending, true);
 
                 // Assert
                 Assert.That(totalRecords, Is.GreaterThanOrEqualTo(2));
@@ -441,7 +442,7 @@ namespace Umbraco.Tests.Persistence.Repositories
                 long totalRecords;
 
                 var filter = unitOfWork.SqlContext.Query<IMedia>().Where(x => x.Name.Contains("File"));
-                var result = repository.GetPagedResultsByQuery(query, 0, 1, out totalRecords, "SortOrder", Direction.Ascending, true, filter);
+                var result = repository.GetPage(query, 0, 1, out totalRecords, "SortOrder", Direction.Ascending, true, filter);
 
                 // Assert
                 Assert.That(totalRecords, Is.EqualTo(1));
@@ -465,7 +466,7 @@ namespace Umbraco.Tests.Persistence.Repositories
                 long totalRecords;
 
                 var filter = unitOfWork.SqlContext.Query<IMedia>().Where(x => x.Name.Contains("Test"));
-                var result = repository.GetPagedResultsByQuery(query, 0, 1, out totalRecords, "SortOrder", Direction.Ascending, true, filter);
+                var result = repository.GetPage(query, 0, 1, out totalRecords, "SortOrder", Direction.Ascending, true, filter);
 
                 // Assert
                 Assert.That(totalRecords, Is.EqualTo(2));
@@ -485,7 +486,7 @@ namespace Umbraco.Tests.Persistence.Repositories
                 var repository = CreateRepository(unitOfWork, out mediaTypeRepository);
 
                 // Act
-                var medias = repository.GetAll(NodeDto.NodeIdSeed + 1, NodeDto.NodeIdSeed + 2);
+                var medias = repository.GetMany(NodeDto.NodeIdSeed + 1, NodeDto.NodeIdSeed + 2);
 
                 // Assert
                 Assert.That(medias, Is.Not.Null);
@@ -505,19 +506,19 @@ namespace Umbraco.Tests.Persistence.Repositories
                 var repository = CreateRepository(unitOfWork, out mediaTypeRepository);
 
                 // Act
-                var medias = repository.GetAll();
+                var medias = repository.GetMany();
 
                 // Assert
                 Assert.That(medias, Is.Not.Null);
                 Assert.That(medias.Any(), Is.True);
                 Assert.That(medias.Count(), Is.GreaterThanOrEqualTo(3));
 
-                medias = repository.GetAll(medias.Select(x => x.Id).ToArray());
+                medias = repository.GetMany(medias.Select(x => x.Id).ToArray());
                 Assert.That(medias, Is.Not.Null);
                 Assert.That(medias.Any(), Is.True);
                 Assert.That(medias.Count(), Is.GreaterThanOrEqualTo(3));
 
-                medias = ((IReadRepository<Guid, IMedia>)repository).GetAll(medias.Select(x => x.Key).ToArray());
+                medias = ((IReadRepository<Guid, IMedia>)repository).GetMany(medias.Select(x => x.Key).ToArray());
                 Assert.That(medias, Is.Not.Null);
                 Assert.That(medias.Any(), Is.True);
                 Assert.That(medias.Count(), Is.GreaterThanOrEqualTo(3));
diff --git a/src/Umbraco.Tests/Persistence/Repositories/MediaTypeRepositoryTest.cs b/src/Umbraco.Tests/Persistence/Repositories/MediaTypeRepositoryTest.cs
index 6b42a14f01..e0a6b623ea 100644
--- a/src/Umbraco.Tests/Persistence/Repositories/MediaTypeRepositoryTest.cs
+++ b/src/Umbraco.Tests/Persistence/Repositories/MediaTypeRepositoryTest.cs
@@ -4,7 +4,9 @@ using NUnit.Framework;
 using Umbraco.Core;
 using Umbraco.Core.Models;
 using Umbraco.Core.Models.Rdbms;
+using Umbraco.Core.Persistence;
 using Umbraco.Core.Persistence.Repositories;
+using Umbraco.Core.Persistence.Repositories.Implement;
 using Umbraco.Core.Persistence.UnitOfWork;
 using Umbraco.Tests.TestHelpers;
 using Umbraco.Tests.TestHelpers.Entities;
@@ -37,16 +39,16 @@ namespace Umbraco.Tests.Persistence.Repositories
                 var repository = CreateRepository(unitOfWork);
 
                 var container1 = new EntityContainer(Constants.ObjectTypes.MediaType) { Name = "blah1" };
-                containerRepository.AddOrUpdate(container1);
+                containerRepository.Save(container1);
                 unitOfWork.Flush();
 
                 var container2 = new EntityContainer(Constants.ObjectTypes.MediaType) { Name = "blah2", ParentId = container1.Id };
-                containerRepository.AddOrUpdate(container2);
+                containerRepository.Save(container2);
                 unitOfWork.Flush();
 
                 var contentType = (IMediaType)MockedContentTypes.CreateVideoMediaType();
                 contentType.ParentId = container2.Id;
-                repository.AddOrUpdate(contentType);
+                repository.Save(contentType);
                 unitOfWork.Flush();
 
                 //create a
@@ -55,7 +57,7 @@ namespace Umbraco.Tests.Persistence.Repositories
                     Name = "Blahasdfsadf"
                 };
                 contentType.ParentId = contentType.Id;
-                repository.AddOrUpdate(contentType2);
+                repository.Save(contentType2);
                 unitOfWork.Flush();
 
                 var result = repository.Move(contentType, container1).ToArray();
@@ -83,7 +85,7 @@ namespace Umbraco.Tests.Persistence.Repositories
                 var containerRepository = CreateContainerRepository(unitOfWork);
 
                 var container = new EntityContainer(Constants.ObjectTypes.MediaType) { Name = "blah" };
-                containerRepository.AddOrUpdate(container);
+                containerRepository.Save(container);
                 unitOfWork.Flush();
                 Assert.That(container.Id, Is.GreaterThan(0));
 
@@ -101,7 +103,7 @@ namespace Umbraco.Tests.Persistence.Repositories
                 var containerRepository = CreateContainerRepository(unitOfWork);
 
                 var container = new EntityContainer(Constants.ObjectTypes.MediaType) { Name = "blah" };
-                containerRepository.AddOrUpdate(container);
+                containerRepository.Save(container);
                 unitOfWork.Flush();
                 Assert.That(container.Id, Is.GreaterThan(0));
 
@@ -124,12 +126,12 @@ namespace Umbraco.Tests.Persistence.Repositories
                 var repository = CreateRepository(unitOfWork);
 
                 var container = new EntityContainer(Constants.ObjectTypes.MediaType) { Name = "blah" };
-                containerRepository.AddOrUpdate(container);
+                containerRepository.Save(container);
                 unitOfWork.Flush();
 
                 var contentType = MockedContentTypes.CreateVideoMediaType();
                 contentType.ParentId = container.Id;
-                repository.AddOrUpdate(contentType);
+                repository.Save(contentType);
                 unitOfWork.Flush();
 
                 Assert.AreEqual(container.Id, contentType.ParentId);
@@ -146,12 +148,12 @@ namespace Umbraco.Tests.Persistence.Repositories
                 var repository = CreateRepository(unitOfWork);
 
                 var container = new EntityContainer(Constants.ObjectTypes.MediaType) { Name = "blah" };
-                containerRepository.AddOrUpdate(container);
+                containerRepository.Save(container);
                 unitOfWork.Flush();
 
                 IMediaType contentType = MockedContentTypes.CreateVideoMediaType();
                 contentType.ParentId = container.Id;
-                repository.AddOrUpdate(contentType);
+                repository.Save(contentType);
                 unitOfWork.Flush();
 
                 // Act
@@ -178,7 +180,7 @@ namespace Umbraco.Tests.Persistence.Repositories
 
                 // Act
                 var contentType = MockedContentTypes.CreateVideoMediaType();
-                repository.AddOrUpdate(contentType);
+                repository.Save(contentType);
                 unitOfWork.Flush();
 
                 var fetched = repository.Get(contentType.Id);
@@ -205,7 +207,7 @@ namespace Umbraco.Tests.Persistence.Repositories
                 var repository = CreateRepository(unitOfWork);
 
                 var videoMediaType = MockedContentTypes.CreateVideoMediaType();
-                repository.AddOrUpdate(videoMediaType);
+                repository.Save(videoMediaType);
                 unitOfWork.Flush();
 
                 // Act
@@ -220,7 +222,7 @@ namespace Umbraco.Tests.Persistence.Repositories
                         SortOrder = 1,
                         DataTypeDefinitionId = -88
                     });
-                repository.AddOrUpdate(mediaType);
+                repository.Save(mediaType);
                 unitOfWork.Flush();
 
                 var dirty = ((MediaType) mediaType).IsDirty();
@@ -244,7 +246,7 @@ namespace Umbraco.Tests.Persistence.Repositories
 
                 // Act
                 var mediaType = MockedContentTypes.CreateVideoMediaType();
-                repository.AddOrUpdate(mediaType);
+                repository.Save(mediaType);
                 unitOfWork.Flush();
 
                 var contentType2 = repository.Get(mediaType.Id);
@@ -308,7 +310,7 @@ namespace Umbraco.Tests.Persistence.Repositories
                 var repository = CreateRepository(unitOfWork);
 
                 // Act
-                var mediaTypes = repository.GetAll();
+                var mediaTypes = repository.GetMany();
                 int count =
                     unitOfWork.Database.ExecuteScalar<int>(
                         "SELECT COUNT(*) FROM umbracoNode WHERE nodeObjectType = @NodeObjectType",
@@ -329,11 +331,11 @@ namespace Umbraco.Tests.Persistence.Repositories
             {
                 var repository = CreateRepository(unitOfWork);
 
-                var allGuidIds = repository.GetAll().Select(x => x.Key).ToArray();
+                var allGuidIds = repository.GetMany().Select(x => x.Key).ToArray();
 
                 // Act
 
-                var mediaTypes = ((IReadRepository<Guid, IMediaType>)repository).GetAll(allGuidIds);
+                var mediaTypes = ((IReadRepository<Guid, IMediaType>)repository).GetMany(allGuidIds);
 
                 int count =
                     unitOfWork.Database.ExecuteScalar<int>(
@@ -373,13 +375,13 @@ namespace Umbraco.Tests.Persistence.Repositories
                 var repository = CreateRepository(unitOfWork);
 
                 var mediaType = MockedContentTypes.CreateVideoMediaType();
-                repository.AddOrUpdate(mediaType);
+                repository.Save(mediaType);
                 unitOfWork.Flush();
 
                 // Act
                 var mediaTypeV2 = repository.Get(NodeDto.NodeIdSeed);
                 mediaTypeV2.PropertyGroups["Media"].PropertyTypes.Remove("title");
-                repository.AddOrUpdate(mediaTypeV2);
+                repository.Save(mediaTypeV2);
                 unitOfWork.Flush();
 
                 var mediaTypeV3 = repository.Get(NodeDto.NodeIdSeed);
@@ -401,7 +403,7 @@ namespace Umbraco.Tests.Persistence.Repositories
                 var repository = CreateRepository(unitOfWork);
 
                 var mediaType = MockedContentTypes.CreateVideoMediaType();
-                repository.AddOrUpdate(mediaType);
+                repository.Save(mediaType);
                 unitOfWork.Flush();
 
                 // Act
diff --git a/src/Umbraco.Tests/Persistence/Repositories/MemberRepositoryTest.cs b/src/Umbraco.Tests/Persistence/Repositories/MemberRepositoryTest.cs
index 8231f5cd08..9bf7479820 100644
--- a/src/Umbraco.Tests/Persistence/Repositories/MemberRepositoryTest.cs
+++ b/src/Umbraco.Tests/Persistence/Repositories/MemberRepositoryTest.cs
@@ -14,6 +14,7 @@ using Umbraco.Core.Persistence;
 
 using Umbraco.Core.Persistence.Querying;
 using Umbraco.Core.Persistence.Repositories;
+using Umbraco.Core.Persistence.Repositories.Implement;
 using Umbraco.Core.Persistence.UnitOfWork;
 using Umbraco.Tests.TestHelpers;
 using Umbraco.Tests.TestHelpers.Entities;
@@ -67,7 +68,7 @@ namespace Umbraco.Tests.Persistence.Repositories
                 var m1 = CreateTestMember(type, "Test 1", "test1@test.com", "pass1", "test1");
                 var m2 = CreateTestMember(type, "Test 2", "test2@test.com", "pass2", "test2");
 
-                var members = repository.GetAll(m1.Id, m2.Id);
+                var members = repository.GetMany(m1.Id, m2.Id);
 
                 Assert.That(members, Is.Not.Null);
                 Assert.That(members.Count(), Is.EqualTo(2));
@@ -92,7 +93,7 @@ namespace Umbraco.Tests.Persistence.Repositories
                     CreateTestMember(type, "Test " + i, "test" + i + "@test.com", "pass" + i, "test" + i);
                 }
 
-                var members = repository.GetAll();
+                var members = repository.GetMany();
 
                 Assert.That(members, Is.Not.Null);
                 Assert.That(members.Any(x => x == null), Is.False);
@@ -117,7 +118,7 @@ namespace Umbraco.Tests.Persistence.Repositories
 
                 // Act
                 var query = unitOfWork.SqlContext.Query<IMember>().Where(x => x.Key == key);
-                var result = repository.GetByQuery(query);
+                var result = repository.Get(query);
 
                 // Assert
                 Assert.That(result.Count(), Is.EqualTo(1));
@@ -161,11 +162,11 @@ namespace Umbraco.Tests.Persistence.Repositories
                 var repository = CreateRepository(unitOfWork, out memberTypeRepository, out memberGroupRepository);
 
                 var memberType = MockedContentTypes.CreateSimpleMemberType();
-                memberTypeRepository.AddOrUpdate(memberType);
+                memberTypeRepository.Save(memberType);
                 unitOfWork.Flush();
 
                 var member = MockedMember.CreateSimpleMember(memberType, "Johnny Hefty", "johnny@example.com", "123", "hefty");
-                repository.AddOrUpdate(member);
+                repository.Save(member);
                 unitOfWork.Flush();
 
                 var sut = repository.Get(member.Id);
@@ -195,17 +196,17 @@ namespace Umbraco.Tests.Persistence.Repositories
                 var repository = CreateRepository(unitOfWork, out memberTypeRepository, out memberGroupRepository);
 
                 var memberType = MockedContentTypes.CreateSimpleMemberType();
-                memberTypeRepository.AddOrUpdate(memberType);
+                memberTypeRepository.Save(memberType);
                 unitOfWork.Flush();
 
                 var member = MockedMember.CreateSimpleMember(memberType, "Johnny Hefty", "johnny@example.com", "123", "hefty");
-                repository.AddOrUpdate(member);
+                repository.Save(member);
                 unitOfWork.Flush();
 
                 sut = repository.Get(member.Id);
                 //when the password is null it will not overwrite what is already there.
                 sut.RawPasswordValue = null;
-                repository.AddOrUpdate(sut);
+                repository.Save(sut);
                 unitOfWork.Flush();
                 sut = repository.Get(member.Id);
 
@@ -225,17 +226,17 @@ namespace Umbraco.Tests.Persistence.Repositories
                 var repository = CreateRepository(unitOfWork, out memberTypeRepository, out memberGroupRepository);
 
                 var memberType = MockedContentTypes.CreateSimpleMemberType();
-                memberTypeRepository.AddOrUpdate(memberType);
+                memberTypeRepository.Save(memberType);
                 unitOfWork.Flush();
 
                 var member = MockedMember.CreateSimpleMember(memberType, "Johnny Hefty", "johnny@example.com", "123", "hefty");
-                repository.AddOrUpdate(member);
+                repository.Save(member);
                 unitOfWork.Flush();
 
                 sut = repository.Get(member.Id);
                 sut.Username = "This is new";
                 sut.Email = "thisisnew@hello.com";
-                repository.AddOrUpdate(sut);
+                repository.Save(sut);
                 unitOfWork.Flush();
                 sut = repository.Get(member.Id);
 
@@ -277,12 +278,12 @@ namespace Umbraco.Tests.Persistence.Repositories
                 if (memberType == null)
                 {
                     memberType = MockedContentTypes.CreateSimpleMemberType();
-                    memberTypeRepository.AddOrUpdate(memberType);
+                    memberTypeRepository.Save(memberType);
                     unitOfWork.Flush();
                 }
 
                 var member = MockedMember.CreateSimpleMember(memberType, name ?? "Johnny Hefty", email ?? "johnny@example.com", password ?? "123", username ?? "hefty", key);
-                repository.AddOrUpdate(member);
+                repository.Save(member);
                 unitOfWork.Complete();
 
                 return member;
@@ -299,7 +300,7 @@ namespace Umbraco.Tests.Persistence.Repositories
                 var repository = CreateRepository(unitOfWork, out memberTypeRepository, out memberGroupRepository);
 
                 var memberType = MockedContentTypes.CreateSimpleMemberType(alias);
-                memberTypeRepository.AddOrUpdate(memberType);
+                memberTypeRepository.Save(memberType);
                 unitOfWork.Complete();
                 return memberType;
             }
diff --git a/src/Umbraco.Tests/Persistence/Repositories/MemberTypeRepositoryTest.cs b/src/Umbraco.Tests/Persistence/Repositories/MemberTypeRepositoryTest.cs
index 12cbaca7cf..ba4eb137bf 100644
--- a/src/Umbraco.Tests/Persistence/Repositories/MemberTypeRepositoryTest.cs
+++ b/src/Umbraco.Tests/Persistence/Repositories/MemberTypeRepositoryTest.cs
@@ -6,7 +6,9 @@ using Umbraco.Core;
 using Umbraco.Core.Cache;
 using Umbraco.Core.Logging;
 using Umbraco.Core.Models;
+using Umbraco.Core.Persistence;
 using Umbraco.Core.Persistence.Repositories;
+using Umbraco.Core.Persistence.Repositories.Implement;
 using Umbraco.Core.Persistence.UnitOfWork;
 using Umbraco.Tests.TestHelpers;
 using Umbraco.Tests.TestHelpers.Entities;
@@ -32,7 +34,7 @@ namespace Umbraco.Tests.Persistence.Repositories
                 var repository = CreateRepository(unitOfWork);
 
                 var memberType = (IMemberType) MockedContentTypes.CreateSimpleMemberType();
-                repository.AddOrUpdate(memberType);
+                repository.Save(memberType);
                 unitOfWork.Flush();
 
                 var sut = repository.Get(memberType.Id);
@@ -60,7 +62,7 @@ namespace Umbraco.Tests.Persistence.Repositories
 
                 var memberType = (IMemberType)MockedContentTypes.CreateSimpleMemberType();
 
-                repository.AddOrUpdate(memberType);
+                repository.Save(memberType);
                 unitOfWork.Complete();
 
                 var propertyKeys = memberType.PropertyTypes.Select(x => x.Key).OrderBy(x => x).ToArray();
@@ -86,7 +88,7 @@ namespace Umbraco.Tests.Persistence.Repositories
 
                 var memberType = MockedContentTypes.CreateSimpleMemberType();
                 memberType.Alias = null;
-                repository.AddOrUpdate(memberType);
+                repository.Save(memberType);
 
                 Assert.Throws<InvalidOperationException>(unitOfWork.Flush);
             }
@@ -101,16 +103,16 @@ namespace Umbraco.Tests.Persistence.Repositories
                 var repository = CreateRepository(unitOfWork);
 
                 var memberType1 = MockedContentTypes.CreateSimpleMemberType();
-                repository.AddOrUpdate(memberType1);
+                repository.Save(memberType1);
                 unitOfWork.Flush();
 
                 var memberType2 = MockedContentTypes.CreateSimpleMemberType();
                 memberType2.Name = "AnotherType";
                 memberType2.Alias = "anotherType";
-                repository.AddOrUpdate(memberType2);
+                repository.Save(memberType2);
                 unitOfWork.Flush();
 
-                var result = repository.GetAll();
+                var result = repository.GetMany();
 
                 //there are 3 because of the Member type created for init data
                 Assert.AreEqual(3, result.Count());
@@ -126,16 +128,16 @@ namespace Umbraco.Tests.Persistence.Repositories
                 var repository = CreateRepository(unitOfWork);
 
                 var memberType1 = MockedContentTypes.CreateSimpleMemberType();
-                repository.AddOrUpdate(memberType1);
+                repository.Save(memberType1);
                 unitOfWork.Flush();
 
                 var memberType2 = MockedContentTypes.CreateSimpleMemberType();
                 memberType2.Name = "AnotherType";
                 memberType2.Alias = "anotherType";
-                repository.AddOrUpdate(memberType2);
+                repository.Save(memberType2);
                 unitOfWork.Flush();
 
-                var result = ((IReadRepository<Guid, IMemberType>)repository).GetAll(memberType1.Key, memberType2.Key);
+                var result = ((IReadRepository<Guid, IMemberType>)repository).GetMany(memberType1.Key, memberType2.Key);
 
                 //there are 3 because of the Member type created for init data
                 Assert.AreEqual(2, result.Count());
@@ -151,13 +153,13 @@ namespace Umbraco.Tests.Persistence.Repositories
                 var repository = CreateRepository(unitOfWork);
 
                 var memberType1 = MockedContentTypes.CreateSimpleMemberType();
-                repository.AddOrUpdate(memberType1);
+                repository.Save(memberType1);
                 unitOfWork.Flush();
 
                 var memberType2 = MockedContentTypes.CreateSimpleMemberType();
                 memberType2.Name = "AnotherType";
                 memberType2.Alias = "anotherType";
-                repository.AddOrUpdate(memberType2);
+                repository.Save(memberType2);
                 unitOfWork.Flush();
 
                 var result = repository.Get(memberType1.Key);
@@ -180,17 +182,17 @@ namespace Umbraco.Tests.Persistence.Repositories
 
                 var memberType1 = MockedContentTypes.CreateSimpleMemberType();
                 memberType1.PropertyTypeCollection.Clear();
-                repository.AddOrUpdate(memberType1);
+                repository.Save(memberType1);
                 unitOfWork.Flush();
 
                 var memberType2 = MockedContentTypes.CreateSimpleMemberType();
                 memberType2.PropertyTypeCollection.Clear();
                 memberType2.Name = "AnotherType";
                 memberType2.Alias = "anotherType";
-                repository.AddOrUpdate(memberType2);
+                repository.Save(memberType2);
                 unitOfWork.Flush();
 
-                var result = repository.GetAll();
+                var result = repository.GetMany();
 
                 //there are 3 because of the Member type created for init data
                 Assert.AreEqual(3, result.Count());
@@ -207,7 +209,7 @@ namespace Umbraco.Tests.Persistence.Repositories
                 var repository = CreateRepository(unitOfWork);
 
                 IMemberType memberType = MockedContentTypes.CreateSimpleMemberType();
-                repository.AddOrUpdate(memberType);
+                repository.Save(memberType);
                 unitOfWork.Flush();
                 memberType = repository.Get(memberType.Id);
                 Assert.That(memberType, Is.Not.Null);
@@ -223,7 +225,7 @@ namespace Umbraco.Tests.Persistence.Repositories
                 var repository = CreateRepository(unitOfWork);
 
                 IMemberType memberType = MockedContentTypes.CreateSimpleMemberType();
-                repository.AddOrUpdate(memberType);
+                repository.Save(memberType);
                 unitOfWork.Flush();
                 memberType = repository.Get(memberType.Key);
                 Assert.That(memberType, Is.Not.Null);
@@ -239,7 +241,7 @@ namespace Umbraco.Tests.Persistence.Repositories
                 var repository = CreateRepository(unitOfWork);
 
                 IMemberType memberType = MockedContentTypes.CreateSimpleMemberType();
-                repository.AddOrUpdate(memberType);
+                repository.Save(memberType);
                 unitOfWork.Flush();
 
                 memberType = repository.Get(memberType.Id);
@@ -261,8 +263,8 @@ namespace Umbraco.Tests.Persistence.Repositories
 
                 IMemberType memberType1 = MockedContentTypes.CreateSimpleMemberType();
                 IMemberType memberType2 = MockedContentTypes.CreateSimpleMemberType("test2");
-                repository.AddOrUpdate(memberType1);
-                repository.AddOrUpdate(memberType2);
+                repository.Save(memberType1);
+                repository.Save(memberType2);
                 unitOfWork.Flush();
 
                 var m1Ids = memberType1.PropertyTypes.Select(x => x.Id).ToArray();
@@ -283,7 +285,7 @@ namespace Umbraco.Tests.Persistence.Repositories
 
                 // Act
                 IMemberType memberType = MockedContentTypes.CreateSimpleMemberType();
-                repository.AddOrUpdate(memberType);
+                repository.Save(memberType);
                 unitOfWork.Flush();
 
                 var contentType2 = repository.Get(memberType.Id);
diff --git a/src/Umbraco.Tests/Persistence/Repositories/NotificationsRepositoryTest.cs b/src/Umbraco.Tests/Persistence/Repositories/NotificationsRepositoryTest.cs
index 2d4d6e0ed0..9111c18584 100644
--- a/src/Umbraco.Tests/Persistence/Repositories/NotificationsRepositoryTest.cs
+++ b/src/Umbraco.Tests/Persistence/Repositories/NotificationsRepositoryTest.cs
@@ -8,6 +8,7 @@ using Umbraco.Core.Models.EntityBase;
 using Umbraco.Core.Models.Membership;
 using Umbraco.Core.Models.Rdbms;
 using Umbraco.Core.Persistence.Repositories;
+using Umbraco.Core.Persistence.Repositories.Implement;
 using Umbraco.Core.Persistence.UnitOfWork;
 using Umbraco.Tests.TestHelpers;
 using Umbraco.Tests.Testing;
diff --git a/src/Umbraco.Tests/Persistence/Repositories/PartialViewRepositoryTests.cs b/src/Umbraco.Tests/Persistence/Repositories/PartialViewRepositoryTests.cs
index 05b7122154..2b846d88ba 100644
--- a/src/Umbraco.Tests/Persistence/Repositories/PartialViewRepositoryTests.cs
+++ b/src/Umbraco.Tests/Persistence/Repositories/PartialViewRepositoryTests.cs
@@ -6,6 +6,7 @@ using Umbraco.Core.Persistence.Repositories;
 using Umbraco.Core.Persistence.UnitOfWork;
 using Umbraco.Core.PropertyEditors;
 using Umbraco.Core.Composing;
+using Umbraco.Core.Persistence.Repositories.Implement;
 using Umbraco.Tests.TestHelpers;
 using Umbraco.Tests.Testing;
 
@@ -42,14 +43,14 @@ namespace Umbraco.Tests.Persistence.Repositories
                 var repository = new PartialViewRepository(unitOfWork, _fileSystem);
 
                 var partialView = new PartialView(PartialViewType.PartialView, "test-path-1.cshtml") { Content = "// partialView" };
-                repository.AddOrUpdate(partialView);
+                repository.Save(partialView);
                 unitOfWork.Flush();
                 Assert.IsTrue(_fileSystem.FileExists("test-path-1.cshtml"));
                 Assert.AreEqual("test-path-1.cshtml", partialView.Path);
                 Assert.AreEqual("/Views/Partials/test-path-1.cshtml", partialView.VirtualPath);
 
                 partialView = new PartialView(PartialViewType.PartialView, "path-2/test-path-2.cshtml") { Content = "// partialView" };
-                repository.AddOrUpdate(partialView);
+                repository.Save(partialView);
                 unitOfWork.Flush();
                 Assert.IsTrue(_fileSystem.FileExists("path-2/test-path-2.cshtml"));
                 Assert.AreEqual("path-2\\test-path-2.cshtml", partialView.Path); // fixed in 7.3 - 7.2.8 does not update the path
@@ -61,7 +62,7 @@ namespace Umbraco.Tests.Persistence.Repositories
                 Assert.AreEqual("/Views/Partials/path-2/test-path-2.cshtml", partialView.VirtualPath);
 
                 partialView = new PartialView(PartialViewType.PartialView, "path-2\\test-path-3.cshtml") { Content = "// partialView" };
-                repository.AddOrUpdate(partialView);
+                repository.Save(partialView);
                 unitOfWork.Flush();
                 Assert.IsTrue(_fileSystem.FileExists("path-2/test-path-3.cshtml"));
                 Assert.AreEqual("path-2\\test-path-3.cshtml", partialView.Path);
@@ -80,7 +81,7 @@ namespace Umbraco.Tests.Persistence.Repositories
                 partialView = new PartialView(PartialViewType.PartialView, "\\test-path-4.cshtml") { Content = "// partialView" };
                 Assert.Throws<FileSecurityException>(() => // fixed in 7.3 - 7.2.8 used to strip the \
                 {
-                    repository.AddOrUpdate(partialView);
+                    repository.Save(partialView);
                 });
 
                 partialView = (PartialView) repository.Get("missing.cshtml");
diff --git a/src/Umbraco.Tests/Persistence/Repositories/PublicAccessRepositoryTest.cs b/src/Umbraco.Tests/Persistence/Repositories/PublicAccessRepositoryTest.cs
index 788e132baf..acda39ced9 100644
--- a/src/Umbraco.Tests/Persistence/Repositories/PublicAccessRepositoryTest.cs
+++ b/src/Umbraco.Tests/Persistence/Repositories/PublicAccessRepositoryTest.cs
@@ -8,6 +8,7 @@ using Umbraco.Core.IO;
 using Umbraco.Core.Models;
 using Umbraco.Core.Persistence;
 using Umbraco.Core.Persistence.Repositories;
+using Umbraco.Core.Persistence.Repositories.Implement;
 using Umbraco.Core.Persistence.UnitOfWork;
 using Umbraco.Tests.TestHelpers;
 using Umbraco.Tests.TestHelpers.Entities;
@@ -38,7 +39,7 @@ namespace Umbraco.Tests.Persistence.Repositories
                         RuleType = "RoleName"
                     },
                 });
-                repo.AddOrUpdate(entry);
+                repo.Save(entry);
                 unitOfWork.Flush();
 
                 repo.Delete(entry);
@@ -68,10 +69,10 @@ namespace Umbraco.Tests.Persistence.Repositories
                         RuleType = "RoleName"
                     },
                 });
-                repo.AddOrUpdate(entry);
+                repo.Save(entry);
                 unitOfWork.Flush();
 
-                var found = repo.GetAll().ToArray();
+                var found = repo.GetMany().ToArray();
 
                 Assert.AreEqual(1, found.Length);
                 Assert.AreEqual(content[0].Id, found[0].ProtectedNodeId);
@@ -113,10 +114,10 @@ namespace Umbraco.Tests.Persistence.Repositories
                         RuleType = "RoleName2"
                     },
                 });
-                repo.AddOrUpdate(entry);
+                repo.Save(entry);
                 unitOfWork.Flush();
 
-                var found = repo.GetAll().ToArray();
+                var found = repo.GetMany().ToArray();
 
                 Assert.AreEqual(1, found.Length);
                 Assert.AreEqual(content[0].Id, found[0].ProtectedNodeId);
@@ -153,7 +154,7 @@ namespace Umbraco.Tests.Persistence.Repositories
                         RuleType = "RoleName"
                     },
                 });
-                repo.AddOrUpdate(entry);
+                repo.Save(entry);
                 unitOfWork.Flush();
 
                 //re-get
@@ -161,7 +162,7 @@ namespace Umbraco.Tests.Persistence.Repositories
 
                 entry.Rules.First().RuleValue = "blah";
                 entry.Rules.First().RuleType = "asdf";
-                repo.AddOrUpdate(entry);
+                repo.Save(entry);
 
                 unitOfWork.Flush();
 
@@ -191,7 +192,7 @@ namespace Umbraco.Tests.Persistence.Repositories
                         RuleType = "RoleName"
                     },
                 });
-                repo.AddOrUpdate(entry);
+                repo.Save(entry);
                 unitOfWork.Flush();
 
                 //re-get
@@ -224,7 +225,7 @@ namespace Umbraco.Tests.Persistence.Repositories
                         });
                     }
                     var entry1 = new PublicAccessEntry(content[i], content[i + 1], content[i + 2], rules);
-                    repo.AddOrUpdate(entry1);
+                    repo.Save(entry1);
                     unitOfWork.Flush();
                     allEntries.Add(entry1);
                 }
@@ -247,12 +248,12 @@ namespace Umbraco.Tests.Persistence.Repositories
                             }
                         }
                         allEntries[i].AddRule("newrule" + i, "newrule" + i);
-                        repo.AddOrUpdate(allEntries[i]);
+                        repo.Save(allEntries[i]);
                         unitOfWork.Flush();
                     }
                 }
 
-                var found = repo.GetAll().ToArray();
+                var found = repo.GetMany().ToArray();
                 Assert.AreEqual(10, found.Length);
 
                 foreach (var publicAccessEntry in found)
@@ -283,7 +284,7 @@ namespace Umbraco.Tests.Persistence.Repositories
                         RuleType = "RoleName"
                     },
                 });
-                repo.AddOrUpdate(entry1);
+                repo.Save(entry1);
 
                 var entry2 = new PublicAccessEntry(content[1], content[0], content[2], new[]
                 {
@@ -293,22 +294,22 @@ namespace Umbraco.Tests.Persistence.Repositories
                         RuleType = "RoleName"
                     },
                 });
-                repo.AddOrUpdate(entry2);
+                repo.Save(entry2);
 
                 unitOfWork.Flush();
 
-                var found = repo.GetAll(entry1.Key).ToArray();
+                var found = repo.GetMany(entry1.Key).ToArray();
                 Assert.AreEqual(1, found.Count());
             }
         }
 
 
-        private ContentRepository CreateRepository(IScopeUnitOfWork unitOfWork, out ContentTypeRepository contentTypeRepository)
+        private DocumentRepository CreateRepository(IScopeUnitOfWork unitOfWork, out ContentTypeRepository contentTypeRepository)
         {
             var templateRepository = new TemplateRepository(unitOfWork, CacheHelper, Logger, Mock.Of<IFileSystem>(), Mock.Of<IFileSystem>(), Mock.Of<ITemplatesSection>());
             var tagRepository = new TagRepository(unitOfWork, CacheHelper, Logger);
             contentTypeRepository = new ContentTypeRepository(unitOfWork, CacheHelper, Logger, templateRepository);
-            var repository = new ContentRepository(unitOfWork, CacheHelper, Logger, contentTypeRepository, templateRepository, tagRepository, Mock.Of<IContentSection>());
+            var repository = new DocumentRepository(unitOfWork, CacheHelper, Logger, contentTypeRepository, templateRepository, tagRepository, Mock.Of<IContentSection>());
             return repository;
         }
 
@@ -321,13 +322,13 @@ namespace Umbraco.Tests.Persistence.Repositories
                 var repo = CreateRepository(unitOfWork, out ctRepo);
 
                 var ct = MockedContentTypes.CreateBasicContentType("testing");
-                ctRepo.AddOrUpdate(ct);
+                ctRepo.Save(ct);
                 unitOfWork.Flush();
                 var result = new List<IContent>();
                 for (int i = 0; i < count; i++)
                 {
                     var c = new Content("test" + i, -1, ct);
-                    repo.AddOrUpdate(c);
+                    repo.Save(c);
                     result.Add(c);
                 }
                 unitOfWork.Complete();
diff --git a/src/Umbraco.Tests/Persistence/Repositories/RedirectUrlRepositoryTests.cs b/src/Umbraco.Tests/Persistence/Repositories/RedirectUrlRepositoryTests.cs
index 3a62c0c53f..603c755b56 100644
--- a/src/Umbraco.Tests/Persistence/Repositories/RedirectUrlRepositoryTests.cs
+++ b/src/Umbraco.Tests/Persistence/Repositories/RedirectUrlRepositoryTests.cs
@@ -4,6 +4,7 @@ using NUnit.Framework;
 using Umbraco.Core;
 using Umbraco.Core.Models;
 using Umbraco.Core.Persistence.Repositories;
+using Umbraco.Core.Persistence.Repositories.Implement;
 using Umbraco.Core.Persistence.UnitOfWork;
 using Umbraco.Tests.TestHelpers;
 using Umbraco.Tests.TestHelpers.Entities;
@@ -35,7 +36,7 @@ namespace Umbraco.Tests.Persistence.Repositories
                     ContentKey = _textpage.Key,
                     Url = "blah"
                 };
-                repo.AddOrUpdate(rurl);
+                repo.Save(rurl);
                 uow.Complete();
 
                 Assert.AreNotEqual(0, rurl.Id);
@@ -67,7 +68,7 @@ namespace Umbraco.Tests.Persistence.Repositories
                     ContentKey = _textpage.Key,
                     Url = "blah"
                 };
-                repo.AddOrUpdate(rurl);
+                repo.Save(rurl);
                 uow.Complete();
 
                 Assert.AreNotEqual(0, rurl.Id);
@@ -83,7 +84,7 @@ namespace Umbraco.Tests.Persistence.Repositories
                     Url = "blah",
                     CreateDateUtc = rurl.CreateDateUtc.AddSeconds(1) // ensure time difference
                 };
-                repo.AddOrUpdate(rurl);
+                repo.Save(rurl);
                 uow.Complete();
 
                 Assert.AreNotEqual(0, rurl.Id);
@@ -113,7 +114,7 @@ namespace Umbraco.Tests.Persistence.Repositories
                     ContentKey = _textpage.Key,
                     Url = "blah"
                 };
-                repo.AddOrUpdate(rurl);
+                repo.Save(rurl);
                 uow.Complete();
 
                 Assert.AreNotEqual(0, rurl.Id);
@@ -126,7 +127,7 @@ namespace Umbraco.Tests.Persistence.Repositories
                     Url = "durg",
                     CreateDateUtc = rurl.CreateDateUtc.AddSeconds(1) // ensure time difference
                 };
-                repo.AddOrUpdate(rurl);
+                repo.Save(rurl);
                 uow.Complete();
 
                 Assert.AreNotEqual(0, rurl.Id);
@@ -157,7 +158,7 @@ namespace Umbraco.Tests.Persistence.Repositories
                     ContentKey = _textpage.Key,
                     Url = "blah"
                 };
-                repo.AddOrUpdate(rurl);
+                repo.Save(rurl);
                 uow.Complete();
 
                 Assert.AreNotEqual(0, rurl.Id);
@@ -167,7 +168,7 @@ namespace Umbraco.Tests.Persistence.Repositories
                     ContentKey = _otherpage.Key,
                     Url = "durg"
                 };
-                repo.AddOrUpdate(rurl);
+                repo.Save(rurl);
                 uow.Complete();
 
                 Assert.AreNotEqual(0, rurl.Id);
diff --git a/src/Umbraco.Tests/Persistence/Repositories/RelationRepositoryTest.cs b/src/Umbraco.Tests/Persistence/Repositories/RelationRepositoryTest.cs
index c7b6a6a959..2ec19bd802 100644
--- a/src/Umbraco.Tests/Persistence/Repositories/RelationRepositoryTest.cs
+++ b/src/Umbraco.Tests/Persistence/Repositories/RelationRepositoryTest.cs
@@ -8,6 +8,7 @@ using Umbraco.Core.Logging;
 using Umbraco.Core.Models;
 using Umbraco.Core.Models.Rdbms;
 using Umbraco.Core.Persistence.Repositories;
+using Umbraco.Core.Persistence.Repositories.Implement;
 using Umbraco.Core.Persistence.UnitOfWork;
 using Umbraco.Tests.TestHelpers;
 using Umbraco.Tests.TestHelpers.Entities;
@@ -46,7 +47,7 @@ namespace Umbraco.Tests.Persistence.Repositories
                 // Act
                 var relationType = repositoryType.Get(1);
                 var relation = new Relation(NodeDto.NodeIdSeed + 2, NodeDto.NodeIdSeed + 3, relationType);
-                repository.AddOrUpdate(relation);
+                repository.Save(relation);
                 unitOfWork.Flush();
 
                 // Assert
@@ -68,7 +69,7 @@ namespace Umbraco.Tests.Persistence.Repositories
                 // Act
                 var relation = repository.Get(1);
                 relation.Comment = "This relation has been updated";
-                repository.AddOrUpdate(relation);
+                repository.Save(relation);
                 unitOfWork.Flush();
 
                 var relationUpdated = repository.Get(1);
@@ -135,7 +136,7 @@ namespace Umbraco.Tests.Persistence.Repositories
                 var repository = CreateRepository(unitOfWork, out repositoryType);
 
                 // Act
-                var relations = repository.GetAll();
+                var relations = repository.GetMany();
 
                 // Assert
                 Assert.That(relations, Is.Not.Null);
@@ -156,7 +157,7 @@ namespace Umbraco.Tests.Persistence.Repositories
                 var repository = CreateRepository(unitOfWork, out repositoryType);
 
                 // Act
-                var relations = repository.GetAll(1, 2);
+                var relations = repository.GetMany(1, 2);
 
                 // Assert
                 Assert.That(relations, Is.Not.Null);
@@ -217,7 +218,7 @@ namespace Umbraco.Tests.Persistence.Repositories
 
                 // Act
                 var query = unitOfWork.SqlContext.Query<IRelation>().Where(x => x.RelationTypeId == RelationTypeDto.NodeIdSeed);
-                var relations = repository.GetByQuery(query);
+                var relations = repository.Get(query);
 
                 // Assert
                 Assert.That(relations, Is.Not.Null);
@@ -267,8 +268,8 @@ namespace Umbraco.Tests.Persistence.Repositories
                 var relationTypeRepository = new RelationTypeRepository(unitOfWork, CacheHelper.CreateDisabledCacheHelper(), Mock.Of<ILogger>());
                 var relationRepository = new RelationRepository(unitOfWork, CacheHelper.CreateDisabledCacheHelper(), Mock.Of<ILogger>(), relationTypeRepository);
 
-                relationTypeRepository.AddOrUpdate(relateContent);
-                relationTypeRepository.AddOrUpdate(relateContentType);
+                relationTypeRepository.Save(relateContent);
+                relationTypeRepository.Save(relateContentType);
                 unitOfWork.Flush();
 
                 //Create and Save ContentType "umbTextpage" -> (NodeDto.NodeIdSeed)
@@ -290,8 +291,8 @@ namespace Umbraco.Tests.Persistence.Repositories
 
                 var relation = new Relation(textpage.Id, subpage.Id, relateContent) { Comment = string.Empty };
                 var relation2 = new Relation(textpage.Id, subpage2.Id, relateContent) { Comment = string.Empty };
-                relationRepository.AddOrUpdate(relation);
-                relationRepository.AddOrUpdate(relation2);
+                relationRepository.Save(relation);
+                relationRepository.Save(relation2);
                 unitOfWork.Complete();
             }
         }
diff --git a/src/Umbraco.Tests/Persistence/Repositories/RelationTypeRepositoryTest.cs b/src/Umbraco.Tests/Persistence/Repositories/RelationTypeRepositoryTest.cs
index e6c8e33478..5bd99b9f19 100644
--- a/src/Umbraco.Tests/Persistence/Repositories/RelationTypeRepositoryTest.cs
+++ b/src/Umbraco.Tests/Persistence/Repositories/RelationTypeRepositoryTest.cs
@@ -8,6 +8,7 @@ using Umbraco.Core.Logging;
 using Umbraco.Core.Models;
 using Umbraco.Core.Models.Rdbms;
 using Umbraco.Core.Persistence.Repositories;
+using Umbraco.Core.Persistence.Repositories.Implement;
 using Umbraco.Core.Persistence.UnitOfWork;
 using Umbraco.Tests.TestHelpers;
 using Umbraco.Tests.Testing;
@@ -45,7 +46,7 @@ namespace Umbraco.Tests.Persistence.Repositories
                                                             Constants.ObjectTypes.Document,
                                                             "relateMemberToContent") { IsBidirectional = true, Name = "Relate Member to Content" };
 
-                repository.AddOrUpdate(relateMemberToContent);
+                repository.Save(relateMemberToContent);
                 unitOfWork.Flush();
 
                 // Assert
@@ -67,7 +68,7 @@ namespace Umbraco.Tests.Persistence.Repositories
                 var relationType = repository.Get(3);
                 relationType.Alias = relationType.Alias + "Updated";
                 relationType.Name = relationType.Name + " Updated";
-                repository.AddOrUpdate(relationType);
+                repository.Save(relationType);
                 unitOfWork.Flush();
 
                 var relationTypeUpdated = repository.Get(3);
@@ -131,7 +132,7 @@ namespace Umbraco.Tests.Persistence.Repositories
                 var repository = CreateRepository(unitOfWork);
 
                 // Act
-                var relationTypes = repository.GetAll();
+                var relationTypes = repository.GetMany();
 
                 // Assert
                 Assert.That(relationTypes, Is.Not.Null);
@@ -151,7 +152,7 @@ namespace Umbraco.Tests.Persistence.Repositories
                 var repository = CreateRepository(unitOfWork);
 
                 // Act
-                var relationTypes = repository.GetAll(2, 3);
+                var relationTypes = repository.GetMany(2, 3);
 
                 // Assert
                 Assert.That(relationTypes, Is.Not.Null);
@@ -210,7 +211,7 @@ namespace Umbraco.Tests.Persistence.Repositories
                 // Act
                 var childObjType = Constants.ObjectTypes.DocumentType;
                 var query = unitOfWork.SqlContext.Query<IRelationType>().Where(x => x.ChildObjectType == childObjType);
-                var result = repository.GetByQuery(query);
+                var result = repository.Get(query);
 
                 // Assert
                 Assert.That(result, Is.Not.Null);
@@ -236,8 +237,8 @@ namespace Umbraco.Tests.Persistence.Repositories
             {
                 var repository = new RelationTypeRepository(unitOfWork, CacheHelper.CreateDisabledCacheHelper(), Mock.Of<ILogger>());
 
-                repository.AddOrUpdate(relateContent);//Id 2
-                repository.AddOrUpdate(relateContentType);//Id 3
+                repository.Save(relateContent);//Id 2
+                repository.Save(relateContentType);//Id 3
                 unitOfWork.Complete();
             }
         }
diff --git a/src/Umbraco.Tests/Persistence/Repositories/ScriptRepositoryTest.cs b/src/Umbraco.Tests/Persistence/Repositories/ScriptRepositoryTest.cs
index c77576d8a0..e46034cee5 100644
--- a/src/Umbraco.Tests/Persistence/Repositories/ScriptRepositoryTest.cs
+++ b/src/Umbraco.Tests/Persistence/Repositories/ScriptRepositoryTest.cs
@@ -8,6 +8,7 @@ using Umbraco.Core.Composing;
 using Umbraco.Core.IO;
 using Umbraco.Core.Models;
 using Umbraco.Core.Persistence.Repositories;
+using Umbraco.Core.Persistence.Repositories.Implement;
 using Umbraco.Core.Persistence.UnitOfWork;
 using Umbraco.Core.PropertyEditors;
 using Umbraco.Tests.TestHelpers;
@@ -66,7 +67,7 @@ namespace Umbraco.Tests.Persistence.Repositories
 
                 // Act
                 var script = new Script("test-add-script.js") { Content = "/// <reference name=\"MicrosoftAjax.js\"/>" };
-                repository.AddOrUpdate(script);
+                repository.Save(script);
                 unitOfWork.Flush();
 
                 //Assert
@@ -85,11 +86,11 @@ namespace Umbraco.Tests.Persistence.Repositories
 
                 // Act
                 var script = new Script("test-updated-script.js") { Content = "/// <reference name=\"MicrosoftAjax.js\"/>" };
-                repository.AddOrUpdate(script);
+                repository.Save(script);
                 unitOfWork.Flush();
 
                 script.Content = "/// <reference name=\"MicrosoftAjax-Updated.js\"/>";
-                repository.AddOrUpdate(script);
+                repository.Save(script);
                 unitOfWork.Flush();
 
                 var scriptUpdated = repository.Get("test-updated-script.js");
@@ -149,15 +150,15 @@ namespace Umbraco.Tests.Persistence.Repositories
                 var repository = new ScriptRepository(unitOfWork, _fileSystem, Mock.Of<IContentSection>());
 
                 var script = new Script("test-script1.js") { Content = "/// <reference name=\"MicrosoftAjax.js\"/>" };
-                repository.AddOrUpdate(script);
+                repository.Save(script);
                 var script2 = new Script("test-script2.js") { Content = "/// <reference name=\"MicrosoftAjax.js\"/>" };
-                repository.AddOrUpdate(script2);
+                repository.Save(script2);
                 var script3 = new Script("test-script3.js") { Content = "/// <reference name=\"MicrosoftAjax.js\"/>" };
-                repository.AddOrUpdate(script3);
+                repository.Save(script3);
                 unitOfWork.Flush();
 
                 // Act
-                var scripts = repository.GetAll();
+                var scripts = repository.GetMany();
 
                 // Assert
                 Assert.That(scripts, Is.Not.Null);
@@ -177,15 +178,15 @@ namespace Umbraco.Tests.Persistence.Repositories
                 var repository = new ScriptRepository(unitOfWork, _fileSystem, Mock.Of<IContentSection>());
 
                 var script = new Script("test-script1.js") { Content = "/// <reference name=\"MicrosoftAjax.js\"/>" };
-                repository.AddOrUpdate(script);
+                repository.Save(script);
                 var script2 = new Script("test-script2.js") { Content = "/// <reference name=\"MicrosoftAjax.js\"/>" };
-                repository.AddOrUpdate(script2);
+                repository.Save(script2);
                 var script3 = new Script("test-script3.js") { Content = "/// <reference name=\"MicrosoftAjax.js\"/>" };
-                repository.AddOrUpdate(script3);
+                repository.Save(script3);
                 unitOfWork.Flush();
 
                 // Act
-                var scripts = repository.GetAll("test-script1.js", "test-script2.js");
+                var scripts = repository.GetMany("test-script1.js", "test-script2.js");
 
                 // Assert
                 Assert.That(scripts, Is.Not.Null);
@@ -224,13 +225,13 @@ namespace Umbraco.Tests.Persistence.Repositories
                 var repository = new ScriptRepository(unitOfWork, _fileSystem, Mock.Of<IContentSection>());
 
                 var script = new Script("test-move-script.js") { Content = content };
-                repository.AddOrUpdate(script);
+                repository.Save(script);
                 unitOfWork.Flush();
 
                 // Act
                 script = repository.Get("test-move-script.js");
                 script.Path = "moved/test-move-script.js";
-                repository.AddOrUpdate(script);
+                repository.Save(script);
                 unitOfWork.Flush();
 
                 var existsOld = repository.Exists("test-move-script.js");
@@ -257,7 +258,7 @@ namespace Umbraco.Tests.Persistence.Repositories
                 var repository = new ScriptRepository(unitOfWork, _fileSystem, Mock.Of<IContentSection>());
 
                 var script = new Script("test-path-1.js") { Content = "// script" };
-                repository.AddOrUpdate(script);
+                repository.Save(script);
                 unitOfWork.Flush();
                 Assert.IsTrue(_fileSystem.FileExists("test-path-1.js"));
                 Assert.AreEqual("test-path-1.js", script.Path);
@@ -265,14 +266,14 @@ namespace Umbraco.Tests.Persistence.Repositories
 
                 //ensure you can prefix the same path as the root path name
                 script = new Script("scripts/path-2/test-path-2.js") { Content = "// script" };
-                repository.AddOrUpdate(script);
+                repository.Save(script);
                 unitOfWork.Flush();
                 Assert.IsTrue(_fileSystem.FileExists("scripts/path-2/test-path-2.js"));
                 Assert.AreEqual("scripts\\path-2\\test-path-2.js", script.Path);
                 Assert.AreEqual("/scripts/scripts/path-2/test-path-2.js", script.VirtualPath);
 
                 script = new Script("path-2/test-path-2.js") { Content = "// script" };
-                repository.AddOrUpdate(script);
+                repository.Save(script);
                 unitOfWork.Flush();
                 Assert.IsTrue(_fileSystem.FileExists("path-2/test-path-2.js"));
                 Assert.AreEqual("path-2\\test-path-2.js", script.Path); // fixed in 7.3 - 7.2.8 does not update the path
@@ -284,7 +285,7 @@ namespace Umbraco.Tests.Persistence.Repositories
                 Assert.AreEqual("/scripts/path-2/test-path-2.js", script.VirtualPath);
 
                 script = new Script("path-2\\test-path-3.js") { Content = "// script" };
-                repository.AddOrUpdate(script);
+                repository.Save(script);
                 unitOfWork.Flush();
                 Assert.IsTrue(_fileSystem.FileExists("path-2/test-path-3.js"));
                 Assert.AreEqual("path-2\\test-path-3.js", script.Path);
@@ -303,7 +304,7 @@ namespace Umbraco.Tests.Persistence.Repositories
                 script = new Script("\\test-path-4.js") { Content = "// script" };
                 Assert.Throws<FileSecurityException>(() => // fixed in 7.3 - 7.2.8 used to strip the \
                 {
-                    repository.AddOrUpdate(script);
+                    repository.Save(script);
                 });
 
                 script = repository.Get("missing.js");
diff --git a/src/Umbraco.Tests/Persistence/Repositories/ServerRegistrationRepositoryTest.cs b/src/Umbraco.Tests/Persistence/Repositories/ServerRegistrationRepositoryTest.cs
index 9f5772576a..9cd4422bb2 100644
--- a/src/Umbraco.Tests/Persistence/Repositories/ServerRegistrationRepositoryTest.cs
+++ b/src/Umbraco.Tests/Persistence/Repositories/ServerRegistrationRepositoryTest.cs
@@ -5,6 +5,7 @@ using NUnit.Framework;
 using Umbraco.Core.Cache;
 using Umbraco.Core.Models;
 using Umbraco.Core.Persistence.Repositories;
+using Umbraco.Core.Persistence.Repositories.Implement;
 using Umbraco.Core.Persistence.UnitOfWork;
 using Umbraco.Tests.TestHelpers;
 using Umbraco.Tests.Testing;
@@ -40,7 +41,7 @@ namespace Umbraco.Tests.Persistence.Repositories
                 var repository = CreateRepository(unitOfWork);
 
                 var server = new ServerRegistration("http://shazwazza.com", "COMPUTER1", DateTime.Now);
-                repository.AddOrUpdate(server);
+                repository.Save(server);
 
                 Assert.Throws<SqlCeException>(unitOfWork.Flush);
             }
@@ -58,7 +59,7 @@ namespace Umbraco.Tests.Persistence.Repositories
 
                 var server = repository.Get(1);
                 server.ServerIdentity = "COMPUTER2";
-                repository.AddOrUpdate(server);
+                repository.Save(server);
                 Assert.Throws<SqlCeException>(unitOfWork.Flush);
             }
 
@@ -109,7 +110,7 @@ namespace Umbraco.Tests.Persistence.Repositories
                 var repository = CreateRepository(unitOfWork);
 
                 // Act
-                var servers = repository.GetAll();
+                var servers = repository.GetMany();
 
                 // Assert
                 Assert.That(servers.Count(), Is.EqualTo(3));
@@ -164,7 +165,7 @@ namespace Umbraco.Tests.Persistence.Repositories
 
                 // Act
                 var server = new ServerRegistration("http://shazwazza.com", "COMPUTER4", DateTime.Now);
-                repository.AddOrUpdate(server);
+                repository.Save(server);
                 unitOfWork.Flush();
 
                 // Assert
@@ -187,7 +188,7 @@ namespace Umbraco.Tests.Persistence.Repositories
                 server.ServerAddress = "https://umbraco.com";
                 server.IsActive = true;
 
-                repository.AddOrUpdate(server);
+                repository.Save(server);
                 unitOfWork.Flush();
 
                 var serverUpdated = repository.Get(2);
@@ -253,9 +254,9 @@ namespace Umbraco.Tests.Persistence.Repositories
             {
                 var repository = CreateRepository(unitOfWork);
 
-                repository.AddOrUpdate(new ServerRegistration("http://localhost", "COMPUTER1", DateTime.Now) { IsActive = true });
-                repository.AddOrUpdate(new ServerRegistration("http://www.mydomain.com", "COMPUTER2", DateTime.Now));
-                repository.AddOrUpdate(new ServerRegistration("https://www.another.domain.com", "Computer3", DateTime.Now));
+                repository.Save(new ServerRegistration("http://localhost", "COMPUTER1", DateTime.Now) { IsActive = true });
+                repository.Save(new ServerRegistration("http://www.mydomain.com", "COMPUTER2", DateTime.Now));
+                repository.Save(new ServerRegistration("https://www.another.domain.com", "Computer3", DateTime.Now));
                 unitOfWork.Complete();
             }
 
diff --git a/src/Umbraco.Tests/Persistence/Repositories/SimilarNodeNameTests.cs b/src/Umbraco.Tests/Persistence/Repositories/SimilarNodeNameTests.cs
index 2b9e3272ef..1485e3c185 100644
--- a/src/Umbraco.Tests/Persistence/Repositories/SimilarNodeNameTests.cs
+++ b/src/Umbraco.Tests/Persistence/Repositories/SimilarNodeNameTests.cs
@@ -1,6 +1,7 @@
 using System.Linq;
 using NUnit.Framework;
 using Umbraco.Core.Persistence.Repositories;
+using Umbraco.Core.Persistence.Repositories.Implement;
 
 namespace Umbraco.Tests.Persistence.Repositories
 {
diff --git a/src/Umbraco.Tests/Persistence/Repositories/StylesheetRepositoryTest.cs b/src/Umbraco.Tests/Persistence/Repositories/StylesheetRepositoryTest.cs
index 974339cd5d..181baa3372 100644
--- a/src/Umbraco.Tests/Persistence/Repositories/StylesheetRepositoryTest.cs
+++ b/src/Umbraco.Tests/Persistence/Repositories/StylesheetRepositoryTest.cs
@@ -10,6 +10,7 @@ using Umbraco.Core.Logging;
 using Umbraco.Core.Models;
 using Umbraco.Core.Persistence;
 using Umbraco.Core.Persistence.Repositories;
+using Umbraco.Core.Persistence.Repositories.Implement;
 using Umbraco.Core.Persistence.UnitOfWork;
 using Umbraco.Core.Scoping;
 using Umbraco.Tests.TestHelpers;
@@ -59,7 +60,7 @@ namespace Umbraco.Tests.Persistence.Repositories
 
                 // Act
                 var stylesheet = new Stylesheet("test-add.css") { Content = "body { color:#000; } .bold {font-weight:bold;}" };
-                repository.AddOrUpdate(stylesheet);
+                repository.Save(stylesheet);
                 unitOfWork.Flush();
 
                 //Assert
@@ -78,12 +79,12 @@ namespace Umbraco.Tests.Persistence.Repositories
 
                 // Act
                 var stylesheet = new Stylesheet("test-update.css") { Content = "body { color:#000; } .bold {font-weight:bold;}" };
-                repository.AddOrUpdate(stylesheet);
+                repository.Save(stylesheet);
                 unitOfWork.Flush();
 
                 var stylesheetUpdate = repository.Get("test-update.css");
                 stylesheetUpdate.Content = "body { color:#000; }";
-                repository.AddOrUpdate(stylesheetUpdate);
+                repository.Save(stylesheetUpdate);
                 unitOfWork.Flush();
 
                 var stylesheetUpdated = repository.Get("test-update.css");
@@ -106,12 +107,12 @@ namespace Umbraco.Tests.Persistence.Repositories
 
                 // Act
                 var stylesheet = new Stylesheet("test-update.css") { Content = "body { color:#000; } .bold {font-weight:bold;}" };
-                repository.AddOrUpdate(stylesheet);
+                repository.Save(stylesheet);
                 unitOfWork.Flush();
 
                 stylesheet.AddProperty(new StylesheetProperty("Test", "p", "font-size:2em;"));
 
-                repository.AddOrUpdate(stylesheet);
+                repository.Save(stylesheet);
                 unitOfWork.Flush();
 
                 //re-get
@@ -137,7 +138,7 @@ p{font-size:2em;}"));
 
                 // Act
                 var stylesheet = new Stylesheet("test-update.css") { Content = "body { color:#000; } .bold {font-weight:bold;}" };
-                repository.AddOrUpdate(stylesheet);
+                repository.Save(stylesheet);
                 unitOfWork.Flush();
 
                 stylesheet.AddProperty(new StylesheetProperty("Test", "p", "font-size:2em;"));
@@ -157,7 +158,7 @@ p{font-size:2em;}"));
 
                 // Act
                 var stylesheet = new Stylesheet("test-delete.css") { Content = "body { color:#000; } .bold {font-weight:bold;}" };
-                repository.AddOrUpdate(stylesheet);
+                repository.Save(stylesheet);
                 unitOfWork.Flush();
 
                 repository.Delete(stylesheet);
@@ -198,11 +199,11 @@ p{font-size:2em;}"));
                 var repository = new StylesheetRepository(unitOfWork, _fileSystem);
 
                 var stylesheet = new Stylesheet("styles-v2.css") { Content = "body { color:#000; } .bold {font-weight:bold;}" };
-                repository.AddOrUpdate(stylesheet);
+                repository.Save(stylesheet);
                 unitOfWork.Flush();
 
                 // Act
-                var stylesheets = repository.GetAll();
+                var stylesheets = repository.GetMany();
 
                 // Assert
                 Assert.That(stylesheets, Is.Not.Null);
@@ -222,11 +223,11 @@ p{font-size:2em;}"));
                 var repository = new StylesheetRepository(unitOfWork, _fileSystem);
 
                 var stylesheet = new Stylesheet("styles-v2.css") { Content = "body { color:#000; } .bold {font-weight:bold;}" };
-                repository.AddOrUpdate(stylesheet);
+                repository.Save(stylesheet);
                 unitOfWork.Flush();
 
                 // Act
-                var stylesheets = repository.GetAll("styles-v2.css", "styles.css");
+                var stylesheets = repository.GetMany("styles-v2.css", "styles.css");
 
                 // Assert
                 Assert.That(stylesheets, Is.Not.Null);
@@ -264,14 +265,14 @@ p{font-size:2em;}"));
                 var repository = new StylesheetRepository(unitOfWork, _fileSystem);
 
                 var stylesheet = new Stylesheet("test-path-1.css") { Content = "body { color:#000; } .bold {font-weight:bold;}" };
-                repository.AddOrUpdate(stylesheet);
+                repository.Save(stylesheet);
                 unitOfWork.Flush();
                 Assert.IsTrue(_fileSystem.FileExists("test-path-1.css"));
                 Assert.AreEqual("test-path-1.css", stylesheet.Path);
                 Assert.AreEqual("/css/test-path-1.css", stylesheet.VirtualPath);
 
                 stylesheet = new Stylesheet("path-2/test-path-2.css") { Content = "body { color:#000; } .bold {font-weight:bold;}" };
-                repository.AddOrUpdate(stylesheet);
+                repository.Save(stylesheet);
                 unitOfWork.Flush();
                 Assert.IsTrue(_fileSystem.FileExists("path-2/test-path-2.css"));
                 Assert.AreEqual("path-2\\test-path-2.css", stylesheet.Path); // fixed in 7.3 - 7.2.8 does not update the path
@@ -283,7 +284,7 @@ p{font-size:2em;}"));
                 Assert.AreEqual("/css/path-2/test-path-2.css", stylesheet.VirtualPath);
 
                 stylesheet = new Stylesheet("path-2\\test-path-3.css") { Content = "body { color:#000; } .bold {font-weight:bold;}" };
-                repository.AddOrUpdate(stylesheet);
+                repository.Save(stylesheet);
                 unitOfWork.Flush();
                 Assert.IsTrue(_fileSystem.FileExists("path-2/test-path-3.css"));
                 Assert.AreEqual("path-2\\test-path-3.css", stylesheet.Path);
@@ -302,7 +303,7 @@ p{font-size:2em;}"));
                 stylesheet = new Stylesheet("\\test-path-4.css") { Content = "body { color:#000; } .bold {font-weight:bold;}" };
                 Assert.Throws<FileSecurityException>(() => // fixed in 7.3 - 7.2.8 used to strip the \
                 {
-                    repository.AddOrUpdate(stylesheet);
+                    repository.Save(stylesheet);
                 });
 
                 // fixed in 7.3 - 7.2.8 used to throw
diff --git a/src/Umbraco.Tests/Persistence/Repositories/TagRepositoryTest.cs b/src/Umbraco.Tests/Persistence/Repositories/TagRepositoryTest.cs
index fd5075999a..8e78789350 100644
--- a/src/Umbraco.Tests/Persistence/Repositories/TagRepositoryTest.cs
+++ b/src/Umbraco.Tests/Persistence/Repositories/TagRepositoryTest.cs
@@ -5,6 +5,7 @@ using Umbraco.Core.Configuration.UmbracoSettings;
 using Umbraco.Core.IO;
 using Umbraco.Core.Models;
 using Umbraco.Core.Persistence.Repositories;
+using Umbraco.Core.Persistence.Repositories.Implement;
 using Umbraco.Core.Persistence.UnitOfWork;
 using Umbraco.Tests.TestHelpers;
 using Umbraco.Tests.TestHelpers.Entities;
@@ -38,7 +39,7 @@ namespace Umbraco.Tests.Persistence.Repositories
                     };
 
                 // Act
-                repository.AddOrUpdate(tag);
+                repository.Save(tag);
                 unitOfWork.Flush();
 
                 // Assert
@@ -62,7 +63,7 @@ namespace Umbraco.Tests.Persistence.Repositories
                     };
 
                 // Act
-                repository.AddOrUpdate(tag);
+                repository.Save(tag);
                 unitOfWork.Flush();
 
                 var tag2 = new Tag()
@@ -70,7 +71,7 @@ namespace Umbraco.Tests.Persistence.Repositories
                         Group = "Test",
                         Text = "Test2"
                     };
-                repository.AddOrUpdate(tag2);
+                repository.Save(tag2);
                 unitOfWork.Flush();
 
                 // Assert
@@ -93,10 +94,10 @@ namespace Umbraco.Tests.Persistence.Repositories
                 //create data to relate to
                 var contentType = MockedContentTypes.CreateSimpleContentType("test", "Test");
                 ServiceContext.FileService.SaveTemplate(contentType.DefaultTemplate); // else, FK violation on contentType!
-                contentTypeRepository.AddOrUpdate(contentType);
+                contentTypeRepository.Save(contentType);
                 unitOfWork.Flush();
                 var content = MockedContent.CreateSimpleContent(contentType);
-                contentRepository.AddOrUpdate(content);
+                contentRepository.Save(content);
                 unitOfWork.Flush();
 
                 var repository = CreateRepository(unitOfWork);
@@ -125,10 +126,10 @@ namespace Umbraco.Tests.Persistence.Repositories
                 //create data to relate to
                 var contentType = MockedContentTypes.CreateSimpleContentType("test", "Test");
                 ServiceContext.FileService.SaveTemplate(contentType.DefaultTemplate); // else, FK violation on contentType!
-                contentTypeRepository.AddOrUpdate(contentType);
+                contentTypeRepository.Save(contentType);
                 unitOfWork.Flush();
                 var content = MockedContent.CreateSimpleContent(contentType);
-                contentRepository.AddOrUpdate(content);
+                contentRepository.Save(content);
                 unitOfWork.Flush();
 
                 var repository = CreateRepository(unitOfWork);
@@ -166,10 +167,10 @@ namespace Umbraco.Tests.Persistence.Repositories
                 //create data to relate to
                 var contentType = MockedContentTypes.CreateSimpleContentType("test", "Test");
                 ServiceContext.FileService.SaveTemplate(contentType.DefaultTemplate); // else, FK violation on contentType!
-                contentTypeRepository.AddOrUpdate(contentType);
+                contentTypeRepository.Save(contentType);
                 unitOfWork.Flush();
                 var content = MockedContent.CreateSimpleContent(contentType);
-                contentRepository.AddOrUpdate(content);
+                contentRepository.Save(content);
                 unitOfWork.Flush();
 
                 var repository = CreateRepository(unitOfWork);
@@ -210,10 +211,10 @@ namespace Umbraco.Tests.Persistence.Repositories
                 //create data to relate to
                 var contentType = MockedContentTypes.CreateSimpleContentType("test", "Test");
                 ServiceContext.FileService.SaveTemplate(contentType.DefaultTemplate); // else, FK violation on contentType!
-                contentTypeRepository.AddOrUpdate(contentType);
+                contentTypeRepository.Save(contentType);
                 unitOfWork.Flush();
                 var content = MockedContent.CreateSimpleContent(contentType);
-                contentRepository.AddOrUpdate(content);
+                contentRepository.Save(content);
                 unitOfWork.Flush();
 
                 var repository = CreateRepository(unitOfWork);
@@ -252,10 +253,10 @@ namespace Umbraco.Tests.Persistence.Repositories
                 //create data to relate to
                 var contentType = MockedContentTypes.CreateSimpleContentType("test", "Test");
                 ServiceContext.FileService.SaveTemplate(contentType.DefaultTemplate); // else, FK violation on contentType!
-                contentTypeRepository.AddOrUpdate(contentType);
+                contentTypeRepository.Save(contentType);
                 unitOfWork.Flush();
                 var content = MockedContent.CreateSimpleContent(contentType);
-                contentRepository.AddOrUpdate(content);
+                contentRepository.Save(content);
                 unitOfWork.Flush();
 
                 var repository = CreateRepository(unitOfWork);
@@ -290,10 +291,10 @@ namespace Umbraco.Tests.Persistence.Repositories
                 //create data to relate to
                 var contentType = MockedContentTypes.CreateSimpleContentType("test", "Test");
                 ServiceContext.FileService.SaveTemplate(contentType.DefaultTemplate); // else, FK violation on contentType!
-                contentTypeRepository.AddOrUpdate(contentType);
+                contentTypeRepository.Save(contentType);
                 unitOfWork.Flush();
                 var content = MockedContent.CreateSimpleContent(contentType);
-                contentRepository.AddOrUpdate(content);
+                contentRepository.Save(content);
                 unitOfWork.Flush();
 
                 var repository = CreateRepository(unitOfWork);
@@ -336,12 +337,12 @@ namespace Umbraco.Tests.Persistence.Repositories
                 //create data to relate to
                 var contentType = MockedContentTypes.CreateSimpleContentType("test", "Test");
                 ServiceContext.FileService.SaveTemplate(contentType.DefaultTemplate); // else, FK violation on contentType!
-                contentTypeRepository.AddOrUpdate(contentType);
+                contentTypeRepository.Save(contentType);
                 unitOfWork.Flush();
                 var content1 = MockedContent.CreateSimpleContent(contentType);
-                contentRepository.AddOrUpdate(content1);
+                contentRepository.Save(content1);
                 var content2 = MockedContent.CreateSimpleContent(contentType);
-                contentRepository.AddOrUpdate(content2);
+                contentRepository.Save(content2);
                 unitOfWork.Flush();
 
                 var repository = CreateRepository(unitOfWork);
@@ -382,12 +383,12 @@ namespace Umbraco.Tests.Persistence.Repositories
                 //create data to relate to
                 var contentType = MockedContentTypes.CreateSimpleContentType("test", "Test");
                 ServiceContext.FileService.SaveTemplate(contentType.DefaultTemplate); // else, FK violation on contentType!
-                contentTypeRepository.AddOrUpdate(contentType);
+                contentTypeRepository.Save(contentType);
                 unitOfWork.Flush();
                 var content1 = MockedContent.CreateSimpleContent(contentType);
-                contentRepository.AddOrUpdate(content1);
+                contentRepository.Save(content1);
                 var content2 = MockedContent.CreateSimpleContent(contentType);
-                contentRepository.AddOrUpdate(content2);
+                contentRepository.Save(content2);
                 unitOfWork.Flush();
 
                 var repository = CreateRepository(unitOfWork);
@@ -429,12 +430,12 @@ namespace Umbraco.Tests.Persistence.Repositories
                 //create data to relate to
                 var contentType = MockedContentTypes.CreateSimpleContentType("test", "Test");
                 ServiceContext.FileService.SaveTemplate(contentType.DefaultTemplate); // else, FK violation on contentType!
-                contentTypeRepository.AddOrUpdate(contentType);
+                contentTypeRepository.Save(contentType);
                 unitOfWork.Flush();
                 var content1 = MockedContent.CreateSimpleContent(contentType);
-                contentRepository.AddOrUpdate(content1);
+                contentRepository.Save(content1);
                 var content2 = MockedContent.CreateSimpleContent(contentType);
-                contentRepository.AddOrUpdate(content2);
+                contentRepository.Save(content2);
                 unitOfWork.Flush();
 
                 var repository = CreateRepository(unitOfWork);
@@ -449,7 +450,7 @@ namespace Umbraco.Tests.Persistence.Repositories
                             new Tag {Text = "tag4", Group = "test"}
                         }, false);
 
-                var result = repository.GetAll();
+                var result = repository.GetMany();
                 Assert.AreEqual(4, result.Count());
             }
         }
@@ -466,12 +467,12 @@ namespace Umbraco.Tests.Persistence.Repositories
                 //create data to relate to
                 var contentType = MockedContentTypes.CreateSimpleContentType("test", "Test");
                 ServiceContext.FileService.SaveTemplate(contentType.DefaultTemplate); // else, FK violation on contentType!
-                contentTypeRepository.AddOrUpdate(contentType);
+                contentTypeRepository.Save(contentType);
                 unitOfWork.Flush();
                 var content1 = MockedContent.CreateSimpleContent(contentType);
-                contentRepository.AddOrUpdate(content1);
+                contentRepository.Save(content1);
                 var content2 = MockedContent.CreateSimpleContent(contentType);
-                contentRepository.AddOrUpdate(content2);
+                contentRepository.Save(content2);
                 unitOfWork.Flush();
 
                 var repository = CreateRepository(unitOfWork);
@@ -489,9 +490,9 @@ namespace Umbraco.Tests.Persistence.Repositories
 
                 //TODO: This would be nice to be able to map the ids back but unfortunately we are not doing this
                 //var result = repository.GetAll(new[] {tags[0].Id, tags[1].Id, tags[2].Id});
-                var all = repository.GetAll().ToArray();
+                var all = repository.GetMany().ToArray();
 
-                var result = repository.GetAll(new[] { all[0].Id, all[1].Id, all[2].Id });
+                var result = repository.GetMany(new[] { all[0].Id, all[1].Id, all[2].Id });
                 Assert.AreEqual(3, result.Count());
             }
         }
@@ -508,12 +509,12 @@ namespace Umbraco.Tests.Persistence.Repositories
                 //create data to relate to
                 var contentType = MockedContentTypes.CreateSimpleContentType("test", "Test");
                 ServiceContext.FileService.SaveTemplate(contentType.DefaultTemplate); // else, FK violation on contentType!
-                contentTypeRepository.AddOrUpdate(contentType);
+                contentTypeRepository.Save(contentType);
                 unitOfWork.Flush();
                 var content1 = MockedContent.CreateSimpleContent(contentType);
-                contentRepository.AddOrUpdate(content1);
+                contentRepository.Save(content1);
                 var content2 = MockedContent.CreateSimpleContent(contentType);
-                contentRepository.AddOrUpdate(content2);
+                contentRepository.Save(content2);
                 unitOfWork.Flush();
 
                 var repository = CreateRepository(unitOfWork);
@@ -554,10 +555,10 @@ namespace Umbraco.Tests.Persistence.Repositories
                 //create data to relate to
                 var contentType = MockedContentTypes.CreateSimpleContentType("test", "Test");
                 ServiceContext.FileService.SaveTemplate(contentType.DefaultTemplate); // else, FK violation on contentType!
-                contentTypeRepository.AddOrUpdate(contentType);
+                contentTypeRepository.Save(contentType);
                 unitOfWork.Flush();
                 var content1 = MockedContent.CreateSimpleContent(contentType);
-                contentRepository.AddOrUpdate(content1);
+                contentRepository.Save(content1);
                 unitOfWork.Flush();
 
                 var repository = CreateRepository(unitOfWork);
@@ -601,10 +602,10 @@ namespace Umbraco.Tests.Persistence.Repositories
                 //create data to relate to
                 var contentType = MockedContentTypes.CreateSimpleContentType("test", "Test");
                 ServiceContext.FileService.SaveTemplate(contentType.DefaultTemplate); // else, FK violation on contentType!
-                contentTypeRepository.AddOrUpdate(contentType);
+                contentTypeRepository.Save(contentType);
                 unitOfWork.Flush();
                 var content1 = MockedContent.CreateSimpleContent(contentType);
-                contentRepository.AddOrUpdate(content1);
+                contentRepository.Save(content1);
                 unitOfWork.Flush();
 
                 var repository = CreateRepository(unitOfWork);
@@ -647,10 +648,10 @@ namespace Umbraco.Tests.Persistence.Repositories
                 //create data to relate to
                 var contentType = MockedContentTypes.CreateSimpleContentType("test", "Test");
                 ServiceContext.FileService.SaveTemplate(contentType.DefaultTemplate); // else, FK violation on contentType!
-                contentTypeRepository.AddOrUpdate(contentType);
+                contentTypeRepository.Save(contentType);
                 unitOfWork.Flush();
                 var content1 = MockedContent.CreateSimpleContent(contentType);
-                contentRepository.AddOrUpdate(content1);
+                contentRepository.Save(content1);
                 unitOfWork.Flush();
 
                 var repository = CreateRepository(unitOfWork);
@@ -696,16 +697,16 @@ namespace Umbraco.Tests.Persistence.Repositories
                 //create data to relate to
                 var contentType = MockedContentTypes.CreateSimpleContentType("test", "Test");
                 ServiceContext.FileService.SaveTemplate(contentType.DefaultTemplate); // else, FK violation on contentType!
-                contentTypeRepository.AddOrUpdate(contentType);
+                contentTypeRepository.Save(contentType);
                 unitOfWork.Flush();
                 var content1 = MockedContent.CreateSimpleContent(contentType);
-                contentRepository.AddOrUpdate(content1);
+                contentRepository.Save(content1);
                 unitOfWork.Flush();
                 var mediaType = MockedContentTypes.CreateImageMediaType("image2");
-                mediaTypeRepository.AddOrUpdate(mediaType);
+                mediaTypeRepository.Save(mediaType);
                 unitOfWork.Flush();
                 var media1 = MockedMedia.CreateMediaImage(mediaType, -1);
-                mediaRepository.AddOrUpdate(media1);
+                mediaRepository.Save(media1);
                 unitOfWork.Flush();
 
                 var repository = CreateRepository(unitOfWork);
@@ -756,16 +757,16 @@ namespace Umbraco.Tests.Persistence.Repositories
                 //create data to relate to
                 var contentType = MockedContentTypes.CreateSimpleContentType("test", "Test");
                 ServiceContext.FileService.SaveTemplate(contentType.DefaultTemplate); // else, FK violation on contentType!
-                contentTypeRepository.AddOrUpdate(contentType);
+                contentTypeRepository.Save(contentType);
                 unitOfWork.Flush();
                 var content1 = MockedContent.CreateSimpleContent(contentType);
-                contentRepository.AddOrUpdate(content1);
+                contentRepository.Save(content1);
                 unitOfWork.Flush();
                 var mediaType = MockedContentTypes.CreateImageMediaType("image2");
-                mediaTypeRepository.AddOrUpdate(mediaType);
+                mediaTypeRepository.Save(mediaType);
                 unitOfWork.Flush();
                 var media1 = MockedMedia.CreateMediaImage(mediaType, -1);
-                mediaRepository.AddOrUpdate(media1);
+                mediaRepository.Save(media1);
                 unitOfWork.Flush();
 
                 var repository = CreateRepository(unitOfWork);
@@ -809,10 +810,10 @@ namespace Umbraco.Tests.Persistence.Repositories
                 //create data to relate to
                 var contentType = MockedContentTypes.CreateSimpleContentType("test", "Test");
                 ServiceContext.FileService.SaveTemplate(contentType.DefaultTemplate); // else, FK violation on contentType!
-                contentTypeRepository.AddOrUpdate(contentType);
+                contentTypeRepository.Save(contentType);
                 unitOfWork.Flush();
                 var content1 = MockedContent.CreateSimpleContent(contentType);
-                contentRepository.AddOrUpdate(content1);
+                contentRepository.Save(content1);
                 unitOfWork.Flush();
 
                 var repository = CreateRepository(unitOfWork);
@@ -851,22 +852,22 @@ namespace Umbraco.Tests.Persistence.Repositories
                 //create data to relate to
                 var contentType = MockedContentTypes.CreateSimpleContentType("test", "Test");
                 ServiceContext.FileService.SaveTemplate(contentType.DefaultTemplate); // else, FK violation on contentType!
-                contentTypeRepository.AddOrUpdate(contentType);
+                contentTypeRepository.Save(contentType);
                 unitOfWork.Flush();
 
                 var content1 = MockedContent.CreateSimpleContent(contentType);
-                contentRepository.AddOrUpdate(content1);
+                contentRepository.Save(content1);
                 unitOfWork.Flush();
 
                 var content2 = MockedContent.CreateSimpleContent(contentType);
-                contentRepository.AddOrUpdate(content2);
+                contentRepository.Save(content2);
                 unitOfWork.Flush();
 
                 var mediaType = MockedContentTypes.CreateImageMediaType("image2");
-                mediaTypeRepository.AddOrUpdate(mediaType);
+                mediaTypeRepository.Save(mediaType);
                 unitOfWork.Flush();
                 var media1 = MockedMedia.CreateMediaImage(mediaType, -1);
-                mediaRepository.AddOrUpdate(media1);
+                mediaRepository.Save(media1);
                 unitOfWork.Flush();
 
                 var repository = CreateRepository(unitOfWork);
@@ -937,22 +938,22 @@ namespace Umbraco.Tests.Persistence.Repositories
                 //create data to relate to
                 var contentType = MockedContentTypes.CreateSimpleContentType("test", "Test");
                 ServiceContext.FileService.SaveTemplate(contentType.DefaultTemplate); // else, FK violation on contentType!
-                contentTypeRepository.AddOrUpdate(contentType);
+                contentTypeRepository.Save(contentType);
                 unitOfWork.Flush();
 
                 var content1 = MockedContent.CreateSimpleContent(contentType);
-                contentRepository.AddOrUpdate(content1);
+                contentRepository.Save(content1);
                 unitOfWork.Flush();
 
                 var content2 = MockedContent.CreateSimpleContent(contentType);
-                contentRepository.AddOrUpdate(content2);
+                contentRepository.Save(content2);
                 unitOfWork.Flush();
 
                 var mediaType = MockedContentTypes.CreateImageMediaType("image2");
-                mediaTypeRepository.AddOrUpdate(mediaType);
+                mediaTypeRepository.Save(mediaType);
                 unitOfWork.Flush();
                 var media1 = MockedMedia.CreateMediaImage(mediaType, -1);
-                mediaRepository.AddOrUpdate(media1);
+                mediaRepository.Save(media1);
                 unitOfWork.Flush();
 
                 var repository = CreateRepository(unitOfWork);
@@ -1005,12 +1006,12 @@ namespace Umbraco.Tests.Persistence.Repositories
             }
         }
 
-        private ContentRepository CreateContentRepository(IScopeUnitOfWork unitOfWork, out ContentTypeRepository contentTypeRepository)
+        private DocumentRepository CreateContentRepository(IScopeUnitOfWork unitOfWork, out ContentTypeRepository contentTypeRepository)
         {
             var templateRepository = new TemplateRepository(unitOfWork, DisabledCache, Logger, Mock.Of<IFileSystem>(), Mock.Of<IFileSystem>(), Mock.Of<ITemplatesSection>());
             var tagRepository = new TagRepository(unitOfWork, DisabledCache, Logger);
             contentTypeRepository = new ContentTypeRepository(unitOfWork, DisabledCache, Logger, templateRepository);
-            var repository = new ContentRepository(unitOfWork, DisabledCache, Logger, contentTypeRepository, templateRepository, tagRepository, Mock.Of<IContentSection>());
+            var repository = new DocumentRepository(unitOfWork, DisabledCache, Logger, contentTypeRepository, templateRepository, tagRepository, Mock.Of<IContentSection>());
             return repository;
         }
 
diff --git a/src/Umbraco.Tests/Persistence/Repositories/TaskRepositoryTest.cs b/src/Umbraco.Tests/Persistence/Repositories/TaskRepositoryTest.cs
index 388e7c0b56..1506b5aba3 100644
--- a/src/Umbraco.Tests/Persistence/Repositories/TaskRepositoryTest.cs
+++ b/src/Umbraco.Tests/Persistence/Repositories/TaskRepositoryTest.cs
@@ -4,6 +4,7 @@ using NUnit.Framework;
 using Umbraco.Core;
 using Umbraco.Core.Models;
 using Umbraco.Core.Persistence.Repositories;
+using Umbraco.Core.Persistence.Repositories.Implement;
 using Umbraco.Core.Persistence.UnitOfWork;
 using Umbraco.Tests.TestHelpers;
 using Umbraco.Tests.Testing;
@@ -31,7 +32,7 @@ namespace Umbraco.Tests.Persistence.Repositories
                     EntityId = -1,
                     OwnerUserId = 0
                 };
-                repo.AddOrUpdate(task);
+                repo.Save(task);
                 unitOfWork.Flush();
 
                 repo.Delete(task);
@@ -51,7 +52,7 @@ namespace Umbraco.Tests.Persistence.Repositories
                 var repo = new TaskRepository(unitOfWork, CacheHelper, Logger);
 
                 var created = DateTime.Now;
-                repo.AddOrUpdate(new Task(new TaskType("asdfasdf"))
+                repo.Save(new Task(new TaskType("asdfasdf"))
                 {
                     AssigneeUserId = 0,
                     Closed = false,
@@ -61,7 +62,7 @@ namespace Umbraco.Tests.Persistence.Repositories
                 });
                 unitOfWork.Flush();
 
-                var found = repo.GetAll().ToArray();
+                var found = repo.GetMany().ToArray();
 
                 Assert.AreEqual(1, found.Length);
                 Assert.AreEqual(0, found.First().AssigneeUserId);
@@ -92,7 +93,7 @@ namespace Umbraco.Tests.Persistence.Repositories
                     OwnerUserId = 0
                 };
 
-                repo.AddOrUpdate(task);
+                repo.Save(task);
                 unitOfWork.Flush();
 
                 //re-get
@@ -101,7 +102,7 @@ namespace Umbraco.Tests.Persistence.Repositories
                 task.Comment = "blah";
                 task.Closed = true;
 
-                repo.AddOrUpdate(task);
+                repo.Save(task);
                 unitOfWork.Flush();
 
                 //re-get
@@ -129,7 +130,7 @@ namespace Umbraco.Tests.Persistence.Repositories
                     OwnerUserId = 0
                 };
 
-                repo.AddOrUpdate(task);
+                repo.Save(task);
                 unitOfWork.Flush();
 
                 //re-get
@@ -149,7 +150,7 @@ namespace Umbraco.Tests.Persistence.Repositories
             {
                 var repo = new TaskRepository(unitOfWork, CacheHelper, Logger);
 
-                var found = repo.GetAll().ToArray();
+                var found = repo.GetMany().ToArray();
                 Assert.AreEqual(20, found.Count());
             }
         }
@@ -211,7 +212,7 @@ namespace Umbraco.Tests.Persistence.Repositories
 
                 for (int i = 0; i < count; i++)
                 {
-                    repo.AddOrUpdate(new Task(new TaskType("asdfasdf"))
+                    repo.Save(new Task(new TaskType("asdfasdf"))
                     {
                         AssigneeUserId = 0,
                         Closed = closed,
diff --git a/src/Umbraco.Tests/Persistence/Repositories/TaskTypeRepositoryTest.cs b/src/Umbraco.Tests/Persistence/Repositories/TaskTypeRepositoryTest.cs
index a9f2564e74..d64bf21adc 100644
--- a/src/Umbraco.Tests/Persistence/Repositories/TaskTypeRepositoryTest.cs
+++ b/src/Umbraco.Tests/Persistence/Repositories/TaskTypeRepositoryTest.cs
@@ -3,6 +3,7 @@ using System.Linq;
 using NUnit.Framework;
 using Umbraco.Core.Models;
 using Umbraco.Core.Persistence.Repositories;
+using Umbraco.Core.Persistence.Repositories.Implement;
 using Umbraco.Core.Persistence.UnitOfWork;
 using Umbraco.Tests.TestHelpers;
 using Umbraco.Tests.Testing;
@@ -32,16 +33,16 @@ namespace Umbraco.Tests.Persistence.Repositories
                     EntityId = -1,
                     OwnerUserId = 0
                 };
-                repo.AddOrUpdate(task);
+                repo.Save(task);
                 unitOfWork.Flush();
 
-                var alltasktypes = taskTypeRepo.GetAll();
+                var alltasktypes = taskTypeRepo.GetMany();
 
                 taskTypeRepo.Delete(taskType);
                 unitOfWork.Flush();
 
-                Assert.AreEqual(alltasktypes.Count() - 1, taskTypeRepo.GetAll().Count());
-                Assert.AreEqual(0, repo.GetAll().Count());
+                Assert.AreEqual(alltasktypes.Count() - 1, taskTypeRepo.GetMany().Count());
+                Assert.AreEqual(0, repo.GetMany().Count());
             }
 
 
diff --git a/src/Umbraco.Tests/Persistence/Repositories/TemplateRepositoryTest.cs b/src/Umbraco.Tests/Persistence/Repositories/TemplateRepositoryTest.cs
index fb7c2ede99..acb72771b9 100644
--- a/src/Umbraco.Tests/Persistence/Repositories/TemplateRepositoryTest.cs
+++ b/src/Umbraco.Tests/Persistence/Repositories/TemplateRepositoryTest.cs
@@ -10,6 +10,7 @@ using Umbraco.Core.Configuration.UmbracoSettings;
 using Umbraco.Core.IO;
 using Umbraco.Core.Models;
 using Umbraco.Core.Persistence.Repositories;
+using Umbraco.Core.Persistence.Repositories.Implement;
 using Umbraco.Core.Persistence.UnitOfWork;
 using Umbraco.Tests.TestHelpers;
 using Umbraco.Tests.TestHelpers.Entities;
@@ -67,7 +68,7 @@ namespace Umbraco.Tests.Persistence.Repositories
                 {
                     Content = @"<%@ Master Language=""C#"" %>"
                 };
-                repository.AddOrUpdate(template);
+                repository.Save(template);
                 unitOfWork.Flush();
 
                 //Assert
@@ -88,7 +89,7 @@ namespace Umbraco.Tests.Persistence.Repositories
 
                 // Act
                 var template = new Template("test", "test");
-                repository.AddOrUpdate(template);
+                repository.Save(template);
                 unitOfWork.Flush();
 
                 //Assert
@@ -115,13 +116,13 @@ namespace Umbraco.Tests.Persistence.Repositories
 
                 //NOTE: This has to be persisted first
                 var template = new Template("test", "test");
-                repository.AddOrUpdate(template);
+                repository.Save(template);
                 unitOfWork.Flush();
 
                 // Act
                 var template2 = new Template("test2", "test2");
                 template2.SetMasterTemplate(template);
-                repository.AddOrUpdate(template2);
+                repository.Save(template2);
                 unitOfWork.Flush();
 
                 //Assert
@@ -145,7 +146,7 @@ namespace Umbraco.Tests.Persistence.Repositories
 
                 // Act
                 var template = new Template("test", "test");
-                repository.AddOrUpdate(template);
+                repository.Save(template);
                 unitOfWork.Flush();
 
                 //Assert
@@ -169,7 +170,7 @@ namespace Umbraco.Tests.Persistence.Repositories
                 {
                     Content = ViewHelper.GetDefaultFileContent()
                 };
-                repository.AddOrUpdate(template);
+                repository.Save(template);
                 unitOfWork.Flush();
 
                 //Assert
@@ -193,13 +194,13 @@ namespace Umbraco.Tests.Persistence.Repositories
 
                 //NOTE: This has to be persisted first
                 var template = new Template("test", "test");
-                repository.AddOrUpdate(template);
+                repository.Save(template);
                 unitOfWork.Flush();
 
                 // Act
                 var template2 = new Template("test2", "test2");
                 template2.SetMasterTemplate(template);
-                repository.AddOrUpdate(template2);
+                repository.Save(template2);
                 unitOfWork.Flush();
 
                 //Assert
@@ -225,14 +226,14 @@ namespace Umbraco.Tests.Persistence.Repositories
                 {
                     Content = ViewHelper.GetDefaultFileContent()
                 };
-                repository.AddOrUpdate(template);
+                repository.Save(template);
                 unitOfWork.Flush();
 
                 var template2 = new Template("test", "test")
                 {
                     Content = ViewHelper.GetDefaultFileContent()
                 };
-                repository.AddOrUpdate(template2);
+                repository.Save(template2);
                 unitOfWork.Flush();
 
                 //Assert
@@ -255,18 +256,18 @@ namespace Umbraco.Tests.Persistence.Repositories
                 {
                     Content = ViewHelper.GetDefaultFileContent()
                 };
-                repository.AddOrUpdate(template);
+                repository.Save(template);
                 unitOfWork.Flush();
 
                 var template2 = new Template("test1", "test1")
                 {
                     Content = ViewHelper.GetDefaultFileContent()
                 };
-                repository.AddOrUpdate(template2);
+                repository.Save(template2);
                 unitOfWork.Flush();
 
                 template.Alias = "test1";
-                repository.AddOrUpdate(template);
+                repository.Save(template);
                 unitOfWork.Flush();
 
                 //Assert
@@ -291,11 +292,11 @@ namespace Umbraco.Tests.Persistence.Repositories
                 {
                     Content = @"<%@ Master Language=""C#"" %>"
                 };
-                repository.AddOrUpdate(template);
+                repository.Save(template);
                 unitOfWork.Flush();
 
                 template.Content = @"<%@ Master Language=""VB"" %>";
-                repository.AddOrUpdate(template);
+                repository.Save(template);
                 unitOfWork.Flush();
 
                 var updated = repository.Get("test");
@@ -322,11 +323,11 @@ namespace Umbraco.Tests.Persistence.Repositories
                 {
                     Content = ViewHelper.GetDefaultFileContent()
                 };
-                repository.AddOrUpdate(template);
+                repository.Save(template);
                 unitOfWork.Flush();
 
                 template.Content += "<html></html>";
-                repository.AddOrUpdate(template);
+                repository.Save(template);
                 unitOfWork.Flush();
 
                 var updated = repository.Get("test");
@@ -350,7 +351,7 @@ namespace Umbraco.Tests.Persistence.Repositories
                 {
                     Content = @"<%@ Master Language=""C#"" %>"
                 };
-                repository.AddOrUpdate(template);
+                repository.Save(template);
                 unitOfWork.Flush();
 
                 // Act
@@ -378,7 +379,7 @@ namespace Umbraco.Tests.Persistence.Repositories
                 {
                     Content = ViewHelper.GetDefaultFileContent()
                 };
-                repository.AddOrUpdate(template);
+                repository.Save(template);
                 unitOfWork.Flush();
 
                 // Act
@@ -404,13 +405,13 @@ namespace Umbraco.Tests.Persistence.Repositories
 
                 var tagRepository = new TagRepository(unitOfWork, DisabledCache, Logger);
                 var contentTypeRepository = new ContentTypeRepository(unitOfWork, DisabledCache, Logger, templateRepository);
-                var contentRepo = new ContentRepository(unitOfWork, DisabledCache, Logger, contentTypeRepository, templateRepository, tagRepository, Mock.Of<IContentSection>());
+                var contentRepo = new DocumentRepository(unitOfWork, DisabledCache, Logger, contentTypeRepository, templateRepository, tagRepository, Mock.Of<IContentSection>());
 
                 var contentType = MockedContentTypes.CreateSimpleContentType("umbTextpage2", "Textpage");
                 ServiceContext.FileService.SaveTemplate(contentType.DefaultTemplate); // else, FK violation on contentType!
-                contentTypeRepository.AddOrUpdate(contentType);
+                contentTypeRepository.Save(contentType);
                 var textpage = MockedContent.CreateSimpleContent(contentType);
-                contentRepo.AddOrUpdate(textpage);
+                contentRepo.Save(textpage);
                 unitOfWork.Flush();
 
 
@@ -418,11 +419,11 @@ namespace Umbraco.Tests.Persistence.Repositories
                 {
                     Content = @"<%@ Master Language=""C#"" %>"
                 };
-                templateRepository.AddOrUpdate(template);
+                templateRepository.Save(template);
                 unitOfWork.Flush();
 
                 textpage.Template = template;
-                contentRepo.AddOrUpdate(textpage);
+                contentRepo.Save(textpage);
                 unitOfWork.Flush();
 
                 // Act
@@ -460,9 +461,9 @@ namespace Umbraco.Tests.Persistence.Repositories
                 child.MasterTemplateId = new Lazy<int>(() => parent.Id);
                 baby.MasterTemplateAlias = child.Alias;
                 baby.MasterTemplateId = new Lazy<int>(() => child.Id);
-                repository.AddOrUpdate(parent);
-                repository.AddOrUpdate(child);
-                repository.AddOrUpdate(baby);
+                repository.Save(parent);
+                repository.Save(child);
+                repository.Save(baby);
                 unitOfWork.Flush();
 
                 // Act
@@ -516,7 +517,7 @@ namespace Umbraco.Tests.Persistence.Repositories
                 // Act
                 var all = repository.GetAll();
                 var allByAlias = repository.GetAll("parent", "child2", "baby2", "notFound");
-                var allById = repository.GetAll(created[0].Id, created[2].Id, created[4].Id, created[5].Id, 999999);
+                var allById = repository.GetMany(created[0].Id, created[2].Id, created[4].Id, created[5].Id, 999999);
 
                 // Assert
                 Assert.AreEqual(9, all.Count());
@@ -638,15 +639,15 @@ namespace Umbraco.Tests.Persistence.Repositories
 
 
                 // Act
-                repository.AddOrUpdate(parent);
-                repository.AddOrUpdate(child1);
-                repository.AddOrUpdate(child2);
-                repository.AddOrUpdate(toddler1);
-                repository.AddOrUpdate(toddler2);
-                repository.AddOrUpdate(toddler3);
-                repository.AddOrUpdate(toddler4);
-                repository.AddOrUpdate(baby1);
-                repository.AddOrUpdate(baby2);
+                repository.Save(parent);
+                repository.Save(child1);
+                repository.Save(child2);
+                repository.Save(toddler1);
+                repository.Save(toddler2);
+                repository.Save(toddler3);
+                repository.Save(toddler4);
+                repository.Save(baby1);
+                repository.Save(baby2);
                 unitOfWork.Flush();
 
                 // Assert
@@ -687,16 +688,16 @@ namespace Umbraco.Tests.Persistence.Repositories
                 toddler2.MasterTemplateAlias = child1.Alias;
                 toddler2.MasterTemplateId = new Lazy<int>(() => child1.Id);
 
-                repository.AddOrUpdate(parent);
-                repository.AddOrUpdate(child1);
-                repository.AddOrUpdate(child2);
-                repository.AddOrUpdate(toddler1);
-                repository.AddOrUpdate(toddler2);
+                repository.Save(parent);
+                repository.Save(child1);
+                repository.Save(child2);
+                repository.Save(toddler1);
+                repository.Save(toddler2);
                 unitOfWork.Flush();
 
                 //Act
                 toddler2.SetMasterTemplate(child2);
-                repository.AddOrUpdate(toddler2);
+                repository.Save(toddler2);
                 unitOfWork.Flush();
 
                 //Assert
@@ -719,13 +720,13 @@ namespace Umbraco.Tests.Persistence.Repositories
                 child1.MasterTemplateAlias = parent.Alias;
                 child1.MasterTemplateId = new Lazy<int>(() => parent.Id);
 
-                repository.AddOrUpdate(parent);
-                repository.AddOrUpdate(child1);
+                repository.Save(parent);
+                repository.Save(child1);
                 unitOfWork.Flush();
 
                 //Act
                 child1.SetMasterTemplate(null);
-                repository.AddOrUpdate(child1);
+                repository.Save(child1);
                 unitOfWork.Flush();
 
                 //Assert
@@ -829,15 +830,15 @@ namespace Umbraco.Tests.Persistence.Repositories
             baby2.MasterTemplateAlias = toddler4.Alias;
             baby2.MasterTemplateId = new Lazy<int>(() => toddler4.Id);
 
-            repository.AddOrUpdate(parent);
-            repository.AddOrUpdate(child1);
-            repository.AddOrUpdate(child2);
-            repository.AddOrUpdate(toddler1);
-            repository.AddOrUpdate(toddler2);
-            repository.AddOrUpdate(toddler3);
-            repository.AddOrUpdate(toddler4);
-            repository.AddOrUpdate(baby1);
-            repository.AddOrUpdate(baby2);
+            repository.Save(parent);
+            repository.Save(child1);
+            repository.Save(child2);
+            repository.Save(toddler1);
+            repository.Save(toddler2);
+            repository.Save(toddler3);
+            repository.Save(toddler4);
+            repository.Save(baby1);
+            repository.Save(baby2);
             unitOfWork.Flush();
 
             return new[] {parent, child1, child2, toddler1, toddler2, toddler3, toddler4, baby1, baby2};
diff --git a/src/Umbraco.Tests/Persistence/Repositories/UserGroupRepositoryTest.cs b/src/Umbraco.Tests/Persistence/Repositories/UserGroupRepositoryTest.cs
index 591a9085eb..8571cc4f84 100644
--- a/src/Umbraco.Tests/Persistence/Repositories/UserGroupRepositoryTest.cs
+++ b/src/Umbraco.Tests/Persistence/Repositories/UserGroupRepositoryTest.cs
@@ -5,6 +5,7 @@ using NUnit.Framework;
 using Umbraco.Core.Logging;
 using Umbraco.Core.Models.Membership;
 using Umbraco.Core.Persistence.Repositories;
+using Umbraco.Core.Persistence.Repositories.Implement;
 using Umbraco.Core.Persistence.UnitOfWork;
 using Umbraco.Tests.TestHelpers;
 using Umbraco.Tests.TestHelpers.Entities;
@@ -33,7 +34,7 @@ namespace Umbraco.Tests.Persistence.Repositories
                 var userGroup = MockedUserGroup.CreateUserGroup();
 
                 // Act
-                repository.AddOrUpdate(userGroup);
+                repository.Save(userGroup);
                 unitOfWork.Complete();
 
                 // Assert
@@ -54,9 +55,9 @@ namespace Umbraco.Tests.Persistence.Repositories
                 var userGroup2 = MockedUserGroup.CreateUserGroup("2");
 
                 // Act
-                repository.AddOrUpdate(userGroup1);
+                repository.Save(userGroup1);
                 unitOfWork.Flush();
-                repository.AddOrUpdate(userGroup2);
+                repository.Save(userGroup2);
                 unitOfWork.Complete();
 
                 // Assert
@@ -75,7 +76,7 @@ namespace Umbraco.Tests.Persistence.Repositories
                 var repository = CreateRepository(unitOfWork);
 
                 var userGroup = MockedUserGroup.CreateUserGroup();
-                repository.AddOrUpdate(userGroup);
+                repository.Save(userGroup);
                 unitOfWork.Complete();
 
                 // Act
@@ -97,14 +98,14 @@ namespace Umbraco.Tests.Persistence.Repositories
                 var repository = CreateRepository(unitOfWork);
 
                 var userGroup = MockedUserGroup.CreateUserGroup();
-                repository.AddOrUpdate(userGroup);
+                repository.Save(userGroup);
                 unitOfWork.Flush();
 
                 // Act
                 var resolved = repository.Get(userGroup.Id);
                 resolved.Name = "New Name";
                 resolved.Permissions = new[] { "Z", "Y", "X" };
-                repository.AddOrUpdate(resolved);
+                repository.Save(resolved);
                 unitOfWork.Complete();
                 var updatedItem = repository.Get(userGroup.Id);
 
@@ -126,7 +127,7 @@ namespace Umbraco.Tests.Persistence.Repositories
                 var userGroup = MockedUserGroup.CreateUserGroup();
 
                 // Act
-                repository.AddOrUpdate(userGroup);
+                repository.Save(userGroup);
                 unitOfWork.Flush();
                 var id = userGroup.Id;
 
@@ -151,7 +152,7 @@ namespace Umbraco.Tests.Persistence.Repositories
                 var repository = CreateRepository(unitOfWork);
 
                 var userGroup = MockedUserGroup.CreateUserGroup();
-                repository.AddOrUpdate(userGroup);
+                repository.Save(userGroup);
                 unitOfWork.Complete();
 
                 // Act
@@ -180,7 +181,7 @@ namespace Umbraco.Tests.Persistence.Repositories
 
                 // Act
                 var query = unitOfWork.SqlContext.Query<IUserGroup>().Where(x => x.Alias == "testUserGroup1");
-                var result = repository.GetByQuery(query);
+                var result = repository.Get(query);
 
                 // Assert
                 Assert.That(result.Count(), Is.GreaterThanOrEqualTo(1));
@@ -199,7 +200,7 @@ namespace Umbraco.Tests.Persistence.Repositories
                 var userGroups = CreateAndCommitMultipleUserGroups(repository, unitOfWork);
 
                 // Act
-                var result = repository.GetAll(userGroups[0].Id, userGroups[1].Id);
+                var result = repository.GetMany(userGroups[0].Id, userGroups[1].Id);
 
                 // Assert
                 Assert.That(result, Is.Not.Null);
@@ -220,7 +221,7 @@ namespace Umbraco.Tests.Persistence.Repositories
                 CreateAndCommitMultipleUserGroups(repository, unitOfWork);
 
                 // Act
-                var result = repository.GetAll();
+                var result = repository.GetMany();
 
                 // Assert
                 Assert.That(result, Is.Not.Null);
@@ -290,12 +291,12 @@ namespace Umbraco.Tests.Persistence.Repositories
                 groups[1].RemoveAllowedSection("media");
                 groups[1].RemoveAllowedSection("media");
 
-                repository.AddOrUpdate(groups[0]);
-                repository.AddOrUpdate(groups[1]);
+                repository.Save(groups[0]);
+                repository.Save(groups[1]);
                 unitOfWork.Complete();
 
                 // Assert
-                var result = repository.GetAll((int)groups[0].Id, (int)groups[1].Id).ToArray();
+                var result = repository.GetMany((int)groups[0].Id, (int)groups[1].Id).ToArray();
                 Assert.AreEqual(1, result[0].AllowedSections.Count());
                 Assert.AreEqual("media", result[0].AllowedSections.First());
                 Assert.AreEqual(1, result[1].AllowedSections.Count());
@@ -332,16 +333,16 @@ namespace Umbraco.Tests.Persistence.Repositories
 
                 groups[2].ClearAllowedSections();
 
-                repository.AddOrUpdate(groups[0]);
-                repository.AddOrUpdate(groups[1]);
-                repository.AddOrUpdate(groups[2]);
+                repository.Save(groups[0]);
+                repository.Save(groups[1]);
+                repository.Save(groups[2]);
                 unitOfWork.Complete();
 
                 for (var i = 0; i < 3; i++)
                     Assert.IsNotNull(repository.Get(groups[i].Id));
 
                 // Assert
-                var result = repository.GetAll(groups[0].Id, groups[1].Id, groups[2].Id).ToArray();
+                var result = repository.GetMany(groups[0].Id, groups[1].Id, groups[2].Id).ToArray();
                 Assert.AreEqual(3, result.Length);
 
                 Assert.AreEqual(3, result[0].AllowedSections.Count());
@@ -370,7 +371,7 @@ namespace Umbraco.Tests.Persistence.Repositories
                 groups[0].RemoveAllowedSection("content");
                 groups[0].AddAllowedSection("settings");
 
-                repository.AddOrUpdate(groups[0]);
+                repository.Save(groups[0]);
                 unitOfWork.Complete();
 
                 // Assert
@@ -394,9 +395,9 @@ namespace Umbraco.Tests.Persistence.Repositories
                 var user1 = MockedUserGroup.CreateUserGroup("1", allowedSections: new[] { "test1" });
                 var user2 = MockedUserGroup.CreateUserGroup("2", allowedSections: new[] { "test2" });
                 var user3 = MockedUserGroup.CreateUserGroup("3", allowedSections: new[] { "test1" });
-                repository.AddOrUpdate(user1);
-                repository.AddOrUpdate(user2);
-                repository.AddOrUpdate(user3);
+                repository.Save(user1);
+                repository.Save(user2);
+                repository.Save(user3);
                 unitOfWork.Complete();
 
                 // Act
@@ -416,9 +417,9 @@ namespace Umbraco.Tests.Persistence.Repositories
             var userGroup1 = MockedUserGroup.CreateUserGroup("1");
             var userGroup2 = MockedUserGroup.CreateUserGroup("2");
             var userGroup3 = MockedUserGroup.CreateUserGroup("3");
-            repository.AddOrUpdate(userGroup1);
-            repository.AddOrUpdate(userGroup2);
-            repository.AddOrUpdate(userGroup3);
+            repository.Save(userGroup1);
+            repository.Save(userGroup2);
+            repository.Save(userGroup3);
             unitOfWork.Complete();
             return new IUserGroup[] { userGroup1, userGroup2, userGroup3 };
         }
diff --git a/src/Umbraco.Tests/Persistence/Repositories/UserRepositoryTest.cs b/src/Umbraco.Tests/Persistence/Repositories/UserRepositoryTest.cs
index 05e86dec1f..6a957e682f 100644
--- a/src/Umbraco.Tests/Persistence/Repositories/UserRepositoryTest.cs
+++ b/src/Umbraco.Tests/Persistence/Repositories/UserRepositoryTest.cs
@@ -9,6 +9,7 @@ using Umbraco.Core.Logging;
 using Umbraco.Core.Models.Membership;
 using Umbraco.Core.Persistence.Mappers;
 using Umbraco.Core.Persistence.Repositories;
+using Umbraco.Core.Persistence.Repositories.Implement;
 using Umbraco.Core.Persistence.UnitOfWork;
 using Umbraco.Tests.TestHelpers;
 using Umbraco.Tests.TestHelpers.Entities;
@@ -28,18 +29,18 @@ namespace Umbraco.Tests.Persistence.Repositories
             return repository;
         }
 
-        private ContentRepository CreateContentRepository(IScopeUnitOfWork unitOfWork, out IContentTypeRepository contentTypeRepository)
+        private DocumentRepository CreateContentRepository(IScopeUnitOfWork unitOfWork, out IContentTypeRepository contentTypeRepository)
         {
             ITemplateRepository tr;
             return CreateContentRepository(unitOfWork, out contentTypeRepository, out tr);
         }
 
-        private ContentRepository CreateContentRepository(IScopeUnitOfWork unitOfWork, out IContentTypeRepository contentTypeRepository, out ITemplateRepository templateRepository)
+        private DocumentRepository CreateContentRepository(IScopeUnitOfWork unitOfWork, out IContentTypeRepository contentTypeRepository, out ITemplateRepository templateRepository)
         {
             templateRepository = new TemplateRepository(unitOfWork, CacheHelper, Logger, Mock.Of<IFileSystem>(), Mock.Of<IFileSystem>(), Mock.Of<ITemplatesSection>());
             var tagRepository = new TagRepository(unitOfWork, CacheHelper, Logger);
             contentTypeRepository = new ContentTypeRepository(unitOfWork, CacheHelper, Logger, templateRepository);
-            var repository = new ContentRepository(unitOfWork, CacheHelper, Logger, contentTypeRepository, templateRepository, tagRepository, Mock.Of<IContentSection>());
+            var repository = new DocumentRepository(unitOfWork, CacheHelper, Logger, contentTypeRepository, templateRepository, tagRepository, Mock.Of<IContentSection>());
             return repository;
         }
 
@@ -66,7 +67,7 @@ namespace Umbraco.Tests.Persistence.Repositories
                 var user = MockedUser.CreateUser();
 
                 // Act
-                repository.AddOrUpdate(user);
+                repository.Save(user);
                 unitOfWork.Flush();
 
                 // Assert
@@ -87,9 +88,9 @@ namespace Umbraco.Tests.Persistence.Repositories
                 var use2 = MockedUser.CreateUser("2");
 
                 // Act
-                repository.AddOrUpdate(user1);
+                repository.Save(user1);
                 unitOfWork.Flush();
-                repository.AddOrUpdate(use2);
+                repository.Save(use2);
                 unitOfWork.Flush();
 
                 // Assert
@@ -108,7 +109,7 @@ namespace Umbraco.Tests.Persistence.Repositories
                 var repository = CreateRepository(unitOfWork);
 
                 var user = MockedUser.CreateUser();
-                repository.AddOrUpdate(user);
+                repository.Save(user);
                 unitOfWork.Flush();
 
                 // Act
@@ -137,12 +138,12 @@ namespace Umbraco.Tests.Persistence.Repositories
                 var mediaRepository = CreateMediaRepository(unitOfWork, out var mediaTypeRepo);
                 var userGroupRepository = CreateUserGroupRepository(unitOfWork);
 
-                contentTypeRepo.AddOrUpdate(ct);
-                mediaTypeRepo.AddOrUpdate(mt);
+                contentTypeRepo.Save(ct);
+                mediaTypeRepo.Save(mt);
                 unitOfWork.Flush();
 
-                contentRepository.AddOrUpdate(content);
-                mediaRepository.AddOrUpdate(media);
+                contentRepository.Save(content);
+                mediaRepository.Save(media);
                 unitOfWork.Flush();
 
                 var user = CreateAndCommitUserWithGroup(userRepository, userGroupRepository, unitOfWork);
@@ -162,7 +163,7 @@ namespace Umbraco.Tests.Persistence.Repositories
                 resolved.Email = "new@new.com";
                 resolved.Username = "newName";
 
-                userRepository.AddOrUpdate(resolved);
+                userRepository.Save(resolved);
                 unitOfWork.Flush();
                 var updatedItem = (User) userRepository.Get(user.Id);
 
@@ -195,7 +196,7 @@ namespace Umbraco.Tests.Persistence.Repositories
                 var user = MockedUser.CreateUser();
 
                 // Act
-                repository.AddOrUpdate(user);
+                repository.Save(user);
                 unitOfWork.Flush();
                 var id = user.Id;
 
@@ -249,7 +250,7 @@ namespace Umbraco.Tests.Persistence.Repositories
 
                 // Act
                 var query = unitOfWork.SqlContext.Query<IUser>().Where(x => x.Username == "TestUser1");
-                var result = repository.GetByQuery(query);
+                var result = repository.Get(query);
 
                 // Assert
                 Assert.That(result.Count(), Is.GreaterThanOrEqualTo(1));
@@ -268,7 +269,7 @@ namespace Umbraco.Tests.Persistence.Repositories
                 var users = CreateAndCommitMultipleUsers(repository, unitOfWork);
 
                 // Act
-                var result = repository.GetAll((int) users[0].Id, (int) users[1].Id);
+                var result = repository.GetMany((int) users[0].Id, (int) users[1].Id);
 
                 // Assert
                 Assert.That(result, Is.Not.Null);
@@ -289,7 +290,7 @@ namespace Umbraco.Tests.Persistence.Repositories
                 CreateAndCommitMultipleUsers(repository, unitOfWork);
 
                 // Act
-                var result = repository.GetAll();
+                var result = repository.GetMany();
 
                 // Assert
                 Assert.That(result, Is.Not.Null);
@@ -357,7 +358,7 @@ namespace Umbraco.Tests.Persistence.Repositories
         private static User CreateAndCommitUserWithGroup(IUserRepository repository, IUserGroupRepository userGroupRepository, IScopeUnitOfWork unitOfWork)
         {
             var user = MockedUser.CreateUser();
-            repository.AddOrUpdate(user);
+            repository.Save(user);
             unitOfWork.Flush();
 
             var group = MockedUserGroup.CreateUserGroup();
@@ -372,9 +373,9 @@ namespace Umbraco.Tests.Persistence.Repositories
             var user1 = MockedUser.CreateUser("1");
             var user2 = MockedUser.CreateUser("2");
             var user3 = MockedUser.CreateUser("3");
-            repository.AddOrUpdate(user1);
-            repository.AddOrUpdate(user2);
-            repository.AddOrUpdate(user3);
+            repository.Save(user1);
+            repository.Save(user2);
+            repository.Save(user3);
             unitOfWork.Complete();
             return new IUser[] { user1, user2, user3 };
         }
diff --git a/src/Umbraco.Tests/Services/ContentServicePerformanceTest.cs b/src/Umbraco.Tests/Services/ContentServicePerformanceTest.cs
index 0e475b3eb7..22e72cf367 100644
--- a/src/Umbraco.Tests/Services/ContentServicePerformanceTest.cs
+++ b/src/Umbraco.Tests/Services/ContentServicePerformanceTest.cs
@@ -11,6 +11,7 @@ using Umbraco.Core.Logging;
 using Umbraco.Core.Models;
 using Umbraco.Core.Models.Rdbms;
 using Umbraco.Core.Persistence.Repositories;
+using Umbraco.Core.Persistence.Repositories.Implement;
 using Umbraco.Tests.TestHelpers;
 using Umbraco.Tests.TestHelpers.Entities;
 using Umbraco.Tests.TestHelpers.Stubs;
@@ -162,11 +163,11 @@ namespace Umbraco.Tests.Services
                 var tRepository = new TemplateRepository(unitOfWork, DisabledCache, Logger, Mock.Of<IFileSystem>(), Mock.Of<IFileSystem>(), Mock.Of<ITemplatesSection>());
                 var tagRepo = new TagRepository(unitOfWork, DisabledCache, Logger);
                 var ctRepository = new ContentTypeRepository(unitOfWork, DisabledCache, Logger, tRepository);
-                var repository = new ContentRepository(unitOfWork, DisabledCache, Logger, ctRepository, tRepository, tagRepo, Mock.Of<IContentSection>());
+                var repository = new DocumentRepository(unitOfWork, DisabledCache, Logger, ctRepository, tRepository, tagRepo, Mock.Of<IContentSection>());
 
                 // Act
                 Stopwatch watch = Stopwatch.StartNew();
-                var contents = repository.GetAll();
+                var contents = repository.GetMany();
                 watch.Stop();
                 var elapsed = watch.ElapsedMilliseconds;
 
@@ -194,11 +195,11 @@ namespace Umbraco.Tests.Services
                 var tRepository = new TemplateRepository(unitOfWork, DisabledCache, Logger, Mock.Of<IFileSystem>(), Mock.Of<IFileSystem>(), Mock.Of<ITemplatesSection>());
                 var tagRepo = new TagRepository(unitOfWork, DisabledCache, Logger);
                 var ctRepository = new ContentTypeRepository(unitOfWork, DisabledCache, Logger, tRepository);
-                var repository = new ContentRepository(unitOfWork, DisabledCache, Logger, ctRepository, tRepository, tagRepo, Mock.Of<IContentSection>());
+                var repository = new DocumentRepository(unitOfWork, DisabledCache, Logger, ctRepository, tRepository, tagRepo, Mock.Of<IContentSection>());
 
                 // Act
                 Stopwatch watch = Stopwatch.StartNew();
-                var contents = repository.GetAll();
+                var contents = repository.GetMany();
                 watch.Stop();
                 var elapsed = watch.ElapsedMilliseconds;
 
@@ -224,13 +225,13 @@ namespace Umbraco.Tests.Services
                 var tRepository = new TemplateRepository(unitOfWork, DisabledCache, Logger, Mock.Of<IFileSystem>(), Mock.Of<IFileSystem>(), Mock.Of<ITemplatesSection>());
                 var tagRepo = new TagRepository(unitOfWork, DisabledCache, Logger);
                 var ctRepository = new ContentTypeRepository(unitOfWork, DisabledCache, Logger, tRepository);
-                var repository = new ContentRepository(unitOfWork, DisabledCache, Logger, ctRepository, tRepository, tagRepo, Mock.Of<IContentSection>());
+                var repository = new DocumentRepository(unitOfWork, DisabledCache, Logger, ctRepository, tRepository, tagRepo, Mock.Of<IContentSection>());
 
                 // Act
-                var contents = repository.GetAll();
+                var contents = repository.GetMany();
 
                 Stopwatch watch = Stopwatch.StartNew();
-                var contentsCached = repository.GetAll();
+                var contentsCached = repository.GetMany();
                 watch.Stop();
                 var elapsed = watch.ElapsedMilliseconds;
 
@@ -257,13 +258,13 @@ namespace Umbraco.Tests.Services
                 var tRepository = new TemplateRepository(unitOfWork, DisabledCache, Logger, Mock.Of<IFileSystem>(), Mock.Of<IFileSystem>(), Mock.Of<ITemplatesSection>());
                 var tagRepo = new TagRepository(unitOfWork, DisabledCache, Logger);
                 var ctRepository = new ContentTypeRepository(unitOfWork, DisabledCache, Logger, tRepository);
-                var repository = new ContentRepository(unitOfWork, DisabledCache, Logger, ctRepository, tRepository, tagRepo, Mock.Of<IContentSection>());
+                var repository = new DocumentRepository(unitOfWork, DisabledCache, Logger, ctRepository, tRepository, tagRepo, Mock.Of<IContentSection>());
 
                 // Act
-                var contents = repository.GetAll();
+                var contents = repository.GetMany();
 
                 Stopwatch watch = Stopwatch.StartNew();
-                var contentsCached = repository.GetAll();
+                var contentsCached = repository.GetMany();
                 watch.Stop();
                 var elapsed = watch.ElapsedMilliseconds;
 
diff --git a/src/Umbraco.Tests/Services/ContentServiceTests.cs b/src/Umbraco.Tests/Services/ContentServiceTests.cs
index ecb6596fb0..2cce5fb11b 100644
--- a/src/Umbraco.Tests/Services/ContentServiceTests.cs
+++ b/src/Umbraco.Tests/Services/ContentServiceTests.cs
@@ -19,6 +19,7 @@ using Umbraco.Core.Services;
 using Umbraco.Tests.TestHelpers.Entities;
 using Umbraco.Core.Events;
 using Umbraco.Core.Logging;
+using Umbraco.Core.Persistence.Repositories.Implement;
 using Umbraco.Tests.Testing;
 
 namespace Umbraco.Tests.Services
@@ -38,12 +39,12 @@ namespace Umbraco.Tests.Services
         public override void SetUp()
         {
             base.SetUp();
-            VersionableRepositoryBase.ThrowOnWarning = true;
+            ContentRepositoryBase.ThrowOnWarning = true;
         }
 
         public override void TearDown()
         {
-            VersionableRepositoryBase.ThrowOnWarning = false;
+            ContentRepositoryBase.ThrowOnWarning = false;
             base.TearDown();
         }
 
@@ -2128,7 +2129,7 @@ namespace Umbraco.Tests.Services
 
                 foreach (var content in list)
                 {
-                    repository.AddOrUpdate(content.Value);
+                    repository.Save(content.Value);
                     unitOfWork.Flush();
                 }
 
@@ -2471,12 +2472,12 @@ namespace Umbraco.Tests.Services
             return list;
         }
 
-        private ContentRepository CreateRepository(IScopeUnitOfWork unitOfWork, out ContentTypeRepository contentTypeRepository)
+        private DocumentRepository CreateRepository(IScopeUnitOfWork unitOfWork, out ContentTypeRepository contentTypeRepository)
         {
             var templateRepository = new TemplateRepository(unitOfWork, DisabledCache, Logger, Mock.Of<IFileSystem>(), Mock.Of<IFileSystem>(), Mock.Of<ITemplatesSection>());
             var tagRepository = new TagRepository(unitOfWork, DisabledCache, Logger);
             contentTypeRepository = new ContentTypeRepository(unitOfWork, DisabledCache, Logger, templateRepository);
-            var repository = new ContentRepository(unitOfWork, DisabledCache, Logger, contentTypeRepository, templateRepository, tagRepository, Mock.Of<IContentSection>());
+            var repository = new DocumentRepository(unitOfWork, DisabledCache, Logger, contentTypeRepository, templateRepository, tagRepository, Mock.Of<IContentSection>());
             return repository;
         }
     }
diff --git a/src/Umbraco.Tests/Services/MacroServiceTests.cs b/src/Umbraco.Tests/Services/MacroServiceTests.cs
index 18fa688fbf..c20ff2490a 100644
--- a/src/Umbraco.Tests/Services/MacroServiceTests.cs
+++ b/src/Umbraco.Tests/Services/MacroServiceTests.cs
@@ -7,6 +7,7 @@ using Umbraco.Core.Logging;
 using Umbraco.Core.Models;
 
 using Umbraco.Core.Persistence.Repositories;
+using Umbraco.Core.Persistence.Repositories.Implement;
 using Umbraco.Tests.Testing;
 
 namespace Umbraco.Tests.Services
@@ -24,9 +25,9 @@ namespace Umbraco.Tests.Services
             {
                 var repository = new MacroRepository(unitOfWork, CacheHelper.CreateDisabledCacheHelper(), Mock.Of<ILogger>());
 
-                repository.AddOrUpdate(new Macro("test1", "Test1", "~/usercontrol/test1.ascx", "MyAssembly1", "test1.xslt", "~/views/macropartials/test1.cshtml"));
-                repository.AddOrUpdate(new Macro("test2", "Test2", "~/usercontrol/test2.ascx", "MyAssembly2", "test2.xslt", "~/views/macropartials/test2.cshtml"));
-                repository.AddOrUpdate(new Macro("test3", "Tet3", "~/usercontrol/test3.ascx", "MyAssembly3", "test3.xslt", "~/views/macropartials/test3.cshtml"));
+                repository.Save(new Macro("test1", "Test1", "~/usercontrol/test1.ascx", "MyAssembly1", "test1.xslt", "~/views/macropartials/test1.cshtml"));
+                repository.Save(new Macro("test2", "Test2", "~/usercontrol/test2.ascx", "MyAssembly2", "test2.xslt", "~/views/macropartials/test2.cshtml"));
+                repository.Save(new Macro("test3", "Tet3", "~/usercontrol/test3.ascx", "MyAssembly3", "test3.xslt", "~/views/macropartials/test3.cshtml"));
                 unitOfWork.Complete();
             }
         }
diff --git a/src/Umbraco.Tests/Services/PreValueConverterTests.cs b/src/Umbraco.Tests/Services/PreValueConverterTests.cs
index 21c989150d..c8c7de2cde 100644
--- a/src/Umbraco.Tests/Services/PreValueConverterTests.cs
+++ b/src/Umbraco.Tests/Services/PreValueConverterTests.cs
@@ -4,6 +4,7 @@ using System.Linq;
 using NUnit.Framework;
 using Umbraco.Core.Models;
 using Umbraco.Core.Persistence.Repositories;
+using Umbraco.Core.Persistence.Repositories.Implement;
 using Umbraco.Core.Services;
 
 namespace Umbraco.Tests.Services
diff --git a/src/Umbraco.Tests/Templates/TemplateRepositoryTests.cs b/src/Umbraco.Tests/Templates/TemplateRepositoryTests.cs
index b267f02879..41f56a7906 100644
--- a/src/Umbraco.Tests/Templates/TemplateRepositoryTests.cs
+++ b/src/Umbraco.Tests/Templates/TemplateRepositoryTests.cs
@@ -9,6 +9,7 @@ using Umbraco.Core.Models;
 using Umbraco.Core.Persistence;
 using Umbraco.Core.Persistence.Querying;
 using Umbraco.Core.Persistence.Repositories;
+using Umbraco.Core.Persistence.Repositories.Implement;
 using Umbraco.Core.Persistence.UnitOfWork;
 using Umbraco.Tests.TestHelpers;
 
diff --git a/src/Umbraco.Web/Cache/ContentCacheRefresher.cs b/src/Umbraco.Web/Cache/ContentCacheRefresher.cs
index 021a56d5d9..7d33630432 100644
--- a/src/Umbraco.Web/Cache/ContentCacheRefresher.cs
+++ b/src/Umbraco.Web/Cache/ContentCacheRefresher.cs
@@ -5,6 +5,7 @@ using Umbraco.Core.Cache;
 using Umbraco.Core.Configuration;
 using Umbraco.Core.Models;
 using Umbraco.Core.Persistence.Repositories;
+using Umbraco.Core.Persistence.Repositories.Implement;
 using Umbraco.Core.Services.Changes;
 using Umbraco.Web.Composing;
 using Umbraco.Web.PublishedCache;
@@ -48,7 +49,7 @@ namespace Umbraco.Web.Cache
             foreach (var payload in payloads)
             {
                 // remove that one
-                runtimeCache.ClearCacheItem(RepositoryBase.GetCacheIdKey<IContent>(payload.Id));
+                runtimeCache.ClearCacheItem(RepositoryCacheKeys.GetKey<IContent>(payload.Id));
 
                 // remove those that are in the branch
                 if (payload.ChangeTypes.HasTypesAny(TreeChangeTypes.RefreshBranch | TreeChangeTypes.Remove))
diff --git a/src/Umbraco.Web/Cache/MacroCacheRefresher.cs b/src/Umbraco.Web/Cache/MacroCacheRefresher.cs
index 633f5c1b76..402151fdb9 100644
--- a/src/Umbraco.Web/Cache/MacroCacheRefresher.cs
+++ b/src/Umbraco.Web/Cache/MacroCacheRefresher.cs
@@ -6,6 +6,7 @@ using umbraco;
 using Umbraco.Core.Persistence.Repositories;
 using System.Linq;
 using Newtonsoft.Json;
+using Umbraco.Core.Persistence.Repositories.Implement;
 
 namespace Umbraco.Web.Cache
 {
@@ -55,7 +56,7 @@ namespace Umbraco.Web.Cache
                 var macroRepoCache = CacheHelper.IsolatedRuntimeCache.GetCache<IMacro>();
                 if (macroRepoCache)
                 {
-                    macroRepoCache.Result.ClearCacheItem(RepositoryBase.GetCacheIdKey<IMacro>(payload.Id));
+                    macroRepoCache.Result.ClearCacheItem(RepositoryCacheKeys.GetKey<IMacro>(payload.Id));
                 }
             });
 
diff --git a/src/Umbraco.Web/Cache/MediaCacheRefresher.cs b/src/Umbraco.Web/Cache/MediaCacheRefresher.cs
index c1ea750185..09a4e3eb5d 100644
--- a/src/Umbraco.Web/Cache/MediaCacheRefresher.cs
+++ b/src/Umbraco.Web/Cache/MediaCacheRefresher.cs
@@ -5,6 +5,7 @@ using Umbraco.Core.Models;
 using Umbraco.Core.Persistence.Repositories;
 using System.Linq;
 using System.Xml.Linq;
+using Umbraco.Core.Persistence.Repositories.Implement;
 using Umbraco.Core.Services;
 using Umbraco.Core.Services.Changes;
 using Umbraco.Web.Composing;
@@ -84,7 +85,7 @@ namespace Umbraco.Web.Cache
                     // repository cache
                     // it *was* done for each pathId but really that does not make sense
                     // only need to do it for the current media
-                    mediaCache.Result.ClearCacheItem(RepositoryBase.GetCacheIdKey<IMedia>(payload.Id));
+                    mediaCache.Result.ClearCacheItem(RepositoryCacheKeys.GetKey<IMedia>(payload.Id));
 
                     // remove those that are in the branch
                     if (payload.ChangeTypes.HasTypesAny(TreeChangeTypes.RefreshBranch | TreeChangeTypes.Remove))
diff --git a/src/Umbraco.Web/Cache/MemberCacheRefresher.cs b/src/Umbraco.Web/Cache/MemberCacheRefresher.cs
index 2ad938b557..abb44b2a42 100644
--- a/src/Umbraco.Web/Cache/MemberCacheRefresher.cs
+++ b/src/Umbraco.Web/Cache/MemberCacheRefresher.cs
@@ -2,6 +2,7 @@
 using Umbraco.Core.Cache;
 using Umbraco.Core.Models;
 using Umbraco.Core.Persistence.Repositories;
+using Umbraco.Core.Persistence.Repositories.Implement;
 using Umbraco.Core.Services;
 
 namespace Umbraco.Web.Cache
@@ -64,7 +65,7 @@ namespace Umbraco.Web.Cache
 
             var memberCache = CacheHelper.IsolatedRuntimeCache.GetCache<IMember>();
             if (memberCache)
-                memberCache.Result.ClearCacheItem(RepositoryBase.GetCacheIdKey<IMember>(id));
+                memberCache.Result.ClearCacheItem(RepositoryCacheKeys.GetKey<IMember>(id));
         }
 
         #endregion
diff --git a/src/Umbraco.Web/Cache/MemberGroupCacheRefresher.cs b/src/Umbraco.Web/Cache/MemberGroupCacheRefresher.cs
index 009f534615..b23cdb5b5a 100644
--- a/src/Umbraco.Web/Cache/MemberGroupCacheRefresher.cs
+++ b/src/Umbraco.Web/Cache/MemberGroupCacheRefresher.cs
@@ -5,6 +5,7 @@ using Umbraco.Core;
 using Umbraco.Core.Cache;
 using Umbraco.Core.Models;
 using Umbraco.Core.Persistence.Repositories;
+using Umbraco.Core.Persistence.Repositories.Implement;
 using Umbraco.Core.Services;
 
 namespace Umbraco.Web.Cache
@@ -66,7 +67,7 @@ namespace Umbraco.Web.Cache
             foreach (var payload in payloads.WhereNotNull())
             {
                 memberGroupCache.Result.ClearCacheByKeySearch($"{typeof(IMemberGroup).FullName}.{payload.Name}");
-                memberGroupCache.Result.ClearCacheItem(RepositoryBase.GetCacheIdKey<IMemberGroup>(payload.Id));
+                memberGroupCache.Result.ClearCacheItem(RepositoryCacheKeys.GetKey<IMemberGroup>(payload.Id));
             }
         }
 
diff --git a/src/Umbraco.Web/Cache/RelationTypeCacheRefresher.cs b/src/Umbraco.Web/Cache/RelationTypeCacheRefresher.cs
index 3f3be57f91..4dd7282f98 100644
--- a/src/Umbraco.Web/Cache/RelationTypeCacheRefresher.cs
+++ b/src/Umbraco.Web/Cache/RelationTypeCacheRefresher.cs
@@ -2,6 +2,7 @@
 using Umbraco.Core.Cache;
 using Umbraco.Core.Models;
 using Umbraco.Core.Persistence.Repositories;
+using Umbraco.Core.Persistence.Repositories.Implement;
 
 namespace Umbraco.Web.Cache
 {
@@ -34,7 +35,7 @@ namespace Umbraco.Web.Cache
         public override void Refresh(int id)
         {
             var cache = CacheHelper.IsolatedRuntimeCache.GetCache<IRelationType>();
-            if (cache) cache.Result.ClearCacheItem(RepositoryBase.GetCacheIdKey<IRelationType>(id));
+            if (cache) cache.Result.ClearCacheItem(RepositoryCacheKeys.GetKey<IRelationType>(id));
             base.Refresh(id);
         }
 
@@ -47,7 +48,7 @@ namespace Umbraco.Web.Cache
         public override void Remove(int id)
         {
             var cache = CacheHelper.IsolatedRuntimeCache.GetCache<IRelationType>();
-            if (cache) cache.Result.ClearCacheItem(RepositoryBase.GetCacheIdKey<IRelationType>(id));
+            if (cache) cache.Result.ClearCacheItem(RepositoryCacheKeys.GetKey<IRelationType>(id));
             base.Remove(id);
         }
 
diff --git a/src/Umbraco.Web/Cache/UserCacheRefresher.cs b/src/Umbraco.Web/Cache/UserCacheRefresher.cs
index a780104a66..6166c65ce5 100644
--- a/src/Umbraco.Web/Cache/UserCacheRefresher.cs
+++ b/src/Umbraco.Web/Cache/UserCacheRefresher.cs
@@ -2,6 +2,7 @@
 using Umbraco.Core.Cache;
 using Umbraco.Core.Models.Membership;
 using Umbraco.Core.Persistence.Repositories;
+using Umbraco.Core.Persistence.Repositories.Implement;
 
 namespace Umbraco.Web.Cache
 {
@@ -41,7 +42,7 @@ namespace Umbraco.Web.Cache
         {
             var userCache = CacheHelper.IsolatedRuntimeCache.GetCache<IUser>();
             if (userCache)
-                userCache.Result.ClearCacheItem(RepositoryBase.GetCacheIdKey<IUser>(id));
+                userCache.Result.ClearCacheItem(RepositoryCacheKeys.GetKey<IUser>(id));
 
             base.Remove(id);
         }
diff --git a/src/Umbraco.Web/Cache/UserGroupCacheRefresher.cs b/src/Umbraco.Web/Cache/UserGroupCacheRefresher.cs
index 58d2f2aec5..deb49ad624 100644
--- a/src/Umbraco.Web/Cache/UserGroupCacheRefresher.cs
+++ b/src/Umbraco.Web/Cache/UserGroupCacheRefresher.cs
@@ -2,6 +2,7 @@
 using Umbraco.Core.Cache;
 using Umbraco.Core.Models.Membership;
 using Umbraco.Core.Persistence.Repositories;
+using Umbraco.Core.Persistence.Repositories.Implement;
 
 namespace Umbraco.Web.Cache
 {
@@ -57,7 +58,7 @@ namespace Umbraco.Web.Cache
             var userGroupCache = CacheHelper.IsolatedRuntimeCache.GetCache<IUserGroup>();
             if (userGroupCache)
             {
-                userGroupCache.Result.ClearCacheItem(RepositoryBase.GetCacheIdKey<IUserGroup>(id));
+                userGroupCache.Result.ClearCacheItem(RepositoryCacheKeys.GetKey<IUserGroup>(id));
                 userGroupCache.Result.ClearCacheByKeySearch(UserGroupRepository.GetByAliasCacheKeyPrefix);
             }
 
diff --git a/src/Umbraco.Web/PublishedCache/NuCache/PublishedSnapshotService.cs b/src/Umbraco.Web/PublishedCache/NuCache/PublishedSnapshotService.cs
index eff769d449..9dc2c0117a 100644
--- a/src/Umbraco.Web/PublishedCache/NuCache/PublishedSnapshotService.cs
+++ b/src/Umbraco.Web/PublishedCache/NuCache/PublishedSnapshotService.cs
@@ -17,6 +17,7 @@ using Umbraco.Core.Models.Rdbms;
 using Umbraco.Core.Persistence;
 using Umbraco.Core.Persistence.DatabaseModelDefinitions;
 using Umbraco.Core.Persistence.Repositories;
+using Umbraco.Core.Persistence.Repositories.Implement;
 using Umbraco.Core.Persistence.UnitOfWork;
 using Umbraco.Core.PropertyEditors;
 using Umbraco.Core.Scoping;
@@ -183,9 +184,9 @@ namespace Umbraco.Web.PublishedCache.NuCache
             // plug repository event handlers
             // these trigger within the transaction to ensure consistency
             // and are used to maintain the central, database-level XML cache
-            ContentRepository.UowRemovingEntity += OnContentRemovingEntity;
+            DocumentRepository.UowRemovingEntity += OnContentRemovingEntity;
             //ContentRepository.RemovedVersion += OnContentRemovedVersion;
-            ContentRepository.UowRefreshedEntity += OnContentRefreshedEntity;
+            DocumentRepository.UowRefreshedEntity += OnContentRefreshedEntity;
             MediaRepository.UowRemovingEntity += OnMediaRemovingEntity;
             //MediaRepository.RemovedVersion += OnMediaRemovedVersion;
             MediaRepository.UowRefreshedEntity += OnMediaRefreshedEntity;
@@ -201,9 +202,9 @@ namespace Umbraco.Web.PublishedCache.NuCache
 
         private void TearDownRepositoryEvents()
         {
-            ContentRepository.UowRemovingEntity -= OnContentRemovingEntity;
+            DocumentRepository.UowRemovingEntity -= OnContentRemovingEntity;
             //ContentRepository.RemovedVersion -= OnContentRemovedVersion;
-            ContentRepository.UowRefreshedEntity -= OnContentRefreshedEntity;
+            DocumentRepository.UowRefreshedEntity -= OnContentRefreshedEntity;
             MediaRepository.UowRemovingEntity -= OnMediaRemovingEntity;
             //MediaRepository.RemovedVersion -= OnMediaRemovedVersion;
             MediaRepository.UowRefreshedEntity -= OnMediaRefreshedEntity;
@@ -1036,7 +1037,7 @@ namespace Umbraco.Web.PublishedCache.NuCache
         // because they need to be consistent with the content that is being refreshed/removed - and that
         // should be guaranteed by a DB transaction
 
-        private void OnContentRemovingEntity(ContentRepository sender, ContentRepository.UnitOfWorkEntityEventArgs args)
+        private void OnContentRemovingEntity(DocumentRepository sender, DocumentRepository.UnitOfWorkEntityEventArgs args)
         {
             OnRemovedEntity(args.UnitOfWork.Database, args.Entity);
         }
@@ -1071,7 +1072,7 @@ namespace Umbraco.Web.PublishedCache.NuCache
             return PropertiesImpactingAllVersions.Any(content.IsPropertyDirty);
         }
 
-        private void OnContentRefreshedEntity(ContentRepository sender, ContentRepository.UnitOfWorkEntityEventArgs args)
+        private void OnContentRefreshedEntity(DocumentRepository sender, DocumentRepository.UnitOfWorkEntityEventArgs args)
         {
             var db = args.UnitOfWork.Database;
             var content = (Content) args.Entity;
@@ -1254,7 +1255,7 @@ WHERE cmsContentNu.nodeId IN (
             }
 
             // insert back - if anything fails the transaction will rollback
-            var repository = uow.CreateRepository<IContentRepository>();
+            var repository = uow.CreateRepository<IDocumentRepository>();
             var query = _uowProvider.SqlContext.Query<IContent>();
             if (contentTypeIds != null && contentTypeIdsA.Length > 0)
                 query = query.WhereIn(x => x.ContentTypeId, contentTypeIdsA); // assume number of ctypes won't blow IN(...)
@@ -1264,7 +1265,7 @@ WHERE cmsContentNu.nodeId IN (
             long total;
             do
             {
-                var descendants = repository.GetPagedResultsByQuery(query, pageIndex++, groupSize, out total, "Path", Direction.Ascending, true);
+                var descendants = repository.GetPage(query, pageIndex++, groupSize, out total, "Path", Direction.Ascending, true);
                 var items = new List<ContentNuDto>();
                 foreach (var c in descendants)
                 {
@@ -1334,7 +1335,7 @@ WHERE cmsContentNu.nodeId IN (
             long total;
             do
             {
-                var descendants = repository.GetPagedResultsByQuery(query, pageIndex++, groupSize, out total, "Path", Direction.Ascending, true);
+                var descendants = repository.GetPage(query, pageIndex++, groupSize, out total, "Path", Direction.Ascending, true);
                 var items = descendants.Select(m => GetDto(m, false)).ToArray();
                 db.BulkInsertRecords(items);
                 processed += items.Length;
@@ -1395,7 +1396,7 @@ WHERE cmsContentNu.nodeId IN (
             long total;
             do
             {
-                var descendants = repository.GetPagedResultsByQuery(query, pageIndex++, groupSize, out total, "Path", Direction.Ascending, true);
+                var descendants = repository.GetPage(query, pageIndex++, groupSize, out total, "Path", Direction.Ascending, true);
                 var items = descendants.Select(m => GetDto(m, false)).ToArray();
                 db.BulkInsertRecords(items);
                 processed += items.Length;
diff --git a/src/Umbraco.Web/PublishedCache/XmlPublishedCache/XmlStore.cs b/src/Umbraco.Web/PublishedCache/XmlPublishedCache/XmlStore.cs
index de06d65cd0..5ac999e6bb 100644
--- a/src/Umbraco.Web/PublishedCache/XmlPublishedCache/XmlStore.cs
+++ b/src/Umbraco.Web/PublishedCache/XmlPublishedCache/XmlStore.cs
@@ -15,6 +15,7 @@ using Umbraco.Core.Models.Rdbms;
 using Umbraco.Core.Persistence;
 using Umbraco.Core.Persistence.DatabaseModelDefinitions;
 using Umbraco.Core.Persistence.Repositories;
+using Umbraco.Core.Persistence.Repositories.Implement;
 using Umbraco.Core.Persistence.UnitOfWork;
 using Umbraco.Core.Scoping;
 using Umbraco.Core.Services;
@@ -169,9 +170,9 @@ namespace Umbraco.Web.PublishedCache.XmlPublishedCache
             // plug repository event handlers
             // these trigger within the transaction to ensure consistency
             // and are used to maintain the central, database-level XML cache
-            ContentRepository.UowRemovingEntity += OnContentRemovingEntity;
-            ContentRepository.UowRemovingVersion += OnContentRemovingVersion;
-            ContentRepository.UowRefreshedEntity += OnContentRefreshedEntity;
+            DocumentRepository.UowRemovingEntity += OnContentRemovingEntity;
+            DocumentRepository.UowRemovingVersion += OnContentRemovingVersion;
+            DocumentRepository.UowRefreshedEntity += OnContentRefreshedEntity;
             MediaRepository.UowRemovingEntity += OnMediaRemovingEntity;
             MediaRepository.UowRemovingVersion += OnMediaRemovingVersion;
             MediaRepository.UowRefreshedEntity += OnMediaRefreshedEntity;
@@ -189,9 +190,9 @@ namespace Umbraco.Web.PublishedCache.XmlPublishedCache
 
         private void ClearEvents()
         {
-            ContentRepository.UowRemovingEntity -= OnContentRemovingEntity;
-            ContentRepository.UowRemovingVersion -= OnContentRemovingVersion;
-            ContentRepository.UowRefreshedEntity -= OnContentRefreshedEntity;
+            DocumentRepository.UowRemovingEntity -= OnContentRemovingEntity;
+            DocumentRepository.UowRemovingVersion -= OnContentRemovingVersion;
+            DocumentRepository.UowRefreshedEntity -= OnContentRefreshedEntity;
             MediaRepository.UowRemovingEntity -= OnMediaRemovingEntity;
             MediaRepository.UowRemovingVersion -= OnMediaRemovingVersion;
             MediaRepository.UowRefreshedEntity -= OnMediaRefreshedEntity;
@@ -1448,7 +1449,7 @@ ORDER BY umbracoNode.level, umbracoNode.sortOrder";
         // it is not the case at the moment, instead a global lock is used whenever content is modified - well,
         // almost: rollback or unpublish do not implement it - nevertheless
 
-        private static void OnContentRemovingEntity(ContentRepository sender, ContentRepository.UnitOfWorkEntityEventArgs args)
+        private static void OnContentRemovingEntity(DocumentRepository sender, DocumentRepository.UnitOfWorkEntityEventArgs args)
         {
             OnRemovedEntity(args.UnitOfWork.Database, args.Entity);
         }
@@ -1472,7 +1473,7 @@ ORDER BY umbracoNode.level, umbracoNode.sortOrder";
             // note: could be optimized by using "WHERE nodeId IN (...)" delete clauses
         }
 
-        private static void OnContentRemovingVersion(ContentRepository sender, ContentRepository.UnitOfWorkVersionEventArgs args)
+        private static void OnContentRemovingVersion(DocumentRepository sender, DocumentRepository.UnitOfWorkVersionEventArgs args)
         {
             OnRemovedVersion(args.UnitOfWork.Database, args.EntityId, args.VersionId);
         }
@@ -1507,7 +1508,7 @@ ORDER BY umbracoNode.level, umbracoNode.sortOrder";
             return PropertiesImpactingAllVersions.Any(content.IsPropertyDirty);
         }
 
-        private void OnContentRefreshedEntity(ContentRepository sender, ContentRepository.UnitOfWorkEntityEventArgs args)
+        private void OnContentRefreshedEntity(DocumentRepository sender, DocumentRepository.UnitOfWorkEntityEventArgs args)
         {
             var db = args.UnitOfWork.Database;
             var entity = args.Entity;
@@ -1657,7 +1658,7 @@ ORDER BY umbracoNode.level, umbracoNode.sortOrder";
             using (var uow = _uowProvider.CreateUnitOfWork())
             {
                 uow.WriteLock(Constants.Locks.ContentTree);
-                var repository = uow.CreateRepository<IContentRepository>();
+                var repository = uow.CreateRepository<IDocumentRepository>();
                 RebuildContentXmlLocked(uow, repository, groupSize, contentTypeIdsA);
                 RebuildPreviewXmlLocked(uow, repository, groupSize, contentTypeIdsA);
                 uow.Complete();
@@ -1671,7 +1672,7 @@ ORDER BY umbracoNode.level, umbracoNode.sortOrder";
             using (var uow = _uowProvider.CreateUnitOfWork())
             {
                 uow.WriteLock(Constants.Locks.ContentTree);
-                var repository = uow.CreateRepository<IContentRepository>();
+                var repository = uow.CreateRepository<IDocumentRepository>();
                 RebuildContentXmlLocked(uow, repository, groupSize, contentTypeIds);
                 uow.Complete();
                 scope.Complete();
@@ -1679,7 +1680,7 @@ ORDER BY umbracoNode.level, umbracoNode.sortOrder";
         }
 
         // assumes content tree lock
-        private void RebuildContentXmlLocked(IScopeUnitOfWork unitOfWork, IContentRepository repository, int groupSize, IEnumerable<int> contentTypeIds)
+        private void RebuildContentXmlLocked(IScopeUnitOfWork unitOfWork, IDocumentRepository repository, int groupSize, IEnumerable<int> contentTypeIds)
         {
             var contentTypeIdsA = contentTypeIds?.ToArray();
             var contentObjectType = Constants.ObjectTypes.Document;
@@ -1729,7 +1730,7 @@ WHERE cmsContentXml.nodeId IN (
             long total;
             do
             {
-                var descendants = repository.GetPagedResultsByQuery(query, pageIndex++, groupSize, out total, "Path", Direction.Ascending, true);
+                var descendants = repository.GetPage(query, pageIndex++, groupSize, out total, "Path", Direction.Ascending, true);
                 const bool published = true; // contentXml contains published content!
                 var items = descendants.Select(c => new ContentXmlDto { NodeId = c.Id, Xml =
                     EntityXmlSerializer.Serialize(_serviceContext.ContentService, _serviceContext.DataTypeService, _serviceContext.UserService, _serviceContext.LocalizationService, _segmentProviders, c, published).ToDataString() }).ToArray();
@@ -1744,7 +1745,7 @@ WHERE cmsContentXml.nodeId IN (
             using (var uow = _uowProvider.CreateUnitOfWork())
             {
                 uow.WriteLock(Constants.Locks.ContentTree);
-                var repository = uow.CreateRepository<IContentRepository>();
+                var repository = uow.CreateRepository<IDocumentRepository>();
                 RebuildPreviewXmlLocked(uow, repository, groupSize, contentTypeIds);
                 uow.Complete();
                 scope.Complete();
@@ -1752,7 +1753,7 @@ WHERE cmsContentXml.nodeId IN (
         }
 
         // assumes content tree lock
-        private void RebuildPreviewXmlLocked(IScopeUnitOfWork unitOfWork, IContentRepository repository, int groupSize, IEnumerable<int> contentTypeIds)
+        private void RebuildPreviewXmlLocked(IScopeUnitOfWork unitOfWork, IDocumentRepository repository, int groupSize, IEnumerable<int> contentTypeIds)
         {
             var contentTypeIdsA = contentTypeIds?.ToArray();
             var contentObjectType = Constants.ObjectTypes.Document;
@@ -1804,7 +1805,7 @@ WHERE cmsPreviewXml.nodeId IN (
             {
                 // .GetPagedResultsByQuery implicitely adds (uDocument.newest = 1) which
                 // is what we want for preview (ie latest version of a content, published or not)
-                var descendants = repository.GetPagedResultsByQuery(query, pageIndex++, groupSize, out total, "Path", Direction.Ascending, true);
+                var descendants = repository.GetPage(query, pageIndex++, groupSize, out total, "Path", Direction.Ascending, true);
                 const bool published = true; // previewXml contains edit content!
                 var items = descendants.Select(c => new PreviewXmlDto
                 {
@@ -1880,7 +1881,7 @@ WHERE cmsContentXml.nodeId IN (
             long total;
             do
             {
-                var descendants = repository.GetPagedResultsByQuery(query, pageIndex++, groupSize, out total, "Path", Direction.Ascending, true);
+                var descendants = repository.GetPage(query, pageIndex++, groupSize, out total, "Path", Direction.Ascending, true);
                 var items = descendants.Select(m => new ContentXmlDto { NodeId = m.Id, Xml =
                     EntityXmlSerializer.Serialize(_serviceContext.MediaService, _serviceContext.DataTypeService, _serviceContext.UserService, _serviceContext.LocalizationService, _segmentProviders, m).ToDataString() }).ToArray();
                 db.BulkInsertRecords(items);
@@ -1952,7 +1953,7 @@ WHERE cmsContentXml.nodeId IN (
             long total;
             do
             {
-                var descendants = repository.GetPagedResultsByQuery(query, pageIndex++, groupSize, out total, "Path", Direction.Ascending, true);
+                var descendants = repository.GetPage(query, pageIndex++, groupSize, out total, "Path", Direction.Ascending, true);
                 var items = descendants.Select(m => new ContentXmlDto { NodeId = m.Id, Xml = EntityXmlSerializer.Serialize(_serviceContext.DataTypeService, _serviceContext.LocalizationService, m).ToDataString() }).ToArray();
                 db.BulkInsertRecords(items);
                 processed += items.Length;