diff --git a/README.md b/README.md
index 286134bcc8a07033396c4c547eba4565056346c9..598a8095f3e50012ea3ab3db05062fb185ad5df2 100644
--- a/README.md
+++ b/README.md
@@ -11,6 +11,16 @@
 - **Assigment**:
     - The system will allow users to manage the smart meter devices at home. For a user, it will be possible to set different smart meters for the different houses they own/rent, and track the power consumption statistics over time that is collected automatically. They can track the power consumption of different devices in different time of the day (e.g., at night). They can also shut down the power to one of their houses through the system, when power is not needed. The power distribution company can consult the power consumption statistics over period of times of all the users registered into the system.
 
+## Modules
+  - **Core**
+    - Main module
+  - **Statistics**
+    - Getting power consumption statistics
+  - **Email**
+    - Sending emails from the system
+  - **Electricity Price**
+    - Getting electricity price in current time (high or low tariff)
+
 ## Roles
 
 System has three authorization roles - **Admin**, **Power Distribution Company Employee** and **Smart Energy User**.
diff --git a/images/ClassDiagram.jpg b/images/ClassDiagram.jpg
index be051fca40529a183b61ed7ce2d6da887395921c..ed14516d33771f1025488f4b1a96cf4c10409e17 100644
Binary files a/images/ClassDiagram.jpg and b/images/ClassDiagram.jpg differ