diff --git a/pms_api_rest/datamodels/pms_calendar_info.py b/pms_api_rest/datamodels/pms_calendar_info.py
index 089fbea09..029b7e0dc 100644
--- a/pms_api_rest/datamodels/pms_calendar_info.py
+++ b/pms_api_rest/datamodels/pms_calendar_info.py
@@ -13,3 +13,4 @@ class PmsCalendarInfo(Datamodel):
     isFirstDay = fields.Boolean(required=False, allow_none=True)
     isLastDay = fields.Boolean(required=False, allow_none=True)
     totalPrice = fields.Float(required=False, allow_none=True)
+    numNotifications = fields.Integer(required=False, allow_none=True)
diff --git a/pms_api_rest/datamodels/pms_room_info.py b/pms_api_rest/datamodels/pms_room_info.py
index 5a5d5a465..d6a2603fb 100644
--- a/pms_api_rest/datamodels/pms_room_info.py
+++ b/pms_api_rest/datamodels/pms_room_info.py
@@ -8,3 +8,4 @@ class PmsRoomInfo(Datamodel):
     id = fields.Integer(required=False, allow_none=True)
     name = fields.String(required=False, allow_none=True)
     roomTypeId = fields.Integer(required=False, allow_none=True)
+    capacity = fields.Integer(required=False, allow_none=True)
diff --git a/pms_api_rest/services/calendar_service.py b/pms_api_rest/services/calendar_service.py
index 3ba49c196..93619d705 100644
--- a/pms_api_rest/services/calendar_service.py
+++ b/pms_api_rest/services/calendar_service.py
@@ -46,12 +46,13 @@ class PmsCalendarService(Component):
                     id=line.id,
                     roomId=line.room_id.id,
                     date=datetime.combine(line.date, datetime.min.time()).isoformat(),
-                    partnerId=line.reservation_id.partner_id.id,
+                    partnerId=line.reservation_id.partner_id.id or None,
                     reservationId=line.reservation_id,
                     isFirstDay=line.reservation_id.checkin == line.date,
                     isLastDay=line.reservation_id.checkout
                     == (line.date + timedelta(days=1)),
                     totalPrice=line.reservation_id.price_total,
+                    numNotifications=len(line.reservation_id.message_ids),
                 )
             )
         return result_lines
diff --git a/pms_api_rest/services/room_services.py b/pms_api_rest/services/room_services.py
index 70ea0f2bf..8bc61e215 100644
--- a/pms_api_rest/services/room_services.py
+++ b/pms_api_rest/services/room_services.py
@@ -43,6 +43,7 @@ class PmsRoomService(Component):
                     id=room.id,
                     name=room.name,
                     roomTypeId=room.room_type_id,
+                    capacity=room.capacity,
                 )
             )
         return result_rooms