diff --git a/doc/source/architecture.rst b/doc/source/architecture.rst
index 6cccce7f6c..66570caa55 100644
--- a/doc/source/architecture.rst
+++ b/doc/source/architecture.rst
@@ -9,17 +9,17 @@ Architecture
 
 The Sahara architecture consists of several components:
 
-* Cluster Configuration Manager  - all the business logic resides here
-
-* Auth component - responsible for client authentication & authorization
+* Auth component - responsible for client authentication & authorization, communicates with Keystone
 
 * DAL - Data Access Layer, persists internal models in DB
 
-* VM Provisioning - component responsible for communication with Nova and Glance
+* Provisioning Engine - component responsible for communication with Nova, Heat, Cinder and Glance
 
-* Deployment Engine - pluggable mechanism responsible for deploying Hadoop on provisioned VMs;
+* Vendor Plugins - pluggable mechanism responsible for configuring and launching Hadoop on provisioned VMs;
   existing management solutions like Apache Ambari and Cloudera Management Console could be utilized for that matter
 
+* EDP - :doc:`../userdoc/edp` responsible for scheduling and managing Hadoop jobs on clusters provisioned by Sahara
+
 * REST API - exposes Sahara functionality via REST
 
 * Python Sahara Client - similar to other OpenStack components Sahara has its own python client
diff --git a/doc/source/images/sahara-architecture.png b/doc/source/images/sahara-architecture.png
index f02c907acb..2122937bcb 100644
Binary files a/doc/source/images/sahara-architecture.png and b/doc/source/images/sahara-architecture.png differ