diff --git a/platypush/entities/devices.py b/platypush/entities/devices.py
index 3db19dd9e..a65e50b38 100644
--- a/platypush/entities/devices.py
+++ b/platypush/entities/devices.py
@@ -8,6 +8,10 @@ from ._base import Entity
 if 'device' not in Base.metadata:
 
     class Device(Entity):
+        """
+        Base class to model device entities.
+        """
+
         __tablename__ = 'device'
 
         id = Column(
diff --git a/platypush/entities/dimmers.py b/platypush/entities/dimmers.py
index c977b0643..bdfa1d934 100644
--- a/platypush/entities/dimmers.py
+++ b/platypush/entities/dimmers.py
@@ -8,6 +8,11 @@ from .devices import Device
 if 'dimmer' not in Base.metadata:
 
     class Dimmer(Device):
+        """
+        This class models dimmer entities. A dimmer is any actionable entity
+        with numeric values and an optional min/max range.
+        """
+
         __tablename__ = 'dimmer'
 
         id = Column(