diff --git a/.travis.yml b/.travis.yml
index 43f6ee0..feaa0a7 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -15,8 +15,8 @@ iot-simulator: &iot-simulator
       - docker-compose -f docker/docker-compose.yml build
     before_script:
       - docker-compose -f docker/docker-compose.yml -f docker/edge/docker-compose.edge.yml up -d
-      - DOCKER_HOST='127.0.0.1:22375' docker-compose -f docker/docker-compose.yml -f docker/edge/docker-compose.edge.yml pull
-      - DOCKER_HOST='127.0.0.1:22375' docker-compose -f docker/docker-compose.yml -f docker/edge/docker-compose.edge.yml build
+      - DOCKER_HOST='127.0.0.1:22375' docker-compose -f docker/edge/docker-compose.modules.yml pull
+      - DOCKER_HOST='127.0.0.1:22375' docker-compose -f docker/edge/docker-compose.modules.yml build
     script:
       - sleep 5  # warm-up
       - sed -i 's/# IOT_SERIAL/IOT_SERIAL/g' docker/edge/docker-compose.modules.yml
diff --git a/README.md b/README.md
index 1a8796e..b3d7303 100644
--- a/README.md
+++ b/README.md
@@ -8,6 +8,11 @@ production.
 
 ![Application Schema](./docs/application_chart.svg)
 
+### Future implementations
+
+- Broker HA via [Nginx stream module](http://nginx.org/en/docs/stream/ngx_stream_core_module.html)
+- Stream analytics via [Apache Spark](https://spark.apache.org/)
+
 ## Installation
 
 ### Requirements
@@ -21,13 +26,17 @@ but it is advised to directly use a minimal Linux VM instead
 
 The application stack is composed by the following components:
 
-- [Django](https://www.djangoproject.com/) with [Django REST framework](https://www.django-rest-framework.org/) web application (running via `gunicorn` in production mode)
+- [Django](https://www.djangoproject.com/) with
+[Django REST framework](https://www.django-rest-framework.org/)
+web application (running via `gunicorn` in production mode)
   - `mqtt-to-db` custom daemon to dump telemetry into the timeseries database
   - telemetry payload is stored as json object (via PostgreSQL JSON data type)
-- [Timescale](https://www.timescale.com/) DB, a [PostgreSQL](https://www.postgresql.org/) database with a timeseries extension
+- [Timescale](https://www.timescale.com/) DB,
+a [PostgreSQL](https://www.postgresql.org/) database with a timeseries extension
 - [Mosquitto](https://mosquitto.org/) MQTT broker (see alternatives below)
 - [Nginx](http://nginx.org/) as ingress for HTTP (see alternative below)
-- [Chrony](https://chrony.tuxfamily.org/) as NTP server (with optional `MD5` encryption)
+- [Chrony](https://chrony.tuxfamily.org/) as NTP server
+(with optional `MD5` encryption)
 
 ## Deployment