diff --git a/config/install/monitoring.sensor_config.user_active.yml b/config/install/monitoring.sensor_config.user_active.yml
index b5d7b59..bf8bbc0 100644
--- a/config/install/monitoring.sensor_config.user_active.yml
+++ b/config/install/monitoring.sensor_config.user_active.yml
@@ -2,7 +2,7 @@ id: user_active
 label: 'Active users'
 description: ''
 category: 'User activity'
-plugin_id: entity_aggregator
+plugin_id: content_entity_aggregator
 value_label: 'Users'
 value_type: 'number'
 status: FALSE
diff --git a/config/install/monitoring.sensor_config.user_new.yml b/config/install/monitoring.sensor_config.user_new.yml
index e1f3c85..c7b66ce 100644
--- a/config/install/monitoring.sensor_config.user_new.yml
+++ b/config/install/monitoring.sensor_config.user_new.yml
@@ -2,7 +2,7 @@ id: user_new
 label: 'New users'
 description: ''
 category: 'User activity'
-plugin_id: entity_aggregator
+plugin_id: content_entity_aggregator
 value_label: 'Users'
 value_type: 'number'
 status: FALSE
diff --git a/config/optional/monitoring.sensor_config.comment_new.yml b/config/optional/monitoring.sensor_config.comment_new.yml
index a19c1a6..30c8d6d 100644
--- a/config/optional/monitoring.sensor_config.comment_new.yml
+++ b/config/optional/monitoring.sensor_config.comment_new.yml
@@ -2,7 +2,7 @@ id: comment_new
 label: 'New Comments'
 description: ''
 category: Content
-plugin_id: entity_aggregator
+plugin_id: content_entity_aggregator
 value_label: Comments
 value_type: 'number'
 status: FALSE
diff --git a/config/optional/monitoring.sensor_config.node_new_all.yml b/config/optional/monitoring.sensor_config.node_new_all.yml
index f450e77..0e7d7e7 100644
--- a/config/optional/monitoring.sensor_config.node_new_all.yml
+++ b/config/optional/monitoring.sensor_config.node_new_all.yml
@@ -1,7 +1,7 @@
 id: node_new_all
 label: 'All new nodes'
 description: 'All new nodes'
-plugin_id: entity_aggregator
+plugin_id: content_entity_aggregator
 value_type : 'number'
 value_label: 'Nodes'
 category: 'Content'
diff --git a/config/optional/monitoring.sensor_config.past_db_critical.yml b/config/optional/monitoring.sensor_config.past_db_critical.yml
index 1b6ff6c..2e754a7 100644
--- a/config/optional/monitoring.sensor_config.past_db_critical.yml
+++ b/config/optional/monitoring.sensor_config.past_db_critical.yml
@@ -2,7 +2,7 @@ id: past_db_critical
 label: 'Critical events'
 description: 'Past event warnings occurred'
 category: Past
-plugin_id: entity_aggregator
+plugin_id: content_entity_aggregator
 value_label: 'Events'
 value_type: 'number'
 status: TRUE
diff --git a/config/optional/monitoring.sensor_config.past_db_debug.yml b/config/optional/monitoring.sensor_config.past_db_debug.yml
index b52d98f..3e557e5 100644
--- a/config/optional/monitoring.sensor_config.past_db_debug.yml
+++ b/config/optional/monitoring.sensor_config.past_db_debug.yml
@@ -2,7 +2,7 @@ id: past_db_debug
 label: 'Debug info'
 description: 'Past debug info'
 category: Past
-plugin_id: entity_aggregator
+plugin_id: content_entity_aggregator
 value_label: 'Events'
 value_type: 'number'
 status: FALSE
diff --git a/config/optional/monitoring.sensor_config.past_db_emergency.yml b/config/optional/monitoring.sensor_config.past_db_emergency.yml
index 8984d33..470a90b 100644
--- a/config/optional/monitoring.sensor_config.past_db_emergency.yml
+++ b/config/optional/monitoring.sensor_config.past_db_emergency.yml
@@ -2,7 +2,7 @@ id: past_db_emergency
 label: 'Emergencies occurred'
 description: 'Past event emergencies occurred'
 category: Past
-plugin_id: entity_aggregator
+plugin_id: content_entity_aggregator
 value_label: 'Events'
 value_type: 'number'
 status: TRUE
diff --git a/config/optional/monitoring.sensor_config.past_db_error.yml b/config/optional/monitoring.sensor_config.past_db_error.yml
index 15fc6e0..808a2b4 100644
--- a/config/optional/monitoring.sensor_config.past_db_error.yml
+++ b/config/optional/monitoring.sensor_config.past_db_error.yml
@@ -2,7 +2,7 @@ id: past_db_error
 label: 'Errors occurred'
 description: 'Past event errors occurred'
 category: Past
-plugin_id: entity_aggregator
+plugin_id: content_entity_aggregator
 value_label: 'Events'
 value_type: 'number'
 status: TRUE
diff --git a/config/optional/monitoring.sensor_config.past_db_info.yml b/config/optional/monitoring.sensor_config.past_db_info.yml
index 038b1f5..6b08f1e 100644
--- a/config/optional/monitoring.sensor_config.past_db_info.yml
+++ b/config/optional/monitoring.sensor_config.past_db_info.yml
@@ -2,7 +2,7 @@ id: past_db_info
 label: 'Past info'
 description: 'Past info reported'
 category: Past
-plugin_id: entity_aggregator
+plugin_id: content_entity_aggregator
 value_label: 'Events'
 value_type: 'number'
 status: FALSE
diff --git a/config/optional/monitoring.sensor_config.past_db_notice.yml b/config/optional/monitoring.sensor_config.past_db_notice.yml
index 06fcc6a..d2e445c 100644
--- a/config/optional/monitoring.sensor_config.past_db_notice.yml
+++ b/config/optional/monitoring.sensor_config.past_db_notice.yml
@@ -2,7 +2,7 @@ id: past_db_notice
 label: 'Notices occurred'
 description: 'Past event notices occurred'
 category: Past
-plugin_id: entity_aggregator
+plugin_id: content_entity_aggregator
 value_label: 'Events'
 value_type: 'number'
 status: FALSE
diff --git a/config/optional/monitoring.sensor_config.past_db_warning.yml b/config/optional/monitoring.sensor_config.past_db_warning.yml
index bf50826..e696742 100644
--- a/config/optional/monitoring.sensor_config.past_db_warning.yml
+++ b/config/optional/monitoring.sensor_config.past_db_warning.yml
@@ -2,7 +2,7 @@ id: past_db_warning
 label: 'Warnings occurred'
 description: 'Past event warnings occurred'
 category: Past
-plugin_id: entity_aggregator
+plugin_id: content_entity_aggregator
 value_label: 'Events'
 value_type: 'number'
 status: TRUE
diff --git a/config/schema/monitoring.schema.yml b/config/schema/monitoring.schema.yml
index 8f49d6d..2487a54 100644
--- a/config/schema/monitoring.schema.yml
+++ b/config/schema/monitoring.schema.yml
@@ -115,7 +115,7 @@ monitoring.settings.database_aggregator:
       type: string
       label: 'Table'
 
-monitoring.settings.entity_aggregator:
+monitoring.settings.content_entity_aggregator:
   type: monitoring.settings.aggregator_base
   label: 'Entity aggregator sensor settings'
   mapping:
@@ -167,7 +167,7 @@ monitoring.settings.core_requirements:
         label: 'Exclude key'
 
 monitoring.settings.payment_turnover:
-  type: monitoring.settings.entity_aggregator
+  type: monitoring.settings.content_entity_aggregator
   label: 'Payment turnover sensor settings'
   mapping:
     currency_code:
diff --git a/modules/test/config/optional/monitoring.sensor_config.entity_aggregate_test.yml b/modules/test/config/optional/monitoring.sensor_config.entity_aggregate_test.yml
index 171c7aa..5d368ad 100644
--- a/modules/test/config/optional/monitoring.sensor_config.entity_aggregate_test.yml
+++ b/modules/test/config/optional/monitoring.sensor_config.entity_aggregate_test.yml
@@ -2,7 +2,7 @@ id: entity_aggregate_test
 label: 'DB Aggregate test'
 description: 'Tests the generic DB aggregate sensor.'
 category: 'Test'
-plugin_id: entity_aggregator
+plugin_id: content_entity_aggregator
 value_type : 'number'
 value_label: 'Druplicons'
 result_logging: TRUE
diff --git a/monitoring.install b/monitoring.install
index 994329b..772df3e 100644
--- a/monitoring.install
+++ b/monitoring.install
@@ -24,7 +24,7 @@ function monitoring_install() {
         'id' => 'node_new_' . $node_type->id(),
         'label' => SafeMarkup::format('New @type nodes', array('@type' => $node_type->label())),
         'description' => SafeMarkup::format('New nodes of type @type', array('@type' => $node_type->label())),
-        'plugin_id' => 'entity_aggregator',
+        'plugin_id' => 'content_entity_aggregator',
         'value_label' => SafeMarkup::format('@type nodes', array('@type' => $node_type->label())),
         'value_type' => 'number',
         'category' => 'Content',
diff --git a/monitoring.module b/monitoring.module
index 6697f1c..e48e046 100644
--- a/monitoring.module
+++ b/monitoring.module
@@ -480,7 +480,7 @@ function monitoring_node_type_insert(NodeTypeInterface $type) {
     'id' => $config_id,
     'label' => SafeMarkup::format('New @type nodes', array('@type' => $type->label())),
     'description' => SafeMarkup::format('New nodes of type @type', array('@type' => $type->label())),
-    'plugin_id' => 'entity_aggregator',
+    'plugin_id' => 'content_entity_aggregator',
     'value_label' => SafeMarkup::format('@type nodes', array('@type' => $type->label())),
     'category' => 'Content',
     'status' => FALSE,
diff --git a/src/Plugin/monitoring/SensorPlugin/CommerceTurnoverSensorPlugin.php b/src/Plugin/monitoring/SensorPlugin/CommerceTurnoverSensorPlugin.php
index cb7ac02..6648a3d 100644
--- a/src/Plugin/monitoring/SensorPlugin/CommerceTurnoverSensorPlugin.php
+++ b/src/Plugin/monitoring/SensorPlugin/CommerceTurnoverSensorPlugin.php
@@ -24,7 +24,7 @@ use Drupal\monitoring\Result\SensorResultInterface;
  * )
  *
  */
-class CommerceTurnoverSensorPlugin extends EntityAggregatorSensorPlugin {
+class CommerceTurnoverSensorPlugin extends ContentEntityAggregatorSensorPlugin {
 
   /**
    * {@inheritdoc}
diff --git a/src/Plugin/monitoring/SensorPlugin/EntityAggregatorSensorPlugin.php b/src/Plugin/monitoring/SensorPlugin/ContentEntityAggregatorSensorPlugin.php
similarity index 92%
rename from src/Plugin/monitoring/SensorPlugin/EntityAggregatorSensorPlugin.php
rename to src/Plugin/monitoring/SensorPlugin/ContentEntityAggregatorSensorPlugin.php
index 73c9b4e..a26c29a 100644
--- a/src/Plugin/monitoring/SensorPlugin/EntityAggregatorSensorPlugin.php
+++ b/src/Plugin/monitoring/SensorPlugin/ContentEntityAggregatorSensorPlugin.php
@@ -1,7 +1,7 @@
 <?php
 /**
  * @file
- * Contains \Drupal\monitoring\Plugin\monitoring\SensorPlugin\EntityAggregatorSensorPlugin.
+ * Contains \Drupal\monitoring\Plugin\monitoring\SensorPlugin\ContentEntityAggregatorSensorPlugin.
  */
 
 namespace Drupal\monitoring\Plugin\monitoring\SensorPlugin;
@@ -22,18 +22,18 @@ use Drupal\monitoring\SensorPlugin\ExtendedInfoSensorPluginInterface;
 use Symfony\Component\DependencyInjection\ContainerInterface;
 
 /**
- * Entity database aggregator.
+ * Content entity database aggregator.
  *
  * It utilises the entity query aggregate functionality.
  *
  * @SensorPlugin(
- *   id = "entity_aggregator",
+ *   id = "content_entity_aggregator",
  *   label = @Translation("Entity Aggregator"),
  *   description = @Translation("Utilises the entity query aggregate functionality."),
  *   addable = TRUE
  * )
  */
-class EntityAggregatorSensorPlugin extends DatabaseAggregatorSensorPluginBase implements ExtendedInfoSensorPluginInterface {
+class ContentEntityAggregatorSensorPlugin extends DatabaseAggregatorSensorPluginBase implements ExtendedInfoSensorPluginInterface {
 
   use DependencySerializationTrait;
   use DependencyTrait;
@@ -201,9 +201,9 @@ class EntityAggregatorSensorPlugin extends DatabaseAggregatorSensorPluginBase im
     // );
 
     // Load entities.
-    $entity_type = $this->getEntityTypeId();
+    $entity_type_id = $this->getEntityTypeId();
     $entities = $this->entityManager
-      ->getStorage($entity_type)
+      ->getStorage($entity_type_id)
       ->loadMultiple($entity_ids);
 
     // Get the fields to display from the settings.
@@ -211,6 +211,7 @@ class EntityAggregatorSensorPlugin extends DatabaseAggregatorSensorPluginBase im
 
     // Render entities.
     $rows = [];
+    /* @var \Drupal\Core\Entity\FieldableEntityInterface $entity */
     foreach ($entities as $id => $entity) {
       $row = [];
       foreach ($fields as $field) {
@@ -242,10 +243,15 @@ class EntityAggregatorSensorPlugin extends DatabaseAggregatorSensorPluginBase im
             break;
 
           default:
-            $property = $entity->getFieldDefinition($field)->getFieldStorageDefinition()->getMainPropertyName();
-            $value = $entity->$field->view(['label' => 'hidden']);
-            $row[] = $value ? \Drupal::service('renderer')->renderPlain($value) : $entity->$field->$property;
-            break;
+            if ($entity->hasField($field)) {
+              $property = $entity->getFieldDefinition($field)->getFieldStorageDefinition()->getMainPropertyName();
+              $value = $entity->$field->view(['label' => 'hidden']);
+              $row[] = $value ? \Drupal::service('renderer')->renderPlain($value) : $entity->$field->$property;
+              break;
+            }
+            else {
+              $row[] = '<invalid field>';
+            }
         }
       }
 
@@ -291,12 +297,13 @@ class EntityAggregatorSensorPlugin extends DatabaseAggregatorSensorPluginBase im
   public function buildConfigurationForm(array $form, FormStateInterface $form_state) {
     $form = parent::buildConfigurationForm($form, $form_state);
     $settings = $this->sensorConfig->getSettings();
+    $options = $this->entityManager->getEntityTypeLabels(TRUE);
 
     $form['entity_type'] = array(
       '#type' => 'select',
-      '#default_value' => $this->getEntityTypeId(),
+      '#default_value' => $this->sensorConfig->getSetting('entity_type', 'node'),
       '#maxlength' => 255,
-      '#options' => $this->entityManager->getEntityTypeLabels(),
+      '#options' => isset($options['Content']) ? $options['Content'] : [],
       '#title' => t('Entity Type'),
     );
     if (!isset($settings['entity_type'])) {
@@ -416,8 +423,8 @@ class EntityAggregatorSensorPlugin extends DatabaseAggregatorSensorPluginBase im
     $entity_type = $this->entityManager->getDefinition($this->getEntityTypeId());
     $form['verbose_fields']['available_fields'] = [
       '#markup' => t('Available Fields for entity %type: <b>%fields</b>', [
-          '%type' => $entity_type->getLabel(),
-          '%fields' => implode(', ', array_keys($this->entityManager->getBaseFieldDefinitions($this->getEntityTypeId())))
+        '%type' => $entity_type->getLabel(),
+        '%fields' => implode(', ', array_keys($this->entityManager->getBaseFieldDefinitions($this->getEntityTypeId())))
         ]
       ),
     ];
diff --git a/src/Plugin/monitoring/SensorPlugin/PaymentTurnoverSensorPlugin.php b/src/Plugin/monitoring/SensorPlugin/PaymentTurnoverSensorPlugin.php
index e491751..fd52ad2 100644
--- a/src/Plugin/monitoring/SensorPlugin/PaymentTurnoverSensorPlugin.php
+++ b/src/Plugin/monitoring/SensorPlugin/PaymentTurnoverSensorPlugin.php
@@ -23,7 +23,7 @@ use Drupal\payment\Entity\Payment;
  *   addable = TRUE
  * )
  */
-class PaymentTurnoverSensorPlugin extends EntityAggregatorSensorPlugin {
+class PaymentTurnoverSensorPlugin extends ContentEntityAggregatorSensorPlugin {
 
   /**
    * {@inheritdoc}
diff --git a/src/Tests/MonitoringCoreKernelTest.php b/src/Tests/MonitoringCoreKernelTest.php
index c38dbd0..f980192 100644
--- a/src/Tests/MonitoringCoreKernelTest.php
+++ b/src/Tests/MonitoringCoreKernelTest.php
@@ -331,7 +331,7 @@ class MonitoringCoreKernelTest extends MonitoringUnitTestBase {
     $sensor = SensorConfig::create(array(
       'id' => 'node_new_existing',
       'label' => 'Existing sensor',
-      'plugin_id' => 'entity_aggregator',
+      'plugin_id' => 'content_entity_aggregator',
       'settings' => array(
         'entity_type' => 'node',
       ),
@@ -349,7 +349,7 @@ class MonitoringCoreKernelTest extends MonitoringUnitTestBase {
     $sensor = SensorConfig::create(array(
       'id' => 'node_new_existing',
       'label' => 'Existing sensor',
-      'plugin_id' => 'entity_aggregator',
+      'plugin_id' => 'content_entity_aggregator',
       'settings' => array(
         'entity_type' => 'node',
       ),
diff --git a/src/Tests/MonitoringCoreWebTest.php b/src/Tests/MonitoringCoreWebTest.php
index b498516..0955301 100644
--- a/src/Tests/MonitoringCoreWebTest.php
+++ b/src/Tests/MonitoringCoreWebTest.php
@@ -296,7 +296,7 @@ class MonitoringCoreWebTest extends MonitoringTestBase {
   /**
    * Tests the entity aggregator.
    *
-   * @see EntityAggregatorSensorPlugin
+   * @see ContentEntityAggregatorSensorPlugin
    */
   public function testEntityAggregator() {
     // Create content types and nodes.
diff --git a/src/Tests/MonitoringPaymentTest.php b/src/Tests/MonitoringPaymentTest.php
index 089987d..be89987 100644
--- a/src/Tests/MonitoringPaymentTest.php
+++ b/src/Tests/MonitoringPaymentTest.php
@@ -43,7 +43,7 @@ class MonitoringPaymentTest extends MonitoringUnitTestBase {
     // Create total payment count sensor.
     $sensor_config = SensorConfig::create(array(
       'id' => 'payment_count',
-      'plugin_id' => 'entity_aggregator',
+      'plugin_id' => 'content_entity_aggregator',
       'value_label' => 'transactions',
       'value_type' => 'number',
       'caching_time' => 3600,
diff --git a/src/Tests/MonitoringUITest.php b/src/Tests/MonitoringUITest.php
index 96f375c..5504d03 100644
--- a/src/Tests/MonitoringUITest.php
+++ b/src/Tests/MonitoringUITest.php
@@ -98,7 +98,7 @@ class MonitoringUITest extends MonitoringTestBase {
     $this->drupalPostForm(NULL, array(
       'label' => 'UI created Sensor',
       'id' => 'ui_test_sensor',
-      'plugin_id' => 'entity_aggregator',
+      'plugin_id' => 'content_entity_aggregator',
     ), t('Select sensor'));
 
     $this->assertText('Sensor plugin settings');