diff --git a/src/Umbraco.Core/Events/CancellableEnumerableObjectEventArgs.cs b/src/Umbraco.Core/Events/CancellableEnumerableObjectEventArgs.cs
index 1a651ef348..1d52d0d847 100644
--- a/src/Umbraco.Core/Events/CancellableEnumerableObjectEventArgs.cs
+++ b/src/Umbraco.Core/Events/CancellableEnumerableObjectEventArgs.cs
@@ -1,34 +1,36 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
-using System.Security.Permissions;
 
 namespace Umbraco.Core.Events
 {
-    [HostProtection(SecurityAction.LinkDemand, SharedState = true)]
-    public class CancellableEnumerableObjectEventArgs<T> : CancellableObjectEventArgs<IEnumerable<T>>, IEquatable<CancellableEnumerableObjectEventArgs<T>>
+    /// <summary>
+    /// Represents event data, for events that support cancellation, and expose impacted objects.
+    /// </summary>
+    /// <typeparam name="TEventObject">The type of the exposed, impacted objects.</typeparam>
+    public class CancellableEnumerableObjectEventArgs<TEventObject> : CancellableObjectEventArgs<IEnumerable<TEventObject>>, IEquatable<CancellableEnumerableObjectEventArgs<TEventObject>>
     {
-        public CancellableEnumerableObjectEventArgs(IEnumerable<T> eventObject, bool canCancel, EventMessages messages, IDictionary<string, object> additionalData)
+        public CancellableEnumerableObjectEventArgs(IEnumerable<TEventObject> eventObject, bool canCancel, EventMessages messages, IDictionary<string, object> additionalData)
             : base(eventObject, canCancel, messages, additionalData)
         { }
 
-        public CancellableEnumerableObjectEventArgs(IEnumerable<T> eventObject, bool canCancel, EventMessages eventMessages)
+        public CancellableEnumerableObjectEventArgs(IEnumerable<TEventObject> eventObject, bool canCancel, EventMessages eventMessages)
             : base(eventObject, canCancel, eventMessages)
         { }
 
-        public CancellableEnumerableObjectEventArgs(IEnumerable<T> eventObject, EventMessages eventMessages)
+        public CancellableEnumerableObjectEventArgs(IEnumerable<TEventObject> eventObject, EventMessages eventMessages)
             : base(eventObject, eventMessages)
         { }
 
-        public CancellableEnumerableObjectEventArgs(IEnumerable<T> eventObject, bool canCancel)
+        public CancellableEnumerableObjectEventArgs(IEnumerable<TEventObject> eventObject, bool canCancel)
             : base(eventObject, canCancel)
         { }
 
-        public CancellableEnumerableObjectEventArgs(IEnumerable<T> eventObject)
+        public CancellableEnumerableObjectEventArgs(IEnumerable<TEventObject> eventObject)
             : base(eventObject)
         { }
 
-        public bool Equals(CancellableEnumerableObjectEventArgs<T> other)
+        public bool Equals(CancellableEnumerableObjectEventArgs<TEventObject> other)
         {
             if (other is null) return false;
             if (ReferenceEquals(this, other)) return true;
@@ -41,7 +43,7 @@ namespace Umbraco.Core.Events
             if (obj is null) return false;
             if (ReferenceEquals(this, obj)) return true;
             if (obj.GetType() != this.GetType()) return false;
-            return Equals((CancellableEnumerableObjectEventArgs<T>)obj);
+            return Equals((CancellableEnumerableObjectEventArgs<TEventObject>)obj);
         }
 
         public override int GetHashCode()
@@ -49,4 +51,4 @@ namespace Umbraco.Core.Events
             return HashCodeHelper.GetHashCode(EventObject);
         }
     }
-}
\ No newline at end of file
+}
diff --git a/src/Umbraco.Core/Events/CancellableEventArgs.cs b/src/Umbraco.Core/Events/CancellableEventArgs.cs
index 19f576478f..d9d670ea59 100644
--- a/src/Umbraco.Core/Events/CancellableEventArgs.cs
+++ b/src/Umbraco.Core/Events/CancellableEventArgs.cs
@@ -1,14 +1,12 @@
 using System;
 using System.Collections.Generic;
 using System.Collections.ObjectModel;
-using System.Security.Permissions;
 
 namespace Umbraco.Core.Events
 {
     /// <summary>
-    /// Event args for that can support cancellation
+    /// Represents event data for events that support cancellation.
     /// </summary>
-    [HostProtection(SecurityAction.LinkDemand, SharedState = true)]
     public class CancellableEventArgs : EventArgs, IEquatable<CancellableEventArgs>
     {
         private bool _cancel;
diff --git a/src/Umbraco.Core/Events/CancellableObjectEventArgs.cs b/src/Umbraco.Core/Events/CancellableObjectEventArgs.cs
index 27ffb1b75d..daf36fd6c8 100644
--- a/src/Umbraco.Core/Events/CancellableObjectEventArgs.cs
+++ b/src/Umbraco.Core/Events/CancellableObjectEventArgs.cs
@@ -1,15 +1,10 @@
-using System;
-using System.Collections;
-using System.Collections.Generic;
-using System.Security.Permissions;
-using Umbraco.Core.Models;
+using System.Collections.Generic;
 
 namespace Umbraco.Core.Events
 {
     /// <summary>
-    /// Used as a base class for the generic type CancellableObjectEventArgs{T} so that we can get direct 'object' access to the underlying EventObject
+    /// Provides a base class for classes representing event data, for events that support cancellation, and expose an impacted object.
     /// </summary>
-    [HostProtection(SecurityAction.LinkDemand, SharedState = true)]
     public abstract class CancellableObjectEventArgs : CancellableEventArgs
     {
         protected CancellableObjectEventArgs(object eventObject, bool canCancel, EventMessages messages, IDictionary<string, object> additionalData)
@@ -41,90 +36,11 @@ namespace Umbraco.Core.Events
         }
 
         /// <summary>
-        /// Returns the object relating to the event
+        /// Gets or sets the impacted object.
         /// </summary>
         /// <remarks>
         /// This is protected so that inheritors can expose it with their own name
         /// </remarks>
         internal object EventObject { get; set; }
-
-    }
-
-    /// <summary>
-    /// Event args for a strongly typed object that can support cancellation
-    /// </summary>
-    /// <typeparam name="T"></typeparam>
-    [HostProtection(SecurityAction.LinkDemand, SharedState = true)]
-    public class CancellableObjectEventArgs<T> : CancellableObjectEventArgs, IEquatable<CancellableObjectEventArgs<T>>
-    {
-        public CancellableObjectEventArgs(T eventObject, bool canCancel, EventMessages messages, IDictionary<string, object> additionalData)
-            : base(eventObject, canCancel, messages, additionalData)
-        {
-        }
-
-        public CancellableObjectEventArgs(T eventObject, bool canCancel, EventMessages eventMessages)
-            : base(eventObject, canCancel, eventMessages)
-        {
-        }
-
-        public CancellableObjectEventArgs(T eventObject, EventMessages eventMessages)
-            : base(eventObject, eventMessages)
-        {
-        }
-
-        public CancellableObjectEventArgs(T eventObject, bool canCancel)
-            : base(eventObject, canCancel)
-        {
-        }
-
-        public CancellableObjectEventArgs(T eventObject)
-            : base(eventObject)
-        {
-        }
-
-        /// <summary>
-        /// Returns the object relating to the event
-        /// </summary>
-        /// <remarks>
-        /// This is protected so that inheritors can expose it with their own name
-        /// </remarks>
-        protected new T EventObject
-        {
-            get { return (T) base.EventObject; }
-            set { base.EventObject = value; }
-        }
-
-        public bool Equals(CancellableObjectEventArgs<T> other)
-        {
-            if (other is null) return false;
-            if (ReferenceEquals(this, other)) return true;
-            return base.Equals(other) && EqualityComparer<T>.Default.Equals(EventObject, other.EventObject);
-        }
-
-        public override bool Equals(object obj)
-        {
-            if (obj is null) return false;
-            if (ReferenceEquals(this, obj)) return true;
-            if (obj.GetType() != this.GetType()) return false;
-            return Equals((CancellableObjectEventArgs<T>)obj);
-        }
-
-        public override int GetHashCode()
-        {
-            unchecked
-            {
-                return (base.GetHashCode() * 397) ^ EqualityComparer<T>.Default.GetHashCode(EventObject);
-            }
-        }
-
-        public static bool operator ==(CancellableObjectEventArgs<T> left, CancellableObjectEventArgs<T> right)
-        {
-            return Equals(left, right);
-        }
-
-        public static bool operator !=(CancellableObjectEventArgs<T> left, CancellableObjectEventArgs<T> right)
-        {
-            return !Equals(left, right);
-        }
     }
 }
diff --git a/src/Umbraco.Core/Events/CancellableObjectEventArgsOfTEventObject.cs b/src/Umbraco.Core/Events/CancellableObjectEventArgsOfTEventObject.cs
new file mode 100644
index 0000000000..ace2ce0a4f
--- /dev/null
+++ b/src/Umbraco.Core/Events/CancellableObjectEventArgsOfTEventObject.cs
@@ -0,0 +1,82 @@
+using System;
+using System.Collections.Generic;
+
+namespace Umbraco.Core.Events
+{
+    /// <summary>
+    /// Represent event data, for events that support cancellation, and expose an impacted object.
+    /// </summary>
+    /// <typeparam name="TEventObject">The type of the exposed, impacted object.</typeparam>
+    public class CancellableObjectEventArgs<TEventObject> : CancellableObjectEventArgs, IEquatable<CancellableObjectEventArgs<TEventObject>>
+    {
+        public CancellableObjectEventArgs(TEventObject eventObject, bool canCancel, EventMessages messages, IDictionary<string, object> additionalData)
+            : base(eventObject, canCancel, messages, additionalData)
+        {
+        }
+
+        public CancellableObjectEventArgs(TEventObject eventObject, bool canCancel, EventMessages eventMessages)
+            : base(eventObject, canCancel, eventMessages)
+        {
+        }
+
+        public CancellableObjectEventArgs(TEventObject eventObject, EventMessages eventMessages)
+            : base(eventObject, eventMessages)
+        {
+        }
+
+        public CancellableObjectEventArgs(TEventObject eventObject, bool canCancel)
+            : base(eventObject, canCancel)
+        {
+        }
+
+        public CancellableObjectEventArgs(TEventObject eventObject)
+            : base(eventObject)
+        {
+        }
+
+        /// <summary>
+        /// Gets or sets the impacted object.
+        /// </summary>
+        /// <remarks>
+        /// This is protected so that inheritors can expose it with their own name
+        /// </remarks>
+        protected new TEventObject EventObject
+        {
+            get => (TEventObject) base.EventObject;
+            set => base.EventObject = value;
+        }
+
+        public bool Equals(CancellableObjectEventArgs<TEventObject> other)
+        {
+            if (other is null) return false;
+            if (ReferenceEquals(this, other)) return true;
+            return base.Equals(other) && EqualityComparer<TEventObject>.Default.Equals(EventObject, other.EventObject);
+        }
+
+        public override bool Equals(object obj)
+        {
+            if (obj is null) return false;
+            if (ReferenceEquals(this, obj)) return true;
+            if (obj.GetType() != this.GetType()) return false;
+            return Equals((CancellableObjectEventArgs<TEventObject>)obj);
+        }
+
+        public override int GetHashCode()
+        {
+            unchecked
+            {
+                return (base.GetHashCode() * 397) ^ EqualityComparer<TEventObject>.Default.GetHashCode(EventObject);
+            }
+        }
+
+        public static bool operator ==(CancellableObjectEventArgs<TEventObject> left, CancellableObjectEventArgs<TEventObject> right)
+        {
+            return Equals(left, right);
+        }
+
+        public static bool operator !=(CancellableObjectEventArgs<TEventObject> left, CancellableObjectEventArgs<TEventObject> right)
+        {
+            return !Equals(left, right);
+        }
+    }
+}
diff --git a/src/Umbraco.Core/Events/ContentPublishedEventArgs.cs b/src/Umbraco.Core/Events/ContentPublishedEventArgs.cs
index 589e447ba7..8c0690d591 100644
--- a/src/Umbraco.Core/Events/ContentPublishedEventArgs.cs
+++ b/src/Umbraco.Core/Events/ContentPublishedEventArgs.cs
@@ -1,29 +1,30 @@
-using System;
-using System.Collections.Generic;
+using System.Collections.Generic;
 using Umbraco.Core.Models;
 
 namespace Umbraco.Core.Events
 {
+    /// <summary>
+    /// Represents event data for the Published event.
+    /// </summary>
     public class ContentPublishedEventArgs : PublishEventArgs<IContent>
     {
+        /// <summary>
+        /// Initializes a new instance of the <see cref="ContentPublishedEventArgs"/> class.
+        /// </summary>
         public ContentPublishedEventArgs(IEnumerable<IContent> eventObject, bool canCancel, EventMessages eventMessages)
             : base(eventObject, canCancel, eventMessages)
-        {
-        }
+        { }
 
         /// <summary>
         /// Determines whether a culture has been published, during a Published event.
         /// </summary>
         public bool HasPublishedCulture(IContent content, string culture)
-            => content.WasPropertyDirty("_changedCulture_" + culture);
+            => content.WasPropertyDirty(ContentBase.ChangeTrackingPrefix.ChangedCulture + culture);
 
         /// <summary>
         /// Determines whether a culture has been unpublished, during a Published event.
         /// </summary>
         public bool HasUnpublishedCulture(IContent content, string culture)
-            => content.WasPropertyDirty("_unpublishedCulture_" + culture); 
-
-
-
+            => content.WasPropertyDirty(ContentBase.ChangeTrackingPrefix.UnpublishedCulture + culture); 
     }
 }
diff --git a/src/Umbraco.Core/Events/ContentPublishingEventArgs.cs b/src/Umbraco.Core/Events/ContentPublishingEventArgs.cs
index 35cbf63441..b64bb19def 100644
--- a/src/Umbraco.Core/Events/ContentPublishingEventArgs.cs
+++ b/src/Umbraco.Core/Events/ContentPublishingEventArgs.cs
@@ -1,21 +1,19 @@
-using System;
-using System.Linq;
-using System.Collections.Generic;
+using System.Collections.Generic;
 using Umbraco.Core.Models;
 
 namespace Umbraco.Core.Events
 {
+    /// <summary>
+    /// Represents event data for the Publishing event.
+    /// </summary>
     public class ContentPublishingEventArgs : PublishEventArgs<IContent>
     {
         /// <summary>
-        /// Creates a new <see cref="ContentPublishingEventArgs"/>
+        /// Initializes a new instance of the <see cref="ContentPublishingEventArgs"/> class.
         /// </summary>
-        /// <param name="eventObject"></param>
-        /// <param name="eventMessages"></param>
         public ContentPublishingEventArgs(IEnumerable<IContent> eventObject, EventMessages eventMessages)
             : base(eventObject, eventMessages)
-        {
-        }
+        { }
 
         /// <summary>
         /// Determines whether a culture is being published, during a Publishing event.
@@ -27,7 +25,6 @@ namespace Umbraco.Core.Events
         /// Determines whether a culture is being unpublished, during a Publishing event.
         /// </summary>
         public bool IsUnpublishingCulture(IContent content, string culture)
-            => content.IsPropertyDirty("_unpublishedCulture_" + culture); //bit of a hack since we know that the content implementation tracks changes this way
-
+            => content.IsPropertyDirty(ContentBase.ChangeTrackingPrefix.UnpublishedCulture + culture); //bit of a hack since we know that the content implementation tracks changes this way
     }
 }
diff --git a/src/Umbraco.Core/Events/ContentSavedEventArgs.cs b/src/Umbraco.Core/Events/ContentSavedEventArgs.cs
index 4d4085b064..e2d8c25dd1 100644
--- a/src/Umbraco.Core/Events/ContentSavedEventArgs.cs
+++ b/src/Umbraco.Core/Events/ContentSavedEventArgs.cs
@@ -1,30 +1,24 @@
-using System;
-using System.Collections.Generic;
+using System.Collections.Generic;
 using Umbraco.Core.Models;
 
 namespace Umbraco.Core.Events
 {
+    /// <summary>
+    /// Represents event data for the Saved event.
+    /// </summary>
     public class ContentSavedEventArgs : SaveEventArgs<IContent>
     {
-        #region Constructors
-
         /// <summary>
-        /// Creates a new <see cref="ContentSavedEventArgs"/>
+        /// Initializes a new instance of the <see cref="ContentSavedEventArgs"/> class.
         /// </summary>
-        /// <param name="eventObject"></param>
-        /// <param name="messages"></param>
-        /// <param name="additionalData"></param>
         public ContentSavedEventArgs(IEnumerable<IContent> eventObject, EventMessages messages, IDictionary<string, object> additionalData)
             : base(eventObject, false, messages, additionalData)
-        {
-        }
-
-        #endregion
+        { }
 
         /// <summary>
         /// Determines whether a culture has been saved, during a Saved event.
         /// </summary>
         public bool HasSavedCulture(IContent content, string culture)
-            => content.WasPropertyDirty("_updatedCulture_" + culture);
+            => content.WasPropertyDirty(ContentBase.ChangeTrackingPrefix.UpdatedCulture + culture);
     }
 }
diff --git a/src/Umbraco.Core/Events/ContentSavingEventArgs.cs b/src/Umbraco.Core/Events/ContentSavingEventArgs.cs
index aa62f64349..384353ee2e 100644
--- a/src/Umbraco.Core/Events/ContentSavingEventArgs.cs
+++ b/src/Umbraco.Core/Events/ContentSavingEventArgs.cs
@@ -1,12 +1,15 @@
-using System.Linq;
-using System.Collections.Generic;
+using System.Collections.Generic;
 using Umbraco.Core.Models;
 
 namespace Umbraco.Core.Events
 {
+    /// <summary>
+    /// Represent event data for the Saving event.
+    /// </summary>
     public class ContentSavingEventArgs : SaveEventArgs<IContent>
     {
         #region Factory Methods
+
         /// <summary>
         /// Converts <see cref="ContentSavingEventArgs"/> to <see cref="ContentSavedEventArgs"/> while preserving all args state
         /// </summary>
@@ -43,24 +46,32 @@ namespace Umbraco.Core.Events
                 EventState = EventState,
                 AdditionalData = AdditionalData
             };
-        } 
+        }
+
         #endregion
 
         #region Constructors
 
-        public ContentSavingEventArgs(IEnumerable<IContent> eventObject, EventMessages eventMessages) : base(eventObject, eventMessages)
-        {
-        }
+        /// <summary>
+        /// Initializes a new instance of the <see cref="ContentSavingEventArgs"/> class.
+        /// </summary>
+        public ContentSavingEventArgs(IEnumerable<IContent> eventObject, EventMessages eventMessages)
+            : base(eventObject, eventMessages)
+        { }
 
-        public ContentSavingEventArgs(IContent eventObject, EventMessages eventMessages) : base(eventObject, eventMessages)
-        {
-        }
+        /// <summary>
+        /// Initializes a new instance of the <see cref="ContentSavingEventArgs"/> class.
+        /// </summary>
+        public ContentSavingEventArgs(IContent eventObject, EventMessages eventMessages)
+            : base(eventObject, eventMessages)
+        { }
 
         #endregion
 
         /// <summary>
         /// Determines whether a culture is being saved, during a Saving event.
         /// </summary>
-        public bool IsSavingCulture(IContent content, string culture) => content.CultureInfos.TryGetValue(culture, out var cultureInfo) && cultureInfo.IsDirty();
+        public bool IsSavingCulture(IContent content, string culture)
+            => content.CultureInfos.TryGetValue(culture, out var cultureInfo) && cultureInfo.IsDirty();
     }
 }
diff --git a/src/Umbraco.Core/Models/Content.cs b/src/Umbraco.Core/Models/Content.cs
index 41d2ea63bd..c5930bf998 100644
--- a/src/Umbraco.Core/Models/Content.cs
+++ b/src/Umbraco.Core/Models/Content.cs
@@ -367,19 +367,19 @@ namespace Umbraco.Core.Models
         public override bool IsPropertyDirty(string propertyName)
         {
             //Special check here since we want to check if the request is for changed cultures
-            if (propertyName.StartsWith("_publishedCulture_"))
+            if (propertyName.StartsWith(ChangeTrackingPrefix.PublishedCulture))
             {
-                var culture = propertyName.TrimStart("_publishedCulture_");
+                var culture = propertyName.TrimStart(ChangeTrackingPrefix.PublishedCulture);
                 return _currentPublishCultureChanges.addedCultures?.Contains(culture) ?? false;
             }
-            if (propertyName.StartsWith("_unpublishedCulture_"))
+            if (propertyName.StartsWith(ChangeTrackingPrefix.UnpublishedCulture))
             {
-                var culture = propertyName.TrimStart("_unpublishedCulture_");
+                var culture = propertyName.TrimStart(ChangeTrackingPrefix.UnpublishedCulture);
                 return _currentPublishCultureChanges.removedCultures?.Contains(culture) ?? false;
             }
-            if (propertyName.StartsWith("_changedCulture_"))
+            if (propertyName.StartsWith(ChangeTrackingPrefix.ChangedCulture))
             {
-                var culture = propertyName.TrimStart("_changedCulture_");
+                var culture = propertyName.TrimStart(ChangeTrackingPrefix.ChangedCulture);
                 return _currentPublishCultureChanges.updatedCultures?.Contains(culture) ?? false;
             }
 
@@ -391,19 +391,19 @@ namespace Umbraco.Core.Models
         public override bool WasPropertyDirty(string propertyName)
         {
             //Special check here since we want to check if the request is for changed cultures
-            if (propertyName.StartsWith("_publishedCulture_"))
+            if (propertyName.StartsWith(ChangeTrackingPrefix.PublishedCulture))
             {
-                var culture = propertyName.TrimStart("_publishedCulture_");
+                var culture = propertyName.TrimStart(ChangeTrackingPrefix.PublishedCulture);
                 return _previousPublishCultureChanges.addedCultures?.Contains(culture) ?? false;
             }
-            if (propertyName.StartsWith("_unpublishedCulture_"))
+            if (propertyName.StartsWith(ChangeTrackingPrefix.UnpublishedCulture))
             {
-                var culture = propertyName.TrimStart("_unpublishedCulture_");
+                var culture = propertyName.TrimStart(ChangeTrackingPrefix.UnpublishedCulture);
                 return _previousPublishCultureChanges.removedCultures?.Contains(culture) ?? false;
             }
-            if (propertyName.StartsWith("_changedCulture_"))
+            if (propertyName.StartsWith(ChangeTrackingPrefix.ChangedCulture))
             {
-                var culture = propertyName.TrimStart("_changedCulture_");
+                var culture = propertyName.TrimStart(ChangeTrackingPrefix.ChangedCulture);
                 return _previousPublishCultureChanges.updatedCultures?.Contains(culture) ?? false;
             }
 
diff --git a/src/Umbraco.Core/Models/ContentBase.cs b/src/Umbraco.Core/Models/ContentBase.cs
index 03eb5a4c9e..e6e893d905 100644
--- a/src/Umbraco.Core/Models/ContentBase.cs
+++ b/src/Umbraco.Core/Models/ContentBase.cs
@@ -18,7 +18,6 @@ namespace Umbraco.Core.Models
     [DebuggerDisplay("Id: {Id}, Name: {Name}, ContentType: {ContentType.Alias}")]
     public abstract class ContentBase : TreeEntityBase, IContentBase
     {
-
         private int _contentTypeId;
         private int _writerId;
         private PropertyCollection _properties;
@@ -30,6 +29,16 @@ namespace Umbraco.Core.Models
         private (HashSet<string> addedCultures, HashSet<string> removedCultures, HashSet<string> updatedCultures) _currentCultureChanges;
         private (HashSet<string> addedCultures, HashSet<string> removedCultures, HashSet<string> updatedCultures) _previousCultureChanges;
 
+        public static class ChangeTrackingPrefix
+        {
+            public const string UpdatedCulture = "_updatedCulture_";
+            public const string ChangedCulture = "_changedCulture_";
+            public const string PublishedCulture = "_publishedCulture_";
+            public const string UnpublishedCulture = "_unpublishedCulture_";
+            public const string AddedCulture = "_addedCulture_";
+            public const string RemovedCulture = "_removedCulture_";
+        }
+
         #endregion
 
         /// <summary>
@@ -86,8 +95,6 @@ namespace Umbraco.Core.Models
             OnPropertyChanged(nameof(Properties));
         }
 
-
-
         /// <summary>
         /// Id of the user who wrote/updated this entity
         /// </summary>
@@ -408,19 +415,19 @@ namespace Umbraco.Core.Models
                 return true;
 
             //Special check here since we want to check if the request is for changed cultures
-            if (propertyName.StartsWith("_addedCulture_"))
+            if (propertyName.StartsWith(ChangeTrackingPrefix.AddedCulture))
             {
-                var culture = propertyName.TrimStart("_addedCulture_");
+                var culture = propertyName.TrimStart(ChangeTrackingPrefix.AddedCulture);
                 return _currentCultureChanges.addedCultures?.Contains(culture) ?? false;
             }
-            if (propertyName.StartsWith("_removedCulture_"))
+            if (propertyName.StartsWith(ChangeTrackingPrefix.RemovedCulture))
             {
-                var culture = propertyName.TrimStart("_removedCulture_");
+                var culture = propertyName.TrimStart(ChangeTrackingPrefix.RemovedCulture);
                 return _currentCultureChanges.removedCultures?.Contains(culture) ?? false;
             }
-            if (propertyName.StartsWith("_updatedCulture_"))
+            if (propertyName.StartsWith(ChangeTrackingPrefix.UpdatedCulture))
             {
-                var culture = propertyName.TrimStart("_updatedCulture_");
+                var culture = propertyName.TrimStart(ChangeTrackingPrefix.UpdatedCulture);
                 return _currentCultureChanges.updatedCultures?.Contains(culture) ?? false;
             }
 
@@ -435,19 +442,19 @@ namespace Umbraco.Core.Models
                 return true;
 
             //Special check here since we want to check if the request is for changed cultures
-            if (propertyName.StartsWith("_addedCulture_"))
+            if (propertyName.StartsWith(ChangeTrackingPrefix.AddedCulture))
             {
-                var culture = propertyName.TrimStart("_addedCulture_");
+                var culture = propertyName.TrimStart(ChangeTrackingPrefix.AddedCulture);
                 return _previousCultureChanges.addedCultures?.Contains(culture) ?? false;
             }
-            if (propertyName.StartsWith("_removedCulture_"))
+            if (propertyName.StartsWith(ChangeTrackingPrefix.RemovedCulture))
             {
-                var culture = propertyName.TrimStart("_removedCulture_");
+                var culture = propertyName.TrimStart(ChangeTrackingPrefix.RemovedCulture);
                 return _previousCultureChanges.removedCultures?.Contains(culture) ?? false;
             }
-            if (propertyName.StartsWith("_updatedCulture_"))
+            if (propertyName.StartsWith(ChangeTrackingPrefix.UpdatedCulture))
             {
-                var culture = propertyName.TrimStart("_updatedCulture_");
+                var culture = propertyName.TrimStart(ChangeTrackingPrefix.UpdatedCulture);
                 return _previousCultureChanges.updatedCultures?.Contains(culture) ?? false;
             }
 
diff --git a/src/Umbraco.Core/Models/ContentRepositoryExtensions.cs b/src/Umbraco.Core/Models/ContentRepositoryExtensions.cs
index ca9bf57902..27678c047c 100644
--- a/src/Umbraco.Core/Models/ContentRepositoryExtensions.cs
+++ b/src/Umbraco.Core/Models/ContentRepositoryExtensions.cs
@@ -20,7 +20,7 @@ namespace Umbraco.Core.Models
                 return Array.Empty<string>();
 
             var culturesUnpublishing = content.CultureInfos.Values
-                .Where(x => content.IsPropertyDirty("_unpublishedCulture_" + x.Culture))
+                .Where(x => content.IsPropertyDirty(ContentBase.ChangeTrackingPrefix.UnpublishedCulture + x.Culture))
                 .Select(x => x.Culture);
 
             return culturesUnpublishing.ToList();
@@ -88,8 +88,7 @@ namespace Umbraco.Core.Models
             {
                 content.CultureInfos.Clear();
                 content.CultureInfos = null;
-            }
-                
+            }                
 
             if (culture == null || culture == "*")
                 content.Name = other.Name;
@@ -158,8 +157,9 @@ namespace Umbraco.Core.Models
                 if (!content.PublishCultureInfos.TryGetValue(culture, out var publishInfos))
                     continue;
 
+                // if it's not dirty, it means it hasn't changed so there's nothing to adjust
                 if (!publishInfos.IsDirty())
-                    continue; //if it's not dirty, it means it hasn't changed so there's nothing to adjust
+                    continue; 
                 
                 content.PublishCultureInfos.AddOrUpdate(culture, publishInfos.Name, date);
 
diff --git a/src/Umbraco.Core/Models/IContentBase.cs b/src/Umbraco.Core/Models/IContentBase.cs
index 8df55bc5a4..0f660181fb 100644
--- a/src/Umbraco.Core/Models/IContentBase.cs
+++ b/src/Umbraco.Core/Models/IContentBase.cs
@@ -63,7 +63,7 @@ namespace Umbraco.Core.Models
         /// culture name, which must be get or set via the <see cref="TreeEntityBase.Name"/> property.</para>
         /// </remarks>
         ContentCultureInfosCollection CultureInfos { get; set; }
-        
+
         /// <summary>
         /// Gets the available cultures.
         /// </summary>
diff --git a/src/Umbraco.Core/Persistence/Repositories/IDocumentRepository.cs b/src/Umbraco.Core/Persistence/Repositories/IDocumentRepository.cs
index d49c92f1bf..fc5382499f 100644
--- a/src/Umbraco.Core/Persistence/Repositories/IDocumentRepository.cs
+++ b/src/Umbraco.Core/Persistence/Repositories/IDocumentRepository.cs
@@ -7,8 +7,6 @@ namespace Umbraco.Core.Persistence.Repositories
 {
     public interface IDocumentRepository : IContentRepository<int, IContent>, IReadRepository<Guid, IContent>
     {
-
-
         /// <summary>
         /// Clears the publishing schedule for all entries having an a date before (lower than, or equal to) a specified date.
         /// </summary>
diff --git a/src/Umbraco.Core/Persistence/Repositories/Implement/DocumentRepository.cs b/src/Umbraco.Core/Persistence/Repositories/Implement/DocumentRepository.cs
index 04af52047c..d8e6fd2c0e 100644
--- a/src/Umbraco.Core/Persistence/Repositories/Implement/DocumentRepository.cs
+++ b/src/Umbraco.Core/Persistence/Repositories/Implement/DocumentRepository.cs
@@ -3,7 +3,6 @@ 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;
@@ -120,15 +119,15 @@ namespace Umbraco.Core.Persistence.Repositories.Implement
                     break;
                 case QueryType.Single:
                 case QueryType.Many:
+                    // R# may flag this ambiguous and red-squiggle it, but it is not
+                    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")))
 
-                    //we've put this in a local function so that the below sql.Select statement doesn't have a problem
-                    //thinking that the call is ambiguous
-                    NPocoSqlExtensions.SqlRef<DocumentDto> SelectStatement(NPocoSqlExtensions.SqlRef<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"));
-
-                    sql = sql.Select<DocumentDto>(SelectStatement)
                        // select the variant name, coalesce to the invariant name, as "variantName"
                        .AndSelect(VariantNameSqlExpression + " AS variantName");
                     break;
@@ -954,8 +953,6 @@ namespace Umbraco.Core.Persistence.Repositories.Implement
 
         #endregion
 
-        
-
         protected override string ApplySystemOrdering(ref Sql<ISqlContext> sql, Ordering ordering)
         {
             // note: 'updater' is the user who created the latest draft version,
@@ -1187,17 +1184,18 @@ namespace Umbraco.Core.Persistence.Repositories.Implement
             return result;
         }
 
-
         private void SetVariations(Content content, IDictionary<int, List<ContentVariation>> contentVariations, IDictionary<int, List<DocumentVariation>> documentVariations)
         {
             if (contentVariations.TryGetValue(content.VersionId, out var contentVariation))
                 foreach (var v in contentVariation)
                     content.SetCultureInfo(v.Culture, v.Name, v.Date);
+
             if (content.PublishedVersionId > 0 && contentVariations.TryGetValue(content.PublishedVersionId, out contentVariation))
             {
                 foreach (var v in contentVariation)
                     content.SetPublishInfo(v.Culture, v.Name, v.Date);
             }
+
             if (documentVariations.TryGetValue(content.Id, out var documentVariation))
                 content.SetCultureEdited(documentVariation.Where(x => x.Edited).Select(x => x.Culture));
         }
diff --git a/src/Umbraco.Core/Services/ContentServiceExtensions.cs b/src/Umbraco.Core/Services/ContentServiceExtensions.cs
index 03a790d4b8..4d673fc902 100644
--- a/src/Umbraco.Core/Services/ContentServiceExtensions.cs
+++ b/src/Umbraco.Core/Services/ContentServiceExtensions.cs
@@ -34,7 +34,7 @@ namespace Umbraco.Core.Services
         /// <param name="mediaTypeAlias"></param>
         /// <param name="userId"></param>
         /// <returns></returns>
-        public static IContent CreateContent(this IContentService contentService, string name, Udi parentId, string mediaTypeAlias, int userId = 0)
+        public static IContent CreateContent(this IContentService contentService, string name, Udi parentId, string mediaTypeAlias, int userId = Constants.Security.SuperUserId)
         {
             var guidUdi = parentId as GuidUdi;
             if (guidUdi == null)
diff --git a/src/Umbraco.Core/Services/IContentService.cs b/src/Umbraco.Core/Services/IContentService.cs
index 600921ee78..b2fce8f3e6 100644
--- a/src/Umbraco.Core/Services/IContentService.cs
+++ b/src/Umbraco.Core/Services/IContentService.cs
@@ -32,27 +32,27 @@ namespace Umbraco.Core.Services
         /// <summary>
         /// Saves a blueprint.
         /// </summary>
-        void SaveBlueprint(IContent content, int userId = 0);
+        void SaveBlueprint(IContent content, int userId = Constants.Security.SuperUserId);
 
         /// <summary>
         /// Deletes a blueprint.
         /// </summary>
-        void DeleteBlueprint(IContent content, int userId = 0);
+        void DeleteBlueprint(IContent content, int userId = Constants.Security.SuperUserId);
 
         /// <summary>
         /// Creates a new content item from a blueprint.
         /// </summary>
-        IContent CreateContentFromBlueprint(IContent blueprint, string name, int userId = 0);
+        IContent CreateContentFromBlueprint(IContent blueprint, string name, int userId = Constants.Security.SuperUserId);
 
         /// <summary>
         /// Deletes blueprints for a content type.
         /// </summary>
-        void DeleteBlueprintsOfType(int contentTypeId, int userId = 0);
+        void DeleteBlueprintsOfType(int contentTypeId, int userId = Constants.Security.SuperUserId);
 
         /// <summary>
         /// Deletes blueprints for content types.
         /// </summary>
-        void DeleteBlueprintsOfTypes(IEnumerable<int> contentTypeIds, int userId = 0);
+        void DeleteBlueprintsOfTypes(IEnumerable<int> contentTypeIds, int userId = Constants.Security.SuperUserId);
 
         #endregion
 
@@ -237,13 +237,13 @@ namespace Umbraco.Core.Services
         /// <summary>
         /// Saves a document.
         /// </summary>
-        OperationResult Save(IContent content, int userId = 0, bool raiseEvents = true);
+        OperationResult Save(IContent content, int userId = Constants.Security.SuperUserId, bool raiseEvents = true);
 
         /// <summary>
         /// Saves documents.
         /// </summary>
         // TODO: why only 1 result not 1 per content?!
-        OperationResult Save(IEnumerable<IContent> contents, int userId = 0, bool raiseEvents = true);
+        OperationResult Save(IEnumerable<IContent> contents, int userId = Constants.Security.SuperUserId, bool raiseEvents = true);
 
         /// <summary>
         /// Deletes a document.
@@ -252,7 +252,7 @@ namespace Umbraco.Core.Services
         /// <para>This method will also delete associated media files, child content and possibly associated domains.</para>
         /// <para>This method entirely clears the content from the database.</para>
         /// </remarks>
-        OperationResult Delete(IContent content, int userId = 0);
+        OperationResult Delete(IContent content, int userId = Constants.Security.SuperUserId);
 
         /// <summary>
         /// Deletes all documents of a given document type.
@@ -261,7 +261,7 @@ namespace Umbraco.Core.Services
         /// <para>All non-deleted descendants of the deleted documents are moved to the recycle bin.</para>
         /// <para>This operation is potentially dangerous and expensive.</para>
         /// </remarks>
-        void DeleteOfType(int documentTypeId, int userId = 0);
+        void DeleteOfType(int documentTypeId, int userId = Constants.Security.SuperUserId);
 
         /// <summary>
         /// Deletes all documents of given document types.
@@ -270,17 +270,17 @@ namespace Umbraco.Core.Services
         /// <para>All non-deleted descendants of the deleted documents are moved to the recycle bin.</para>
         /// <para>This operation is potentially dangerous and expensive.</para>
         /// </remarks>
-        void DeleteOfTypes(IEnumerable<int> contentTypeIds, int userId = 0);
+        void DeleteOfTypes(IEnumerable<int> contentTypeIds, int userId = Constants.Security.SuperUserId);
 
         /// <summary>
         /// Deletes versions of a document prior to a given date.
         /// </summary>
-        void DeleteVersions(int id, DateTime date, int userId = 0);
+        void DeleteVersions(int id, DateTime date, int userId = Constants.Security.SuperUserId);
 
         /// <summary>
         /// Deletes a version of a document.
         /// </summary>
-        void DeleteVersion(int id, int versionId, bool deletePriorVersions, int userId = 0);
+        void DeleteVersion(int id, int versionId, bool deletePriorVersions, int userId = Constants.Security.SuperUserId);
 
         #endregion
 
@@ -289,7 +289,7 @@ namespace Umbraco.Core.Services
         /// <summary>
         /// Moves a document under a new parent.
         /// </summary>
-        void Move(IContent content, int parentId, int userId = 0);
+        void Move(IContent content, int parentId, int userId = Constants.Security.SuperUserId);
 
         /// <summary>
         /// Copies a document.
@@ -297,7 +297,7 @@ namespace Umbraco.Core.Services
         /// <remarks>
         /// <para>Recursively copies all children.</para>
         /// </remarks>
-        IContent Copy(IContent content, int parentId, bool relateToOriginal, int userId = 0);
+        IContent Copy(IContent content, int parentId, bool relateToOriginal, int userId = Constants.Security.SuperUserId);
 
         /// <summary>
         /// Copies a document.
@@ -305,12 +305,12 @@ namespace Umbraco.Core.Services
         /// <remarks>
         /// <para>Optionally recursively copies all children.</para>
         /// </remarks>
-        IContent Copy(IContent content, int parentId, bool relateToOriginal, bool recursive, int userId = 0);
+        IContent Copy(IContent content, int parentId, bool relateToOriginal, bool recursive, int userId = Constants.Security.SuperUserId);
 
         /// <summary>
         /// Moves a document to the recycle bin.
         /// </summary>
-        OperationResult MoveToRecycleBin(IContent content, int userId = 0);
+        OperationResult MoveToRecycleBin(IContent content, int userId = Constants.Security.SuperUserId);
 
         /// <summary>
         /// Empties the recycle bin.
@@ -320,12 +320,12 @@ namespace Umbraco.Core.Services
         /// <summary>
         /// Sorts documents.
         /// </summary>
-        OperationResult Sort(IEnumerable<IContent> items, int userId = 0, bool raiseEvents = true);
+        OperationResult Sort(IEnumerable<IContent> items, int userId = Constants.Security.SuperUserId, bool raiseEvents = true);
 
         /// <summary>
         /// Sorts documents.
         /// </summary>
-        OperationResult Sort(IEnumerable<int> ids, int userId = 0, bool raiseEvents = true);
+        OperationResult Sort(IEnumerable<int> ids, int userId = Constants.Security.SuperUserId, bool raiseEvents = true);
 
         #endregion
 
@@ -341,12 +341,11 @@ namespace Umbraco.Core.Services
         /// <para>If the content type is variant, then culture can be either '*' or an actual culture, but neither 'null' nor
         /// 'empty'. If the content type is invariant, then culture can be either '*' or null or empty.</para>
         /// </remarks>
-        /// <param name="content"></param>
-        /// <param name="culture"></param>
-        /// <param name="userId"></param>
-        /// <param name="raiseEvents"></param>
-        /// <returns></returns>
-        PublishResult SaveAndPublish(IContent content, string culture = "*", int userId = 0, bool raiseEvents = true);
+        /// <param name="content">The document to publish.</param>
+        /// <param name="culture">The culture to publish.</param>
+        /// <param name="userId">The identifier of the user performing the action.</param>
+        /// <param name="raiseEvents">A value indicating whether to raise events.</param>
+        PublishResult SaveAndPublish(IContent content, string culture = "*", int userId = Constants.Security.SuperUserId, bool raiseEvents = true);
 
         /// <summary>
         /// Saves and publishes a document.
@@ -356,12 +355,11 @@ namespace Umbraco.Core.Services
         /// <para>When a culture is being published, it includes all varying values along with all invariant values.</para>
         /// <para>The document is *always* saved, even when publishing fails.</para>
         /// </remarks>
-        /// <param name="content"></param>
+        /// <param name="content">The document to publish.</param>
         /// <param name="cultures">The cultures to publish.</param>
-        /// <param name="userId"></param>
-        /// <param name="raiseEvents"></param>
-        /// <returns></returns>
-        PublishResult SaveAndPublish(IContent content, string[] cultures, int userId = 0, bool raiseEvents = true);
+        /// <param name="userId">The identifier of the user performing the action.</param>
+        /// <param name="raiseEvents">A value indicating whether to raise events.</param>
+        PublishResult SaveAndPublish(IContent content, string[] cultures, int userId = Constants.Security.SuperUserId, bool raiseEvents = true);
 
         /// <summary>
         /// Saves and publishes a document branch.
@@ -377,7 +375,7 @@ namespace Umbraco.Core.Services
         /// only those documents that are already published, are republished. When <c>true</c>, all documents are
         /// published. The root of the branch is always published, regardless of <paramref name="force"/>.</para>
         /// </remarks>
-        IEnumerable<PublishResult> SaveAndPublishBranch(IContent content, bool force, string culture = "*", int userId = 0);
+        IEnumerable<PublishResult> SaveAndPublishBranch(IContent content, bool force, string culture = "*", int userId = Constants.Security.SuperUserId);
 
         /// <summary>
         /// Saves and publishes a document branch.
@@ -391,7 +389,7 @@ namespace Umbraco.Core.Services
         /// only those documents that are already published, are republished. When <c>true</c>, all documents are
         /// published. The root of the branch is always published, regardless of <paramref name="force"/>.</para>
         /// </remarks>
-        IEnumerable<PublishResult> SaveAndPublishBranch(IContent content, bool force, string[] cultures, int userId = 0);
+        IEnumerable<PublishResult> SaveAndPublishBranch(IContent content, bool force, string[] cultures, int userId = Constants.Security.SuperUserId);
 
         /// <summary>
         /// Saves and publishes a document branch.
@@ -416,7 +414,7 @@ namespace Umbraco.Core.Services
         IEnumerable<PublishResult> SaveAndPublishBranch(IContent content, bool force,
             Func<IContent, HashSet<string>> shouldPublish,
             Func<IContent, HashSet<string>, bool> publishCultures,
-            int userId = 0);
+            int userId = Constants.Security.SuperUserId);
 
         /// <summary>
         /// Unpublishes a document.
@@ -428,7 +426,7 @@ namespace Umbraco.Core.Services
         /// <para>If the content type is variant, then culture can be either '*' or an actual culture, but neither null nor
         /// empty. If the content type is invariant, then culture can be either '*' or null or empty.</para>
         /// </remarks>
-        PublishResult Unpublish(IContent content, string culture = "*", int userId = 0);
+        PublishResult Unpublish(IContent content, string culture = "*", int userId = Constants.Security.SuperUserId);
 
         /// <summary>
         /// Gets a value indicating whether a document is path-publishable.
@@ -445,7 +443,7 @@ namespace Umbraco.Core.Services
         /// <summary>
         /// Saves a document and raises the "sent to publication" events.
         /// </summary>
-        bool SendToPublication(IContent content, int userId = 0);
+        bool SendToPublication(IContent content, int userId = Constants.Security.SuperUserId);
 
         /// <summary>
         /// Publishes and unpublishes scheduled documents.
@@ -480,27 +478,27 @@ namespace Umbraco.Core.Services
         /// <summary>
         /// Creates a document.
         /// </summary>
-        IContent Create(string name, Guid parentId, string documentTypeAlias, int userId = 0);
+        IContent Create(string name, Guid parentId, string documentTypeAlias, int userId = Constants.Security.SuperUserId);
 
         /// <summary>
         /// Creates a document.
         /// </summary>
-        IContent Create(string name, int parentId, string documentTypeAlias, int userId = 0);
+        IContent Create(string name, int parentId, string documentTypeAlias, int userId = Constants.Security.SuperUserId);
 
         /// <summary>
         /// Creates a document.
         /// </summary>
-        IContent Create(string name, IContent parent, string documentTypeAlias, int userId = 0);
+        IContent Create(string name, IContent parent, string documentTypeAlias, int userId = Constants.Security.SuperUserId);
 
         /// <summary>
         /// Creates and saves a document.
         /// </summary>
-        IContent CreateAndSave(string name, int parentId, string contentTypeAlias, int userId = 0);
+        IContent CreateAndSave(string name, int parentId, string contentTypeAlias, int userId = Constants.Security.SuperUserId);
 
         /// <summary>
         /// Creates and saves a document.
         /// </summary>
-        IContent CreateAndSave(string name, IContent parent, string contentTypeAlias, int userId = 0);
+        IContent CreateAndSave(string name, IContent parent, string contentTypeAlias, int userId = Constants.Security.SuperUserId);
 
         #endregion
 
@@ -516,7 +514,7 @@ namespace Umbraco.Core.Services
         /// <remarks>
         /// <para>When no culture is specified, all cultures are rolled back.</para>
         /// </remarks>
-        OperationResult Rollback(int id, int versionId, string culture = "*", int userId = 0);
+        OperationResult Rollback(int id, int versionId, string culture = "*", int userId = Constants.Security.SuperUserId);
 
         #endregion
     }
diff --git a/src/Umbraco.Core/Services/IContentTypeServiceBase.cs b/src/Umbraco.Core/Services/IContentTypeServiceBase.cs
index 8fa77e4836..b86494adb5 100644
--- a/src/Umbraco.Core/Services/IContentTypeServiceBase.cs
+++ b/src/Umbraco.Core/Services/IContentTypeServiceBase.cs
@@ -47,11 +47,11 @@ namespace Umbraco.Core.Services
         IEnumerable<TItem> GetChildren(int id);
         bool HasChildren(int id);
 
-        void Save(TItem item, int userId = 0);
-        void Save(IEnumerable<TItem> items, int userId = 0);
+        void Save(TItem item, int userId = Constants.Security.SuperUserId);
+        void Save(IEnumerable<TItem> items, int userId = Constants.Security.SuperUserId);
 
-        void Delete(TItem item, int userId = 0);
-        void Delete(IEnumerable<TItem> item, int userId = 0);
+        void Delete(TItem item, int userId = Constants.Security.SuperUserId);
+        void Delete(IEnumerable<TItem> item, int userId = Constants.Security.SuperUserId);
 
 
         Attempt<string[]> ValidateComposition(TItem compo);
@@ -63,15 +63,15 @@ namespace Umbraco.Core.Services
         /// <returns></returns>
         bool HasContainerInPath(string contentPath);
 
-        Attempt<OperationResult<OperationResultType, EntityContainer>> CreateContainer(int parentContainerId, string name, int userId = 0);
-        Attempt<OperationResult> SaveContainer(EntityContainer container, int userId = 0);
+        Attempt<OperationResult<OperationResultType, EntityContainer>> CreateContainer(int parentContainerId, string name, int userId = Constants.Security.SuperUserId);
+        Attempt<OperationResult> SaveContainer(EntityContainer container, int userId = Constants.Security.SuperUserId);
         EntityContainer GetContainer(int containerId);
         EntityContainer GetContainer(Guid containerId);
         IEnumerable<EntityContainer> GetContainers(int[] containerIds);
         IEnumerable<EntityContainer> GetContainers(TItem contentType);
         IEnumerable<EntityContainer> GetContainers(string folderName, int level);
-        Attempt<OperationResult> DeleteContainer(int containerId, int userId = 0);
-        Attempt<OperationResult<OperationResultType, EntityContainer>> RenameContainer(int id, string name, int userId = 0);
+        Attempt<OperationResult> DeleteContainer(int containerId, int userId = Constants.Security.SuperUserId);
+        Attempt<OperationResult<OperationResultType, EntityContainer>> RenameContainer(int id, string name, int userId = Constants.Security.SuperUserId);
 
         Attempt<OperationResult<MoveOperationStatusType>> Move(TItem moving, int containerId);
         Attempt<OperationResult<MoveOperationStatusType, TItem>> Copy(TItem copying, int containerId);
diff --git a/src/Umbraco.Core/Services/IDataTypeService.cs b/src/Umbraco.Core/Services/IDataTypeService.cs
index 537c0e629f..3dc530e250 100644
--- a/src/Umbraco.Core/Services/IDataTypeService.cs
+++ b/src/Umbraco.Core/Services/IDataTypeService.cs
@@ -9,15 +9,15 @@ namespace Umbraco.Core.Services
     /// </summary>
     public interface IDataTypeService : IService
     {
-        Attempt<OperationResult<OperationResultType, EntityContainer>> CreateContainer(int parentId, string name, int userId = 0);
-        Attempt<OperationResult> SaveContainer(EntityContainer container, int userId = 0);
+        Attempt<OperationResult<OperationResultType, EntityContainer>> CreateContainer(int parentId, string name, int userId = Constants.Security.SuperUserId);
+        Attempt<OperationResult> SaveContainer(EntityContainer container, int userId = Constants.Security.SuperUserId);
         EntityContainer GetContainer(int containerId);
         EntityContainer GetContainer(Guid containerId);
         IEnumerable<EntityContainer> GetContainers(string folderName, int level);
         IEnumerable<EntityContainer> GetContainers(IDataType dataType);
         IEnumerable<EntityContainer> GetContainers(int[] containerIds);
-        Attempt<OperationResult> DeleteContainer(int containerId, int userId = 0);
-        Attempt<OperationResult<OperationResultType, EntityContainer>> RenameContainer(int id, string name, int userId = 0);
+        Attempt<OperationResult> DeleteContainer(int containerId, int userId = Constants.Security.SuperUserId);
+        Attempt<OperationResult<OperationResultType, EntityContainer>> RenameContainer(int id, string name, int userId = Constants.Security.SuperUserId);
 
         /// <summary>
         /// Gets a <see cref="IDataType"/> by its Name
@@ -52,14 +52,14 @@ namespace Umbraco.Core.Services
         /// </summary>
         /// <param name="dataType"><see cref="IDataType"/> to save</param>
         /// <param name="userId">Id of the user issuing the save</param>
-        void Save(IDataType dataType, int userId = 0);
+        void Save(IDataType dataType, int userId = Constants.Security.SuperUserId);
 
         /// <summary>
         /// Saves a collection of <see cref="IDataType"/>
         /// </summary>
         /// <param name="dataTypeDefinitions"><see cref="IDataType"/> to save</param>
         /// <param name="userId">Id of the user issuing the save</param>
-        void Save(IEnumerable<IDataType> dataTypeDefinitions, int userId = 0);
+        void Save(IEnumerable<IDataType> dataTypeDefinitions, int userId = Constants.Security.SuperUserId);
 
         /// <summary>
         /// Saves a collection of <see cref="IDataType"/>
@@ -78,7 +78,7 @@ namespace Umbraco.Core.Services
         /// </remarks>
         /// <param name="dataType"><see cref="IDataType"/> to delete</param>
         /// <param name="userId">Id of the user issuing the deletion</param>
-        void Delete(IDataType dataType, int userId = 0);
+        void Delete(IDataType dataType, int userId = Constants.Security.SuperUserId);
 
         /// <summary>
         /// Gets a <see cref="IDataType"/> by its control Id
diff --git a/src/Umbraco.Core/Services/IFileService.cs b/src/Umbraco.Core/Services/IFileService.cs
index 8596424b03..5fe52559ee 100644
--- a/src/Umbraco.Core/Services/IFileService.cs
+++ b/src/Umbraco.Core/Services/IFileService.cs
@@ -18,12 +18,12 @@ namespace Umbraco.Core.Services
         IPartialView GetPartialView(string path);
         IPartialView GetPartialViewMacro(string path);
         IEnumerable<IPartialView> GetPartialViewMacros(params string[] names);
-        Attempt<IPartialView> CreatePartialView(IPartialView partialView, string snippetName = null, int userId = 0);
-        Attempt<IPartialView> CreatePartialViewMacro(IPartialView partialView, string snippetName = null, int userId = 0);
-        bool DeletePartialView(string path, int userId = 0);
-        bool DeletePartialViewMacro(string path, int userId = 0);
-        Attempt<IPartialView> SavePartialView(IPartialView partialView, int userId = 0);
-        Attempt<IPartialView> SavePartialViewMacro(IPartialView partialView, int userId = 0);
+        Attempt<IPartialView> CreatePartialView(IPartialView partialView, string snippetName = null, int userId = Constants.Security.SuperUserId);
+        Attempt<IPartialView> CreatePartialViewMacro(IPartialView partialView, string snippetName = null, int userId = Constants.Security.SuperUserId);
+        bool DeletePartialView(string path, int userId = Constants.Security.SuperUserId);
+        bool DeletePartialViewMacro(string path, int userId = Constants.Security.SuperUserId);
+        Attempt<IPartialView> SavePartialView(IPartialView partialView, int userId = Constants.Security.SuperUserId);
+        Attempt<IPartialView> SavePartialViewMacro(IPartialView partialView, int userId = Constants.Security.SuperUserId);
         bool ValidatePartialView(PartialView partialView);
         bool ValidatePartialViewMacro(PartialView partialView);
 
@@ -45,14 +45,14 @@ namespace Umbraco.Core.Services
         /// </summary>
         /// <param name="stylesheet"><see cref="Stylesheet"/> to save</param>
         /// <param name="userId">Optional id of the user saving the stylesheet</param>
-        void SaveStylesheet(Stylesheet stylesheet, int userId = 0);
+        void SaveStylesheet(Stylesheet stylesheet, int userId = Constants.Security.SuperUserId);
 
         /// <summary>
         /// Deletes a stylesheet by its name
         /// </summary>
         /// <param name="path">Name incl. extension of the Stylesheet to delete</param>
         /// <param name="userId">Optional id of the user deleting the stylesheet</param>
-        void DeleteStylesheet(string path, int userId = 0);
+        void DeleteStylesheet(string path, int userId = Constants.Security.SuperUserId);
 
         /// <summary>
         /// Validates a <see cref="Stylesheet"/>
@@ -79,14 +79,14 @@ namespace Umbraco.Core.Services
         /// </summary>
         /// <param name="script"><see cref="Script"/> to save</param>
         /// <param name="userId">Optional id of the user saving the script</param>
-        void SaveScript(Script script, int userId = 0);
+        void SaveScript(Script script, int userId = Constants.Security.SuperUserId);
 
         /// <summary>
         /// Deletes a script by its name
         /// </summary>
         /// <param name="path">Name incl. extension of the Script to delete</param>
         /// <param name="userId">Optional id of the user deleting the script</param>
-        void DeleteScript(string path, int userId = 0);
+        void DeleteScript(string path, int userId = Constants.Security.SuperUserId);
 
         /// <summary>
         /// Validates a <see cref="Script"/>
@@ -187,7 +187,7 @@ namespace Umbraco.Core.Services
         /// </summary>
         /// <param name="template"><see cref="ITemplate"/> to save</param>
         /// <param name="userId">Optional id of the user saving the template</param>
-        void SaveTemplate(ITemplate template, int userId = 0);
+        void SaveTemplate(ITemplate template, int userId = Constants.Security.SuperUserId);
 
         /// <summary>
         /// Creates a template for a content type
@@ -198,16 +198,16 @@ namespace Umbraco.Core.Services
         /// <returns>
         /// The template created
         /// </returns>
-        Attempt<OperationResult<OperationResultType, ITemplate>> CreateTemplateForContentType(string contentTypeAlias, string contentTypeName, int userId = 0);
+        Attempt<OperationResult<OperationResultType, ITemplate>> CreateTemplateForContentType(string contentTypeAlias, string contentTypeName, int userId = Constants.Security.SuperUserId);
 
-        ITemplate CreateTemplateWithIdentity(string name, string alias, string content, ITemplate masterTemplate = null, int userId = 0);
+        ITemplate CreateTemplateWithIdentity(string name, string alias, string content, ITemplate masterTemplate = null, int userId = Constants.Security.SuperUserId);
 
         /// <summary>
         /// Deletes a template by its alias
         /// </summary>
         /// <param name="alias">Alias of the <see cref="ITemplate"/> to delete</param>
         /// <param name="userId">Optional id of the user deleting the template</param>
-        void DeleteTemplate(string alias, int userId = 0);
+        void DeleteTemplate(string alias, int userId = Constants.Security.SuperUserId);
 
         /// <summary>
         /// Validates a <see cref="ITemplate"/>
@@ -221,7 +221,7 @@ namespace Umbraco.Core.Services
         /// </summary>
         /// <param name="templates">List of <see cref="Template"/> to save</param>
         /// <param name="userId">Optional id of the user</param>
-        void SaveTemplate(IEnumerable<ITemplate> templates, int userId = 0);
+        void SaveTemplate(IEnumerable<ITemplate> templates, int userId = Constants.Security.SuperUserId);
 
         /// <summary>
         /// Gets the content of a template as a stream.
diff --git a/src/Umbraco.Core/Services/ILocalizationService.cs b/src/Umbraco.Core/Services/ILocalizationService.cs
index 4882c7e829..54022d37bb 100644
--- a/src/Umbraco.Core/Services/ILocalizationService.cs
+++ b/src/Umbraco.Core/Services/ILocalizationService.cs
@@ -86,7 +86,7 @@ namespace Umbraco.Core.Services
         /// </summary>
         /// <param name="dictionaryItem"><see cref="IDictionaryItem"/> to save</param>
         /// <param name="userId">Optional id of the user saving the dictionary item</param>
-        void Save(IDictionaryItem dictionaryItem, int userId = 0);
+        void Save(IDictionaryItem dictionaryItem, int userId = Constants.Security.SuperUserId);
 
         /// <summary>
         /// Deletes a <see cref="IDictionaryItem"/> object and its related translations
@@ -94,7 +94,7 @@ namespace Umbraco.Core.Services
         /// </summary>
         /// <param name="dictionaryItem"><see cref="IDictionaryItem"/> to delete</param>
         /// <param name="userId">Optional id of the user deleting the dictionary item</param>
-        void Delete(IDictionaryItem dictionaryItem, int userId = 0);
+        void Delete(IDictionaryItem dictionaryItem, int userId = Constants.Security.SuperUserId);
 
         /// <summary>
         /// Gets a <see cref="ILanguage"/> by its id
@@ -153,14 +153,14 @@ namespace Umbraco.Core.Services
         /// </summary>
         /// <param name="language"><see cref="ILanguage"/> to save</param>
         /// <param name="userId">Optional id of the user saving the language</param>
-        void Save(ILanguage language, int userId = 0);
+        void Save(ILanguage language, int userId = Constants.Security.SuperUserId);
 
         /// <summary>
         /// Deletes a <see cref="ILanguage"/> by removing it and its usages from the db
         /// </summary>
         /// <param name="language"><see cref="ILanguage"/> to delete</param>
         /// <param name="userId">Optional id of the user deleting the language</param>
-        void Delete(ILanguage language, int userId = 0);
+        void Delete(ILanguage language, int userId = Constants.Security.SuperUserId);
 
         /// <summary>
         /// Gets the full dictionary key map.
diff --git a/src/Umbraco.Core/Services/IMacroService.cs b/src/Umbraco.Core/Services/IMacroService.cs
index 8c3acfd619..597c986f37 100644
--- a/src/Umbraco.Core/Services/IMacroService.cs
+++ b/src/Umbraco.Core/Services/IMacroService.cs
@@ -39,14 +39,14 @@ namespace Umbraco.Core.Services
         /// </summary>
         /// <param name="macro"><see cref="IMacro"/> to delete</param>
         /// <param name="userId">Optional id of the user deleting the macro</param>
-        void Delete(IMacro macro, int userId = 0);
+        void Delete(IMacro macro, int userId = Constants.Security.SuperUserId);
 
         /// <summary>
         /// Saves an <see cref="IMacro"/>
         /// </summary>
         /// <param name="macro"><see cref="IMacro"/> to save</param>
         /// <param name="userId">Optional id of the user saving the macro</param>
-        void Save(IMacro macro, int userId = 0);
+        void Save(IMacro macro, int userId = Constants.Security.SuperUserId);
 
         ///// <summary>
         ///// Gets a list all available <see cref="IMacroPropertyType"/> plugins
diff --git a/src/Umbraco.Core/Services/IMediaService.cs b/src/Umbraco.Core/Services/IMediaService.cs
index ce2062d08d..02398c3634 100644
--- a/src/Umbraco.Core/Services/IMediaService.cs
+++ b/src/Umbraco.Core/Services/IMediaService.cs
@@ -37,7 +37,7 @@ namespace Umbraco.Core.Services
         /// <param name="mediaTypeAlias">Alias of the <see cref="IMediaType"/></param>
         /// <param name="userId">Optional id of the user creating the media item</param>
         /// <returns><see cref="IMedia"/></returns>
-        IMedia CreateMedia(string name, Guid parentId, string mediaTypeAlias, int userId = 0);
+        IMedia CreateMedia(string name, Guid parentId, string mediaTypeAlias, int userId = Constants.Security.SuperUserId);
 
         /// <summary>
         /// Creates an <see cref="IMedia"/> object using the alias of the <see cref="IMediaType"/>
@@ -53,7 +53,7 @@ namespace Umbraco.Core.Services
         /// <param name="mediaTypeAlias">Alias of the <see cref="IMediaType"/></param>
         /// <param name="userId">Optional id of the user creating the media item</param>
         /// <returns><see cref="IMedia"/></returns>
-        IMedia CreateMedia(string name, int parentId, string mediaTypeAlias, int userId = 0);
+        IMedia CreateMedia(string name, int parentId, string mediaTypeAlias, int userId = Constants.Security.SuperUserId);
 
         /// <summary>
         /// Creates an <see cref="IMedia"/> object using the alias of the <see cref="IMediaType"/>
@@ -69,7 +69,7 @@ namespace Umbraco.Core.Services
         /// <param name="mediaTypeAlias">Alias of the <see cref="IMediaType"/></param>
         /// <param name="userId">Optional id of the user creating the media item</param>
         /// <returns><see cref="IMedia"/></returns>
-        IMedia CreateMedia(string name, IMedia parent, string mediaTypeAlias, int userId = 0);
+        IMedia CreateMedia(string name, IMedia parent, string mediaTypeAlias, int userId = Constants.Security.SuperUserId);
 
         /// <summary>
         /// Gets an <see cref="IMedia"/> object by Id
@@ -152,14 +152,14 @@ namespace Umbraco.Core.Services
         /// <param name="parentId">Id of the Media's new Parent</param>
         /// <param name="userId">Id of the User moving the Media</param>
         /// <returns>True if moving succeeded, otherwise False</returns>
-        Attempt<OperationResult> Move(IMedia media, int parentId, int userId = 0);
+        Attempt<OperationResult> Move(IMedia media, int parentId, int userId = Constants.Security.SuperUserId);
 
         /// <summary>
         /// Deletes an <see cref="IMedia"/> object by moving it to the Recycle Bin
         /// </summary>
         /// <param name="media">The <see cref="IMedia"/> to delete</param>
         /// <param name="userId">Id of the User deleting the Media</param>
-        Attempt<OperationResult> MoveToRecycleBin(IMedia media, int userId = 0);
+        Attempt<OperationResult> MoveToRecycleBin(IMedia media, int userId = Constants.Security.SuperUserId);
 
         /// <summary>
         /// Empties the Recycle Bin by deleting all <see cref="IMedia"/> that resides in the bin
@@ -172,7 +172,7 @@ namespace Umbraco.Core.Services
         /// <remarks>This needs extra care and attention as its potentially a dangerous and extensive operation</remarks>
         /// <param name="mediaTypeId">Id of the <see cref="IMediaType"/></param>
         /// <param name="userId">Optional Id of the user deleting Media</param>
-        void DeleteMediaOfType(int mediaTypeId, int userId = 0);
+        void DeleteMediaOfType(int mediaTypeId, int userId = Constants.Security.SuperUserId);
 
         /// <summary>
         /// Deletes all media of the specified types. All Descendants of deleted media that is not of these types is moved to Recycle Bin.
@@ -180,7 +180,7 @@ namespace Umbraco.Core.Services
         /// <remarks>This needs extra care and attention as its potentially a dangerous and extensive operation</remarks>
         /// <param name="mediaTypeIds">Ids of the <see cref="IMediaType"/>s</param>
         /// <param name="userId">Optional Id of the user issuing the delete operation</param>
-        void DeleteMediaOfTypes(IEnumerable<int> mediaTypeIds, int userId = 0);
+        void DeleteMediaOfTypes(IEnumerable<int> mediaTypeIds, int userId = Constants.Security.SuperUserId);
         
         /// <summary>
         /// Permanently deletes an <see cref="IMedia"/> object
@@ -191,7 +191,7 @@ namespace Umbraco.Core.Services
         /// </remarks>
         /// <param name="media">The <see cref="IMedia"/> to delete</param>
         /// <param name="userId">Id of the User deleting the Media</param>
-        Attempt<OperationResult> Delete(IMedia media, int userId = 0);
+        Attempt<OperationResult> Delete(IMedia media, int userId = Constants.Security.SuperUserId);
 
         /// <summary>
         /// Saves a single <see cref="IMedia"/> object
@@ -199,7 +199,7 @@ namespace Umbraco.Core.Services
         /// <param name="media">The <see cref="IMedia"/> to save</param>
         /// <param name="userId">Id of the User saving the Media</param>
         /// <param name="raiseEvents">Optional boolean indicating whether or not to raise events.</param>
-        Attempt<OperationResult> Save(IMedia media, int userId = 0, bool raiseEvents = true);
+        Attempt<OperationResult> Save(IMedia media, int userId = Constants.Security.SuperUserId, bool raiseEvents = true);
 
         /// <summary>
         /// Saves a collection of <see cref="IMedia"/> objects
@@ -207,7 +207,7 @@ namespace Umbraco.Core.Services
         /// <param name="medias">Collection of <see cref="IMedia"/> to save</param>
         /// <param name="userId">Id of the User saving the Media</param>
         /// <param name="raiseEvents">Optional boolean indicating whether or not to raise events.</param>
-        Attempt<OperationResult> Save(IEnumerable<IMedia> medias, int userId = 0, bool raiseEvents = true);
+        Attempt<OperationResult> Save(IEnumerable<IMedia> medias, int userId = Constants.Security.SuperUserId, bool raiseEvents = true);
 
         /// <summary>
         /// Gets an <see cref="IMedia"/> object by its 'UniqueId'
@@ -250,7 +250,7 @@ namespace Umbraco.Core.Services
         /// <param name="id">Id of the <see cref="IMedia"/> object to delete versions from</param>
         /// <param name="versionDate">Latest version date</param>
         /// <param name="userId">Optional Id of the User deleting versions of a Content object</param>
-        void DeleteVersions(int id, DateTime versionDate, int userId = 0);
+        void DeleteVersions(int id, DateTime versionDate, int userId = Constants.Security.SuperUserId);
 
         /// <summary>
         /// Permanently deletes specific version(s) from an <see cref="IMedia"/> object.
@@ -259,7 +259,7 @@ namespace Umbraco.Core.Services
         /// <param name="versionId">Id of the version to delete</param>
         /// <param name="deletePriorVersions">Boolean indicating whether to delete versions prior to the versionId</param>
         /// <param name="userId">Optional Id of the User deleting versions of a Content object</param>
-        void DeleteVersion(int id, int versionId, bool deletePriorVersions, int userId = 0);
+        void DeleteVersion(int id, int versionId, bool deletePriorVersions, int userId = Constants.Security.SuperUserId);
 
         /// <summary>
         /// Gets an <see cref="IMedia"/> object from the path stored in the 'umbracoFile' property.
@@ -304,7 +304,7 @@ namespace Umbraco.Core.Services
         /// <param name="userId"></param>
         /// <param name="raiseEvents"></param>
         /// <returns>True if sorting succeeded, otherwise False</returns>
-        bool Sort(IEnumerable<IMedia> items, int userId = 0, bool raiseEvents = true);
+        bool Sort(IEnumerable<IMedia> items, int userId = Constants.Security.SuperUserId, bool raiseEvents = true);
 
         /// <summary>
         /// Creates an <see cref="IMedia"/> object using the alias of the <see cref="IMediaType"/>
@@ -319,7 +319,7 @@ namespace Umbraco.Core.Services
         /// <param name="mediaTypeAlias">Alias of the <see cref="IMediaType"/></param>
         /// <param name="userId">Optional id of the user creating the media item</param>
         /// <returns><see cref="IMedia"/></returns>
-        IMedia CreateMediaWithIdentity(string name, IMedia parent, string mediaTypeAlias, int userId = 0);
+        IMedia CreateMediaWithIdentity(string name, IMedia parent, string mediaTypeAlias, int userId = Constants.Security.SuperUserId);
 
         /// <summary>
         /// Creates an <see cref="IMedia"/> object using the alias of the <see cref="IMediaType"/>
@@ -334,7 +334,7 @@ namespace Umbraco.Core.Services
         /// <param name="mediaTypeAlias">Alias of the <see cref="IMediaType"/></param>
         /// <param name="userId">Optional id of the user creating the media item</param>
         /// <returns><see cref="IMedia"/></returns>
-        IMedia CreateMediaWithIdentity(string name, int parentId, string mediaTypeAlias, int userId = 0);
+        IMedia CreateMediaWithIdentity(string name, int parentId, string mediaTypeAlias, int userId = Constants.Security.SuperUserId);
 
         /// <summary>
         /// Gets the content of a media as a stream.
diff --git a/src/Umbraco.Core/Services/IPackagingService.cs b/src/Umbraco.Core/Services/IPackagingService.cs
index c14882fe7a..b38b5a426b 100644
--- a/src/Umbraco.Core/Services/IPackagingService.cs
+++ b/src/Umbraco.Core/Services/IPackagingService.cs
@@ -27,7 +27,7 @@ namespace Umbraco.Core.Services
         /// <param name="packageDefinition"></param>
         /// <param name="packageFile"></param>
         /// <param name="userId"></param>
-        IEnumerable<string> InstallCompiledPackageFiles(PackageDefinition packageDefinition, FileInfo packageFile, int userId = 0);
+        IEnumerable<string> InstallCompiledPackageFiles(PackageDefinition packageDefinition, FileInfo packageFile, int userId = Constants.Security.SuperUserId);
 
         /// <summary>
         /// Installs the data, entities, objects contained in an umbraco package file (zip)
@@ -35,7 +35,7 @@ namespace Umbraco.Core.Services
         /// <param name="packageDefinition"></param>
         /// <param name="packageFile"></param>
         /// <param name="userId"></param>
-        InstallationSummary InstallCompiledPackageData(PackageDefinition packageDefinition, FileInfo packageFile, int userId = 0);
+        InstallationSummary InstallCompiledPackageData(PackageDefinition packageDefinition, FileInfo packageFile, int userId = Constants.Security.SuperUserId);
 
         /// <summary>
         /// Uninstalls all versions of the package by name
@@ -43,7 +43,7 @@ namespace Umbraco.Core.Services
         /// <param name="packageName"></param>
         /// <param name="userId"></param>
         /// <returns></returns>
-        UninstallationSummary UninstallPackage(string packageName, int userId = 0);
+        UninstallationSummary UninstallPackage(string packageName, int userId = Constants.Security.SuperUserId);
 
         #endregion
 
@@ -75,7 +75,7 @@ namespace Umbraco.Core.Services
         /// <param name="alreadyInstalled">If the package is an upgrade, the original/current PackageDefinition is returned</param>
         /// <returns></returns>
         PackageInstallType GetPackageInstallType(string packageName, SemVersion packageVersion, out PackageDefinition alreadyInstalled);
-        void DeleteInstalledPackage(int packageId, int userId = 0);
+        void DeleteInstalledPackage(int packageId, int userId = Constants.Security.SuperUserId);
 
         /// <summary>
         /// Persists a package definition to storage
@@ -89,7 +89,7 @@ namespace Umbraco.Core.Services
 
         IEnumerable<PackageDefinition> GetAllCreatedPackages();
         PackageDefinition GetCreatedPackageById(int id);
-        void DeleteCreatedPackage(int id, int userId = 0);
+        void DeleteCreatedPackage(int id, int userId = Constants.Security.SuperUserId);
 
         /// <summary>
         /// Persists a package definition to storage
diff --git a/src/Umbraco.Core/Services/Implement/ContentService.cs b/src/Umbraco.Core/Services/Implement/ContentService.cs
index ce7417722d..485299c18a 100644
--- a/src/Umbraco.Core/Services/Implement/ContentService.cs
+++ b/src/Umbraco.Core/Services/Implement/ContentService.cs
@@ -159,7 +159,7 @@ namespace Umbraco.Core.Services.Implement
         /// <param name="contentTypeAlias">Alias of the <see cref="IContentType"/></param>
         /// <param name="userId">Optional id of the user creating the content</param>
         /// <returns><see cref="IContent"/></returns>
-        public IContent Create(string name, Guid parentId, string contentTypeAlias, int userId = 0)
+        public IContent Create(string name, Guid parentId, string contentTypeAlias, int userId = Constants.Security.SuperUserId)
         {
             // TODO: what about culture?
 
@@ -179,7 +179,7 @@ namespace Umbraco.Core.Services.Implement
         /// <param name="contentTypeAlias">The alias of the content type.</param>
         /// <param name="userId">The optional id of the user creating the content.</param>
         /// <returns>The content object.</returns>
-        public IContent Create(string name, int parentId, string contentTypeAlias, int userId = 0)
+        public IContent Create(string name, int parentId, string contentTypeAlias, int userId = Constants.Security.SuperUserId)
         {
             // TODO: what about culture?
 
@@ -212,7 +212,7 @@ namespace Umbraco.Core.Services.Implement
         /// <param name="contentTypeAlias">The alias of the content type.</param>
         /// <param name="userId">The optional id of the user creating the content.</param>
         /// <returns>The content object.</returns>
-        public IContent Create(string name, IContent parent, string contentTypeAlias, int userId = 0)
+        public IContent Create(string name, IContent parent, string contentTypeAlias, int userId = Constants.Security.SuperUserId)
         {
             // TODO: what about culture?
 
@@ -243,7 +243,7 @@ namespace Umbraco.Core.Services.Implement
         /// <param name="contentTypeAlias">The alias of the content type.</param>
         /// <param name="userId">The optional id of the user creating the content.</param>
         /// <returns>The content object.</returns>
-        public IContent CreateAndSave(string name, int parentId, string contentTypeAlias, int userId = 0)
+        public IContent CreateAndSave(string name, int parentId, string contentTypeAlias, int userId = Constants.Security.SuperUserId)
         {
             // TODO: what about culture?
 
@@ -277,7 +277,7 @@ namespace Umbraco.Core.Services.Implement
         /// <param name="contentTypeAlias">The alias of the content type.</param>
         /// <param name="userId">The optional id of the user creating the content.</param>
         /// <returns>The content object.</returns>
-        public IContent CreateAndSave(string name, IContent parent, string contentTypeAlias, int userId = 0)
+        public IContent CreateAndSave(string name, IContent parent, string contentTypeAlias, int userId = Constants.Security.SuperUserId)
         {
             // TODO: what about culture?
 
@@ -749,7 +749,7 @@ namespace Umbraco.Core.Services.Implement
         #region Save, Publish, Unpublish
 
         /// <inheritdoc />
-        public OperationResult Save(IContent content, int userId = 0, bool raiseEvents = true)
+        public OperationResult Save(IContent content, int userId = Constants.Security.SuperUserId, bool raiseEvents = true)
         {
             var publishedState = content.PublishedState;
             if (publishedState != PublishedState.Published && publishedState != PublishedState.Unpublished)
@@ -807,7 +807,7 @@ namespace Umbraco.Core.Services.Implement
         }
 
         /// <inheritdoc />
-        public OperationResult Save(IEnumerable<IContent> contents, int userId = 0, bool raiseEvents = true)
+        public OperationResult Save(IEnumerable<IContent> contents, int userId = Constants.Security.SuperUserId, bool raiseEvents = true)
         {
             var evtMsgs = EventMessagesFactory.Get();
             var contentsA = contents.ToArray();
@@ -847,7 +847,7 @@ namespace Umbraco.Core.Services.Implement
         }
 
         /// <inheritdoc />
-        public PublishResult SaveAndPublish(IContent content, string culture = "*", int userId = 0, bool raiseEvents = true)
+        public PublishResult SaveAndPublish(IContent content, string culture = "*", int userId = Constants.Security.SuperUserId, bool raiseEvents = true)
         {
             var evtMsgs = EventMessagesFactory.Get();
 
@@ -908,14 +908,15 @@ namespace Umbraco.Core.Services.Implement
                     : new PublishResult(PublishResultType.FailedPublishNothingToPublish, evtMsgs, content);
             }
 
+            // TODO: currently, no way to know which one failed
             if (cultures.Select(content.PublishCulture).Any(isValid => !isValid))
-                return new PublishResult(PublishResultType.FailedPublishContentInvalid, evtMsgs, content); //fixme: no way to know which one failed?
+                return new PublishResult(PublishResultType.FailedPublishContentInvalid, evtMsgs, content);
 
             return CommitDocumentChanges(content, userId, raiseEvents);
         }
 
         /// <inheritdoc />
-        public PublishResult Unpublish(IContent content, string culture = "*", int userId = 0)
+        public PublishResult Unpublish(IContent content, string culture = "*", int userId = Constants.Security.SuperUserId)
         {
             if (content == null) throw new ArgumentNullException(nameof(content));
 
@@ -980,7 +981,7 @@ namespace Umbraco.Core.Services.Implement
         /// <see cref="CommitDocumentChanges"/> to actually commit the changes to the database.</para>
         /// <para>The document is *always* saved, even when publishing fails.</para>
         /// </remarks>
-        internal PublishResult CommitDocumentChanges(IContent content, int userId = 0, bool raiseEvents = true)
+        internal PublishResult CommitDocumentChanges(IContent content, int userId = Constants.Security.SuperUserId, bool raiseEvents = true)
         {
             using (var scope = ScopeProvider.CreateScope())
             {
@@ -991,7 +992,7 @@ namespace Umbraco.Core.Services.Implement
             }
         }
 
-        private PublishResult CommitDocumentChangesInternal(IScope scope, IContent content, int userId = 0, bool raiseEvents = true, bool branchOne = false, bool branchRoot = false)
+        private PublishResult CommitDocumentChangesInternal(IScope scope, IContent content, int userId = Constants.Security.SuperUserId, bool raiseEvents = true, bool branchOne = false, bool branchRoot = false)
         {
             var evtMsgs = EventMessagesFactory.Get();
             PublishResult publishResult = null;
@@ -1055,9 +1056,10 @@ namespace Umbraco.Core.Services.Implement
                     }
 
                     // reset published state from temp values (publishing, unpublishing) to original value
-                    // (published, unpublished) in order to save the document, unchanged
-                    //TODO: why? this seems odd, were just setting the exact same value that it already has
-                    // instead do we want to just set the PublishState?
+                    // (published, unpublished) in order to save the document, unchanged - yes, this is odd,
+                    // but: (a) it means we don't reproduce the PublishState logic here and (b) setting the
+                    // PublishState to anything other than Publishing or Unpublishing - which is precisely
+                    // what we want to do here - throws
                     content.Published = content.Published; 
                 }
             }
@@ -1080,9 +1082,10 @@ namespace Umbraco.Core.Services.Implement
                     else
                     {
                         // reset published state from temp values (publishing, unpublishing) to original value
-                        // (published, unpublished) in order to save the document, unchanged
-                        //TODO: why? this seems odd, were just setting the exact same value that it already has
-                        // instead do we want to just set the PublishState?
+                        // (published, unpublished) in order to save the document, unchanged - yes, this is odd,
+                        // but: (a) it means we don't reproduce the PublishState logic here and (b) setting the
+                        // PublishState to anything other than Publishing or Unpublishing - which is precisely
+                        // what we want to do here - throws
                         content.Published = content.Published;
                     }
                 }
@@ -1356,7 +1359,7 @@ namespace Umbraco.Core.Services.Implement
 
 
         /// <inheritdoc />
-        public IEnumerable<PublishResult> SaveAndPublishBranch(IContent content, bool force, string culture = "*", int userId = 0)
+        public IEnumerable<PublishResult> SaveAndPublishBranch(IContent content, bool force, string culture = "*", int userId = Constants.Security.SuperUserId)
         {
             // note: EditedValue and PublishedValue are objects here, so it is important to .Equals()
             // and not to == them, else we would be comparing references, and that is a bad thing
@@ -1398,7 +1401,7 @@ namespace Umbraco.Core.Services.Implement
         }
 
         /// <inheritdoc />
-        public IEnumerable<PublishResult> SaveAndPublishBranch(IContent content, bool force, string[] cultures, int userId = 0)
+        public IEnumerable<PublishResult> SaveAndPublishBranch(IContent content, bool force, string[] cultures, int userId = Constants.Security.SuperUserId)
         {
             // note: EditedValue and PublishedValue are objects here, so it is important to .Equals()
             // and not to == them, else we would be comparing references, and that is a bad thing
@@ -1438,7 +1441,7 @@ namespace Umbraco.Core.Services.Implement
         public IEnumerable<PublishResult> SaveAndPublishBranch(IContent document, bool force,
             Func<IContent, HashSet<string>> shouldPublish,
             Func<IContent, HashSet<string>, bool> publishCultures,
-            int userId = 0)
+            int userId = Constants.Security.SuperUserId)
         {
             if (shouldPublish == null) throw new ArgumentNullException(nameof(shouldPublish));
             if (publishCultures == null) throw new ArgumentNullException(nameof(publishCultures));
@@ -1507,9 +1510,8 @@ namespace Umbraco.Core.Services.Implement
                 Audit(AuditType.Publish, userId, document.Id, "Branch published");
 
                 // trigger events for the entire branch
+                // (SaveAndPublishBranchOne does *not* do it)
                 scope.Events.Dispatch(TreeChanged, this, new TreeChange<IContent>(document, TreeChangeTypes.RefreshBranch).ToEventArgs());
-
-                //fixme - in the SaveAndPublishBranchOne -> CommitDocumentChangesInternal publishing/published is going to be raised there, so are we raising it 2x for the same thing?
                 scope.Events.Dispatch(Published, this, new ContentPublishedEventArgs(publishedDocuments, false, evtMsgs), nameof(Published));
 
                 scope.Complete();
@@ -1617,7 +1619,7 @@ namespace Umbraco.Core.Services.Implement
         /// <param name="id">Id of the <see cref="IContent"/> object to delete versions from</param>
         /// <param name="versionDate">Latest version date</param>
         /// <param name="userId">Optional Id of the User deleting versions of a Content object</param>
-        public void DeleteVersions(int id, DateTime versionDate, int userId = 0)
+        public void DeleteVersions(int id, DateTime versionDate, int userId = Constants.Security.SuperUserId)
         {
             using (var scope = ScopeProvider.CreateScope())
             {
@@ -1647,7 +1649,7 @@ namespace Umbraco.Core.Services.Implement
         /// <param name="versionId">Id of the version to delete</param>
         /// <param name="deletePriorVersions">Boolean indicating whether to delete versions prior to the versionId</param>
         /// <param name="userId">Optional Id of the User deleting versions of a Content object</param>
-        public void DeleteVersion(int id, int versionId, bool deletePriorVersions, int userId = 0)
+        public void DeleteVersion(int id, int versionId, bool deletePriorVersions, int userId = Constants.Security.SuperUserId)
         {
             using (var scope = ScopeProvider.CreateScope())
             {
@@ -1733,7 +1735,7 @@ namespace Umbraco.Core.Services.Implement
         /// <param name="content">The <see cref="IContent"/> to move</param>
         /// <param name="parentId">Id of the Content's new Parent</param>
         /// <param name="userId">Optional Id of the User moving the Content</param>
-        public void Move(IContent content, int parentId, int userId = 0)
+        public void Move(IContent content, int parentId, int userId = Constants.Security.SuperUserId)
         {
             // if moving to the recycle bin then use the proper method
             if (parentId == Constants.System.RecycleBinContent)
@@ -1909,7 +1911,7 @@ namespace Umbraco.Core.Services.Implement
         /// <param name="relateToOriginal">Boolean indicating whether the copy should be related to the original</param>
         /// <param name="userId">Optional Id of the User copying the Content</param>
         /// <returns>The newly created <see cref="IContent"/> object</returns>
-        public IContent Copy(IContent content, int parentId, bool relateToOriginal, int userId = 0)
+        public IContent Copy(IContent content, int parentId, bool relateToOriginal, int userId = Constants.Security.SuperUserId)
         {
             return Copy(content, parentId, relateToOriginal, true, userId);
         }
@@ -1924,7 +1926,7 @@ namespace Umbraco.Core.Services.Implement
         /// <param name="recursive">A value indicating whether to recursively copy children.</param>
         /// <param name="userId">Optional Id of the User copying the Content</param>
         /// <returns>The newly created <see cref="IContent"/> object</returns>
-        public IContent Copy(IContent content, int parentId, bool relateToOriginal, bool recursive, int userId = 0)
+        public IContent Copy(IContent content, int parentId, bool relateToOriginal, bool recursive, int userId = Constants.Security.SuperUserId)
         {
             var copy = content.DeepCloneWithResetIdentities();
             copy.ParentId = parentId;
@@ -2027,7 +2029,7 @@ namespace Umbraco.Core.Services.Implement
         /// <param name="content">The <see cref="IContent"/> to send to publication</param>
         /// <param name="userId">Optional Id of the User issuing the send to publication</param>
         /// <returns>True if sending publication was successful otherwise false</returns>
-        public bool SendToPublication(IContent content, int userId = 0)
+        public bool SendToPublication(IContent content, int userId = Constants.Security.SuperUserId)
         {
             using (var scope = ScopeProvider.CreateScope())
             {
@@ -2081,7 +2083,7 @@ namespace Umbraco.Core.Services.Implement
         /// <param name="userId"></param>
         /// <param name="raiseEvents"></param>
         /// <returns>Result indicating what action was taken when handling the command.</returns>
-        public OperationResult Sort(IEnumerable<IContent> items, int userId = 0, bool raiseEvents = true)
+        public OperationResult Sort(IEnumerable<IContent> items, int userId = Constants.Security.SuperUserId, bool raiseEvents = true)
         {
             var evtMsgs = EventMessagesFactory.Get();
 
@@ -2110,7 +2112,7 @@ namespace Umbraco.Core.Services.Implement
         /// <param name="userId"></param>
         /// <param name="raiseEvents"></param>
         /// <returns>Result indicating what action was taken when handling the command.</returns>
-        public OperationResult Sort(IEnumerable<int> ids, int userId = 0, bool raiseEvents = true)
+        public OperationResult Sort(IEnumerable<int> ids, int userId = Constants.Security.SuperUserId, bool raiseEvents = true)
         {
             var evtMsgs = EventMessagesFactory.Get();
 
@@ -2595,7 +2597,7 @@ namespace Umbraco.Core.Services.Implement
         /// </remarks>
         /// <param name="contentTypeIds">Id of the <see cref="IContentType"/></param>
         /// <param name="userId">Optional Id of the user issuing the delete operation</param>
-        public void DeleteOfTypes(IEnumerable<int> contentTypeIds, int userId = 0)
+        public void DeleteOfTypes(IEnumerable<int> contentTypeIds, int userId = Constants.Security.SuperUserId)
         {
             // TODO: This currently this is called from the ContentTypeService but that needs to change,
             // if we are deleting a content type, we should just delete the data and do this operation slightly differently.
@@ -2671,7 +2673,7 @@ namespace Umbraco.Core.Services.Implement
         /// <remarks>This needs extra care and attention as its potentially a dangerous and extensive operation</remarks>
         /// <param name="contentTypeId">Id of the <see cref="IContentType"/></param>
         /// <param name="userId">Optional id of the user deleting the media</param>
-        public void DeleteOfType(int contentTypeId, int userId = 0)
+        public void DeleteOfType(int contentTypeId, int userId = Constants.Security.SuperUserId)
         {
             DeleteOfTypes(new[] { contentTypeId }, userId);
         }
@@ -2729,7 +2731,7 @@ namespace Umbraco.Core.Services.Implement
             }
         }
 
-        public void SaveBlueprint(IContent content, int userId = 0)
+        public void SaveBlueprint(IContent content, int userId = Constants.Security.SuperUserId)
         {
             //always ensure the blueprint is at the root
             if (content.ParentId != -1)
@@ -2755,7 +2757,7 @@ namespace Umbraco.Core.Services.Implement
             }
         }
 
-        public void DeleteBlueprint(IContent content, int userId = 0)
+        public void DeleteBlueprint(IContent content, int userId = Constants.Security.SuperUserId)
         {
             using (var scope = ScopeProvider.CreateScope())
             {
@@ -2768,7 +2770,7 @@ namespace Umbraco.Core.Services.Implement
 
         private static readonly string[] ArrayOfOneNullString = { null };
 
-        public IContent CreateContentFromBlueprint(IContent blueprint, string name, int userId = 0)
+        public IContent CreateContentFromBlueprint(IContent blueprint, string name, int userId = Constants.Security.SuperUserId)
         {
             if (blueprint == null) throw new ArgumentNullException(nameof(blueprint));
 
@@ -2817,7 +2819,7 @@ namespace Umbraco.Core.Services.Implement
             }
         }
 
-        public void DeleteBlueprintsOfTypes(IEnumerable<int> contentTypeIds, int userId = 0)
+        public void DeleteBlueprintsOfTypes(IEnumerable<int> contentTypeIds, int userId = Constants.Security.SuperUserId)
         {
             using (var scope = ScopeProvider.CreateScope())
             {
@@ -2844,7 +2846,7 @@ namespace Umbraco.Core.Services.Implement
             }
         }
 
-        public void DeleteBlueprintsOfType(int contentTypeId, int userId = 0)
+        public void DeleteBlueprintsOfType(int contentTypeId, int userId = Constants.Security.SuperUserId)
         {
             DeleteBlueprintsOfTypes(new[] { contentTypeId }, userId);
         }
@@ -2853,7 +2855,7 @@ namespace Umbraco.Core.Services.Implement
 
         #region Rollback
 
-        public OperationResult Rollback(int id, int versionId, string culture = "*", int userId = 0)
+        public OperationResult Rollback(int id, int versionId, string culture = "*", int userId = Constants.Security.SuperUserId)
         {
             var evtMsgs = EventMessagesFactory.Get();
 
diff --git a/src/Umbraco.Core/Services/Implement/ContentTypeServiceBaseOfTRepositoryTItemTService.cs b/src/Umbraco.Core/Services/Implement/ContentTypeServiceBaseOfTRepositoryTItemTService.cs
index d4cb890953..1f1f0d9ac3 100644
--- a/src/Umbraco.Core/Services/Implement/ContentTypeServiceBaseOfTRepositoryTItemTService.cs
+++ b/src/Umbraco.Core/Services/Implement/ContentTypeServiceBaseOfTRepositoryTItemTService.cs
@@ -376,7 +376,7 @@ namespace Umbraco.Core.Services.Implement
 
         #region Save
 
-        public void Save(TItem item, int userId = 0)
+        public void Save(TItem item, int userId = Constants.Security.SuperUserId)
         {
             using (var scope = ScopeProvider.CreateScope())
             {
@@ -414,7 +414,7 @@ namespace Umbraco.Core.Services.Implement
             }
         }
 
-        public void Save(IEnumerable<TItem> items, int userId = 0)
+        public void Save(IEnumerable<TItem> items, int userId = Constants.Security.SuperUserId)
         {
             var itemsA = items.ToArray();
 
@@ -460,7 +460,7 @@ namespace Umbraco.Core.Services.Implement
 
         #region Delete
 
-        public void Delete(TItem item, int userId = 0)
+        public void Delete(TItem item, int userId = Constants.Security.SuperUserId)
         {
             using (var scope = ScopeProvider.CreateScope())
             {
@@ -514,7 +514,7 @@ namespace Umbraco.Core.Services.Implement
             }
         }
 
-        public void Delete(IEnumerable<TItem> items, int userId = 0)
+        public void Delete(IEnumerable<TItem> items, int userId = Constants.Security.SuperUserId)
         {
             var itemsA = items.ToArray();
 
@@ -735,7 +735,7 @@ namespace Umbraco.Core.Services.Implement
 
         protected Guid ContainerObjectType => EntityContainer.GetContainerObjectType(ContainedObjectType);
 
-        public Attempt<OperationResult<OperationResultType, EntityContainer>> CreateContainer(int parentId, string name, int userId = 0)
+        public Attempt<OperationResult<OperationResultType, EntityContainer>> CreateContainer(int parentId, string name, int userId = Constants.Security.SuperUserId)
         {
             var evtMsgs = EventMessagesFactory.Get();
             using (var scope = ScopeProvider.CreateScope())
@@ -775,7 +775,7 @@ namespace Umbraco.Core.Services.Implement
             }
         }
 
-        public Attempt<OperationResult> SaveContainer(EntityContainer container, int userId = 0)
+        public Attempt<OperationResult> SaveContainer(EntityContainer container, int userId = Constants.Security.SuperUserId)
         {
             var evtMsgs = EventMessagesFactory.Get();
 
@@ -869,7 +869,7 @@ namespace Umbraco.Core.Services.Implement
             }
         }
 
-        public Attempt<OperationResult> DeleteContainer(int containerId, int userId = 0)
+        public Attempt<OperationResult> DeleteContainer(int containerId, int userId = Constants.Security.SuperUserId)
         {
             var evtMsgs = EventMessagesFactory.Get();
             using (var scope = ScopeProvider.CreateScope())
@@ -906,7 +906,7 @@ namespace Umbraco.Core.Services.Implement
             }
         }
 
-        public Attempt<OperationResult<OperationResultType, EntityContainer>> RenameContainer(int id, string name, int userId = 0)
+        public Attempt<OperationResult<OperationResultType, EntityContainer>> RenameContainer(int id, string name, int userId = Constants.Security.SuperUserId)
         {
             var evtMsgs = EventMessagesFactory.Get();
             using (var scope = ScopeProvider.CreateScope())
diff --git a/src/Umbraco.Core/Services/Implement/DataTypeService.cs b/src/Umbraco.Core/Services/Implement/DataTypeService.cs
index 97368e9047..445daddff4 100644
--- a/src/Umbraco.Core/Services/Implement/DataTypeService.cs
+++ b/src/Umbraco.Core/Services/Implement/DataTypeService.cs
@@ -38,7 +38,7 @@ namespace Umbraco.Core.Services.Implement
 
         #region Containers
 
-        public Attempt<OperationResult<OperationResultType, EntityContainer>> CreateContainer(int parentId, string name, int userId = 0)
+        public Attempt<OperationResult<OperationResultType, EntityContainer>> CreateContainer(int parentId, string name, int userId = Constants.Security.SuperUserId)
         {
             var evtMsgs = EventMessagesFactory.Get();
             using (var scope = ScopeProvider.CreateScope())
@@ -119,7 +119,7 @@ namespace Umbraco.Core.Services.Implement
             }
         }
 
-        public Attempt<OperationResult> SaveContainer(EntityContainer container, int userId = 0)
+        public Attempt<OperationResult> SaveContainer(EntityContainer container, int userId = Constants.Security.SuperUserId)
         {
             var evtMsgs = EventMessagesFactory.Get();
 
@@ -153,7 +153,7 @@ namespace Umbraco.Core.Services.Implement
             return OperationResult.Attempt.Succeed(evtMsgs);
         }
 
-        public Attempt<OperationResult> DeleteContainer(int containerId, int userId = 0)
+        public Attempt<OperationResult> DeleteContainer(int containerId, int userId = Constants.Security.SuperUserId)
         {
             var evtMsgs = EventMessagesFactory.Get();
             using (var scope = ScopeProvider.CreateScope())
@@ -186,7 +186,7 @@ namespace Umbraco.Core.Services.Implement
             return OperationResult.Attempt.Succeed(evtMsgs);
         }
 
-        public Attempt<OperationResult<OperationResultType, EntityContainer>> RenameContainer(int id, string name, int userId = 0)
+        public Attempt<OperationResult<OperationResultType, EntityContainer>> RenameContainer(int id, string name, int userId = Constants.Security.SuperUserId)
         {
             var evtMsgs = EventMessagesFactory.Get();
             using (var scope = ScopeProvider.CreateScope())
@@ -331,7 +331,7 @@ namespace Umbraco.Core.Services.Implement
         /// </summary>
         /// <param name="dataType"><see cref="IDataType"/> to save</param>
         /// <param name="userId">Id of the user issuing the save</param>
-        public void Save(IDataType dataType, int userId = 0)
+        public void Save(IDataType dataType, int userId = Constants.Security.SuperUserId)
         {
             dataType.CreatorId = userId;
 
@@ -363,7 +363,7 @@ namespace Umbraco.Core.Services.Implement
         /// </summary>
         /// <param name="dataTypeDefinitions"><see cref="IDataType"/> to save</param>
         /// <param name="userId">Id of the user issuing the save</param>
-        public void Save(IEnumerable<IDataType> dataTypeDefinitions, int userId = 0)
+        public void Save(IEnumerable<IDataType> dataTypeDefinitions, int userId = Constants.Security.SuperUserId)
         {
             Save(dataTypeDefinitions, userId, true);
         }
@@ -413,7 +413,7 @@ namespace Umbraco.Core.Services.Implement
         /// </remarks>
         /// <param name="dataType"><see cref="IDataType"/> to delete</param>
         /// <param name="userId">Optional Id of the user issuing the deletion</param>
-        public void Delete(IDataType dataType, int userId = 0)
+        public void Delete(IDataType dataType, int userId = Constants.Security.SuperUserId)
         {
             using (var scope = ScopeProvider.CreateScope())
             {
diff --git a/src/Umbraco.Core/Services/Implement/FileService.cs b/src/Umbraco.Core/Services/Implement/FileService.cs
index d85b0ca1ba..596d033ae8 100644
--- a/src/Umbraco.Core/Services/Implement/FileService.cs
+++ b/src/Umbraco.Core/Services/Implement/FileService.cs
@@ -74,7 +74,7 @@ namespace Umbraco.Core.Services.Implement
         /// </summary>
         /// <param name="stylesheet"><see cref="Stylesheet"/> to save</param>
         /// <param name="userId"></param>
-        public void SaveStylesheet(Stylesheet stylesheet, int userId = 0)
+        public void SaveStylesheet(Stylesheet stylesheet, int userId = Constants.Security.SuperUserId)
         {
             using (var scope = ScopeProvider.CreateScope())
             {
@@ -100,7 +100,7 @@ namespace Umbraco.Core.Services.Implement
         /// </summary>
         /// <param name="path">Name incl. extension of the Stylesheet to delete</param>
         /// <param name="userId"></param>
-        public void DeleteStylesheet(string path, int userId = 0)
+        public void DeleteStylesheet(string path, int userId = Constants.Security.SuperUserId)
         {
             using (var scope = ScopeProvider.CreateScope())
             {
@@ -217,7 +217,7 @@ namespace Umbraco.Core.Services.Implement
         /// </summary>
         /// <param name="script"><see cref="Script"/> to save</param>
         /// <param name="userId"></param>
-        public void SaveScript(Script script, int userId = 0)
+        public void SaveScript(Script script, int userId = Constants.Security.SuperUserId)
         {
             using (var scope = ScopeProvider.CreateScope())
             {
@@ -242,7 +242,7 @@ namespace Umbraco.Core.Services.Implement
         /// </summary>
         /// <param name="path">Name incl. extension of the Script to delete</param>
         /// <param name="userId"></param>
-        public void DeleteScript(string path, int userId = 0)
+        public void DeleteScript(string path, int userId = Constants.Security.SuperUserId)
         {
             using (var scope = ScopeProvider.CreateScope())
             {
@@ -338,7 +338,7 @@ namespace Umbraco.Core.Services.Implement
         /// <returns>
         /// The template created
         /// </returns>
-        public Attempt<OperationResult<OperationResultType, ITemplate>> CreateTemplateForContentType(string contentTypeAlias, string contentTypeName, int userId = 0)
+        public Attempt<OperationResult<OperationResultType, ITemplate>> CreateTemplateForContentType(string contentTypeAlias, string contentTypeName, int userId = Constants.Security.SuperUserId)
         {
             var template = new Template(contentTypeName,
                 //NOTE: We are NOT passing in the content type alias here, we want to use it's name since we don't
@@ -395,7 +395,7 @@ namespace Umbraco.Core.Services.Implement
         /// <param name="masterTemplate"></param>
         /// <param name="userId"></param>
         /// <returns></returns>
-        public ITemplate CreateTemplateWithIdentity(string name, string alias, string content, ITemplate masterTemplate = null, int userId = 0)
+        public ITemplate CreateTemplateWithIdentity(string name, string alias, string content, ITemplate masterTemplate = null, int userId = Constants.Security.SuperUserId)
         {
             // file might already be on disk, if so grab the content to avoid overwriting
             var template = new Template(name, alias)
@@ -529,7 +529,7 @@ namespace Umbraco.Core.Services.Implement
         /// </summary>
         /// <param name="template"><see cref="Template"/> to save</param>
         /// <param name="userId"></param>
-        public void SaveTemplate(ITemplate template, int userId = 0)
+        public void SaveTemplate(ITemplate template, int userId = Constants.Security.SuperUserId)
         {
             using (var scope = ScopeProvider.CreateScope())
             {
@@ -553,7 +553,7 @@ namespace Umbraco.Core.Services.Implement
         /// </summary>
         /// <param name="templates">List of <see cref="Template"/> to save</param>
         /// <param name="userId">Optional id of the user</param>
-        public void SaveTemplate(IEnumerable<ITemplate> templates, int userId = 0)
+        public void SaveTemplate(IEnumerable<ITemplate> templates, int userId = Constants.Security.SuperUserId)
         {
             var templatesA = templates.ToArray();
             using (var scope = ScopeProvider.CreateScope())
@@ -579,7 +579,7 @@ namespace Umbraco.Core.Services.Implement
         /// </summary>
         /// <param name="alias">Alias of the <see cref="ITemplate"/> to delete</param>
         /// <param name="userId"></param>
-        public void DeleteTemplate(string alias, int userId = 0)
+        public void DeleteTemplate(string alias, int userId = Constants.Security.SuperUserId)
         {
             using (var scope = ScopeProvider.CreateScope())
             {
@@ -723,17 +723,17 @@ namespace Umbraco.Core.Services.Implement
             }
         }
 
-        public Attempt<IPartialView> CreatePartialView(IPartialView partialView, string snippetName = null, int userId = 0)
+        public Attempt<IPartialView> CreatePartialView(IPartialView partialView, string snippetName = null, int userId = Constants.Security.SuperUserId)
         {
             return CreatePartialViewMacro(partialView, PartialViewType.PartialView, snippetName, userId);
         }
 
-        public Attempt<IPartialView> CreatePartialViewMacro(IPartialView partialView, string snippetName = null, int userId = 0)
+        public Attempt<IPartialView> CreatePartialViewMacro(IPartialView partialView, string snippetName = null, int userId = Constants.Security.SuperUserId)
         {
             return CreatePartialViewMacro(partialView, PartialViewType.PartialViewMacro, snippetName, userId);
         }
 
-        private Attempt<IPartialView> CreatePartialViewMacro(IPartialView partialView, PartialViewType partialViewType, string snippetName = null, int userId = 0)
+        private Attempt<IPartialView> CreatePartialViewMacro(IPartialView partialView, PartialViewType partialViewType, string snippetName = null, int userId = Constants.Security.SuperUserId)
         {
             string partialViewHeader;
             switch (partialViewType)
@@ -799,17 +799,17 @@ namespace Umbraco.Core.Services.Implement
             return Attempt<IPartialView>.Succeed(partialView);
         }        
 
-        public bool DeletePartialView(string path, int userId = 0)
+        public bool DeletePartialView(string path, int userId = Constants.Security.SuperUserId)
         {
             return DeletePartialViewMacro(path, PartialViewType.PartialView, userId);
         }
 
-        public bool DeletePartialViewMacro(string path, int userId = 0)
+        public bool DeletePartialViewMacro(string path, int userId = Constants.Security.SuperUserId)
         {
             return DeletePartialViewMacro(path, PartialViewType.PartialViewMacro, userId);
         }
 
-        private bool DeletePartialViewMacro(string path, PartialViewType partialViewType, int userId = 0)
+        private bool DeletePartialViewMacro(string path, PartialViewType partialViewType, int userId = Constants.Security.SuperUserId)
         {
             using (var scope = ScopeProvider.CreateScope())
             {
@@ -839,17 +839,17 @@ namespace Umbraco.Core.Services.Implement
             return true;
         }
 
-        public Attempt<IPartialView> SavePartialView(IPartialView partialView, int userId = 0)
+        public Attempt<IPartialView> SavePartialView(IPartialView partialView, int userId = Constants.Security.SuperUserId)
         {
             return SavePartialView(partialView, PartialViewType.PartialView, userId);
         }
 
-        public Attempt<IPartialView> SavePartialViewMacro(IPartialView partialView, int userId = 0)
+        public Attempt<IPartialView> SavePartialViewMacro(IPartialView partialView, int userId = Constants.Security.SuperUserId)
         {
             return SavePartialView(partialView, PartialViewType.PartialViewMacro, userId);
         }
 
-        private Attempt<IPartialView> SavePartialView(IPartialView partialView, PartialViewType partialViewType, int userId = 0)
+        private Attempt<IPartialView> SavePartialView(IPartialView partialView, PartialViewType partialViewType, int userId = Constants.Security.SuperUserId)
         {
             using (var scope = ScopeProvider.CreateScope())
             {
diff --git a/src/Umbraco.Core/Services/Implement/LocalizationService.cs b/src/Umbraco.Core/Services/Implement/LocalizationService.cs
index 678ea10da2..251261cfc8 100644
--- a/src/Umbraco.Core/Services/Implement/LocalizationService.cs
+++ b/src/Umbraco.Core/Services/Implement/LocalizationService.cs
@@ -227,7 +227,7 @@ namespace Umbraco.Core.Services.Implement
         /// </summary>
         /// <param name="dictionaryItem"><see cref="IDictionaryItem"/> to save</param>
         /// <param name="userId">Optional id of the user saving the dictionary item</param>
-        public void Save(IDictionaryItem dictionaryItem, int userId = 0)
+        public void Save(IDictionaryItem dictionaryItem, int userId = Constants.Security.SuperUserId)
         {
             using (var scope = ScopeProvider.CreateScope())
             {
@@ -256,7 +256,7 @@ namespace Umbraco.Core.Services.Implement
         /// </summary>
         /// <param name="dictionaryItem"><see cref="IDictionaryItem"/> to delete</param>
         /// <param name="userId">Optional id of the user deleting the dictionary item</param>
-        public void Delete(IDictionaryItem dictionaryItem, int userId = 0)
+        public void Delete(IDictionaryItem dictionaryItem, int userId = Constants.Security.SuperUserId)
         {
             using (var scope = ScopeProvider.CreateScope())
             {
@@ -356,7 +356,7 @@ namespace Umbraco.Core.Services.Implement
         /// </summary>
         /// <param name="language"><see cref="ILanguage"/> to save</param>
         /// <param name="userId">Optional id of the user saving the language</param>
-        public void Save(ILanguage language, int userId = 0)
+        public void Save(ILanguage language, int userId = Constants.Security.SuperUserId)
         {
             using (var scope = ScopeProvider.CreateScope())
             {
@@ -409,7 +409,7 @@ namespace Umbraco.Core.Services.Implement
         /// </summary>
         /// <param name="language"><see cref="ILanguage"/> to delete</param>
         /// <param name="userId">Optional id of the user deleting the language</param>
-        public void Delete(ILanguage language, int userId = 0)
+        public void Delete(ILanguage language, int userId = Constants.Security.SuperUserId)
         {
             using (var scope = ScopeProvider.CreateScope())
             {
diff --git a/src/Umbraco.Core/Services/Implement/MacroService.cs b/src/Umbraco.Core/Services/Implement/MacroService.cs
index d4f2d95bbb..a6631aae4c 100644
--- a/src/Umbraco.Core/Services/Implement/MacroService.cs
+++ b/src/Umbraco.Core/Services/Implement/MacroService.cs
@@ -81,7 +81,7 @@ namespace Umbraco.Core.Services.Implement
         /// </summary>
         /// <param name="macro"><see cref="IMacro"/> to delete</param>
         /// <param name="userId">Optional id of the user deleting the macro</param>
-        public void Delete(IMacro macro, int userId = 0)
+        public void Delete(IMacro macro, int userId = Constants.Security.SuperUserId)
         {
             using (var scope = ScopeProvider.CreateScope())
             {
@@ -106,7 +106,7 @@ namespace Umbraco.Core.Services.Implement
         /// </summary>
         /// <param name="macro"><see cref="IMacro"/> to save</param>
         /// <param name="userId">Optional Id of the user deleting the macro</param>
-        public void Save(IMacro macro, int userId = 0)
+        public void Save(IMacro macro, int userId = Constants.Security.SuperUserId)
         {
             using (var scope = ScopeProvider.CreateScope())
             {
diff --git a/src/Umbraco.Core/Services/Implement/MediaService.cs b/src/Umbraco.Core/Services/Implement/MediaService.cs
index e7a42e28e4..1fa9b9fdb4 100644
--- a/src/Umbraco.Core/Services/Implement/MediaService.cs
+++ b/src/Umbraco.Core/Services/Implement/MediaService.cs
@@ -112,7 +112,7 @@ namespace Umbraco.Core.Services.Implement
         /// <param name="mediaTypeAlias">Alias of the <see cref="IMediaType"/></param>
         /// <param name="userId">Optional id of the user creating the media item</param>
         /// <returns><see cref="IMedia"/></returns>
-        public IMedia CreateMedia(string name, Guid parentId, string mediaTypeAlias, int userId = 0)
+        public IMedia CreateMedia(string name, Guid parentId, string mediaTypeAlias, int userId = Constants.Security.SuperUserId)
         {
             var parent = GetById(parentId);
             return CreateMedia(name, parent, mediaTypeAlias, userId);
@@ -130,7 +130,7 @@ namespace Umbraco.Core.Services.Implement
         /// <param name="mediaTypeAlias">The alias of the media type.</param>
         /// <param name="userId">The optional id of the user creating the media.</param>
         /// <returns>The media object.</returns>
-        public IMedia CreateMedia(string name, int parentId, string mediaTypeAlias, int userId = 0)
+        public IMedia CreateMedia(string name, int parentId, string mediaTypeAlias, int userId = Constants.Security.SuperUserId)
         {
             var mediaType = GetMediaType(mediaTypeAlias);
             if (mediaType == null)
@@ -160,7 +160,7 @@ namespace Umbraco.Core.Services.Implement
         /// <param name="mediaTypeAlias">The alias of the media type.</param>
         /// <param name="userId">The optional id of the user creating the media.</param>
         /// <returns>The media object.</returns>
-        public IMedia CreateMedia(string name, string mediaTypeAlias, int userId = 0)
+        public IMedia CreateMedia(string name, string mediaTypeAlias, int userId = Constants.Security.SuperUserId)
         {
             // not locking since not saving anything
 
@@ -190,7 +190,7 @@ namespace Umbraco.Core.Services.Implement
         /// <param name="mediaTypeAlias">The alias of the media type.</param>
         /// <param name="userId">The optional id of the user creating the media.</param>
         /// <returns>The media object.</returns>
-        public IMedia CreateMedia(string name, IMedia parent, string mediaTypeAlias, int userId = 0)
+        public IMedia CreateMedia(string name, IMedia parent, string mediaTypeAlias, int userId = Constants.Security.SuperUserId)
         {
             if (parent == null) throw new ArgumentNullException(nameof(parent));
 
@@ -219,7 +219,7 @@ namespace Umbraco.Core.Services.Implement
         /// <param name="mediaTypeAlias">The alias of the media type.</param>
         /// <param name="userId">The optional id of the user creating the media.</param>
         /// <returns>The media object.</returns>
-        public IMedia CreateMediaWithIdentity(string name, int parentId, string mediaTypeAlias, int userId = 0)
+        public IMedia CreateMediaWithIdentity(string name, int parentId, string mediaTypeAlias, int userId = Constants.Security.SuperUserId)
         {
             using (var scope = ScopeProvider.CreateScope())
             {
@@ -251,7 +251,7 @@ namespace Umbraco.Core.Services.Implement
         /// <param name="mediaTypeAlias">The alias of the media type.</param>
         /// <param name="userId">The optional id of the user creating the media.</param>
         /// <returns>The media object.</returns>
-        public IMedia CreateMediaWithIdentity(string name, IMedia parent, string mediaTypeAlias, int userId = 0)
+        public IMedia CreateMediaWithIdentity(string name, IMedia parent, string mediaTypeAlias, int userId = Constants.Security.SuperUserId)
         {
             if (parent == null) throw new ArgumentNullException(nameof(parent));
 
@@ -632,7 +632,7 @@ namespace Umbraco.Core.Services.Implement
         /// <param name="media">The <see cref="IMedia"/> to save</param>
         /// <param name="userId">Id of the User saving the Media</param>
         /// <param name="raiseEvents">Optional boolean indicating whether or not to raise events.</param>
-        public Attempt<OperationResult> Save(IMedia media, int userId = 0, bool raiseEvents = true)
+        public Attempt<OperationResult> Save(IMedia media, int userId = Constants.Security.SuperUserId, bool raiseEvents = true)
         {
             var evtMsgs = EventMessagesFactory.Get();
 
@@ -677,7 +677,7 @@ namespace Umbraco.Core.Services.Implement
         /// <param name="medias">Collection of <see cref="IMedia"/> to save</param>
         /// <param name="userId">Id of the User saving the Media</param>
         /// <param name="raiseEvents">Optional boolean indicating whether or not to raise events.</param>
-        public Attempt<OperationResult> Save(IEnumerable<IMedia> medias, int userId = 0, bool raiseEvents = true)
+        public Attempt<OperationResult> Save(IEnumerable<IMedia> medias, int userId = Constants.Security.SuperUserId, bool raiseEvents = true)
         {
             var evtMsgs = EventMessagesFactory.Get();
             var mediasA = medias.ToArray();
@@ -724,7 +724,7 @@ namespace Umbraco.Core.Services.Implement
         /// </summary>
         /// <param name="media">The <see cref="IMedia"/> to delete</param>
         /// <param name="userId">Id of the User deleting the Media</param>
-        public Attempt<OperationResult> Delete(IMedia media, int userId = 0)
+        public Attempt<OperationResult> Delete(IMedia media, int userId = Constants.Security.SuperUserId)
         {
             var evtMsgs = EventMessagesFactory.Get();
 
@@ -785,7 +785,7 @@ namespace Umbraco.Core.Services.Implement
         /// <param name="id">Id of the <see cref="IMedia"/> object to delete versions from</param>
         /// <param name="versionDate">Latest version date</param>
         /// <param name="userId">Optional Id of the User deleting versions of a Media object</param>
-        public void DeleteVersions(int id, DateTime versionDate, int userId = 0)
+        public void DeleteVersions(int id, DateTime versionDate, int userId = Constants.Security.SuperUserId)
         {
             using (var scope = ScopeProvider.CreateScope())
             {
@@ -809,7 +809,7 @@ namespace Umbraco.Core.Services.Implement
             }
         }
 
-        private void DeleteVersions(IScope scope, bool wlock, int id, DateTime versionDate, int userId = 0)
+        private void DeleteVersions(IScope scope, bool wlock, int id, DateTime versionDate, int userId = Constants.Security.SuperUserId)
         {
             var args = new DeleteRevisionsEventArgs(id, dateToRetain: versionDate);
             if (scope.Events.DispatchCancelable(DeletingVersions, this, args))
@@ -832,7 +832,7 @@ namespace Umbraco.Core.Services.Implement
         /// <param name="versionId">Id of the version to delete</param>
         /// <param name="deletePriorVersions">Boolean indicating whether to delete versions prior to the versionId</param>
         /// <param name="userId">Optional Id of the User deleting versions of a Media object</param>
-        public void DeleteVersion(int id, int versionId, bool deletePriorVersions, int userId = 0)
+        public void DeleteVersion(int id, int versionId, bool deletePriorVersions, int userId = Constants.Security.SuperUserId)
         {
             using (var scope = ScopeProvider.CreateScope())
             {
@@ -872,7 +872,7 @@ namespace Umbraco.Core.Services.Implement
         /// </summary>
         /// <param name="media">The <see cref="IMedia"/> to delete</param>
         /// <param name="userId">Id of the User deleting the Media</param>
-        public Attempt<OperationResult> MoveToRecycleBin(IMedia media, int userId = 0)
+        public Attempt<OperationResult> MoveToRecycleBin(IMedia media, int userId = Constants.Security.SuperUserId)
         {
             var evtMsgs = EventMessagesFactory.Get();
             var moves = new List<Tuple<IMedia, string>>();
@@ -916,7 +916,7 @@ namespace Umbraco.Core.Services.Implement
         /// <param name="media">The <see cref="IMedia"/> to move</param>
         /// <param name="parentId">Id of the Media's new Parent</param>
         /// <param name="userId">Id of the User moving the Media</param>
-        public Attempt<OperationResult> Move(IMedia media, int parentId, int userId = 0)
+        public Attempt<OperationResult> Move(IMedia media, int parentId, int userId = Constants.Security.SuperUserId)
         {
             var evtMsgs = EventMessagesFactory.Get();
 
@@ -1084,7 +1084,7 @@ namespace Umbraco.Core.Services.Implement
         /// <param name="userId"></param>
         /// <param name="raiseEvents"></param>
         /// <returns>True if sorting succeeded, otherwise False</returns>
-        public bool Sort(IEnumerable<IMedia> items, int userId = 0, bool raiseEvents = true)
+        public bool Sort(IEnumerable<IMedia> items, int userId = Constants.Security.SuperUserId, bool raiseEvents = true)
         {
             var itemsA = items.ToArray();
             if (itemsA.Length == 0) return true;
@@ -1273,7 +1273,7 @@ namespace Umbraco.Core.Services.Implement
         /// </remarks>
         /// <param name="mediaTypeIds">Id of the <see cref="IMediaType"/></param>
         /// <param name="userId">Optional id of the user deleting the media</param>
-        public void DeleteMediaOfTypes(IEnumerable<int> mediaTypeIds, int userId = 0)
+        public void DeleteMediaOfTypes(IEnumerable<int> mediaTypeIds, int userId = Constants.Security.SuperUserId)
         {
             // TODO: This currently this is called from the ContentTypeService but that needs to change,
             // if we are deleting a content type, we should just delete the data and do this operation slightly differently.
@@ -1338,7 +1338,7 @@ namespace Umbraco.Core.Services.Implement
         /// <remarks>This needs extra care and attention as its potentially a dangerous and extensive operation</remarks>
         /// <param name="mediaTypeId">Id of the <see cref="IMediaType"/></param>
         /// <param name="userId">Optional id of the user deleting the media</param>
-        public void DeleteMediaOfType(int mediaTypeId, int userId = 0)
+        public void DeleteMediaOfType(int mediaTypeId, int userId = Constants.Security.SuperUserId)
         {
             DeleteMediaOfTypes(new[] { mediaTypeId }, userId);
         }
diff --git a/src/Umbraco.Core/Services/Implement/PackagingService.cs b/src/Umbraco.Core/Services/Implement/PackagingService.cs
index 9c4c6290a9..5194a26eb5 100644
--- a/src/Umbraco.Core/Services/Implement/PackagingService.cs
+++ b/src/Umbraco.Core/Services/Implement/PackagingService.cs
@@ -100,7 +100,7 @@ namespace Umbraco.Core.Services.Implement
 
         public CompiledPackage GetCompiledPackageInfo(FileInfo packageFile) => _packageInstallation.ReadPackage(packageFile);
 
-        public IEnumerable<string> InstallCompiledPackageFiles(PackageDefinition packageDefinition, FileInfo packageFile, int userId = 0)
+        public IEnumerable<string> InstallCompiledPackageFiles(PackageDefinition packageDefinition, FileInfo packageFile, int userId = Constants.Security.SuperUserId)
         {
             if (packageDefinition == null) throw new ArgumentNullException(nameof(packageDefinition));
             if (packageDefinition.Id == default) throw new ArgumentException("The package definition has not been persisted");
@@ -118,7 +118,7 @@ namespace Umbraco.Core.Services.Implement
             return files;
         }
 
-        public InstallationSummary InstallCompiledPackageData(PackageDefinition packageDefinition, FileInfo packageFile, int userId = 0)
+        public InstallationSummary InstallCompiledPackageData(PackageDefinition packageDefinition, FileInfo packageFile, int userId = Constants.Security.SuperUserId)
         {
             if (packageDefinition == null) throw new ArgumentNullException(nameof(packageDefinition));
             if (packageDefinition.Id == default) throw new ArgumentException("The package definition has not been persisted");
@@ -141,7 +141,7 @@ namespace Umbraco.Core.Services.Implement
             return summary;
         }
 
-        public UninstallationSummary UninstallPackage(string packageName, int userId = 0)
+        public UninstallationSummary UninstallPackage(string packageName, int userId = Constants.Security.SuperUserId)
         {
             //this is ordered by descending version
             var allPackageVersions = GetInstalledPackageByName(packageName)?.ToList();
@@ -187,7 +187,7 @@ namespace Umbraco.Core.Services.Implement
 
         #region Created/Installed Package Repositories
 
-        public void DeleteCreatedPackage(int id, int userId = 0)
+        public void DeleteCreatedPackage(int id, int userId = Constants.Security.SuperUserId)
         {
             var package = GetCreatedPackageById(id);
             if (package == null) return;
@@ -236,7 +236,7 @@ namespace Umbraco.Core.Services.Implement
 
         public bool SaveInstalledPackage(PackageDefinition definition) => _installedPackages.SavePackage(definition);
 
-        public void DeleteInstalledPackage(int packageId, int userId = 0)
+        public void DeleteInstalledPackage(int packageId, int userId = Constants.Security.SuperUserId)
         {
             var package = GetInstalledPackageById(packageId);
             if (package == null) return;
diff --git a/src/Umbraco.Core/Umbraco.Core.csproj b/src/Umbraco.Core/Umbraco.Core.csproj
index 84335fbe6a..b29977697a 100755
--- a/src/Umbraco.Core/Umbraco.Core.csproj
+++ b/src/Umbraco.Core/Umbraco.Core.csproj
@@ -303,6 +303,7 @@
     <Compile Include="DisposableObjectSlim.cs" />
     <Compile Include="EnumExtensions.cs" />
     <Compile Include="Events\CancellableEnumerableObjectEventArgs.cs" />
+    <Compile Include="Events\CancellableObjectEventArgsOfTEventObject.cs" />
     <Compile Include="Events\ContentPublishedEventArgs.cs" />
     <Compile Include="Events\ContentPublishingEventArgs.cs" />
     <Compile Include="Events\ContentSavedEventArgs.cs" />
diff --git a/src/Umbraco.Tests/PublishedContent/PublishedContentMoreTests.cs b/src/Umbraco.Tests/PublishedContent/PublishedContentMoreTests.cs
index 5f3a51f4f6..0dcc4bea99 100644
--- a/src/Umbraco.Tests/PublishedContent/PublishedContentMoreTests.cs
+++ b/src/Umbraco.Tests/PublishedContent/PublishedContentMoreTests.cs
@@ -195,7 +195,7 @@ namespace Umbraco.Tests.PublishedContent
         [Test]
         public void PublishedContentQueryTypedContentList()
         {
-            var query = new PublishedContentQuery(UmbracoContext.Current.ContentCache, UmbracoContext.Current.MediaCache, UmbracoContext.Current.VariationContextAccessor);
+            var query = new PublishedContentQuery(UmbracoContext.Current.PublishedSnapshot, UmbracoContext.Current.VariationContextAccessor);
             var result = query.Content(new[] { 1, 2, 4 }).ToArray();
             Assert.AreEqual(2, result.Length);
             Assert.AreEqual(1, result[0].Id);
diff --git a/src/Umbraco.Tests/Services/ContentServiceTests.cs b/src/Umbraco.Tests/Services/ContentServiceTests.cs
index 78f0d739fb..85c195e553 100644
--- a/src/Umbraco.Tests/Services/ContentServiceTests.cs
+++ b/src/Umbraco.Tests/Services/ContentServiceTests.cs
@@ -66,7 +66,7 @@ namespace Umbraco.Tests.Services
             ServiceContext.FileService.SaveTemplate(contentType.DefaultTemplate);
             contentTypeService.Save(contentType);
 
-            var blueprint = MockedContent.CreateTextpageContent(contentType, "hello", -1);
+            var blueprint = MockedContent.CreateTextpageContent(contentType, "hello", Constants.System.Root);
             blueprint.SetValue("title", "blueprint 1");
             blueprint.SetValue("bodyText", "blueprint 2");
             blueprint.SetValue("keywords", "blueprint 3");
@@ -92,7 +92,7 @@ namespace Umbraco.Tests.Services
             ServiceContext.FileService.SaveTemplate(contentType.DefaultTemplate);
             contentTypeService.Save(contentType);
 
-            var blueprint = MockedContent.CreateTextpageContent(contentType, "hello", -1);
+            var blueprint = MockedContent.CreateTextpageContent(contentType, "hello", Constants.System.Root);
             blueprint.SetValue("title", "blueprint 1");
             blueprint.SetValue("bodyText", "blueprint 2");
             blueprint.SetValue("keywords", "blueprint 3");
@@ -118,7 +118,7 @@ namespace Umbraco.Tests.Services
                 ServiceContext.FileService.SaveTemplate(contentType.DefaultTemplate);
                 contentTypeService.Save(contentType);
 
-                var blueprint = MockedContent.CreateTextpageContent(contentType, "hello", -1);
+                var blueprint = MockedContent.CreateTextpageContent(contentType, "hello", Constants.System.Root);
                 blueprint.SetValue("title", "blueprint 1");
                 blueprint.SetValue("bodyText", "blueprint 2");
                 blueprint.SetValue("keywords", "blueprint 3");
@@ -153,7 +153,7 @@ namespace Umbraco.Tests.Services
 
             for (int i = 0; i < 10; i++)
             {
-                var blueprint = MockedContent.CreateTextpageContent(i % 2 == 0 ? ct1 : ct2, "hello" + i, -1);
+                var blueprint = MockedContent.CreateTextpageContent(i % 2 == 0 ? ct1 : ct2, "hello" + i, Constants.System.Root);
                 contentService.SaveBlueprint(blueprint);
             }
 
@@ -264,7 +264,7 @@ namespace Umbraco.Tests.Services
             var contentService = ServiceContext.ContentService;
 
             // Act
-            var content = contentService.CreateAndSave("Test", -1, "umbTextpage", Constants.Security.SuperUserId);
+            var content = contentService.CreateAndSave("Test", Constants.System.Root, "umbTextpage", Constants.Security.SuperUserId);
 
             content.ContentSchedule.Add(null, DateTime.Now.AddHours(2));
             contentService.Save(content, Constants.Security.SuperUserId);
@@ -292,7 +292,7 @@ namespace Umbraco.Tests.Services
             var contentService = ServiceContext.ContentService;
 
             // Act
-            var content = contentService.CreateAndSave("Test", -1, "umbTextpage", Constants.Security.SuperUserId);
+            var content = contentService.CreateAndSave("Test", Constants.System.Root, "umbTextpage", Constants.Security.SuperUserId);
             for (var i = 0; i < 20; i++)
             {
                 content.SetValue("bodyText", "hello world " + Guid.NewGuid());
@@ -317,7 +317,7 @@ namespace Umbraco.Tests.Services
             var results = new List<IContent>();
             for (var i = 0; i < 20; i++)
             {
-                results.Add(contentService.CreateAndSave("Test", -1, "umbTextpage", 0));
+                results.Add(contentService.CreateAndSave("Test", Constants.System.Root, "umbTextpage", 0));
             }
 
             var sortedGet = contentService.GetByIds(new[] {results[10].Id, results[5].Id, results[12].Id}).ToArray();
@@ -337,7 +337,7 @@ namespace Umbraco.Tests.Services
             // Act
             for (int i = 0; i < 20; i++)
             {
-                contentService.CreateAndSave("Test", -1, "umbTextpage", Constants.Security.SuperUserId);
+                contentService.CreateAndSave("Test", Constants.System.Root, "umbTextpage", Constants.Security.SuperUserId);
             }
 
             // Assert
@@ -356,7 +356,7 @@ namespace Umbraco.Tests.Services
             // Act
             for (int i = 0; i < 20; i++)
             {
-                contentService.CreateAndSave("Test", -1, "umbBlah", Constants.Security.SuperUserId);
+                contentService.CreateAndSave("Test", Constants.System.Root, "umbBlah", Constants.Security.SuperUserId);
             }
 
             // Assert
@@ -371,7 +371,7 @@ namespace Umbraco.Tests.Services
             var contentTypeService = ServiceContext.ContentTypeService;
             var contentType = MockedContentTypes.CreateSimpleContentType("umbBlah", "test Doc Type");
             contentTypeService.Save(contentType);
-            var parent = contentService.CreateAndSave("Test", -1, "umbBlah", Constants.Security.SuperUserId);
+            var parent = contentService.CreateAndSave("Test", Constants.System.Root, "umbBlah", Constants.Security.SuperUserId);
 
             // Act
             for (int i = 0; i < 20; i++)
@@ -391,7 +391,7 @@ namespace Umbraco.Tests.Services
             var contentTypeService = ServiceContext.ContentTypeService;
             var contentType = MockedContentTypes.CreateSimpleContentType("umbBlah", "test Doc Type");
             contentTypeService.Save(contentType);
-            var parent = contentService.CreateAndSave("Test", -1, "umbBlah", Constants.Security.SuperUserId);
+            var parent = contentService.CreateAndSave("Test", Constants.System.Root, "umbBlah", Constants.Security.SuperUserId);
 
             // Act
             IContent current = parent;
@@ -425,7 +425,7 @@ namespace Umbraco.Tests.Services
             var contentService = ServiceContext.ContentService;
 
             // Act
-            var content = contentService.Create("Test", -1, "umbTextpage", Constants.Security.SuperUserId);
+            var content = contentService.Create("Test", Constants.System.Root, "umbTextpage", Constants.Security.SuperUserId);
 
             // Assert
             Assert.That(content, Is.Not.Null);
@@ -439,7 +439,7 @@ namespace Umbraco.Tests.Services
             var contentService = ServiceContext.ContentService;
 
             // Act
-            var content = contentService.Create("Test", -1, "umbTextpage", Constants.Security.SuperUserId);
+            var content = contentService.Create("Test", Constants.System.Root, "umbTextpage", Constants.Security.SuperUserId);
 
             // Assert
             Assert.That(content, Is.Not.Null);
@@ -453,12 +453,12 @@ namespace Umbraco.Tests.Services
             var contentService = ServiceContext.ContentService;
 
             // Act
-            var content = contentService.Create("Test", -1, "umbTextpage");
+            var content = contentService.Create("Test", Constants.System.Root, "umbTextpage");
 
             // Assert
             Assert.That(content, Is.Not.Null);
             Assert.That(content.HasIdentity, Is.False);
-            Assert.That(content.CreatorId, Is.EqualTo(0)); //Default to 0 (unknown) since we didn't explicitly set this in the Create call
+            Assert.That(content.CreatorId, Is.EqualTo(Constants.Security.SuperUserId)); //Default to -1 aka SuperUser (unknown) since we didn't explicitly set this in the Create call
         }
 
         [Test]
@@ -472,7 +472,7 @@ namespace Umbraco.Tests.Services
                 RawPasswordValue = "test"
                 };
             ServiceContext.UserService.Save(user);
-            var content = new Content("Test", -1, ServiceContext.ContentTypeService.Get("umbTextpage"));
+            var content = new Content("Test", Constants.System.Root, ServiceContext.ContentTypeService.Get("umbTextpage"));
 
             // Act
             ServiceContext.ContentService.Save(content, (int)user.Id);
@@ -489,7 +489,7 @@ namespace Umbraco.Tests.Services
             var contentService = ServiceContext.ContentService;
 
             // Act & Assert
-            Assert.Throws<Exception>(() => contentService.Create("Test", -1, "umbAliasDoesntExist"));
+            Assert.Throws<Exception>(() => contentService.Create("Test", Constants.System.Root, "umbAliasDoesntExist"));
         }
 
         [Test]
@@ -497,7 +497,7 @@ namespace Umbraco.Tests.Services
         {
             // Arrange
             var contentService = ServiceContext.ContentService;
-            var content = new Content(string.Empty, -1, ServiceContext.ContentTypeService.Get("umbTextpage"));
+            var content = new Content(string.Empty, Constants.System.Root, ServiceContext.ContentTypeService.Get("umbTextpage"));
 
             // Act & Assert
             Assert.Throws<InvalidOperationException>(() => contentService.Save(content));
@@ -727,7 +727,7 @@ namespace Umbraco.Tests.Services
             contentType.Variations = ContentVariation.Culture;
             ServiceContext.ContentTypeService.Save(contentType);
 
-            IContent content = new Content("content", -1, contentType);
+            IContent content = new Content("content", Constants.System.Root, contentType);
             content.SetCultureName("content-fr", langFr.IsoCode);
             content.SetCultureName("content-en", langUk.IsoCode);
             content.PublishCulture(langFr.IsoCode);
@@ -779,7 +779,7 @@ namespace Umbraco.Tests.Services
 
             ServiceContext.ContentTypeService.Save(contentType);
 
-            IContent content = new Content("content", -1, contentType);
+            IContent content = new Content("content", Constants.System.Root, contentType);
             content.SetCultureName("content-en", langGB.IsoCode);
             content.SetCultureName("content-fr", langFr.IsoCode);
             
@@ -821,7 +821,7 @@ namespace Umbraco.Tests.Services
             contentType.Variations = ContentVariation.Culture;
             ServiceContext.ContentTypeService.Save(contentType);
 
-            IContent content = new Content("content", -1, contentType);
+            IContent content = new Content("content", Constants.System.Root, contentType);
             content.SetCultureName("content-fr", langFr.IsoCode);
             var published = ServiceContext.ContentService.SaveAndPublish(content, langFr.IsoCode);
             //audit log will only show that french was published
@@ -852,7 +852,7 @@ namespace Umbraco.Tests.Services
             contentType.Variations = ContentVariation.Culture;
             ServiceContext.ContentTypeService.Save(contentType);
 
-            IContent content = new Content("content", -1, contentType);
+            IContent content = new Content("content", Constants.System.Root, contentType);
             content.SetCultureName("content-fr", langFr.IsoCode);
             content.SetCultureName("content-gb", langGB.IsoCode);
             var published = ServiceContext.ContentService.SaveAndPublish(content, new[] {langGB.IsoCode, langFr.IsoCode});
@@ -910,7 +910,7 @@ namespace Umbraco.Tests.Services
         {
             // Arrange
             var contentService = ServiceContext.ContentService;
-            var parent = contentService.Create("parent", -1, "umbTextpage");
+            var parent = contentService.Create("parent", Constants.System.Root, "umbTextpage");
 
             contentService.SaveAndPublish(parent);
             var content = contentService.Create("child", parent, "umbTextpage");
@@ -1235,7 +1235,7 @@ namespace Umbraco.Tests.Services
         {
             // Arrange
             var contentService = ServiceContext.ContentService;
-            var content = contentService.Create("Home US", -1, "umbTextpage", Constants.Security.SuperUserId);
+            var content = contentService.Create("Home US", Constants.System.Root, "umbTextpage", Constants.Security.SuperUserId);
             content.SetValue("author", "Barack Obama");
 
             // Act
@@ -1730,7 +1730,7 @@ namespace Umbraco.Tests.Services
             ServiceContext.FileService.SaveTemplate(contentType.DefaultTemplate); // else, FK violation on contentType!
             ServiceContext.ContentTypeService.Save(contentType);
 
-            var content = MockedContent.CreateSimpleContent(contentType, "Simple Tags Page", -1);
+            var content = MockedContent.CreateSimpleContent(contentType, "Simple Tags Page", Constants.System.Root);
             content.AssignTags(propAlias, new[] {"hello", "world"});
             contentService.Save(content);
 
@@ -1906,7 +1906,7 @@ namespace Umbraco.Tests.Services
             ServiceContext.FileService.SaveTemplate(contentType.DefaultTemplate); // else, FK violation on contentType!
             ServiceContext.ContentTypeService.Save(contentType);
 
-            var page = new Content("Page", -1, contentType)
+            var page = new Content("Page", Constants.System.Root, contentType)
             {
                 Level = 1,
                 SortOrder = 1,
@@ -2133,7 +2133,7 @@ namespace Umbraco.Tests.Services
             var contentType = MockedContentTypes.CreateAllTypesContentType("allDataTypes", "All DataTypes");
             contentTypeService.Save(contentType);
             var contentService = ServiceContext.ContentService;
-            var content = MockedContent.CreateAllTypesContent(contentType, "Random Content", -1);
+            var content = MockedContent.CreateAllTypesContent(contentType, "Random Content", Constants.System.Root);
             contentService.Save(content);
             var id = content.Id;
 
@@ -2186,7 +2186,7 @@ namespace Umbraco.Tests.Services
         public void Ensure_Content_Xml_Created()
         {
             var contentService = ServiceContext.ContentService;
-            var content = contentService.Create("Home US", -1, "umbTextpage", Constants.Security.SuperUserId);
+            var content = contentService.Create("Home US", Constants.System.Root, "umbTextpage", Constants.Security.SuperUserId);
             content.SetValue("author", "Barack Obama");
 
             contentService.Save(content);
@@ -2208,7 +2208,7 @@ namespace Umbraco.Tests.Services
         public void Ensure_Preview_Xml_Created()
         {
             var contentService = ServiceContext.ContentService;
-            var content = contentService.Create("Home US", -1, "umbTextpage", Constants.Security.SuperUserId);
+            var content = contentService.Create("Home US", Constants.System.Root, "umbTextpage", Constants.Security.SuperUserId);
             content.SetValue("author", "Barack Obama");
 
             contentService.Save(content);
@@ -2236,10 +2236,10 @@ namespace Umbraco.Tests.Services
             }
 
             long total;
-            var entities = service.GetPagedChildren(-1, 0, 6, out total).ToArray();
+            var entities = service.GetPagedChildren(Constants.System.Root, 0, 6, out total).ToArray();
             Assert.That(entities.Length, Is.EqualTo(6));
             Assert.That(total, Is.EqualTo(10));
-            entities = service.GetPagedChildren(-1, 1, 6, out total).ToArray();
+            entities = service.GetPagedChildren(Constants.System.Root, 1, 6, out total).ToArray();
             Assert.That(entities.Length, Is.EqualTo(4));
             Assert.That(total, Is.EqualTo(10));
         }
@@ -2271,10 +2271,10 @@ namespace Umbraco.Tests.Services
 
             long total;
             // children in root including the folder - not the descendants in the folder
-            var entities = service.GetPagedChildren(-1, 0, 6, out total).ToArray();
+            var entities = service.GetPagedChildren(Constants.System.Root, 0, 6, out total).ToArray();
             Assert.That(entities.Length, Is.EqualTo(6));
             Assert.That(total, Is.EqualTo(10));
-            entities = service.GetPagedChildren(-1, 1, 6, out total).ToArray();
+            entities = service.GetPagedChildren(Constants.System.Root, 1, 6, out total).ToArray();
             Assert.That(entities.Length, Is.EqualTo(4));
             Assert.That(total, Is.EqualTo(10));
 
@@ -2290,7 +2290,7 @@ namespace Umbraco.Tests.Services
         [Test]
         public void PublishingTest()
         {
-            var contentType = new ContentType(-1)
+            var contentType = new ContentType(Constants.System.Root)
             {
                 Alias = "foo",
                 Name = "Foo"
@@ -2308,7 +2308,7 @@ namespace Umbraco.Tests.Services
             ServiceContext.ContentTypeService.Save(contentType);
 
             var contentService = ServiceContext.ContentService;
-            var content = contentService.Create("foo", -1, "foo");
+            var content = contentService.Create("foo", Constants.System.Root, "foo");
             contentService.Save(content);
 
             Assert.IsFalse(content.Published);
@@ -2436,7 +2436,7 @@ namespace Umbraco.Tests.Services
             contentTypeService.Save(contentType);
 
             var contentService = ServiceContext.ContentService;
-            var content = new Content(null, -1, contentType);
+            var content = new Content(null, Constants.System.Root, contentType);
 
             content.SetCultureName("name-us", langUk.IsoCode);
             content.SetCultureName("name-fr", langFr.IsoCode);
@@ -2471,7 +2471,7 @@ namespace Umbraco.Tests.Services
 
             var contentService = ServiceContext.ContentService;
 
-            var content = new Content(null, -1, contentType);
+            var content = new Content(null, Constants.System.Root, contentType);
             content.SetCultureName("root", langUk.IsoCode);
             contentService.Save(content);
 
@@ -2513,13 +2513,13 @@ namespace Umbraco.Tests.Services
             var o = new[] { 2, 1, 3, 0, 4 }; // randomly different
             for (var i = 0; i < 5; i++)
             {
-                var contentA = new Content(null, -1, contentType);
+                var contentA = new Content(null, Constants.System.Root, contentType);
                 contentA.SetCultureName("contentA" + i + "uk", langUk.IsoCode);
                 contentA.SetCultureName("contentA" + o[i] + "fr", langFr.IsoCode);
                 contentA.SetCultureName("contentX" + i + "da", langDa.IsoCode);
                 contentService.Save(contentA);
 
-                var contentB = new Content(null, -1, contentType);
+                var contentB = new Content(null, Constants.System.Root, contentType);
                 contentB.SetCultureName("contentB" + i + "uk", langUk.IsoCode);
                 contentB.SetCultureName("contentB" + o[i] + "fr", langFr.IsoCode);
                 contentB.SetCultureName("contentX" + i + "da", langDa.IsoCode);
@@ -2527,7 +2527,7 @@ namespace Umbraco.Tests.Services
             }
 
             // get all
-            var list = contentService.GetPagedChildren(-1, 0, 100, out var total).ToList();
+            var list = contentService.GetPagedChildren(Constants.System.Root, 0, 100, out var total).ToList();
 
             Console.WriteLine("ALL");
             WriteList(list);
@@ -2537,7 +2537,7 @@ namespace Umbraco.Tests.Services
             Assert.AreEqual(11, list.Count);
 
             // filter
-            list = contentService.GetPagedChildren(-1, 0, 100, out total,
+            list = contentService.GetPagedChildren(Constants.System.Root, 0, 100, out total,
                 SqlContext.Query<IContent>().Where(x => x.Name.Contains("contentX")),
                 Ordering.By("name", culture: langFr.IsoCode)).ToList();
 
@@ -2545,7 +2545,7 @@ namespace Umbraco.Tests.Services
             Assert.AreEqual(0, list.Count);
 
             // filter
-            list = contentService.GetPagedChildren(-1, 0, 100, out total,
+            list = contentService.GetPagedChildren(Constants.System.Root, 0, 100, out total,
                 SqlContext.Query<IContent>().Where(x => x.Name.Contains("contentX")),
                 Ordering.By("name", culture: langDa.IsoCode)).ToList();
 
@@ -2556,7 +2556,7 @@ namespace Umbraco.Tests.Services
             Assert.AreEqual(10, list.Count);
 
             // filter
-            list = contentService.GetPagedChildren(-1, 0, 100, out total,
+            list = contentService.GetPagedChildren(Constants.System.Root, 0, 100, out total,
                 SqlContext.Query<IContent>().Where(x => x.Name.Contains("contentA")),
                 Ordering.By("name", culture: langFr.IsoCode)).ToList();
 
@@ -2569,7 +2569,7 @@ namespace Umbraco.Tests.Services
             for (var i = 0; i < 5; i++)
                 Assert.AreEqual("contentA" + i + "fr", list[i].GetCultureName(langFr.IsoCode));
 
-            list = contentService.GetPagedChildren(-1, 0, 100, out total,
+            list = contentService.GetPagedChildren(Constants.System.Root, 0, 100, out total,
                 SqlContext.Query<IContent>().Where(x => x.Name.Contains("contentA")),
                 Ordering.By("name", direction: Direction.Descending, culture: langFr.IsoCode)).ToList();
 
@@ -2614,7 +2614,7 @@ namespace Umbraco.Tests.Services
             contentTypeService.Save(contentType);
 
             var contentService = ServiceContext.ContentService;
-            var content = contentService.Create("Home US", -1, "umbTextpage");
+            var content = contentService.Create("Home US", Constants.System.Root, "umbTextpage");
 
             // creating content with a name but no culture - will set the invariant name
             // but, because that content is variant, as soon as we save, we'll need to
diff --git a/src/Umbraco.Web/PublishedContentQuery.cs b/src/Umbraco.Web/PublishedContentQuery.cs
index 2c4d08502e..61180580cb 100644
--- a/src/Umbraco.Web/PublishedContentQuery.cs
+++ b/src/Umbraco.Web/PublishedContentQuery.cs
@@ -2,41 +2,31 @@
 using System.Collections;
 using System.Collections.Generic;
 using System.Linq;
-using System.Reflection;
-using System.Text.RegularExpressions;
 using System.Xml.XPath;
 using Examine;
 using Examine.Search;
 using Umbraco.Core;
 using Umbraco.Core.Models.PublishedContent;
-using Umbraco.Core.Services;
 using Umbraco.Core.Xml;
 using Umbraco.Examine;
 using Umbraco.Web.PublishedCache;
 
 namespace Umbraco.Web
 {
-    using Examine = global::Examine;
-
     /// <summary>
     /// A class used to query for published content, media items
     /// </summary>
     public class PublishedContentQuery : IPublishedContentQuery
     {
-        private readonly IPublishedContentCache _contentCache;
-        private readonly IPublishedMediaCache _mediaCache;
+        private readonly IPublishedSnapshot _publishedSnapshot;
         private readonly IVariationContextAccessor _variationContextAccessor;
 
         /// <summary>
-        /// Constructor used to return results from the caches
+        /// Initializes a new instance of the <see cref="PublishedContentQuery"/> class.
         /// </summary>
-        /// <param name="contentCache"></param>
-        /// <param name="mediaCache"></param>
-        /// <param name="variationContextAccessor"></param>
-        public PublishedContentQuery(IPublishedContentCache contentCache, IPublishedMediaCache mediaCache, IVariationContextAccessor variationContextAccessor)
+        public PublishedContentQuery(IPublishedSnapshot publishedSnapshot, IVariationContextAccessor variationContextAccessor)
         {
-            _contentCache = contentCache ?? throw new ArgumentNullException(nameof(contentCache));
-            _mediaCache = mediaCache ?? throw new ArgumentNullException(nameof(mediaCache));
+            _publishedSnapshot = publishedSnapshot ?? throw new ArgumentNullException(nameof(publishedSnapshot));
             _variationContextAccessor = variationContextAccessor ?? throw new ArgumentNullException(nameof(variationContextAccessor));
         }
 
@@ -44,48 +34,48 @@ namespace Umbraco.Web
 
         public IPublishedContent Content(int id)
         {
-            return ItemById(id, _contentCache);
+            return ItemById(id, _publishedSnapshot.Content);
         }
 
         public IPublishedContent Content(Guid id)
         {
-            return ItemById(id, _contentCache);
+            return ItemById(id, _publishedSnapshot.Content);
         }
 
         public IPublishedContent Content(Udi id)
         {
             if (!(id is GuidUdi udi)) return null;
-            return ItemById(udi.Guid, _contentCache);
+            return ItemById(udi.Guid, _publishedSnapshot.Content);
         }
 
         public IPublishedContent ContentSingleAtXPath(string xpath, params XPathVariable[] vars)
         {
-            return ItemByXPath(xpath, vars, _contentCache);
+            return ItemByXPath(xpath, vars, _publishedSnapshot.Content);
         }
 
         public IEnumerable<IPublishedContent> Content(IEnumerable<int> ids)
         {
-            return ItemsByIds(_contentCache, ids);
+            return ItemsByIds(_publishedSnapshot.Content, ids);
         }
 
         public IEnumerable<IPublishedContent> Content(IEnumerable<Guid> ids)
         {
-            return ItemsByIds(_contentCache, ids);
+            return ItemsByIds(_publishedSnapshot.Content, ids);
         }
 
         public IEnumerable<IPublishedContent> ContentAtXPath(string xpath, params XPathVariable[] vars)
         {
-            return ItemsByXPath(xpath, vars, _contentCache);
+            return ItemsByXPath(xpath, vars, _publishedSnapshot.Content);
         }
 
         public IEnumerable<IPublishedContent> ContentAtXPath(XPathExpression xpath, params XPathVariable[] vars)
         {
-            return ItemsByXPath(xpath, vars, _contentCache);
+            return ItemsByXPath(xpath, vars, _publishedSnapshot.Content);
         }
 
         public IEnumerable<IPublishedContent> ContentAtRoot()
         {
-            return ItemsAtRoot(_contentCache);
+            return ItemsAtRoot(_publishedSnapshot.Content);
         }
 
         #endregion
@@ -94,33 +84,33 @@ namespace Umbraco.Web
 
         public IPublishedContent Media(int id)
         {
-            return ItemById(id, _mediaCache);
+            return ItemById(id, _publishedSnapshot.Media);
         }
 
         public IPublishedContent Media(Guid id)
         {
-            return ItemById(id, _mediaCache);
+            return ItemById(id, _publishedSnapshot.Media);
         }
 
         public IPublishedContent Media(Udi id)
         {
             if (!(id is GuidUdi udi)) return null;
-            return ItemById(udi.Guid, _mediaCache);
+            return ItemById(udi.Guid, _publishedSnapshot.Media);
         }
 
         public IEnumerable<IPublishedContent> Media(IEnumerable<int> ids)
         {
-            return ItemsByIds(_mediaCache, ids);
+            return ItemsByIds(_publishedSnapshot.Media, ids);
         }
 
         public IEnumerable<IPublishedContent> Media(IEnumerable<Guid> ids)
         {
-            return ItemsByIds(_mediaCache, ids);
+            return ItemsByIds(_publishedSnapshot.Media, ids);
         }
 
         public IEnumerable<IPublishedContent> MediaAtRoot()
         {
-            return ItemsAtRoot(_mediaCache);
+            return ItemsAtRoot(_publishedSnapshot.Media);
         }
 
 
@@ -224,7 +214,7 @@ namespace Umbraco.Web
 
             totalRecords = results.TotalItemCount;
 
-            return new CultureContextualSearchResults(results.ToPublishedSearchResults(_contentCache), _variationContextAccessor, culture);
+            return new CultureContextualSearchResults(results.ToPublishedSearchResults(_publishedSnapshot.Content), _variationContextAccessor, culture);
         }
 
         /// <inheritdoc />
@@ -241,7 +231,7 @@ namespace Umbraco.Web
                 : query.Execute(maxResults: skip + take);
 
             totalRecords = results.TotalItemCount;
-            return results.ToPublishedSearchResults(_contentCache);
+            return results.ToPublishedSearchResults(_publishedSnapshot.Content);
         }
 
         /// <summary>
diff --git a/src/Umbraco.Web/Routing/ContentFinderByConfigured404.cs b/src/Umbraco.Web/Routing/ContentFinderByConfigured404.cs
index 382ee6fe12..e3cad25c6f 100644
--- a/src/Umbraco.Web/Routing/ContentFinderByConfigured404.cs
+++ b/src/Umbraco.Web/Routing/ContentFinderByConfigured404.cs
@@ -13,7 +13,6 @@ namespace Umbraco.Web.Routing
     /// </summary>
     public class ContentFinderByConfigured404 : IContentLastChanceFinder
     {
-
         private readonly ILogger _logger;
         private readonly IEntityService _entityService;
         private readonly IContentSection _contentConfigSection;
@@ -63,7 +62,7 @@ namespace Umbraco.Web.Routing
             var error404 = NotFoundHandlerHelper.GetCurrentNotFoundPageId(
                 _contentConfigSection.Error404Collection.ToArray(),
                 _entityService,
-                new PublishedContentQuery(frequest.UmbracoContext.ContentCache, frequest.UmbracoContext.MediaCache, frequest.UmbracoContext.VariationContextAccessor),
+                new PublishedContentQuery(frequest.UmbracoContext.PublishedSnapshot, frequest.UmbracoContext.VariationContextAccessor),
                 errorCulture);
 
             IPublishedContent content = null;
diff --git a/src/Umbraco.Web/Runtime/WebRuntimeComposer.cs b/src/Umbraco.Web/Runtime/WebRuntimeComposer.cs
index 0f17c19bdb..3afe6aa397 100644
--- a/src/Umbraco.Web/Runtime/WebRuntimeComposer.cs
+++ b/src/Umbraco.Web/Runtime/WebRuntimeComposer.cs
@@ -91,7 +91,7 @@ namespace Umbraco.Web.Runtime
             composition.Register<IPublishedContentQuery>(factory =>
             {
                 var umbCtx = factory.GetInstance<IUmbracoContextAccessor>();
-                return new PublishedContentQuery(umbCtx.UmbracoContext.ContentCache, umbCtx.UmbracoContext.MediaCache, factory.GetInstance<IVariationContextAccessor>());
+                return new PublishedContentQuery(umbCtx.UmbracoContext.PublishedSnapshot, factory.GetInstance<IVariationContextAccessor>());
             }, Lifetime.Request);
             composition.Register<ITagQuery, TagQuery>(Lifetime.Request);
 
diff --git a/src/Umbraco.Web/UmbracoHelper.cs b/src/Umbraco.Web/UmbracoHelper.cs
index 962d181d7b..d2da4d1646 100644
--- a/src/Umbraco.Web/UmbracoHelper.cs
+++ b/src/Umbraco.Web/UmbracoHelper.cs
@@ -73,7 +73,7 @@ namespace Umbraco.Web
         #endregion
 
         // ensures that we can return the specified value
-        T Ensure<T>(T o) where T : class => o ?? throw new InvalidOperationException(""); // fixme
+        T Ensure<T>(T o) where T : class => o ?? throw new InvalidOperationException("This UmbracoHelper instance has not been initialized.");
 
         private IUmbracoComponentRenderer ComponentRenderer => Ensure(_componentRenderer);
         private ICultureDictionaryFactory CultureDictionaryFactory => Ensure(_cultureDictionaryFactory);