diff --git a/hub/data/energy_systems/montreal_custom_systems.xml b/hub/data/energy_systems/montreal_custom_systems.xml
index be67a4ea..cdf914a5 100644
--- a/hub/data/energy_systems/montreal_custom_systems.xml
+++ b/hub/data/energy_systems/montreal_custom_systems.xml
@@ -30,6 +30,12 @@
             <electrical_efficiency>0.22</electrical_efficiency>
             <storage>true</storage>
         </equipment>
+        <equipment id="7" type="heat pump" fuel_type="electricity">
+            <name>Heat Pump</name>
+            <heating_efficiency>2.79</heating_efficiency>
+            <cooling_efficiency>3.23</cooling_efficiency>
+            <storage>false</storage>
+        </equipment>
     </generation_equipments>
     <distribution_equipments>
         <equipment id="1" type="Water distribution heating">
@@ -282,6 +288,29 @@
                 <dissipation_id>3</dissipation_id>
             </equipments>
         </system>
+        <system id="17">
+            <name>Multi-zone built-up system with heat pump for heat</name>
+            <demands>
+                <demand>heating</demand>
+                <demand>domestic_hot_water</demand>
+            </demands>
+            <equipments>
+                <generation_id>7</generation_id>
+                <distribution_id>1</distribution_id>
+                <dissipation_id>2</dissipation_id>
+            </equipments>
+        </system>
+        <system id="18">
+            <name>Multi-zone built-up system with heat pump for cooling</name>
+            <demands>
+                <demand>cooling</demand>
+            </demands>
+            <equipments>
+                <generation_id>7</generation_id>
+                <distribution_id>2</distribution_id>
+                <dissipation_id>2</dissipation_id>
+            </equipments>
+        </system>
     </systems>
     <system_clusters>
         <system_cluster name="system 1 gas">
@@ -399,5 +428,12 @@
                 <system_id>15</system_id>
             </systems>
         </system_cluster>
+        <system_cluster name="system 7 electricity pv">
+            <systems>
+                <system_id>17</system_id>
+                <system_id>18</system_id>
+                <system_id>15</system_id>
+            </systems>
+        </system_cluster>
     </system_clusters>
 </catalog>
diff --git a/hub/exports/building_energy/idf.py b/hub/exports/building_energy/idf.py
index 860e1f5e..c47ca734 100644
--- a/hub/exports/building_energy/idf.py
+++ b/hub/exports/building_energy/idf.py
@@ -581,19 +581,19 @@ class Idf:
     self._idf.newidfobject(
       "OUTPUT:VARIABLE",
       Variable_Name="Zone Ideal Loads Supply Air Total Heating Energy",
-      Reporting_Frequency="Monthly",
+      Reporting_Frequency="Hourly",
     )
 
     self._idf.newidfobject(
       "OUTPUT:VARIABLE",
       Variable_Name="Zone Ideal Loads Supply Air Total Cooling Energy",
-      Reporting_Frequency="Monthly",
+      Reporting_Frequency="Hourly",
     )
 
     self._idf.newidfobject(
       "OUTPUT:VARIABLE",
       Variable_Name="Water Use Equipment Heating Rate",
-      Reporting_Frequency="Monthly",
+      Reporting_Frequency="Hourly",
     )
 
     # post-process to erase windows associated to adiabatic walls
diff --git a/hub/exports/building_energy/idf_files/Minimal.idf b/hub/exports/building_energy/idf_files/Minimal.idf
index f720b702..7d535832 100644
--- a/hub/exports/building_energy/idf_files/Minimal.idf
+++ b/hub/exports/building_energy/idf_files/Minimal.idf
@@ -148,10 +148,10 @@
 
   OutputControl:Table:Style, CommaAndHTML,JtoKWH;
 
-  Output:Meter,DISTRICTHEATING:Facility,monthly;
-  Output:Meter,DISTRICTCOOLING:Facility,monthly;
-  Output:Meter,InteriorEquipment:Electricity,monthly;
-  Output:Meter,InteriorLights:Electricity,monthly;
+  Output:Meter,DISTRICTHEATING:Facility,hourly;
+  Output:Meter,DISTRICTCOOLING:Facility,hourly;
+  Output:Meter,InteriorEquipment:Electricity,hourly;
+  Output:Meter,InteriorLights:Electricity,hourly;
 
   OutputControl:IlluminanceMap:Style,
      Comma;                                         !- Column separator