diff --git a/hub/data/energy_systems/montreal_custom_systems.xml b/hub/data/energy_systems/montreal_custom_systems.xml
index 99c073e9..b49bbc62 100644
--- a/hub/data/energy_systems/montreal_custom_systems.xml
+++ b/hub/data/energy_systems/montreal_custom_systems.xml
@@ -1,116 +1,282 @@
 <catalog lod="1">
+    <generation_equipments>
+        <equipment id="1" type="boiler" fuel_type="gas">
+            <name>Fuel-fired water boiler</name>
+            <heating_efficiency>0.85</heating_efficiency>
+        </equipment>
+        <equipment id="2" type="boiler" fuel_type="electricity">
+            <name>Electric water boiler</name>
+            <heating_efficiency>1</heating_efficiency>
+        </equipment>
+        <equipment id="3" type="furnace" fuel_type="gas">
+            <name>Fuel-fired furnace and fuel boiler for acs</name>
+            <heating_efficiency>0.85</heating_efficiency>
+        </equipment>
+        <equipment id="4" type="furnace" fuel_type="electricity">
+            <name>Electrical furnace and fuel boiler for acs</name>
+            <heating_efficiency>1</heating_efficiency>
+        </equipment>
+        <equipment id="5" type="cooler" fuel_type="electricity">
+            <name>Air cooled DX with external condenser</name>
+            <cooling_efficiency>3.23</cooling_efficiency>
+        </equipment>
+        <equipment id="6" type="electricity generator" fuel_type="renewable">
+            <name>PV system</name>
+            <electrical_efficiency>0.22</electrical_efficiency>
+        </equipment>
+    </generation_equipments>
+    <distribution_equipments>
+        <equipment id="1" type="Water distribution heating">
+            <name>Water distribution heating</name>
+            <distribution_heat_losses units="%">10</distribution_heat_losses>
+            <distribution_consumption_fix_flow units="%">4</distribution_consumption_fix_flow>
+            <distribution_consumption_variable_flow units="%">1</distribution_consumption_variable_flow>
+        </equipment>
+        <equipment id="2" type="Water distribution cooling">
+            <name>Water distribution cooling</name>
+            <distribution_heat_losses units="%">10</distribution_heat_losses>
+            <distribution_consumption_fix_flow units="%">4</distribution_consumption_fix_flow>
+            <distribution_consumption_variable_flow units="%">1</distribution_consumption_variable_flow>
+        </equipment>
+        <equipment id="3" type="Central air distribution heating">
+            <name>Central air distribution heating</name>
+            <distribution_heat_losses units="%">10</distribution_heat_losses>
+            <distribution_consumption_fix_flow units="%">13</distribution_consumption_fix_flow>
+            <distribution_consumption_variable_flow units="%">13</distribution_consumption_variable_flow>
+        </equipment>
+        <equipment id="4" type="Central air distribution cooling">
+            <name>Central air distribution cooling</name>
+            <distribution_heat_losses units="%">10</distribution_heat_losses>
+            <distribution_consumption_fix_flow units="%">13</distribution_consumption_fix_flow>
+            <distribution_consumption_variable_flow units="%">13</distribution_consumption_variable_flow>
+        </equipment>
+        <equipment id="5" type="Local air distribution heating">
+            <name>Local air distribution heating</name>
+            <distribution_heat_losses units="%">10</distribution_heat_losses>
+            <distribution_consumption_fix_flow units="%">8</distribution_consumption_fix_flow>
+            <distribution_consumption_variable_flow units="%">8</distribution_consumption_variable_flow>
+        </equipment>
+         <equipment id="6" type="Local air distribution cooling">
+            <name>Local air distribution cooling</name>
+            <distribution_heat_losses units="%">10</distribution_heat_losses>
+            <distribution_consumption_fix_flow units="%">8</distribution_consumption_fix_flow>
+            <distribution_consumption_variable_flow units="%">8</distribution_consumption_variable_flow>
+        </equipment>
+        <equipment id="7" type="Refrigerant distribution">
+            <name>Refrigerant distribution</name>
+            <distribution_heat_losses units="%">1</distribution_heat_losses>
+            <distribution_consumption_fix_flow units="%">1</distribution_consumption_fix_flow>
+            <distribution_consumption_variable_flow units="%">2</distribution_consumption_variable_flow>
+        </equipment>
+        <equipment id="8" type="No distribution">
+            <name>No distribution</name>
+            <distribution_heat_losses units="%">0</distribution_heat_losses>
+            <distribution_consumption_fix_flow units="%">0</distribution_consumption_fix_flow>
+            <distribution_consumption_variable_flow units="%">0</distribution_consumption_variable_flow>
+        </equipment>
+    </distribution_equipments>
+    <dissipation_equipments>
+        <equipment id="1" type="baseboards">
+            <name>Baseboards</name>
+            <parasitic_consumption>0</parasitic_consumption>
+        </equipment>
+        <equipment id="2" type="fan-coils">
+            <name>fan-coils</name>
+            <parasitic_consumption>2</parasitic_consumption>
+        </equipment>
+        <equipment id="3" type="inductors">
+            <name>inductors</name>
+            <parasitic_consumption>0</parasitic_consumption>
+        </equipment>
+    </dissipation_equipments>
     <systems>
-        <system id="1" type="boiler" fuel_type="gas">
-            <name>Fuel-fired water boiler with baseboards</name>
+        <system id = "1">
+            <name>Unitary air conditioner with baseboard heater fuel fired boiler</name>
             <demands>
                 <demand>heating</demand>
                 <demand>domestic_hot_water</demand>
             </demands>
-            <heating_efficiency>0.85</heating_efficiency>
-            <distribution_heat_losses units="%">10</distribution_heat_losses>
-            <distribution_consumption_fix_flow units="%">1000000000</distribution_consumption_fix_flow>
-            <distribution_consumption_variable_flow units="%">1000000000</distribution_consumption_variable_flow>
+            <equipments>
+                <generation_id>1</generation_id>
+                <distribution_id>1</distribution_id>
+                <dissipation_id>1</dissipation_id>
+            </equipments>
             <storage>false</storage>
         </system>
-        <system id="2" type="boiler" fuel_type="electricity">
-            <name>Electrical resistance water boiler</name>
+        <system id = "2">
+            <name>4 pipe fan coils with fuel fired boiler</name>
             <demands>
                 <demand>heating</demand>
                 <demand>domestic_hot_water</demand>
             </demands>
-            <heating_efficiency>1</heating_efficiency>
-            <distribution_heat_losses units="%">10</distribution_heat_losses>
-            <distribution_consumption_fix_flow units="%">1000000000</distribution_consumption_fix_flow>
-            <distribution_consumption_variable_flow units="%">1000000000</distribution_consumption_variable_flow>
+            <equipments>
+                <generation_id>1</generation_id>
+                <distribution_id>1</distribution_id>
+                <dissipation_id>2</dissipation_id>
+            </equipments>
+            <storage>false</storage>
+        </system>
+        <system id="3">
+            <name>4 pipe fan coils with electrical resistance water boiler</name>
+            <demands>
+                <demand>heating</demand>
+                <demand>domestic_hot_water</demand>
+            </demands>
+            <equipments>
+                <generation_id>2</generation_id>
+                <distribution_id>1</distribution_id>
+                <dissipation_id>2</dissipation_id>
+            </equipments>
             <storage>true</storage>
         </system>
-        <system id="3" type="furnace" fuel_type="gas">
-            <name>Fuel-fired furnace and fuel boiler for acs</name>
+        <system id="4">
+            <name>Single zone packaged rooftop unit with fuel-fired furnace and baseboards and fuel boiler for acs</name>
             <demands>
                 <demand>heating</demand>
-                 <demand>domestic_hot_water</demand>
+                <demand>domestic_hot_water</demand>
            </demands>
-            <heating_efficiency>0.85</heating_efficiency>
-            <distribution_heat_losses units="%">25</distribution_heat_losses>
-            <distribution_consumption_fix_flow units="%">1000000000</distribution_consumption_fix_flow>
-            <distribution_consumption_variable_flow units="%">1000000000</distribution_consumption_variable_flow>
+            <equipments>
+                <generation_id>3</generation_id>
+                <distribution_id>5</distribution_id>
+                <dissipation_id>1</dissipation_id>
+            </equipments>
             <storage>false</storage>
         </system>
-        <system id="4" type="furnace" fuel_type="electricity">
-            <name>Electrical resistance furnace and electrical boiler for acs</name>
+        <system id="5">
+            <name>Single zone packaged rooftop unit with electrical resistance furnace and baseboards and fuel boiler for acs</name>
             <demands>
                 <demand>heating</demand>
                 <demand>domestic_hot_water</demand>
             </demands>
-            <heating_efficiency>1</heating_efficiency>
-            <distribution_heat_losses units="%">25</distribution_heat_losses>
-            <distribution_consumption_fix_flow units="%">1000000000</distribution_consumption_fix_flow>
-            <distribution_consumption_variable_flow units="%">1000000000</distribution_consumption_variable_flow>
+            <equipments>
+                <generation_id>4</generation_id>
+                <distribution_id>5</distribution_id>
+                <dissipation_id>1</dissipation_id>
+            </equipments>
             <storage>false</storage>
         </system>
-        <system id="5" type="baseboard" fuel_type="gas">
-            <name>Baseboards: hydronic with fuel boiler</name>
+        <system id="6">
+            <name>Single zone make-up air unit with baseboard heating with fuel fired boiler</name>
             <demands>
                 <demand>heating</demand>
                 <demand>domestic_hot_water</demand>
             </demands>
-            <heating_efficiency>0.85</heating_efficiency>
-            <distribution_heat_losses units="%">10</distribution_heat_losses>
-            <distribution_consumption_fix_flow units="%">1000000000</distribution_consumption_fix_flow>
-            <distribution_consumption_variable_flow units="%">1000000000</distribution_consumption_variable_flow>
+            <equipments>
+                <generation_id>1</generation_id>
+                <distribution_id>1</distribution_id>
+                <dissipation_id>1</dissipation_id>
+            </equipments>
             <storage>false</storage>
         </system>
-        <system id="6" type="baseboard" fuel_type="electricity">
-            <name>Electrical baseboards and electrical boiler for acs</name>
+        <system id="7">
+            <name>Single zone make-up air unit with electrical baseboard heating and DHW with resistance</name>
             <demands>
                 <demand>heating</demand>
                 <demand>domestic_hot_water</demand>
             </demands>
-            <heating_efficiency>1</heating_efficiency>
-            <distribution_heat_losses units="%">0</distribution_heat_losses>
-            <distribution_consumption_fix_flow units="%">1000000000</distribution_consumption_fix_flow>
-            <distribution_consumption_variable_flow units="%">1000000000</distribution_consumption_variable_flow>
+            <equipments>
+                <generation_id>2</generation_id>
+                <distribution_id>5</distribution_id>
+                <dissipation_id>3</dissipation_id>
+            </equipments>
             <storage>false</storage>
         </system>
-        <system id="7" type="cooler" fuel_type="electricity">
-            <name>Air cooled DX with external condenser</name>
+         <system id="8">
+            <name>Multi-zone built-up system with baseboard heater hydronic with fuel fired boiler</name>
+            <demands>
+                <demand>heating</demand>
+                <demand>domestic_hot_water</demand>
+            </demands>
+            <equipments>
+                <generation_id>2</generation_id>
+                <distribution_id>1</distribution_id>
+                <dissipation_id>3</dissipation_id>
+            </equipments>
+            <storage>false</storage>
+        </system>
+         <system id="9">
+            <name>Multi-zone built-up system with electrical baseboard heater and electrical hot water</name>
+            <demands>
+                <demand>heating</demand>
+                <demand>domestic_hot_water</demand>
+            </demands>
+            <equipments>
+                <generation_id>2</generation_id>
+                <distribution_id>1</distribution_id>
+                <dissipation_id>3</dissipation_id>
+            </equipments>
+            <storage>false</storage>
+        </system>
+        <system id="10">
+            <name>Unitary air conditioner air cooled DX with external condenser</name>
             <demands>
                 <demand>cooling</demand>
             </demands>
-            <cooling_efficiency>3.23</cooling_efficiency>
-            <distribution_heat_losses units="%">0</distribution_heat_losses>
-            <distribution_consumption_fix_flow units="%">1000000000</distribution_consumption_fix_flow>
-            <distribution_consumption_variable_flow units="%">1000000000</distribution_consumption_variable_flow>
+            <equipments>
+                <generation_id>5</generation_id>
+                <distribution_id>6</distribution_id>
+                <dissipation_id>3</dissipation_id>
+            </equipments>
             <storage>false</storage>
         </system>
-        <system id="8" type="cooler" fuel_type="electricity">
-            <name>Water cooled, water chiller</name>
+        <system id="11">
+            <name>4 pipe fan coils with water cooled, water chiller</name>
             <demands>
                 <demand>cooling</demand>
             </demands>
-            <cooling_efficiency>3.23</cooling_efficiency>
-            <distribution_heat_losses units="%">10</distribution_heat_losses>
-            <distribution_consumption_fix_flow units="%">1000000000</distribution_consumption_fix_flow>
-            <distribution_consumption_variable_flow units="%">1000000000</distribution_consumption_variable_flow>
+            <equipments>
+                <generation_id>5</generation_id>
+                <distribution_id>2</distribution_id>
+                <dissipation_id>2</dissipation_id>
+            </equipments>
             <storage>false</storage>
         </system>
-        <system id="9" type="cooler" fuel_type="electricity">
-            <name>Air cooled DX</name>
+        <system id="12">
+            <name>Single zone packaged rooftop unit with air cooled DX</name>
             <demands>
                 <demand>cooling</demand>
             </demands>
-            <cooling_efficiency>3.23</cooling_efficiency>
-            <distribution_heat_losses units="%">0</distribution_heat_losses>
-            <distribution_consumption_fix_flow units="%">1000000000</distribution_consumption_fix_flow>
-            <distribution_consumption_variable_flow units="%">1000000000</distribution_consumption_variable_flow>
+            <equipments>
+                <generation_id>5</generation_id>
+                <distribution_id>6</distribution_id>
+                <dissipation_id>3</dissipation_id>
+            </equipments>
             <storage>false</storage>
         </system>
-        <system id="10" type="electricity generator" fuel_type="renewable">
+        <system id="13">
+            <name>Single zone make-up air unit with air cooled DX</name>
+            <demands>
+                <demand>cooling</demand>
+            </demands>
+            <equipments>
+                <generation_id>5</generation_id>
+                <distribution_id>6</distribution_id>
+                <dissipation_id>3</dissipation_id>
+            </equipments>
+            <storage>false</storage>
+        </system>
+        <system id="14">
+            <name>Multi-zone built-up system with water cooled, water chiller</name>
+            <demands>
+                <demand>cooling</demand>
+            </demands>
+            <equipments>
+                <generation_id>5</generation_id>
+                <distribution_id>3</distribution_id>
+                <dissipation_id>3</dissipation_id>
+            </equipments>
+            <storage>false</storage>
+        </system>
+        <system id="15">
             <name>PV system</name>
             <demands>
                 <demand>electricity</demand>
             </demands>
-            <electrical_efficiency>0.22</electrical_efficiency>
+            <equipments>
+                <generation_id>6</generation_id>
+                <distribution_id>5</distribution_id>
+                <dissipation_id>3</dissipation_id>
+            </equipments>
             <storage>true</storage>
         </system>
     </systems>
@@ -125,109 +291,109 @@
             <systems>
                 <system_id>1</system_id>
                 <system_id>7</system_id>
-                <system_id>10</system_id>
+                <system_id>15</system_id>
             </systems>
         </system_cluster>
         <system_cluster name="system 1 electricity">
             <systems>
-                <system_id>2</system_id>
-                <system_id>7</system_id>
+                <system_id>1</system_id>
+                <system_id>10</system_id>
             </systems>
         </system_cluster>
         <system_cluster name="system 1 electricity pv">
             <systems>
                 <system_id>2</system_id>
-                <system_id>7</system_id>
                 <system_id>10</system_id>
+                <system_id>15</system_id>
             </systems>
         </system_cluster>
         <system_cluster name="system 2 gas">
             <systems>
-                <system_id>1</system_id>
-                <system_id>8</system_id>
+                <system_id>2</system_id>
+                <system_id>11</system_id>
             </systems>
         </system_cluster>
         <system_cluster name="system 2 gas pv">
             <systems>
-                <system_id>1</system_id>
-                <system_id>8</system_id>
-                <system_id>10</system_id>
+                <system_id>2</system_id>
+                <system_id>11</system_id>
+                <system_id>15</system_id>
             </systems>
         </system_cluster>
         <system_cluster name="system 2 electricity">
             <systems>
-                <system_id>2</system_id>
-                <system_id>8</system_id>
+                <system_id>3</system_id>
+                <system_id>11</system_id>
             </systems>
         </system_cluster>
         <system_cluster name="system 2 electricity pv">
             <systems>
-                <system_id>2</system_id>
-                <system_id>8</system_id>
-                <system_id>10</system_id>
+                <system_id>3</system_id>
+                <system_id>11</system_id>
+                <system_id>15</system_id>
             </systems>
         </system_cluster>
         <system_cluster name="system 3 and 4 gas">
             <systems>
-                <system_id>3</system_id>
                 <system_id>4</system_id>
+                <system_id>12</system_id>
             </systems>
         </system_cluster>
         <system_cluster name="system 3 and 4 gas pv">
             <systems>
-                <system_id>3</system_id>
                 <system_id>4</system_id>
-                <system_id>10</system_id>
+                <system_id>12</system_id>
+                <system_id>15</system_id>
             </systems>
         </system_cluster>
         <system_cluster name="system 3 and 4 electricity">
             <systems>
-                <system_id>4</system_id>
-                <system_id>4</system_id>
+                <system_id>5</system_id>
+                <system_id>12</system_id>
             </systems>
         </system_cluster>
         <system_cluster name="system 3 and 4 electricity pv">
             <systems>
-                <system_id>4</system_id>
-                <system_id>4</system_id>
-                <system_id>10</system_id>
+                <system_id>5</system_id>
+                <system_id>12</system_id>
+                <system_id>15</system_id>
             </systems>
         </system_cluster>
         <system_cluster name="system 5">
             <systems>
-                <system_id>8</system_id>
+                <system_id>11</system_id>
             </systems>
         </system_cluster>
         <system_cluster name="system 5 pv">
             <systems>
-                <system_id>8</system_id>
-                <system_id>10</system_id>
+                <system_id>11</system_id>
+                <system_id>15</system_id>
             </systems>
         </system_cluster>
         <system_cluster name="system 6 gas">
             <systems>
-                <system_id>5</system_id>
                 <system_id>8</system_id>
+                <system_id>14</system_id>
             </systems>
         </system_cluster>
         <system_cluster name="system 6 gas pv">
             <systems>
-                <system_id>5</system_id>
                 <system_id>8</system_id>
-                <system_id>10</system_id>
+                <system_id>14</system_id>
+                <system_id>15</system_id>
             </systems>
         </system_cluster>
         <system_cluster name="system 6 electricity">
             <systems>
-                <system_id>6</system_id>
-                <system_id>8</system_id>
+                <system_id>9</system_id>
+                <system_id>14</system_id>
             </systems>
         </system_cluster>
         <system_cluster name="system 6 electricity pv">
             <systems>
-                <system_id>6</system_id>
-                <system_id>8</system_id>
-                <system_id>10</system_id>
+                <system_id>9</system_id>
+                <system_id>14</system_id>
+                <system_id>15</system_id>
             </systems>
         </system_cluster>
     </system_clusters>