diff --git a/config/optional/rest.resource.monitoring_sensor.yml b/config/optional/rest.resource.monitoring_sensor.yml
new file mode 100644
index 0000000..7424a24
--- /dev/null
+++ b/config/optional/rest.resource.monitoring_sensor.yml
@@ -0,0 +1,17 @@
+langcode: en
+status: TRUE
+dependencies:
+  module:
+    - basic_auth
+    - monitoring
+    - user
+id: monitoring_sensor
+plugin_id: 'monitoring-sensor'
+granularity: method
+configuration:
+  GET:
+    supported_formats:
+      - json
+    supported_auth:
+      - basic_auth
+      - cookie
diff --git a/config/optional/rest.resource.monitoring_sensor_result.yml b/config/optional/rest.resource.monitoring_sensor_result.yml
new file mode 100644
index 0000000..9e88949
--- /dev/null
+++ b/config/optional/rest.resource.monitoring_sensor_result.yml
@@ -0,0 +1,17 @@
+langcode: en
+status: TRUE
+dependencies:
+  module:
+    - basic_auth
+    - monitoring
+    - user
+id: monitoring_sensor_result
+plugin_id: 'monitoring-sensor-result'
+granularity: method
+configuration:
+  GET:
+    supported_formats:
+      - json
+    supported_auth:
+      - basic_auth
+      - cookie
diff --git a/modules/demo/monitoring_demo.info.yml b/modules/demo/monitoring_demo.info.yml
index 67fc3f8..940c070 100644
--- a/modules/demo/monitoring_demo.info.yml
+++ b/modules/demo/monitoring_demo.info.yml
@@ -11,6 +11,6 @@ dependencies:
  - search_api_db
  - monitoring
  - rest
- - hal
+ - basic_auth
  - dblog
  - file
diff --git a/modules/demo/monitoring_demo.install b/modules/demo/monitoring_demo.install
index ed797ef..01a0d63 100644
--- a/modules/demo/monitoring_demo.install
+++ b/modules/demo/monitoring_demo.install
@@ -21,26 +21,6 @@ function monitoring_demo_install() {
     ->set('page.front', '/monitoring-demo')
     ->save();
 
-  // Enable REST API for monitoring resources.
-  $settings = array(
-    'monitoring-sensor' => array(
-      'GET' => array(
-        'supported_formats' => array('hal_json'),
-        'supported_auth' => array('cookie'),
-      ),
-    ),
-    'monitoring-sensor-result' => array(
-      'GET' => array(
-        'supported_formats' => array('hal_json'),
-        'supported_auth' => array('cookie'),
-      ),
-    ),
-  );
-  \Drupal::configFactory()
-    ->getEditable('rest.settings')
-    ->set('resources', $settings)
-    ->save();
-
   // Create a few nodes and comments as sample data for some sensors.
   $nodes = [];
   $nodes[] = _monitoring_setup_create_node(array('type' => 'article'));
diff --git a/modules/multigraph/config/optional/rest.resource.monitoring_multigraph.yml b/modules/multigraph/config/optional/rest.resource.monitoring_multigraph.yml
new file mode 100644
index 0000000..36a6e2a
--- /dev/null
+++ b/modules/multigraph/config/optional/rest.resource.monitoring_multigraph.yml
@@ -0,0 +1,17 @@
+langcode: en
+status: TRUE
+dependencies:
+  module:
+    - basic_auth
+    - monitoring_multigraph
+    - user
+id: monitoring_multigraph
+plugin_id: 'monitoring-multigraph'
+granularity: method
+configuration:
+  GET:
+    supported_formats:
+      - json
+    supported_auth:
+      - basic_auth
+      - cookie
diff --git a/modules/multigraph/src/Tests/MultigraphServicesTest.php b/modules/multigraph/src/Tests/MultigraphServicesTest.php
index 0b735b5..1b0cfbd 100644
--- a/modules/multigraph/src/Tests/MultigraphServicesTest.php
+++ b/modules/multigraph/src/Tests/MultigraphServicesTest.php
@@ -26,7 +26,8 @@ class MultigraphServicesTest extends RESTTestBase {
     'dblog',
     'hal',
     'rest',
-    'monitoring',
+    'node',
+    'basic_auth',
     'monitoring_multigraph',
   );
 
@@ -46,20 +47,6 @@ class MultigraphServicesTest extends RESTTestBase {
     $this->defaultMimeType = 'application/json';
     $this->defaultFormat = 'json';
 
-    // Enable REST API for monitoring resources.
-    $config = $this->config('rest.settings');
-    $settings = array(
-      'monitoring-multigraph' => array(
-        'GET' => array(
-          'supported_formats' => array($this->defaultFormat),
-          'supported_auth' => $this->defaultAuth,
-        ),
-      ),
-    );
-    $config->set('resources', $settings);
-    $config->save();
-    $this->rebuildCache();
-
     $this->servicesAccount = $this->drupalCreateUser(array(
       'restful get monitoring-multigraph',
     ));
diff --git a/src/Plugin/monitoring/SensorPlugin/CommerceTurnoverSensorPlugin.php b/src/Plugin/monitoring/SensorPlugin/CommerceTurnoverSensorPlugin.php
index 6648a3d..6d3c1d3 100644
--- a/src/Plugin/monitoring/SensorPlugin/CommerceTurnoverSensorPlugin.php
+++ b/src/Plugin/monitoring/SensorPlugin/CommerceTurnoverSensorPlugin.php
@@ -29,8 +29,8 @@ class CommerceTurnoverSensorPlugin extends ContentEntityAggregatorSensorPlugin {
   /**
    * {@inheritdoc}
    */
-  protected function getEntityQueryAggregate($table, array $conditions, array $time_interval = array()) {
-    $query = parent::getEntityQueryAggregate($table, $conditions, $time_interval);
+  protected function getEntityQueryAggregate() {
+    $query = parent::getEntityQueryAggregate();
 
     // Get the field name for the amount field.
     $field_amount = $this->getFieldName($query, array('field' => 'commerce_order_total.amount'));