diff --git a/src/Seq.Api/Model/Alerting/AlertActivityPart.cs b/src/Seq.Api/Model/Alerting/AlertActivityPart.cs
new file mode 100644
index 0000000..f869be3
--- /dev/null
+++ b/src/Seq.Api/Model/Alerting/AlertActivityPart.cs
@@ -0,0 +1,47 @@
+using System;
+using System.Collections.Generic;
+// ReSharper disable UnusedAutoPropertyAccessor.Global
+
+namespace Seq.Api.Model.Alerting
+{
+    /// <summary>
+    /// A summary of recent activity on an alert.
+    /// </summary>
+    
+    public class AlertActivityPart
+    {
+        /// <summary>
+        /// When the last check for the alert was performed.
+        /// </summary>
+        public DateTime? LastCheck { get; set; }
+        
+        /// <summary>
+        /// Whether or not the last check triggered any notifications.
+        /// </summary>
+        public bool LastCheckTriggered { get; set; }
+        
+        /// <summary>
+        /// Any failures that prevented the last check from completing successfully.
+        /// These failures indicate a problem with the alert itself, not with the
+        /// data being monitored.
+        ///
+        /// A value of <c>null</c> indicates the last check succeeded.
+        /// </summary>
+        public List<string> LastCheckFailures { get; set; }
+        
+        /// <summary>
+        /// When the alert may be checked again after being triggered.
+        /// </summary>
+        public DateTime? SuppressedUntil { get; set; }
+        
+        /// <summary>
+        /// The most recent occurrences of the alert that triggered notifications.
+        /// </summary>
+        public List<AlertOccurrencePart> RecentOccurrences { get; set; } = new List<AlertOccurrencePart>();
+
+        /// <summary>
+        /// The number of times this alert has been triggered since its creation.
+        /// </summary>
+        public int TotalOccurrences { get; set; }
+    }
+}
diff --git a/src/Seq.Api/Model/Alerting/AlertEntity.cs b/src/Seq.Api/Model/Alerting/AlertEntity.cs
new file mode 100644
index 0000000..5dc1745
--- /dev/null
+++ b/src/Seq.Api/Model/Alerting/AlertEntity.cs
@@ -0,0 +1,111 @@
+// Copyright Datalust and contributors. 
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+using System;
+using System.Collections.Generic;
+using Seq.Api.Model.LogEvents;
+using Seq.Api.Model.Security;
+using Seq.Api.Model.Shared;
+using Seq.Api.Model.Signals;
+
+namespace Seq.Api.Model.Alerting
+{
+    /// <summary>
+    /// An alert.
+    /// </summary>
+    public class AlertEntity : Entity
+    {
+        /// <summary>
+        /// A friendly, human-readable title for the alert.
+        /// </summary>
+        public string Title { get; set; }
+
+        /// <summary>
+        /// An optional long-form description of the alert.
+        /// </summary>
+        public string Description { get; set; }
+
+        /// <summary>
+        /// The user id of the user who owns the alert; if <c>null</c>, the alert is shared.
+        /// </summary>
+        public string OwnerId { get; set; }
+
+        /// <summary>
+        /// If <c>true</c>, the alert can only be modified by users with the <see cref="Permission.Setup"/> permission.
+        /// </summary>
+        public bool IsProtected { get; set; }
+        
+        /// <summary>
+        /// If <c>true</c>, the alert will not be processed, and notifications will not be sent.
+        /// </summary>
+        public bool IsDisabled { get; set; }
+        
+        /// <summary>
+        /// An optional <see cref="SignalExpressionPart"/> limiting the data source that triggers the alert.
+        /// </summary>
+        public SignalExpressionPart SignalExpression { get; set; }
+
+        /// <summary>
+        /// An optional <c>where</c> clause limiting the data source that triggers the alert.
+        /// </summary>
+        public string Where { get; set; }
+        
+        /// <summary>
+        /// Additional groupings applied to the data source. The <c>time()</c> grouping is controlled by the alerting
+        /// infrastructure according to the <see cref="TimeGrouping"/> property and should not be specified here.
+        /// </summary>
+        public List<GroupingColumnPart> GroupBy { get; set; } = new List<GroupingColumnPart>();
+
+        /// <summary>
+        /// The interval over which the alert condition will be measured.
+        /// </summary>
+        public TimeSpan TimeGrouping { get; set; }
+        
+        /// <summary>
+        /// The individual measurements that will be tested by the alert condition.
+        /// </summary>
+        public List<ColumnPart> Select { get; set; } = new List<ColumnPart>();
+        
+        /// <summary>
+        /// The alert condition. This is a <c>having</c> clause over the grouped results
+        /// computed by the alert query.
+        /// </summary>
+        public string Having { get; set; }
+        
+        /// <summary>
+        /// A level indicating the severity or priority of the alert.
+        /// </summary>
+        public LogEventLevel NotificationLevel { get; set; }
+        
+        /// <summary>
+        /// Additional properties that will be attached to the generated notification.
+        /// </summary>
+        public List<EventPropertyPart> NotificationProperties { get; set; } = new List<EventPropertyPart>();
+
+        /// <summary>
+        /// The channels that will receive notifications when the alert is triggered.
+        /// </summary>
+        public List<NotificationChannelPart> NotificationChannels { get; set; } = new List<NotificationChannelPart>();
+
+        /// <summary>
+        /// The time after the alert is triggered within which no further notifications will be sent.
+        /// </summary>
+        public TimeSpan SuppressionTime { get; set; }
+
+        /// <summary>
+        /// Any recent activity for the alert.
+        /// </summary>
+        public AlertActivityPart Activity { get; set; }
+    }
+}
diff --git a/src/Seq.Api/Model/Alerting/AlertNotificationPart.cs b/src/Seq.Api/Model/Alerting/AlertNotificationPart.cs
new file mode 100644
index 0000000..2145ce9
--- /dev/null
+++ b/src/Seq.Api/Model/Alerting/AlertNotificationPart.cs
@@ -0,0 +1,16 @@
+using Seq.Api.Model.AppInstances;
+
+namespace Seq.Api.Model.Alerting
+{
+    /// <summary>
+    /// A record of the <see cref="NotificationChannelPart"/> that was notified of an alert occurrence.
+    /// </summary>
+    public class AlertNotificationPart
+    {
+        /// <summary>
+        /// The <see cref="AppInstanceEntity" /> that was notified.
+        /// This id is a historical record, so it may be for app instance that no longer exists.
+        /// </summary>
+        public string HistoricalAppInstanceId { get; set; }
+    }
+}
diff --git a/src/Seq.Api/Model/Alerting/AlertOccurrencePart.cs b/src/Seq.Api/Model/Alerting/AlertOccurrencePart.cs
new file mode 100644
index 0000000..c5fed8b
--- /dev/null
+++ b/src/Seq.Api/Model/Alerting/AlertOccurrencePart.cs
@@ -0,0 +1,34 @@
+using System;
+using System.Collections.Generic;
+using Seq.Api.Model.AppInstances;
+using Seq.Api.Model.LogEvents;
+using Seq.Api.Model.Shared;
+
+namespace Seq.Api.Model.Alerting
+{
+    /// <summary>
+    /// An occurrence of an alert that triggered notifications.
+    /// </summary>
+    public class AlertOccurrencePart
+    {
+        /// <summary>
+        /// The time when the alert was checked and triggered.
+        /// </summary>
+        public DateTime DetectedAt { get; set; }
+        
+        /// <summary>
+        /// The time grouping that triggered the alert.
+        /// </summary>
+        public DateTimeRange DetectedOverRange { get; set; }
+
+        /// <summary>
+        /// The level of notifications sent for this instance.
+        /// </summary>
+        public LogEventLevel NotificationLevel { get; set; }
+
+        /// <summary>
+        /// The <see cref="NotificationChannelPart">NotificationChannelParts</see> that were alerted.
+        /// </summary>
+        public List<AlertNotificationPart> Notifications { get; set; } = new List<AlertNotificationPart>();
+    }
+}
\ No newline at end of file
diff --git a/src/Seq.Api/Model/Monitoring/AlertStateEntity.cs b/src/Seq.Api/Model/Alerting/AlertStateEntity.cs
similarity index 74%
rename from src/Seq.Api/Model/Monitoring/AlertStateEntity.cs
rename to src/Seq.Api/Model/Alerting/AlertStateEntity.cs
index 27ba7f6..b788d9f 100644
--- a/src/Seq.Api/Model/Monitoring/AlertStateEntity.cs
+++ b/src/Seq.Api/Model/Alerting/AlertStateEntity.cs
@@ -13,8 +13,9 @@
 // limitations under the License.
 
 using System;
+using System.Collections.Generic;
 
-namespace Seq.Api.Model.Monitoring
+namespace Seq.Api.Model.Alerting
 {
     /// <summary>
     /// Describes the state of an active alert.
@@ -31,30 +32,15 @@ public class AlertStateEntity : Entity
         /// </summary>
         public string Title { get; set; }
         
-        /// <summary>
-        /// The title of the chart to which the alert is attached.
-        /// </summary>
-        public string ChartTitle { get; set; }
-        
-        /// <summary>
-        /// The title of the dashboards in which the alert is set.
-        /// </summary>
-        public string DashboardTitle { get; set; }
-
         /// <summary>
         /// The user id of the user who owns the alert; if <c>null</c>, the alert is shared.
         /// </summary>
         public string OwnerId { get; set; }
 
         /// <summary>
-        /// The notification level associated with the alert.
-        /// </summary>
-        public string Level { get; set; }
-        
-        /// <summary>
-        /// The id of an app instance that will receive notifications when the alert is triggered.
+        /// The ids of app instances that receive notifications when the alert is triggered.
         /// </summary>
-        public string NotificationAppInstanceId { get; set; }
+        public List<string> NotificationAppInstanceIds { get; set; }
 
         /// <summary>
         /// The time at which the alert was last checked. Not preserved across server restarts.
diff --git a/src/Seq.Api/Model/Alerting/NotificationChannelPart.cs b/src/Seq.Api/Model/Alerting/NotificationChannelPart.cs
new file mode 100644
index 0000000..37988dc
--- /dev/null
+++ b/src/Seq.Api/Model/Alerting/NotificationChannelPart.cs
@@ -0,0 +1,63 @@
+// Copyright Datalust and contributors. 
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+using System.Collections.Generic;
+using Seq.Api.Model.AppInstances;
+
+namespace Seq.Api.Model.Alerting
+{
+    /// <summary>
+    /// A notification channel belonging to an alert.
+    /// </summary>
+    public class NotificationChannelPart
+    {
+        /// <summary>
+        /// A system-assigned identifier for the channel. This is used when updating channels to carry over unchanged
+        /// values of sensitive settings, which are not round-tripped to the client for editing. When creating a
+        /// new channel, this should be <c>null</c>.
+        /// </summary>
+        public string Id { get; set; }
+        
+        /// <summary>
+        /// The message used for the title or subject of the notification. If not specified, a default message based
+        /// on the alert title will be used.
+        /// </summary>
+        public string NotificationMessage { get; set; }
+
+        /// <summary>
+        /// If <c>true</c>, notifications will include a sample of the events that contributed to the triggering of
+        /// the alert.
+        /// </summary>
+        public bool IncludeContributingEvents { get; set; }
+        
+        /// <summary>
+        /// When <see cref="IncludeContributingEvents"/> is <c>true</c>, the maximum number of contributing events to
+        /// include in the notification. Note that this value is an upper limit, and server resource constraints may
+        /// prevent all contributing events from being included even below this limit.
+        /// </summary>
+        public uint? IncludedContributingEventLimit { get; set; }
+
+        /// <summary>
+        /// The id of an <see cref="AppInstanceEntity"/> that will receive notifications from the alert.
+        /// </summary>
+        public string NotificationAppInstanceId { get; set; }
+
+        /// <summary>
+        /// Additional properties that will be used to configure the notification app when triggered
+        /// by the alert.
+        /// </summary>
+        public Dictionary<string, string> NotificationAppSettingOverrides { get; set; } =
+            new Dictionary<string, string>();
+    }
+}
diff --git a/src/Seq.Api/Model/Cluster/ClusterNodeEntity.cs b/src/Seq.Api/Model/Cluster/ClusterNodeEntity.cs
new file mode 100644
index 0000000..f8056e5
--- /dev/null
+++ b/src/Seq.Api/Model/Cluster/ClusterNodeEntity.cs
@@ -0,0 +1,53 @@
+// Copyright Datalust and contributors. 
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+namespace Seq.Api.Model.Cluster
+{
+    /// <summary>
+    /// Describes a node in a Seq cluster.
+    /// </summary>
+    public class ClusterNodeEntity : Entity
+    {
+        /// <summary>
+        /// The role the node is currently acting in.
+        /// </summary>
+        public NodeRole Role { get; set; }
+        
+        /// <summary>
+        /// An informational name associated with the node.
+        /// </summary>
+        public string Name { get; set; }
+
+        /// <summary>
+        /// An informational representation of the storage generation committed to the node.
+        /// </summary>
+        public string Generation { get; set; }
+        
+        /// <summary>
+        /// Whether any writes have occurred since the node's last completed sync.
+        /// </summary>
+        public bool? IsUpToDate { get; set; }
+        
+        /// <summary>
+        /// The time since the node's last completed sync operation.
+        /// </summary>
+        public double? MillisecondsSinceLastSync { get; set; }
+
+        /// <summary>
+        /// An informational description of the node's current state, or <c langword="null">null</c> if no additional
+        /// information about the node is available.
+        /// </summary>
+        public string StateDescription { get; set; }
+    }
+}
diff --git a/src/Seq.Api/Model/Inputs/InputAppliedPropertyPart.cs b/src/Seq.Api/Model/Cluster/NodeRole.cs
similarity index 60%
rename from src/Seq.Api/Model/Inputs/InputAppliedPropertyPart.cs
rename to src/Seq.Api/Model/Cluster/NodeRole.cs
index 6f4d3d4..0e753e2 100644
--- a/src/Seq.Api/Model/Inputs/InputAppliedPropertyPart.cs
+++ b/src/Seq.Api/Model/Cluster/NodeRole.cs
@@ -1,4 +1,4 @@
-// Copyright © Datalust and contributors. 
+// Copyright Datalust and contributors. 
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
@@ -12,22 +12,26 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-namespace Seq.Api.Model.Inputs
+namespace Seq.Api.Model.Cluster
 {
     /// <summary>
-    /// A name/value property attached to events ingested through an API key.
+    /// The role a node is acting in within a cluster of connected Seq instances.
     /// </summary>
-    //  Note, this duplicates EventPropertyPart.
-    public class InputAppliedPropertyPart
+    public enum NodeRole
     {
         /// <summary>
-        /// The property name (required).
+        /// The node is not part of a cluster.
         /// </summary>
-        public string Name { get; set; }
-
+        Standalone,
+        
+        /// <summary>
+        /// The node is a replica, following the state of a leader node.
+        /// </summary>
+        Follower,
+        
         /// <summary>
-        /// The property value, or <c>null</c>.
+        /// The node is a replication leader.
         /// </summary>
-        public object Value { get; set; }
+        Leader
     }
 }
\ No newline at end of file
diff --git a/src/Seq.Api/Model/Monitoring/ChartDisplayStylePart.cs b/src/Seq.Api/Model/Dashboarding/ChartDisplayStylePart.cs
similarity index 96%
rename from src/Seq.Api/Model/Monitoring/ChartDisplayStylePart.cs
rename to src/Seq.Api/Model/Dashboarding/ChartDisplayStylePart.cs
index 7f6dbf4..0b79d4d 100644
--- a/src/Seq.Api/Model/Monitoring/ChartDisplayStylePart.cs
+++ b/src/Seq.Api/Model/Dashboarding/ChartDisplayStylePart.cs
@@ -12,7 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-namespace Seq.Api.Model.Monitoring
+namespace Seq.Api.Model.Dashboarding
 {
     /// <summary>
     /// How a chart will be displayed on a dashboard.
diff --git a/src/Seq.Api/Model/Monitoring/ChartPart.cs b/src/Seq.Api/Model/Dashboarding/ChartPart.cs
similarity index 97%
rename from src/Seq.Api/Model/Monitoring/ChartPart.cs
rename to src/Seq.Api/Model/Dashboarding/ChartPart.cs
index 6e8c092..afbc8aa 100644
--- a/src/Seq.Api/Model/Monitoring/ChartPart.cs
+++ b/src/Seq.Api/Model/Dashboarding/ChartPart.cs
@@ -15,7 +15,7 @@
 using System.Collections.Generic;
 using Seq.Api.Model.Signals;
 
-namespace Seq.Api.Model.Monitoring
+namespace Seq.Api.Model.Dashboarding
 {
     /// <summary>
     /// A chart that appears on a dashboard.
diff --git a/src/Seq.Api/Model/Monitoring/ChartQueryPart.cs b/src/Seq.Api/Model/Dashboarding/ChartQueryPart.cs
similarity index 89%
rename from src/Seq.Api/Model/Monitoring/ChartQueryPart.cs
rename to src/Seq.Api/Model/Dashboarding/ChartQueryPart.cs
index 069bf86..2f84f5b 100644
--- a/src/Seq.Api/Model/Monitoring/ChartQueryPart.cs
+++ b/src/Seq.Api/Model/Dashboarding/ChartQueryPart.cs
@@ -13,9 +13,10 @@
 // limitations under the License.
 
 using System.Collections.Generic;
+using Seq.Api.Model.Shared;
 using Seq.Api.Model.Signals;
 
-namespace Seq.Api.Model.Monitoring
+namespace Seq.Api.Model.Dashboarding
 {
     /// <summary>
     /// A query within a chart.
@@ -30,7 +31,7 @@ public class ChartQueryPart
         /// <summary>
         /// Individual measurements included in the query. These are effectively projected columns.
         /// </summary>
-        public List<MeasurementPart> Measurements { get; set; } = new List<MeasurementPart>();
+        public List<ColumnPart> Measurements { get; set; } = new List<ColumnPart>();
 
         /// <summary>
         /// An optional filtering <c>where</c> clause limiting the data that contributes to the chart.
@@ -52,11 +53,6 @@ public class ChartQueryPart
         /// </summary>
         public MeasurementDisplayStylePart DisplayStyle { get; set; } = new MeasurementDisplayStylePart();
 
-        /// <summary>
-        /// Alerts attached to the chart.
-        /// </summary>
-        public List<AlertPart> Alerts { get; set; } = new List<AlertPart>();
-
         /// <summary>
         /// A filter that limits which groups will be displayed on the chart. Not supported by all chart types.
         /// </summary>
diff --git a/src/Seq.Api/Model/Monitoring/DashboardEntity.cs b/src/Seq.Api/Model/Dashboarding/DashboardEntity.cs
similarity index 97%
rename from src/Seq.Api/Model/Monitoring/DashboardEntity.cs
rename to src/Seq.Api/Model/Dashboarding/DashboardEntity.cs
index 9a49d10..edac684 100644
--- a/src/Seq.Api/Model/Monitoring/DashboardEntity.cs
+++ b/src/Seq.Api/Model/Dashboarding/DashboardEntity.cs
@@ -16,7 +16,7 @@
 using Seq.Api.Model.Security;
 using Seq.Api.Model.Signals;
 
-namespace Seq.Api.Model.Monitoring
+namespace Seq.Api.Model.Dashboarding
 {
     /// <summary>
     /// A dashboard.
diff --git a/src/Seq.Api/Model/Monitoring/MeasurementDisplayPalette.cs b/src/Seq.Api/Model/Dashboarding/MeasurementDisplayPalette.cs
similarity index 97%
rename from src/Seq.Api/Model/Monitoring/MeasurementDisplayPalette.cs
rename to src/Seq.Api/Model/Dashboarding/MeasurementDisplayPalette.cs
index 401c3f8..77c4f16 100644
--- a/src/Seq.Api/Model/Monitoring/MeasurementDisplayPalette.cs
+++ b/src/Seq.Api/Model/Dashboarding/MeasurementDisplayPalette.cs
@@ -12,7 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-namespace Seq.Api.Model.Monitoring
+namespace Seq.Api.Model.Dashboarding
 {
     /// <summary>
     /// The color palette used for displaying a measurement on a chart.
diff --git a/src/Seq.Api/Model/Monitoring/MeasurementDisplayStylePart.cs b/src/Seq.Api/Model/Dashboarding/MeasurementDisplayStylePart.cs
similarity index 98%
rename from src/Seq.Api/Model/Monitoring/MeasurementDisplayStylePart.cs
rename to src/Seq.Api/Model/Dashboarding/MeasurementDisplayStylePart.cs
index 9cfd9c6..48f703c 100644
--- a/src/Seq.Api/Model/Monitoring/MeasurementDisplayStylePart.cs
+++ b/src/Seq.Api/Model/Dashboarding/MeasurementDisplayStylePart.cs
@@ -12,7 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-namespace Seq.Api.Model.Monitoring
+namespace Seq.Api.Model.Dashboarding
 {
     /// <summary>
     /// How a measurement will be displayed within a chart.
diff --git a/src/Seq.Api/Model/Monitoring/MeasurementDisplayType.cs b/src/Seq.Api/Model/Dashboarding/MeasurementDisplayType.cs
similarity index 97%
rename from src/Seq.Api/Model/Monitoring/MeasurementDisplayType.cs
rename to src/Seq.Api/Model/Dashboarding/MeasurementDisplayType.cs
index 61e6b57..6a83aeb 100644
--- a/src/Seq.Api/Model/Monitoring/MeasurementDisplayType.cs
+++ b/src/Seq.Api/Model/Dashboarding/MeasurementDisplayType.cs
@@ -12,7 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-namespace Seq.Api.Model.Monitoring
+namespace Seq.Api.Model.Dashboarding
 {
     /// <summary>
     /// The method used to visually represent a measurement.
diff --git a/src/Seq.Api/Model/Diagnostics/ServerMetricsEntity.cs b/src/Seq.Api/Model/Diagnostics/ServerMetricsEntity.cs
index 6bb1079..09928ca 100644
--- a/src/Seq.Api/Model/Diagnostics/ServerMetricsEntity.cs
+++ b/src/Seq.Api/Model/Diagnostics/ServerMetricsEntity.cs
@@ -52,7 +52,7 @@ public ServerMetricsEntity()
         /// <summary>
         /// Bytes of free space remaining on the disk used for event storage.
         /// </summary>
-        public long EventStoreDiskRemainingBytes { get; set; }
+        public long? EventStoreDiskRemainingBytes { get; set; }
 
         /// <summary>
         /// The number of events that arrived at the ingestion endpoint in the past minute.
diff --git a/src/Seq.Api/Model/Events/EventEntity.cs b/src/Seq.Api/Model/Events/EventEntity.cs
index 48181d6..fb38bad 100644
--- a/src/Seq.Api/Model/Events/EventEntity.cs
+++ b/src/Seq.Api/Model/Events/EventEntity.cs
@@ -14,6 +14,9 @@
 
 using System.Collections.Generic;
 using Newtonsoft.Json;
+using Seq.Api.Model.Shared;
+
+// ReSharper disable UnusedAutoPropertyAccessor.Global
 
 namespace Seq.Api.Model.Events
 {
diff --git a/src/Seq.Api/Model/Inputs/InputSettingsPart.cs b/src/Seq.Api/Model/Inputs/InputSettingsPart.cs
index 540b566..cd396c8 100644
--- a/src/Seq.Api/Model/Inputs/InputSettingsPart.cs
+++ b/src/Seq.Api/Model/Inputs/InputSettingsPart.cs
@@ -28,7 +28,7 @@ public class InputSettingsPart
         /// Properties that will be automatically added to all events ingested using the key. These will override any properties with
         /// the same names already present on the event.
         /// </summary>
-        public List<InputAppliedPropertyPart> AppliedProperties { get; set; } = new List<InputAppliedPropertyPart>();
+        public List<EventPropertyPart> AppliedProperties { get; set; } = new List<EventPropertyPart>();
 
         /// <summary>
         /// A filter that selects events to ingest. If <c>null</c>, all events received using the key will be ingested.
@@ -48,4 +48,4 @@ public class InputSettingsPart
         /// </summary>
         public bool UseServerTimestamps { get; set; }
     }
-}
\ No newline at end of file
+}
diff --git a/src/Seq.Api/Model/License/LicenseEntity.cs b/src/Seq.Api/Model/License/LicenseEntity.cs
index 0bdb65e..e9ddd3c 100644
--- a/src/Seq.Api/Model/License/LicenseEntity.cs
+++ b/src/Seq.Api/Model/License/LicenseEntity.cs
@@ -67,5 +67,10 @@ public class LicenseEntity : Entity
         /// update the license when the subscription is renewed or tier changed.
         /// </summary>
         public bool AutomaticallyRefresh { get; set; }
+
+        /// <summary>
+        /// If <c>true</c>, the license supports running Seq in a DR configuration.
+        /// </summary>
+        public bool IncludesDisasterRecovery { get; set; }
     }
 }
diff --git a/src/Seq.Api/Model/Monitoring/AlertPart.cs b/src/Seq.Api/Model/Monitoring/AlertPart.cs
deleted file mode 100644
index 678311d..0000000
--- a/src/Seq.Api/Model/Monitoring/AlertPart.cs
+++ /dev/null
@@ -1,82 +0,0 @@
-// Copyright © Datalust and contributors. 
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-using Seq.Api.Model.LogEvents;
-using System;
-using System.Collections.Generic;
-using Seq.Api.Model.AppInstances;
-
-namespace Seq.Api.Model.Monitoring
-{
-    /// <summary>
-    /// An alert attached to a dashboard chart.
-    /// </summary>
-    public class AlertPart
-    {
-        Dictionary<string, string> _notificationAppSettingOverrides = new Dictionary<string, string>();
-
-        /// <summary>
-        /// The unique id assigned to the alert.
-        /// </summary>
-        public string Id { get; set; }
-
-        /// <summary>
-        /// The alert condition. This is effectively a <c>having</c> clause over the grouped results
-        /// computed by the <see cref="ChartQueryPart"/>.
-        /// </summary>
-        public string Condition { get; set; }
-
-        /// <summary>
-        /// A friendly, human-readable description of the alert.
-        /// </summary>
-        public string Title { get; set; }
-
-        /// <summary>
-        /// The interval within which the alert condition will be measured.
-        /// </summary>
-        public TimeSpan MeasurementWindow { get; set; }
-
-        /// <summary>
-        /// The time allowed for events to reach the server before being included in alert calculations.
-        /// This is relative to the current server clock.
-        /// </summary>
-        public TimeSpan StabilizationWindow { get; set; } = TimeSpan.FromSeconds(30);
-
-        /// <summary>
-        /// The time after the alert files within which no further notifications will be sent for the
-        /// alert.
-        /// </summary>
-        public TimeSpan SuppressionTime { get; set; }
-
-        /// <summary>
-        /// An informational level that suggests the importance of the alert.
-        /// </summary>
-        public LogEventLevel Level { get; set; } = LogEventLevel.Warning;
-
-        /// <summary>
-        /// The id of an <see cref="AppInstanceEntity"/> that will receive notifications from the alert.
-        /// </summary>
-        public string NotificationAppInstanceId { get; set; }
-
-        /// <summary>
-        /// Additional properties that will be used to configure the notification app when triggered
-        /// by the alert.
-        /// </summary>
-        public Dictionary<string, string> NotificationAppSettingOverrides
-        {
-            get => _notificationAppSettingOverrides;
-            set => _notificationAppSettingOverrides = value ?? new Dictionary<string, string>();
-        }
-    }
-}
diff --git a/src/Seq.Api/Model/Retention/RetentionPolicyEntity.cs b/src/Seq.Api/Model/Retention/RetentionPolicyEntity.cs
index ef8a587..380f850 100644
--- a/src/Seq.Api/Model/Retention/RetentionPolicyEntity.cs
+++ b/src/Seq.Api/Model/Retention/RetentionPolicyEntity.cs
@@ -13,6 +13,7 @@
 // limitations under the License.
 
 using System;
+using Newtonsoft.Json;
 using Seq.Api.Model.Signals;
 
 namespace Seq.Api.Model.Retention
@@ -38,7 +39,8 @@ public class RetentionPolicyEntity : Entity
         /// <summary>
         /// Obsolete.
         /// </summary>
-        [Obsolete("Replaced by RemovedSignalExpression.")]
+        [Obsolete("Replaced by RemovedSignalExpression."),
+         JsonProperty(DefaultValueHandling = DefaultValueHandling.Ignore)]
         public string SignalId { get; set; }
     }
 }
diff --git a/src/Seq.Api/Model/Root/RootEntity.cs b/src/Seq.Api/Model/Root/RootEntity.cs
index ebaacf7..8dcb8da 100644
--- a/src/Seq.Api/Model/Root/RootEntity.cs
+++ b/src/Seq.Api/Model/Root/RootEntity.cs
@@ -12,6 +12,9 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
+using System.Collections.Generic;
+using Newtonsoft.Json;
+
 namespace Seq.Api.Model.Root
 {
     /// <summary>
@@ -41,6 +44,13 @@ public RootEntity()
         /// An informational name identifying the instance.
         /// </summary>
         public string InstanceName { get; set; }
+        
+        /// <summary>
+        /// A list of non-default features enabled on this server. Normally, <c langword="null">null</c> unless
+        /// an administrator has explicitly opted-into alpha or beta-level features.
+        /// </summary>
+        [JsonProperty(DefaultValueHandling = DefaultValueHandling.Ignore)]
+        public List<string> EnabledFeatures { get; set; }
 
         /// <summary>
         /// Links to resources exposed by the API.
diff --git a/src/Seq.Api/Model/Events/EventPropertyPart.cs b/src/Seq.Api/Model/Shared/EventPropertyPart.cs
similarity index 91%
rename from src/Seq.Api/Model/Events/EventPropertyPart.cs
rename to src/Seq.Api/Model/Shared/EventPropertyPart.cs
index 1c54054..15b71da 100644
--- a/src/Seq.Api/Model/Events/EventPropertyPart.cs
+++ b/src/Seq.Api/Model/Shared/EventPropertyPart.cs
@@ -1,4 +1,4 @@
-// Copyright © Datalust and contributors. 
+// Copyright © Datalust and contributors. 
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
@@ -14,12 +14,13 @@
 
 using System;
 
-namespace Seq.Api.Model.Events
+// ReSharper disable MemberCanBePrivate.Global
+
+namespace Seq.Api.Model.Shared
 {
     /// <summary>
     /// A name/value property associated with an event.
     /// </summary>
-    //  Note, this duplicates InputAppliedPropertyPart.
     public class EventPropertyPart
     {
         /// <summary>
diff --git a/src/Seq.Api/Model/Shared/GroupingColumnPart.cs b/src/Seq.Api/Model/Shared/GroupingColumnPart.cs
new file mode 100644
index 0000000..043b54d
--- /dev/null
+++ b/src/Seq.Api/Model/Shared/GroupingColumnPart.cs
@@ -0,0 +1,23 @@
+namespace Seq.Api.Model.Shared
+{
+    /// <summary>
+    /// A column appearing within a group-by clause.
+    /// </summary>
+    public class GroupingColumnPart
+    {
+        /// <summary>
+        /// The expression (<c>select</c>ed column) that computes the value of the measurement.
+        /// </summary>
+        public string Value { get; set; }
+
+        /// <summary>
+        /// An optional label for the measurement (effectively the right-hand size of an <c>as</c> clause).
+        /// </summary>
+        public string Label { get; set; }
+
+        /// <summary>
+        /// If <c>true</c>, the grouping is case-insensitive; otherwise, the grouping will be case-sensitive.
+        /// </summary>
+        public bool IsCaseInsensitive { get; set; }
+    }
+}
diff --git a/src/Seq.Api/Model/Monitoring/MeasurementPart.cs b/src/Seq.Api/Model/Shared/MeasurementPart.cs
similarity index 89%
rename from src/Seq.Api/Model/Monitoring/MeasurementPart.cs
rename to src/Seq.Api/Model/Shared/MeasurementPart.cs
index 97edb6a..3171196 100644
--- a/src/Seq.Api/Model/Monitoring/MeasurementPart.cs
+++ b/src/Seq.Api/Model/Shared/MeasurementPart.cs
@@ -12,12 +12,12 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-namespace Seq.Api.Model.Monitoring
+namespace Seq.Api.Model.Shared
 {
     /// <summary>
-    /// A measurement that contributes to a chart.
+    /// A column with value and label.
     /// </summary>
-    public class MeasurementPart
+    public class ColumnPart
     {
         /// <summary>
         /// The expression (<c>select</c>ed column) that computes the value of the measurement.
diff --git a/src/Seq.Api/Model/Workspaces/WorkspaceContentPart.cs b/src/Seq.Api/Model/Workspaces/WorkspaceContentPart.cs
index 9b5d666..e3c635f 100644
--- a/src/Seq.Api/Model/Workspaces/WorkspaceContentPart.cs
+++ b/src/Seq.Api/Model/Workspaces/WorkspaceContentPart.cs
@@ -13,7 +13,7 @@
 // limitations under the License.
 
 using System.Collections.Generic;
-using Seq.Api.Model.Monitoring;
+using Seq.Api.Model.Dashboarding;
 using Seq.Api.Model.Signals;
 using Seq.Api.Model.SqlQueries;
 
diff --git a/src/Seq.Api/Model/Workspaces/WorkspaceEntity.cs b/src/Seq.Api/Model/Workspaces/WorkspaceEntity.cs
index 887d3f7..23bd0cf 100644
--- a/src/Seq.Api/Model/Workspaces/WorkspaceEntity.cs
+++ b/src/Seq.Api/Model/Workspaces/WorkspaceEntity.cs
@@ -29,7 +29,7 @@ public class WorkspaceEntity : Entity
         public string Title { get; set; }
 
         /// <summary>
-        /// A long-form description of the workspace.
+        /// An optional long-form description of the workspace.
         /// </summary>
         public string Description { get; set; }
 
diff --git a/src/Seq.Api/ResourceGroups/AlertStateResourceGroup.cs b/src/Seq.Api/ResourceGroups/AlertStateResourceGroup.cs
index 8b8fa17..e530ed0 100644
--- a/src/Seq.Api/ResourceGroups/AlertStateResourceGroup.cs
+++ b/src/Seq.Api/ResourceGroups/AlertStateResourceGroup.cs
@@ -16,7 +16,8 @@
 using System.Collections.Generic;
 using System.Threading;
 using System.Threading.Tasks;
-using Seq.Api.Model.Monitoring;
+using Seq.Api.Model.Alerting;
+using Seq.Api.Model.Dashboarding;
 
 namespace Seq.Api.ResourceGroups
 {
@@ -25,7 +26,7 @@ namespace Seq.Api.ResourceGroups
     /// </summary>
     public class AlertStateResourceGroup : ApiResourceGroup
     {
-        internal AlertStateResourceGroup(ISeqConnection connection)
+        internal AlertStateResourceGroup(ILoadResourceGroup connection)
             : base("AlertState", connection)
         {
         }
diff --git a/src/Seq.Api/ResourceGroups/AlertsResourceGroup.cs b/src/Seq.Api/ResourceGroups/AlertsResourceGroup.cs
new file mode 100644
index 0000000..6961422
--- /dev/null
+++ b/src/Seq.Api/ResourceGroups/AlertsResourceGroup.cs
@@ -0,0 +1,104 @@
+// Copyright Datalust and contributors. 
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+using System;
+using System.Collections.Generic;
+using System.Threading;
+using System.Threading.Tasks;
+using Seq.Api.Model;
+using Seq.Api.Model.Alerting;
+using Seq.Api.Model.Users;
+
+namespace Seq.Api.ResourceGroups
+{    
+    /// <summary>
+    /// Create and manage alerts being monitored by the server.
+    /// </summary>
+    public class AlertsResourceGroup : ApiResourceGroup
+    {        
+        internal AlertsResourceGroup(ILoadResourceGroup connection)
+            : base("Alerts", connection)
+        {
+        }
+
+        /// <summary>
+        /// Retrieve the dashboard with the given id; throws if the entity does not exist.
+        /// </summary>
+        /// <param name="id">The id of the dashboard.</param>
+        /// <param name="cancellationToken">A <see cref="CancellationToken"/> allowing the operation to be canceled.</param>
+        /// <returns>The dashboard.</returns>
+        public async Task<AlertEntity> FindAsync(string id, CancellationToken cancellationToken = default)
+        {
+            if (id == null) throw new ArgumentNullException(nameof(id));
+            return await GroupGetAsync<AlertEntity>("Item", new Dictionary<string, object> { { "id", id } }, cancellationToken: cancellationToken).ConfigureAwait(false);
+        }
+
+        /// <summary>
+        /// Retrieve alerts.
+        /// </summary>
+        /// <param name="ownerId">If the id of a <see cref="UserEntity"/> is provided, only alerts owned by them will be included in the result; if
+        /// not specified, personal alerts for all owners will be listed.</param>
+        /// <param name="shared">If <c>true</c>, shared alerts will be included in the result.</param>
+        /// <param name="cancellationToken"><see cref="CancellationToken"/> allowing the operation to be canceled.</param>
+        /// <returns>A list containing matching alerts.</returns>
+        public async Task<List<AlertEntity>> ListAsync(string ownerId = null, bool shared = false, CancellationToken cancellationToken = default)
+        {
+            var parameters = new Dictionary<string, object> { { "ownerId", ownerId }, { "shared", shared } };
+            return await GroupListAsync<AlertEntity>("Items", parameters, cancellationToken: cancellationToken).ConfigureAwait(false);
+        }
+
+        /// <summary>
+        /// Construct a alert with server defaults pre-initialized.
+        /// </summary>
+        /// <param name="cancellationToken"><see cref="CancellationToken"/> allowing the operation to be canceled.</param>
+        /// <returns>The unsaved alert.</returns>
+        public async Task<AlertEntity> TemplateAsync(CancellationToken cancellationToken = default)
+        {
+            return await GroupGetAsync<AlertEntity>("Template", cancellationToken: cancellationToken).ConfigureAwait(false);
+        }
+
+        /// <summary>
+        /// Add a new alert.
+        /// </summary>
+        /// <param name="entity">The alert to add.</param>
+        /// <param name="cancellationToken">A <see cref="CancellationToken"/> allowing the operation to be canceled.</param>
+        /// <returns>The alert, with server-allocated properties such as <see cref="Entity.Id"/> initialized.</returns>
+        public async Task<AlertEntity> AddAsync(AlertEntity entity, CancellationToken cancellationToken = default)
+        {
+            return await GroupCreateAsync<AlertEntity, AlertEntity>(entity, cancellationToken: cancellationToken).ConfigureAwait(false);
+        }
+
+        /// <summary>
+        /// Remove an existing alert.
+        /// </summary>
+        /// <param name="entity">The alert to remove.</param>
+        /// <param name="cancellationToken">A <see cref="CancellationToken"/> allowing the operation to be canceled.</param>
+        /// <returns>A task indicating completion.</returns>
+        public async Task RemoveAsync(AlertEntity entity, CancellationToken cancellationToken = default)
+        {
+            await Client.DeleteAsync(entity, "Self", entity, cancellationToken: cancellationToken).ConfigureAwait(false);
+        }
+
+        /// <summary>
+        /// Update an existing alert.
+        /// </summary>
+        /// <param name="entity">The alert to update.</param>
+        /// <param name="cancellationToken">A <see cref="CancellationToken"/> allowing the operation to be canceled.</param>
+        /// <returns>A task indicating completion.</returns>
+        public async Task UpdateAsync(AlertEntity entity, CancellationToken cancellationToken = default)
+        {
+            await Client.PutAsync(entity, "Self", entity, cancellationToken: cancellationToken).ConfigureAwait(false);
+        }
+    }
+}
diff --git a/src/Seq.Api/ResourceGroups/ApiKeysResourceGroup.cs b/src/Seq.Api/ResourceGroups/ApiKeysResourceGroup.cs
index 883ec1d..ad98137 100644
--- a/src/Seq.Api/ResourceGroups/ApiKeysResourceGroup.cs
+++ b/src/Seq.Api/ResourceGroups/ApiKeysResourceGroup.cs
@@ -30,7 +30,7 @@ namespace Seq.Api.ResourceGroups
     /// </summary>
     public class ApiKeysResourceGroup : ApiResourceGroup
     {
-        internal ApiKeysResourceGroup(ISeqConnection connection)
+        internal ApiKeysResourceGroup(ILoadResourceGroup connection)
             : base("ApiKeys", connection)
         {
         }
diff --git a/src/Seq.Api/ResourceGroups/ApiResourceGroup.cs b/src/Seq.Api/ResourceGroups/ApiResourceGroup.cs
index a515dd6..4347f64 100644
--- a/src/Seq.Api/ResourceGroups/ApiResourceGroup.cs
+++ b/src/Seq.Api/ResourceGroups/ApiResourceGroup.cs
@@ -30,9 +30,14 @@ namespace Seq.Api.ResourceGroups
     public abstract class ApiResourceGroup
     {
         readonly string _name;
-        readonly ISeqConnection _connection;
+        readonly ILoadResourceGroup _connection;
 
-        internal ApiResourceGroup(string name, ISeqConnection connection)
+        /// <summary>
+        /// Construct an <see cref="ApiResourceGroup"/> for the named 
+        /// </summary>
+        /// <param name="name"></param>
+        /// <param name="connection"></param>
+        protected ApiResourceGroup(string name, ILoadResourceGroup connection)
         {
             _name = name;
             _connection = connection;
diff --git a/src/Seq.Api/ResourceGroups/AppInstancesResourceGroup.cs b/src/Seq.Api/ResourceGroups/AppInstancesResourceGroup.cs
index 0ee6737..2a12737 100644
--- a/src/Seq.Api/ResourceGroups/AppInstancesResourceGroup.cs
+++ b/src/Seq.Api/ResourceGroups/AppInstancesResourceGroup.cs
@@ -29,7 +29,7 @@ namespace Seq.Api.ResourceGroups
     /// </summary>
     public class AppInstancesResourceGroup : ApiResourceGroup
     {
-        internal AppInstancesResourceGroup(ISeqConnection connection)
+        internal AppInstancesResourceGroup(ILoadResourceGroup connection)
             : base("AppInstances", connection)
         {
         }
diff --git a/src/Seq.Api/ResourceGroups/AppsResourceGroup.cs b/src/Seq.Api/ResourceGroups/AppsResourceGroup.cs
index 9b9d76d..727c555 100644
--- a/src/Seq.Api/ResourceGroups/AppsResourceGroup.cs
+++ b/src/Seq.Api/ResourceGroups/AppsResourceGroup.cs
@@ -26,7 +26,7 @@ namespace Seq.Api.ResourceGroups
     /// </summary>
     public class AppsResourceGroup : ApiResourceGroup
     {
-        internal AppsResourceGroup(ISeqConnection connection)
+        internal AppsResourceGroup(ILoadResourceGroup connection)
             : base("Apps", connection)
         {
         }
diff --git a/src/Seq.Api/ResourceGroups/BackupsResourceGroup.cs b/src/Seq.Api/ResourceGroups/BackupsResourceGroup.cs
index 984a651..cfc16f4 100644
--- a/src/Seq.Api/ResourceGroups/BackupsResourceGroup.cs
+++ b/src/Seq.Api/ResourceGroups/BackupsResourceGroup.cs
@@ -27,7 +27,7 @@ namespace Seq.Api.ResourceGroups
     /// </summary>
     public class BackupsResourceGroup : ApiResourceGroup
     {
-        internal BackupsResourceGroup(ISeqConnection connection)
+        internal BackupsResourceGroup(ILoadResourceGroup connection)
             : base("Backups", connection)
         {
         }
diff --git a/src/Seq.Api/ResourceGroups/ClusterNodesResourceGroup.cs b/src/Seq.Api/ResourceGroups/ClusterNodesResourceGroup.cs
new file mode 100644
index 0000000..b32ed4a
--- /dev/null
+++ b/src/Seq.Api/ResourceGroups/ClusterNodesResourceGroup.cs
@@ -0,0 +1,70 @@
+// Copyright Datalust and contributors. 
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+using System;
+using System.Collections.Generic;
+using System.Threading;
+using System.Threading.Tasks;
+using Seq.Api.Model.Cluster;
+
+namespace Seq.Api.ResourceGroups
+{
+    /// <summary>
+    /// Perform operations on a Seq cluster.
+    /// </summary>
+    /// <remarks>Seq clustering initially supports a two-node replication
+    /// topology.</remarks>
+    public class ClusterNodesResourceGroup : ApiResourceGroup
+    {
+        internal ClusterNodesResourceGroup(ILoadResourceGroup connection)
+            : base("ClusterNodes", connection)
+        {
+        }
+
+        /// <summary>
+        /// Retrieve the cluster node with the given id; throws if the entity does not exist.
+        /// </summary>
+        /// <param name="id">The id of the cluster node.</param>
+        /// <param name="cancellationToken">A <see cref="CancellationToken"/> allowing the operation to be canceled.</param>
+        /// <returns>The cluster node.</returns>
+        public async Task<ClusterNodeEntity> FindAsync(string id, CancellationToken cancellationToken = default)
+        {
+            if (id == null) throw new ArgumentNullException(nameof(id));
+            return await GroupGetAsync<ClusterNodeEntity>("Item", new Dictionary<string, object> { { "id", id } }, cancellationToken).ConfigureAwait(false);
+        }
+
+        /// <summary>
+        /// Retrieve all known cluster nodes.
+        /// </summary>
+        /// <param name="cancellationToken"><see cref="CancellationToken"/> allowing the operation to be canceled.</param>
+        /// <returns>A list containing matching dashboards.</returns>
+        public async Task<List<ClusterNodeEntity>> ListAsync(CancellationToken cancellationToken = default)
+        {
+            return await GroupListAsync<ClusterNodeEntity>("Items", null, cancellationToken).ConfigureAwait(false);
+        }
+
+        /// <summary>
+        /// Manually demote a leader node. The operation will proceed asynchronously; the state of the node can be checked
+        /// using <see cref="ListAsync"/> (the node will disappear when demotion has finished).
+        /// </summary>
+        /// <param name="leader">The leader node.</param>
+        /// <param name="cancellationToken">A <see cref="CancellationToken"/> allowing the operation to be canceled.</param>
+        /// <remarks>If successfully failed over, the node must be restarted before it can join the cluster as follower.</remarks>
+        public async Task DemoteAsync(ClusterNodeEntity leader, CancellationToken cancellationToken = default)
+        {
+            if (leader == null) throw new ArgumentNullException(nameof(leader));
+            await Client.PostAsync(leader, "Demote", new object(), cancellationToken: cancellationToken).ConfigureAwait(false);
+        }
+    }
+}
diff --git a/src/Seq.Api/ResourceGroups/DashboardsResourceGroup.cs b/src/Seq.Api/ResourceGroups/DashboardsResourceGroup.cs
index 4a673cf..18d71be 100644
--- a/src/Seq.Api/ResourceGroups/DashboardsResourceGroup.cs
+++ b/src/Seq.Api/ResourceGroups/DashboardsResourceGroup.cs
@@ -17,7 +17,7 @@
 using System.Threading;
 using System.Threading.Tasks;
 using Seq.Api.Model;
-using Seq.Api.Model.Monitoring;
+using Seq.Api.Model.Dashboarding;
 using Seq.Api.Model.Users;
 
 namespace Seq.Api.ResourceGroups
@@ -27,7 +27,7 @@ namespace Seq.Api.ResourceGroups
     /// </summary>
     public class DashboardsResourceGroup : ApiResourceGroup
     {
-        internal DashboardsResourceGroup(ISeqConnection connection)
+        internal DashboardsResourceGroup(ILoadResourceGroup connection)
             : base("Dashboards", connection)
         {
         }
diff --git a/src/Seq.Api/ResourceGroups/DataResourceGroup.cs b/src/Seq.Api/ResourceGroups/DataResourceGroup.cs
index 33b2690..d8cc53a 100644
--- a/src/Seq.Api/ResourceGroups/DataResourceGroup.cs
+++ b/src/Seq.Api/ResourceGroups/DataResourceGroup.cs
@@ -26,7 +26,7 @@ namespace Seq.Api.ResourceGroups
     /// </summary>
     public class DataResourceGroup : ApiResourceGroup
     {
-        internal DataResourceGroup(ISeqConnection connection)
+        internal DataResourceGroup(ILoadResourceGroup connection)
             : base("Data", connection)
         {
         }
diff --git a/src/Seq.Api/ResourceGroups/DiagnosticsResourceGroup.cs b/src/Seq.Api/ResourceGroups/DiagnosticsResourceGroup.cs
index 644242c..0566efe 100644
--- a/src/Seq.Api/ResourceGroups/DiagnosticsResourceGroup.cs
+++ b/src/Seq.Api/ResourceGroups/DiagnosticsResourceGroup.cs
@@ -18,7 +18,6 @@
 using System.Threading.Tasks;
 using Seq.Api.Model.Diagnostics;
 using Seq.Api.Model.Diagnostics.Storage;
-using Seq.Api.Model.Inputs;
 
 // ReSharper disable UnusedMember.Global
 
@@ -29,7 +28,7 @@ namespace Seq.Api.ResourceGroups
     /// </summary>
     public class DiagnosticsResourceGroup : ApiResourceGroup
     {
-        internal DiagnosticsResourceGroup(ISeqConnection connection)
+        internal DiagnosticsResourceGroup(ILoadResourceGroup connection)
             : base("Diagnostics", connection)
         {
         }
diff --git a/src/Seq.Api/ResourceGroups/EventsResourceGroup.cs b/src/Seq.Api/ResourceGroups/EventsResourceGroup.cs
index 01b4259..96ee76f 100644
--- a/src/Seq.Api/ResourceGroups/EventsResourceGroup.cs
+++ b/src/Seq.Api/ResourceGroups/EventsResourceGroup.cs
@@ -29,7 +29,7 @@ namespace Seq.Api.ResourceGroups
     /// </summary>
     public class EventsResourceGroup : ApiResourceGroup
     {
-        internal EventsResourceGroup(ISeqConnection connection)
+        internal EventsResourceGroup(ILoadResourceGroup connection)
             : base("Events", connection)
         {
         }
diff --git a/src/Seq.Api/ResourceGroups/ExpressionsResourceGroup.cs b/src/Seq.Api/ResourceGroups/ExpressionsResourceGroup.cs
index 50043c0..7474a74 100644
--- a/src/Seq.Api/ResourceGroups/ExpressionsResourceGroup.cs
+++ b/src/Seq.Api/ResourceGroups/ExpressionsResourceGroup.cs
@@ -24,7 +24,7 @@ namespace Seq.Api.ResourceGroups
     /// </summary>
     public class ExpressionsResourceGroup : ApiResourceGroup
     {
-        internal ExpressionsResourceGroup(ISeqConnection connection)
+        internal ExpressionsResourceGroup(ILoadResourceGroup connection)
             : base("Expressions", connection)
         {
         }
diff --git a/src/Seq.Api/ResourceGroups/FeedsResourceGroup.cs b/src/Seq.Api/ResourceGroups/FeedsResourceGroup.cs
index 121ce97..11e369a 100644
--- a/src/Seq.Api/ResourceGroups/FeedsResourceGroup.cs
+++ b/src/Seq.Api/ResourceGroups/FeedsResourceGroup.cs
@@ -26,7 +26,7 @@ namespace Seq.Api.ResourceGroups
     /// </summary>
     public class FeedsResourceGroup : ApiResourceGroup
     {
-        internal FeedsResourceGroup(ISeqConnection connection)
+        internal FeedsResourceGroup(ILoadResourceGroup connection)
             : base("Feeds", connection)
         {
         }
diff --git a/src/Seq.Api/ResourceGroups/ISeqConnection.cs b/src/Seq.Api/ResourceGroups/ILoadResourceGroup.cs
similarity index 51%
rename from src/Seq.Api/ResourceGroups/ISeqConnection.cs
rename to src/Seq.Api/ResourceGroups/ILoadResourceGroup.cs
index ae29134..a3ac76a 100644
--- a/src/Seq.Api/ResourceGroups/ISeqConnection.cs
+++ b/src/Seq.Api/ResourceGroups/ILoadResourceGroup.cs
@@ -19,9 +19,25 @@
 
 namespace Seq.Api.ResourceGroups
 {
-    interface ISeqConnection
+    /// <summary>
+    /// The contract between resource groups and the implementing connection type.
+    /// </summary>
+    /// <remarks>This interface is an implementation detail that should not be relied on by
+    /// application-level consumers.</remarks>
+    public interface ILoadResourceGroup
     {
+        /// <summary>
+        /// Load the resource group with the given <paramref name="name"/>.
+        /// </summary>
+        /// <param name="name">The resource group name. The name is the simple form, for example,
+        /// <c>"Dashboards"</c>.</param>
+        /// <param name="cancellationToken">A <see cref="CancellationToken"/> allowing the operation to be canceled.</param>
+        /// <returns>The requested resource group.</returns>
         Task<ResourceGroup> LoadResourceGroupAsync(string name, CancellationToken cancellationToken = default);
+        
+        /// <summary>
+        /// The underlying Seq API client.
+        /// </summary>
         SeqApiClient Client { get; }
     }
 }
diff --git a/src/Seq.Api/ResourceGroups/LicensesResourceGroup.cs b/src/Seq.Api/ResourceGroups/LicensesResourceGroup.cs
index 9bb8e17..a26bbb4 100644
--- a/src/Seq.Api/ResourceGroups/LicensesResourceGroup.cs
+++ b/src/Seq.Api/ResourceGroups/LicensesResourceGroup.cs
@@ -25,7 +25,7 @@ namespace Seq.Api.ResourceGroups
     /// </summary>
     public class LicensesResourceGroup : ApiResourceGroup
     {
-        internal LicensesResourceGroup(ISeqConnection connection)
+        internal LicensesResourceGroup(ILoadResourceGroup connection)
             : base("Licenses", connection)
         {
         }
diff --git a/src/Seq.Api/ResourceGroups/PermalinksResourceGroup.cs b/src/Seq.Api/ResourceGroups/PermalinksResourceGroup.cs
index 166821d..9d7faa8 100644
--- a/src/Seq.Api/ResourceGroups/PermalinksResourceGroup.cs
+++ b/src/Seq.Api/ResourceGroups/PermalinksResourceGroup.cs
@@ -27,7 +27,7 @@ namespace Seq.Api.ResourceGroups
     /// </summary>
     public class PermalinksResourceGroup : ApiResourceGroup
     {
-        internal PermalinksResourceGroup(ISeqConnection connection)
+        internal PermalinksResourceGroup(ILoadResourceGroup connection)
             : base("Permalinks", connection)
         {
         }
diff --git a/src/Seq.Api/ResourceGroups/RetentionPoliciesResourceGroup.cs b/src/Seq.Api/ResourceGroups/RetentionPoliciesResourceGroup.cs
index 9c3d712..9007ae8 100644
--- a/src/Seq.Api/ResourceGroups/RetentionPoliciesResourceGroup.cs
+++ b/src/Seq.Api/ResourceGroups/RetentionPoliciesResourceGroup.cs
@@ -26,7 +26,7 @@ namespace Seq.Api.ResourceGroups
     /// </summary>
     public class RetentionPoliciesResourceGroup : ApiResourceGroup
     {
-        internal RetentionPoliciesResourceGroup(ISeqConnection connection)
+        internal RetentionPoliciesResourceGroup(ILoadResourceGroup connection)
             : base("RetentionPolicies", connection)
         {
         }
diff --git a/src/Seq.Api/ResourceGroups/RolesResourceGroup.cs b/src/Seq.Api/ResourceGroups/RolesResourceGroup.cs
index bdc61ca..728f0f2 100644
--- a/src/Seq.Api/ResourceGroups/RolesResourceGroup.cs
+++ b/src/Seq.Api/ResourceGroups/RolesResourceGroup.cs
@@ -25,7 +25,7 @@ namespace Seq.Api.ResourceGroups
     /// </summary>
     public class RolesResourceGroup : ApiResourceGroup
     {
-        internal RolesResourceGroup(ISeqConnection connection)
+        internal RolesResourceGroup(ILoadResourceGroup connection)
             : base("Roles", connection)
         {
         }
diff --git a/src/Seq.Api/ResourceGroups/RunningTasksResourceGroup.cs b/src/Seq.Api/ResourceGroups/RunningTasksResourceGroup.cs
index 0327347..fb0c217 100644
--- a/src/Seq.Api/ResourceGroups/RunningTasksResourceGroup.cs
+++ b/src/Seq.Api/ResourceGroups/RunningTasksResourceGroup.cs
@@ -16,7 +16,8 @@
 using System.Collections.Generic;
 using System.Threading;
 using System.Threading.Tasks;
-using Seq.Api.Model.Monitoring;
+using Seq.Api.Model.Alerting;
+using Seq.Api.Model.Dashboarding;
 using Seq.Api.Model.Tasks;
 
 namespace Seq.Api.ResourceGroups
@@ -26,7 +27,7 @@ namespace Seq.Api.ResourceGroups
     /// </summary>
     public class RunningTasksResourceGroup : ApiResourceGroup
     {
-        internal RunningTasksResourceGroup (ISeqConnection connection)
+        internal RunningTasksResourceGroup (ILoadResourceGroup connection)
             : base("RunningTasks", connection)
         {
         }
diff --git a/src/Seq.Api/ResourceGroups/SettingsResourceGroup.cs b/src/Seq.Api/ResourceGroups/SettingsResourceGroup.cs
index 8146b97..7d4b0e2 100644
--- a/src/Seq.Api/ResourceGroups/SettingsResourceGroup.cs
+++ b/src/Seq.Api/ResourceGroups/SettingsResourceGroup.cs
@@ -25,7 +25,7 @@ namespace Seq.Api.ResourceGroups
     /// </summary>
     public class SettingsResourceGroup : ApiResourceGroup
     {
-        internal SettingsResourceGroup(ISeqConnection connection)
+        internal SettingsResourceGroup(ILoadResourceGroup connection)
             : base("Settings", connection)
         {
         }
diff --git a/src/Seq.Api/ResourceGroups/SignalsResourceGroup.cs b/src/Seq.Api/ResourceGroups/SignalsResourceGroup.cs
index c1fb65c..d74c680 100644
--- a/src/Seq.Api/ResourceGroups/SignalsResourceGroup.cs
+++ b/src/Seq.Api/ResourceGroups/SignalsResourceGroup.cs
@@ -27,7 +27,7 @@ namespace Seq.Api.ResourceGroups
     /// </summary>
     public class SignalsResourceGroup : ApiResourceGroup
     {
-        internal SignalsResourceGroup(ISeqConnection connection)
+        internal SignalsResourceGroup(ILoadResourceGroup connection)
             : base("Signals", connection)
         {
         }
diff --git a/src/Seq.Api/ResourceGroups/SqlQueriesResourceGroup.cs b/src/Seq.Api/ResourceGroups/SqlQueriesResourceGroup.cs
index 7ce7cde..83414ed 100644
--- a/src/Seq.Api/ResourceGroups/SqlQueriesResourceGroup.cs
+++ b/src/Seq.Api/ResourceGroups/SqlQueriesResourceGroup.cs
@@ -27,7 +27,7 @@ namespace Seq.Api.ResourceGroups
     /// </summary>
     public class SqlQueriesResourceGroup : ApiResourceGroup
     {
-        internal SqlQueriesResourceGroup(ISeqConnection connection)
+        internal SqlQueriesResourceGroup(ILoadResourceGroup connection)
             : base("SqlQueries", connection)
         {
         }
diff --git a/src/Seq.Api/ResourceGroups/UpdatesResourceGroup.cs b/src/Seq.Api/ResourceGroups/UpdatesResourceGroup.cs
index d5146b2..840d215 100644
--- a/src/Seq.Api/ResourceGroups/UpdatesResourceGroup.cs
+++ b/src/Seq.Api/ResourceGroups/UpdatesResourceGroup.cs
@@ -24,7 +24,7 @@ namespace Seq.Api.ResourceGroups
     /// </summary>
     public class UpdatesResourceGroup : ApiResourceGroup
     {
-        internal UpdatesResourceGroup(ISeqConnection connection)
+        internal UpdatesResourceGroup(ILoadResourceGroup connection)
             : base("Updates", connection)
         {
         }
diff --git a/src/Seq.Api/ResourceGroups/UsersResourceGroup.cs b/src/Seq.Api/ResourceGroups/UsersResourceGroup.cs
index c99dae0..5b95402 100644
--- a/src/Seq.Api/ResourceGroups/UsersResourceGroup.cs
+++ b/src/Seq.Api/ResourceGroups/UsersResourceGroup.cs
@@ -28,7 +28,7 @@ namespace Seq.Api.ResourceGroups
     /// </summary>
     public class UsersResourceGroup : ApiResourceGroup
     {
-        internal UsersResourceGroup(ISeqConnection connection)
+        internal UsersResourceGroup(ILoadResourceGroup connection)
             : base("Users", connection)
         {
         }
diff --git a/src/Seq.Api/ResourceGroups/WorkspacesResourceGroup.cs b/src/Seq.Api/ResourceGroups/WorkspacesResourceGroup.cs
index 89b4ce0..665d714 100644
--- a/src/Seq.Api/ResourceGroups/WorkspacesResourceGroup.cs
+++ b/src/Seq.Api/ResourceGroups/WorkspacesResourceGroup.cs
@@ -27,7 +27,7 @@ namespace Seq.Api.ResourceGroups
     /// </summary>
     public class WorkspacesResourceGroup : ApiResourceGroup
     {
-        internal WorkspacesResourceGroup(ISeqConnection connection)
+        internal WorkspacesResourceGroup(ILoadResourceGroup connection)
             : base("Workspaces", connection)
         {
         }
diff --git a/src/Seq.Api/Seq.Api.csproj b/src/Seq.Api/Seq.Api.csproj
index 83d448f..285f5fa 100644
--- a/src/Seq.Api/Seq.Api.csproj
+++ b/src/Seq.Api/Seq.Api.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
     <Description>Client library for the Seq HTTP API.</Description>
-    <VersionPrefix>2021.2.1</VersionPrefix>
+    <VersionPrefix>2020.3.0</VersionPrefix>
     <Authors>Datalust;Contributors</Authors>
     <TargetFramework>netstandard2.0</TargetFramework>
     <TreatWarningsAsErrors>true</TreatWarningsAsErrors>
@@ -13,9 +13,13 @@
     <PackageLicenseExpression>Apache-2.0</PackageLicenseExpression>
     <LangVersion>8</LangVersion>
   </PropertyGroup>
+  
   <ItemGroup>
     <PackageReference Include="Newtonsoft.Json" Version="12.0.3" />
     <PackageReference Include="Tavis.UriTemplates" Version="1.1.1" />
-    <None Include="seq-api-icon.png" Pack="true" PackagePath="\"/>
+  </ItemGroup>
+  
+  <ItemGroup>
+    <None Include="seq-api-icon.png" Pack="true" PackagePath="\" />
   </ItemGroup>
 </Project>
diff --git a/src/Seq.Api/SeqConnection.cs b/src/Seq.Api/SeqConnection.cs
index 1710ff3..63703ce 100644
--- a/src/Seq.Api/SeqConnection.cs
+++ b/src/Seq.Api/SeqConnection.cs
@@ -29,7 +29,7 @@ namespace Seq.Api
     /// <summary>
     /// Exposes high-level (typed) interactions with the Seq API through various resource groups.
     /// </summary>
-    public class SeqConnection : ISeqConnection, IDisposable
+    public class SeqConnection : ILoadResourceGroup, IDisposable
     {
         readonly object _sync = new object();
         readonly Dictionary<string, Task<ResourceGroup>> _resourceGroups = new Dictionary<string, Task<ResourceGroup>>();
@@ -74,13 +74,18 @@ public void Dispose()
         /// the HTTP API.
         /// </summary>
         public SeqApiClient Client { get; }
+        
+        /// <summary>
+        /// Create and manage alerts.
+        /// </summary>
+        public AlertsResourceGroup Alerts => new AlertsResourceGroup(this);
 
         /// <summary>
         /// List and administratively remove active alerts. To create/edit/remove alerts in normal
         /// circumstances, use <see cref="Dashboards"/>.
         /// </summary>
         public AlertStateResourceGroup AlertState => new AlertStateResourceGroup(this);
- 
+
         /// <summary>
         /// Perform operations on API keys.
         /// </summary>
@@ -100,7 +105,12 @@ public void Dispose()
         /// Perform operations on backups.
         /// </summary>
         public BackupsResourceGroup Backups => new BackupsResourceGroup(this);
-
+        
+        /// <summary>
+        /// Perform operations on the Seq cluster.
+        /// </summary>
+        public ClusterNodesResourceGroup ClusterNodes => new ClusterNodesResourceGroup(this);
+        
         /// <summary>
         /// Perform operations on dashboards.
         /// </summary>
@@ -228,8 +238,8 @@ async Task<bool> ConnectAsync(bool throwOnFailure)
 
             throw new SeqApiException($"Could not connect to the Seq API endpoint: {(int)statusCode}/{statusCode}.", statusCode);
         }
-
-        async Task<ResourceGroup> ISeqConnection.LoadResourceGroupAsync(string name, CancellationToken cancellationToken)
+        
+        async Task<ResourceGroup> ILoadResourceGroup.LoadResourceGroupAsync(string name, CancellationToken cancellationToken)
         {
             Task<RootEntity> loadRoot;
             lock (_sync)