diff --git a/scancore-agents/scan-cluster/scan-cluster b/scancore-agents/scan-cluster/scan-cluster
index f5d0b890..b515d28e 100755
--- a/scancore-agents/scan-cluster/scan-cluster
+++ b/scancore-agents/scan-cluster/scan-cluster
@@ -88,7 +88,10 @@ sub collect_data
 {
 	my ($anvil) = @_;
 	
-	# 
+	# Pick out core cluster details.
+# 	my $stonith_enabled  = $anvil->data->{cib}{parsed}{configuration}{crm_config}{cluster_property_set}{nvpair}{
+# 	my $maintenance_mode = 
+# 	my $no_quorum_policy = 
 	
 	
 	return(0);
diff --git a/scancore-agents/scan-cluster/scan-cluster.sql b/scancore-agents/scan-cluster/scan-cluster.sql
index 15367fa1..3fe71677 100644
--- a/scancore-agents/scan-cluster/scan-cluster.sql
+++ b/scancore-agents/scan-cluster/scan-cluster.sql
@@ -1,9 +1,12 @@
 -- This is the database schema for the 'scan-cluster Scan Agent'.
 
 CREATE TABLE scan_cluster (
-    scan_cluster_uuid         uuid                        primary key,
-    scan_cluster_host_uuid    uuid                        not null,
-    modified_date             timestamp with time zone    not null,
+    scan_cluster_uuid                uuid                        primary key,
+    scan_cluster_host_uuid           uuid                        not null,
+    scan_cluster_stonith_enabled     boolean                     not null,       -- Tracks when stonith (fencing) was enabled/disabled
+    scan_cluster_maintenance_mode    boolean                     not null,       -- Tracks when maintenance mode is enabled/disabled.
+    scan_cluster_no_quorum_policy    text                        not null,       -- Tracks what is done when quorum is lost.
+    modified_date                    timestamp with time zone    not null,
     
     FOREIGN KEY(scan_cluster_host_uuid) REFERENCES hosts(host_uuid)
 );