diff --git a/Makefile b/Makefile
index b52a77e0501af7b1fae7142222411d2b8f29a31e..648f5d9a29693b4449ee1278d24c7adde6f476ce 100644
--- a/Makefile
+++ b/Makefile
@@ -1,5 +1,9 @@
 schema:
 	python setup.py insert_schema
+	$(MAKE) black
+
+black:
+	black -l 90 pi_mqtt_gpio
 
 packages: clean schema sdist wheel2 wheel3
 
diff --git a/config.schema.yml b/config.schema.yml
index 42dcedc4b1af91b10b6f9284d8f9f56c484abede..7feb3c49ef572a01de4b92832be37fa9015ec222 100644
--- a/config.schema.yml
+++ b/config.schema.yml
@@ -145,6 +145,27 @@ sensor_modules:
         required: no
         default: yes
 
+stream_modules:
+  type: list
+  required: no
+  default: []
+  schema:
+    type: dict
+    allow_unknown: yes
+    schema:
+      name:
+        type: string
+        required: yes
+        empty: no
+      module:
+        type: string
+        required: yes
+        empty: no
+      cleanup:
+        type: boolean
+        required: no
+        default: yes
+
 digital_inputs:
   type: list
   required: no
@@ -286,6 +307,52 @@ sensor_inputs:
         default: 2
         min: 0
 
+stream_reads:
+  type: list
+  required: no
+  default: []
+  schema:
+    type: dict
+    allow_unknown: yes
+    schema:
+      name:
+        type: string
+        required: yes
+        empty: no
+      module:
+        type: string
+        required: yes
+        empty: no
+      retain:
+        type: boolean
+        required: no
+        default: no
+      encoding:
+        type: string
+        required: no
+      interval:
+        type: float
+        required: no
+        default: 60
+        min: 0.01
+
+stream_writes:
+  type: list
+  required: no
+  default: []
+  schema:
+    type: dict
+    allow_unknown: yes
+    schema:
+      name:
+        type: string
+        required: yes
+        empty: no
+      module:
+        type: string
+        required: yes
+        empty: no
+
 logging:
   type: dict
   required: no
diff --git a/pi_mqtt_gpio/modules/__init__.py b/pi_mqtt_gpio/modules/__init__.py
index c284e15a91b5095a7d8db4e4ecc4e1dfb3156984..0661d99894ca2e5746fa7a32a2e91a1372c4d73c 100644
--- a/pi_mqtt_gpio/modules/__init__.py
+++ b/pi_mqtt_gpio/modules/__init__.py
@@ -91,6 +91,7 @@ class GenericSensor(object):
         """
         pass
 
+
 class GenericStream(object):
     """
     Abstracts a generic stream interface to be implemented